Provided GetBestVirtualSize and DoGetBestSize implementations for
generic and GTK+ wxScrolledWindow. wxWindowBase::DoGetBestSize was returning a virtual size if there were child controls, which was then used to set the scrolled window actual size. Similarly, wxWindowBase::GetBestVirtualSize was returning the actual window size; now we return the virtual size for dimensions that have scrolling (e.g. vertical scrolling direction), or the minimum/actual size for those that don't (e.g. the maximum control width if there is no horizontal scrolling). This allows the scrolled window to be properly sized, whereas before it would start off at the virtual size (giving enormous layouts). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32866 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -68,6 +68,14 @@ public:
|
||||
// Set the scrolled area of the window.
|
||||
virtual void DoSetVirtualSize( int x, int y );
|
||||
|
||||
// wxWindow's GetBestVirtualSize returns the actual window size,
|
||||
// whereas we want to return the virtual size
|
||||
virtual wxSize GetBestVirtualSize() const;
|
||||
|
||||
// Return the size best suited for the current window
|
||||
// (this isn't a virtual size, this is a sensible size for the window)
|
||||
virtual wxSize DoGetBestSize() const;
|
||||
|
||||
// Set the x, y scrolling increments.
|
||||
void SetScrollRate( int xstep, int ystep );
|
||||
|
||||
|
Reference in New Issue
Block a user