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

28
src/msw/headerctrl.cpp
View File

@@ -475,18 +475,18 @@ wxEventType wxHeaderCtrl::GetClickEventType(bool dblclk, int button)
switch ( button )
{
case 0:
evtType = dblclk ? wxEVT_COMMAND_HEADER_DCLICK
: wxEVT_COMMAND_HEADER_CLICK;
evtType = dblclk ? wxEVT_HEADER_DCLICK
: wxEVT_HEADER_CLICK;
break;
case 1:
evtType = dblclk ? wxEVT_COMMAND_HEADER_RIGHT_DCLICK
: wxEVT_COMMAND_HEADER_RIGHT_CLICK;
evtType = dblclk ? wxEVT_HEADER_RIGHT_DCLICK
: wxEVT_HEADER_RIGHT_CLICK;
break;
case 2:
evtType = dblclk ? wxEVT_COMMAND_HEADER_MIDDLE_DCLICK
: wxEVT_COMMAND_HEADER_MIDDLE_CLICK;
evtType = dblclk ? wxEVT_HEADER_MIDDLE_DCLICK
: wxEVT_HEADER_MIDDLE_CLICK;
break;
default:
@@ -554,7 +554,7 @@ bool wxHeaderCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
break;
case HDN_DIVIDERDBLCLICK:
evtType = wxEVT_COMMAND_HEADER_SEPARATOR_DCLICK;
evtType = wxEVT_HEADER_SEPARATOR_DCLICK;
break;
@@ -573,7 +573,7 @@ bool wxHeaderCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
break;
}
evtType = wxEVT_COMMAND_HEADER_BEGIN_RESIZE;
evtType = wxEVT_HEADER_BEGIN_RESIZE;
// fall through
case HDN_ENDTRACKA:
@@ -582,7 +582,7 @@ bool wxHeaderCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
if ( evtType == wxEVT_NULL )
{
evtType = wxEVT_COMMAND_HEADER_END_RESIZE;
evtType = wxEVT_HEADER_END_RESIZE;
// don't generate events with invalid width
const int minWidth = GetColumn(idx).GetMinWidth();
@@ -612,7 +612,7 @@ bool wxHeaderCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
// generate the resizing event from here as we don't seem
// to be getting HDN_TRACK events at all, at least with
// comctl32.dll v6
evtType = wxEVT_COMMAND_HEADER_RESIZING;
evtType = wxEVT_HEADER_RESIZING;
}
}
break;
@@ -643,7 +643,7 @@ bool wxHeaderCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
break;
}
evtType = wxEVT_COMMAND_HEADER_BEGIN_REORDER;
evtType = wxEVT_HEADER_BEGIN_REORDER;
break;
case HDN_ENDDRAG:
@@ -657,14 +657,14 @@ bool wxHeaderCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
order = MSWFromNativeOrder(order);
evtType = wxEVT_COMMAND_HEADER_END_REORDER;
evtType = wxEVT_HEADER_END_REORDER;
// We (successfully) ended dragging the column.
m_colBeingDragged = -1;
break;
case NM_RELEASEDCAPTURE:
evtType = wxEVT_COMMAND_HEADER_DRAGGING_CANCELLED;
evtType = wxEVT_HEADER_DRAGGING_CANCELLED;
// Dragging the column was cancelled.
m_colBeingDragged = -1;
@@ -692,7 +692,7 @@ bool wxHeaderCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
// special post-processing for HDN_ENDDRAG: we need to update the
// internal column indices array if this is allowed to go ahead as
// the native control is going to reorder its columns now
if ( evtType == wxEVT_COMMAND_HEADER_END_REORDER )
if ( evtType == wxEVT_HEADER_END_REORDER )
MoveColumnInOrderArray(m_colIndices, idx, order);
if ( processed )