Moved the pending pos and size into wxWindowMSW

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

diff --git a/include/wx/generic/scrolwin.h b/include/wx/generic/scrolwin.h
index 698e8bd8244dcd99f9557c83167d51fbf937ff2c..c7ecc79bf1ba4085a6cc60c7fac61c6de149045c 100644 (file)
--- a/include/wx/generic/scrolwin.h
+++ b/include/wx/generic/scrolwin.h
@@ -71,9 +71,14 @@ public:
 
     virtual void DoSetVirtualSize(int x, int y);
 
-#ifdef __WXMAC__
-    virtual bool MacClipChildren() const { return true ; }
-#endif
+    // 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;
+
 protected:
     // this is needed for wxEVT_PAINT processing hack described in
     // wxScrollHelperEvtHandler::ProcessEvent()