support for using DIBs for wxBitmap implementation (patch 649866)

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 5482b488488ef237c338d436ac430631e8284857..889f1d6482668e4e747dce49ba717149a48f5e2f 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -95,7 +95,7 @@
 // compiler defects workarounds
 // ----------------------------------------------------------------------------
 
 // compiler defects workarounds
 // ----------------------------------------------------------------------------
 

-#if defined(__VISUALC__) && !defined(WIN32)
+#if defined(__VISUALC__) && !defined(WIN32) && !defined(__WXWINCE__)

     // VC1.5 does not have LPTSTR type
 #define LPTSTR  LPSTR
 #define LPCTSTR LPCSTR
     // VC1.5 does not have LPTSTR type
 #define LPTSTR  LPSTR
 #define LPCTSTR LPCSTR


@@ -231,7 +231,7 @@ typedef int wxWindowID;
 
 // check for explicit keyword support
 #ifndef HAVE_EXPLICIT
 
 // check for explicit keyword support
 #ifndef HAVE_EXPLICIT

-    #if defined(__VISUALC__) && (__VISUALC__ > 1200)
+    #if defined(__VISUALC__) && (__VISUALC__ >= 1200)

         // VC++ 6.0 has explicit (what about the earlier versions?)
         #define HAVE_EXPLICIT
     #elif defined(__BORLANDC__) && (__BORLANDC__ >= 0x0520)
         // VC++ 6.0 has explicit (what about the earlier versions?)
         #define HAVE_EXPLICIT
     #elif defined(__BORLANDC__) && (__BORLANDC__ >= 0x0520)


@@ -391,6 +391,15 @@ class WXDLLEXPORT wxEvent;
 #  endif /* ATTRIBUTE_PRINTF */
 #endif
 
 #  endif /* ATTRIBUTE_PRINTF */
 #endif
 

+// Macro to issue warning when using deprecated functions with gcc or MSVC7:
+#if defined(__GNUC__)
+    #define wxDEPRECATED(x) x __attribute__ ((deprecated))
+#elif defined(__VISUALC__) && (__VISUALC__ >= 1300)
+    #define wxDEPRECATED(x) __declspec(deprecated) x
+#else
+    #define wxDEPRECATED(x) x
+#endif
+

 // everybody gets the assert and other debug macros
 #ifdef __cplusplus
 #include "wx/debug.h"
 // everybody gets the assert and other debug macros
 #ifdef __cplusplus
 #include "wx/debug.h"


@@ -1800,10 +1809,10 @@ enum wxPrintMode
 // macro to specify "All Files" on different platforms
 #if defined(__WXMSW__) || defined(__WXPM__)
 #   define wxALL_FILES_PATTERN   wxT("*.*")
 // macro to specify "All Files" on different platforms
 #if defined(__WXMSW__) || defined(__WXPM__)
 #   define wxALL_FILES_PATTERN   wxT("*.*")

-#   define wxALL_FILES           gettext_noop(wxT("All files (*.*)|*.*"))
+#   define wxALL_FILES           gettext_noop("All files (*.*)|*.*")

 #else
 #   define wxALL_FILES_PATTERN   wxT("*")
 #else
 #   define wxALL_FILES_PATTERN   wxT("*")

-#   define wxALL_FILES           gettext_noop(wxT("All files (*)|*"))
+#   define wxALL_FILES           gettext_noop("All files (*)|*")

 #endif
 
 // ---------------------------------------------------------------------------
 #endif
 
 // ---------------------------------------------------------------------------