wxThread fixes - compilation under Unix temporarily broken, sorry.

[wxWidgets.git] / src / msw / treectrl.cpp

diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp
index 02f7e0ad92d82c48dc524d2366fab85073dbd1b3..07b86000b98f931efb22862e57083c3673950e25 100644 (file)
--- a/src/msw/treectrl.cpp
+++ b/src/msw/treectrl.cpp
@@ -28,7 +28,7 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-    #include "wx.h"
+    #include "wx/wx.h"

 #endif
 
 #if defined(__WIN95__)
 #endif
 
 #if defined(__WIN95__)


@@ -54,6 +54,10 @@
 #undef GetNextSibling
 #endif
 
 #undef GetNextSibling
 #endif
 

+#ifdef GetClassInfo
+#undef GetClassInfo
+#endif
+

 #include "wx/msw/treectrl.h"
 
 // Bug in headers, sometimes
 #include "wx/msw/treectrl.h"
 
 // Bug in headers, sometimes


@@ -813,7 +817,7 @@ void wxTreeCtrl::SortChildren(const wxTreeItemId& item)
     }
     else
     {
     }
     else
     {

-        TVSORTCB tvSort;
+        TV_SORTCB tvSort;

         tvSort.hParent = (HTREEITEM)(WXHTREEITEM)item;
         tvSort.lpfnCompare = (PFNTVCOMPARE)TreeView_CompareCallback;
         tvSort.lParam = (LPARAM)this;
         tvSort.hParent = (HTREEITEM)(WXHTREEITEM)item;
         tvSort.lpfnCompare = (PFNTVCOMPARE)TreeView_CompareCallback;
         tvSort.lParam = (LPARAM)this;