don't use a floating point value as a boolean flag; gcc4 (correctly) complains when...

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

diff --git a/include/wx/gtk/scrolwin.h b/include/wx/gtk/scrolwin.h
index bcfb3940df520ed1d178b857182be7c8cca38989..ce4d3f8348ed699dd52d4ae44ccabfb6fe4fd199 100644 (file)
--- 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 );
 
@@ -127,7 +131,7 @@ public:
 
     // Override this function if you don't want to have wxScrolledWindow
     // automatically change the origin according to the scroll position.
-    void PrepareDC(wxDC& dc) { DoPrepareDC(); }
+    void PrepareDC(wxDC& dc) { DoPrepareDC(dc); }
 
     // lay out the window and its children
     virtual bool Layout();
@@ -185,7 +189,7 @@ protected:
 
 private:
     DECLARE_EVENT_TABLE()
-    DECLARE_ABSTRACT_CLASS(wxScrolledWindow)
+    DECLARE_DYNAMIC_CLASS(wxScrolledWindow)
 };
 
 #endif