X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0f442030c49fd83eea24a332f286bcbbf4c4055c..186ef90c55be910263ef31cb09fe38a6ac700d1d:/src/generic/grid.cpp

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index d6de399fb8..8768d2316e 100644
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -100,21 +100,21 @@ WX_DEFINE_OBJARRAY(wxGridCellWithAttrArray)
 // events
 // ----------------------------------------------------------------------------
 
-const int wxEVT_GRID_CELL_LEFT_CLICK = wxNewEventType();
-const int wxEVT_GRID_CELL_RIGHT_CLICK = wxNewEventType();
-const int wxEVT_GRID_CELL_LEFT_DCLICK = wxNewEventType();
-const int wxEVT_GRID_CELL_RIGHT_DCLICK = wxNewEventType();
-const int wxEVT_GRID_LABEL_LEFT_CLICK = wxNewEventType();
-const int wxEVT_GRID_LABEL_RIGHT_CLICK = wxNewEventType();
-const int wxEVT_GRID_LABEL_LEFT_DCLICK = wxNewEventType();
-const int wxEVT_GRID_LABEL_RIGHT_DCLICK = wxNewEventType();
-const int wxEVT_GRID_ROW_SIZE = wxNewEventType();
-const int wxEVT_GRID_COL_SIZE = wxNewEventType();
-const int wxEVT_GRID_RANGE_SELECT = wxNewEventType();
-const int wxEVT_GRID_CELL_CHANGE = wxNewEventType();
-const int wxEVT_GRID_SELECT_CELL = wxNewEventType();
-const int wxEVT_GRID_EDITOR_SHOWN = wxNewEventType();
-const int wxEVT_GRID_EDITOR_HIDDEN = wxNewEventType();
+DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_LEFT_CLICK)
+DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_RIGHT_CLICK)
+DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_LEFT_DCLICK)
+DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_RIGHT_DCLICK)
+DEFINE_EVENT_TYPE(wxEVT_GRID_LABEL_LEFT_CLICK)
+DEFINE_EVENT_TYPE(wxEVT_GRID_LABEL_RIGHT_CLICK)
+DEFINE_EVENT_TYPE(wxEVT_GRID_LABEL_LEFT_DCLICK)
+DEFINE_EVENT_TYPE(wxEVT_GRID_LABEL_RIGHT_DCLICK)
+DEFINE_EVENT_TYPE(wxEVT_GRID_ROW_SIZE)
+DEFINE_EVENT_TYPE(wxEVT_GRID_COL_SIZE)
+DEFINE_EVENT_TYPE(wxEVT_GRID_RANGE_SELECT)
+DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_CHANGE)
+DEFINE_EVENT_TYPE(wxEVT_GRID_SELECT_CELL)
+DEFINE_EVENT_TYPE(wxEVT_GRID_EDITOR_SHOWN)
+DEFINE_EVENT_TYPE(wxEVT_GRID_EDITOR_HIDDEN)
 
 // ----------------------------------------------------------------------------
 // private classes
@@ -1410,12 +1410,12 @@ void wxGridCellEditorEvtHandler::OnKeyDown(wxKeyEvent& event)
             break;
 
         case WXK_TAB:
-            event.Skip( m_grid->ProcessEvent( event ) );
+            event.Skip( m_grid->GetEventHandler()->ProcessEvent( event ) );
             break;
 
         case WXK_NUMPAD_ENTER:
         case WXK_RETURN:
-            if (!m_grid->ProcessEvent(event))
+            if ( !m_grid->GetEventHandler()->ProcessEvent(event) )
                 m_editor->HandleReturn(event);
             break;
 
@@ -3143,12 +3143,12 @@ void wxGridRowLabelWindow::OnMouseEvent( wxMouseEvent& event )
 //
 void wxGridRowLabelWindow::OnKeyDown( wxKeyEvent& event )
 {
-    if ( !m_owner->ProcessEvent( event ) ) event.Skip();
+    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
 }
 
 void wxGridRowLabelWindow::OnKeyUp( wxKeyEvent& event )
 {
-    if ( !m_owner->ProcessEvent( event ) ) event.Skip();
+    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
 }
 
 
@@ -3202,12 +3202,12 @@ void wxGridColLabelWindow::OnMouseEvent( wxMouseEvent& event )
 //
 void wxGridColLabelWindow::OnKeyDown( wxKeyEvent& event )
 {
-    if ( !m_owner->ProcessEvent( event ) ) event.Skip();
+    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
 }
 
 void wxGridColLabelWindow::OnKeyUp( wxKeyEvent& event )
 {
-    if ( !m_owner->ProcessEvent( event ) ) event.Skip();
+    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
 }
 
 
@@ -3260,12 +3260,12 @@ void wxGridCornerLabelWindow::OnMouseEvent( wxMouseEvent& event )
 //
 void wxGridCornerLabelWindow::OnKeyDown( wxKeyEvent& event )
 {
-    if ( !m_owner->ProcessEvent( event ) ) event.Skip();
+    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
 }
 
 void wxGridCornerLabelWindow::OnKeyUp( wxKeyEvent& event )
 {
-    if ( !m_owner->ProcessEvent( event ) ) event.Skip();
+    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
 }
 
 
@@ -3334,12 +3334,12 @@ void wxGridWindow::OnMouseEvent( wxMouseEvent& event )
 //
 void wxGridWindow::OnKeyDown( wxKeyEvent& event )
 {
-    if ( !m_owner->ProcessEvent( event ) ) event.Skip();
+    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
 }
 
 void wxGridWindow::OnKeyUp( wxKeyEvent& event )
 {
-    if ( !m_owner->ProcessEvent( event ) ) event.Skip();
+    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
 }
 
 void wxGridWindow::OnEraseBackground( wxEraseEvent& WXUNUSED(event) )
@@ -8305,7 +8305,7 @@ void wxGrid::DeselectRow( int row )
     {
         if ( m_selection->IsInSelection(row, 0 ) )
             m_selection->ToggleCellSelection( row, 0);
-    } 
+    }
     else
     {
         int nCols = GetNumberCols();