X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/598dc9b7779271df770ccbe0377a0f9e15816583..0555b2a0a3c509687e7fc5aeb160f5171b7e6311:/include/wx/os2/dialog.h diff --git a/include/wx/os2/dialog.h b/include/wx/os2/dialog.h index 89671430e9..c4497ef466 100644 --- a/include/wx/os2/dialog.h +++ b/include/wx/os2/dialog.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: dialog.h +// Name: wx/os2/dialog.h // Purpose: wxDialog class // Author: David Webster // Modified by: @@ -14,65 +14,30 @@ #include "wx/panel.h" -WXDLLEXPORT_DATA(extern const char*) wxDialogNameStr; +WXDLLIMPEXP_DATA_CORE(extern const char) wxDialogNameStr[]; -class WXDLLEXPORT wxDialogModalData; +class WXDLLIMPEXP_FWD_CORE wxDialogModalData; // // Dialog boxes // -class WXDLLEXPORT wxDialog: public wxDialogBase +class WXDLLIMPEXP_CORE wxDialog: public wxDialogBase { public: 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 ; - - 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 @@ -83,49 +48,22 @@ public: ,long lStyle = wxDEFAULT_DIALOG_STYLE ,const wxString& rsName = wxDialogNameStr ); - ~wxDialog(); + virtual ~wxDialog(); - void SetModal(bool bFlag); - virtual bool IsModal(void) const; + // return true if we're showing the dialog modally + virtual bool IsModal() const { return m_modalData != NULL; } - // For now, same as Show(TRUE) but returns return code + // show the dialog modally and return the value passed to EndModal() 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; - - // - // Implementation only from now on + // implementation only from now on // ------------------------------- - // - - // - // Override some base class virtuals - // - virtual bool Show(bool bShow); - - // - // Event handlers - // - void OnCharHook(wxKeyEvent& rEvent); - void OnCloseWindow(wxCloseEvent& rEvent); - // - // Standard buttons - // - void OnOK(wxCommandEvent& rEvent); - void OnApply(wxCommandEvent& rEvent); - void OnCancel(wxCommandEvent& rEvent); - - // - // Responds to colour changes - // - void OnSysColourChanged(wxSysColourChangedEvent& rEvent); + // override some base class virtuals + virtual bool Show(bool show = true); // // Callbacks @@ -134,13 +72,29 @@ public: ,WXWPARAM wParam ,WXLPARAM lParam ); +#if WXWIN_COMPATIBILITY_2_6 -protected: - // - // Show modal dialog and enter modal loop - // - void DoShowModal(void); + // 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 ); +#endif // WXWIN_COMPATIBILITY_2_6 + +protected: // // Common part of all ctors // @@ -148,6 +102,7 @@ protected: 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; @@ -159,8 +114,7 @@ private: class wxWindowDisabler* m_pWindowDisabler; DECLARE_DYNAMIC_CLASS(wxDialog) - DECLARE_EVENT_TABLE() + wxDECLARE_NO_COPY_CLASS(wxDialog); }; // end of CLASS wxDialog #endif // _WX_DIALOG_H_ -