X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_PagedContainer.cpp;h=9f32442a577901139b5a810492c2828dc1195cd1;hb=eef14b29d313b9dd16453d12f20aa02383ee139c;hp=87ef65afa4d3c8949c8a93e74008133fd9c4ed49;hpb=41695176c748943485f8844fea6e89cef9a0b6f5;p=modules%2Fshaper.git diff --git a/src/ModuleBase/ModuleBase_PagedContainer.cpp b/src/ModuleBase/ModuleBase_PagedContainer.cpp index 87ef65afa..9f32442a5 100644 --- a/src/ModuleBase/ModuleBase_PagedContainer.cpp +++ b/src/ModuleBase/ModuleBase_PagedContainer.cpp @@ -22,6 +22,9 @@ ModuleBase_PagedContainer::ModuleBase_PagedContainer(QWidget* theParent, const C : ModuleBase_ModelWidget(theParent, theData, theParentId), myIsFocusOnCurrentPage(false) { + // it is not obligatory to be ignored when property panel tries to activate next active widget + // but if focus is moved to this control, it can accept it. + myIsObligatory = false; } ModuleBase_PagedContainer::~ModuleBase_PagedContainer() @@ -30,7 +33,7 @@ ModuleBase_PagedContainer::~ModuleBase_PagedContainer() int ModuleBase_PagedContainer::addPage(ModuleBase_PageBase* thePage, const QString& theName, const QString& theCaseId, - const QIcon& theIcon ) + const QPixmap& theIcon ) { if (!myPages.count()) { setDefaultValue(theCaseId.toStdString());