Committed Jaako's renderer patch

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index e1d94d62aa393d2eaa4c6aee0dcdc77a29aa07f7..8bfbee8cc236d3a30953494c77971ba625ce5280 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -79,12 +79,18 @@
 #       pragma warning(disable:4702)    /* unreachable code */
 #   endif
 
 #       pragma warning(disable:4702)    /* unreachable code */
 #   endif
 

-/* Deprecated functions such as sprintf, localtime */
-#if __VISUALC__ >= 1400
-#define _CRT_SECURE_NO_DEPRECATE 1
-#define _CRT_NON_CONFORMING_SWPRINTFS 1
-#endif
-
+    /*
+       VC++ 8 gives a warning when using standard functions such as sprintf,
+       localtime, ... -- stop this madness, unless the user had already done it
+     */
+    #if __VISUALC__ >= 1400
+        #ifndef _CRT_SECURE_NO_DEPRECATE
+            #define _CRT_SECURE_NO_DEPRECATE 1
+        #endif
+        #ifndef _CRT_NON_CONFORMING_SWPRINTFS
+            #define _CRT_NON_CONFORMING_SWPRINTFS 1
+        #endif
+    #endif /* VC++ 8 */

 #endif /*  __VISUALC__ */
 
 /*  suppress some Salford C++ warnings */
 #endif /*  __VISUALC__ */
 
 /*  suppress some Salford C++ warnings */


@@ -695,6 +701,24 @@ enum
     wxDOS                     /*  wxBase under MS-DOS */
 };
 
     wxDOS                     /*  wxBase under MS-DOS */
 };
 

+/* Friendlier platform names */
+enum
+{
+    wxMotif = wxMOTIF_X,
+    wxMac = wxMAC,
+    wxMSW = wxWINDOWS,
+    wxWinCE = wxWINDOWS_CE,
+    wxWinPocketPC = wxWINDOWS_POCKETPC,
+    wxWinSmartPhone = wxWINDOWS_SMARTPHONE,
+    wxWin95= wxWIN95,
+    wxUnix = wxUNIX,                   /*  wxBase under Unix */
+    wxPalmOS = wxPALMOS,               /*  PalmOS */
+    wxOS2 = wxOS2_PM,
+
+    wxMGL = 100,
+    wxCocoa
+};
+

 /*  ---------------------------------------------------------------------------- */
 /*  standard wxWidgets types */
 /*  ---------------------------------------------------------------------------- */
 /*  ---------------------------------------------------------------------------- */
 /*  standard wxWidgets types */
 /*  ---------------------------------------------------------------------------- */


@@ -1034,7 +1058,7 @@ inline void *wxUIntToPtr(wxUIntPtr p)
 
     #define wxHAS_INT64 1
 
 
     #define wxHAS_INT64 1
 

-#else // !wxUSE_LONGLONG
+#else /* !wxUSE_LONGLONG */

 
     #define wxHAS_INT64 0
 
 
     #define wxHAS_INT64 0
 


@@ -1526,9 +1550,11 @@ enum wxBorder
 /*  always show an entire number of rows */
 #define wxLB_INT_HEIGHT     0x0800
 
 /*  always show an entire number of rows */
 #define wxLB_INT_HEIGHT     0x0800
 

-/*  deprecated synonyms */
-#define wxPROCESS_ENTER     0x0400  /*  wxTE_PROCESS_ENTER */
-#define wxPASSWORD          0x0800  /*  wxTE_PASSWORD */
+#if WXWIN_COMPATIBILITY_2_6
+    /*  deprecated synonyms */
+    #define wxPROCESS_ENTER   0x0400  /*  wxTE_PROCESS_ENTER */
+    #define wxPASSWORD        0x0800  /*  wxTE_PASSWORD */
+#endif

 
 /*
  * wxComboBox style flags
 
 /*
  * wxComboBox style flags


@@ -1654,6 +1680,8 @@ enum wxBorder
  * wxStaticText flags
  */
 #define wxST_NO_AUTORESIZE    0x0001
  * wxStaticText flags
  */
 #define wxST_NO_AUTORESIZE    0x0001

+#define wxST_DOTS_MIDDLE      0x0002
+#define wxST_DOTS_END         0x0004

 
 /*
  * wxStaticBitmap flags
 
 /*
  * wxStaticBitmap flags


@@ -2877,6 +2905,7 @@ typedef GtkWidget *WXWidget;
 #ifdef __WXGTK20__
 #define G_DISABLE_DEPRECATED
 #define PANGO_DISABLE_DEPRECATED
 #ifdef __WXGTK20__
 #define G_DISABLE_DEPRECATED
 #define PANGO_DISABLE_DEPRECATED

+#define GDK_PIXBUF_DISABLE_DEPRECATED

 #ifndef __VMS
 /* GtkCombo is not defined on VMS if this is defined */
 # define GTK_DISABLE_DEPRECATED
 #ifndef __VMS
 /* GtkCombo is not defined on VMS if this is defined */
 # define GTK_DISABLE_DEPRECATED