Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

replaced untyped hash with a typed one; 64 bit fixes (don't cast pointers to long...)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22123 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-07-19 21:06:59 +00:00
parent 46674ada08
commit ee4b272189
6 changed files with 227 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
include/wx/generic/treectlg.h
View File

@@ -221,9 +221,11 @@ public:
// the same! // the same!
// get the first child of this item // get the first child of this item
wxTreeItemId GetFirstChild(const wxTreeItemId& item, long& cookie) const; wxTreeItemId GetFirstChild(const wxTreeItemId& item,
wxTreeItemIdValue& cookie) const;
// get the next child // get the next child
wxTreeItemId GetNextChild(const wxTreeItemId& item, long& cookie) const; wxTreeItemId GetNextChild(const wxTreeItemId& item,
wxTreeItemIdValue& cookie) const;
// get the last child of this item - this method doesn't use cookies // get the last child of this item - this method doesn't use cookies
wxTreeItemId GetLastChild(const wxTreeItemId& item) const; wxTreeItemId GetLastChild(const wxTreeItemId& item) const;
@@ -342,14 +344,21 @@ public:
// NB: this function is not reentrant and not MT-safe (FIXME)! // NB: this function is not reentrant and not MT-safe (FIXME)!
void SortChildren(const wxTreeItemId& item); void SortChildren(const wxTreeItemId& item);
#if WXWIN_COMPATIBILITY_2_4
// deprecated functions: use Set/GetItemImage directly // deprecated functions: use Set/GetItemImage directly
// get the selected item image
int GetItemSelectedImage(const wxTreeItemId& item) const int GetItemSelectedImage(const wxTreeItemId& item) const
{ return GetItemImage(item, wxTreeItemIcon_Selected); } { return GetItemImage(item, wxTreeItemIcon_Selected); }
// set the selected item image
void SetItemSelectedImage(const wxTreeItemId& item, int image) void SetItemSelectedImage(const wxTreeItemId& item, int image)
{ SetItemImage(item, image, wxTreeItemIcon_Selected); } { SetItemImage(item, image, wxTreeItemIcon_Selected); }
// use the versions taking wxTreeItemIdValue cookies
wxDEPRECATED( wxTreeItemId GetFirstChild(const wxTreeItemId& item,
long& cookie) const );
wxDEPRECATED( wxTreeItemId GetNextChild(const wxTreeItemId& item,
long& cookie) const );
#endif // WXWIN_COMPATIBILITY_2_4
// implementation only from now on // implementation only from now on
// overridden base class virtuals // overridden base class virtuals

50
include/wx/msw/treectrl.h
View File

@@ -25,6 +25,7 @@
#include "wx/textctrl.h" #include "wx/textctrl.h"
#include "wx/dynarray.h" #include "wx/dynarray.h"
#include "wx/treebase.h" #include "wx/treebase.h"
#include "wx/hashmap.h"
#ifdef __GNUWIN32__ #ifdef __GNUWIN32__
// Cygwin windows.h defines these identifiers // Cygwin windows.h defines these identifiers
@@ -32,19 +33,11 @@
#undef GetNextSibling #undef GetNextSibling
#endif // Cygwin #endif // Cygwin
// the type for "untyped" data
typedef long wxDataType;
// fwd decl // fwd decl
class WXDLLEXPORT wxImageList; class WXDLLEXPORT wxImageList;
class WXDLLEXPORT wxDragImage; class WXDLLEXPORT wxDragImage;
struct WXDLLEXPORT wxTreeViewItem; struct WXDLLEXPORT wxTreeViewItem;
// a callback function used for sorting tree items, it should return -1 if the
// first item precedes the second, +1 if the second precedes the first or 0 if
// they're equivalent
class wxTreeItemData;
// NB: all the following flags are for compatbility only and will be removed in the // NB: all the following flags are for compatbility only and will be removed in the
// next versions // next versions
@@ -57,13 +50,18 @@ enum
wxTREE_EXPAND_TOGGLE wxTREE_EXPAND_TOGGLE
}; };
// flags for deprecated InsertItem() variant // flags for deprecated InsertItem() variant (their values are the same as of
// TVI_FIRST and TVI_LAST)
#define wxTREE_INSERT_FIRST 0xFFFF0001 #define wxTREE_INSERT_FIRST 0xFFFF0001
#define wxTREE_INSERT_LAST 0xFFFF0002 #define wxTREE_INSERT_LAST 0xFFFF0002
// hash storing attributes for our items
WX_DECLARE_EXPORTED_VOIDPTR_HASH_MAP(wxTreeItemAttr *, wxMapTreeAttr);
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxTreeCtrl // wxTreeCtrl
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
class WXDLLEXPORT wxTreeCtrl : public wxControl class WXDLLEXPORT wxTreeCtrl : public wxControl
{ {
public: public:
@@ -241,9 +239,11 @@ public:
// the same! // the same!
// get the first child of this item // get the first child of this item
wxTreeItemId GetFirstChild(const wxTreeItemId& item, long& _cookie) const; wxTreeItemId GetFirstChild(const wxTreeItemId& item,
wxTreeItemIdValue& cookie) const;
// get the next child // get the next child
wxTreeItemId GetNextChild(const wxTreeItemId& item, long& _cookie) const; wxTreeItemId GetNextChild(const wxTreeItemId& item,
wxTreeItemIdValue& cookie) const;
// get the last child of this item - this method doesn't use cookies // get the last child of this item - this method doesn't use cookies
wxTreeItemId GetLastChild(const wxTreeItemId& item) const; wxTreeItemId GetLastChild(const wxTreeItemId& item) const;
@@ -371,34 +371,38 @@ public:
// deprecated // deprecated
// ---------- // ----------
#if WXWIN_COMPATIBILITY_2_4
// these methods are deprecated and will be removed in future versions of // these methods are deprecated and will be removed in future versions of
// wxWindows, they're here for compatibility only, don't use them in new // wxWindows, they're here for compatibility only, don't use them in new
// code (the comments indicate why these methods are now useless and how to // code (the comments indicate why these methods are now useless and how to
// replace them) // replace them)
// use Expand, Collapse, CollapseAndReset or Toggle // use Expand, Collapse, CollapseAndReset or Toggle
void ExpandItem(const wxTreeItemId& item, int action); wxDEPRECATED( void ExpandItem(const wxTreeItemId& item, int action) );
// use AddRoot, PrependItem or AppendItem // use AddRoot, PrependItem or AppendItem
wxTreeItemId InsertItem(const wxTreeItemId& parent, wxDEPRECATED( wxTreeItemId InsertItem(const wxTreeItemId& parent,
const wxString& text, const wxString& text,
int image = -1, int selImage = -1, int image = -1, int selImage = -1,
long insertAfter = wxTREE_INSERT_LAST); long insertAfter = wxTREE_INSERT_LAST) );
// use Set/GetImageList and Set/GetStateImageList // use Set/GetImageList and Set/GetStateImageList
wxImageList *GetImageList(int) const wxImageList *GetImageList(int) const { return GetImageList(); }
{ return GetImageList(); } void SetImageList(wxImageList *imageList, int) { SetImageList(imageList); }
void SetImageList(wxImageList *imageList, int)
{ SetImageList(imageList); }
// use Set/GetItemImage directly // use Set/GetItemImage directly
// get the selected item image
int GetItemSelectedImage(const wxTreeItemId& item) const int GetItemSelectedImage(const wxTreeItemId& item) const
{ return GetItemImage(item, wxTreeItemIcon_Selected); } { return GetItemImage(item, wxTreeItemIcon_Selected); }
// set the selected item image
void SetItemSelectedImage(const wxTreeItemId& item, int image) void SetItemSelectedImage(const wxTreeItemId& item, int image)
{ SetItemImage(item, image, wxTreeItemIcon_Selected); } { SetItemImage(item, image, wxTreeItemIcon_Selected); }
// use the versions taking wxTreeItemIdValue cookies
wxDEPRECATED( wxTreeItemId GetFirstChild(const wxTreeItemId& item,
long& cookie) const );
wxDEPRECATED( wxTreeItemId GetNextChild(const wxTreeItemId& item,
long& cookie) const );
#endif // WXWIN_COMPATIBILITY_2_4
// implementation // implementation
// -------------- // --------------
@@ -463,8 +467,8 @@ private:
bool IsDataIndirect(wxTreeItemData *data) const bool IsDataIndirect(wxTreeItemData *data) const
{ return data && data->GetId().m_pItem == 0; } { return data && data->GetId().m_pItem == 0; }
// the hash storing the items attributes (indexed by items ids) // the hash storing the items attributes (indexed by item ids)
wxHashTable m_attrs; wxMapTreeAttr m_attrs;
// TRUE if the hash above is not empty // TRUE if the hash above is not empty
bool m_hasAnyAttr; bool m_hasAnyAttr;
@@ -476,7 +480,7 @@ private:
void* m_pVirtualRoot; void* m_pVirtualRoot;
// the starting item for selection with Shift // the starting item for selection with Shift
WXHTREEITEM m_htSelStart; wxTreeItemId m_htSelStart;
friend class wxTreeItemIndirectData; friend class wxTreeItemIndirectData;
friend class wxTreeSortHelper; friend class wxTreeSortHelper;

11
include/wx/treebase.h
View File

@@ -34,7 +34,7 @@
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Using this typedef removes an ambiguity when calling Remove() // Using this typedef removes an ambiguity when calling Remove()
typedef unsigned long wxTreeItemIdValue; typedef void *wxTreeItemIdValue;
class WXDLLEXPORT wxTreeItemId class WXDLLEXPORT wxTreeItemId
{ {
@@ -43,11 +43,8 @@ public:
// 0 is invalid value for HTREEITEM // 0 is invalid value for HTREEITEM
wxTreeItemId() { m_pItem = 0; } wxTreeItemId() { m_pItem = 0; }
// this one is used in the generic version // construct wxTreeItemId from the native item id
wxTreeItemId(void *pItem) { m_pItem = (long) pItem; } wxTreeItemId(void *pItem) { m_pItem = pItem; }
// and this one under MSW
wxTreeItemId(long lItem) { m_pItem = lItem; }
// default copy ctor/assignment operator are ok for us // default copy ctor/assignment operator are ok for us
@@ -95,7 +92,7 @@ protected:
wxTreeItemId m_pItem; wxTreeItemId m_pItem;
}; };
WX_DEFINE_EXPORTED_ARRAY_LONG(wxTreeItemId, wxArrayTreeItemIds); WX_DEFINE_EXPORTED_ARRAY_NO_PTR(wxTreeItemId, wxArrayTreeItemIds);
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// constants // constants

70
src/generic/treectlg.cpp
View File

@@ -1138,7 +1138,8 @@ wxTreeItemId wxGenericTreeCtrl::GetItemParent(const wxTreeItemId& item) const
return ((wxGenericTreeItem*) item.m_pItem)->GetParent(); return ((wxGenericTreeItem*) item.m_pItem)->GetParent();
} }
wxTreeItemId wxGenericTreeCtrl::GetFirstChild(const wxTreeItemId& item, long& cookie) const wxTreeItemId wxGenericTreeCtrl::GetFirstChild(const wxTreeItemId& item,
wxTreeItemIdValue& cookie) const
{ {
wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") ); wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );
@@ -1146,7 +1147,40 @@ wxTreeItemId wxGenericTreeCtrl::GetFirstChild(const wxTreeItemId& item, long& co
return GetNextChild(item, cookie); return GetNextChild(item, cookie);
} }
wxTreeItemId wxGenericTreeCtrl::GetNextChild(const wxTreeItemId& item, long& cookie) const wxTreeItemId wxGenericTreeCtrl::GetNextChild(const wxTreeItemId& item,
wxTreeItemIdValue& cookie) const
{
wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );
wxArrayGenericTreeItems& children = ((wxGenericTreeItem*) item.m_pItem)->GetChildren();
// it's ok to cast cookie to size_t, we never have indices big enough to
// overflow "void *"
size_t *pIndex = (size_t *)&cookie;
if ( *pIndex < children.Count() )
{
return children.Item(*pIndex++);
}
else
{
// there are no more of them
return wxTreeItemId();
}
}
#if WXWIN_COMPATIBILITY_2_4
wxTreeItemId wxGenericTreeCtrl::GetFirstChild(const wxTreeItemId& item,
long& cookie) const
{
wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );
cookie = 0;
return GetNextChild(item, cookie);
}
wxTreeItemId wxGenericTreeCtrl::GetNextChild(const wxTreeItemId& item,
long& cookie) const
{ {
wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") ); wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );
@@ -1162,6 +1196,8 @@ wxTreeItemId wxGenericTreeCtrl::GetNextChild(const wxTreeItemId& item, long& coo
} }
} }
#endif // WXWIN_COMPATIBILITY_2_4
wxTreeItemId wxGenericTreeCtrl::GetLastChild(const wxTreeItemId& item) const wxTreeItemId wxGenericTreeCtrl::GetLastChild(const wxTreeItemId& item) const
{ {
wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") ); wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );
@@ -1354,7 +1390,7 @@ wxTreeItemId wxGenericTreeCtrl::DoInsertItem(const wxTreeItemId& parentId,
if ( data != NULL ) if ( data != NULL )
{ {
data->m_pItem = (long) item; data->m_pItem = item;
} }
parent->Insert( item, previous ); parent->Insert( item, previous );
@@ -1374,7 +1410,7 @@ wxTreeItemId wxGenericTreeCtrl::AddRoot(const wxString& text,
image, selImage, data); image, selImage, data);
if ( data != NULL ) if ( data != NULL )
{ {
data->m_pItem = (long) m_anchor; data->m_pItem = m_anchor;
} }
if (HasFlag(wxTR_HIDE_ROOT)) if (HasFlag(wxTR_HIDE_ROOT))
@@ -1462,7 +1498,7 @@ wxTreeItemId wxGenericTreeCtrl::AppendItem(const wxTreeItemId& parentId,
void wxGenericTreeCtrl::SendDeleteEvent(wxGenericTreeItem *item) void wxGenericTreeCtrl::SendDeleteEvent(wxGenericTreeItem *item)
{ {
wxTreeEvent event( wxEVT_COMMAND_TREE_DELETE_ITEM, GetId() ); wxTreeEvent event( wxEVT_COMMAND_TREE_DELETE_ITEM, GetId() );
event.m_item = (long) item; event.m_item = item;
event.SetEventObject( this ); event.SetEventObject( this );
ProcessEvent( event ); ProcessEvent( event );
} }
@@ -1552,7 +1588,7 @@ void wxGenericTreeCtrl::Expand(const wxTreeItemId& itemId)
return; return;
wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_EXPANDING, GetId() ); wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_EXPANDING, GetId() );
event.m_item = (long) item; event.m_item = item;
event.SetEventObject( this ); event.SetEventObject( this );
if ( ProcessEvent( event ) && !event.IsAllowed() ) if ( ProcessEvent( event ) && !event.IsAllowed() )
@@ -1600,7 +1636,7 @@ void wxGenericTreeCtrl::Collapse(const wxTreeItemId& itemId)
return; return;
wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_COLLAPSING, GetId() ); wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_COLLAPSING, GetId() );
event.m_item = (long) item; event.m_item = item;
event.SetEventObject( this ); event.SetEventObject( this );
if ( ProcessEvent( event ) && !event.IsAllowed() ) if ( ProcessEvent( event ) && !event.IsAllowed() )
{ {
@@ -1790,8 +1826,8 @@ void wxGenericTreeCtrl::SelectItem(const wxTreeItemId& itemId,
} }
wxTreeEvent event( wxEVT_COMMAND_TREE_SEL_CHANGING, GetId() ); wxTreeEvent event( wxEVT_COMMAND_TREE_SEL_CHANGING, GetId() );
event.m_item = (long) item; event.m_item = item;
event.m_itemOld = (long) m_current; event.m_itemOld = m_current;
event.SetEventObject( this ); event.SetEventObject( this );
// TODO : Here we don't send any selection mode yet ! // TODO : Here we don't send any selection mode yet !
@@ -2633,7 +2669,7 @@ void wxGenericTreeCtrl::OnChar( wxKeyEvent &event )
if ( !event.HasModifiers() ) if ( !event.HasModifiers() )
{ {
wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_ACTIVATED, GetId() ); wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_ACTIVATED, GetId() );
event.m_item = (long) m_current; event.m_item = m_current;
event.SetEventObject( this ); event.SetEventObject( this );
GetEventHandler()->ProcessEvent( event ); GetEventHandler()->ProcessEvent( event );
} }
@@ -2881,7 +2917,7 @@ void wxGenericTreeCtrl::Edit( const wxTreeItemId& item )
wxGenericTreeItem *itemEdit = (wxGenericTreeItem *)item.m_pItem; wxGenericTreeItem *itemEdit = (wxGenericTreeItem *)item.m_pItem;
wxTreeEvent te( wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT, GetId() ); wxTreeEvent te( wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT, GetId() );
te.m_item = (long) itemEdit; te.m_item = itemEdit;
te.SetEventObject( this ); te.SetEventObject( this );
if ( GetEventHandler()->ProcessEvent( te ) && !te.IsAllowed() ) if ( GetEventHandler()->ProcessEvent( te ) && !te.IsAllowed() )
{ {
@@ -2912,7 +2948,7 @@ bool wxGenericTreeCtrl::OnRenameAccept(wxGenericTreeItem *item,
const wxString& value) const wxString& value)
{ {
wxTreeEvent le( wxEVT_COMMAND_TREE_END_LABEL_EDIT, GetId() ); wxTreeEvent le( wxEVT_COMMAND_TREE_END_LABEL_EDIT, GetId() );
le.m_item = (long) item; le.m_item = item;
le.SetEventObject( this ); le.SetEventObject( this );
le.m_label = value; le.m_label = value;
le.m_editCancelled = FALSE; le.m_editCancelled = FALSE;
@@ -2924,7 +2960,7 @@ void wxGenericTreeCtrl::OnRenameCancelled(wxGenericTreeItem *item)
{ {
// let owner know that the edit was cancelled // let owner know that the edit was cancelled
wxTreeEvent le( wxEVT_COMMAND_TREE_END_LABEL_EDIT, GetId() ); wxTreeEvent le( wxEVT_COMMAND_TREE_END_LABEL_EDIT, GetId() );
le.m_item = (long) item; le.m_item = item;
le.SetEventObject( this ); le.SetEventObject( this );
le.m_label = wxEmptyString; le.m_label = wxEmptyString;
le.m_editCancelled = TRUE; le.m_editCancelled = TRUE;
@@ -2982,7 +3018,7 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )
: wxEVT_COMMAND_TREE_BEGIN_DRAG; : wxEVT_COMMAND_TREE_BEGIN_DRAG;
wxTreeEvent nevent( command, GetId() ); wxTreeEvent nevent( command, GetId() );
nevent.m_item = (long) m_current; nevent.m_item = m_current;
nevent.SetEventObject(this); nevent.SetEventObject(this);
// by default the dragging is not supported, the user code must // by default the dragging is not supported, the user code must
@@ -3043,7 +3079,7 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )
// generate the drag end event // generate the drag end event
wxTreeEvent event(wxEVT_COMMAND_TREE_END_DRAG, GetId()); wxTreeEvent event(wxEVT_COMMAND_TREE_END_DRAG, GetId());
event.m_item = (long) item; event.m_item = item;
event.m_pointDrag = pt; event.m_pointDrag = pt;
event.SetEventObject(this); event.SetEventObject(this);
@@ -3069,7 +3105,7 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )
if ( event.RightDown() ) if ( event.RightDown() )
{ {
wxTreeEvent nevent(wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK, GetId()); wxTreeEvent nevent(wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK, GetId());
nevent.m_item = (long) item; nevent.m_item = item;
nevent.m_pointDrag = CalcScrolledPosition(pt); nevent.m_pointDrag = CalcScrolledPosition(pt);
nevent.SetEventObject(this); nevent.SetEventObject(this);
GetEventHandler()->ProcessEvent(nevent); GetEventHandler()->ProcessEvent(nevent);
@@ -3164,7 +3200,7 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )
// send activate event first // send activate event first
wxTreeEvent nevent( wxEVT_COMMAND_TREE_ITEM_ACTIVATED, GetId() ); wxTreeEvent nevent( wxEVT_COMMAND_TREE_ITEM_ACTIVATED, GetId() );
nevent.m_item = (long) item; nevent.m_item = item;
nevent.m_pointDrag = CalcScrolledPosition(pt); nevent.m_pointDrag = CalcScrolledPosition(pt);
nevent.SetEventObject( this ); nevent.SetEventObject( this );
if ( !GetEventHandler()->ProcessEvent( nevent ) ) if ( !GetEventHandler()->ProcessEvent( nevent ) )

5
src/msw/dragimag.cpp
View File

@@ -251,8 +251,9 @@ bool wxDragImage::Create(const wxTreeCtrl& treeCtrl, wxTreeItemId& id)
{ {
if ( m_hImageList ) if ( m_hImageList )
ImageList_Destroy(GetHimageList()); ImageList_Destroy(GetHimageList());
m_hImageList = (WXHIMAGELIST) TreeView_CreateDragImage((HWND) treeCtrl.GetHWND(), (HTREEITEM) (WXHTREEITEM) id); m_hImageList = (WXHIMAGELIST)
return TRUE; TreeView_CreateDragImage(GetHwndOf(&treeCtrl), (HTREEITEM) id.m_pItem);
return m_hImageList != 0;
} }
#endif #endif

237
src/msw/treectrl.cpp
View File

@@ -36,17 +36,6 @@
// comctl32.dll versions // comctl32.dll versions
#define wxUSE_COMCTL32_SAFELY 0 #define wxUSE_COMCTL32_SAFELY 0
// Mingw32 is a bit mental even though this is done in winundef
#ifdef GetFirstChild
#undef GetFirstChild
#endif
#ifdef GetNextSibling
#undef GetNextSibling
#endif
#if defined(__WIN95__)
#include "wx/app.h" #include "wx/app.h"
#include "wx/log.h" #include "wx/log.h"
#include "wx/dynarray.h" #include "wx/dynarray.h"
@@ -86,8 +75,8 @@
#define TVM_SETTEXTCOLOR (TV_FIRST + 30) #define TVM_SETTEXTCOLOR (TV_FIRST + 30)
#endif #endif
// a macro to hide the ugliness of nested casts // a macro to hide the cast ugliness
#define HITEM(item) (HTREEITEM)(WXHTREEITEM)(item) #define HITEM(item) (HTREEITEM)((item).m_pItem)
// the native control doesn't support multiple selections under MSW and we // 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 // have 2 ways to emulate them: either using TVS_CHECKBOXES style and let
@@ -551,7 +540,7 @@ bool wxTreeTraversal::DoTraverse(const wxTreeItemId& root, bool recursively)
bool wxTreeTraversal::Traverse(const wxTreeItemId& root, bool recursively) bool wxTreeTraversal::Traverse(const wxTreeItemId& root, bool recursively)
{ {
long cookie; wxTreeItemIdValue cookie;
wxTreeItemId child = m_tree->GetFirstChild(root, cookie); wxTreeItemId child = m_tree->GetFirstChild(root, cookie);
while ( child.IsOk() ) while ( child.IsOk() )
{ {
@@ -725,11 +714,7 @@ wxTreeCtrl::~wxTreeCtrl()
// delete any attributes // delete any attributes
if ( m_hasAnyAttr ) if ( m_hasAnyAttr )
{ {
for ( wxHashTable::compatibility_iterator node = m_attrs.Next(); WX_CLEAR_HASH_MAP(wxMapTreeAttr, m_attrs);
node; node = m_attrs.Next() )
{
delete (wxTreeItemAttr *)node->GetData();
}
// prevent TVN_DELETEITEM handler from deleting the attributes again! // prevent TVN_DELETEITEM handler from deleting the attributes again!
m_hasAnyAttr = false; m_hasAnyAttr = false;
@@ -1204,51 +1189,40 @@ void wxTreeCtrl::RefreshItem(const wxTreeItemId& item)
wxColour wxTreeCtrl::GetItemTextColour(const wxTreeItemId& item) const wxColour wxTreeCtrl::GetItemTextColour(const wxTreeItemId& item) const
{ {
long id = (long)(WXHTREEITEM)item; wxMapTreeAttr::const_iterator it = m_attrs.find(item);
wxTreeItemAttr *attr = (wxTreeItemAttr *)m_attrs.Get(id);
if ( !attr )
{
return wxNullColour;
}
return attr->GetTextColour(); return it == m_attrs.end() ? wxNullColour : it->second->GetTextColour();
} }
wxColour wxTreeCtrl::GetItemBackgroundColour(const wxTreeItemId& item) const wxColour wxTreeCtrl::GetItemBackgroundColour(const wxTreeItemId& item) const
{ {
long id = (long)(WXHTREEITEM)item; wxMapTreeAttr::const_iterator it = m_attrs.find(item);
wxTreeItemAttr *attr = (wxTreeItemAttr *)m_attrs.Get(id);
if ( !attr )
{
return wxNullColour;
}
return attr->GetBackgroundColour(); return it == m_attrs.end() ? wxNullColour : it->second->GetBackgroundColour();
} }
wxFont wxTreeCtrl::GetItemFont(const wxTreeItemId& item) const wxFont wxTreeCtrl::GetItemFont(const wxTreeItemId& item) const
{ {
long id = (long)(WXHTREEITEM)item; wxMapTreeAttr::const_iterator it = m_attrs.find(item);
wxTreeItemAttr *attr = (wxTreeItemAttr *)m_attrs.Get(id);
if ( !attr )
{
return wxNullFont;
}
return attr->GetFont(); return it == m_attrs.end() ? wxNullFont : it->second->GetFont();
} }
void wxTreeCtrl::SetItemTextColour(const wxTreeItemId& item, void wxTreeCtrl::SetItemTextColour(const wxTreeItemId& item,
const wxColour& col) const wxColour& col)
{
wxTreeItemAttr *attr;
wxMapTreeAttr::iterator it = m_attrs.find(item);
if ( it == m_attrs.end() )
{ {
m_hasAnyAttr = true; m_hasAnyAttr = true;
long id = (long)(WXHTREEITEM)item; m_attrs[item] =
wxTreeItemAttr *attr = (wxTreeItemAttr *)m_attrs.Get(id);
if ( !attr )
{
attr = new wxTreeItemAttr; attr = new wxTreeItemAttr;
m_attrs.Put(id, (wxObject *)attr); }
else
{
attr = it->second;
} }
attr->SetTextColour(col); attr->SetTextColour(col);
@@ -1258,15 +1232,19 @@ void wxTreeCtrl::SetItemTextColour(const wxTreeItemId& item,
void wxTreeCtrl::SetItemBackgroundColour(const wxTreeItemId& item, void wxTreeCtrl::SetItemBackgroundColour(const wxTreeItemId& item,
const wxColour& col) const wxColour& col)
{
wxTreeItemAttr *attr;
wxMapTreeAttr::iterator it = m_attrs.find(item);
if ( it == m_attrs.end() )
{ {
m_hasAnyAttr = true; m_hasAnyAttr = true;
long id = (long)(WXHTREEITEM)item; m_attrs[item] =
wxTreeItemAttr *attr = (wxTreeItemAttr *)m_attrs.Get(id);
if ( !attr )
{
attr = new wxTreeItemAttr; attr = new wxTreeItemAttr;
m_attrs.Put(id, (wxObject *)attr); }
else // already in the hash
{
attr = it->second;
} }
attr->SetBackgroundColour(col); attr->SetBackgroundColour(col);
@@ -1275,15 +1253,19 @@ void wxTreeCtrl::SetItemBackgroundColour(const wxTreeItemId& item,
} }
void wxTreeCtrl::SetItemFont(const wxTreeItemId& item, const wxFont& font) void wxTreeCtrl::SetItemFont(const wxTreeItemId& item, const wxFont& font)
{
wxTreeItemAttr *attr;
wxMapTreeAttr::iterator it = m_attrs.find(item);
if ( it == m_attrs.end() )
{ {
m_hasAnyAttr = true; m_hasAnyAttr = true;
long id = (long)(WXHTREEITEM)item; m_attrs[item] =
wxTreeItemAttr *attr = (wxTreeItemAttr *)m_attrs.Get(id);
if ( !attr )
{
attr = new wxTreeItemAttr; attr = new wxTreeItemAttr;
m_attrs.Put(id, (wxObject *)attr); }
else // already in the hash
{
attr = it->second;
} }
attr->SetFont(font); attr->SetFont(font);
@@ -1308,7 +1290,7 @@ bool wxTreeCtrl::IsVisible(const wxTreeItemId& item) const
// this ugliness comes directly from MSDN - it *is* the correct way to pass // this ugliness comes directly from MSDN - it *is* the correct way to pass
// the HTREEITEM with TVM_GETITEMRECT // 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 // false means get item rect for the whole item, not only text
return SendMessage(GetHwnd(), TVM_GETITEMRECT, false, (LPARAM)&rect) != 0; return SendMessage(GetHwnd(), TVM_GETITEMRECT, false, (LPARAM)&rect) != 0;
@@ -1359,15 +1341,15 @@ wxTreeItemId wxTreeCtrl::GetRootItem() const
if ( GET_VIRTUAL_ROOT() ) if ( GET_VIRTUAL_ROOT() )
return TVI_ROOT; return TVI_ROOT;
return wxTreeItemId((WXHTREEITEM) TreeView_GetRoot(GetHwnd())); return wxTreeItemId(TreeView_GetRoot(GetHwnd()));
} }
wxTreeItemId wxTreeCtrl::GetSelection() const wxTreeItemId wxTreeCtrl::GetSelection() const
{ {
wxCHECK_MSG( !(m_windowStyle & wxTR_MULTIPLE), (long)(WXHTREEITEM)0, wxCHECK_MSG( !(m_windowStyle & wxTR_MULTIPLE), NULL,
wxT("this only works with single selection controls") ); wxT("this only works with single selection controls") );
return wxTreeItemId((WXHTREEITEM) TreeView_GetSelection(GetHwnd())); return wxTreeItemId(TreeView_GetSelection(GetHwnd()));
} }
wxTreeItemId wxTreeCtrl::GetItemParent(const wxTreeItemId& item) const wxTreeItemId wxTreeCtrl::GetItemParent(const wxTreeItemId& item) const
@@ -1389,32 +1371,57 @@ wxTreeItemId wxTreeCtrl::GetItemParent(const wxTreeItemId& item) const
} }
} }
return wxTreeItemId((WXHTREEITEM)hItem); return wxTreeItemId(hItem);
} }
wxTreeItemId wxTreeCtrl::GetFirstChild(const wxTreeItemId& item, wxTreeItemId wxTreeCtrl::GetFirstChild(const wxTreeItemId& item,
long& _cookie) const wxTreeItemIdValue& cookie) const
{ {
// remember the last child returned in 'cookie' // remember the last child returned in 'cookie'
_cookie = (long)TreeView_GetChild(GetHwnd(), HITEM(item)); cookie = TreeView_GetChild(GetHwnd(), HITEM(item));
return wxTreeItemId((WXHTREEITEM)_cookie); return wxTreeItemId(cookie);
} }
wxTreeItemId wxTreeCtrl::GetNextChild(const wxTreeItemId& WXUNUSED(item), wxTreeItemId wxTreeCtrl::GetNextChild(const wxTreeItemId& WXUNUSED(item),
long& _cookie) const wxTreeItemIdValue& cookie) const
{ {
wxTreeItemId l = wxTreeItemId((WXHTREEITEM)TreeView_GetNextSibling(GetHwnd(), wxTreeItemId item(TreeView_GetNextSibling(GetHwnd(),
HITEM(_cookie))); HITEM(wxTreeItemId(cookie))));
_cookie = (long)l; cookie = item.m_pItem;
return l; return item;
} }
#if WXWIN_COMPATIBILITY_2_4
wxTreeItemId wxTreeCtrl::GetFirstChild(const wxTreeItemId& item,
long& cookie) const
{
cookie = (long)TreeView_GetChild(GetHwnd(), HITEM(item));
return wxTreeItemId((void *)cookie);
}
wxTreeItemId wxTreeCtrl::GetNextChild(const wxTreeItemId& WXUNUSED(item),
long& cookie) const
{
wxTreeItemId item(TreeView_GetNextSibling
(
GetHwnd(),
HITEM(wxTreeItemId((void *)cookie)
)));
cookie = (long)item.m_pItem;
return item;
}
#endif // WXWIN_COMPATIBILITY_2_4
wxTreeItemId wxTreeCtrl::GetLastChild(const wxTreeItemId& item) const wxTreeItemId wxTreeCtrl::GetLastChild(const wxTreeItemId& item) const
{ {
// can this be done more efficiently? // can this be done more efficiently?
long cookie; wxTreeItemIdValue cookie;
wxTreeItemId childLast, wxTreeItemId childLast,
child = GetFirstChild(item, cookie); child = GetFirstChild(item, cookie);
@@ -1429,31 +1436,31 @@ wxTreeItemId wxTreeCtrl::GetLastChild(const wxTreeItemId& item) const
wxTreeItemId wxTreeCtrl::GetNextSibling(const wxTreeItemId& item) const wxTreeItemId wxTreeCtrl::GetNextSibling(const wxTreeItemId& item) const
{ {
return wxTreeItemId((WXHTREEITEM) TreeView_GetNextSibling(GetHwnd(), HITEM(item))); return wxTreeItemId(TreeView_GetNextSibling(GetHwnd(), HITEM(item)));
} }
wxTreeItemId wxTreeCtrl::GetPrevSibling(const wxTreeItemId& item) const wxTreeItemId wxTreeCtrl::GetPrevSibling(const wxTreeItemId& item) const
{ {
return wxTreeItemId((WXHTREEITEM) TreeView_GetPrevSibling(GetHwnd(), HITEM(item))); return wxTreeItemId(TreeView_GetPrevSibling(GetHwnd(), HITEM(item)));
} }
wxTreeItemId wxTreeCtrl::GetFirstVisibleItem() const wxTreeItemId wxTreeCtrl::GetFirstVisibleItem() const
{ {
return wxTreeItemId((WXHTREEITEM) TreeView_GetFirstVisible(GetHwnd())); return wxTreeItemId(TreeView_GetFirstVisible(GetHwnd()));
} }
wxTreeItemId wxTreeCtrl::GetNextVisible(const wxTreeItemId& item) const wxTreeItemId wxTreeCtrl::GetNextVisible(const wxTreeItemId& item) const
{ {
wxASSERT_MSG( IsVisible(item), wxT("The item you call GetNextVisible() for must be visible itself!")); 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 wxTreeItemId wxTreeCtrl::GetPrevVisible(const wxTreeItemId& item) const
{ {
wxASSERT_MSG( IsVisible(item), wxT("The item you call GetPrevVisible() for must be visible itself!")); 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)));
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -1562,22 +1569,26 @@ wxTreeItemId wxTreeCtrl::DoInsertItem(const wxTreeItemId& parent,
if ( data != NULL ) if ( data != NULL )
{ {
// associate the application tree item with Win32 tree item handle // 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 // for compatibility only
#if WXWIN_COMPATIBILITY_2_4
wxTreeItemId wxTreeCtrl::InsertItem(const wxTreeItemId& parent, wxTreeItemId wxTreeCtrl::InsertItem(const wxTreeItemId& parent,
const wxString& text, const wxString& text,
int image, int selImage, int image, int selImage,
long insertAfter) long insertAfter)
{ {
return DoInsertItem(parent, (WXHTREEITEM)insertAfter, text, return DoInsertItem(parent, wxTreeItemId((void *)insertAfter), text,
image, selImage, NULL); image, selImage, NULL);
} }
#endif // WXWIN_COMPATIBILITY_2_4
wxTreeItemId wxTreeCtrl::AddRoot(const wxString& text, wxTreeItemId wxTreeCtrl::AddRoot(const wxString& text,
int image, int selectedImage, int image, int selectedImage,
wxTreeItemData *data) wxTreeItemData *data)
@@ -1591,7 +1602,7 @@ wxTreeItemId wxTreeCtrl::AddRoot(const wxString& text,
return TVI_ROOT; return TVI_ROOT;
} }
return DoInsertItem(wxTreeItemId((long)(WXHTREEITEM) 0), (long)(WXHTREEITEM) 0, return DoInsertItem(wxTreeItemId(), 0,
text, image, selectedImage, data); text, image, selectedImage, data);
} }
@@ -1600,7 +1611,7 @@ wxTreeItemId wxTreeCtrl::PrependItem(const wxTreeItemId& parent,
int image, int selectedImage, int image, int selectedImage,
wxTreeItemData *data) wxTreeItemData *data)
{ {
return DoInsertItem(parent, (WXHTREEITEM) TVI_FIRST, return DoInsertItem(parent, TVI_FIRST,
text, image, selectedImage, data); text, image, selectedImage, data);
} }
@@ -1620,7 +1631,7 @@ wxTreeItemId wxTreeCtrl::InsertItem(const wxTreeItemId& parent,
wxTreeItemData *data) wxTreeItemData *data)
{ {
// find the item from index // find the item from index
long cookie; wxTreeItemIdValue cookie;
wxTreeItemId idPrev, idCur = GetFirstChild(parent, cookie); wxTreeItemId idPrev, idCur = GetFirstChild(parent, cookie);
while ( index != 0 && idCur.IsOk() ) while ( index != 0 && idCur.IsOk() )
{ {
@@ -1642,7 +1653,7 @@ wxTreeItemId wxTreeCtrl::AppendItem(const wxTreeItemId& parent,
int image, int selectedImage, int image, int selectedImage,
wxTreeItemData *data) wxTreeItemData *data)
{ {
return DoInsertItem(parent, (WXHTREEITEM) TVI_LAST, return DoInsertItem(parent, TVI_LAST,
text, image, selectedImage, data); text, image, selectedImage, data);
} }
@@ -1657,13 +1668,13 @@ void wxTreeCtrl::Delete(const wxTreeItemId& item)
// delete all children (but don't delete the item itself) // delete all children (but don't delete the item itself)
void wxTreeCtrl::DeleteChildren(const wxTreeItemId& item) void wxTreeCtrl::DeleteChildren(const wxTreeItemId& item)
{ {
long cookie; wxTreeItemIdValue cookie;
wxArrayLong children; wxArrayTreeItemIds children;
wxTreeItemId child = GetFirstChild(item, cookie); wxTreeItemId child = GetFirstChild(item, cookie);
while ( child.IsOk() ) while ( child.IsOk() )
{ {
children.Add((long)(WXHTREEITEM)child); children.Add(child);
child = GetNextChild(item, cookie); child = GetNextChild(item, cookie);
} }
@@ -1671,7 +1682,7 @@ void wxTreeCtrl::DeleteChildren(const wxTreeItemId& item)
size_t nCount = children.Count(); size_t nCount = children.Count();
for ( size_t n = 0; n < nCount; n++ ) 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")); wxLogLastError(wxT("TreeView_DeleteItem"));
} }
@@ -1767,7 +1778,7 @@ void wxTreeCtrl::Unselect()
wxT("doesn't make sense, may be you want UnselectAll()?") ); wxT("doesn't make sense, may be you want UnselectAll()?") );
// just remove the selection // just remove the selection
SelectItem(wxTreeItemId((long) (WXHTREEITEM) 0)); SelectItem(wxTreeItemId());
} }
void wxTreeCtrl::UnselectAll() void wxTreeCtrl::UnselectAll()
@@ -1927,7 +1938,7 @@ wxTreeItemId wxTreeCtrl::HitTest(const wxPoint& point, int& flags)
#undef TRANSLATE_FLAG #undef TRANSLATE_FLAG
return wxTreeItemId((WXHTREEITEM) hitTestInfo.hItem); return wxTreeItemId(hitTestInfo.hItem);
} }
bool wxTreeCtrl::GetBoundingRect(const wxTreeItemId& item, bool wxTreeCtrl::GetBoundingRect(const wxTreeItemId& item,
@@ -2107,8 +2118,7 @@ long wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
if ( !m_htSelStart ) if ( !m_htSelStart )
{ {
// take the focused item // take the focused item
m_htSelStart = (WXHTREEITEM) m_htSelStart = TreeView_GetSelection(GetHwnd());
TreeView_GetSelection(GetHwnd());
} }
SelectRange(GetHwnd(), HITEM(m_htSelStart), htItem, SelectRange(GetHwnd(), HITEM(m_htSelStart), htItem,
@@ -2203,7 +2213,7 @@ long wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
// generate the drag end event // generate the drag end event
wxTreeEvent event(wxEVT_COMMAND_TREE_END_DRAG, m_windowId); 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.m_pointDrag = wxPoint(x, y);
event.SetEventObject(this); event.SetEventObject(this);
@@ -2247,7 +2257,7 @@ long wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
HTREEITEM htSel = (HTREEITEM)TreeView_GetSelection(GetHwnd()); HTREEITEM htSel = (HTREEITEM)TreeView_GetSelection(GetHwnd());
if ( !m_htSelStart ) if ( !m_htSelStart )
{ {
m_htSelStart = (WXHTREEITEM)htSel; m_htSelStart = htSel;
} }
if ( wParam == VK_SPACE ) if ( wParam == VK_SPACE )
@@ -2342,7 +2352,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
NM_TREEVIEW *tv = (NM_TREEVIEW *)lParam; 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); event.m_pointDrag = wxPoint(tv->ptDrag.x, tv->ptDrag.y);
// don't allow dragging by default: the user code must // don't allow dragging by default: the user code must
@@ -2357,7 +2367,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
eventType = wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT; eventType = wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT;
TV_DISPINFO *info = (TV_DISPINFO *)lParam; 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; event.m_label = info->item.pszText;
event.m_editCancelled = false; event.m_editCancelled = false;
} }
@@ -2368,12 +2378,16 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
eventType = wxEVT_COMMAND_TREE_DELETE_ITEM; eventType = wxEVT_COMMAND_TREE_DELETE_ITEM;
NM_TREEVIEW *tv = (NM_TREEVIEW *)lParam; NM_TREEVIEW *tv = (NM_TREEVIEW *)lParam;
event.m_item = (WXHTREEITEM)tv->itemOld.hItem; event.m_item = tv->itemOld.hItem;
if ( m_hasAnyAttr ) if ( m_hasAnyAttr )
{ {
delete (wxTreeItemAttr *)m_attrs. wxMapTreeAttr::iterator it = m_attrs.find(tv->itemOld.hItem);
Delete((long)tv->itemOld.hItem); if ( it != m_attrs.end() )
{
delete it->second;
m_attrs.erase(it);
}
} }
} }
break; break;
@@ -2383,7 +2397,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
eventType = wxEVT_COMMAND_TREE_END_LABEL_EDIT; eventType = wxEVT_COMMAND_TREE_END_LABEL_EDIT;
TV_DISPINFO *info = (TV_DISPINFO *)lParam; 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; event.m_label = info->item.pszText;
if (info->item.pszText == NULL) if (info->item.pszText == NULL)
{ {
@@ -2408,7 +2422,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
TV_DISPINFO *info = (TV_DISPINFO *)lParam; TV_DISPINFO *info = (TV_DISPINFO *)lParam;
event.m_item = (WXHTREEITEM) info->item.hItem; event.m_item = info->item.hItem;
break; break;
} }
@@ -2438,7 +2452,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
eventType = gs_expandEvents[what][how]; eventType = gs_expandEvents[what][how];
event.m_item = (WXHTREEITEM) tv->itemNew.hItem; event.m_item = tv->itemNew.hItem;
} }
break; break;
@@ -2451,9 +2465,6 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
// similar to the ones from a "real" WM_KEYDOWN so that // similar to the ones from a "real" WM_KEYDOWN so that
// CreateKeyEvent() works correctly // CreateKeyEvent() works correctly
WXLPARAM lParam = WXLPARAM lParam =
// (::GetKeyState(VK_MENU) & 0x100 ? KF_ALTDOWN : 0) << 16;
// Returns different negative values on WinME and WinNT,
// so simply test for negative value.
(::GetKeyState(VK_MENU) < 0 ? KF_ALTDOWN : 0) << 16; (::GetKeyState(VK_MENU) < 0 ? KF_ALTDOWN : 0) << 16;
WXWPARAM wParam = info->wVKey; WXWPARAM wParam = info->wVKey;
@@ -2508,14 +2519,14 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
hdr->code == TVN_SELCHANGEDW) hdr->code == TVN_SELCHANGEDW)
{ {
NM_TREEVIEWW* tv = (NM_TREEVIEWW *)lParam; NM_TREEVIEWW* tv = (NM_TREEVIEWW *)lParam;
event.m_item = (WXHTREEITEM) tv->itemNew.hItem; event.m_item = tv->itemNew.hItem;
event.m_itemOld = (WXHTREEITEM) tv->itemOld.hItem; event.m_itemOld = tv->itemOld.hItem;
} }
else else
{ {
NM_TREEVIEWA* tv = (NM_TREEVIEWA *)lParam; NM_TREEVIEWA* tv = (NM_TREEVIEWA *)lParam;
event.m_item = (WXHTREEITEM) tv->itemNew.hItem; event.m_item = tv->itemNew.hItem;
event.m_itemOld = (WXHTREEITEM) tv->itemOld.hItem; event.m_itemOld = tv->itemOld.hItem;
} }
} }
break; break;
@@ -2536,16 +2547,18 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
case CDDS_ITEMPREPAINT: case CDDS_ITEMPREPAINT:
{ {
wxTreeItemAttr *attr = wxMapTreeAttr::iterator
(wxTreeItemAttr *)m_attrs.Get(nmcd.dwItemSpec); it = m_attrs.find((void *)nmcd.dwItemSpec);
if ( !attr ) if ( it == m_attrs.end() )
{ {
// nothing to do for this item // nothing to do for this item
*result = CDRF_DODEFAULT; *result = CDRF_DODEFAULT;
break; break;
} }
wxTreeItemAttr * const attr = it->second;
HFONT hFont; HFONT hFont;
if ( attr->HasFont() ) if ( attr->HasFont() )
{ {
@@ -2642,7 +2655,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
{ {
if ( tvhti.flags & TVHT_ONITEM ) if ( tvhti.flags & TVHT_ONITEM )
{ {
event.m_item = (WXHTREEITEM) tvhti.hItem; event.m_item = tvhti.hItem;
eventType = (int)hdr->code == NM_DBLCLK eventType = (int)hdr->code == NM_DBLCLK
? wxEVT_COMMAND_TREE_ITEM_ACTIVATED ? wxEVT_COMMAND_TREE_ITEM_ACTIVATED
: wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK; : wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK;
@@ -2771,7 +2784,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
// comctl32.dll or our code? // comctl32.dll or our code?
{ {
NM_TREEVIEW* tv = (NM_TREEVIEW *)lParam; NM_TREEVIEW* tv = (NM_TREEVIEW *)lParam;
wxTreeItemId id = (WXHTREEITEM)tv->itemNew.hItem; wxTreeItemId id(tv->itemNew.hItem);
int image = GetItemImage(id, wxTreeItemIcon_Expanded); int image = GetItemImage(id, wxTreeItemIcon_Expanded);
if ( image != -1 ) if ( image != -1 )
@@ -2861,7 +2874,5 @@ int wxTreeCtrl::GetState(const wxTreeItemId& node)
return STATEIMAGEMASKTOINDEX(tvi.state); return STATEIMAGEMASKTOINDEX(tvi.state);
} }
#endif // __WIN95__
#endif // wxUSE_TREECTRL #endif // wxUSE_TREECTRL