Compilaton fixes.

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

diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp
index 342d8188d7eb9aa209a1b28af428ca06b3edb884..f64ea0651cd290856d61564686018d0dde566902 100644 (file)
--- a/src/msw/treectrl.cpp
+++ b/src/msw/treectrl.cpp
@@ -75,8 +75,14 @@
     #define TVM_SETTEXTCOLOR        (TV_FIRST + 30)
 #endif
 
     #define TVM_SETTEXTCOLOR        (TV_FIRST + 30)
 #endif
 

-// a macro to hide the cast ugliness
-#define HITEM(item)     (HTREEITEM)((item).m_pItem)
+// macros to hide the cast ugliness
+// --------------------------------
+
+// ptr is the real item id, i.e. wxTreeItemId::m_pItem
+#define HITEM_PTR(ptr)     (HTREEITEM)(ptr)
+
+// item here is a wxTreeItemId
+#define HITEM(item)     HITEM_PTR((item).m_pItem)

 
 // the native control doesn't support multiple selections under MSW and we
 // have 2 ways to emulate them: either using TVS_CHECKBOXES style and let
 
 // the native control doesn't support multiple selections under MSW and we
 // have 2 ways to emulate them: either using TVS_CHECKBOXES style and let


@@ -569,7 +575,6 @@ void wxTreeCtrl::Init()
     m_textCtrl = NULL;
     m_hasAnyAttr = false;
     m_dragImage = NULL;
     m_textCtrl = NULL;
     m_hasAnyAttr = false;
     m_dragImage = NULL;

-    m_htSelStart = 0;

     m_pVirtualRoot = NULL;
 
     // initialize the global array of events now as it can't be done statically
     m_pVirtualRoot = NULL;
 
     // initialize the global array of events now as it can't be done statically


