X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5340966638dba7bcbd960913a0fc010dd1de4883..68bc51a9ed67dfd2891cd8474a0793171d5e2a8d:/include/wx/generic/scrolwin.h

diff --git a/include/wx/generic/scrolwin.h b/include/wx/generic/scrolwin.h
index 88ef181e6b..2163b7141d 100644
--- a/include/wx/generic/scrolwin.h
+++ b/include/wx/generic/scrolwin.h
@@ -12,10 +12,6 @@
 #ifndef _WX_GENERIC_SCROLLWIN_H_
 #define _WX_GENERIC_SCROLLWIN_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "genscrolwin.h"
-#endif
-
 // ----------------------------------------------------------------------------
 // headers and constants
 // ----------------------------------------------------------------------------
@@ -23,7 +19,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
@@ -32,6 +28,9 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr;
 
 // avoid triggering this stupid VC++ warning
 #ifdef __VISUALC__
+    #if _MSC_VER > 1100
+        #pragma warning(push)
+    #endif
     #pragma warning(disable:4355) // 'this' used in base member initializer list
 #endif
 
@@ -71,9 +70,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()
@@ -90,8 +94,8 @@ private:
     DECLARE_EVENT_TABLE()
 };
 
-#ifdef __VISUALC__
-    #pragma warning(default:4355)
+#if defined(__VISUALC__) && (_MSC_VER > 1100)
+    #pragma warning(pop)
 #endif
 
 #endif