Big wxRegion clean up.

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

diff --git a/include/wx/os2/dialog.h b/include/wx/os2/dialog.h
index 5bdea1a1d4b084a230f13ecb6e8f286ca5a529be..0198cd9bfa7c8780332c4f0a40b6ccd9e0109eff 100644 (file)
--- a/include/wx/os2/dialog.h
+++ b/include/wx/os2/dialog.h
@@ -16,126 +16,147 @@
 
 WXDLLEXPORT_DATA(extern const char*) wxDialogNameStr;
 
 
 WXDLLEXPORT_DATA(extern const char*) wxDialogNameStr;
 

+//

 // Dialog boxes
 // Dialog boxes

+//

 class WXDLLEXPORT wxDialog: public wxDialogBase
 {
 class WXDLLEXPORT wxDialog: public wxDialogBase
 {

-  DECLARE_DYNAMIC_CLASS(wxDialog)

 public:
 
 public:
 

-  wxDialog();
+  inline wxDialog() { Init(); }

 
 

+  //

   // Constructor with a modal flag, but no window id - the old convention
   // Constructor with a modal flag, but no window id - the old convention

-  inline wxDialog( wxWindow*       parent
-                  ,const wxString& title
-                  ,bool            modal
-                  ,int             x = -1
-                  ,int             y = -1
-                  ,int             width = 500
-                  ,int             height = 500
-                  ,long            style = wxDEFAULT_DIALOG_STYLE
-                  ,const wxString& name = wxDialogNameStr
+  //
+  inline wxDialog( wxWindow*       pParent
+                  ,const wxString& rsTitle
+                  ,bool            bModal
+                  ,int             nX = -1
+                  ,int             nY = -1
+                  ,int             nWidth = 500
+                  ,int             nHeight = 500
+                  ,long            lStyle = wxDEFAULT_DIALOG_STYLE
+                  ,const wxString& rsName = wxDialogNameStr

                  )
     {
                  )
     {

-        long modalStyle = modal ? wxDIALOG_MODAL : wxDIALOG_MODELESS ;
-        Create(parent, -1, title, wxPoint(x, y), wxSize(width, height), style|modalStyle, name);
+        long                        lModalStyle = lStyle ? wxDIALOG_MODAL : wxDIALOG_MODELESS ;
+
+        Create( pParent
+               ,-1
+               ,rsTitle
+               ,wxPoint(nX, nY)
+               ,wxSize(nWidth, nHeight)
+               ,lStyle | lModalStyle
+               ,rsName
+              );

     }
 
     }
 

+    //

     // Constructor with no modal flag - the new convention.
     // Constructor with no modal flag - the new convention.

-    inline wxDialog( wxWindow*       parent
-                    ,wxWindowID      id
-                    ,const wxString& title
-                    ,const wxPoint&  pos = wxDefaultPosition
-                    ,const wxSize&   size = wxDefaultSize
-                    ,long            style = wxDEFAULT_DIALOG_STYLE
-                    ,const wxString& name = wxDialogNameStr
+    //
+    inline wxDialog( wxWindow*       pParent
+                    ,wxWindowID      vId
+                    ,const wxString& rsTitle
+                    ,const wxPoint&  rPos = wxDefaultPosition
+                    ,const wxSize&   rSize = wxDefaultSize
+                    ,long            lStyle = wxDEFAULT_DIALOG_STYLE
+                    ,const wxString& rsName = wxDialogNameStr

                    )
     {
                    )
     {

-        Create(parent, id, title, pos, size, style, name);
+        Create( pParent
+               ,vId
+               ,rsTitle
+               ,rPos
+               ,rSize
+               ,lStyle
+               ,rsName
+              );

     }
 
     }
 

-    bool Create( wxWindow*       parent
-                ,wxWindowID      id
-                ,const wxString& title
-                , // bool modal = FALSE, // TODO make this a window style?
-                 const wxPoint&  pos = wxDefaultPosition
-                ,const wxSize&   size = wxDefaultSize
-                ,long            style = wxDEFAULT_DIALOG_STYLE
-                ,const wxString& name = wxDialogNameStr
+    bool Create( wxWindow*       pParent
+                ,wxWindowID      vId
+                ,const wxString& rsTitle
+                ,const wxPoint&  rPos = wxDefaultPosition
+                ,const wxSize&   rSize = wxDefaultSize
+                ,long            lStyle = wxDEFAULT_DIALOG_STYLE
+                ,const wxString& rsName = wxDialogNameStr

                );
                );

-

     ~wxDialog();
 
     ~wxDialog();
 

-    virtual bool Destroy();
-
-    virtual void DoSetClientSize(int width, int height);
-
-    virtual void GetPosition(int *x, int *y) const;
-
-    bool Show(bool show);
-    bool IsShown() const;
-    void Iconize(bool iconize);
-
-#if WXWIN_COMPATIBILITY
-    bool Iconized() const { return IsIconized(); };
-#endif
-
-    virtual bool IsIconized() const;
-    void         Fit();
-
-    void     SetTitle(const wxString& title);
-    wxString GetTitle() const ;
-
-    void OnSize(wxSizeEvent& event);
-    bool OnClose();
-    void OnCharHook(wxKeyEvent& event);
-    void OnPaint(wxPaintEvent& event);
-    void OnCloseWindow(wxCloseEvent& event);
-
-    void SetModal(bool flag);
-
-    virtual void Centre(int direction = wxBOTH);
-    virtual bool IsModal() const;
+            void SetModal(bool bFlag);
+    virtual bool IsModal(void) const;

 
     // For now, same as Show(TRUE) but returns return code
 
     // For now, same as Show(TRUE) but returns return code

-    virtual int  ShowModal();
+    virtual int ShowModal();
+
+    // may be called to terminate the dialog with the given return code

     virtual void EndModal(int retCode);
 
     virtual void EndModal(int retCode);
 

+    //
+    // Returns TRUE if we're in a modal loop
+    //
+            bool IsModalShowing() const;
+
+    //
+    // Implementation only from now on
+    // -------------------------------
+    //
+
+    //
+    // Override some base class virtuals
+    //
+    virtual bool Show(bool bShow);
+
+    //
+    // Event handlers
+    //
+    bool OnClose(void);
+    void OnCharHook(wxKeyEvent& rEvent);
+    void OnCloseWindow(wxCloseEvent& rEvent);
+
+    //

     // Standard buttons
     // Standard buttons

-    void     OnOK(wxCommandEvent& event);
-    void     OnApply(wxCommandEvent& event);
-    void     OnCancel(wxCommandEvent& event);
+    //
+    void     OnOK(wxCommandEvent& rEvent);
+    void     OnApply(wxCommandEvent& rEvent);
+    void     OnCancel(wxCommandEvent& rEvent);

 
 

+    //

     // Responds to colour changes
     // Responds to colour changes

-    void     OnSysColourChanged(wxSysColourChangedEvent& event);
-
-    // implementation
-    // --------------
-    virtual MRESULT OS2WindowProc(HWND hwnd, WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
-
-    virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
-                                WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
+    //
+    void     OnSysColourChanged(wxSysColourChangedEvent& rEvent);

 
 

-    bool IsModalShowing() const { return m_modalShowing; }
-
-  // tooltip management
-#if wxUSE_TOOLTIPS
-    WXHWND GetToolTipCtrl() const { return m_hwndToolTip; }
-    void SetToolTipCtrl(WXHWND hwndTT) { m_hwndToolTip = hwndTT; }
-#endif // tooltips
+    //
+    // Callbacks
+    //
+    virtual MRESULT OS2WindowProc( WXUINT   uMessage
+                                  ,WXWPARAM wParam
+                                  ,WXLPARAM lParam
+                                 );

 
 protected:
 
 protected:

-    bool   m_modalShowing;
-    WXHWND m_hwndOldFocus;  // the window which had focus before we were shown
+    //
+    // Show modal dialog and enter modal loop
+    //
+    void DoShowModal(void);

 
 

-private:
-#if wxUSE_TOOLTIPS
-    WXHWND                m_hwndToolTip;
-#endif // tooltips
+    //
+    // Common part of all ctors
+    //
+    void Init(void);

 
 private:
 
 private:

+    wxWindow*                       m_pOldFocus;
+
+    //
+    // While we are showing a modal dialog we disable the other windows using
+    // this object
+    //
+    class wxWindowDisabler*         m_pWindowDisabler;
+
+    DECLARE_DYNAMIC_CLASS(wxDialog)
+    DECLARE_EVENT_TABLE()
+}; // end of CLASS wxDialog

 
 

-DECLARE_EVENT_TABLE()
-};
+#endif // _WX_DIALOG_H_

 
 

-#endif
-    // _WX_DIALOG_H_