X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8a60ae88fb4266f22558dd113480c3762a15cac3..2dc1bdac6a37437e66e742122fb68f9c763f7d9e:/include/wx/defs.h

diff --git a/include/wx/defs.h b/include/wx/defs.h
index f8b01d2c33..74aba1c334 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -21,6 +21,7 @@
 #include "glib.h"
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
+#include "wx/gtk/win_gtk.h"
 
 #endif
 
@@ -40,11 +41,19 @@
 #endif
 #endif
 
-// Eliminate double/float warnings
-#ifdef _MSC_VER
-# pragma warning(disable:4244)
+#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)    // cobversion from double to float
+#   pragma warning(disable:4100)    // unreferenced formal parameter
+#endif
 
 //////////////////////////////////////////////////////////////////////////////////
 // Currently Only MS-Windows/NT, XView and Motif are supported
@@ -56,6 +65,7 @@
 # define __X__
 #endif
 
+#ifdef __WXMSW__
 // wxWindows checks for WIN32, not __WIN32__
 #if ((defined(WIN32) || defined(__NT__)) && !defined(__WIN32__) && !defined(__WXSTUBS__))
 #define __WIN32__
@@ -69,6 +79,8 @@
 #define __WIN95__
 #endif
 
+#endif // wxMSW
+
 // Make sure the environment is set correctly
 #if defined(__WXMSW__) && defined(__X__)
 # error "Target can't be both X and Windows"
@@ -100,16 +112,23 @@
 // 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(__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
+    #define byte unsigned char
 #endif
 
 typedef short int WXTYPE;
@@ -149,7 +168,7 @@ typedef int wxWindowID;
 #  ifdef WXMAKINGDLL
 #    define WXDLLEXPORT __declspec( dllexport )
 #    define WXDLLEXPORT_DATA(type) __declspec( dllexport ) type
-#    define WXDLLEXPORT_CTORFN __declspec( dllexport )
+#    define WXDLLEXPORT_CTORFN // __declspec( dllexport )
 #  elif defined(WXUSINGDLL)
 #    define WXDLLEXPORT __declspec( dllimport )
 #    define WXDLLEXPORT_DATA(type) __declspec( dllimport ) type
@@ -287,6 +306,12 @@ WXDLLEXPORT_DATA(extern const bool) wxFalse;
 #define except(x) catch(...)
 #endif
 
+// where should i put this? we need to make sure of this as it breaks
+// the <iostream> code.
+#if !wxUSE_IOSTREAMH && defined(__WXDEBUG__)
+#undef __WXDEBUG__
+#endif
+
 // Callback function type definition
 typedef void (*wxFunction) (wxObject&, wxEvent&);
 
@@ -528,13 +553,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
  */
@@ -696,7 +728,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
@@ -836,6 +869,7 @@ enum {
 #define wxID_CLEAR              5033
 #define wxID_FIND               5034
 #define wxID_DUPLICATE          5035
+#define wxID_SELECTALL          5036
 
 #define wxID_FILE1              5050
 #define wxID_FILE2              5051
@@ -889,6 +923,7 @@ typedef void *          WXRGNDATA;
 typedef void *          WXMSG;
 typedef unsigned long   WXHCONV;
 typedef unsigned long   WXHKEY;
+typedef unsigned long   WXHTREEITEM;
 typedef void *          WXDRAWITEMSTRUCT;
 typedef void *          WXMEASUREITEMSTRUCT;
 typedef void *          WXLPCREATESTRUCT;