Skip to content

Commit

Permalink
Make GetEffectiveMinSize virtual as not being able to override the me…
Browse files Browse the repository at this point in the history
…thod, which the sizer system depends on, is inflexible

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58513 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
  • Loading branch information
Robert Roebling committed Jan 30, 2009
1 parent fc50ab9 commit a20a357
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion include/wx/window.h
Expand Up @@ -402,7 +402,7 @@ class WXDLLIMPEXP_CORE wxWindowBase : public wxEvtHandler
// This function will merge the window's best size into the window's
// minimum size, giving priority to the min size components, and
// returns the results.
wxSize GetEffectiveMinSize() const;
virtual wxSize GetEffectiveMinSize() const;
wxDEPRECATED( wxSize GetBestFittingSize() const ); // replaced by GetEffectiveMinSize
wxDEPRECATED( wxSize GetAdjustedMinSize() const ); // replaced by GetEffectiveMinSize

Expand Down
5 changes: 4 additions & 1 deletion interface/wx/window.h
Expand Up @@ -708,10 +708,13 @@ class wxWindow : public wxEvtHandler
Merges the window's best size into the min size and returns the result.
This is the value used by sizers to determine the appropriate
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
*/
wxSize GetEffectiveMinSize() const;
virtual wxSize GetEffectiveMinSize() const;

/**
Returns the maximum size of window's client area.
Expand Down

0 comments on commit a20a357

Please sign in to comment.