1) IPAL15174 (Dump study works wrong for Concatenate):

	fix of Problem 1 (no icon ?Build compound? in dialog box).
2) add the checking of the study lock.

diff --git a/src/SMESHGUI/SMESHGUI_BuildCompoundDlg.h b/src/SMESHGUI/SMESHGUI_BuildCompoundDlg.h
index 862080e95483302061c7e1b13cb725201e4c92ff..c7bc29cdae464578ea268d1b4779dac3d73a3189 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_BuildCompoundDlg.h
+++ b/src/SMESHGUI/SMESHGUI_BuildCompoundDlg.h
@@ -25,8 +25,8 @@
 //  Author : Alexander KOVALEV
 //  Module : SMESH
 
-#ifndef DIALOGBOX_BUILD_MESH_H
-#define DIALOGBOX_BUILD_MESH_H
+#ifndef SMESHGUI_BuildCompoundDlg_H
+#define SMESHGUI_BuildCompoundDlg_H
 
 #include "LightApp_SelectionMgr.h"
 #include "SUIT_SelectionFilter.h"
@@ -67,10 +67,7 @@ class SMESHGUI_BuildCompoundDlg : public QDialog
 
  public:
 
-  SMESHGUI_BuildCompoundDlg (SMESHGUI  * theModule,
-                            const char* title,
-                            const char* icon,
-                            int         theAction);
+  SMESHGUI_BuildCompoundDlg (SMESHGUI  * theModule);
   ~SMESHGUI_BuildCompoundDlg();
 
 public :
@@ -91,8 +88,6 @@ public :
   SUIT_SelectionFilter*   myMeshFilter;
   SMESH::mesh_array_var   myMeshArray;
 
-  int myAction;
-
   // Widgets
   QButtonGroup* GroupConstructors;
   QRadioButton* Constructor1;
@@ -129,7 +124,7 @@ public :
  private slots:
   void ClickOnOk();
   void ClickOnCancel();
-  void ClickOnApply();
+  bool ClickOnApply();
   void ClickOnHelp();
   void SelectionIntoArgument();
   void DeactivateActiveDialog();
@@ -137,4 +132,4 @@ public :
   void onSelectMerge(bool);
 };
 
-#endif // DIALOGBOX_BUILD_MESH_H
+#endif // SMESHGUI_BuildCompoundDlg_H