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

rename wxGrid::SendSizeEvent() to SendGridSizeEvent() to avoid warnings about conflicts with base wxWindow class method with the same name

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60464 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-05-01 22:59:58 +00:00
parent bca8c756a3
commit c5c1ea9648
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/generic/grid.h
View File

@@ -1972,9 +1972,9 @@ protected:
{ return SendEvent(evtType, m_currentCellCoords, s); } { return SendEvent(evtType, m_currentCellCoords, s); }
// send wxEVT_GRID_{ROW,COL}_SIZE // send wxEVT_GRID_{ROW,COL}_SIZE
void SendSizeEvent(wxEventType type, void SendGridSizeEvent(wxEventType type,
int row, int col, int row, int col,
const wxMouseEvent& mouseEv); const wxMouseEvent& mouseEv);
void OnPaint( wxPaintEvent& ); void OnPaint( wxPaintEvent& );
void OnSize( wxSizeEvent& ); void OnSize( wxSizeEvent& );

2
include/wx/generic/private/grid.h
View File

@@ -200,7 +200,7 @@ private:
// can't do anything else here // can't do anything else here
wxMouseEvent e; wxMouseEvent e;
e.SetState(wxGetMouseState()); e.SetState(wxGetMouseState());
GetOwner()->SendSizeEvent(wxEVT_GRID_COL_SIZE, -1, idx, e); GetOwner()->SendGridSizeEvent(wxEVT_GRID_COL_SIZE, -1, idx, e);
} }
// overridden to react to the columns order changes in the customization // overridden to react to the columns order changes in the customization

10
src/generic/grid.cpp
View File

@@ -2973,7 +2973,7 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
// TODO: generate RESIZING event, see #10754 // TODO: generate RESIZING event, see #10754
AutoSizeRowLabelSize( row ); AutoSizeRowLabelSize( row );
SendSizeEvent(wxEVT_GRID_ROW_SIZE, row, -1, event); SendGridSizeEvent(wxEVT_GRID_ROW_SIZE, row, -1, event);
ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, GetColLabelWindow()); ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, GetColLabelWindow());
m_dragLastPos = -1; m_dragLastPos = -1;
@@ -3319,7 +3319,7 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
// TODO: generate RESIZING event, see #10754 // TODO: generate RESIZING event, see #10754
AutoSizeColLabelSize( colEdge ); AutoSizeColLabelSize( colEdge );
SendSizeEvent(wxEVT_GRID_COL_SIZE, -1, colEdge, event); SendGridSizeEvent(wxEVT_GRID_COL_SIZE, -1, colEdge, event);
ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, GetColLabelWindow()); ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, GetColLabelWindow());
m_dragLastPos = -1; m_dragLastPos = -1;
@@ -3995,7 +3995,7 @@ void wxGrid::DoEndDragResizeRow(const wxMouseEvent& event)
// TODO: generate RESIZING event, see #10754 // TODO: generate RESIZING event, see #10754
if ( DoEndDragResizeLine(wxGridRowOperations()) ) if ( DoEndDragResizeLine(wxGridRowOperations()) )
SendSizeEvent(wxEVT_GRID_ROW_SIZE, m_dragRowOrCol, -1, event); SendGridSizeEvent(wxEVT_GRID_ROW_SIZE, m_dragRowOrCol, -1, event);
} }
void wxGrid::DoEndDragResizeCol(const wxMouseEvent& event) void wxGrid::DoEndDragResizeCol(const wxMouseEvent& event)
@@ -4003,7 +4003,7 @@ void wxGrid::DoEndDragResizeCol(const wxMouseEvent& event)
// TODO: generate RESIZING event, see #10754 // TODO: generate RESIZING event, see #10754
if ( DoEndDragResizeLine(wxGridColumnOperations()) ) if ( DoEndDragResizeLine(wxGridColumnOperations()) )
SendSizeEvent(wxEVT_GRID_COL_SIZE, -1, m_dragRowOrCol, event); SendGridSizeEvent(wxEVT_GRID_COL_SIZE, -1, m_dragRowOrCol, event);
} }
void wxGrid::DoStartMoveCol(int col) void wxGrid::DoStartMoveCol(int col)
@@ -4182,7 +4182,7 @@ wxGrid::DoAppendLines(bool (wxGridTableBase::*funcAppend)(size_t),
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
void void
wxGrid::SendSizeEvent(wxEventType type, wxGrid::SendGridSizeEvent(wxEventType type,
int row, int col, int row, int col,
const wxMouseEvent& mouseEv) const wxMouseEvent& mouseEv)
{ {