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

Don't use a cached best size if the window has a sizer

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58525 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2009-01-30 20:08:14 +00:00
parent 10b0f4894b
commit 26f7724c4b
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/window.h
View File

@@ -374,12 +374,8 @@ public:
// get the size best suited for the window (in fact, minimal // get the size best suited for the window (in fact, minimal
// acceptable size using which it will still look "nice" in // acceptable size using which it will still look "nice" in
// most situations) // most situations)
wxSize GetBestSize() const wxSize GetBestSize() const;
{
if (m_bestSizeCache.IsFullySpecified())
return m_bestSizeCache;
return DoGetBestSize();
}
void GetBestSize(int *w, int *h) const void GetBestSize(int *w, int *h) const
{ {
wxSize s = GetBestSize(); wxSize s = GetBestSize();

9
src/common/wincmn.cpp
View File

@@ -47,6 +47,8 @@
#include "wx/menu.h" #include "wx/menu.h"
#endif //WX_PRECOMP #endif //WX_PRECOMP
#include "wx/collpane.h"
#if wxUSE_DRAG_AND_DROP #if wxUSE_DRAG_AND_DROP
#include "wx/dnd.h" #include "wx/dnd.h"
#endif // wxUSE_DRAG_AND_DROP #endif // wxUSE_DRAG_AND_DROP
@@ -720,6 +722,13 @@ wxSize wxWindowBase::GetEffectiveMinSize() const
return min; return min;
} }
wxSize wxWindowBase::GetBestSize() const
{
if ((!m_windowSizer) && (m_bestSizeCache.IsFullySpecified()))
return m_bestSizeCache;
return DoGetBestSize();
}
void wxWindowBase::SetMinSize(const wxSize& minSize) void wxWindowBase::SetMinSize(const wxSize& minSize)
{ {