AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Changed all EVT_WXGRID... constants to EVT_GRID...

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3975 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Bedward 1999-10-14 04:42:29 +00:00
parent d88de032d3
commit b5f788a51e
2 changed files with 62 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1036,48 +1036,48 @@ class WXDLLEXPORT wxGridRangeSelectEvent : public wxNotifyEvent
};
const wxEventType EVT_WXGRID_CELL_LEFT_CLICK = wxEVT_FIRST + 1580;
const wxEventType EVT_WXGRID_CELL_RIGHT_CLICK = wxEVT_FIRST + 1581;
const wxEventType EVT_WXGRID_CELL_LEFT_DCLICK = wxEVT_FIRST + 1582;
const wxEventType EVT_WXGRID_CELL_RIGHT_DCLICK = wxEVT_FIRST + 1583;
const wxEventType EVT_WXGRID_LABEL_LEFT_CLICK = wxEVT_FIRST + 1584;
const wxEventType EVT_WXGRID_LABEL_RIGHT_CLICK = wxEVT_FIRST + 1585;
const wxEventType EVT_WXGRID_LABEL_LEFT_DCLICK = wxEVT_FIRST + 1586;
const wxEventType EVT_WXGRID_LABEL_RIGHT_DCLICK = wxEVT_FIRST + 1587;
const wxEventType EVT_WXGRID_ROW_SIZE = wxEVT_FIRST + 1588;
const wxEventType EVT_WXGRID_COL_SIZE = wxEVT_FIRST + 1589;
const wxEventType EVT_WXGRID_RANGE_SELECT = wxEVT_FIRST + 1590;
const wxEventType EVT_WXGRID_CELL_CHANGE = wxEVT_FIRST + 1591;
const wxEventType EVT_GRID_CELL_LEFT_CLICK = wxEVT_FIRST + 1580;
const wxEventType EVT_GRID_CELL_RIGHT_CLICK = wxEVT_FIRST + 1581;
const wxEventType EVT_GRID_CELL_LEFT_DCLICK = wxEVT_FIRST + 1582;
const wxEventType EVT_GRID_CELL_RIGHT_DCLICK = wxEVT_FIRST + 1583;
const wxEventType EVT_GRID_LABEL_LEFT_CLICK = wxEVT_FIRST + 1584;
const wxEventType EVT_GRID_LABEL_RIGHT_CLICK = wxEVT_FIRST + 1585;
const wxEventType EVT_GRID_LABEL_LEFT_DCLICK = wxEVT_FIRST + 1586;
const wxEventType EVT_GRID_LABEL_RIGHT_DCLICK = wxEVT_FIRST + 1587;
const wxEventType EVT_GRID_ROW_SIZE = wxEVT_FIRST + 1588;
const wxEventType EVT_GRID_COL_SIZE = wxEVT_FIRST + 1589;
const wxEventType EVT_GRID_RANGE_SELECT = wxEVT_FIRST + 1590;
const wxEventType EVT_GRID_CELL_CHANGE = wxEVT_FIRST + 1591;
typedef void (wxEvtHandler::*wxGridEventFunction)(wxGridEvent&);
typedef void (wxEvtHandler::*wxGridSizeEventFunction)(wxGridSizeEvent&);
typedef void (wxEvtHandler::*wxGridRangeSelectEventFunction)(wxGridRangeSelectEvent&);
#define EVT_WXGRID_CELL_LEFT_CLICK(fn) { EVT_WXGRID_CELL_LEFT_CLICK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridEventFunction) &fn, NULL },
#define EVT_WXGRID_CELL_RIGHT_CLICK(fn) { EVT_WXGRID_CELL_RIGHT_CLICK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridEventFunction) &fn, NULL },
#define EVT_WXGRID_CELL_LEFT_DCLICK(fn) { EVT_WXGRID_CELL_LEFT_DCLICK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridEventFunction) &fn, NULL },
#define EVT_WXGRID_CELL_RIGHT_DCLICK(fn) { EVT_WXGRID_CELL_RIGHT_DCLICK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridEventFunction) &fn, NULL },
#define EVT_WXGRID_LABEL_LEFT_CLICK(fn) { EVT_WXGRID_LABEL_LEFT_CLICK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridEventFunction) &fn, NULL },
#define EVT_WXGRID_LABEL_RIGHT_CLICK(fn) { EVT_WXGRID_LABEL_RIGHT_CLICK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridEventFunction) &fn, NULL },
#define EVT_WXGRID_LABEL_LEFT_DCLICK(fn) { EVT_WXGRID_LABEL_LEFT_DCLICK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridEventFunction) &fn, NULL },
#define EVT_WXGRID_LABEL_RIGHT_DCLICK(fn) { EVT_WXGRID_LABEL_RIGHT_DCLICK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridEventFunction) &fn, NULL },
#define EVT_WXGRID_ROW_SIZE(fn) { EVT_WXGRID_ROW_SIZE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridSizeEventFunction) &fn, NULL },
#define EVT_WXGRID_COL_SIZE(fn) { EVT_WXGRID_COL_SIZE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridSizeEventFunction) &fn, NULL },
#define EVT_WXGRID_RANGE_SELECT(fn) { EVT_WXGRID_RANGE_SELECT, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridRangeSelectEventFunction) &fn, NULL },
#define EVT_WXGRID_CELL_CHANGE(fn) { EVT_WXGRID_CELL_CHANGE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridEventFunction) &fn, NULL },
#define EVT_GRID_CELL_LEFT_CLICK(fn) { EVT_GRID_CELL_LEFT_CLICK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridEventFunction) &fn, NULL },
#define EVT_GRID_CELL_RIGHT_CLICK(fn) { EVT_GRID_CELL_RIGHT_CLICK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridEventFunction) &fn, NULL },
#define EVT_GRID_CELL_LEFT_DCLICK(fn) { EVT_GRID_CELL_LEFT_DCLICK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridEventFunction) &fn, NULL },
#define EVT_GRID_CELL_RIGHT_DCLICK(fn) { EVT_GRID_CELL_RIGHT_DCLICK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridEventFunction) &fn, NULL },
#define EVT_GRID_LABEL_LEFT_CLICK(fn) { EVT_GRID_LABEL_LEFT_CLICK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridEventFunction) &fn, NULL },
#define EVT_GRID_LABEL_RIGHT_CLICK(fn) { EVT_GRID_LABEL_RIGHT_CLICK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridEventFunction) &fn, NULL },
#define EVT_GRID_LABEL_LEFT_DCLICK(fn) { EVT_GRID_LABEL_LEFT_DCLICK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridEventFunction) &fn, NULL },
#define EVT_GRID_LABEL_RIGHT_DCLICK(fn) { EVT_GRID_LABEL_RIGHT_DCLICK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridEventFunction) &fn, NULL },
#define EVT_GRID_ROW_SIZE(fn) { EVT_GRID_ROW_SIZE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridSizeEventFunction) &fn, NULL },
#define EVT_GRID_COL_SIZE(fn) { EVT_GRID_COL_SIZE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridSizeEventFunction) &fn, NULL },
#define EVT_GRID_RANGE_SELECT(fn) { EVT_GRID_RANGE_SELECT, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridRangeSelectEventFunction) &fn, NULL },
#define EVT_GRID_CELL_CHANGE(fn) { EVT_GRID_CELL_CHANGE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridEventFunction) &fn, NULL },
#if 0 // TODO: implement these ? others ?
const wxEventType EVT_WXGRID_SELECT_CELL = wxEVT_FIRST + 1575;
const wxEventType EVT_WXGRID_CREATE_CELL = wxEVT_FIRST + 1576;
const wxEventType EVT_WXGRID_CHANGE_LABELS = wxEVT_FIRST + 1577;
const wxEventType EVT_WXGRID_CHANGE_SEL_LABEL = wxEVT_FIRST + 1578;
const wxEventType EVT_GRID_SELECT_CELL = wxEVT_FIRST + 1575;
const wxEventType EVT_GRID_CREATE_CELL = wxEVT_FIRST + 1576;
const wxEventType EVT_GRID_CHANGE_LABELS = wxEVT_FIRST + 1577;
const wxEventType EVT_GRID_CHANGE_SEL_LABEL = wxEVT_FIRST + 1578;
#define EVT_WXGRID_SELECT_CELL(fn) { EVT_WXGRID_SELECT_CELL, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridEventFunction) &fn, NULL },
#define EVT_WXGRID_CREATE_CELL(fn) { EVT_WXGRID_CREATE_CELL, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridEventFunction) &fn, NULL },
#define EVT_WXGRID_CHANGE_LABELS(fn) { EVT_WXGRID_CHANGE_LABELS, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridEventFunction) &fn, NULL },
#define EVT_WXGRID_CHANGE_SEL_LABEL(fn) { EVT_WXGRID_CHANGE_SEL_LABEL, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridEventFunction) &fn, NULL },
#define EVT_GRID_SELECT_CELL(fn) { EVT_GRID_SELECT_CELL, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridEventFunction) &fn, NULL },
#define EVT_GRID_CREATE_CELL(fn) { EVT_GRID_CREATE_CELL, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridEventFunction) &fn, NULL },
#define EVT_GRID_CHANGE_LABELS(fn) { EVT_GRID_CHANGE_LABELS, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridEventFunction) &fn, NULL },
#define EVT_GRID_CHANGE_SEL_LABEL(fn) { EVT_GRID_CHANGE_SEL_LABEL, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridEventFunction) &fn, NULL },
#endif

