added wxTE_BESTWRAP style (which is the default now); renamed wxTE_LINEWRAP to wxTE_C...

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

diff --git a/include/wx/os2/dialog.h b/include/wx/os2/dialog.h
index 49f5af72ec8139479c470a1bd06ce53f271aab03..5a5a49a3212e721e42b2af5d501dcd146146b630 100644 (file)
--- a/include/wx/os2/dialog.h
+++ b/include/wx/os2/dialog.h
@@ -16,6 +16,8 @@
 
 WXDLLEXPORT_DATA(extern const char*) wxDialogNameStr;
 
 
 WXDLLEXPORT_DATA(extern const char*) wxDialogNameStr;
 

+class WXDLLEXPORT wxDialogModalData;
+

 //
 // Dialog boxes
 //
 //
 // Dialog boxes
 //


@@ -25,53 +27,17 @@ public:
 
   inline wxDialog() { Init(); }
 
 
   inline wxDialog() { Init(); }
 

-  //
-  // Constructor with a modal flag, but no window id - the old convention
-  //
-  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
-                 )
+    // full ctor
+    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)

     {
     {

-        long                        lModalStyle = lStyle ? wxDIALOG_MODAL : wxDIALOG_MODELESS ;
-
-        bModal = false;
-        Create( pParent
-               ,-1
-               ,rsTitle
-               ,wxPoint(nX, nY)
-               ,wxSize(nWidth, nHeight)
-               ,lStyle | lModalStyle
-               ,rsName
-              );
-    }
+        Init();

 
 

-    //
-    // Constructor with no modal flag - the new convention.
-    //
-    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( pParent
-               ,vId
-               ,rsTitle
-               ,rPos
-               ,rSize
-               ,lStyle
-               ,rsName
-              );
+        (void)Create(parent, id, title, pos, size, style, name);

     }
 
     bool Create( wxWindow*       pParent
     }
 
     bool Create( wxWindow*       pParent


@@ -82,49 +48,29 @@ public:
                 ,long            lStyle = wxDEFAULT_DIALOG_STYLE
                 ,const wxString& rsName = wxDialogNameStr
                );
                 ,long            lStyle = wxDEFAULT_DIALOG_STYLE
                 ,const wxString& rsName = wxDialogNameStr
                );

-    ~wxDialog();
-
-    virtual bool Destroy(void);
-    virtual bool Show(bool bShow);
-    virtual void Iconize(bool bIconize);
-    virtual bool IsIconized(void) const;
+    virtual ~wxDialog();

 
 

-    virtual bool IsTopLevel(void) const { return TRUE; }
+    // return true if we're showing the dialog modally
+    virtual bool IsModal() const { return m_modalData != NULL; }

 
 

-    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);
-
-    //
-    // Returns TRUE if we're in a modal loop
-    //
-    bool IsModalShowing() const;
+    // show the dialog modally and return the value passed to EndModal()
+    virtual int ShowModal();

 
 

-#if WXWIN_COMPATIBILITY
-    bool Iconized() const { return IsIconized(); };
-#endif
+    // may be called to terminate the dialog with the given return code
+    virtual void EndModal(int retCode);

 
 

-    //
-    // Implementation only from now on
+    // implementation only from now on

     // -------------------------------
     // -------------------------------

-    //
+
+    // override some base class virtuals
+    virtual bool Show(bool show = true);

 
     //
     // Event handlers
     //
 
     //
     // Event handlers
     //

-    bool OnClose(void);

     void OnCharHook(wxKeyEvent& rEvent);
     void OnCloseWindow(wxCloseEvent& rEvent);
 
     void OnCharHook(wxKeyEvent& rEvent);
     void OnCloseWindow(wxCloseEvent& rEvent);
 

-    //
-    // May be called to terminate the dialog with the given return code
-    //
-

     //
     // Standard buttons
     //
     //
     // Standard buttons
     //


@@ -144,28 +90,50 @@ public:
                                   ,WXWPARAM wParam
                                   ,WXLPARAM lParam
                                  );
                                   ,WXWPARAM wParam
                                   ,WXLPARAM lParam
                                  );

+    // obsolete methods
+    // ----------------
+
+    // Constructor with a modal flag, but no window id - the old convention
+    wxDEPRECATED( 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
+                          ) );
+
+    // just call Show() or ShowModal()
+    wxDEPRECATED( void SetModal(bool bFlag) );
+
+    // use IsModal()
+    wxDEPRECATED( bool IsModalShowing() const );
+

 protected:
     //
 protected:
     //

-    // Override more base class virtuals
-    //
-    virtual void DoSetClientSize( int nWidth
-                                 ,int nHeight
-                                );
-    virtual void DoGetPosition( int* pnX
-                               ,int* pnY
-                              ) const;
+    // find the window to use as parent for this dialog if none has been
+    // specified explicitly by the user

     //
     //

-    // Show modal dialog and enter modal loop
+    // may return NULL

     //
     //

-    void DoShowModal(void);
+    wxWindow *FindSuitableParent() const;

 
     //
     // Common part of all ctors
     //
 
     //
     // Common part of all ctors
     //

-    void Init();
+    void Init(void);
+
+    // end either modal or modeless dialog
+    void EndDialog(int rc);

 
 private:
     wxWindow*                       m_pOldFocus;
 
 private:
     wxWindow*                       m_pOldFocus;

+    bool        m_endModalCalled; // allow for closing within InitDialog
+
+    // this pointer is non-NULL only while the modal event loop is running
+    wxDialogModalData *m_modalData;

 
     //
     // While we are showing a modal dialog we disable the other windows using
 
     //
     // While we are showing a modal dialog we disable the other windows using


@@ -175,6 +143,7 @@ private:
 
     DECLARE_DYNAMIC_CLASS(wxDialog)
     DECLARE_EVENT_TABLE()
 
     DECLARE_DYNAMIC_CLASS(wxDialog)
     DECLARE_EVENT_TABLE()

+    DECLARE_NO_COPY_CLASS(wxDialog)

 }; // end of CLASS wxDialog
 
 #endif // _WX_DIALOG_H_
 }; // end of CLASS wxDialog
 
 #endif // _WX_DIALOG_H_