reverted the change of r56246 and keep the old behaviour of MB2WC/WC2MB; document...

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

diff --git a/interface/wx/vscroll.h b/interface/wx/vscroll.h
index 71d4ddbd8a67cebeac269fd7e9babb9740974672..13a13229fb144996109fab21cdda915b6f60c98a 100644 (file)
--- a/interface/wx/vscroll.h
+++ b/interface/wx/vscroll.h
@@ -96,13 +96,13 @@ public:
 
         @see GetOrientationTargetSize()
     */
-    virtual int GetNonOrientationTargetSize() const;
+    virtual int GetNonOrientationTargetSize() const = 0;
 
     /**
         This function need to be overridden to return the orientation that this
         helper is working with, either @c wxHORIZONTAL or @c wxVERTICAL.
     */
-    virtual wxOrientation GetOrientation() const;
+    virtual wxOrientation GetOrientation() const = 0;
 
     /**
         This function needs to be overridden in the in the derived class to
@@ -112,7 +112,7 @@ public:
 
         @see GetNonOrientationTargetSize()
     */
-    virtual int GetOrientationTargetSize() const;
+    virtual int GetOrientationTargetSize() const = 0;
 
     /**
         This function will return the target window this helper class is
@@ -141,12 +141,6 @@ public:
     */
     bool IsVisible(size_t unit) const;
 
-    /**
-        This function must be overridden in the derived class, and should
-        return the size of the given unit in pixels.
-    */
-    virtual wxCoord OnGetUnitSize(size_t unit) const;
-
     /**
         This function doesn't have to be overridden but it may be useful to do
         so if calculating the units' sizes is a relatively expensive operation
@@ -190,6 +184,15 @@ public:
         last item).
     */
     int VirtualHitTest(wxCoord coord) const;
+
+
+protected:
+
+    /**
+        This function must be overridden in the derived class, and should
+        return the size of the given unit in pixels.
+    */
+    virtual wxCoord OnGetUnitSize(size_t unit) const = 0;
 };
 
 
@@ -257,12 +260,6 @@ public:
     */
     bool IsRowVisible(size_t row) const;
 
-    /**
-        This function must be overridden in the derived class, and should
-        return the height of the given row in pixels.
-    */
-    virtual wxCoord OnGetRowHeight(size_t row) const;
-
     /**
         This function doesn't have to be overridden but it may be useful to do
         so if calculating the rows' sizes is a relatively expensive operation
@@ -324,6 +321,14 @@ public:
         @see GetRowCount()
     */
     void SetRowCount(size_t rowCount);
+
+protected:
+
+    /**
+        This function must be overridden in the derived class, and should
+        return the height of the given row in pixels.
+    */
+    virtual wxCoord OnGetRowHeight(size_t row) const = 0;
 };
 
 
@@ -392,12 +397,6 @@ public:
     */
     bool IsColumnVisible(size_t column) const;
 
-    /**
-        This function must be overridden in the derived class, and should
-        return the width of the given column in pixels.
-    */
-    virtual wxCoord OnGetColumnWidth(size_t column) const;
-
     /**
         This function doesn't have to be overridden but it may be useful to do
         so if calculating the columns' sizes is a relatively expensive
@@ -460,6 +459,14 @@ public:
         @see GetColumnCount()
     */
     void SetColumnCount(size_t columnCount);
+
+protected:
+
+    /**
+        This function must be overridden in the derived class, and should
+        return the width of the given column in pixels.
+    */
+    virtual wxCoord OnGetColumnWidth(size_t column) const = 0;
 };