X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/16ee7f42e1b6964e5b7dd8d2152ea31a3748b370..88150e6073673c304d285906e0d718374a5abe93:/include/wx/defs.h?ds=sidebyside

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 6d684c34d0..e68ab2cc01 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -41,9 +41,18 @@
 #endif
 #endif
 
-// Eliminate double/float warnings
+#if defined(sun) || defined(__SUN__)
+# if !defined(__GNUG__)
+#  ifndef __SUNCC__
+#   define __SUNCC__
+#  endif
+# endif
+#endif
+
+// suppress some Visual C++ warnings
 #ifdef _MSC_VER
-# pragma warning(disable:4244)
+#   pragma warning(disable:4244)    // cobversion from double to float
+#   pragma warning(disable:4100)    // unreferenced formal parameter
 #endif
 
 //////////////////////////////////////////////////////////////////////////////////
@@ -103,16 +112,25 @@
 // VC++ 4.0 is 1000.
 
 // Add more tests here for compilers that don't already define bool.
-#if ( defined(_MSC_VER) && (_MSC_VER <= 1000) ) || (defined(__BORLANDC__) && (__BORLANDC__ < 0x500))
-typedef unsigned int bool;
-#endif
-
-#if defined(_MSC_VER) && (_MSC_VER == 1020)
-#define bool unsigned int
+#if defined( __MWERKS__ )
+    #if (__MWERKS__ < 0x1000) || !__option(bool)
+        typedef unsigned int bool;
+    #endif
+#elif defined(_MSC_VER) && (_MSC_VER <= 1000)
+    typedef unsigned int bool;
+#elif defined(_MSC_VER) && (_MSC_VER == 1020)
+    #define bool unsigned int
+#elif defined(__BORLANDC__) && (__BORLANDC__ < 0x500)
+    typedef unsigned int bool;
+#elif defined(__WATCOMC__)
+    typedef unsigned int bool;
+#elif defined(__SUNCC__)
+    // If we use int, we get identically overloaded functions in config.cpp
+    typedef unsigned char bool;
 #endif
 
-#if ( defined(_MSC_VER) && (_MSC_VER <= 800) ) || defined(__GNUWIN32__)
-#define byte unsigned char
+#if ( defined(_MSC_VER) && (_MSC_VER <= 800) ) || defined(__GNUWIN32__) || (defined(__BORLANDC__) && defined(__WIN16__))
+    #define byte unsigned char
 #endif
 
 typedef short int WXTYPE;
@@ -293,8 +311,10 @@ WXDLLEXPORT_DATA(extern const bool) wxFalse;
 // where should i put this? we need to make sure of this as it breaks
 // the <iostream> code.
 #if !wxUSE_IOSTREAMH && defined(__WXDEBUG__)
+#ifndef __MWERKS__
 #undef __WXDEBUG__
 #endif
+#endif
 
 // Callback function type definition
 typedef void (*wxFunction) (wxObject&, wxEvent&);
@@ -447,6 +467,15 @@ typedef void (*wxFunction) (wxObject&, wxEvent&);
 /*
  * wxRadioBox/wxRadioButton style flags
  */
+
+// New, more intuitive names to specify majorDim argument
+
+// Same as wxRA_HORIZONTAL
+#define wxRA_SPECIFY_COLS   0x0001
+// Same as wxRA_VERTICAL
+#define wxRA_SPECIFY_ROWS   0x0002
+
+// Old names for compatibility
 #define wxRA_HORIZONTAL     wxHORIZONTAL
 #define wxRA_VERTICAL       wxVERTICAL
 #define wxRB_GROUP          0x0004
@@ -537,13 +566,20 @@ typedef void (*wxFunction) (wxObject&, wxEvent&);
 #define wxSP_WRAP           0x0020
 
 /*
- * wxSplitterWnd flags
+ * wxSplitterWindow flags
  */
 
 #define wxSP_NOBORDER       0x0000
 #define wxSP_3D             0x0004
 #define wxSP_BORDER         0x0008
 
+/*
+ * wxFrame extra flags
+ */
+
+// No title on taskbar
+#define wxFRAME_TOOL_WINDOW 0x0004
+
 /*
  * wxTabCtrl flags
  */
@@ -705,7 +741,8 @@ enum wxDataFormat
   wxDF_METAFILE =         3,  /* CF_METAFILEPICT */
   wxDF_DIB =              8,  /* CF_DIB */
   wxDF_OEMTEXT =          7,  /* CF_OEMTEXT */
-  wxDF_FILENAME =         15  /* CF_HDROP */
+  wxDF_FILENAME =         15, /* CF_HDROP */
+  wxDF_PRIVATE =          20
 };
 
 // Virtual keycodes
@@ -905,8 +942,10 @@ typedef void *          WXMEASUREITEMSTRUCT;
 typedef void *          WXLPCREATESTRUCT;
 #ifdef __GNUWIN32__
 typedef int (*WXFARPROC)();
-#else
+#elif defined(__WIN32__)
 typedef int (__stdcall *WXFARPROC)();
+#else
+typedef int (*WXFARPROC)();
 #endif
 
 #endif