non-osx methods bracketed

[wxWidgets.git] / include / wx / vscroll.h

diff --git a/include/wx/vscroll.h b/include/wx/vscroll.h
index 624d12187ebfb5b164f93b7b00e4fc0fc0c12fdd..d04ba462d446297fa01840155d2b20e5bf997d03 100644 (file)
--- a/include/wx/vscroll.h
+++ b/include/wx/vscroll.h
@@ -12,6 +12,10 @@
 #ifndef _WX_VSCROLL_H_
 #define _WX_VSCROLL_H_
 
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#pragma interface "vscroll.h"
+#endif
+
 #include "wx/panel.h"           // base class
 
 // ----------------------------------------------------------------------------
@@ -62,7 +66,7 @@ public:
     // just as with the ctor above, wxVSCROLL style is always used, there is no
     // need to specify it
     bool Create(wxWindow *parent,
-                wxWindowID id,
+                wxWindowID id = wxID_ANY,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
@@ -96,7 +100,8 @@ public:
     // redraw all lines in the specified range (inclusive)
     void RefreshLines(size_t from, size_t to);
 
-    // return the item at the specified (in physical coordinates) position or
+    // return the item at the specified (in physical coordinates) position or.
+
     // wxNOT_FOUND if none, i.e. if it is below the last item
     int HitTest(wxCoord x, wxCoord y) const;
     int HitTest(const wxPoint& pt) const { return HitTest(pt.x, pt.y); }
@@ -141,7 +146,18 @@ protected:
     //
     // finally note that lineMin is inclusive, while lineMax is exclusive, as
     // usual
-    virtual void OnGetLinesHint(size_t lineMin, size_t lineMax) const { }
+    virtual void OnGetLinesHint(size_t WXUNUSED(lineMin),
+                                size_t WXUNUSED(lineMax)) const { }
+
+    // when the number of lines changes, we try to estimate the total height
+    // of all lines which is a rather expensive operation in terms of lines
+    // access, so if the user code may estimate the average height
+    // better/faster than we do, it should override this function to implement
+    // its own logic
+    //
+    // this function should return the best guess for the total height it may
+    // make
+    virtual wxCoord EstimateTotalHeight() const;
 
 
     // the event handlers
@@ -179,6 +195,8 @@ private:
 
 
     DECLARE_EVENT_TABLE()
+    DECLARE_NO_COPY_CLASS(wxVScrolledWindow)
+    DECLARE_ABSTRACT_CLASS(wxVScrolledWindow)
 };
 
 #endif // _WX_VSCROLL_H_