* Fixes.

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 6271188f533447a91df56576957f58d87e98666a..f3eb99881ed7b5bef169db8c047c54e1f64a496b 100644 (file)
--- 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
 
@@ -289,8 +290,8 @@ 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 && WXDEBUG
-#undef WXDEBUG
+#if !wxUSE_IOSTREAMH && defined(__WXDEBUG__)
+#undef __WXDEBUG__
 #endif
 
 // Callback function type definition
@@ -896,6 +897,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;