X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1c067fe3c1e752658c63b4d556eb6a5468213860..1f0acb435592470b421b80df854fbbb08cd2853f:/include/wx/motif/dialog.h diff --git a/include/wx/motif/dialog.h b/include/wx/motif/dialog.h index be53d02123..a0a3247b9f 100644 --- a/include/wx/motif/dialog.h +++ b/include/wx/motif/dialog.h @@ -12,13 +12,11 @@ #ifndef _WX_DIALOG_H_ #define _WX_DIALOG_H_ -class WXDLLEXPORT wxEventLoop; +class WXDLLIMPEXP_FWD_CORE wxEventLoop; // Dialog boxes -class WXDLLEXPORT wxDialog : public wxDialogBase +class WXDLLIMPEXP_CORE wxDialog : public wxDialogBase { - DECLARE_DYNAMIC_CLASS(wxDialog) - public: wxDialog(); @@ -39,7 +37,7 @@ public: long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxDialogNameStr); - ~wxDialog(); + virtual ~wxDialog(); virtual bool Destroy(); @@ -59,19 +57,8 @@ public: virtual void ChangeFont(bool keepOriginalSize = true); virtual void ChangeBackgroundColour(); virtual void ChangeForegroundColour(); - inline WXWidget GetTopWidget() const { return m_mainWidget; } - inline WXWidget GetClientWidget() const { return m_mainWidget; } - - // Standard buttons - void OnOK(wxCommandEvent& event); - void OnApply(wxCommandEvent& event); - void OnCancel(wxCommandEvent& event); - - // Responds to colour changes - void OnSysColourChanged(wxSysColourChangedEvent& event); - - void OnCharHook(wxKeyEvent& event); - void OnCloseWindow(wxCloseEvent& event); + WXWidget GetTopWidget() const { return m_mainWidget; } + WXWidget GetClientWidget() const { return m_mainWidget; } private: virtual bool XmDoCreateTLW(wxWindow* parent, @@ -89,15 +76,14 @@ private: protected: virtual void DoSetSize(int x, int y, - int width, int height, - int sizeFlags = wxSIZE_AUTO); + int width, int height, + int sizeFlags = wxSIZE_AUTO); virtual void DoSetClientSize(int width, int height); private: - DECLARE_EVENT_TABLE() + DECLARE_DYNAMIC_CLASS(wxDialog) }; -#endif -// _WX_DIALOG_H_ +#endif // _WX_DIALOG_H_