X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSHAPERGUI%2FSHAPERGUI_NestedButton.cpp;h=37926325ea41863ae0185acffcf39f420988acd5;hb=093e8c42e3cf9a40071fe2f81591b7eb4bdfc247;hp=0ce9e0133694861dd1a8924ac3ce54101817767c;hpb=4d84ccf9dfa30be18dea333e6a77495e0516ba92;p=modules%2Fshaper.git

diff --git a/src/SHAPERGUI/SHAPERGUI_NestedButton.cpp b/src/SHAPERGUI/SHAPERGUI_NestedButton.cpp
index 0ce9e0133..37926325e 100644
--- a/src/SHAPERGUI/SHAPERGUI_NestedButton.cpp
+++ b/src/SHAPERGUI/SHAPERGUI_NestedButton.cpp
@@ -1,3 +1,23 @@
+// Copyright (C) 2014-2017  CEA/DEN, 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
+// 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
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// See http://www.salome-platform.org/ or
+// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+//
+
 /*
  * SHAPERGUI_NestedButton.cpp
  *
@@ -11,6 +31,7 @@
 #include <QFrame>
 #include <QHBoxLayout>
 #include <QToolButton>
+#include <QToolBar>
 #include <QEvent>
 
 SHAPERGUI_NestedButton::SHAPERGUI_NestedButton(QObject* theParent,
@@ -43,6 +64,12 @@ void SHAPERGUI_NestedButton::showAdditionalButtons(bool isShow)
 
 QWidget * SHAPERGUI_NestedButton::createWidget(QWidget * theParent)
 {
+  // the action has widget only in tool bar, in menu bar, the default
+  // action presentation is shown
+  QToolBar* aToolBar = dynamic_cast<QToolBar*>(theParent);
+  if (!aToolBar)
+    return 0;
+
   myButtonFrame = new QFrame(theParent);
   QHBoxLayout* aBoxLay = new QHBoxLayout(myButtonFrame);
   aBoxLay->setContentsMargins(2, 0, 0, 0);
@@ -96,5 +123,5 @@ void SHAPERGUI_NestedButton::actionStateChanged()
   } else {
     QString s = "false";
   }
-  
+
 }