X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0e0de6b8aa49309ba439fcfd7251967915749c09..ef094fa075bc56bcbc33b12159c395ea28afda3b:/include/wx/dialog.h?ds=sidebyside diff --git a/include/wx/dialog.h b/include/wx/dialog.h index b3d75ccfbb..f13cc11a5f 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,31 +20,27 @@ #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(); } - ~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; } 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 wxSizer *CreateButtonSizer( long flags ); @@ -54,15 +50,12 @@ protected: // the return code from modal dialog int m_returnCode; - // FIXME - temporary hack in absence of wxTLW !! - #ifdef wxTopLevelWindowNative 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 +66,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