X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/88ac883a0d005437c97a60d8195bd5e4719b1154..02fe546f1fe77a53b6de70a663113a9e22c1ccf4:/src/generic/treectrl.cpp diff --git a/src/generic/treectrl.cpp b/src/generic/treectrl.cpp index 79a7c6e1cc..b3bdc84ab7 100644 --- a/src/generic/treectrl.cpp +++ b/src/generic/treectrl.cpp @@ -926,7 +926,7 @@ bool wxTreeCtrl::TagNextChildren(wxGenericTreeItem *crt_item, wxGenericTreeItem size_t count = children.Count(); for (size_t n=(size_t)(index+1); nSetHilight(select); RefreshLine(crt_item); - if (crt_item==last_item) return true; + if (crt_item==last_item) return TRUE; if (crt_item->HasChildren()) { wxArrayTreeItems& children = crt_item->GetChildren(); size_t count = children.Count(); for ( size_t n = 0; n < count; ++n ) - if (TagAllChildrenUntilLast(children[n], last_item, select)) return true; + if (TagAllChildrenUntilLast(children[n], last_item, select)) return TRUE; } - return false; + return FALSE; } void wxTreeCtrl::SelectItemRange(wxGenericTreeItem *item1, wxGenericTreeItem *item2) @@ -970,7 +970,9 @@ void wxTreeCtrl::SelectItemRange(wxGenericTreeItem *item1, wxGenericTreeItem *it if (TagAllChildrenUntilLast(first,last,select)) return; +/* cout << first->GetText() << " " << last->GetText() << " " << (int) select << endl; +*/ TagNextChildren(first,last,select); } @@ -986,8 +988,8 @@ void wxTreeCtrl::SelectItem(const wxTreeItemId& itemId, // to keep going anyhow !!! if (is_single) { - unselect_others=true; - extended_select=false; + unselect_others=TRUE; + extended_select=FALSE; } wxGenericTreeItem *item = itemId.m_pItem; @@ -998,14 +1000,18 @@ void wxTreeCtrl::SelectItem(const wxTreeItemId& itemId, event.SetEventObject( this ); // Here we don't send any selection mode yet ! TO SEE +/* if (m_current) cout << m_current->GetText() << " " << (int)m_current->HasHilight() << endl; +*/ if ( GetEventHandler()->ProcessEvent( event ) && event.WasVetoed() ) return; +/* if (m_current) - cout << m_current->GetText() << " " << (int)m_current->HasHilight() << endl; + cout << m_current->GetText() << " " << (int)m_current->HasHilight() << endl; +*/ // ctrl press if (unselect_others) @@ -1023,7 +1029,7 @@ void wxTreeCtrl::SelectItem(const wxTreeItemId& itemId, } else { - bool select=true; // the default + bool select=TRUE; // the default // Check if we need to toggle hilight (ctrl mode) if (!unselect_others)