diff --git a/include/wx/window.h b/include/wx/window.h
index 40ad7b237c..97b35334c0 100644
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -733,14 +733,12 @@ public:
         if ( SetFont(font) )
             m_hasFont = false;
     }
-    const wxFont& GetFont() const { return DoGetFont(); }
-    wxFont& GetFont() { return DoGetFont(); }
+    wxFont GetFont() const;
 
         // set/retrieve the cursor for this window (SetCursor() returns true
         // if the cursor was really changed)
     virtual bool SetCursor( const wxCursor &cursor );
     const wxCursor& GetCursor() const { return m_cursor; }
-    wxCursor& GetCursor() { return m_cursor; }
 
 #if wxUSE_CARET
         // associate a caret with the window
@@ -1226,10 +1224,6 @@ private:
     // the stack of windows which have captured the mouse
     static struct WXDLLEXPORT wxWindowNext *ms_winCaptureNext;
 
-    // implementation of both const and non-const versions of GetFont()
-    wxFont& DoGetFont() const;
-
-
     DECLARE_ABSTRACT_CLASS(wxWindowBase)
     DECLARE_NO_COPY_CLASS(wxWindowBase)
     DECLARE_EVENT_TABLE()