X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5340966638dba7bcbd960913a0fc010dd1de4883..682214d5c6ec3e56dbdfd0c97d70d87e614b38c2:/include/wx/generic/scrolwin.h?ds=sidebyside

diff --git a/include/wx/generic/scrolwin.h b/include/wx/generic/scrolwin.h
index 88ef181e6b..91c76bbbf3 100644
--- a/include/wx/generic/scrolwin.h
+++ b/include/wx/generic/scrolwin.h
@@ -23,7 +23,7 @@
 #include "wx/window.h"
 #include "wx/panel.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr;
+extern WXDLLEXPORT_DATA(const wxChar*) wxPanelNameStr;
 
 // default scrolled window style
 #ifndef wxScrolledWindowStyle
@@ -71,8 +71,16 @@ public:
 
     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 ; }
+    virtual bool MacClipChildren() const { return true ; }
 #endif
 protected:
     // this is needed for wxEVT_PAINT processing hack described in