Fix for the fix for wxChoice selection.

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

diff --git a/include/wx/dialog.h b/include/wx/dialog.h
index 6f070cf127ce48eddd53892d20522a512d0e890a..ce21810e370393684bedc03592165d416d04cbed 100644 (file)
--- a/include/wx/dialog.h
+++ b/include/wx/dialog.h
@@ -22,7 +22,15 @@
 
 #define wxDIALOG_NO_PARENT      0x0001  // Don't make owned by apps top window
 
 
 #define wxDIALOG_NO_PARENT      0x0001  // Don't make owned by apps top window
 

-#define wxDEFAULT_DIALOG_STYLE  (wxSYSTEM_MENU | wxCAPTION | wxCLOSE_BOX)
+#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;
 
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr;
 


@@ -63,7 +71,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(__PALMOS__)
+        #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"