X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0e0de6b8aa49309ba439fcfd7251967915749c09..4d876ee3f727afa0d79aa5f7b03bf9a59673bef6:/include/wx/dialog.h diff --git a/include/wx/dialog.h b/include/wx/dialog.h index b3d75ccfbb..7146986a5e 100644 --- a/include/wx/dialog.h +++ b/include/wx/dialog.h @@ -30,10 +30,10 @@ class WXDLLEXPORT wxDialogBase : public wxTopLevelWindow { public: wxDialogBase() { Init(); } - ~wxDialogBase() {} - + virtual ~wxDialogBase() { } + void Init(); - + // the modal dialogs have a return code - usually the id of the last // pressed button void SetReturnCode(int returnCode) { m_returnCode = returnCode; } @@ -44,7 +44,7 @@ public: // lines into a vertical wxBoxSizer wxSizer *CreateTextSizer( const wxString &message ); #endif // wxUSE_STATTEXT && wxUSE_TEXTCTRL - + #if wxUSE_BUTTON // places buttons into a horizontal wxBoxSizer wxSizer *CreateButtonSizer( long flags ); @@ -55,14 +55,14 @@ protected: int m_returnCode; // FIXME - temporary hack in absence of wxTLW !! - #ifdef wxTopLevelWindowNative +#ifdef wxTopLevelWindowNative DECLARE_EVENT_TABLE() WX_DECLARE_CONTROL_CONTAINER(); - #endif +#endif }; -#if defined(__WXUNIVERSAL__) +#if defined(__WXUNIVERSAL__) && !defined(__WXMICROWIN__) #include "wx/univ/dialog.h" #else #if defined(__WXMSW__)