X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/40ff126ac4ff57ab4aa22a5c7c7ce621479e8739..9869c26285dc51d13607cddaa04f65ce983653a5:/include/wx/os2/dialog.h diff --git a/include/wx/os2/dialog.h b/include/wx/os2/dialog.h index d4ae70e32c..e4136df3c9 100644 --- a/include/wx/os2/dialog.h +++ b/include/wx/os2/dialog.h @@ -4,7 +4,6 @@ // Author: David Webster // Modified by: // Created: 10/14/99 -// RCS-ID: $Id$ // Copyright: (c) David Webster // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -14,14 +13,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 +64,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 // @@ -113,22 +94,11 @@ public: #endif // WXWIN_COMPATIBILITY_2_6 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; - // // 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 @@ -143,8 +113,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_