X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d7260478196b59ffd83c3328f710ba6f45860428..5f3565a2fb3d678b03cf8547f37e56b1efe786f5:/include/wx/dialog.h diff --git a/include/wx/dialog.h b/include/wx/dialog.h index f13cc11a5f..ce21810e37 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,6 +20,18 @@ #include "wx/containr.h" #include "wx/toplevel.h" +#define wxDIALOG_NO_PARENT 0x0001 // Don't make owned by apps top window + +#ifdef __WXWINCE__ +# ifdef __SMARTPHONE__ +# define wxDEFAULT_DIALOG_STYLE (wxMAXIMIZE | wxCAPTION) +# else +# define wxDEFAULT_DIALOG_STYLE (0) +# endif +#else // !__WXWINCE__ +# define wxDEFAULT_DIALOG_STYLE (wxSYSTEM_MENU | wxCAPTION | wxCLOSE_BOX) +#endif + WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr; class WXDLLEXPORT wxDialogBase : public wxTopLevelWindow @@ -50,6 +62,7 @@ protected: // the return code from modal dialog int m_returnCode; + DECLARE_NO_COPY_CLASS(wxDialogBase) DECLARE_EVENT_TABLE() WX_DECLARE_CONTROL_CONTAINER(); }; @@ -58,7 +71,9 @@ protected: #if defined(__WXUNIVERSAL__) && !defined(__WXMICROWIN__) #include "wx/univ/dialog.h" #else - #if defined(__WXMSW__) + #if defined(__PALMOS__) + #include "wx/palmos/dialog.h" + #elif defined(__WXMSW__) #include "wx/msw/dialog.h" #elif defined(__WXMOTIF__) #include "wx/motif/dialog.h"