diff --git a/include/wx/univ/window.h b/include/wx/univ/window.h index d5aa30e4ba..1d21f3b716 100644 --- a/include/wx/univ/window.h +++ b/include/wx/univ/window.h @@ -237,12 +237,6 @@ protected: // draw the controls contents virtual void DoDraw(wxControlRenderer *renderer); - // calculate the best size for the client area of the window: default - // implementation of DoGetBestSize() uses this method and adds the border - // width to the result - virtual wxSize DoGetBestClientSize() const; - virtual wxSize DoGetBestSize() const; - // override the base class method to return the size of the window borders virtual wxSize DoGetBorderSize() const; diff --git a/src/univ/winuniv.cpp b/src/univ/winuniv.cpp index 1e6ab4bb99..9ec63e0861 100644 --- a/src/univ/winuniv.cpp +++ b/src/univ/winuniv.cpp @@ -718,16 +718,6 @@ void wxWindow::OnSize(wxSizeEvent& event) #endif } -wxSize wxWindow::DoGetBestSize() const -{ - return AdjustSize(DoGetBestClientSize()); -} - -wxSize wxWindow::DoGetBestClientSize() const -{ - return wxWindowNative::DoGetBestSize(); -} - wxSize wxWindow::DoGetBorderSize() const { return AdjustSize(wxSize(0, 0));