wxDropSource now has 3 custom cursors for copy/move/nothing

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 96699360413cedcdd52b24d7e4cd02dbb1e802fc..bf12c02ae0e58abbedc736836dd0f1e8f87961a9 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -16,6 +16,12 @@
     #pragma interface "defs.h"
 #endif
 
+
+// needed to handle strings with xgettext:
+#ifndef gettext_noop
+#  define gettext_noop(x) x
+#endif
+
 // ----------------------------------------------------------------------------
 // compiler and OS identification
 // ----------------------------------------------------------------------------
@@ -132,8 +138,10 @@
 // we are setting this define because of the complex check
 // using NORLANDER as Cygwin may follow. (header author is Anders Norlander)
 #if defined(__MINGW32__) && ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95)))
+#ifndef wxUSE_NORLANDER_HEADERS
 #   define wxUSE_NORLANDER_HEADERS 1
 #endif
+#endif
 
 
 //////////////////////////////////////////////////////////////////////////////////
@@ -274,7 +282,9 @@
         // Cygwin supports bool
         #define HAVE_BOOL
     #elif defined(__VISAGECPP__)
-        typedef unsigned long bool;
+        #if __IBMCPP__ < 400
+            typedef unsigned long bool;
+        #endif
         #define HAVE_BOOL
     #endif // compilers
 #endif // HAVE_BOOL
@@ -1014,6 +1024,11 @@ enum wxStretch
  */
 #define wxST_SIZEGRIP         0x0010
 
+/*
+ * wxStaticText flags
+ */
+#define wxST_NO_AUTORESIZE    0x0001
+
 /*
  * wxStaticLine flags
  */
@@ -1503,6 +1518,16 @@ typedef enum {
     wxPRINT_MODE_PRINTER = 3    // Send to printer
 } wxPrintMode;
 
+// ---------------------------------------------------------------------------
+// Macro to specify "All Files" on different platforms
+// ---------------------------------------------------------------------------
+#if defined(__WXMSW__)
+#   define wxALL_FILES_PATTERN   "*.*"
+#   define wxALL_FILES           gettext_noop("All files (*.*)|*.*")
+#else
+#   define wxALL_FILES_PATTERN   "*"
+#   define wxALL_FILES           gettext_noop("All files (*)|*")
+#endif
 // ---------------------------------------------------------------------------
 // macros that enable wxWindows apps to be compiled in absence of the
 // sytem headers, although some platform specific types are used in the