we need our own imaglist implementation because in wxmac wxIcon does not inherit...

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

diff --git a/include/wx/generic/scrolwin.h b/include/wx/generic/scrolwin.h
index 698e8bd8244dcd99f9557c83167d51fbf937ff2c..91c76bbbf3a407b01167b2a0f737ade4e709f966 100644 (file)
--- a/include/wx/generic/scrolwin.h
+++ b/include/wx/generic/scrolwin.h
@@ -71,6 +71,14 @@ public:
 
     virtual void DoSetVirtualSize(int x, int y);
 
 
     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;
+

 #ifdef __WXMAC__
     virtual bool MacClipChildren() const { return true ; }
 #endif
 #ifdef __WXMAC__
     virtual bool MacClipChildren() const { return true ; }
 #endif