Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed best sizes for wxUniv controls.

Browse Source 
Many wxUniv controls had a way too small best size which was noticeable when running e.g. the widgets sample. Regression started in r61169 where wxWindowBase::DoGetClientBestSize() was introduced but that virtual function already existed in wxUniv's wxWindow. Removing wxUniv's wxWindow::DoGetBestSize and wxWindow::DoGetBestClientSize fixes sizing issues.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68902 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Dimitri Schoolwerth
2011-08-25 23:16:44 +00:00
parent 82e1729555
commit b849473237
2 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/univ/window.h
View File

@@ -237,12 +237,6 @@ protected:
// draw the controls contents // draw the controls contents
virtual void DoDraw(wxControlRenderer *renderer); 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 // override the base class method to return the size of the window borders
virtual wxSize DoGetBorderSize() const; virtual wxSize DoGetBorderSize() const;

10
src/univ/winuniv.cpp
View File

@@ -718,16 +718,6 @@ void wxWindow::OnSize(wxSizeEvent& event)
#endif #endif
} }
wxSize wxWindow::DoGetBestSize() const
{
return AdjustSize(DoGetBestClientSize());
}
wxSize wxWindow::DoGetBestClientSize() const
{
return wxWindowNative::DoGetBestSize();
}
wxSize wxWindow::DoGetBorderSize() const wxSize wxWindow::DoGetBorderSize() const
{ {
return AdjustSize(wxSize(0, 0)); return AdjustSize(wxSize(0, 0));