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

Provide shorter synonyms for wxEVT_XXX constants.

Browse Source 
Use the same short names as are used by the event table macros for the event
type constants themselves. This makes them much more comfortable to use, e.g.
Bind(wxEVT_BUTTON) compared to Bind(wxEVT_COMMAND_BUTTON_CLICKED).

The old long names are still kept for backwards compatibility and shouldn't be
removed as it doesn't really cost anything to continue providing them, but all
new event types should only use the short versions.

Closes #10661.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73850 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2013-04-25 10:11:03 +00:00
parent 3f7564f229
commit ce7fe42e84
405 changed files with 2703 additions and 2409 deletions
Download Patch File Download Diff File Expand all files Collapse all files

136
src/msw/treectrl.cpp
View File

@@ -666,8 +666,8 @@ 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 }
{ wxEVT_TREE_ITEM_COLLAPSED, wxEVT_TREE_ITEM_COLLAPSING },
{ wxEVT_TREE_ITEM_EXPANDED, wxEVT_TREE_ITEM_EXPANDING }
};
*/
@@ -726,10 +726,10 @@ void wxTreeCtrl::Init()
// 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;
gs_expandEvents[IDX_COLLAPSE][IDX_DONE] = wxEVT_TREE_ITEM_COLLAPSED;
gs_expandEvents[IDX_COLLAPSE][IDX_DOING] = wxEVT_TREE_ITEM_COLLAPSING;
gs_expandEvents[IDX_EXPAND][IDX_DONE] = wxEVT_TREE_ITEM_EXPANDED;
gs_expandEvents[IDX_EXPAND][IDX_DOING] = wxEVT_TREE_ITEM_EXPANDING;
}
bool wxTreeCtrl::Create(wxWindow *parent,
@@ -1642,11 +1642,11 @@ void wxTreeCtrl::Delete(const wxTreeItemId& item)
if ( next.IsOk() )
{
wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING, this, next);
wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING, this, next);
if ( IsTreeEventAllowed(changingEvent) )
{
wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED, this, next);
wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED, this, next);
(void)HandleTreeEvent(changedEvent);
}
else
@@ -1739,7 +1739,7 @@ void wxTreeCtrl::DoExpand(const wxTreeItemId& item, int flag)
if ( IsExpanded(item) )
{
wxTreeEvent event(wxEVT_COMMAND_TREE_ITEM_COLLAPSING,
wxTreeEvent event(wxEVT_TREE_ITEM_COLLAPSING,
this, wxTreeItemId(item));
if ( !IsTreeEventAllowed(event) )
@@ -1751,7 +1751,7 @@ void wxTreeCtrl::DoExpand(const wxTreeItemId& item, int flag)
if ( IsExpanded(item) )
return;
wxTreeEvent event(wxEVT_COMMAND_TREE_ITEM_COLLAPSED, this, item);
wxTreeEvent event(wxEVT_TREE_ITEM_COLLAPSED, this, item);
(void)HandleTreeEvent(event);
}
//else: change didn't took place, so do nothing at all
@@ -1792,7 +1792,7 @@ void wxTreeCtrl::Unselect()
if ( HasFlag(wxTR_MULTIPLE) )
{
wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING,
wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING,
this, wxTreeItemId());
changingEvent.m_itemOld = htFocus;
@@ -1800,7 +1800,7 @@ void wxTreeCtrl::Unselect()
{
ClearFocusedItem();
wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED,
this, wxTreeItemId());
changedEvent.m_itemOld = htFocus;
(void)HandleTreeEvent(changedEvent);
@@ -1832,14 +1832,14 @@ void wxTreeCtrl::UnselectAll()
HTREEITEM htFocus = (HTREEITEM)TreeView_GetSelection(GetHwnd());
if ( !htFocus ) return;
wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING, this);
wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING, this);
changingEvent.m_itemOld = htFocus;
if ( IsTreeEventAllowed(changingEvent) )
{
DoUnselectAll();
wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED, this);
wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED, this);
changedEvent.m_itemOld = htFocus;
(void)HandleTreeEvent(changedEvent);
}
@@ -1870,14 +1870,14 @@ void wxTreeCtrl::SelectChildren(const wxTreeItemId& parent)
HTREEITEM htFocus = (HTREEITEM)TreeView_GetSelection(GetHwnd());
wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING, this);
wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING, this);
changingEvent.m_itemOld = htFocus;
if ( IsTreeEventAllowed(changingEvent) )
{
DoSelectChildren(parent);
wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED, this);
wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED, this);
changedEvent.m_itemOld = htFocus;
(void)HandleTreeEvent(changedEvent);
}
@@ -1902,7 +1902,7 @@ void wxTreeCtrl::SelectItem(const wxTreeItemId& item, bool select)
if ( HasFlag(wxTR_MULTIPLE) )
{
wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING, this, item);
wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING, this, item);
if ( IsTreeEventAllowed(changingEvent) )
{
@@ -1914,7 +1914,7 @@ void wxTreeCtrl::SelectItem(const wxTreeItemId& item, bool select)
SetFocusedItem(item);
}
wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED,
this, item);
(void)HandleTreeEvent(changedEvent);
}
@@ -1938,7 +1938,7 @@ void wxTreeCtrl::SelectItem(const wxTreeItemId& item, bool select)
// not so send the events ourselves and ignore those generated by
// TreeView_SelectItem() if m_changingSelection is set.
wxTreeEvent
changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING, this, itemNew);
changingEvent(wxEVT_TREE_SEL_CHANGING, this, itemNew);
changingEvent.SetOldItem(itemOld);
if ( IsTreeEventAllowed(changingEvent) )
@@ -1953,7 +1953,7 @@ void wxTreeCtrl::SelectItem(const wxTreeItemId& item, bool select)
{
::SetFocus(GetHwnd(), HITEM(item));
wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED,
this, itemNew);
changedEvent.SetOldItem(itemOld);
(void)HandleTreeEvent(changedEvent);
@@ -2193,7 +2193,7 @@ bool wxTreeCtrl::MSWShouldPreProcessMessage(WXMSG* msg)
// conjunction with modifiers
if ( (msg->wParam == VK_RETURN) && !wxIsAnyModifierDown() )
{
// we need VK_RETURN to generate wxEVT_COMMAND_TREE_ITEM_ACTIVATED
// we need VK_RETURN to generate wxEVT_TREE_ITEM_ACTIVATED
return false;
}
}
@@ -2207,7 +2207,7 @@ bool wxTreeCtrl::MSWCommand(WXUINT cmd, WXWORD id_)
if ( cmd == EN_UPDATE )
{
wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, id);
wxCommandEvent event(wxEVT_TEXT, id);
event.SetEventObject( this );
ProcessCommand(event);
}
@@ -2251,7 +2251,7 @@ bool wxTreeCtrl::MSWHandleSelectionKey(unsigned vkey)
if ( vkey != VK_RETURN && bCtrl )
{
wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING,
wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING,
this, htSel);
changingEvent.m_itemOld = htSel;
@@ -2259,7 +2259,7 @@ bool wxTreeCtrl::MSWHandleSelectionKey(unsigned vkey)
{
DoToggleItemSelection(wxTreeItemId(htSel));
wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED,
this, htSel);
changedEvent.m_itemOld = htSel;
(void)HandleTreeEvent(changedEvent);
@@ -2272,7 +2272,7 @@ bool wxTreeCtrl::MSWHandleSelectionKey(unsigned vkey)
if ( count != 1 || HITEM(selections[0]) != htSel )
{
wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING,
wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING,
this, htSel);
changingEvent.m_itemOld = htSel;
@@ -2281,7 +2281,7 @@ bool wxTreeCtrl::MSWHandleSelectionKey(unsigned vkey)
DoUnselectAll();
DoSelectItem(wxTreeItemId(htSel));
wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED,
this, htSel);
changedEvent.m_itemOld = htSel;
(void)HandleTreeEvent(changedEvent);
@@ -2316,7 +2316,7 @@ bool wxTreeCtrl::MSWHandleSelectionKey(unsigned vkey)
break;
}
wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING,
wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING,
this, next);
changingEvent.m_itemOld = htSel;
@@ -2326,7 +2326,7 @@ bool wxTreeCtrl::MSWHandleSelectionKey(unsigned vkey)
DoSelectItem(next);
SetFocusedItem(next);
wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED,
this, next);
changedEvent.m_itemOld = htSel;
(void)HandleTreeEvent(changedEvent);
@@ -2351,7 +2351,7 @@ bool wxTreeCtrl::MSWHandleSelectionKey(unsigned vkey)
if ( bShift && SelectRange(GetHwnd(), HITEM(m_htSelStart), HITEM(next),
SR_UNSELECT_OTHERS | SR_SIMULATE) )
{
wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING, this, next);
wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING, this, next);
changingEvent.m_itemOld = htSel;
if ( IsTreeEventAllowed(changingEvent) )
@@ -2359,7 +2359,7 @@ bool wxTreeCtrl::MSWHandleSelectionKey(unsigned vkey)
SelectRange(GetHwnd(), HITEM(m_htSelStart), HITEM(next),
SR_UNSELECT_OTHERS);
wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED, this, next);
wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED, this, next);
changedEvent.m_itemOld = htSel;
(void)HandleTreeEvent(changedEvent);
}
@@ -2380,7 +2380,7 @@ bool wxTreeCtrl::MSWHandleSelectionKey(unsigned vkey)
if ( next.IsOk() && !IsHiddenRoot(next) )
{
wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING,
wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING,
this, next);
changingEvent.m_itemOld = htSel;
@@ -2390,7 +2390,7 @@ bool wxTreeCtrl::MSWHandleSelectionKey(unsigned vkey)
DoSelectItem(next);
SetFocusedItem(next);
wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED,
this, next);
changedEvent.m_itemOld = htSel;
(void)HandleTreeEvent(changedEvent);
@@ -2416,7 +2416,7 @@ bool wxTreeCtrl::MSWHandleSelectionKey(unsigned vkey)
{
wxTreeItemId next = TreeView_GetChild(GetHwnd(), htSel);
wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING, this, next);
wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING, this, next);
changingEvent.m_itemOld = htSel;
if ( IsTreeEventAllowed(changingEvent) )
@@ -2425,7 +2425,7 @@ bool wxTreeCtrl::MSWHandleSelectionKey(unsigned vkey)
DoSelectItem(next);
SetFocusedItem(next);
wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED, this, next);
wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED, this, next);
changedEvent.m_itemOld = htSel;
(void)HandleTreeEvent(changedEvent);
}
@@ -2473,7 +2473,7 @@ bool wxTreeCtrl::MSWHandleSelectionKey(unsigned vkey)
HITEM(m_htSelStart), HITEM(next),
SR_UNSELECT_OTHERS | SR_SIMULATE) )
{
wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING,
wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING,
this, next);
changingEvent.m_itemOld = htSel;
@@ -2484,7 +2484,7 @@ bool wxTreeCtrl::MSWHandleSelectionKey(unsigned vkey)
SR_UNSELECT_OTHERS);
SetFocusedItem(next);
wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED,
this, next);
changedEvent.m_itemOld = htSel;
(void)HandleTreeEvent(changedEvent);
@@ -2493,7 +2493,7 @@ bool wxTreeCtrl::MSWHandleSelectionKey(unsigned vkey)
}
else // no Shift
{
wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING,
wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING,
this, next);
changingEvent.m_itemOld = htSel;
@@ -2503,7 +2503,7 @@ bool wxTreeCtrl::MSWHandleSelectionKey(unsigned vkey)
DoSelectItem(next);
SetFocusedItem(next);
wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED,
this, next);
changedEvent.m_itemOld = htSel;
(void)HandleTreeEvent(changedEvent);
@@ -2595,7 +2595,7 @@ bool wxTreeCtrl::MSWHandleSelectionKey(unsigned vkey)
next = nextTemp;
}
wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING,
wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING,
this, next);
changingEvent.m_itemOld = htSel;
@@ -2606,7 +2606,7 @@ bool wxTreeCtrl::MSWHandleSelectionKey(unsigned vkey)
DoSelectItem(next);
SetFocusedItem(next);
wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED,
this, next);
changedEvent.m_itemOld = htSel;
(void)HandleTreeEvent(changedEvent);
@@ -2623,7 +2623,7 @@ bool wxTreeCtrl::MSWHandleSelectionKey(unsigned vkey)
bool wxTreeCtrl::MSWHandleTreeKeyDownEvent(WXWPARAM wParam, WXLPARAM lParam)
{
wxTreeEvent keyEvent(wxEVT_COMMAND_TREE_KEY_DOWN, this);
wxTreeEvent keyEvent(wxEVT_TREE_KEY_DOWN, this);
keyEvent.m_evtKey = CreateKeyEvent(wxEVT_KEY_DOWN, wParam, lParam);
bool processed = HandleTreeEvent(keyEvent);
@@ -2635,7 +2635,7 @@ bool wxTreeCtrl::MSWHandleTreeKeyDownEvent(WXWPARAM wParam, WXLPARAM lParam)
const HTREEITEM htSel = (HTREEITEM)TreeView_GetSelection(GetHwnd());
if ( htSel )
{
wxTreeEvent activatedEvent(wxEVT_COMMAND_TREE_ITEM_ACTIVATED,
wxTreeEvent activatedEvent(wxEVT_TREE_ITEM_ACTIVATED,
this, htSel);
(void)HandleTreeEvent(activatedEvent);
}
@@ -2698,7 +2698,7 @@ wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
// create the event
if ( item.IsOk() )
{
wxTreeEvent event(wxEVT_COMMAND_TREE_ITEM_MENU, this, item);
wxTreeEvent event(wxEVT_TREE_ITEM_MENU, this, item);
event.m_pointDrag = pt;
@@ -2771,7 +2771,7 @@ wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
break;
}
wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING,
wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING,
this, htItem);
changingEvent.m_itemOld = htOldItem;
@@ -2785,7 +2785,7 @@ wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
// reset on any click without Shift
m_htSelStart.Unset();
wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED,
this, htItem);
changedEvent.m_itemOld = htOldItem;
(void)HandleTreeEvent(changedEvent);
@@ -2820,7 +2820,7 @@ wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
if ( willChange )
{
wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING,
wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING,
this, htItem);
changingEvent.m_itemOld = htOldItem;
@@ -2840,7 +2840,7 @@ wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
SetFocusedItem(wxTreeItemId(htItem));
wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED,
this, htItem);
changedEvent.m_itemOld = htOldItem;
(void)HandleTreeEvent(changedEvent);
@@ -2871,7 +2871,7 @@ wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
// multiple drag and drop to work.
if ( !IsItemSelected(GetHwnd(), htItem))
{
wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING,
wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING,
this, htItem);
changingEvent.m_itemOld = htOldItem;
@@ -2881,7 +2881,7 @@ wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
DoSelectItem(wxTreeItemId(htItem));
SetFocusedItem(wxTreeItemId(htItem));
wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED,
this, htItem);
changedEvent.m_itemOld = htOldItem;
(void)HandleTreeEvent(changedEvent);
@@ -2950,7 +2950,7 @@ wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
// confusing, so override this default behaviour
if ( !IsItemSelected(GetHwnd(), htItem) )
{
wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING,
wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING,
this, htItem);
changingEvent.m_itemOld = htOldItem;
@@ -2960,7 +2960,7 @@ wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
DoSelectItem(wxTreeItemId(htItem));
SetFocusedItem(wxTreeItemId(htItem));
wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED,
this, htItem);
changedEvent.m_itemOld = htOldItem;
(void)HandleTreeEvent(changedEvent);
@@ -3044,7 +3044,7 @@ wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
{
m_mouseUpDeselect = false;
wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING,
wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING,
this, htItem);
changingEvent.m_itemOld = htOldItem;
@@ -3054,7 +3054,7 @@ wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
DoSelectItem(wxTreeItemId(htItem));
SetFocusedItem(wxTreeItemId(htItem));
wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED,
this, htItem);
changedEvent.m_itemOld = htOldItem;
(void)HandleTreeEvent(changedEvent);
@@ -3068,7 +3068,7 @@ wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
{
if ( tvht.flags & TVHT_ONITEMSTATEICON )
{
wxTreeEvent event(wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK,
wxTreeEvent event(wxEVT_TREE_STATE_IMAGE_CLICK,
this, htItem);
(void)HandleTreeEvent(event);
@@ -3093,7 +3093,7 @@ wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
wxDELETE(m_dragImage);
// generate the drag end event
wxTreeEvent event(wxEVT_COMMAND_TREE_END_DRAG,
wxTreeEvent event(wxEVT_TREE_END_DRAG,
this, htItem);
event.m_pointDrag = wxPoint(x, y);
(void)HandleTreeEvent(event);
@@ -3253,13 +3253,13 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
switch ( hdr->code )
{
case TVN_BEGINDRAG:
eventType = wxEVT_COMMAND_TREE_BEGIN_DRAG;
eventType = wxEVT_TREE_BEGIN_DRAG;
// fall through
case TVN_BEGINRDRAG:
{
if ( eventType == wxEVT_NULL )
eventType = wxEVT_COMMAND_TREE_BEGIN_RDRAG;
eventType = wxEVT_TREE_BEGIN_RDRAG;
//else: left drag, already set above
NM_TREEVIEW *tv = (NM_TREEVIEW *)lParam;
@@ -3276,7 +3276,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
case TVN_BEGINLABELEDIT:
{
eventType = wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT;
eventType = wxEVT_TREE_BEGIN_LABEL_EDIT;
TV_DISPINFO *info = (TV_DISPINFO *)lParam;
// although the user event handler may still veto it, it is
@@ -3291,7 +3291,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
case TVN_DELETEITEM:
{
eventType = wxEVT_COMMAND_TREE_DELETE_ITEM;
eventType = wxEVT_TREE_DELETE_ITEM;
NM_TREEVIEW *tv = (NM_TREEVIEW *)lParam;
event.m_item = tv->itemOld.hItem;
@@ -3310,7 +3310,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
case TVN_ENDLABELEDIT:
{
eventType = wxEVT_COMMAND_TREE_END_LABEL_EDIT;
eventType = wxEVT_TREE_END_LABEL_EDIT;
TV_DISPINFO *info = (TV_DISPINFO *)lParam;
event.m_item = info->item.hItem;
@@ -3334,7 +3334,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
#ifdef TVN_GETINFOTIP
case TVN_GETINFOTIP:
{
eventType = wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP;
eventType = wxEVT_TREE_ITEM_GETTOOLTIP;
NMTVGETINFOTIP *info = (NMTVGETINFOTIP*)lParam;
// Which item are we trying to get a tooltip for?
@@ -3346,13 +3346,13 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
#endif // !__WXWINCE__
case TVN_GETDISPINFO:
eventType = wxEVT_COMMAND_TREE_GET_INFO;
eventType = wxEVT_TREE_GET_INFO;
// fall through
case TVN_SETDISPINFO:
{
if ( eventType == wxEVT_NULL )
eventType = wxEVT_COMMAND_TREE_SET_INFO;
eventType = wxEVT_TREE_SET_INFO;
//else: get, already set above
TV_DISPINFO *info = (TV_DISPINFO *)lParam;
@@ -3440,7 +3440,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
case TVN_SELCHANGEDW:
if ( !m_changingSelection )
{
eventType = wxEVT_COMMAND_TREE_SEL_CHANGED;
eventType = wxEVT_TREE_SEL_CHANGED;
}
// fall through
@@ -3449,7 +3449,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
if ( !m_changingSelection )
{
if ( eventType == wxEVT_NULL )
eventType = wxEVT_COMMAND_TREE_SEL_CHANGING;
eventType = wxEVT_TREE_SEL_CHANGING;
//else: already set above
if (hdr->code == TVN_SELCHANGINGW ||
@@ -3648,7 +3648,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
if ( htFlags & wxTREE_HITTEST_ONITEMSTATEICON )
{
event.m_item = item;
eventType = wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK;
eventType = wxEVT_TREE_STATE_IMAGE_CLICK;
}
break;
@@ -3666,8 +3666,8 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
{
event.m_item = tvhti.hItem;
eventType = (int)hdr->code == NM_DBLCLK
? wxEVT_COMMAND_TREE_ITEM_ACTIVATED
: wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK;
? wxEVT_TREE_ITEM_ACTIVATED
: wxEVT_TREE_ITEM_RIGHT_CLICK;
event.m_pointDrag.x = tvhti.pt.x;
event.m_pointDrag.y = tvhti.pt.y;