Fixes to wxMotif scrolling and colours (wxTreeCtrl/wxListCtrl now seem to work

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 102264dc2d83f61f007a9e36c8e864f4d5573456..e68ab2cc01ddf0011013e04a10d68c03befe70b6 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -122,12 +122,14 @@
     #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__)
+#if ( defined(_MSC_VER) && (_MSC_VER <= 800) ) || defined(__GNUWIN32__) || (defined(__BORLANDC__) && defined(__WIN16__))
     #define byte unsigned char
 #endif
 
@@ -309,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&);
@@ -938,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