diff --git a/include/wx/univ/toolbar.h b/include/wx/univ/toolbar.h index 7ab15e4bb8..b393311e60 100644 --- a/include/wx/univ/toolbar.h +++ b/include/wx/univ/toolbar.h @@ -101,9 +101,6 @@ protected: const wxString& label) wxOVERRIDE; virtual wxSize DoGetBestClientSize() const wxOVERRIDE; - virtual void DoSetSize(int x, int y, - int width, int height, - int sizeFlags = wxSIZE_AUTO) wxOVERRIDE; virtual void DoDraw(wxControlRenderer *renderer) wxOVERRIDE; // get the bounding rect for the given tool diff --git a/src/univ/toolbar.cpp b/src/univ/toolbar.cpp index 833bd80334..2c2ceffd6c 100644 --- a/src/univ/toolbar.cpp +++ b/src/univ/toolbar.cpp @@ -563,33 +563,6 @@ wxSize wxToolBar::DoGetBestClientSize() const return wxSize(m_maxWidth, m_maxHeight); } -void wxToolBar::DoSetSize(int x, int y, int width, int height, int sizeFlags) -{ - int old_width, old_height; - GetSize(&old_width, &old_height); - - wxToolBarBase::DoSetSize(x, y, width, height, sizeFlags); - - // Correct width and height if needed. - if ( width == wxDefaultCoord || height == wxDefaultCoord ) - { - int tmp_width, tmp_height; - GetSize(&tmp_width, &tmp_height); - - if ( width == wxDefaultCoord ) - width = tmp_width; - if ( height == wxDefaultCoord ) - height = tmp_height; - } - - // We must refresh the frame size when the toolbar changes size - // otherwise the toolbar can be shown incorrectly - if ( old_width != width || old_height != height ) - { - SendSizeEventToParent(); - } -} - // ---------------------------------------------------------------------------- // wxToolBar drawing // ----------------------------------------------------------------------------