1. serious bug in wxRegConfig corrected - deleting a value would delete the

[wxWidgets.git] / include / wx / msw / treectrl.h

diff --git a/include/wx/msw/treectrl.h b/include/wx/msw/treectrl.h
index 97baa3f6a4d77d8013a79b5e3b4b06f8395cc90e..b9b401cdbc52c3608afaf96061d6a1c61a11e61e 100644 (file)
--- a/include/wx/msw/treectrl.h
+++ b/include/wx/msw/treectrl.h
@@ -15,6 +15,7 @@
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
+
 #ifdef __GNUG__
     #pragma interface "treectrl.h"
 #endif
@@ -23,6 +24,12 @@
 #include "wx/event.h"
 #include "wx/textctrl.h"
 
+#ifdef __GNUWIN32__
+    // Cygwin windows.h defines these identifiers
+    #undef GetFirstChild
+    #undef GetNextSibling
+#endif // Cygwin
+
 // the type for "untyped" data
 typedef long wxDataType;