renamed Render's argument to not obfuscate its meaning

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

diff --git a/include/wx/dialog.h b/include/wx/dialog.h
index fe3959626e577ab21aff48503f36799aed60f98a..ce21810e370393684bedc03592165d416d04cbed 100644 (file)
--- a/include/wx/dialog.h
+++ b/include/wx/dialog.h
@@ -12,7 +12,7 @@
 #ifndef _WX_DIALOG_H_BASE_
 #define _WX_DIALOG_H_BASE_
 
 #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
 
     #pragma interface "dialogbase.h"
 #endif
 


@@ -20,6 +20,18 @@
 #include "wx/containr.h"
 #include "wx/toplevel.h"
 
 #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
 WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr;
 
 class WXDLLEXPORT wxDialogBase : public wxTopLevelWindow


@@ -59,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"