Changed system colours for better default display of wxGrid. Please revert

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

diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp
index 866108c7c0cf3346b68809b039175b507c8f12a4..bb398e715e9d2ad10dea520aa223f40a81d0cc26 100644 (file)
--- a/src/msw/treectrl.cpp
+++ b/src/msw/treectrl.cpp
@@ -243,11 +243,12 @@ private:
 
 static HTREEITEM GetItemFromPoint(HWND hwndTV, int x, int y)
 {
 
 static HTREEITEM GetItemFromPoint(HWND hwndTV, int x, int y)
 {

-    TVHITTESTINFO tvht;
+    TV_HITTESTINFO tvht;

     tvht.pt.x = x;
     tvht.pt.y = y;
 
     tvht.pt.x = x;
     tvht.pt.y = y;
 

-    return TreeView_HitTest(hwndTV, &tvht);
+    // TreeView_HitTest() doesn't do the right cast in mingw32 headers
+    return (HTREEITEM)TreeView_HitTest(hwndTV, &tvht);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -344,6 +345,11 @@ bool wxTreeCtrl::Create(wxWindow *parent,
     !defined( __BORLANDC__ ) && \
     !defined( __WATCOMC__ ) && \
     (!defined(__VISUALC__) || (__VISUALC__ > 1010))
     !defined( __BORLANDC__ ) && \
     !defined( __WATCOMC__ ) && \
     (!defined(__VISUALC__) || (__VISUALC__ > 1010))

+
+#ifndef TVS_CHECKBOXES
+#define TVS_CHECKBOXES 0x0100
+#endif
+

     // we emulate the multiple selection tree controls by using checkboxes: set
     // up the image list we need for this if we do have multiple selections
     if ( m_windowStyle & wxTR_MULTIPLE )
     // we emulate the multiple selection tree controls by using checkboxes: set
     // up the image list we need for this if we do have multiple selections
     if ( m_windowStyle & wxTR_MULTIPLE )