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

rename wxHeaderCtrl DRAG events into RESIZE ones as we're also going to have column drag-reodering

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57197 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-12-08 16:38:56 +00:00
parent afdf99e13a
commit 396825dced
6 changed files with 35 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/wx/headerctrl.h
View File

@@ -323,9 +323,9 @@ extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_HEADER_MIDDLE_DCLICK;
extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_HEADER_SEPARATOR_DCLICK; extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_HEADER_SEPARATOR_DCLICK;
extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_HEADER_BEGIN_DRAG; extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_HEADER_BEGIN_RESIZE;
extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_HEADER_DRAGGING; extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_HEADER_RESIZING;
extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_HEADER_END_DRAG; extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_HEADER_END_RESIZE;
typedef void (wxEvtHandler::*wxHeaderCtrlEventFunction)(wxHeaderCtrlEvent&); typedef void (wxEvtHandler::*wxHeaderCtrlEventFunction)(wxHeaderCtrlEvent&);
@@ -346,8 +346,8 @@ typedef void (wxEvtHandler::*wxHeaderCtrlEventFunction)(wxHeaderCtrlEvent&);
#define EVT_HEADER_SEPARATOR_DCLICK(id, fn) wx__DECLARE_HEADER_EVT(SEPARATOR_DCLICK, id, fn) #define EVT_HEADER_SEPARATOR_DCLICK(id, fn) wx__DECLARE_HEADER_EVT(SEPARATOR_DCLICK, id, fn)
#define EVT_HEADER_BEGIN_DRAG(id, fn) wx__DECLARE_HEADER_EVT(BEGIN_DRAG, id, fn) #define EVT_HEADER_BEGIN_RESIZE(id, fn) wx__DECLARE_HEADER_EVT(BEGIN_RESIZE, id, fn)
#define EVT_HEADER_DRAGGING(id, fn) wx__DECLARE_HEADER_EVT(DRAGGING, id, fn) #define EVT_HEADER_RESIZING(id, fn) wx__DECLARE_HEADER_EVT(RESIZING, id, fn)
#define EVT_HEADER_END_DRAG(id, fn) wx__DECLARE_HEADER_EVT(END_DRAG, id, fn) #define EVT_HEADER_END_RESIZE(id, fn) wx__DECLARE_HEADER_EVT(END_RESIZE, id, fn)
#endif // _WX_HEADERCTRL_H_ #endif // _WX_HEADERCTRL_H_

31
interface/wx/headerctrl.h
View File

@@ -70,21 +70,22 @@
contents width and the control provides UpdateColumnWidthToFit() method contents width and the control provides UpdateColumnWidthToFit() method
to make implementing this easier). to make implementing this easier).
@event{EVT_HEADER_BEGIN_DRAG(id, func)} @event{EVT_HEADER_BEGIN_RESIZE(id, func)}
The user started to drag the column with the specified index (this The user started to drag the separator to the right of the column
can only happen if wxHeaderColumn::IsResizeable() returned true for with the specified index (this can only happen for the columns for
this column). The event can be vetoed to prevent the control from which wxHeaderColumn::IsResizeable() returns true). The event can
being resized, if it isn't, the dragging and end drag events will be vetoed to prevent the column from being resized. If it isn't,
be generated later. the resizing and end resize events will be generated later.
@event{EVT_HEADER_DRAGGING(id, func)} @event{EVT_HEADER_RESIZING(id, func)}
The user is dragging the column with the specified index and its The user is dragging the column with the specified index resizing
current width is wxHeaderCtrlEvent::GetWidth(). The event can be it and its current width is wxHeaderCtrlEvent::GetWidth(). The
vetoed to stop the dragging operation completely at any time. event can be vetoed to stop the dragging operation completely at
@event{EVT_HEADER_END_DRAG(id, func)} any time.
The user stopped dragging the column. If @event{EVT_HEADER_END_RESIZE(id, func)}
wxHeaderCtrlEvent::IsCancelled() returns @true, nothing should Either the user stopped dragging the column by releasing the mouse
be done, otherwise the column should normally be resized to the or the resizing was cancelled. If wxHeaderCtrlEvent::IsCancelled()
value of wxHeaderCtrlEvent::GetWidth(). returns @true, nothing should be done, otherwise the column should
normally be resized to the value of wxHeaderCtrlEvent::GetWidth().
@endEventTable @endEventTable
@library{wxcore} @library{wxcore}

6
src/common/headerctrlcmn.cpp
View File

@@ -178,6 +178,6 @@ const wxEventType wxEVT_COMMAND_HEADER_MIDDLE_DCLICK = wxNewEventType();
const wxEventType wxEVT_COMMAND_HEADER_SEPARATOR_DCLICK = wxNewEventType(); const wxEventType wxEVT_COMMAND_HEADER_SEPARATOR_DCLICK = wxNewEventType();
const wxEventType wxEVT_COMMAND_HEADER_BEGIN_DRAG = wxNewEventType(); const wxEventType wxEVT_COMMAND_HEADER_BEGIN_RESIZE = wxNewEventType();
const wxEventType wxEVT_COMMAND_HEADER_DRAGGING = wxNewEventType(); const wxEventType wxEVT_COMMAND_HEADER_RESIZING = wxNewEventType();
const wxEventType wxEVT_COMMAND_HEADER_END_DRAG = wxNewEventType(); const wxEventType wxEVT_COMMAND_HEADER_END_RESIZE = wxNewEventType();

