Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refs #550: fix crash when myObject is NULL
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_DeleteDlg.cxx
diff --git
a/src/HYDROGUI/HYDROGUI_DeleteDlg.cxx
b/src/HYDROGUI/HYDROGUI_DeleteDlg.cxx
index e7c93fa394b024993f7955e638f92e558aa61209..2afe552c6663a167c44c8a0e654399ad85caeb13 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_DeleteDlg.cxx
+++ b/
src/HYDROGUI/HYDROGUI_DeleteDlg.cxx
@@
-1,12
+1,8
@@
-// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
+// Copyright (C) 2014-2015 EDF-R&D
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License
, or (at your option) any later version
.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-44,6
+40,7
@@
HYDROGUI_DeleteDlg::HYDROGUI_DeleteDlg( QWidget* theParent )
myObjectsLabel = new QLabel( tr( "CONFIRM_DELETION" ), mainFrame() );
myObjects = new QTextEdit( mainFrame() );
myObjects->setReadOnly( true );
myObjectsLabel = new QLabel( tr( "CONFIRM_DELETION" ), mainFrame() );
myObjects = new QTextEdit( mainFrame() );
myObjects->setReadOnly( true );
+ myObjects->setFocusPolicy( Qt::NoFocus );
QGridLayout* aLayout = new QGridLayout( mainFrame() );
aLayout->setMargin( 5 );
QGridLayout* aLayout = new QGridLayout( mainFrame() );
aLayout->setMargin( 5 );
@@
-55,8
+52,13
@@
HYDROGUI_DeleteDlg::HYDROGUI_DeleteDlg( QWidget* theParent )
if ( QPushButton* aYesBtn = ::qobject_cast<QPushButton*>( button( Yes ) ) )
{
setFocusProxy( aYesBtn );
if ( QPushButton* aYesBtn = ::qobject_cast<QPushButton*>( button( Yes ) ) )
{
setFocusProxy( aYesBtn );
+ aYesBtn->setAutoDefault( true );
aYesBtn->setDefault( true );
}
aYesBtn->setDefault( true );
}
+ if ( QPushButton* aNoBtn = ::qobject_cast<QPushButton*>( button( No ) ) )
+ {
+ aNoBtn->setAutoDefault( true );
+ }
setMinimumSize( 275, 250 );
}
setMinimumSize( 275, 250 );
}