X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1978421a6d8b81c1f8a961da4b8ddf544fec7b1b..5bc97d1b81910a82e249f6227798b42089149f94:/include/wx/window.h diff --git a/include/wx/window.h b/include/wx/window.h index 2c266712cc..e9f83c941d 100644 --- a/include/wx/window.h +++ b/include/wx/window.h @@ -219,7 +219,7 @@ public: return wxPoint(w, h); } - void SetPosition( const wxPoint& pt ) { Move( pt ) ; } + void SetPosition( const wxPoint& pt ) { Move( pt ) ; } void GetSize( int *w, int *h ) const { DoGetSize(w, h); } wxSize GetSize() const @@ -229,13 +229,6 @@ public: 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; @@ -646,9 +639,6 @@ public: 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); @@ -788,7 +778,7 @@ public: void SetToolTip( wxToolTip *tip ) { DoSetToolTip(tip); } // get the associated tooltip or NULL if none wxToolTip* GetToolTip() const { return m_tooltip; } - wxString GetToolTipText() const ; + wxString GetToolTipText() const ; #endif // wxUSE_TOOLTIPS // drag and drop