X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/82c9f85ce5aceaa3aedac7e690070d5eff904e5b..1b8865e92caa043cf31043e38a788d8d4a9286e0:/include/wx/dialog.h?ds=sidebyside diff --git a/include/wx/dialog.h b/include/wx/dialog.h index cfab0663ad..fe3959626e 100644 --- a/include/wx/dialog.h +++ b/include/wx/dialog.h @@ -12,7 +12,7 @@ #ifndef _WX_DIALOG_H_BASE_ #define _WX_DIALOG_H_BASE_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "dialogbase.h" #endif @@ -20,13 +20,9 @@ #include "wx/containr.h" #include "wx/toplevel.h" -// FIXME - temporary hack in absence of wxTLW !! -#ifndef wxTopLevelWindowNative -#include "wx/panel.h" -class WXDLLEXPORT wxDialogBase : public wxPanel -#else +WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr; + class WXDLLEXPORT wxDialogBase : public wxTopLevelWindow -#endif { public: wxDialogBase() { Init(); } @@ -39,11 +35,11 @@ public: void SetReturnCode(int returnCode) { m_returnCode = returnCode; } int GetReturnCode() const { return m_returnCode; } -#if wxUSE_STATTEXT && wxUSE_TEXTCTRL +#if wxUSE_STATTEXT // && wxUSE_TEXTCTRL // splits text up at newlines and places the // lines into a vertical wxBoxSizer wxSizer *CreateTextSizer( const wxString &message ); -#endif // wxUSE_STATTEXT && wxUSE_TEXTCTRL +#endif // wxUSE_STATTEXT // && wxUSE_TEXTCTRL #if wxUSE_BUTTON // places buttons into a horizontal wxBoxSizer @@ -54,15 +50,13 @@ protected: // the return code from modal dialog int m_returnCode; - // FIXME - temporary hack in absence of wxTLW !! -#ifdef wxTopLevelWindowNative + DECLARE_NO_COPY_CLASS(wxDialogBase) DECLARE_EVENT_TABLE() WX_DECLARE_CONTROL_CONTAINER(); -#endif }; -#if defined(__WXUNIVERSAL__) +#if defined(__WXUNIVERSAL__) && !defined(__WXMICROWIN__) #include "wx/univ/dialog.h" #else #if defined(__WXMSW__) @@ -73,10 +67,10 @@ protected: #include "wx/gtk/dialog.h" #elif defined(__WXMAC__) #include "wx/mac/dialog.h" + #elif defined(__WXCOCOA__) + #include "wx/cocoa/dialog.h" #elif defined(__WXPM__) #include "wx/os2/dialog.h" - #elif defined(__WXSTUBS__) - #include "wx/stubs/dialog.h" #endif #endif