GTK 1.0 compilation (not tested)

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index eeca285224cfe1ab0a9309e55e86b13ebdd01be0..0a16399ebff69bc2d83e0efaae193e493074f2ee 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -53,7 +53,7 @@
         #endif
     #endif // Sun
 
-    #ifdef __hpux
+    #if defined(__hpux) && !defined(__HPUX__)
         #define __HPUX__
     #endif // HP-UX
 
@@ -108,11 +108,14 @@
 //////////////////////////////////////////////////////////////////////////////////
 // Currently Only MS-Windows/NT, XView and Motif are supported
 //
-#if defined(__HPUX__) && !defined(__WXMOTIF__)
-# define __WXMOTIF__
+#if defined(__HPUX__) && !defined(__WXGTK__)
+    #ifndef __WXMOTIF__  
+        #define __WXMOTIF__
+    #endif // __WXMOTIF__
 #endif
+
 #if defined(__WXMOTIF__)
-# define __X__
+    #define __X__
 #endif
 
 #ifdef __WXMSW__
@@ -202,6 +205,12 @@
 
 typedef unsigned char wxByte;
 typedef short int WXTYPE;
+
+// special care should be taken with this type under Windows where the real
+// window id is unsigned, so we must always do the cast before comparing them
+// (or else they would be always different!). Usign wxGetWindowId() which does
+// the cast itself is recommended. Note that this type can't be unsigned
+// because -1 is a valid (and largely used) value for window id.
 typedef int wxWindowID;
 
 // Macro to cut down on compiler warnings.
@@ -883,6 +892,7 @@ enum wxKeyCode
   WXK_NUMPAD_DOWN,
   WXK_NUMPAD_PRIOR,
   WXK_NUMPAD_PAGEUP,
+  WXK_NUMPAD_NEXT,
   WXK_NUMPAD_PAGEDOWN,
   WXK_NUMPAD_END,
   WXK_NUMPAD_BEGIN,