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

Make GetEffectiveMinSize virtual as not being able to override the method, which the sizer system depends on, is inflexible

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58513 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2009-01-30 09:37:14 +00:00
parent fc50ab9081
commit a20a357d92
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/window.h
View File

@@ -402,7 +402,7 @@ public:
// This function will merge the window's best size into the window's // This function will merge the window's best size into the window's
// minimum size, giving priority to the min size components, and // minimum size, giving priority to the min size components, and
// returns the results. // returns the results.
wxSize GetEffectiveMinSize() const; virtual wxSize GetEffectiveMinSize() const;
wxDEPRECATED( wxSize GetBestFittingSize() const ); // replaced by GetEffectiveMinSize wxDEPRECATED( wxSize GetBestFittingSize() const ); // replaced by GetEffectiveMinSize
wxDEPRECATED( wxSize GetAdjustedMinSize() const ); // replaced by GetEffectiveMinSize wxDEPRECATED( wxSize GetAdjustedMinSize() const ); // replaced by GetEffectiveMinSize

5
interface/wx/window.h
View File

@@ -709,9 +709,12 @@ public:
This is the value used by sizers to determine the appropriate This is the value used by sizers to determine the appropriate
ammount of space to allocate for the widget. ammount of space to allocate for the widget.
This is the method called by any wxSizer when they query the size
of a certain window or control.
@see GetBestSize(), SetInitialSize(), @ref overview_windowsizing @see GetBestSize(), SetInitialSize(), @ref overview_windowsizing
*/ */
wxSize GetEffectiveMinSize() const; virtual wxSize GetEffectiveMinSize() const;
/** /**
Returns the maximum size of window's client area. Returns the maximum size of window's client area.