Reenable wxPalmOS status bar after recent changes. Start transition from faked drawin...

[wxWidgets.git] / include / wx / dialog.h

diff --git a/include/wx/dialog.h b/include/wx/dialog.h
index c40e2399a3dc8e0e517f58d433b4756e2b45ee8e..17dc6c0ac110873b788606fd0265cd83135c45a9 100644 (file)
--- a/include/wx/dialog.h
+++ b/include/wx/dialog.h
@@ -20,12 +20,19 @@
 #include "wx/containr.h"
 #include "wx/toplevel.h"
 
 #include "wx/containr.h"
 #include "wx/toplevel.h"
 

+class WXDLLEXPORT wxSizer;
+class WXDLLEXPORT wxStdDialogButtonSizer;
+

 #define wxDIALOG_NO_PARENT      0x0001  // Don't make owned by apps top window
 
 #ifdef __WXWINCE__
 #define wxDIALOG_NO_PARENT      0x0001  // Don't make owned by apps top window
 
 #ifdef __WXWINCE__

-    #define wxDEFAULT_DIALOG_STYLE (0)
+#   ifdef __SMARTPHONE__
+#       define wxDEFAULT_DIALOG_STYLE (wxMAXIMIZE | wxCAPTION)
+#   else
+#       define wxDEFAULT_DIALOG_STYLE (0)
+#   endif

 #else // !__WXWINCE__
 #else // !__WXWINCE__

-    #define wxDEFAULT_DIALOG_STYLE  (wxSYSTEM_MENU | wxCAPTION | wxCLOSE_BOX)
+#   define wxDEFAULT_DIALOG_STYLE  (wxSYSTEM_MENU | wxCAPTION | wxCLOSE_BOX)

 #endif
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr;
 #endif
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr;


@@ -52,6 +59,7 @@ public:
 #if wxUSE_BUTTON
     // places buttons into a horizontal wxBoxSizer
     wxSizer *CreateButtonSizer( long flags );
 #if wxUSE_BUTTON
     // places buttons into a horizontal wxBoxSizer
     wxSizer *CreateButtonSizer( long flags );

+    wxStdDialogButtonSizer *CreateStdDialogButtonSizer( long flags );

 #endif // wxUSE_BUTTON
 
 protected:
 #endif // wxUSE_BUTTON
 
 protected:


@@ -67,7 +75,9 @@ protected:
 #if defined(__WXUNIVERSAL__) && !defined(__WXMICROWIN__)
     #include "wx/univ/dialog.h"
 #else
 #if defined(__WXUNIVERSAL__) && !defined(__WXMICROWIN__)
     #include "wx/univ/dialog.h"
 #else

-    #if defined(__WXMSW__)
+    #if defined(__WXPALMOS__)
+        #include "wx/palmos/dialog.h"
+    #elif defined(__WXMSW__)

         #include "wx/msw/dialog.h"
     #elif defined(__WXMOTIF__)
         #include "wx/motif/dialog.h"
         #include "wx/msw/dialog.h"
     #elif defined(__WXMOTIF__)
         #include "wx/motif/dialog.h"