wxID_PREFERENCES added for the preferences menu item

[wxWidgets.git] / include / wx / window.h

diff --git a/include/wx/window.h b/include/wx/window.h
index 2c266712cc3a3413d8909302b19f2ab124f73130..0917bae9443d400ce3316469ea759eb6bc0104da 100644 (file)
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -229,13 +229,6 @@ public:
         return wxSize(w, h);
     }
 
         return wxSize(w, h);
     }
 

-// the following are just helper functions to help some compiler with the extended rtti inf
-    void SetWindowPosition( const wxPoint &pt) { SetPosition( pt ) ; }
-    wxPoint GetWindowPosition() const { return GetPosition() ; }
-
-    void SetWindowSize( const wxSize &sz ) { SetSize( sz ) ; }
-    wxSize GetWindowSize() const { return GetSize() ; }
-

     wxRect GetRect() const
     {
         int x, y, w, h;
     wxRect GetRect() const
     {
         int x, y, w, h;


@@ -646,9 +639,6 @@ public:
     const wxFont& GetFont() const { return m_font; }
     wxFont& GetFont() { return m_font; }
 
     const wxFont& GetFont() const { return m_font; }
     wxFont& GetFont() { return m_font; }
 

-    // for resolving RTTI conflicts
-    wxFont GetWindowFont() const { return GetFont() ; }
-

 #if wxUSE_CARET
         // associate a caret with the window
     void SetCaret(wxCaret *caret);
 #if wxUSE_CARET
         // associate a caret with the window
     void SetCaret(wxCaret *caret);