better native types for carbon

[wxWidgets.git] / src / generic / grid.cpp

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 91dce5ee8aa6ec6d6893a0da68362d7b85daa59e..73318daf36dd28fab641790b92941a2f708c61dd 100644 (file)
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -3459,7 +3459,7 @@ void wxGrid::ChangeCursorMode(CursorMode mode,
                               wxWindow *win,
                               bool captureMouse)
 {
                               wxWindow *win,
                               bool captureMouse)
 {

-#ifdef __WXDEBUG__
+#if wxUSE_LOG_TRACE

     static const wxChar *cursorModes[] =
     {
         _T("SELECT_CELL"),
     static const wxChar *cursorModes[] =
     {
         _T("SELECT_CELL"),


@@ -3476,7 +3476,7 @@ void wxGrid::ChangeCursorMode(CursorMode mode,
                                   : win ? _T("rowLabelWin")
                                         : _T("gridWin"),
                cursorModes[m_cursorMode], cursorModes[mode]);
                                   : win ? _T("rowLabelWin")
                                         : _T("gridWin"),
                cursorModes[m_cursorMode], cursorModes[mode]);

-#endif
+#endif // wxUSE_LOG_TRACE

 
     if ( mode == m_cursorMode &&
          win == m_winCapture &&
 
     if ( mode == m_cursorMode &&
          win == m_winCapture &&


@@ -5976,7 +5976,7 @@ void wxGrid::SaveEditControlValue()
         wxGridCellEditor* editor = attr->GetEditor(this, row, col);
 
         wxString newval;
         wxGridCellEditor* editor = attr->GetEditor(this, row, col);
 
         wxString newval;

-        bool changed = editor->EndEdit(oldval, &newval);
+        bool changed = editor->EndEdit(row, col, this, oldval, &newval);

 
         if ( changed && SendEvent(wxEVT_GRID_CELL_CHANGING, newval) != -1 )
         {
 
         if ( changed && SendEvent(wxEVT_GRID_CELL_CHANGING, newval) != -1 )
         {