12
src/generic/datavgen.cpp
View File

@@ -137,13 +137,13 @@ private:
event.Skip(); event.Skip();
} }
void OnBeginDrag(wxHeaderCtrlEvent& event) void OnBeginResize(wxHeaderCtrlEvent& event)
{ {
if ( !GetColumn(event.GetColumn()).IsResizeable() ) if ( !GetColumn(event.GetColumn()).IsResizeable() )
event.Veto(); event.Veto();
} }
void OnDragging(wxHeaderCtrlEvent& event) void OnResizing(wxHeaderCtrlEvent& event)
{ {
const wxHeaderColumnBase& col = GetColumn(event.GetColumn()); const wxHeaderColumnBase& col = GetColumn(event.GetColumn());
@@ -152,7 +152,7 @@ private:
event.Veto(); event.Veto();
} }
void OnEndDrag(wxHeaderCtrlEvent& event) void OnEndResize(wxHeaderCtrlEvent& event)
{ {
if ( !event.IsCancelled() ) if ( !event.IsCancelled() )
{ {
@@ -170,9 +170,9 @@ BEGIN_EVENT_TABLE(wxDataViewHeaderWindow, wxHeaderCtrl)
EVT_HEADER_CLICK(wxID_ANY, wxDataViewHeaderWindow::OnClick) EVT_HEADER_CLICK(wxID_ANY, wxDataViewHeaderWindow::OnClick)
EVT_HEADER_RIGHT_CLICK(wxID_ANY, wxDataViewHeaderWindow::OnRClick) EVT_HEADER_RIGHT_CLICK(wxID_ANY, wxDataViewHeaderWindow::OnRClick)
EVT_HEADER_BEGIN_DRAG(wxID_ANY, wxDataViewHeaderWindow::OnBeginDrag) EVT_HEADER_BEGIN_RESIZE(wxID_ANY, wxDataViewHeaderWindow::OnBeginResize)
EVT_HEADER_DRAGGING(wxID_ANY, wxDataViewHeaderWindow::OnDragging) EVT_HEADER_RESIZING(wxID_ANY, wxDataViewHeaderWindow::OnResizing)
EVT_HEADER_END_DRAG(wxID_ANY, wxDataViewHeaderWindow::OnEndDrag) EVT_HEADER_END_RESIZE(wxID_ANY, wxDataViewHeaderWindow::OnEndResize)
END_EVENT_TABLE() END_EVENT_TABLE()
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

2
src/generic/headerctrlg.cpp
View File

@@ -258,7 +258,7 @@ void wxHeaderCtrl::EndResizing(int width)
if ( width != -1 ) if ( width != -1 )
ReleaseMouse(); ReleaseMouse();
wxHeaderCtrlEvent event(wxEVT_COMMAND_HEADER_END_DRAG, GetId()); wxHeaderCtrlEvent event(wxEVT_COMMAND_HEADER_END_RESIZE, GetId());
event.SetEventObject(this); event.SetEventObject(this);
event.SetColumn(m_colBeingResized); event.SetColumn(m_colBeingResized);
if ( width == -1 ) if ( width == -1 )

6
src/msw/headerctrl.cpp
View File

@@ -332,19 +332,19 @@ bool wxHeaderCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
// ASCII and Unicode versions of this message // ASCII and Unicode versions of this message
case HDN_BEGINTRACKA: case HDN_BEGINTRACKA:
case HDN_BEGINTRACKW: case HDN_BEGINTRACKW:
evtType = wxEVT_COMMAND_HEADER_BEGIN_DRAG; evtType = wxEVT_COMMAND_HEADER_BEGIN_RESIZE;
// fall through // fall through
case HDN_TRACKA: case HDN_TRACKA:
case HDN_TRACKW: case HDN_TRACKW:
if ( evtType == wxEVT_NULL ) if ( evtType == wxEVT_NULL )
evtType = wxEVT_COMMAND_HEADER_DRAGGING; evtType = wxEVT_COMMAND_HEADER_RESIZING;
// fall through // fall through
case HDN_ENDTRACKA: case HDN_ENDTRACKA:
case HDN_ENDTRACKW: case HDN_ENDTRACKW:
if ( evtType == wxEVT_NULL ) if ( evtType == wxEVT_NULL )
evtType = wxEVT_COMMAND_HEADER_END_DRAG; evtType = wxEVT_COMMAND_HEADER_END_RESIZE;
width = nmhdr->pitem->cxy; width = nmhdr->pitem->cxy;
break; break;