X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/edf1dfa16db5bc9df60b30d01ca9892b298be34f..9c805dec6caf3c98a3797898cffe795b5b56e606:/include/wx/os2/dialog.h?ds=sidebyside diff --git a/include/wx/os2/dialog.h b/include/wx/os2/dialog.h index 0706163a56..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,14 +14,14 @@ #include "wx/panel.h" -WXDLLEXPORT_DATA(extern const wxChar*) 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: @@ -65,24 +65,6 @@ public: // override some base class virtuals virtual bool Show(bool show = true); - // - // 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); - // // Callbacks // @@ -90,8 +72,7 @@ public: ,WXWPARAM wParam ,WXLPARAM lParam ); - // obsolete methods - // ---------------- +#if WXWIN_COMPATIBILITY_2_6 // Constructor with a modal flag, but no window id - the old convention wxDEPRECATED( wxDialog( wxWindow* pParent @@ -111,23 +92,14 @@ public: // use IsModal() wxDEPRECATED( bool IsModalShowing() const ); -protected: - // - // find the window to use as parent for this dialog if none has been - // specified explicitly by the user - // - // may return NULL - // - wxWindow *FindSuitableParent() const; +#endif // WXWIN_COMPATIBILITY_2_6 +protected: // // Common part of all ctors // void Init(void); - // end either modal or modeless dialog - void EndDialog(int rc); - private: wxWindow* m_pOldFocus; bool m_endModalCalled; // allow for closing within InitDialog @@ -142,9 +114,7 @@ private: class wxWindowDisabler* m_pWindowDisabler; DECLARE_DYNAMIC_CLASS(wxDialog) - DECLARE_EVENT_TABLE() - DECLARE_NO_COPY_CLASS(wxDialog) + wxDECLARE_NO_COPY_CLASS(wxDialog); }; // end of CLASS wxDialog #endif // _WX_DIALOG_H_ -