From c5c1ea964817e562d1c4b0d89b3937fce28c3f10 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 1 May 2009 22:59:58 +0000 Subject: [PATCH] rename wxGrid::SendSizeEvent() to SendGridSizeEvent() to avoid warnings about conflicts with base wxWindow class method with the same name git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60464 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/generic/grid.h | 6 +++--- include/wx/generic/private/grid.h | 2 +- src/generic/grid.cpp | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h index 9490b030c8..7fd7dd7b12 100644 --- a/include/wx/generic/grid.h +++ b/include/wx/generic/grid.h @@ -1972,9 +1972,9 @@ protected: { return SendEvent(evtType, m_currentCellCoords, s); } // send wxEVT_GRID_{ROW,COL}_SIZE - void SendSizeEvent(wxEventType type, - int row, int col, - const wxMouseEvent& mouseEv); + void SendGridSizeEvent(wxEventType type, + int row, int col, + const wxMouseEvent& mouseEv); void OnPaint( wxPaintEvent& ); void OnSize( wxSizeEvent& ); diff --git a/include/wx/generic/private/grid.h b/include/wx/generic/private/grid.h index d0a2844284..4718828012 100644 --- a/include/wx/generic/private/grid.h +++ b/include/wx/generic/private/grid.h @@ -200,7 +200,7 @@ private: // can't do anything else here wxMouseEvent e; 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 diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp index c11346662e..b39338c470 100644 --- a/src/generic/grid.cpp +++ b/src/generic/grid.cpp @@ -2973,7 +2973,7 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) // TODO: generate RESIZING event, see #10754 AutoSizeRowLabelSize( row ); - SendSizeEvent(wxEVT_GRID_ROW_SIZE, row, -1, event); + SendGridSizeEvent(wxEVT_GRID_ROW_SIZE, row, -1, event); ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, GetColLabelWindow()); m_dragLastPos = -1; @@ -3319,7 +3319,7 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) // TODO: generate RESIZING event, see #10754 AutoSizeColLabelSize( colEdge ); - SendSizeEvent(wxEVT_GRID_COL_SIZE, -1, colEdge, event); + SendGridSizeEvent(wxEVT_GRID_COL_SIZE, -1, colEdge, event); ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, GetColLabelWindow()); m_dragLastPos = -1; @@ -3995,7 +3995,7 @@ void wxGrid::DoEndDragResizeRow(const wxMouseEvent& event) // TODO: generate RESIZING event, see #10754 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) @@ -4003,7 +4003,7 @@ void wxGrid::DoEndDragResizeCol(const wxMouseEvent& event) // TODO: generate RESIZING event, see #10754 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) @@ -4182,7 +4182,7 @@ wxGrid::DoAppendLines(bool (wxGridTableBase::*funcAppend)(size_t), // ---------------------------------------------------------------------------- void -wxGrid::SendSizeEvent(wxEventType type, +wxGrid::SendGridSizeEvent(wxEventType type, int row, int col, const wxMouseEvent& mouseEv) { -- 2.45.2