@@ -1010,7 +1015,8 @@ void wxTreeCtrl::SetItemImage(const wxTreeItemId& item, int image,
         case wxTreeItemIcon_Normal:
             {
                 const int imageNormalOld = GetItemImage(item);
         case wxTreeItemIcon_Normal:
             {
                 const int imageNormalOld = GetItemImage(item);

-                const int imageSelOld = GetItemSelectedImage(item);
+                const int imageSelOld =
+                    GetItemImage(item, wxTreeItemIcon_Selected);

 
                 // always set the normal image
                 imageNormal = image;
 
                 // always set the normal image
                 imageNormal = image;


@@ -1035,7 +1041,7 @@ void wxTreeCtrl::SetItemImage(const wxTreeItemId& item, int image,
                 // the wxTreeItemIndirectData GetItemXXXImage() will use it to
                 // get the images
                 imageNormal = GetItemImage(item);
                 // the wxTreeItemIndirectData GetItemXXXImage() will use it to
                 // get the images
                 imageNormal = GetItemImage(item);

-                imageSel = GetItemSelectedImage(item);
+                imageSel = GetItemImage(item, wxTreeItemIcon_Selected);

 
                 // if it doesn't have it yet, add it
                 wxTreeItemIndirectData *data = new
 
                 // if it doesn't have it yet, add it
                 wxTreeItemIndirectData *data = new


@@ -1189,21 +1195,21 @@ void wxTreeCtrl::RefreshItem(const wxTreeItemId& item)
 
 wxColour wxTreeCtrl::GetItemTextColour(const wxTreeItemId& item) const
 {
 
 wxColour wxTreeCtrl::GetItemTextColour(const wxTreeItemId& item) const
 {

-    wxMapTreeAttr::const_iterator it = m_attrs.find(item);
+    wxMapTreeAttr::const_iterator it = m_attrs.find(item.m_pItem);

 
     return it == m_attrs.end() ? wxNullColour : it->second->GetTextColour();
 }
 
 wxColour wxTreeCtrl::GetItemBackgroundColour(const wxTreeItemId& item) const
 {
 
     return it == m_attrs.end() ? wxNullColour : it->second->GetTextColour();
 }
 
 wxColour wxTreeCtrl::GetItemBackgroundColour(const wxTreeItemId& item) const
 {

-    wxMapTreeAttr::const_iterator it = m_attrs.find(item);
+    wxMapTreeAttr::const_iterator it = m_attrs.find(item.m_pItem);

 
     return it == m_attrs.end() ? wxNullColour : it->second->GetBackgroundColour();
 }
 
 wxFont wxTreeCtrl::GetItemFont(const wxTreeItemId& item) const
 {
 
     return it == m_attrs.end() ? wxNullColour : it->second->GetBackgroundColour();
 }
 
 wxFont wxTreeCtrl::GetItemFont(const wxTreeItemId& item) const
 {

-    wxMapTreeAttr::const_iterator it = m_attrs.find(item);
+    wxMapTreeAttr::const_iterator it = m_attrs.find(item.m_pItem);

 
     return it == m_attrs.end() ? wxNullFont : it->second->GetFont();
 }
 
     return it == m_attrs.end() ? wxNullFont : it->second->GetFont();
 }


@@ -1212,12 +1218,12 @@ void wxTreeCtrl::SetItemTextColour(const wxTreeItemId& item,
                                    const wxColour& col)
 {
     wxTreeItemAttr *attr;
                                    const wxColour& col)
 {
     wxTreeItemAttr *attr;

-    wxMapTreeAttr::iterator it = m_attrs.find(item);
+    wxMapTreeAttr::iterator it = m_attrs.find(item.m_pItem);

     if ( it == m_attrs.end() )
     {
         m_hasAnyAttr = true;
 
     if ( it == m_attrs.end() )
     {
         m_hasAnyAttr = true;
 

-        m_attrs[item] =
+        m_attrs[item.m_pItem] =

         attr = new wxTreeItemAttr;
     }
     else
         attr = new wxTreeItemAttr;
     }
     else


@@ -1234,12 +1240,12 @@ void wxTreeCtrl::SetItemBackgroundColour(const wxTreeItemId& item,
                                          const wxColour& col)
 {
     wxTreeItemAttr *attr;
                                          const wxColour& col)
 {
     wxTreeItemAttr *attr;

-    wxMapTreeAttr::iterator it = m_attrs.find(item);
+    wxMapTreeAttr::iterator it = m_attrs.find(item.m_pItem);

     if ( it == m_attrs.end() )
     {
         m_hasAnyAttr = true;
 
     if ( it == m_attrs.end() )
     {
         m_hasAnyAttr = true;
 

-        m_attrs[item] =
+        m_attrs[item.m_pItem] =

         attr = new wxTreeItemAttr;
     }
     else // already in the hash
         attr = new wxTreeItemAttr;
     }
     else // already in the hash


@@ -1255,12 +1261,12 @@ void wxTreeCtrl::SetItemBackgroundColour(const wxTreeItemId& item,
 void wxTreeCtrl::SetItemFont(const wxTreeItemId& item, const wxFont& font)
 {
     wxTreeItemAttr *attr;
 void wxTreeCtrl::SetItemFont(const wxTreeItemId& item, const wxFont& font)
 {
     wxTreeItemAttr *attr;

-    wxMapTreeAttr::iterator it = m_attrs.find(item);
+    wxMapTreeAttr::iterator it = m_attrs.find(item.m_pItem);

     if ( it == m_attrs.end() )
     {
         m_hasAnyAttr = true;
 
     if ( it == m_attrs.end() )
     {
         m_hasAnyAttr = true;
 

-        m_attrs[item] =
+        m_attrs[item.m_pItem] =

         attr = new wxTreeItemAttr;
     }
     else // already in the hash
         attr = new wxTreeItemAttr;
     }
     else // already in the hash


@@ -1346,7 +1352,7 @@ wxTreeItemId wxTreeCtrl::GetRootItem() const
 
 wxTreeItemId wxTreeCtrl::GetSelection() const
 {
 
 wxTreeItemId wxTreeCtrl::GetSelection() const
 {

-    wxCHECK_MSG( !(m_windowStyle & wxTR_MULTIPLE), NULL,
+    wxCHECK_MSG( !(m_windowStyle & wxTR_MULTIPLE), wxTreeItemId(),

                  wxT("this only works with single selection controls") );
 
     return wxTreeItemId(TreeView_GetSelection(GetHwnd()));
                  wxT("this only works with single selection controls") );
 
     return wxTreeItemId(TreeView_GetSelection(GetHwnd()));


@@ -1602,7 +1608,7 @@ wxTreeItemId wxTreeCtrl::AddRoot(const wxString& text,
         return TVI_ROOT;
     }
 
         return TVI_ROOT;
     }
 

-    return DoInsertItem(wxTreeItemId(), 0,
+    return DoInsertItem(wxTreeItemId(), wxTreeItemId(),

                         text, image, selectedImage, data);
 }
 
                         text, image, selectedImage, data);
 }
 


@@ -1682,7 +1688,7 @@ void wxTreeCtrl::DeleteChildren(const wxTreeItemId& item)
     size_t nCount = children.Count();
     for ( size_t n = 0; n < nCount; n++ )
     {
     size_t nCount = children.Count();
     for ( size_t n = 0; n < nCount; n++ )
     {

-        if ( !TreeView_DeleteItem(GetHwnd(), HITEM(children[n])) )
+        if ( !TreeView_DeleteItem(GetHwnd(), HITEM_PTR(children[n])) )

         {
             wxLogLastError(wxT("TreeView_DeleteItem"));
         }
         {
             wxLogLastError(wxT("TreeView_DeleteItem"));
         }


@@ -1767,10 +1773,12 @@ void wxTreeCtrl::Toggle(const wxTreeItemId& item)
     DoExpand(item, TVE_TOGGLE);
 }
 
     DoExpand(item, TVE_TOGGLE);
 }
 

+#if WXWIN_COMPATIBILITY_2_4

 void wxTreeCtrl::ExpandItem(const wxTreeItemId& item, int action)
 {
     DoExpand(item, action);
 }
 void wxTreeCtrl::ExpandItem(const wxTreeItemId& item, int action)
 {
     DoExpand(item, action);
 }

+#endif

 
 void wxTreeCtrl::Unselect()
 {
 
 void wxTreeCtrl::Unselect()
 {


@@ -1790,9 +1798,9 @@ void wxTreeCtrl::UnselectAll()
         for ( size_t n = 0; n < count; n++ )
         {
 #if wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE
         for ( size_t n = 0; n < count; n++ )
         {
 #if wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE

-            SetItemCheck(selections[n], false);
+            SetItemCheck(HITEM_PTR(selections[n]), false);

 #else // !wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE
 #else // !wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE

-            ::UnselectItem(GetHwnd(), HITEM(selections[n]));
+            ::UnselectItem(GetHwnd(), HITEM_PTR(selections[n]));

 #endif // wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE/!wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE
         }
     }
 #endif // wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE/!wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE
         }
     }


@@ -2106,7 +2114,7 @@ long wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
                         ::SetFocus(GetHwnd(), htItem);
 
                         // reset on any click without Shift
                         ::SetFocus(GetHwnd(), htItem);
 
                         // reset on any click without Shift

-                        m_htSelStart = 0;
+                        m_htSelStart.Unset();

 
                         processed = true;
                     }
 
                         processed = true;
                     }


@@ -2137,7 +2145,7 @@ long wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
                         size_t count = GetSelections(selections);
                         if ( count == 0 ||
                              count > 1 ||
                         size_t count = GetSelections(selections);
                         if ( count == 0 ||
                              count > 1 ||

-                             HITEM(selections[0]) != htItem )
+                             HITEM_PTR(selections[0]) != htItem )

                         {
                             // clear the previously selected items, if the
                             // user clicked outside of the present selection.
                         {
                             // clear the previously selected items, if the
                             // user clicked outside of the present selection.


@@ -2163,7 +2171,7 @@ long wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
                         }
 
                         // reset on any click without Shift
                         }
 
                         // reset on any click without Shift

-                        m_htSelStart = 0;
+                        m_htSelStart.Unset();

                     }
                 }
                 break;
                     }
                 }
                 break;


@@ -2239,7 +2247,7 @@ long wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
         {
             // TreeView_GetItemRect() will return false if item is not visible,
             // which may happen perfectly well
         {
             // TreeView_GetItemRect() will return false if item is not visible,
             // which may happen perfectly well

-            if ( TreeView_GetItemRect(GetHwnd(), HITEM(selections[n]),
+            if ( TreeView_GetItemRect(GetHwnd(), HITEM_PTR(selections[n]),

                                       &rect, true) )
             {
                 ::InvalidateRect(GetHwnd(), &rect, false);
                                       &rect, true) )
             {
                 ::InvalidateRect(GetHwnd(), &rect, false);