/////////////////////////////////////////////////////////////////////////////
-// Name: treectrl.cpp
+// Name: src/msw/treectrl.cpp
// Purpose: wxTreeCtrl
// Author: Julian Smart
// Modified by: Vadim Zeitlin to be less MSW-specific on 10.10.98
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
- #pragma implementation "treectrl.h"
-#endif
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#pragma hdrstop
#endif
-#include "wx/msw/private.h"
+#if wxUSE_TREECTRL
-// Set this to 1 to be _absolutely_ sure that repainting will work for all comctl32.dll versions
-#define wxUSE_COMCTL32_SAFELY 0
+#include "wx/msw/private.h"
-// Mingw32 is a bit mental even though this is done in winundef
-#ifdef GetFirstChild
- #undef GetFirstChild
-#endif
+// include <commctrl.h> "properly"
+#include "wx/msw/wrapcctl.h"
-#ifdef GetNextSibling
- #undef GetNextSibling
-#endif
+#include "wx/msw/missing.h"
-#if defined(__WIN95__)
+// Set this to 1 to be _absolutely_ sure that repainting will work for all
+// comctl32.dll versions
+#define wxUSE_COMCTL32_SAFELY 0
+#include "wx/app.h"
#include "wx/log.h"
#include "wx/dynarray.h"
#include "wx/imaglist.h"
#include "wx/settings.h"
-#include "wx/msw/treectrl.h"
+#include "wx/treectrl.h"
#include "wx/msw/dragimag.h"
-#ifdef __GNUWIN32_OLD__
- #include "wx/msw/gnuwin32/extra.h"
-#endif
-
-#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) || defined(__TWIN32__))
- #include <commctrl.h>
-#endif
-
-// Bug in headers, sometimes
-#ifndef TVIS_FOCUSED
- #define TVIS_FOCUSED 0x0001
-#endif
-
-#ifndef TV_FIRST
- #define TV_FIRST 0x1100
-#endif
-
-#ifndef TVS_CHECKBOXES
- #define TVS_CHECKBOXES 0x0100
-#endif
-
-// old headers might miss these messages (comctl32.dll 4.71+ only)
-#ifndef TVM_SETBKCOLOR
- #define TVM_SETBKCOLOR (TV_FIRST + 29)
- #define TVM_SETTEXTCOLOR (TV_FIRST + 30)
-#endif
+// macros to hide the cast ugliness
+// --------------------------------
-// a macro to hide the ugliness of nested casts
-#define HITEM(item) (HTREEITEM)(WXHTREEITEM)(item)
+// get HTREEITEM from wxTreeItemId
+#define HITEM(item) ((HTREEITEM)(((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
// wrappers for TreeView_GetItem/TreeView_SetItem
static bool IsItemSelected(HWND hwndTV, HTREEITEM hItem)
{
+
TV_ITEM tvi;
tvi.mask = TVIF_STATE | TVIF_HANDLE;
tvi.stateMask = TVIS_SELECTED;
return (tvi.state & TVIS_SELECTED) != 0;
}
-static void SelectItem(HWND hwndTV, HTREEITEM hItem, bool select = TRUE)
+static bool SelectItem(HWND hwndTV, HTREEITEM hItem, bool select = true)
{
TV_ITEM tvi;
tvi.mask = TVIF_STATE | TVIF_HANDLE;
if ( TreeView_SetItem(hwndTV, &tvi) == -1 )
{
wxLogLastError(wxT("TreeView_SetItem"));
+ return false;
}
+
+ return true;
}
static inline void UnselectItem(HWND hwndTV, HTREEITEM htItem)
{
- SelectItem(hwndTV, htItem, FALSE);
+ SelectItem(hwndTV, htItem, false);
}
static inline void ToggleItemSelection(HWND hwndTV, HTREEITEM htItem)
static void SelectRange(HWND hwndTV,
HTREEITEM htFirst,
HTREEITEM htLast,
- bool unselectOthers = TRUE)
+ bool unselectOthers = true)
{
// find the first (or last) item and select it
- bool cont = TRUE;
+ bool cont = true;
HTREEITEM htItem = (HTREEITEM)TreeView_GetRoot(hwndTV);
while ( htItem && cont )
{
SelectItem(hwndTV, htItem);
}
- cont = FALSE;
+ cont = false;
}
else
{
UINT mask_, // fields which are valid
UINT stateMask_ = 0) // for TVIF_STATE only
{
+ wxZeroMemory(*this);
+
// hItem member is always valid
mask = mask_ | TVIF_HANDLE;
stateMask = stateMask_;
}
};
+// wxVirutalNode is used in place of a single root when 'hidden' root is
+// specified.
+class wxVirtualNode : public wxTreeViewItem
+{
+public:
+ wxVirtualNode(wxTreeItemData *data)
+ : wxTreeViewItem(TVI_ROOT, 0)
+ {
+ m_data = data;
+ }
+
+ ~wxVirtualNode()
+ {
+ delete m_data;
+ }
+
+ wxTreeItemData *GetData() const { return m_data; }
+ void SetData(wxTreeItemData *data) { delete m_data; m_data = data; }
+
+private:
+ wxTreeItemData *m_data;
+
+ DECLARE_NO_COPY_CLASS(wxVirtualNode)
+};
+
#ifdef __VISUALC__
#pragma warning( default : 4097 )
#endif
+// a macro to get the virtual root, returns NULL if none
+#define GET_VIRTUAL_ROOT() ((wxVirtualNode *)m_pVirtualRoot)
+
+// returns true if the item is the virtual root
+#define IS_VIRTUAL_ROOT(item) (HITEM(item) == TVI_ROOT)
+
// a class which encapsulates the tree traversal logic: it vists all (unless
-// OnVisit() returns FALSE) items under the given one
+// OnVisit() returns false) items under the given one
class wxTreeTraversal
{
public:
m_tree = tree;
}
+ // give it a virtual dtor: not really needed as the class is never used
+ // polymorphically and not even allocated on heap at all, but this is safer
+ // (in case it ever is) and silences the compiler warnings for now
+ virtual ~wxTreeTraversal() { }
+
// do traverse the tree: visit all items (recursively by default) under the
- // given one; return TRUE if all items were traversed or FALSE if the
- // traversal was aborted because OnVisit returned FALSE
- bool DoTraverse(const wxTreeItemId& root, bool recursively = TRUE);
+ // given one; return true if all items were traversed or false if the
+ // traversal was aborted because OnVisit returned false
+ bool DoTraverse(const wxTreeItemId& root, bool recursively = true);
// override this function to do whatever is needed for each item, return
- // FALSE to stop traversing
+ // false to stop traversing
virtual bool OnVisit(const wxTreeItemId& item) = 0;
protected:
bool Traverse(const wxTreeItemId& root, bool recursively);
const wxTreeCtrl *m_tree;
+
+ DECLARE_NO_COPY_CLASS(wxTreeTraversal)
};
// internal class for getting the selected items
{
m_selections.Empty();
- DoTraverse(tree->GetRootItem());
+ if (tree->GetCount() > 0)
+ DoTraverse(tree->GetRootItem());
}
virtual bool OnVisit(const wxTreeItemId& item)
{
+ // can't visit a virtual node.
+ if ( (GetTree()->GetRootItem() == item) && (GetTree()->GetWindowStyle() & wxTR_HIDE_ROOT))
+ {
+ return true;
+ }
+
#if wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE
if ( GetTree()->IsItemChecked(item) )
#else
m_selections.Add(item);
}
- return TRUE;
+ return true;
}
size_t GetCount() const { return m_selections.GetCount(); }
private:
wxArrayTreeItemIds& m_selections;
+
+ DECLARE_NO_COPY_CLASS(TraverseSelections)
};
// internal class for counting tree items
DoTraverse(root, recursively);
}
- virtual bool OnVisit(const wxTreeItemId& item)
+ virtual bool OnVisit(const wxTreeItemId& WXUNUSED(item))
{
m_count++;
- return TRUE;
+ return true;
}
size_t GetCount() const { return m_count; }
private:
size_t m_count;
+
+ DECLARE_NO_COPY_CLASS(TraverseCounter)
};
// ----------------------------------------------------------------------------
//
// There is only one problem with this: when we retrieve the item's data, we
// don't know whether we get a pointer to wxTreeItemData or
-// wxTreeItemIndirectData. So we have to maintain a list of all items which
-// have indirect data inside the listctrl itself.
+// wxTreeItemIndirectData. So we always set the item id to an invalid value
+// in this class and the code using the client data checks for it and retrieves
+// the real client data in this case.
// ----------------------------------------------------------------------------
-class wxTreeItemIndirectData
+class wxTreeItemIndirectData : public wxTreeItemData
{
public:
// ctor associates this data with the item and the real item data becomes
// and set ourselves as the new one
tree->SetIndirectItemData(item, this);
+
+ // we must have the invalid value for the item
+ m_pItem = 0l;
}
// dtor deletes the associated data as well
- ~wxTreeItemIndirectData() { delete m_data; }
+ virtual ~wxTreeItemIndirectData() { delete m_data; }
// accessors
// get the real data associated with the item
// all the images associated with the item
int m_images[wxTreeItemIcon_Max];
+ // the real client data
wxTreeItemData *m_data;
+
+ DECLARE_NO_COPY_CLASS(wxTreeItemIndirectData)
};
// ----------------------------------------------------------------------------
// wxWin macros
// ----------------------------------------------------------------------------
+#if wxUSE_EXTENDED_RTTI
+WX_DEFINE_FLAGS( wxTreeCtrlStyle )
+
+wxBEGIN_FLAGS( wxTreeCtrlStyle )
+ // new style border flags, we put them first to
+ // use them for streaming out
+ wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+ wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+ wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+ wxFLAGS_MEMBER(wxBORDER_RAISED)
+ wxFLAGS_MEMBER(wxBORDER_STATIC)
+ wxFLAGS_MEMBER(wxBORDER_NONE)
+
+ // old style border flags
+ wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+ wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+ wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+ wxFLAGS_MEMBER(wxRAISED_BORDER)
+ wxFLAGS_MEMBER(wxSTATIC_BORDER)
+ wxFLAGS_MEMBER(wxBORDER)
+
+ // standard window styles
+ wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+ wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+ wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+ wxFLAGS_MEMBER(wxWANTS_CHARS)
+ wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+ wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+ wxFLAGS_MEMBER(wxVSCROLL)
+ wxFLAGS_MEMBER(wxHSCROLL)
+
+ wxFLAGS_MEMBER(wxTR_EDIT_LABELS)
+ wxFLAGS_MEMBER(wxTR_NO_BUTTONS)
+ wxFLAGS_MEMBER(wxTR_HAS_BUTTONS)
+ wxFLAGS_MEMBER(wxTR_TWIST_BUTTONS)
+ wxFLAGS_MEMBER(wxTR_NO_LINES)
+ wxFLAGS_MEMBER(wxTR_FULL_ROW_HIGHLIGHT)
+ wxFLAGS_MEMBER(wxTR_LINES_AT_ROOT)
+ wxFLAGS_MEMBER(wxTR_HIDE_ROOT)
+ wxFLAGS_MEMBER(wxTR_ROW_LINES)
+ wxFLAGS_MEMBER(wxTR_HAS_VARIABLE_ROW_HEIGHT)
+ wxFLAGS_MEMBER(wxTR_SINGLE)
+ wxFLAGS_MEMBER(wxTR_MULTIPLE)
+ wxFLAGS_MEMBER(wxTR_EXTENDED)
+ wxFLAGS_MEMBER(wxTR_DEFAULT_STYLE)
+
+wxEND_FLAGS( wxTreeCtrlStyle )
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxTreeCtrl, wxControl,"wx/treectrl.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxTreeCtrl)
+ wxEVENT_PROPERTY( TextUpdated , wxEVT_COMMAND_TEXT_UPDATED , wxCommandEvent )
+ wxEVENT_RANGE_PROPERTY( TreeEvent , wxEVT_COMMAND_TREE_BEGIN_DRAG , wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK , wxTreeEvent )
+ wxPROPERTY_FLAGS( WindowStyle , wxTreeCtrlStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxTreeCtrl)
+wxEND_HANDLERS_TABLE()
+
+wxCONSTRUCTOR_5( wxTreeCtrl , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle )
+#else
IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrl, wxControl)
+#endif
// ----------------------------------------------------------------------------
-// variables
+// constants
// ----------------------------------------------------------------------------
-// handy table for sending events
-static const wxEventType g_events[2][2] =
+// indices in gs_expandEvents table below
+enum
+{
+ IDX_COLLAPSE,
+ IDX_EXPAND,
+ IDX_WHAT_MAX
+};
+
+enum
+{
+ IDX_DONE,
+ IDX_DOING,
+ IDX_HOW_MAX
+};
+
+// handy table for sending events - it has to be initialized during run-time
+// now so can't be const any more
+static /* const */ wxEventType gs_expandEvents[IDX_WHAT_MAX][IDX_HOW_MAX];
+
+/*
+ but logically it's a const table with the following entries:
+=
{
{ wxEVT_COMMAND_TREE_ITEM_COLLAPSED, wxEVT_COMMAND_TREE_ITEM_COLLAPSING },
{ wxEVT_COMMAND_TREE_ITEM_EXPANDED, wxEVT_COMMAND_TREE_ITEM_EXPANDING }
};
+*/
// ============================================================================
// implementation
bool wxTreeTraversal::DoTraverse(const wxTreeItemId& root, bool recursively)
{
if ( !OnVisit(root) )
- return FALSE;
+ return false;
return Traverse(root, recursively);
}
bool wxTreeTraversal::Traverse(const wxTreeItemId& root, bool recursively)
{
- long cookie;
+ wxTreeItemIdValue cookie;
wxTreeItemId child = m_tree->GetFirstChild(root, cookie);
while ( child.IsOk() )
{
// depth first traversal
- if ( recursively && !Traverse(child, TRUE) )
- return FALSE;
+ if ( recursively && !Traverse(child, true) )
+ return false;
if ( !OnVisit(child) )
- return FALSE;
+ return false;
child = m_tree->GetNextChild(root, cookie);
}
- return TRUE;
+ return true;
}
// ----------------------------------------------------------------------------
void wxTreeCtrl::Init()
{
- m_imageListNormal = NULL;
- m_imageListState = NULL;
- m_ownsImageListNormal = m_ownsImageListState = FALSE;
m_textCtrl = NULL;
- m_hasAnyAttr = FALSE;
+ m_hasAnyAttr = false;
m_dragImage = NULL;
+ m_pVirtualRoot = NULL;
- m_htSelStart = 0;
+ // initialize the global array of events now as it can't be done statically
+ // with the wxEVT_XXX values being allocated during run-time only
+ gs_expandEvents[IDX_COLLAPSE][IDX_DONE] = wxEVT_COMMAND_TREE_ITEM_COLLAPSED;
+ gs_expandEvents[IDX_COLLAPSE][IDX_DOING] = wxEVT_COMMAND_TREE_ITEM_COLLAPSING;
+ gs_expandEvents[IDX_EXPAND][IDX_DONE] = wxEVT_COMMAND_TREE_ITEM_EXPANDED;
+ gs_expandEvents[IDX_EXPAND][IDX_DOING] = wxEVT_COMMAND_TREE_ITEM_EXPANDING;
}
bool wxTreeCtrl::Create(wxWindow *parent,
{
Init();
+ if ( (style & wxBORDER_MASK) == wxBORDER_DEFAULT )
+ style |= wxBORDER_SUNKEN;
+
if ( !CreateControl(parent, id, pos, size, style, validator, name) )
- return FALSE;
+ return false;
- DWORD wstyle = WS_VISIBLE | WS_CHILD | WS_TABSTOP |
- TVS_SHOWSELALWAYS /* | WS_CLIPSIBLINGS */;
+ DWORD exStyle = 0;
+ DWORD wstyle = MSWGetStyle(m_windowStyle, & exStyle);
+ wstyle |= WS_TABSTOP | TVS_SHOWSELALWAYS;
if ((m_windowStyle & wxTR_NO_LINES) == 0)
wstyle |= TVS_HASLINES;
if ( m_windowStyle & wxTR_LINES_AT_ROOT )
wstyle |= TVS_LINESATROOT;
+ if ( m_windowStyle & wxTR_FULL_ROW_HIGHLIGHT )
+ {
+ if ( wxApp::GetComCtl32Version() >= 471 )
+ wstyle |= TVS_FULLROWSELECT;
+ }
+
// using TVS_CHECKBOXES for emulation of a multiselection tree control
// doesn't work without the new enough headers
#if wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE && \
wstyle |= TVS_CHECKBOXES;
#endif // wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE
+#if !defined(__WXWINCE__) && defined(TVS_INFOTIP)
+ // Need so that TVN_GETINFOTIP messages will be sent
+ wstyle |= TVS_INFOTIP;
+#endif
+
// Create the tree control.
- if ( !MSWCreateControl(WC_TREEVIEW, wstyle) )
- return FALSE;
+ if ( !MSWCreateControl(WC_TREEVIEW, wstyle, pos, size) )
+ return false;
#if wxUSE_COMCTL32_SAFELY
- wxWindow::SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
+ wxWindow::SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
wxWindow::SetForegroundColour(wxWindow::GetParent()->GetForegroundColour());
#elif 1
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
SetForegroundColour(wxWindow::GetParent()->GetForegroundColour());
#else
// This works around a bug in the Windows tree control whereby for some versions
// THIS FIX NOW REVERTED since it caused problems on _other_ systems.
// Assume the user has an updated comctl32.dll.
::SendMessage(GetHwnd(), TVM_SETBKCOLOR, 0,-1);
- wxWindow::SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
+ wxWindow::SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
SetForegroundColour(wxWindow::GetParent()->GetForegroundColour());
#endif
HDC hdcMem = CreateCompatibleDC(NULL);
// create a mono bitmap of the standard size
- int x = GetSystemMetrics(SM_CXMENUCHECK);
- int y = GetSystemMetrics(SM_CYMENUCHECK);
- wxImageList imagelistCheckboxes(x, y, FALSE, 2);
+ int x = ::GetSystemMetrics(SM_CXMENUCHECK);
+ int y = ::GetSystemMetrics(SM_CYMENUCHECK);
+ wxImageList imagelistCheckboxes(x, y, false, 2);
HBITMAP hbmpCheck = CreateBitmap(x, y, // bitmap size
1, // # of color planes
1, // # bits needed for one pixel
}
#endif // 0
- SetSize(pos.x, pos.y, size.x, size.y);
+ wxSetCCUnicodeFormat(GetHwnd());
- return TRUE;
+ return true;
}
wxTreeCtrl::~wxTreeCtrl()
// delete any attributes
if ( m_hasAnyAttr )
{
- for ( wxNode *node = m_attrs.Next(); node; node = m_attrs.Next() )
- {
- delete (wxTreeItemAttr *)node->Data();
- }
+ WX_CLEAR_HASH_MAP(wxMapTreeAttr, m_attrs);
// prevent TVN_DELETEITEM handler from deleting the attributes again!
- m_hasAnyAttr = FALSE;
+ m_hasAnyAttr = false;
}
DeleteTextCtrl();
// delete user data to prevent memory leaks
+ // also deletes hidden root node storage.
DeleteAllItems();
-
- if (m_ownsImageListNormal) delete m_imageListNormal;
- if (m_ownsImageListState) delete m_imageListState;
}
// ----------------------------------------------------------------------------
// accessors
// ----------------------------------------------------------------------------
+/* static */ wxVisualAttributes
+wxTreeCtrl::GetClassDefaultAttributes(wxWindowVariant variant)
+{
+ wxVisualAttributes attrs = GetCompositeControlsDefaultAttributes(variant);
+
+ // common controls have their own default font
+ attrs.font = wxGetCCDefaultFont();
+
+ return attrs;
+}
+
+
// simple wrappers which add error checking in debug mode
bool wxTreeCtrl::DoGetItem(wxTreeViewItem* tvItem) const
{
+ wxCHECK_MSG( tvItem->hItem != TVI_ROOT, false,
+ _T("can't retrieve virtual root item") );
+
if ( !TreeView_GetItem(GetHwnd(), tvItem) )
{
wxLogLastError(wxT("TreeView_GetItem"));
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
void wxTreeCtrl::DoSetItem(wxTreeViewItem* tvItem)
TreeView_SetIndent(GetHwnd(), indent);
}
-wxImageList *wxTreeCtrl::GetImageList() const
-{
- return m_imageListNormal;
-}
-
-wxImageList *wxTreeCtrl::GetStateImageList() const
-{
- return m_imageListNormal;
-}
-
void wxTreeCtrl::SetAnyImageList(wxImageList *imageList, int which)
{
// no error return
- TreeView_SetImageList(GetHwnd(),
- imageList ? imageList->GetHIMAGELIST() : 0,
- which);
+ (void) TreeView_SetImageList(GetHwnd(),
+ imageList ? imageList->GetHIMAGELIST() : 0,
+ which);
}
void wxTreeCtrl::SetImageList(wxImageList *imageList)
{
- if (m_ownsImageListNormal) delete m_imageListNormal;
+ if (m_ownsImageListNormal)
+ delete m_imageListNormal;
+
SetAnyImageList(m_imageListNormal = imageList, TVSIL_NORMAL);
- m_ownsImageListNormal = FALSE;
+ m_ownsImageListNormal = false;
}
void wxTreeCtrl::SetStateImageList(wxImageList *imageList)
{
if (m_ownsImageListState) delete m_imageListState;
SetAnyImageList(m_imageListState = imageList, TVSIL_STATE);
- m_ownsImageListState = FALSE;
-}
-
-void wxTreeCtrl::AssignImageList(wxImageList *imageList)
-{
- SetImageList(imageList);
- m_ownsImageListNormal = TRUE;
-}
-
-void wxTreeCtrl::AssignStateImageList(wxImageList *imageList)
-{
- SetStateImageList(imageList);
- m_ownsImageListState = TRUE;
+ m_ownsImageListState = false;
}
size_t wxTreeCtrl::GetChildrenCount(const wxTreeItemId& item,
bool recursively) const
{
- TraverseCounter counter(this, item, recursively);
+ wxCHECK_MSG( item.IsOk(), 0u, wxT("invalid tree item") );
+ TraverseCounter counter(this, item, recursively);
return counter.GetCount() - 1;
}
{
#if !wxUSE_COMCTL32_SAFELY
if ( !wxWindowBase::SetBackgroundColour(colour) )
- return FALSE;
+ return false;
- SendMessage(GetHwnd(), TVM_SETBKCOLOR, 0, colour.GetPixel());
+ ::SendMessage(GetHwnd(), TVM_SETBKCOLOR, 0, colour.GetPixel());
#endif
- return TRUE;
+ return true;
}
bool wxTreeCtrl::SetForegroundColour(const wxColour &colour)
{
#if !wxUSE_COMCTL32_SAFELY
if ( !wxWindowBase::SetForegroundColour(colour) )
- return FALSE;
+ return false;
- SendMessage(GetHwnd(), TVM_SETTEXTCOLOR, 0, colour.GetPixel());
+ ::SendMessage(GetHwnd(), TVM_SETTEXTCOLOR, 0, colour.GetPixel());
#endif
- return TRUE;
+ return true;
}
// ----------------------------------------------------------------------------
wxString wxTreeCtrl::GetItemText(const wxTreeItemId& item) const
{
+ wxCHECK_MSG( item.IsOk(), wxEmptyString, wxT("invalid tree item") );
+
wxChar buf[512]; // the size is arbitrary...
wxTreeViewItem tvItem(item, TVIF_TEXT);
void wxTreeCtrl::SetItemText(const wxTreeItemId& item, const wxString& text)
{
+ wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );
+
+ if ( IS_VIRTUAL_ROOT(item) )
+ return;
+
wxTreeViewItem tvItem(item, TVIF_TEXT);
tvItem.pszText = (wxChar *)text.c_str(); // conversion is ok
DoSetItem(&tvItem);
+
+ // when setting the text of the item being edited, the text control should
+ // be updated to reflect the new text as well, otherwise calling
+ // SetItemText() in the OnBeginLabelEdit() handler doesn't have any effect
+ //
+ // don't use GetEditControl() here because m_textCtrl is not set yet
+ HWND hwndEdit = TreeView_GetEditControl(GetHwnd());
+ if ( hwndEdit )
+ {
+ if ( item == m_idEdited )
+ {
+ ::SetWindowText(hwndEdit, text);
+ }
+ }
}
int wxTreeCtrl::DoGetItemImageFromData(const wxTreeItemId& item,
int wxTreeCtrl::GetItemImage(const wxTreeItemId& item,
wxTreeItemIcon which) const
{
+ wxCHECK_MSG( item.IsOk(), -1, wxT("invalid tree item") );
+
+ if ( (HITEM(item) == TVI_ROOT) && (m_windowStyle & wxTR_HIDE_ROOT) )
+ {
+ // TODO: Maybe a hidden root can still provide images?
+ return -1;
+ }
+
if ( HasIndirectData(item) )
{
return DoGetItemImageFromData(item, which);
void wxTreeCtrl::SetItemImage(const wxTreeItemId& item, int image,
wxTreeItemIcon which)
{
- int imageNormal, imageSel;
+ wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );
+
+ if ( IS_VIRTUAL_ROOT(item) )
+ {
+ // TODO: Maybe a hidden root can still store images?
+ return;
+ }
+
+ int imageNormal,
+ imageSel;
+
switch ( which )
{
default:
wxFAIL_MSG( wxT("unknown tree item image type") );
+ // fall through
case wxTreeItemIcon_Normal:
- imageNormal = image;
- imageSel = GetItemSelectedImage(item);
+ {
+ const int imageNormalOld = GetItemImage(item);
+ const int imageSelOld =
+ GetItemImage(item, wxTreeItemIcon_Selected);
+
+ // always set the normal image
+ imageNormal = image;
+
+ // if the selected and normal images were the same, they should
+ // be the same after the update, otherwise leave the selected
+ // image as it was
+ imageSel = imageNormalOld == imageSelOld ? image : imageSelOld;
+ }
break;
case wxTreeItemIcon_Selected:
// 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
wxTreeItemData *wxTreeCtrl::GetItemData(const wxTreeItemId& item) const
{
+ wxCHECK_MSG( item.IsOk(), NULL, wxT("invalid tree item") );
+
wxTreeViewItem tvItem(item, TVIF_PARAM);
- if ( !DoGetItem(&tvItem) )
+
+ // Hidden root may have data.
+ if ( IS_VIRTUAL_ROOT(item) )
{
- return NULL;
+ return GET_VIRTUAL_ROOT()->GetData();
}
- if ( HasIndirectData(item) )
+ // Visible node.
+ if ( !DoGetItem(&tvItem) )
{
- return ((wxTreeItemIndirectData *)tvItem.lParam)->GetData();
+ return NULL;
}
- else
+
+ wxTreeItemData *data = (wxTreeItemData *)tvItem.lParam;
+ if ( IsDataIndirect(data) )
{
- return (wxTreeItemData *)tvItem.lParam;
+ data = ((wxTreeItemIndirectData *)data)->GetData();
}
+
+ return data;
}
void wxTreeCtrl::SetItemData(const wxTreeItemId& item, wxTreeItemData *data)
{
+ wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );
+
+ if ( IS_VIRTUAL_ROOT(item) )
+ {
+ GET_VIRTUAL_ROOT()->SetData(data);
+ }
+
// first, associate this piece of data with this item
if ( data )
{
// wxTreeItemIndirectData as well
wxASSERT_MSG( !HasIndirectData(item), wxT("setting indirect data twice?") );
- SetItemData(item, (wxTreeItemData *)data);
-
- m_itemsWithIndirectData.Add(item);
+ SetItemData(item, data);
}
bool wxTreeCtrl::HasIndirectData(const wxTreeItemId& item) const
{
- return m_itemsWithIndirectData.Index(item) != wxNOT_FOUND;
+ // query the item itself
+ wxTreeViewItem tvItem(item, TVIF_PARAM);
+ if ( !DoGetItem(&tvItem) )
+ {
+ return false;
+ }
+
+ wxTreeItemData *data = (wxTreeItemData *)tvItem.lParam;
+
+ return data && IsDataIndirect(data);
}
void wxTreeCtrl::SetItemHasChildren(const wxTreeItemId& item, bool has)
{
+ wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );
+
+ if ( IS_VIRTUAL_ROOT(item) )
+ return;
+
wxTreeViewItem tvItem(item, TVIF_CHILDREN);
tvItem.cChildren = (int)has;
DoSetItem(&tvItem);
void wxTreeCtrl::SetItemBold(const wxTreeItemId& item, bool bold)
{
+ wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );
+
+ if ( IS_VIRTUAL_ROOT(item) )
+ return;
+
wxTreeViewItem tvItem(item, TVIF_STATE, TVIS_BOLD);
tvItem.state = bold ? TVIS_BOLD : 0;
DoSetItem(&tvItem);
void wxTreeCtrl::SetItemDropHighlight(const wxTreeItemId& item, bool highlight)
{
+ if ( IS_VIRTUAL_ROOT(item) )
+ return;
+
wxTreeViewItem tvItem(item, TVIF_STATE, TVIS_DROPHILITED);
tvItem.state = highlight ? TVIS_DROPHILITED : 0;
DoSetItem(&tvItem);
}
+void wxTreeCtrl::RefreshItem(const wxTreeItemId& item)
+{
+ if ( IS_VIRTUAL_ROOT(item) )
+ return;
+
+ wxRect rect;
+ if ( GetBoundingRect(item, rect) )
+ {
+ RefreshRect(rect);
+ }
+}
+
+wxColour wxTreeCtrl::GetItemTextColour(const wxTreeItemId& item) const
+{
+ wxCHECK_MSG( item.IsOk(), wxNullColour, wxT("invalid tree 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
+{
+ wxCHECK_MSG( item.IsOk(), wxNullColour, wxT("invalid tree 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
+{
+ wxCHECK_MSG( item.IsOk(), wxNullFont, wxT("invalid tree item") );
+
+ wxMapTreeAttr::const_iterator it = m_attrs.find(item.m_pItem);
+ return it == m_attrs.end() ? wxNullFont : it->second->GetFont();
+}
+
void wxTreeCtrl::SetItemTextColour(const wxTreeItemId& item,
const wxColour& col)
{
- m_hasAnyAttr = TRUE;
+ wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );
- long id = (long)(WXHTREEITEM)item;
- wxTreeItemAttr *attr = (wxTreeItemAttr *)m_attrs.Get(id);
- if ( !attr )
+ wxTreeItemAttr *attr;
+ wxMapTreeAttr::iterator it = m_attrs.find(item.m_pItem);
+ if ( it == m_attrs.end() )
{
+ m_hasAnyAttr = true;
+
+ m_attrs[item.m_pItem] =
attr = new wxTreeItemAttr;
- m_attrs.Put(id, (wxObject *)attr);
+ }
+ else
+ {
+ attr = it->second;
}
attr->SetTextColour(col);
+
+ RefreshItem(item);
}
void wxTreeCtrl::SetItemBackgroundColour(const wxTreeItemId& item,
const wxColour& col)
{
- m_hasAnyAttr = TRUE;
+ wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );
- long id = (long)(WXHTREEITEM)item;
- wxTreeItemAttr *attr = (wxTreeItemAttr *)m_attrs.Get(id);
- if ( !attr )
+ wxTreeItemAttr *attr;
+ wxMapTreeAttr::iterator it = m_attrs.find(item.m_pItem);
+ if ( it == m_attrs.end() )
{
+ m_hasAnyAttr = true;
+
+ m_attrs[item.m_pItem] =
attr = new wxTreeItemAttr;
- m_attrs.Put(id, (wxObject *)attr);
+ }
+ else // already in the hash
+ {
+ attr = it->second;
}
attr->SetBackgroundColour(col);
+
+ RefreshItem(item);
}
void wxTreeCtrl::SetItemFont(const wxTreeItemId& item, const wxFont& font)
{
- m_hasAnyAttr = TRUE;
+ wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );
- long id = (long)(WXHTREEITEM)item;
- wxTreeItemAttr *attr = (wxTreeItemAttr *)m_attrs.Get(id);
- if ( !attr )
+ wxTreeItemAttr *attr;
+ wxMapTreeAttr::iterator it = m_attrs.find(item.m_pItem);
+ if ( it == m_attrs.end() )
{
+ m_hasAnyAttr = true;
+
+ m_attrs[item.m_pItem] =
attr = new wxTreeItemAttr;
- m_attrs.Put(id, (wxObject *)attr);
+ }
+ else // already in the hash
+ {
+ attr = it->second;
}
attr->SetFont(font);
+
+ RefreshItem(item);
}
// ----------------------------------------------------------------------------
bool wxTreeCtrl::IsVisible(const wxTreeItemId& item) const
{
+ wxCHECK_MSG( item.IsOk(), false, wxT("invalid tree item") );
+
+ if ( item == wxTreeItemId(TVI_ROOT) )
+ {
+ // virtual (hidden) root is never visible
+ return false;
+ }
+
// 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;
+ *(HTREEITEM *)&rect = HITEM(item);
- // FALSE means get item rect for the whole item, not only text
- return SendMessage(GetHwnd(), TVM_GETITEMRECT, FALSE, (LPARAM)&rect) != 0;
+ // true means to get rect for just the text, not the whole line
+ if ( !::SendMessage(GetHwnd(), TVM_GETITEMRECT, true, (LPARAM)&rect) )
+ {
+ // if TVM_GETITEMRECT returned false, then the item is definitely not
+ // visible (because its parent is not expanded)
+ return false;
+ }
+ // however if it returned true, the item might still be outside the
+ // currently visible part of the tree, test for it (notice that partly
+ // visible means visible here)
+ return rect.bottom > 0 && rect.top < GetClientSize().y;
}
bool wxTreeCtrl::ItemHasChildren(const wxTreeItemId& item) const
{
+ wxCHECK_MSG( item.IsOk(), false, wxT("invalid tree item") );
+
wxTreeViewItem tvItem(item, TVIF_CHILDREN);
DoGetItem(&tvItem);
bool wxTreeCtrl::IsExpanded(const wxTreeItemId& item) const
{
- // probably not a good idea to put it here
- //wxASSERT( ItemHasChildren(item) );
+ wxCHECK_MSG( item.IsOk(), false, wxT("invalid tree item") );
wxTreeViewItem tvItem(item, TVIF_STATE, TVIS_EXPANDED);
DoGetItem(&tvItem);
bool wxTreeCtrl::IsSelected(const wxTreeItemId& item) const
{
+ wxCHECK_MSG( item.IsOk(), false, wxT("invalid tree item") );
+
wxTreeViewItem tvItem(item, TVIF_STATE, TVIS_SELECTED);
DoGetItem(&tvItem);
bool wxTreeCtrl::IsBold(const wxTreeItemId& item) const
{
+ wxCHECK_MSG( item.IsOk(), false, wxT("invalid tree item") );
+
wxTreeViewItem tvItem(item, TVIF_STATE, TVIS_BOLD);
DoGetItem(&tvItem);
wxTreeItemId wxTreeCtrl::GetRootItem() const
{
- return wxTreeItemId((WXHTREEITEM) TreeView_GetRoot(GetHwnd()));
+ // Root may be real (visible) or virtual (hidden).
+ if ( GET_VIRTUAL_ROOT() )
+ return TVI_ROOT;
+
+ return wxTreeItemId(TreeView_GetRoot(GetHwnd()));
}
wxTreeItemId wxTreeCtrl::GetSelection() const
{
- wxCHECK_MSG( !(m_windowStyle & wxTR_MULTIPLE), (long)(WXHTREEITEM)0,
+ wxCHECK_MSG( !(m_windowStyle & wxTR_MULTIPLE), wxTreeItemId(),
wxT("this only works with single selection controls") );
- return wxTreeItemId((WXHTREEITEM) TreeView_GetSelection(GetHwnd()));
+ return wxTreeItemId(TreeView_GetSelection(GetHwnd()));
}
-wxTreeItemId wxTreeCtrl::GetParent(const wxTreeItemId& item) const
+wxTreeItemId wxTreeCtrl::GetItemParent(const wxTreeItemId& item) const
{
- return wxTreeItemId((WXHTREEITEM) TreeView_GetParent(GetHwnd(), HITEM(item)));
+ wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );
+
+ HTREEITEM hItem;
+
+ if ( IS_VIRTUAL_ROOT(item) )
+ {
+ // no parent for the virtual root
+ hItem = 0;
+ }
+ else // normal item
+ {
+ hItem = TreeView_GetParent(GetHwnd(), HITEM(item));
+ if ( !hItem && HasFlag(wxTR_HIDE_ROOT) )
+ {
+ // the top level items should have the virtual root as their parent
+ hItem = TVI_ROOT;
+ }
+ }
+
+ return wxTreeItemId(hItem);
}
wxTreeItemId wxTreeCtrl::GetFirstChild(const wxTreeItemId& item,
- long& _cookie) const
+ wxTreeItemIdValue& cookie) const
{
+ wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );
+
// remember the last child returned in 'cookie'
- _cookie = (long)TreeView_GetChild(GetHwnd(), HITEM(item));
+ cookie = TreeView_GetChild(GetHwnd(), HITEM(item));
+
+ return wxTreeItemId(cookie);
+}
+
+wxTreeItemId wxTreeCtrl::GetNextChild(const wxTreeItemId& WXUNUSED(item),
+ wxTreeItemIdValue& cookie) const
+{
+ wxTreeItemId fromCookie(cookie);
+
+ HTREEITEM hitem = HITEM(fromCookie);
+
+ hitem = TreeView_GetNextSibling(GetHwnd(), hitem);
+
+ wxTreeItemId item(hitem);
+
+ cookie = item.m_pItem;
+
+ return item;
+}
+
+#if WXWIN_COMPATIBILITY_2_4
+
+wxTreeItemId wxTreeCtrl::GetFirstChild(const wxTreeItemId& item,
+ long& cookie) const
+{
+ wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );
- return wxTreeItemId((WXHTREEITEM)_cookie);
+ cookie = (long)TreeView_GetChild(GetHwnd(), HITEM(item));
+
+ return wxTreeItemId((void *)cookie);
}
wxTreeItemId wxTreeCtrl::GetNextChild(const wxTreeItemId& WXUNUSED(item),
- long& _cookie) const
+ long& cookie) const
{
- wxTreeItemId l = wxTreeItemId((WXHTREEITEM)TreeView_GetNextSibling(GetHwnd(),
- HITEM(_cookie)));
- _cookie = (long)l;
+ wxTreeItemId fromCookie((void *)cookie);
+
+ HTREEITEM hitem = HITEM(fromCookie);
- return l;
+ hitem = TreeView_GetNextSibling(GetHwnd(), hitem);
+
+ wxTreeItemId item(hitem);
+
+ cookie = (long)item.m_pItem;
+
+ return item;
}
+#endif // WXWIN_COMPATIBILITY_2_4
+
wxTreeItemId wxTreeCtrl::GetLastChild(const wxTreeItemId& item) const
{
+ wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );
+
// can this be done more efficiently?
- long cookie;
+ wxTreeItemIdValue cookie;
wxTreeItemId childLast,
child = GetFirstChild(item, cookie);
wxTreeItemId wxTreeCtrl::GetNextSibling(const wxTreeItemId& item) const
{
- return wxTreeItemId((WXHTREEITEM) TreeView_GetNextSibling(GetHwnd(), HITEM(item)));
+ wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );
+ return wxTreeItemId(TreeView_GetNextSibling(GetHwnd(), HITEM(item)));
}
wxTreeItemId wxTreeCtrl::GetPrevSibling(const wxTreeItemId& item) const
{
- return wxTreeItemId((WXHTREEITEM) TreeView_GetPrevSibling(GetHwnd(), HITEM(item)));
+ wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );
+ return wxTreeItemId(TreeView_GetPrevSibling(GetHwnd(), HITEM(item)));
}
wxTreeItemId wxTreeCtrl::GetFirstVisibleItem() const
{
- return wxTreeItemId((WXHTREEITEM) TreeView_GetFirstVisible(GetHwnd()));
+ return wxTreeItemId(TreeView_GetFirstVisible(GetHwnd()));
}
wxTreeItemId wxTreeCtrl::GetNextVisible(const wxTreeItemId& item) const
{
+ wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );
wxASSERT_MSG( IsVisible(item), wxT("The item you call GetNextVisible() for must be visible itself!"));
- return wxTreeItemId((WXHTREEITEM) TreeView_GetNextVisible(GetHwnd(), HITEM(item)));
+ return wxTreeItemId(TreeView_GetNextVisible(GetHwnd(), HITEM(item)));
}
wxTreeItemId wxTreeCtrl::GetPrevVisible(const wxTreeItemId& item) const
{
+ wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );
wxASSERT_MSG( IsVisible(item), wxT("The item you call GetPrevVisible() for must be visible itself!"));
- return wxTreeItemId((WXHTREEITEM) TreeView_GetPrevVisible(GetHwnd(), HITEM(item)));
+ return wxTreeItemId(TreeView_GetPrevVisible(GetHwnd(), HITEM(item)));
}
// ----------------------------------------------------------------------------
bool wxTreeCtrl::IsItemChecked(const wxTreeItemId& item) const
{
+ wxCHECK_MSG( item.IsOk(), false, wxT("invalid tree item") );
+
// receive the desired information.
wxTreeViewItem tvItem(item, TVIF_STATE, TVIS_STATEIMAGEMASK);
DoGetItem(&tvItem);
void wxTreeCtrl::SetItemCheck(const wxTreeItemId& item, bool check)
{
+ wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );
+
// receive the desired information.
wxTreeViewItem tvItem(item, TVIF_STATE, TVIS_STATEIMAGEMASK);
+ DoGetItem(&tvItem);
+
// state images are one-based
tvItem.state = (check ? 2 : 1) << 12;
// Usual operations
// ----------------------------------------------------------------------------
-wxTreeItemId wxTreeCtrl::DoInsertItem(const wxTreeItemId& parent,
- wxTreeItemId hInsertAfter,
- const wxString& text,
- int image, int selectedImage,
- wxTreeItemData *data)
+wxTreeItemId wxTreeCtrl::DoInsertAfter(const wxTreeItemId& parent,
+ const wxTreeItemId& hInsertAfter,
+ const wxString& text,
+ int image, int selectedImage,
+ wxTreeItemData *data)
{
wxCHECK_MSG( parent.IsOk() || !TreeView_GetRoot(GetHwnd()),
wxTreeItemId(),
}
UINT mask = 0;
- if ( !text.IsEmpty() )
+ if ( !text.empty() )
{
mask |= TVIF_TEXT;
tvIns.item.pszText = (wxChar *)text.c_str(); // cast is ok
if ( data != NULL )
{
// associate the application tree item with Win32 tree item handle
- data->SetId((WXHTREEITEM)id);
+ data->SetId(id);
}
- return wxTreeItemId((WXHTREEITEM)id);
+ return wxTreeItemId(id);
}
// for compatibility only
-wxTreeItemId wxTreeCtrl::InsertItem(const wxTreeItemId& parent,
- const wxString& text,
- int image, int selImage,
- long insertAfter)
-{
- return DoInsertItem(parent, (WXHTREEITEM)insertAfter, text,
- image, selImage, NULL);
-}
+#if WXWIN_COMPATIBILITY_2_4
-wxTreeItemId wxTreeCtrl::AddRoot(const wxString& text,
- int image, int selectedImage,
- wxTreeItemData *data)
+void wxTreeCtrl::SetImageList(wxImageList *imageList, int)
{
- return DoInsertItem(wxTreeItemId((long) (WXHTREEITEM) 0), (long)(WXHTREEITEM) 0,
- text, image, selectedImage, data);
+ SetImageList(imageList);
}
-wxTreeItemId wxTreeCtrl::PrependItem(const wxTreeItemId& parent,
- const wxString& text,
- int image, int selectedImage,
- wxTreeItemData *data)
+int wxTreeCtrl::GetItemSelectedImage(const wxTreeItemId& item) const
{
- return DoInsertItem(parent, (WXHTREEITEM) TVI_FIRST,
- text, image, selectedImage, data);
+ return GetItemImage(item, wxTreeItemIcon_Selected);
}
-wxTreeItemId wxTreeCtrl::InsertItem(const wxTreeItemId& parent,
- const wxTreeItemId& idPrevious,
- const wxString& text,
- int image, int selectedImage,
- wxTreeItemData *data)
+void wxTreeCtrl::SetItemSelectedImage(const wxTreeItemId& item, int image)
{
- return DoInsertItem(parent, idPrevious, text, image, selectedImage, data);
+ SetItemImage(item, image, wxTreeItemIcon_Selected);
}
-wxTreeItemId wxTreeCtrl::InsertItem(const wxTreeItemId& parent,
- size_t index,
- const wxString& text,
- int image, int selectedImage,
- wxTreeItemData *data)
+#endif // WXWIN_COMPATIBILITY_2_4
+
+wxTreeItemId wxTreeCtrl::AddRoot(const wxString& text,
+ int image, int selectedImage,
+ wxTreeItemData *data)
{
- // find the item from index
- long cookie;
- wxTreeItemId idPrev, idCur = GetFirstChild(parent, cookie);
- while ( index != 0 && idCur.IsOk() )
+
+ if ( m_windowStyle & wxTR_HIDE_ROOT )
{
- index--;
+ // create a virtual root item, the parent for all the others
+ m_pVirtualRoot = new wxVirtualNode(data);
- idPrev = idCur;
- idCur = GetNextChild(parent, cookie);
+ return TVI_ROOT;
}
- // assert, not check: if the index is invalid, we will append the item
- // to the end
- wxASSERT_MSG( index == 0, _T("bad index in wxTreeCtrl::InsertItem") );
-
- return DoInsertItem(parent, idPrev, text, image, selectedImage, data);
+ return DoInsertAfter(wxTreeItemId(), wxTreeItemId(),
+ text, image, selectedImage, data);
}
-wxTreeItemId wxTreeCtrl::AppendItem(const wxTreeItemId& parent,
- const wxString& text,
- int image, int selectedImage,
- wxTreeItemData *data)
+wxTreeItemId wxTreeCtrl::DoInsertItem(const wxTreeItemId& parent,
+ size_t index,
+ const wxString& text,
+ int image, int selectedImage,
+ wxTreeItemData *data)
{
- return DoInsertItem(parent, (WXHTREEITEM) TVI_LAST,
- text, image, selectedImage, data);
+ wxTreeItemId idPrev;
+ if ( index == (size_t)-1 )
+ {
+ // special value: append to the end
+ idPrev = TVI_LAST;
+ }
+ else // find the item from index
+ {
+ wxTreeItemIdValue cookie;
+ wxTreeItemId idCur = GetFirstChild(parent, cookie);
+ while ( index != 0 && idCur.IsOk() )
+ {
+ index--;
+
+ idPrev = idCur;
+ idCur = GetNextChild(parent, cookie);
+ }
+
+ // assert, not check: if the index is invalid, we will append the item
+ // to the end
+ wxASSERT_MSG( index == 0, _T("bad index in wxTreeCtrl::InsertItem") );
+ }
+
+ return DoInsertAfter(parent, idPrev, text, image, selectedImage, data);
}
void wxTreeCtrl::Delete(const wxTreeItemId& item)
// delete all children (but don't delete the item itself)
void wxTreeCtrl::DeleteChildren(const wxTreeItemId& item)
{
- long cookie;
+ wxTreeItemIdValue cookie;
- wxArrayLong children;
+ wxArrayTreeItemIds children;
wxTreeItemId child = GetFirstChild(item, cookie);
while ( child.IsOk() )
{
- children.Add((long)(WXHTREEITEM)child);
+ children.Add(child);
child = GetNextChild(item, cookie);
}
size_t nCount = children.Count();
for ( size_t n = 0; n < nCount; n++ )
{
- if ( !TreeView_DeleteItem(GetHwnd(), (HTREEITEM)children[n]) )
+ if ( !TreeView_DeleteItem(GetHwnd(), HITEM(children[n])) )
{
wxLogLastError(wxT("TreeView_DeleteItem"));
}
void wxTreeCtrl::DeleteAllItems()
{
+ // delete the "virtual" root item.
+ if ( GET_VIRTUAL_ROOT() )
+ {
+ delete GET_VIRTUAL_ROOT();
+ m_pVirtualRoot = NULL;
+ }
+
+ // and all the real items
+
if ( !TreeView_DeleteAllItems(GetHwnd()) )
{
wxLogLastError(wxT("TreeView_DeleteAllItems"));
flag == TVE_TOGGLE,
wxT("Unknown flag in wxTreeCtrl::DoExpand") );
+ // A hidden root can be neither expanded nor collapsed.
+ wxCHECK_RET( !(m_windowStyle & wxTR_HIDE_ROOT) || (HITEM(item) != TVI_ROOT),
+ wxT("Can't expand/collapse hidden root node!") )
+
// TreeView_Expand doesn't send TVN_ITEMEXPAND(ING) messages, so we must
// emulate them. This behaviour has changed slightly with comctl32.dll
// v 4.70 - now it does send them but only the first time. To maintain
{
wxTreeEvent event(wxEVT_NULL, m_windowId);
event.m_item = item;
+ event.SetEventObject(this);
- bool isExpanded = IsExpanded(item);
+ // note that the {EXPAND|COLLAPS}ING event is sent by TreeView_Expand()
+ // itself
+ event.SetEventType(gs_expandEvents[IsExpanded(item) ? IDX_EXPAND
+ : IDX_COLLAPSE]
+ [IDX_DONE]);
- event.SetEventObject(this);
-
- // FIXME return value of {EXPAND|COLLAPS}ING event handler is discarded
- event.SetEventType(g_events[isExpanded][TRUE]);
- GetEventHandler()->ProcessEvent(event);
-
- event.SetEventType(g_events[isExpanded][FALSE]);
- GetEventHandler()->ProcessEvent(event);
+ (void)GetEventHandler()->ProcessEvent(event);
}
//else: change didn't took place, so do nothing at all
}
DoExpand(item, TVE_TOGGLE);
}
+#if WXWIN_COMPATIBILITY_2_4
+
void wxTreeCtrl::ExpandItem(const wxTreeItemId& item, int action)
{
DoExpand(item, action);
}
+#endif
+
void wxTreeCtrl::Unselect()
{
wxASSERT_MSG( !(m_windowStyle & wxTR_MULTIPLE),
wxT("doesn't make sense, may be you want UnselectAll()?") );
// just remove the selection
- SelectItem(wxTreeItemId((long) (WXHTREEITEM) 0));
+ SelectItem(wxTreeItemId());
}
void wxTreeCtrl::UnselectAll()
for ( size_t n = 0; n < count; n++ )
{
#if wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE
- SetItemCheck(selections[n], FALSE);
+ SetItemCheck(HITEM(selections[n]), false);
#else // !wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE
::UnselectItem(GetHwnd(), HITEM(selections[n]));
#endif // wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE/!wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE
}
+
+ m_htSelStart.Unset();
}
else
{
}
}
-void wxTreeCtrl::SelectItem(const wxTreeItemId& item)
+void wxTreeCtrl::SelectItem(const wxTreeItemId& item, bool select)
{
if ( m_windowStyle & wxTR_MULTIPLE )
{
#if wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE
// selecting the item means checking it
- SetItemCheck(item);
+ SetItemCheck(item, select);
#else // !wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE
- ::SelectItem(GetHwnd(), HITEM(item));
+ ::SelectItem(GetHwnd(), HITEM(item), select);
#endif // wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE/!wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE
}
else
{
+ wxASSERT_MSG( select,
+ _T("SelectItem(false) works only for multiselect") );
+
// inspite of the docs (MSDN Jan 99 edition), we don't seem to receive
// the notification from the control (i.e. TVN_SELCHANG{ED|ING}), so
// send them ourselves
{
wxLogLastError(wxT("TreeView_SelectItem"));
}
- else
+ else // ok
{
event.SetEventType(wxEVT_COMMAND_TREE_SEL_CHANGED);
(void)GetEventHandler()->ProcessEvent(event);
}
}
-wxTextCtrl* wxTreeCtrl::GetEditControl() const
+wxTextCtrl *wxTreeCtrl::GetEditControl() const
{
- // normally, we could try to do something like this to return something
- // even when the editing was started by the user and not by calling
- // EditLabel() - but as nobody has asked for this so far and there might be
- // problems in the code below, I leave it disabled for now (VZ)
-#if 0
- if ( !m_textCtrl )
- {
- HWND hwndText = TreeView_GetEditControl(GetHwnd());
- if ( hwndText )
- {
- m_textCtrl = new wxTextCtrl(this, -1);
- m_textCtrl->Hide();
- m_textCtrl->SetHWND((WXHWND)hwndText);
- }
- //else: not editing label right now
- }
-#endif // 0
-
return m_textCtrl;
}
{
if ( m_textCtrl )
{
+ // the HWND corresponding to this control is deleted by the tree
+ // control itself and we don't know when exactly this happens, so check
+ // if the window still exists before calling UnsubclassWin()
+ if ( !::IsWindow(GetHwndOf(m_textCtrl)) )
+ {
+ m_textCtrl->SetHWND(0);
+ }
+
m_textCtrl->UnsubclassWin();
m_textCtrl->SetHWND(0);
delete m_textCtrl;
m_textCtrl = NULL;
+
+ m_idEdited.Unset();
}
}
DeleteTextCtrl();
+ m_idEdited = item;
+ m_textCtrl = (wxTextCtrl *)textControlClass->CreateObject();
HWND hWnd = (HWND) TreeView_EditLabel(GetHwnd(), HITEM(item));
// this is not an error - the TVN_BEGINLABELEDIT handler might have
- // returned FALSE
+ // returned false
if ( !hWnd )
{
+ delete m_textCtrl;
+ m_textCtrl = NULL;
return NULL;
}
- m_textCtrl = (wxTextCtrl *)textControlClass->CreateObject();
- m_textCtrl->SetHWND((WXHWND)hWnd);
- m_textCtrl->SubclassWin((WXHWND)hWnd);
-
+ // textctrl is subclassed in MSWOnNotify
return m_textCtrl;
}
// End label editing, optionally cancelling the edit
-void wxTreeCtrl::EndEditLabel(const wxTreeItemId& item, bool discardChanges)
+void wxTreeCtrl::DoEndEditLabel(bool discardChanges)
{
TreeView_EndEditLabelNow(GetHwnd(), discardChanges);
DeleteTextCtrl();
}
-wxTreeItemId wxTreeCtrl::HitTest(const wxPoint& point, int& flags)
+wxTreeItemId wxTreeCtrl::DoTreeHitTest(const wxPoint& point, int& flags)
{
TV_HITTESTINFO hitTestInfo;
hitTestInfo.pt.x = (int)point.x;
hitTestInfo.pt.y = (int)point.y;
- TreeView_HitTest(GetHwnd(), &hitTestInfo);
+ (void) TreeView_HitTest(GetHwnd(), &hitTestInfo);
flags = 0;
#undef TRANSLATE_FLAG
- return wxTreeItemId((WXHTREEITEM) hitTestInfo.hItem);
+ return wxTreeItemId(hitTestInfo.hItem);
}
bool wxTreeCtrl::GetBoundingRect(const wxTreeItemId& item,
bool textOnly) const
{
RECT rc;
+
+ // Virtual root items have no bounding rectangle
+ if ( IS_VIRTUAL_ROOT(item) )
+ {
+ return false;
+ }
+
if ( TreeView_GetItemRect(GetHwnd(), HITEM(item),
&rc, textOnly) )
{
rect = wxRect(wxPoint(rc.left, rc.top), wxPoint(rc.right, rc.bottom));
- return TRUE;
+ return true;
}
else
{
// couldn't retrieve rect: for example, item isn't visible
- return FALSE;
+ return false;
}
}
// sorting stuff
// ----------------------------------------------------------------------------
-static int CALLBACK TreeView_CompareCallback(wxTreeItemData *pItem1,
- wxTreeItemData *pItem2,
- wxTreeCtrl *tree)
+// this is just a tiny namespace which is friend to wxTreeCtrl and so can use
+// functions such as IsDataIndirect()
+class wxTreeSortHelper
+{
+public:
+ static int CALLBACK Compare(LPARAM data1, LPARAM data2, LPARAM tree);
+
+private:
+ static wxTreeItemId GetIdFromData(wxTreeCtrl *tree, LPARAM item)
+ {
+ wxTreeItemData *data = (wxTreeItemData *)item;
+ if ( tree->IsDataIndirect(data) )
+ {
+ data = ((wxTreeItemIndirectData *)data)->GetData();
+ }
+
+ return data->GetId();
+ }
+};
+
+int CALLBACK wxTreeSortHelper::Compare(LPARAM pItem1,
+ LPARAM pItem2,
+ LPARAM htree)
{
wxCHECK_MSG( pItem1 && pItem2, 0,
wxT("sorting tree without data doesn't make sense") );
- return tree->OnCompareItems(pItem1->GetId(), pItem2->GetId());
-}
+ wxTreeCtrl *tree = (wxTreeCtrl *)htree;
-int wxTreeCtrl::OnCompareItems(const wxTreeItemId& item1,
- const wxTreeItemId& item2)
-{
- return wxStrcmp(GetItemText(item1), GetItemText(item2));
+ return tree->OnCompareItems(GetIdFromData(tree, pItem1),
+ GetIdFromData(tree, pItem2));
}
void wxTreeCtrl::SortChildren(const wxTreeItemId& item)
{
+ wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );
+
// rely on the fact that TreeView_SortChildren does the same thing as our
// default behaviour, i.e. sorts items alphabetically and so call it
// directly if we're not in derived class (much more efficient!)
{
TV_SORTCB tvSort;
tvSort.hParent = HITEM(item);
- tvSort.lpfnCompare = (PFNTVCOMPARE)TreeView_CompareCallback;
+ tvSort.lpfnCompare = wxTreeSortHelper::Compare;
tvSort.lParam = (LPARAM)this;
TreeView_SortChildrenCB(GetHwnd(), &tvSort, 0 /* reserved */);
}
else
{
// nothing done
- return FALSE;
+ return false;
}
// command processed
- return TRUE;
+ return true;
}
// we hook into WndProc to process WM_MOUSEMOVE/WM_BUTTONUP messages - as we
// only do it during dragging, minimize wxWin overhead (this is important for
// WM_MOUSEMOVE as they're a lot of them) by catching Windows messages directly
// instead of passing by wxWin events
-long wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
+WXLRESULT wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
{
- bool processed = FALSE;
- long rc = 0;
+ bool processed = false;
+ WXLRESULT rc = 0;
+ bool isMultiple = HasFlag(wxTR_MULTIPLE);
- bool isMultiple = (GetWindowStyle() & wxTR_MULTIPLE) != 0;
+ // This message is sent after a right-click, or when the "menu" key is pressed
+ if ( nMsg == WM_CONTEXTMENU )
+ {
+ int x = GET_X_LPARAM(lParam),
+ y = GET_Y_LPARAM(lParam);
+ // Convert the screen point to a client point
+ wxPoint MenuPoint = ScreenToClient(wxPoint(x, y));
+
+ wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_MENU, GetId() );
+
+ // can't use GetSelection() here as it would assert in multiselect mode
+ event.m_item = wxTreeItemId(TreeView_GetSelection(GetHwnd()));
+ event.SetEventObject( this );
+
+ // Get the bounding rectangle for the item, including the non-text areas
+ wxRect ItemRect;
+ GetBoundingRect(event.m_item, ItemRect, false);
+ // If the point is inside the bounding rectangle, use it as the click position.
+ // This should be the case for WM_CONTEXTMENU as the result of a right-click
+ if (ItemRect.Inside(MenuPoint))
+ {
+ event.m_pointDrag = MenuPoint;
+ }
+ // Use the Explorer standard of putting the menu at the left edge of the text,
+ // in the vertical middle of the text. Should be the case for the "menu" key
+ else
+ {
+ // Use the bounding rectangle of only the text part
+ GetBoundingRect(event.m_item, ItemRect, true);
+ event.m_pointDrag = wxPoint(ItemRect.GetX(), ItemRect.GetY() + ItemRect.GetHeight() / 2);
+ }
- if ( (nMsg >= WM_MOUSEFIRST) && (nMsg <= WM_MOUSELAST) )
+ if ( GetEventHandler()->ProcessEvent(event) )
+ processed = true;
+ //else: continue with generating wxEVT_CONTEXT_MENU in base class code
+ }
+ else if ( (nMsg >= WM_MOUSEFIRST) && (nMsg <= WM_MOUSELAST) )
{
- // we only process mouse messages here and these parameters have the same
- // meaning for all of them
+ // we only process mouse messages here and these parameters have the
+ // same meaning for all of them
int x = GET_X_LPARAM(lParam),
y = GET_Y_LPARAM(lParam);
HTREEITEM htItem = GetItemFromPoint(GetHwnd(), x, y);
+ TV_HITTESTINFO tvht;
+ tvht.pt.x = x;
+ tvht.pt.y = y;
+
+ (void) TreeView_HitTest(GetHwnd(), &tvht);
+
switch ( nMsg )
{
+ case WM_RBUTTONDOWN:
+ // if the item we are about to right click on is not already
+ // selected or if we click outside of any item, remove the
+ // entire previous selection
+ if ( !htItem || !::IsItemSelected(GetHwnd(), htItem) )
+ {
+ UnselectAll();
+ }
+
+ // select item and set the focus to the
+ // newly selected item
+ ::SelectItem(GetHwnd(), htItem);
+ ::SetFocus(GetHwnd(), htItem);
+ break;
+
#if !wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE
case WM_LBUTTONDOWN:
- if ( htItem && isMultiple )
+ if ( htItem && isMultiple && (tvht.flags & TVHT_ONITEM) != 0 )
{
+ m_htClickedItem = (WXHTREEITEM) htItem;
+ m_ptClick = wxPoint(x, y);
+
if ( wParam & MK_CONTROL )
{
SetFocus();
// toggle selected state
- ToggleItemSelection(GetHwnd(), htItem);
+ ::ToggleItemSelection(GetHwnd(), htItem);
::SetFocus(GetHwnd(), htItem);
// reset on any click without Shift
- m_htSelStart = 0;
+ m_htSelStart.Unset();
- processed = TRUE;
+ processed = true;
}
else if ( wParam & MK_SHIFT )
{
if ( !m_htSelStart )
{
// take the focused item
- m_htSelStart = (WXHTREEITEM)
- TreeView_GetSelection(GetHwnd());
+ m_htSelStart = TreeView_GetSelection(GetHwnd());
}
- SelectRange(GetHwnd(), HITEM(m_htSelStart), htItem,
+ if ( m_htSelStart )
+ SelectRange(GetHwnd(), HITEM(m_htSelStart), htItem,
!(wParam & MK_CONTROL));
+ else
+ ::SelectItem(GetHwnd(), htItem);
::SetFocus(GetHwnd(), htItem);
- processed = TRUE;
+ processed = true;
}
else // normal click
{
- // clear the selection and then let the default handler
- // do the job
- UnselectAll();
+ // avoid doing anything if we click on the only
+ // currently selected item
+
+ SetFocus();
+
+ wxArrayTreeItemIds selections;
+ size_t count = GetSelections(selections);
+ if ( count == 0 ||
+ count > 1 ||
+ HITEM(selections[0]) != htItem )
+ {
+ // clear the previously selected items, if the
+ // user clicked outside of the present selection.
+ // otherwise, perform the deselection on mouse-up.
+ // this allows multiple drag and drop to work.
- // prevent the click from starting in-place editing
- // when there was no selection in the control
- TreeView_SelectItem(GetHwnd(), 0);
+ if (!IsItemSelected(GetHwnd(), htItem))
+ {
+ UnselectAll();
+
+ // prevent the click from starting in-place editing
+ // which should only happen if we click on the
+ // already selected item (and nothing else is
+ // selected)
+
+ TreeView_SelectItem(GetHwnd(), 0);
+ ::SelectItem(GetHwnd(), htItem);
+ }
+ ::SetFocus(GetHwnd(), htItem);
+ processed = true;
+ }
// reset on any click without Shift
- m_htSelStart = 0;
+ m_htSelStart.Unset();
}
}
break;
#endif // wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE
case WM_MOUSEMOVE:
+#ifndef __WXWINCE__
+ if ( m_htClickedItem )
+ {
+ int cx = abs(m_ptClick.x - x);
+ int cy = abs(m_ptClick.y - y);
+
+ if ( cx > GetSystemMetrics( SM_CXDRAG ) || cy > GetSystemMetrics( SM_CYDRAG ) )
+ {
+ HWND pWnd = ::GetParent( GetHwnd() );
+ if ( pWnd )
+ {
+ NM_TREEVIEW tv;
+
+ tv.hdr.hwndFrom = GetHwnd();
+ tv.hdr.idFrom = ::GetWindowLong( GetHwnd(), GWL_ID );
+ tv.hdr.code = TVN_BEGINDRAG;
+
+ tv.itemNew.hItem = HITEM(m_htClickedItem);
+
+ TVITEM tviAux;
+ ZeroMemory(&tviAux, sizeof(tviAux));
+ tviAux.hItem = HITEM(m_htClickedItem);
+ tviAux.mask = TVIF_STATE | TVIF_PARAM;
+ tviAux.stateMask = 0xffffffff;
+ TreeView_GetItem( GetHwnd(), &tviAux );
+
+ tv.itemNew.state = tviAux.state;
+ tv.itemNew.lParam = tviAux.lParam;
+
+ tv.ptDrag.x = x;
+ tv.ptDrag.y = y;
+
+ ::SendMessage( pWnd, WM_NOTIFY, tv.hdr.idFrom, (LPARAM)&tv );
+ }
+ m_htClickedItem.Unset();
+ }
+ }
+#endif // __WXWINCE__
+
if ( m_dragImage )
{
m_dragImage->Move(wxPoint(x, y));
break;
case WM_LBUTTONUP:
+
+ // facilitates multiple drag-and-drop
+ if (htItem && isMultiple)
+ {
+ wxArrayTreeItemIds selections;
+ size_t count = GetSelections(selections);
+
+ if (count > 1 &&
+ !(wParam & MK_CONTROL) &&
+ !(wParam & MK_SHIFT))
+ {
+ UnselectAll();
+ TreeView_SelectItem(GetHwnd(), htItem);
+ ::SelectItem(GetHwnd(), htItem);
+ ::SetFocus(GetHwnd(), htItem);
+ }
+ m_htClickedItem.Unset();
+ }
+
+ // fall through
+
case WM_RBUTTONUP:
if ( m_dragImage )
{
// generate the drag end event
wxTreeEvent event(wxEVT_COMMAND_TREE_END_DRAG, m_windowId);
- event.m_item = (WXHTREEITEM)htItem;
+ event.m_item = htItem;
event.m_pointDrag = wxPoint(x, y);
event.SetEventObject(this);
RECT rect;
for ( size_t n = 0; n < count; n++ )
{
- // TreeView_GetItemRect() will return FALSE if item is not visible,
+ // TreeView_GetItemRect() will return false if item is not visible,
// which may happen perfectly well
if ( TreeView_GetItemRect(GetHwnd(), HITEM(selections[n]),
&rect, TRUE) )
bool bCtrl = wxIsCtrlDown(),
bShift = wxIsShiftDown();
- // we handle.arrows and space, but not page up/down and home/end: the
- // latter should be easy, but not the former
-
HTREEITEM htSel = (HTREEITEM)TreeView_GetSelection(GetHwnd());
- if ( !m_htSelStart )
+ switch ( wParam )
{
- m_htSelStart = (WXHTREEITEM)htSel;
- }
-
- if ( wParam == VK_SPACE )
- {
- if ( bCtrl )
- {
- ToggleItemSelection(GetHwnd(), htSel);
- }
- else
- {
- UnselectAll();
-
- ::SelectItem(GetHwnd(), htSel);
- }
+ case VK_SPACE:
+ if ( bCtrl )
+ {
+ ::ToggleItemSelection(GetHwnd(), htSel);
+ }
+ else
+ {
+ UnselectAll();
- processed = TRUE;
- }
- else if ( wParam == VK_UP || wParam == VK_DOWN )
- {
- if ( !bCtrl && !bShift )
- {
- // no modifiers, just clear selection and then let the default
- // processing to take place
- UnselectAll();
- }
- else if ( htSel )
- {
- (void)wxControl::MSWWindowProc(nMsg, wParam, lParam);
+ ::SelectItem(GetHwnd(), htSel);
+ }
- HTREEITEM htNext = (HTREEITEM)(wParam == VK_UP
- ? TreeView_GetPrevVisible(GetHwnd(), htSel)
- : TreeView_GetNextVisible(GetHwnd(), htSel));
+ processed = true;
+ break;
- if ( !htNext )
+ case VK_UP:
+ case VK_DOWN:
+ if ( !bCtrl && !bShift )
{
- // at the top/bottom
- htNext = htSel;
+ // no modifiers, just clear selection and then let the default
+ // processing to take place
+ UnselectAll();
}
-
- if ( bShift )
+ else if ( htSel )
{
- SelectRange(GetHwnd(), HITEM(m_htSelStart), htNext);
+ (void)wxControl::MSWWindowProc(nMsg, wParam, lParam);
+
+ HTREEITEM htNext = (HTREEITEM)
+ TreeView_GetNextItem
+ (
+ GetHwnd(),
+ htSel,
+ wParam == VK_UP ? TVGN_PREVIOUSVISIBLE
+ : TVGN_NEXTVISIBLE
+ );
+
+ if ( !htNext )
+ {
+ // at the top/bottom
+ htNext = htSel;
+ }
+
+ if ( bShift )
+ {
+ if ( !m_htSelStart )
+ m_htSelStart = htSel;
+
+ SelectRange(GetHwnd(), HITEM(m_htSelStart), htNext);
+ }
+ else // bCtrl
+ {
+ // without changing selection
+ ::SetFocus(GetHwnd(), htNext);
+ }
+
+ processed = true;
}
- else // bCtrl
+ break;
+
+ case VK_HOME:
+ case VK_END:
+ case VK_PRIOR:
+ case VK_NEXT:
+ // TODO: handle Shift/Ctrl with these keys
+ if ( !bCtrl && !bShift )
{
- // without changing selection
- ::SetFocus(GetHwnd(), htNext);
+ UnselectAll();
+
+ m_htSelStart.Unset();
}
+ }
+ }
+#endif // !wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE
+ else if ( nMsg == WM_COMMAND )
+ {
+ // if we receive a EN_KILLFOCUS command from the in-place edit control
+ // used for label editing, make sure to end editing
+ WORD id, cmd;
+ WXHWND hwnd;
+ UnpackCommand(wParam, lParam, &id, &hwnd, &cmd);
- processed = TRUE;
+ if ( cmd == EN_KILLFOCUS )
+ {
+ if ( m_textCtrl && m_textCtrl->GetHandle() == hwnd )
+ {
+ DoEndEditLabel();
+
+ processed = true;
}
}
}
-#endif // !wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE
if ( !processed )
rc = wxControl::MSWWindowProc(nMsg, wParam, lParam);
return rc;
}
+WXLRESULT
+wxTreeCtrl::MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
+{
+ // default WM_RBUTTONDOWN handler enters modal loop inside DefWindowProc()
+ // waiting for WM_RBUTTONUP and then sends the resulting WM_CONTEXTMENU to
+ // the parent window, not us, which completely breaks everything so simply
+ // don't let it see this message at all
+ if ( nMsg == WM_RBUTTONDOWN )
+ return 0;
+
+ // but because of the above we don't get NM_RCLICK which is normally
+ // generated by tree window proc when the modal loop mentioned above ends
+ // because the mouse is released -- synthesize it ourselves instead
+ if ( nMsg == WM_RBUTTONUP )
+ {
+ NMHDR hdr;
+ hdr.hwndFrom = GetHwnd();
+ hdr.idFrom = GetId();
+ hdr.code = NM_RCLICK;
+
+ WXLPARAM rc;
+ MSWOnNotify(GetId(), (LPARAM)&hdr, &rc);
+
+ // continue as usual
+ }
+
+ if ( nMsg == WM_CHAR )
+ {
+ // also don't let the control process Space and Return keys because it
+ // doesn't do anything useful with them anyhow but always beeps
+ // annoyingly when it receives them and there is no way to turn it off
+ // simply if you just process TREEITEM_ACTIVATED event to which Space
+ // and Enter presses are mapped in your code
+ if ( wParam == VK_SPACE || wParam == VK_RETURN )
+ return 0;
+ }
+
+ return wxControl::MSWDefWindowProc(nMsg, wParam, lParam);
+}
+
// process WM_NOTIFY Windows message
bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
{
NM_TREEVIEW *tv = (NM_TREEVIEW *)lParam;
- event.m_item = (WXHTREEITEM) tv->itemNew.hItem;
+ event.m_item = tv->itemNew.hItem;
event.m_pointDrag = wxPoint(tv->ptDrag.x, tv->ptDrag.y);
// don't allow dragging by default: the user code must
eventType = wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT;
TV_DISPINFO *info = (TV_DISPINFO *)lParam;
- event.m_item = (WXHTREEITEM) info->item.hItem;
+ // although the user event handler may still veto it, it is
+ // important to set it now so that calls to SetItemText() from
+ // the event handler would change the text controls contents
+ m_idEdited =
+ event.m_item = info->item.hItem;
event.m_label = info->item.pszText;
+ event.m_editCancelled = false;
}
break;
eventType = wxEVT_COMMAND_TREE_DELETE_ITEM;
NM_TREEVIEW *tv = (NM_TREEVIEW *)lParam;
- event.m_item = (WXHTREEITEM)tv->itemOld.hItem;
+ event.m_item = tv->itemOld.hItem;
if ( m_hasAnyAttr )
{
- delete (wxTreeItemAttr *)m_attrs.
- Delete((long)tv->itemOld.hItem);
+ wxMapTreeAttr::iterator it = m_attrs.find(tv->itemOld.hItem);
+ if ( it != m_attrs.end() )
+ {
+ delete it->second;
+ m_attrs.erase(it);
+ }
}
}
break;
eventType = wxEVT_COMMAND_TREE_END_LABEL_EDIT;
TV_DISPINFO *info = (TV_DISPINFO *)lParam;
- event.m_item = (WXHTREEITEM)info->item.hItem;
+ event.m_item = info->item.hItem;
event.m_label = info->item.pszText;
- if (info->item.pszText == NULL)
- return FALSE;
+ event.m_editCancelled = info->item.pszText == NULL;
+ break;
+ }
+
+#ifndef __WXWINCE__
+ // These *must* not be removed or TVN_GETINFOTIP will
+ // not be processed each time the mouse is moved
+ // and the tooltip will only ever update once.
+ case TTN_NEEDTEXTA:
+ case TTN_NEEDTEXTW:
+ {
+ *result = 0;
+
break;
}
+#ifdef TVN_GETINFOTIP
+ case TVN_GETINFOTIP:
+ {
+ eventType = wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP;
+ NMTVGETINFOTIP *info = (NMTVGETINFOTIP*)lParam;
+
+ // Which item are we trying to get a tooltip for?
+ event.m_item = info->hItem;
+
+ break;
+ }
+#endif
+#endif
+
case TVN_GETDISPINFO:
eventType = wxEVT_COMMAND_TREE_GET_INFO;
// fall through
TV_DISPINFO *info = (TV_DISPINFO *)lParam;
- event.m_item = (WXHTREEITEM) info->item.hItem;
+ event.m_item = info->item.hItem;
break;
}
case TVN_ITEMEXPANDING:
- event.m_code = FALSE;
- // fall through
-
case TVN_ITEMEXPANDED:
{
NM_TREEVIEW* tv = (NM_TREEVIEW*)lParam;
- bool expand = FALSE;
+ int what;
switch ( tv->action )
{
+ default:
+ wxLogDebug(wxT("unexpected code %d in TVN_ITEMEXPAND message"), tv->action);
+ // fall through
+
case TVE_EXPAND:
- expand = TRUE;
+ what = IDX_EXPAND;
break;
case TVE_COLLAPSE:
- expand = FALSE;
+ what = IDX_COLLAPSE;
break;
-
- default:
- wxLogDebug(wxT("unexpected code %d in TVN_ITEMEXPAND message"), tv->action);
}
- bool ing = ((int)hdr->code == TVN_ITEMEXPANDING);
- eventType = g_events[expand][ing];
+ int how = hdr->code == TVN_ITEMEXPANDING ? IDX_DOING
+ : IDX_DONE;
+
+ eventType = gs_expandEvents[what][how];
- event.m_item = (WXHTREEITEM) tv->itemNew.hItem;
+ event.m_item = tv->itemNew.hItem;
}
break;
eventType = wxEVT_COMMAND_TREE_KEY_DOWN;
TV_KEYDOWN *info = (TV_KEYDOWN *)lParam;
- event.m_code = wxCharCodeMSWToWX(info->wVKey);
+ // fabricate the lParam and wParam parameters sufficiently
+ // similar to the ones from a "real" WM_KEYDOWN so that
+ // CreateKeyEvent() works correctly
+ const bool isAltDown = ::GetKeyState(VK_MENU) < 0;
+ WXLPARAM lParam = (isAltDown ? KF_ALTDOWN : 0) << 16;
+
+ WXWPARAM wParam = info->wVKey;
+
+ int keyCode = wxCharCodeMSWToWX(info->wVKey);
+ if ( !keyCode )
+ {
+ // wxCharCodeMSWToWX() returns 0 to indicate that this is a
+ // simple ASCII key
+ keyCode = wParam;
+ }
+
+ event.m_evtKey = CreateKeyEvent(wxEVT_KEY_DOWN,
+ keyCode,
+ lParam,
+ wParam);
// a separate event for Space/Return
- if ( !wxIsCtrlDown() && !wxIsShiftDown() &&
+ if ( !wxIsCtrlDown() && !wxIsShiftDown() && !isAltDown &&
((info->wVKey == VK_SPACE) || (info->wVKey == VK_RETURN)) )
{
wxTreeEvent event2(wxEVT_COMMAND_TREE_ITEM_ACTIVATED,
}
break;
- case TVN_SELCHANGED:
+ // NB: MSLU is broken and sends TVN_SELCHANGEDA instead of
+ // TVN_SELCHANGEDW in Unicode mode under Win98. Therefore
+ // we have to handle both messages:
+ case TVN_SELCHANGEDA:
+ case TVN_SELCHANGEDW:
eventType = wxEVT_COMMAND_TREE_SEL_CHANGED;
// fall through
- case TVN_SELCHANGING:
+ case TVN_SELCHANGINGA:
+ case TVN_SELCHANGINGW:
{
if ( eventType == wxEVT_NULL )
eventType = wxEVT_COMMAND_TREE_SEL_CHANGING;
//else: already set above
- NM_TREEVIEW* tv = (NM_TREEVIEW *)lParam;
-
- event.m_item = (WXHTREEITEM) tv->itemNew.hItem;
- event.m_itemOld = (WXHTREEITEM) tv->itemOld.hItem;
+ if (hdr->code == TVN_SELCHANGINGW ||
+ hdr->code == TVN_SELCHANGEDW)
+ {
+ NM_TREEVIEWW* tv = (NM_TREEVIEWW *)lParam;
+ event.m_item = tv->itemNew.hItem;
+ event.m_itemOld = tv->itemOld.hItem;
+ }
+ else
+ {
+ NM_TREEVIEWA* tv = (NM_TREEVIEWA *)lParam;
+ event.m_item = tv->itemNew.hItem;
+ event.m_itemOld = tv->itemOld.hItem;
+ }
}
break;
-#if defined(_WIN32_IE) && _WIN32_IE >= 0x300 && !wxUSE_COMCTL32_SAFELY
+ // instead of explicitly checking for _WIN32_IE, check if the
+ // required symbols are available in the headers
+#if defined(CDDS_PREPAINT) && !wxUSE_COMCTL32_SAFELY
case NM_CUSTOMDRAW:
{
LPNMTVCUSTOMDRAW lptvcd = (LPNMTVCUSTOMDRAW)lParam;
NMCUSTOMDRAW& nmcd = lptvcd->nmcd;
- switch( nmcd.dwDrawStage )
+ switch ( nmcd.dwDrawStage )
{
case CDDS_PREPAINT:
// if we've got any items with non standard attributes,
// notify us before painting each item
*result = m_hasAnyAttr ? CDRF_NOTIFYITEMDRAW
: CDRF_DODEFAULT;
- return TRUE;
+ break;
case CDDS_ITEMPREPAINT:
{
- wxTreeItemAttr *attr =
- (wxTreeItemAttr *)m_attrs.Get(nmcd.dwItemSpec);
+ wxMapTreeAttr::iterator
+ it = m_attrs.find((void *)nmcd.dwItemSpec);
- if ( !attr )
+ if ( it == m_attrs.end() )
{
// nothing to do for this item
- return CDRF_DODEFAULT;
- }
-
- HFONT hFont;
- wxColour colText, colBack;
- if ( attr->HasFont() )
- {
- wxFont font = attr->GetFont();
- hFont = (HFONT)font.GetResourceHandle();
- }
- else
- {
- hFont = 0;
- }
-
- if ( attr->HasTextColour() )
- {
- colText = attr->GetTextColour();
- }
- else
- {
- colText = GetForegroundColour();
+ *result = CDRF_DODEFAULT;
+ break;
}
- // selection colours should override ours
- if ( nmcd.uItemState & CDIS_SELECTED )
- {
- DWORD clrBk = ::GetSysColor(COLOR_HIGHLIGHT);
- lptvcd->clrTextBk = clrBk;
+ wxTreeItemAttr * const attr = it->second;
- // try to make the text visible
- lptvcd->clrText = wxColourToRGB(colText);
- lptvcd->clrText |= ~clrBk;
- lptvcd->clrText &= 0x00ffffff;
- }
- else
+ // selection colours should override ours,
+ // otherwise it is too confusing ot the user
+ if ( !(nmcd.uItemState & CDIS_SELECTED) )
{
+ wxColour colBack;
if ( attr->HasBackgroundColour() )
{
colBack = attr->GetBackgroundColour();
+ lptvcd->clrTextBk = wxColourToRGB(colBack);
}
- else
+ }
+
+ // but we still want to keep the special foreground
+ // colour when we don't have focus (we can't keep
+ // it when we do, it would usually be unreadable on
+ // the almost inverted bg colour...)
+ if ( !(nmcd.uItemState & CDIS_SELECTED) ||
+ FindFocus() != this )
+ {
+ wxColour colText;
+ if ( attr->HasTextColour() )
{
- colBack = GetBackgroundColour();
+ colText = attr->GetTextColour();
+ lptvcd->clrText = wxColourToRGB(colText);
}
-
- lptvcd->clrText = wxColourToRGB(colText);
- lptvcd->clrTextBk = wxColourToRGB(colBack);
}
- // note that if we wanted to set colours for
- // individual columns (subitems), we would have
- // returned CDRF_NOTIFYSUBITEMREDRAW from here
- if ( hFont )
+ if ( attr->HasFont() )
{
+ HFONT hFont = GetHfontOf(attr->GetFont());
+
::SelectObject(nmcd.hdc, hFont);
*result = CDRF_NEWFONT;
}
- else
+ else // no specific font
{
*result = CDRF_DODEFAULT;
}
-
- return TRUE;
}
+ break;
default:
*result = CDRF_DODEFAULT;
- return TRUE;
}
}
- break;
-#endif // _WIN32_IE >= 0x300
+
+ // we always process it
+ return true;
+#endif // have owner drawn support in headers
+
+ case NM_CLICK:
+ {
+ DWORD pos = GetMessagePos();
+ POINT point;
+ point.x = LOWORD(pos);
+ point.y = HIWORD(pos);
+ ::MapWindowPoints(HWND_DESKTOP, GetHwnd(), &point, 1);
+ int flags = 0;
+ wxTreeItemId item = HitTest(wxPoint(point.x, point.y), flags);
+ if (flags & wxTREE_HITTEST_ONITEMSTATEICON)
+ {
+ event.m_item = item;
+ eventType = wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK;
+ }
+ break;
+ }
case NM_DBLCLK:
case NM_RCLICK:
{
if ( tvhti.flags & TVHT_ONITEM )
{
- event.m_item = (WXHTREEITEM) tvhti.hItem;
+ event.m_item = tvhti.hItem;
eventType = (int)hdr->code == NM_DBLCLK
? wxEVT_COMMAND_TREE_ITEM_ACTIVATED
: wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK;
+
+ event.m_pointDrag.x = tvhti.pt.x;
+ event.m_pointDrag.y = tvhti.pt.y;
}
break;
// the return code of this event handler as the return value for
// NM_DBLCLK - otherwise, double clicking the item to toggle its
// expanded status would never work
- *result = FALSE;
+ *result = false;
break;
case TVN_BEGINDRAG:
wxASSERT_MSG( !m_dragImage, _T("starting to drag once again?") );
m_dragImage = new wxDragImage(*this, event.m_item);
- m_dragImage->BeginDrag(wxPoint(0, 0), this);
+ m_dragImage->BeginDrag(wxPoint(0,0), this);
m_dragImage->Show();
}
break;
case TVN_DELETEITEM:
{
- // NB: we might process this message using wxWindows event
+ // NB: we might process this message using wxWidgets event
// tables, but due to overhead of wxWin event system we
// prefer to do it here ourself (otherwise deleting a tree
// with many items is just too slow)
wxTreeItemIndirectData *data = (wxTreeItemIndirectData *)
tv->itemOld.lParam;
delete data; // can't be NULL here
-
- m_itemsWithIndirectData.Remove(item);
-#if 0
- int iIndex = m_itemsWithIndirectData.Index(item);
- wxASSERT( iIndex != wxNOT_FOUND) ;
- m_itemsWithIndirectData.wxBaseArray::RemoveAt((size_t)iIndex);
-#endif
}
else
{
delete data; // may be NULL, ok
}
- processed = TRUE; // Make sure we don't get called twice
+ processed = true; // Make sure we don't get called twice
}
break;
case TVN_BEGINLABELEDIT:
- // return TRUE to cancel label editing
+ // return true to cancel label editing
*result = !event.IsAllowed();
+
+ // set ES_WANTRETURN ( like we do in BeginLabelEdit )
+ if ( event.IsAllowed() )
+ {
+ HWND hText = TreeView_GetEditControl(GetHwnd());
+ if(hText != NULL)
+ {
+ // MBN: if m_textCtrl already has an HWND, it is a stale
+ // pointer from a previous edit (because the user
+ // didn't modify the label before dismissing the control,
+ // and TVN_ENDLABELEDIT was not sent), so delete it
+ if(m_textCtrl && m_textCtrl->GetHWND() != 0)
+ DeleteTextCtrl();
+ if(!m_textCtrl)
+ m_textCtrl = new wxTextCtrl();
+ m_textCtrl->SetParent(this);
+ m_textCtrl->SetHWND((WXHWND)hText);
+ m_textCtrl->SubclassWin((WXHWND)hText);
+
+ // set wxTE_PROCESS_ENTER style for the text control to
+ // force it to process the Enter presses itself, otherwise
+ // they could be stolen from it by the dialog
+ // navigation code
+ m_textCtrl->SetWindowStyle(m_textCtrl->GetWindowStyle()
+ | wxTE_PROCESS_ENTER);
+ }
+ }
+ else // we had set m_idEdited before
+ {
+ m_idEdited.Unset();
+ }
break;
case TVN_ENDLABELEDIT:
- // return TRUE to set the label to the new string: note that we
+ // return true to set the label to the new string: note that we
// also must pretend that we did process the message or it is going
- // to be passed to DefWindowProc() which will happily return FALSE
+ // to be passed to DefWindowProc() which will happily return false
// cancelling the label change
*result = event.IsAllowed();
- processed = TRUE;
+ processed = true;
// ensure that we don't have the text ctrl which is going to be
// deleted any more
DeleteTextCtrl();
break;
+#ifndef __WXWINCE__
+#ifdef TVN_GETINFOTIP
+ case TVN_GETINFOTIP:
+ {
+ // If the user permitted a tooltip change, change it
+ if (event.IsAllowed())
+ {
+ SetToolTip(event.m_label);
+ }
+ }
+ break;
+#endif
+#endif
+
case TVN_SELCHANGING:
case TVN_ITEMEXPANDING:
- // return TRUE to prevent the action from happening
+ // return true to prevent the action from happening
*result = !event.IsAllowed();
break;
+ case TVN_ITEMEXPANDED:
+ // the item is not refreshed properly after expansion when it has
+ // an image depending on the expanded/collapsed state - bug in
+ // comctl32.dll or our code?
+ {
+ NM_TREEVIEW* tv = (NM_TREEVIEW *)lParam;
+ wxTreeItemId id(tv->itemNew.hItem);
+
+ int image = GetItemImage(id, wxTreeItemIcon_Expanded);
+ if ( image != -1 )
+ {
+ RefreshItem(id);
+ }
+ }
+ break;
+
case TVN_GETDISPINFO:
// NB: so far the user can't set the image himself anyhow, so do it
// anyway - but this may change later
- if ( /* !processed && */ 1 )
+ //if ( /* !processed && */ 1 )
{
wxTreeItemId item = event.m_item;
TV_DISPINFO *info = (TV_DISPINFO *)lParam;
// for the other messages the return value is ignored and there is
// nothing special to do
}
-
return processed;
}
-#endif // __WIN95__
+// ----------------------------------------------------------------------------
+// State control.
+// ----------------------------------------------------------------------------
+
+// why do they define INDEXTOSTATEIMAGEMASK but not the inverse?
+#define STATEIMAGEMASKTOINDEX(state) (((state) & TVIS_STATEIMAGEMASK) >> 12)
+
+void wxTreeCtrl::SetState(const wxTreeItemId& node, int state)
+{
+ TV_ITEM tvi;
+ tvi.hItem = (HTREEITEM)node.m_pItem;
+ tvi.mask = TVIF_STATE;
+ tvi.stateMask = TVIS_STATEIMAGEMASK;
+
+ // Select the specified state, or -1 == cycle to the next one.
+ if ( state == -1 )
+ {
+ TreeView_GetItem(GetHwnd(), &tvi);
+
+ state = STATEIMAGEMASKTOINDEX(tvi.state) + 1;
+ if ( state == m_imageListState->GetImageCount() )
+ state = 1;
+ }
+
+ wxCHECK_RET( state < m_imageListState->GetImageCount(),
+ _T("wxTreeCtrl::SetState(): item index out of bounds") );
+
+ tvi.state = INDEXTOSTATEIMAGEMASK(state);
+
+ TreeView_SetItem(GetHwnd(), &tvi);
+}
+
+int wxTreeCtrl::GetState(const wxTreeItemId& node)
+{
+ TV_ITEM tvi;
+ tvi.hItem = (HTREEITEM)node.m_pItem;
+ tvi.mask = TVIF_STATE;
+ tvi.stateMask = TVIS_STATEIMAGEMASK;
+ TreeView_GetItem(GetHwnd(), &tvi);
+
+ return STATEIMAGEMASKTOINDEX(tvi.state);
+}
+#endif // wxUSE_TREECTRL
projects / wxWidgets.git / blobdiff