diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h
index 47d18a9031..5f707fb54b 100644
--- a/include/wx/generic/grid.h
+++ b/include/wx/generic/grid.h
@@ -1478,7 +1478,7 @@ public:
     void SetCellBitmap(wxBitmap *WXUNUSED(bitmap), int WXUNUSED(row), int WXUNUSED(col))
     { }
     void SetDividerPen(const wxPen& WXUNUSED(pen)) { }
-    wxPen& GetDividerPen() const { return wxNullPen; }
+    wxPen& GetDividerPen() const;
     void OnActivate(bool WXUNUSED(active)) {}
 
     // ******** End of compatibility functions **********
diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 592c390854..65a3603c05 100644
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -624,7 +624,7 @@ void wxGridCellTextEditor::HandleReturn( wxKeyEvent&
 {
 #if defined(__WXMOTIF__) || defined(__WXGTK__)
     // wxMotif needs a little extra help...
-    long pos = Text()->GetInsertionPoint();
+    size_t pos = (size_t)( Text()->GetInsertionPoint() );
     wxString s( Text()->GetValue() );
     s = s.Left(pos) + "\n" + s.Mid(pos);
     Text()->SetValue(s);
@@ -7606,6 +7606,12 @@ void wxGrid::Fit()
     AutoSize();
 }
 
+
+wxPen& wxGrid::GetDividerPen() const
+{
+    return wxNullPen;
+}
+
 // ----------------------------------------------------------------------------
 // cell value accessor functions
 // ----------------------------------------------------------------------------