X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/af49c4b8a2d3553e733e71c7dd3911881f4c1a2a..95561ddfc3c0c84c71316d40cb539135fa68b440:/include/wx/dialog.h diff --git a/include/wx/dialog.h b/include/wx/dialog.h index c883f1cc21..c40e2399a3 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_ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "dialogbase.h" #endif @@ -20,13 +20,17 @@ #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 -class WXDLLEXPORT wxDialogBase : public wxTopLevelWindow +#define wxDIALOG_NO_PARENT 0x0001 // Don't make owned by apps top window + +#ifdef __WXWINCE__ + #define wxDEFAULT_DIALOG_STYLE (0) +#else // !__WXWINCE__ + #define wxDEFAULT_DIALOG_STYLE (wxSYSTEM_MENU | wxCAPTION | wxCLOSE_BOX) #endif + +WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr; + +class WXDLLEXPORT wxDialogBase : public wxTopLevelWindow { public: wxDialogBase() { Init(); } @@ -39,11 +43,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,11 +58,9 @@ 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 }; @@ -73,10 +75,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