diff --git a/distrib/msw/ogl.rsp b/distrib/msw/ogl.rsp
index 626702ed4f..9d6f588198 100644
--- a/distrib/msw/ogl.rsp
+++ b/distrib/msw/ogl.rsp
@@ -36,7 +36,7 @@ contrib/samples/ogl/ogledit/*.rc
 contrib/samples/ogl/ogledit/*.def
 contrib/samples/ogl/ogledit/*.xbm
 contrib/samples/ogl/ogledit/make*.*
-contrib/samples/ogl/ogledit/Makefile
+contrib/samples/ogl/ogledit/Makefile.in
 contrib/samples/ogl/ogledit/*.txt
 contrib/samples/ogl/ogledit/*.ico
 contrib/samples/ogl/ogledit/*.bmp
@@ -54,7 +54,7 @@ contrib/samples/ogl/studio/*.rc
 contrib/samples/ogl/studio/*.def
 contrib/samples/ogl/studio/*.xbm
 contrib/samples/ogl/studio/make*.*
-contrib/samples/ogl/studio/Makefile
+contrib/samples/ogl/studio/Makefile.in
 contrib/samples/ogl/studio/*.txt
 contrib/samples/ogl/studio/*.ico
 contrib/samples/ogl/studio/*.bmp
diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index fa2ba8e649..6d8bad37e8 100644
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -5952,7 +5952,7 @@ bool wxGrid::IsCellEditControlDisplayed() const
         int row = m_currentCellCoords.GetRow();
         int col = m_currentCellCoords.GetCol();
         wxGridCellAttr* attr = GetCellAttr(row, col);
-        wxGridCellEditor* editor = attr->GetEditor(this, row, col);
+        wxGridCellEditor* editor = attr->GetEditor((wxGrid*) this, row, col);
         if ( editor && editor->IsCreated() )
         {
             wxWindow *control = editor->GetControl();