*** empty log message ***

diff --git a/src/SMESHGUI/Makefile.in b/src/SMESHGUI/Makefile.in
index 76b193bf32ec4863cb8addef7b257ffefc62236d..6b0f10e38260ebf55f8ece4709d9bb5b081da427 100644 (file)
--- a/src/SMESHGUI/Makefile.in
+++ b/src/SMESHGUI/Makefile.in
@@ -107,6 +107,7 @@ LIB_SRC =   SMESHGUI.cxx \
                SMESHGUI_VTKUtils.cxx \
                SMESHGUI_Selection.cxx \
                SMESHGUI_CreatePolyhedralVolumeDlg.cxx \
+               SMESHGUI_Dialog.cxx \
                SMESHGUI_Operation.cxx 
 
 LIB_MOC = \
@@ -150,6 +151,7 @@ LIB_MOC = \
                SMESHGUI_SewingDlg.h \
                SMESHGUI_PrecisionDlg.h \
                SMESHGUI_MergeNodesDlg.h \
+               SMESHGUI_Dialog.h \
                SMESHGUI_CreatePolyhedralVolumeDlg.h \
                SMESHGUI_Operation.h
     

diff --git a/src/SMESHGUI/SMESHGUI.cxx b/src/SMESHGUI/SMESHGUI.cxx
index 028e489b3842d4f3da62dbf908c5e3b48b346bf6..b2e72a8ad31c8454deaf9c9aac18e927879df22d 100644 (file)
--- a/src/SMESHGUI/SMESHGUI.cxx
+++ b/src/SMESHGUI/SMESHGUI.cxx
@@ -2473,7 +2473,7 @@ void SMESHGUI::createPopupItem( const int id,
   if( pId!=-1 )
     parentId = popupMgr()->actionId( action( pId ) );
 
-  if( !popupMgr()->contains( popupMgr()->actionId( action( id ) ) ) )
+//  if( !popupMgr()->contains( popupMgr()->actionId( action( id ) ) ) )
     popupMgr()->insert( action( id ), parentId, 0 );
 
   QChar lc = QtxPopupMgr::Selection::defEquality();

diff --git a/src/SMESHGUI/SMESHGUI_Dialog.cxx b/src/SMESHGUI/SMESHGUI_Dialog.cxx
new file mode 100644 (file)
index 0000000..0d8d7eb
--- /dev/null
+++ b/src/SMESHGUI/SMESHGUI_Dialog.cxx
@@ -0,0 +1,17 @@
+
+#include <SMESHGUI_Dialog.h>
+#include <SMESHGUI_Utils.h>
+#include <SMESHGUI.h>
+
+#include <SUIT_Desktop.h>
+
+SMESHGUI_Dialog::SMESHGUI_Dialog( SMESHGUI* theModule, const bool modal, const bool allowResize,
+                                  const int flags )
+: SalomeApp_Dialog( SMESH::GetDesktop( theModule ), "", modal, allowResize, flags )
+{
+}
+
+SMESHGUI_Dialog::~SMESHGUI_Dialog()
+{
+}
+

diff --git a/src/SMESHGUI/SMESHGUI_Dialog.h b/src/SMESHGUI/SMESHGUI_Dialog.h
new file mode 100644 (file)
index 0000000..62deb9a
--- /dev/null
+++ b/src/SMESHGUI/SMESHGUI_Dialog.h
@@ -0,0 +1,18 @@
+
+#ifndef SMESHGUI_DIALOG_H
+#define SMESHGUI_DIALOG_H
+
+#include <SalomeApp_Dialog.h>
+
+class SMESHGUI;
+
+class SMESHGUI_Dialog : public SalomeApp_Dialog
+{
+  Q_OBJECT
+  
+public:
+  SMESHGUI_Dialog( SMESHGUI*, const bool = false, const bool = false, const int = OK | Cancel | Apply );
+  virtual ~SMESHGUI_Dialog();
+};
+
+#endif