X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fe5ddd9250907dd4012161c810e5640b2182818c..2c01d33555e3125057f4575ca7d0d2aba93f421f:/include/wx/gtk/scrolwin.h

diff --git a/include/wx/gtk/scrolwin.h b/include/wx/gtk/scrolwin.h
index 3023df7fc4..ce4d3f8348 100644
--- a/include/wx/gtk/scrolwin.h
+++ b/include/wx/gtk/scrolwin.h
@@ -12,10 +12,6 @@
 #ifndef _WX_GTK_SCROLLWIN_H_
 #define _WX_GTK_SCROLLWIN_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "scrolwin.h"
-#endif
-
 // ----------------------------------------------------------------------------
 // headers and constants
 // ----------------------------------------------------------------------------
@@ -68,6 +64,14 @@ public:
     // 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 );
 
@@ -185,7 +189,7 @@ protected:
 
 private:
     DECLARE_EVENT_TABLE()
-    DECLARE_ABSTRACT_CLASS(wxScrolledWindow)
+    DECLARE_DYNAMIC_CLASS(wxScrolledWindow)
 };
 
 #endif