Moved the cleanup code to an EVT_WINDOW_DESTROY handler.

[wxWidgets.git] / include / wx / os2 / dialog.h

diff --git a/include/wx/os2/dialog.h b/include/wx/os2/dialog.h
index 5a01bed637ad96ddbe888856ca193308f4b9f8a2..0198cd9bfa7c8780332c4f0a40b6ccd9e0109eff 100644 (file)
--- a/include/wx/os2/dialog.h
+++ b/include/wx/os2/dialog.h
@@ -83,36 +83,30 @@ public:
                );
     ~wxDialog();
 
-    virtual bool Destroy(void);
-    virtual bool Show(bool bShow);
-    virtual void Iconize(bool bIconize);
-    virtual bool IsIconized(void) const;
-
-    virtual bool IsTopLevel(void) const { return TRUE; }
-
-    void         SetModal(bool bFlag);
+            void SetModal(bool bFlag);
     virtual bool IsModal(void) const;
 
-    //
     // For now, same as Show(TRUE) but returns return code
-    //
-    virtual int  ShowModal(void);
-    virtual void EndModal(int nRetCode);
+    virtual int ShowModal();
+
+    // may be called to terminate the dialog with the given return code
+    virtual void EndModal(int retCode);
 
     //
     // Returns TRUE if we're in a modal loop
     //
-    bool IsModalShowing() const;
-
-#if WXWIN_COMPATIBILITY
-    bool Iconized() const { return IsIconized(); };
-#endif
+            bool IsModalShowing() const;
 
     //
     // Implementation only from now on
     // -------------------------------
     //
 
+    //
+    // Override some base class virtuals
+    //
+    virtual bool Show(bool bShow);
+
     //
     // Event handlers
     //
@@ -120,10 +114,6 @@ public:
     void OnCharHook(wxKeyEvent& rEvent);
     void OnCloseWindow(wxCloseEvent& rEvent);
 
-    //
-    // May be called to terminate the dialog with the given return code
-    //
-
     //
     // Standard buttons
     //
@@ -143,17 +133,9 @@ public:
                                   ,WXWPARAM wParam
                                   ,WXLPARAM lParam
                                  );
+
 protected:
     //
-    // Override more base class virtuals
-    //
-    virtual void DoSetClientSize( int nWidth
-                                 ,int nHeight
-                                );
-    virtual void DoGetPosition( int* pnX
-                               ,int* pnY
-                              ) const;
-    //
     // Show modal dialog and enter modal loop
     //
     void DoShowModal(void);
@@ -161,7 +143,7 @@ protected:
     //
     // Common part of all ctors
     //
-    void Init();
+    void Init(void);
 
 private:
     wxWindow*                       m_pOldFocus;