// ----------------------------------------------------------------------------
// a convenient wrapper around TV_ITEM struct which adds a ctor
+#ifdef __VISUALC__
#pragma warning( disable : 4097 )
+#endif
+
struct wxTreeViewItem : public TV_ITEM
{
wxTreeViewItem(const wxTreeItemId& item, // the item handle
hItem = (HTREEITEM) (WXHTREEITEM) item;
}
};
+
+#ifdef __VISUALC__
#pragma warning( default : 4097 )
+#endif
// a class which encapsulates the tree traversal logic: it vists all (unless
// OnVisit() returns FALSE) items under the given one
if ( m_windowStyle & wxTR_LINES_AT_ROOT )
wstyle |= TVS_LINESATROOT;
-#if !defined( __GNUWIN32__ ) && !defined( __BORLANDC__ ) && !defined(wxUSE_NORLANDER_HEADERS)
+#if !defined( __GNUWIN32__ ) && !defined( __BORLANDC__ ) && !defined( __WATCOMC__ ) && !defined(wxUSE_NORLANDER_HEADERS)
// 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 !defined(__VISUALC__) || (__VISUALC__ != 1010)
+#if !defined(__VISUALC__) || (__VISUALC__ > 1010)
if ( m_windowStyle & wxTR_MULTIPLE )
wstyle |= TVS_CHECKBOXES;
#endif
DFC_BUTTON,
DFCS_BUTTONCHECK | DFCS_CHECKED) )
{
- wxLogLastError(_T("DrawFrameControl(check)"));
+ wxLogLastError(wxT("DrawFrameControl(check)"));
}
bmp.SetHBITMAP((WXHBITMAP)hbmpCheck);
DFC_BUTTON,
DFCS_BUTTONCHECK) )
{
- wxLogLastError(_T("DrawFrameControl(uncheck)"));
+ wxLogLastError(wxT("DrawFrameControl(uncheck)"));
}
bmp.SetHBITMAP((WXHBITMAP)hbmpCheck);
{
TraverseCounter counter(this, item, recursively);
- return counter.GetCount();
+ return counter.GetCount() - 1;
}
// ----------------------------------------------------------------------------
if ( !DoGetItem(&tvItem) )
{
// don't return some garbage which was on stack, but an empty string
- buf[0] = _T('\0');
+ buf[0] = wxT('\0');
}
return wxString(buf);
switch ( which )
{
default:
- wxFAIL_MSG( _T("unknown tree item image type") );
+ wxFAIL_MSG( wxT("unknown tree item image type") );
case wxTreeItemIcon_Normal:
mask = TVIF_IMAGE;
switch ( which )
{
default:
- wxFAIL_MSG( _T("unknown tree item image type") );
+ wxFAIL_MSG( wxT("unknown tree item image type") );
case wxTreeItemIcon_Normal:
imageNormal = image;
}
else
{
- wxFAIL_MSG( _T("failed to change tree items data") );
+ wxFAIL_MSG( wxT("failed to change tree items data") );
}
}
else
// to crash too because the code elsewhere supposes that the pointer the
// wxTreeItemIndirectData has is a real wxItemData and not
// wxTreeItemIndirectData as well
- wxASSERT_MSG( !HasIndirectData(item), _T("setting indirect data twice?") );
+ wxASSERT_MSG( !HasIndirectData(item), wxT("setting indirect data twice?") );
SetItemData(item, (wxTreeItemData *)data);
{
// Bug in Gnu-Win32 headers, so don't use the macro TreeView_GetItemRect
RECT rect;
+
+ // this ugliness comes directly from MSDN - it *is* the correct way to pass
+ // the HTREEITEM with TVM_GETITEMRECT
+ *(WXHTREEITEM *)&rect = (WXHTREEITEM)item;
+
+ // FALSE means get item rect for the whole item, not only text
return SendMessage(GetHwnd(), TVM_GETITEMRECT, FALSE, (LPARAM)&rect) != 0;
}
wxTreeItemId wxTreeCtrl::GetSelection() const
{
wxCHECK_MSG( !(m_windowStyle & wxTR_MULTIPLE), (WXHTREEITEM)0,
- _T("this only works with single selection controls") );
+ wxT("this only works with single selection controls") );
return wxTreeItemId((WXHTREEITEM) TreeView_GetSelection(GetHwnd()));
}
wxTreeItemId wxTreeCtrl::GetNextVisible(const wxTreeItemId& item) const
{
- wxASSERT_MSG( IsVisible(item), _T("The item you call GetNextVisible() "
+ wxASSERT_MSG( IsVisible(item), wxT("The item you call GetNextVisible() "
"for must be visible itself!"));
return wxTreeItemId((WXHTREEITEM) TreeView_GetNextVisible(GetHwnd(), (HTREEITEM) (WXHTREEITEM) item));
wxTreeItemId wxTreeCtrl::GetPrevVisible(const wxTreeItemId& item) const
{
- wxASSERT_MSG( IsVisible(item), _T("The item you call GetPrevVisible() "
+ wxASSERT_MSG( IsVisible(item), wxT("The item you call GetPrevVisible() "
"for must be visible itself!"));
return wxTreeItemId((WXHTREEITEM) TreeView_GetPrevVisible(GetHwnd(), (HTREEITEM) (WXHTREEITEM) item));
flag == (TVE_COLLAPSE | TVE_COLLAPSERESET) ||
flag == TVE_EXPAND ||
flag == TVE_TOGGLE,
- _T("Unknown flag in wxTreeCtrl::DoExpand") );
+ wxT("Unknown flag in wxTreeCtrl::DoExpand") );
// TreeView_Expand doesn't send TVN_ITEMEXPAND(ING) messages, so we must
// emulate them. This behaviour has changed slightly with comctl32.dll
void wxTreeCtrl::Unselect()
{
- wxASSERT_MSG( !(m_windowStyle & wxTR_MULTIPLE), _T("doesn't make sense") );
+ wxASSERT_MSG( !(m_windowStyle & wxTR_MULTIPLE), wxT("doesn't make sense") );
// just remove the selection
SelectItem(wxTreeItemId((WXHTREEITEM) 0));
wxTreeCtrl *tree)
{
wxCHECK_MSG( pItem1 && pItem2, 0,
- _T("sorting tree without data doesn't make sense") );
+ wxT("sorting tree without data doesn't make sense") );
return tree->OnCompareItems(pItem1->GetId(), pItem2->GetId());
}
switch ( hdr->code )
{
+ case NM_RCLICK:
+ {
+ if ( wxControl::MSWOnNotify(idCtrl, lParam, result) )
+ return TRUE;
+
+ TV_HITTESTINFO tvhti;
+ ::GetCursorPos(&(tvhti.pt));
+ ::ScreenToClient(GetHwnd(),&(tvhti.pt));
+ if ( TreeView_HitTest(GetHwnd(),&tvhti) )
+ {
+ if( tvhti.flags & TVHT_ONITEM )
+ {
+ event.m_item = (WXHTREEITEM) tvhti.hItem;
+ eventType=wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK;
+ }
+ }
+ break;
+ }
+
case TVN_BEGINDRAG:
eventType = wxEVT_COMMAND_TREE_BEGIN_DRAG;
// fall through
event.m_item = (WXHTREEITEM)info->item.hItem;
event.m_label = info->item.pszText;
+ if (info->item.pszText == NULL)
+ return FALSE;
break;
}
break;
default:
- wxLogDebug(_T("unexpected code %d in TVN_ITEMEXPAND "
+ wxLogDebug(wxT("unexpected code %d in TVN_ITEMEXPAND "
"message"), tv->action);
}
- bool ing = (hdr->code == TVN_ITEMEXPANDING);
+ bool ing = ((int)hdr->code == TVN_ITEMEXPANDING);
eventType = g_events[expand][ing];
event.m_item = (WXHTREEITEM) tv->itemNew.hItem;
projects / wxWidgets.git / blobdiff