60
src/generic/grid.cpp
View File

@ -1133,8 +1133,8 @@ bool wxGrid::SendEvent( const wxEventType type,
int row, int col,
wxMouseEvent& mouseEv )
{
if ( type == EVT_WXGRID_ROW_SIZE ||
type == EVT_WXGRID_COL_SIZE )
if ( type == EVT_GRID_ROW_SIZE ||
type == EVT_GRID_COL_SIZE )
{
int rowOrCol = (row == -1 ? col : row);
@ -1150,7 +1150,7 @@ bool wxGrid::SendEvent( const wxEventType type,
return GetEventHandler()->ProcessEvent(gridEvt);
}
else if ( type == EVT_WXGRID_RANGE_SELECT )
else if ( type == EVT_GRID_RANGE_SELECT )
{
wxGridRangeSelectEvent gridEvt( GetId(),
type,
@ -1187,8 +1187,8 @@ bool wxGrid::SendEvent( const wxEventType type,
bool wxGrid::SendEvent( const wxEventType type,
int row, int col )
{
if ( type == EVT_WXGRID_ROW_SIZE ||
type == EVT_WXGRID_COL_SIZE )
if ( type == EVT_GRID_ROW_SIZE ||
type == EVT_GRID_COL_SIZE )
{
int rowOrCol = (row == -1 ? col : row);
@ -1380,7 +1380,7 @@ void wxGrid::OnMouse( wxMouseEvent& ev )
if ( YToEdgeOfRow(y) < 0 )
{
row = YToRow(y);
if ( !SendEvent( EVT_WXGRID_LABEL_LEFT_CLICK, row, col, ev ) )
if ( !SendEvent( EVT_GRID_LABEL_LEFT_CLICK, row, col, ev ) )
{
SelectRow( row, ev.ShiftDown() );
m_cursorMode = WXGRID_CURSOR_SELECT_ROW;
@ -1398,7 +1398,7 @@ void wxGrid::OnMouse( wxMouseEvent& ev )
if ( XToEdgeOfCol(x) < 0 )
{
col = XToCol(x);
if ( !SendEvent( EVT_WXGRID_LABEL_LEFT_CLICK, row, col, ev ) )
if ( !SendEvent( EVT_GRID_LABEL_LEFT_CLICK, row, col, ev ) )
{
SelectCol( col, ev.ShiftDown() );
m_cursorMode = WXGRID_CURSOR_SELECT_COL;
@ -1411,7 +1411,7 @@ void wxGrid::OnMouse( wxMouseEvent& ev )
{
// leave both row and col as -1
//
if ( !SendEvent( EVT_WXGRID_LABEL_LEFT_CLICK, row, col, ev ) )
if ( !SendEvent( EVT_GRID_LABEL_LEFT_CLICK, row, col, ev ) )
{
SelectAll();
}
@ -1421,7 +1421,7 @@ void wxGrid::OnMouse( wxMouseEvent& ev )
case WXGRID_CELL:
{
XYToCell( x, y, cellCoords );
if ( !SendEvent( EVT_WXGRID_CELL_LEFT_CLICK,
if ( !SendEvent( EVT_GRID_CELL_LEFT_CLICK,
cellCoords.GetRow(),
cellCoords.GetCol(),
ev ) )
@ -1460,7 +1460,7 @@ void wxGrid::OnMouse( wxMouseEvent& ev )
if ( YToEdgeOfRow(y) < 0 )
{
row = YToRow(y);
SendEvent( EVT_WXGRID_LABEL_LEFT_DCLICK, row, col, ev );
SendEvent( EVT_GRID_LABEL_LEFT_DCLICK, row, col, ev );
}
}
break;
@ -1474,7 +1474,7 @@ void wxGrid::OnMouse( wxMouseEvent& ev )
if ( XToEdgeOfCol(x) < 0 )
{
col = XToCol(x);
SendEvent( EVT_WXGRID_LABEL_LEFT_DCLICK, row, col, ev );
SendEvent( EVT_GRID_LABEL_LEFT_DCLICK, row, col, ev );
}
}
break;
@ -1483,14 +1483,14 @@ void wxGrid::OnMouse( wxMouseEvent& ev )
{
// leave both row and col as -1
//
SendEvent( EVT_WXGRID_LABEL_LEFT_DCLICK, row, col, ev );
SendEvent( EVT_GRID_LABEL_LEFT_DCLICK, row, col, ev );
}
break;
case WXGRID_CELL:
{
XYToCell( x, y, cellCoords );
SendEvent( EVT_WXGRID_CELL_LEFT_DCLICK,
SendEvent( EVT_GRID_CELL_LEFT_DCLICK,
cellCoords.GetRow(),
cellCoords.GetCol(),
ev );
@ -1535,7 +1535,7 @@ void wxGrid::OnMouse( wxMouseEvent& ev )
// Note: we are ending the event *after* doing
// default processing in this case
//
SendEvent( EVT_WXGRID_ROW_SIZE, m_dragRowOrCol, -1, ev );
SendEvent( EVT_GRID_ROW_SIZE, m_dragRowOrCol, -1, ev );
}
}
break;
@ -1563,7 +1563,7 @@ void wxGrid::OnMouse( wxMouseEvent& ev )
// Note: we are ending the event *after* doing
// default processing in this case
//
SendEvent( EVT_WXGRID_COL_SIZE, -1, m_dragRowOrCol, ev );
SendEvent( EVT_GRID_COL_SIZE, -1, m_dragRowOrCol, ev );
}
}
break;
@ -1575,7 +1575,7 @@ void wxGrid::OnMouse( wxMouseEvent& ev )
// Note: we are ending the event *after* doing
// default processing in this case
//
SendEvent( EVT_WXGRID_RANGE_SELECT, -1, -1, ev );
SendEvent( EVT_GRID_RANGE_SELECT, -1, -1, ev );
}
}
break;
@ -1599,7 +1599,7 @@ void wxGrid::OnMouse( wxMouseEvent& ev )
case WXGRID_ROWLABEL:
{
row = YToRow(y);
if ( !SendEvent( EVT_WXGRID_LABEL_RIGHT_CLICK, row, col, ev ) )
if ( !SendEvent( EVT_GRID_LABEL_RIGHT_CLICK, row, col, ev ) )
{
// TODO: default processing ?
}
@ -1609,7 +1609,7 @@ void wxGrid::OnMouse( wxMouseEvent& ev )
case WXGRID_COLLABEL:
{
col = XToCol(x);
if ( !SendEvent( EVT_WXGRID_LABEL_RIGHT_CLICK, row, col, ev ) )
if ( !SendEvent( EVT_GRID_LABEL_RIGHT_CLICK, row, col, ev ) )
{
// TODO: default processing ?
}
@ -1620,7 +1620,7 @@ void wxGrid::OnMouse( wxMouseEvent& ev )
{
// leave both row and col as -1
//
if ( !SendEvent( EVT_WXGRID_LABEL_RIGHT_CLICK, row, col, ev ) )
if ( !SendEvent( EVT_GRID_LABEL_RIGHT_CLICK, row, col, ev ) )
{
// TODO: default processing ?
}
@ -1630,7 +1630,7 @@ void wxGrid::OnMouse( wxMouseEvent& ev )
case WXGRID_CELL:
{
XYToCell( x, y, cellCoords );
if ( !SendEvent( EVT_WXGRID_CELL_RIGHT_CLICK,
if ( !SendEvent( EVT_GRID_CELL_RIGHT_CLICK,
cellCoords.GetRow(),
cellCoords.GetCol(),
ev ) )
@ -1663,14 +1663,14 @@ void wxGrid::OnMouse( wxMouseEvent& ev )
case WXGRID_ROWLABEL:
{
row = YToRow(y);
SendEvent( EVT_WXGRID_LABEL_RIGHT_DCLICK, row, col, ev );
SendEvent( EVT_GRID_LABEL_RIGHT_DCLICK, row, col, ev );
}
break;
case WXGRID_COLLABEL:
{
col = XToCol(x);
SendEvent( EVT_WXGRID_LABEL_RIGHT_DCLICK, row, col, ev );
SendEvent( EVT_GRID_LABEL_RIGHT_DCLICK, row, col, ev );
}
break;
@ -1678,14 +1678,14 @@ void wxGrid::OnMouse( wxMouseEvent& ev )
{
// leave both row and col as -1
//
SendEvent( EVT_WXGRID_LABEL_RIGHT_DCLICK, row, col, ev );
SendEvent( EVT_GRID_LABEL_RIGHT_DCLICK, row, col, ev );
}
break;
case WXGRID_CELL:
{
XYToCell( x, y, cellCoords );
SendEvent( EVT_WXGRID_CELL_RIGHT_DCLICK,
SendEvent( EVT_GRID_CELL_RIGHT_DCLICK,
cellCoords.GetRow(),
cellCoords.GetCol(),
ev );
@ -2153,7 +2153,7 @@ void wxGrid::SaveEditControlValue()
if ( valueChanged )
{
SendEvent( EVT_WXGRID_CELL_CHANGE,
SendEvent( EVT_GRID_CELL_CHANGE,
m_currentCellCoords.GetRow(),
m_currentCellCoords.GetCol() );
}
@ -3863,7 +3863,7 @@ void wxGrid::SetRowSize( int row, int height )
// Note: we are ending the event *after* doing
// default processing in this case
//
SendEvent( EVT_WXGRID_ROW_SIZE,
SendEvent( EVT_GRID_ROW_SIZE,
row, -1 );
}
else
@ -3902,7 +3902,7 @@ void wxGrid::SetColSize( int col, int width )
// Note: we are ending the event *after* doing
// default processing in this case
//
SendEvent( EVT_WXGRID_COL_SIZE,
SendEvent( EVT_GRID_COL_SIZE,
-1, col );
}
else
@ -4141,7 +4141,7 @@ void wxGrid::SelectRow( int row, bool addToSelected )
}
wxGridRangeSelectEvent gridEvt( GetId(),
EVT_WXGRID_RANGE_SELECT,
EVT_GRID_RANGE_SELECT,
this,
m_selectedTopLeft,
m_selectedBottomRight );
@ -4178,7 +4178,7 @@ void wxGrid::SelectCol( int col, bool addToSelected )
}
wxGridRangeSelectEvent gridEvt( GetId(),
EVT_WXGRID_RANGE_SELECT,
EVT_GRID_RANGE_SELECT,
this,
m_selectedTopLeft,
m_selectedBottomRight );
@ -4220,7 +4220,7 @@ void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol )
if ( !m_isDragging )
{
wxGridRangeSelectEvent gridEvt( GetId(),
EVT_WXGRID_RANGE_SELECT,
EVT_GRID_RANGE_SELECT,
this,
m_selectedTopLeft,
m_selectedBottomRight );