regrouped the fix by VZ so that __MWERKS__ comes first, since CW also defines _MSC_VE...

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

diff --git a/include/wx/msw/treectrl.h b/include/wx/msw/treectrl.h
index 27ab5a75629cf6e6edad0afd6b6799552817b6ee..716be9607336d69b5953e01db9180fac90b81a34 100644 (file)
--- a/include/wx/msw/treectrl.h
+++ b/include/wx/msw/treectrl.h
@@ -22,6 +22,11 @@
 #include "wx/control.h"
 #include "wx/event.h"
 
+#ifdef __MINGW32__
+#undef GetFirstChild()
+#undef GetNextSibling()
+#endif
+
 // the type for "untyped" data
 typedef long wxDataType;
 
@@ -388,7 +393,7 @@ public:
         // get the bounding rectangle of the item (or of its label only)
         // @@@ do we really need to expose this functions to the application?
     void GetBoundingRect(const wxTreeItemId& item,
-                         wxRectangle& rect,
+                         wxRect& rect,
                          bool textOnly = FALSE) const;
 
     // deprecated