applied heavily modified patch 1116702: support for specifying disabled toolbar image...

[wxWidgets.git] / include / wx / gtk1 / scrolwin.h

diff --git a/include/wx/gtk1/scrolwin.h b/include/wx/gtk1/scrolwin.h
index ecbe811f13d213d4bf6c09e6be89b5c9ed83aa22..b74c39146cdcf4c862fc4a6e818fdfaa13b6c5a9 100644 (file)
--- a/include/wx/gtk1/scrolwin.h
+++ b/include/wx/gtk1/scrolwin.h
@@ -68,6 +68,14 @@ public:
     // Set the scrolled area of the window.
     virtual void DoSetVirtualSize( int x, int y );
 
     // 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 );
 
     // Set the x, y scrolling increments.
     void SetScrollRate( int xstep, int ystep );