Bug 20: View \96 Windows: name of windows are wrong.

diff --git a/src/HYDROGUI/HYDROGUI_Operation.cxx b/src/HYDROGUI/HYDROGUI_Operation.cxx
index 3183b3b82b8af70118e8c0409844a9e51e0f5971..d3d15202d7d5964c5c60677423e378d02570069e 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_Operation.cxx
+++ b/src/HYDROGUI/HYDROGUI_Operation.cxx
@@ -94,17 +94,13 @@ void HYDROGUI_Operation::startOperation()
 void HYDROGUI_Operation::abortOperation()
 {
   LightApp_Operation::abortOperation();
-
-  if( inputPanel() )
-    inputPanel()->hide();
+  closeInputPanel();
 }
 
 void HYDROGUI_Operation::commitOperation()
 {
   LightApp_Operation::commitOperation();
-
-  if( inputPanel() )
-    inputPanel()->hide();
+  closeInputPanel();
 }
 
 HYDROGUI_InputPanel* HYDROGUI_Operation::createInputPanel() const
@@ -112,6 +108,16 @@ HYDROGUI_InputPanel* HYDROGUI_Operation::createInputPanel() const
   return NULL;
 }
 
+void HYDROGUI_Operation::closeInputPanel()
+{
+  if( myPanel )
+  {
+    myModule->getApp()->desktop()->removeDockWidget( myPanel );
+    delete myPanel;
+    myPanel = 0;
+  }
+}
+
 bool HYDROGUI_Operation::processApply( int& theUpdateFlags,
                                        QString& theErrorMsg )
 {

diff --git a/src/HYDROGUI/HYDROGUI_Operation.h b/src/HYDROGUI/HYDROGUI_Operation.h
index cd701c418dc56858867df773cb2d2de56d062f72..70b1ccd0f0909d1f48eb8f817b84b27544390f36 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_Operation.h
+++ b/src/HYDROGUI/HYDROGUI_Operation.h
@@ -52,6 +52,7 @@ protected:
   virtual void commitOperation();
 
   virtual HYDROGUI_InputPanel* createInputPanel() const;
+  virtual void closeInputPanel();
 
   virtual bool processApply( int& theUpdateFlags, QString& theErrorMsg );
   virtual void processCancel();