X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f11bdd03b9623a61bfe3137beeefd7b1256bb9a1..95561ddfc3c0c84c71316d40cb539135fa68b440:/include/wx/dialog.h diff --git a/include/wx/dialog.h b/include/wx/dialog.h index c96c015e73..c40e2399a3 100644 --- a/include/wx/dialog.h +++ b/include/wx/dialog.h @@ -12,30 +12,43 @@ #ifndef _WX_DIALOG_H_BASE_ #define _WX_DIALOG_H_BASE_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "dialogbase.h" #endif #include "wx/defs.h" -#include "wx/panel.h" +#include "wx/containr.h" +#include "wx/toplevel.h" -class WXDLLEXPORT wxDialogBase : public wxPanel +#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: -#ifdef __DARWIN__ - ~wxDialogBase() { } -#endif + wxDialogBase() { Init(); } + 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 ); @@ -44,25 +57,29 @@ public: protected: // the return code from modal dialog int m_returnCode; + + DECLARE_NO_COPY_CLASS(wxDialogBase) + DECLARE_EVENT_TABLE() + WX_DECLARE_CONTROL_CONTAINER(); }; -#if defined(__WXMSW__) - #include "wx/msw/dialog.h" -#elif defined(__WXMOTIF__) - #include "wx/motif/dialog.h" -#elif defined(__WXGTK__) - #include "wx/gtk/dialog.h" -#elif defined(__WXMGL__) - #include "wx/mgl/dialog.h" -// FIXME_MGL -- belongs to wxUniv -#elif defined(__WXQT__) - #include "wx/qt/dialog.h" -#elif defined(__WXMAC__) - #include "wx/mac/dialog.h" -#elif defined(__WXPM__) - #include "wx/os2/dialog.h" -#elif defined(__WXSTUBS__) - #include "wx/stubs/dialog.h" + +#if defined(__WXUNIVERSAL__) && !defined(__WXMICROWIN__) + #include "wx/univ/dialog.h" +#else + #if defined(__WXMSW__) + #include "wx/msw/dialog.h" + #elif defined(__WXMOTIF__) + #include "wx/motif/dialog.h" + #elif defined(__WXGTK__) + #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" + #endif #endif #endif