(blind) compilation fixes after latest changes

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

diff --git a/include/wx/vscroll.h b/include/wx/vscroll.h
index 1d15edfb5d92270425a1fb04e6902ef8e2c66109..4b18ca6333e3396103c45503b5eb511064a726cd 100644 (file)
--- a/include/wx/vscroll.h
+++ b/include/wx/vscroll.h
@@ -351,7 +351,7 @@ protected:
 
     // forward calls to OnGetRowsHeightHint()
     virtual void OnGetUnitsSizeHint(size_t unitMin, size_t unitMax) const
 
     // forward calls to OnGetRowsHeightHint()
     virtual void OnGetUnitsSizeHint(size_t unitMin, size_t unitMax) const

-        { return OnGetRowsHeightHint(unitMin, unitMax); }
+        { OnGetRowsHeightHint(unitMin, unitMax); }

 
     // again, if not overridden, it will fall back on default method
     virtual wxCoord EstimateTotalHeight() const
 
     // again, if not overridden, it will fall back on default method
     virtual wxCoord EstimateTotalHeight() const


@@ -434,7 +434,7 @@ protected:
 
     // forward calls to OnGetColumnsWidthHint()
     virtual void OnGetUnitsSizeHint(size_t unitMin, size_t unitMax) const
 
     // forward calls to OnGetColumnsWidthHint()
     virtual void OnGetUnitsSizeHint(size_t unitMin, size_t unitMax) const

-        { return OnGetColumnsWidthHint(unitMin, unitMax); }
+        { OnGetColumnsWidthHint(unitMin, unitMax); }

 
     // again, if not overridden, it will fall back on default method
     virtual wxCoord EstimateTotalWidth() const { return DoEstimateTotalSize(); }
 
     // again, if not overridden, it will fall back on default method
     virtual wxCoord EstimateTotalWidth() const { return DoEstimateTotalSize(); }


@@ -618,9 +618,15 @@ public:
     virtual bool ScrollPages(int pages) { return ScrollRowPages(pages); }
 
 protected:
     virtual bool ScrollPages(int pages) { return ScrollRowPages(pages); }
 
 protected:

+    // unless the code has been updated to override OnGetRowHeight() instead,

     // this function must be overridden in the derived class and it should
     // return the height of the given row in pixels
     // this function must be overridden in the derived class and it should
     // return the height of the given row in pixels

-    virtual wxCoord OnGetLineHeight(size_t n) const = 0;
+    virtual wxCoord OnGetLineHeight(size_t WXUNUSED(n)) const
+    {
+        wxFAIL_MSG( _T("must be overridden if OnGetRowHeight() isn't!") );
+
+        return -1;
+    }

 
     // forwards the calls from base class pure virtual function to pure virtual
     // OnGetLineHeight instead (backwards compatible name)
 
     // forwards the calls from base class pure virtual function to pure virtual
     // OnGetLineHeight instead (backwards compatible name)


@@ -648,7 +654,7 @@ protected:
     // forwards the calls from base class pure virtual function to pure virtual
     // OnGetLinesHint instead (backwards compatible name)
     void OnGetRowsHeightHint(size_t rowMin, size_t rowMax) const
     // forwards the calls from base class pure virtual function to pure virtual
     // OnGetLinesHint instead (backwards compatible name)
     void OnGetRowsHeightHint(size_t rowMin, size_t rowMax) const

-        { return OnGetLinesHint(rowMin, rowMax); }
+        { OnGetLinesHint(rowMin, rowMax); }

 
 
     // get the total height of the lines between lineMin (inclusive) and
 
 
     // get the total height of the lines between lineMin (inclusive) and


@@ -660,9 +666,9 @@ protected:
 #else // !WXWIN_COMPATIBILITY_2_8
 
 // shortcut to avoid checking compatibility modes later
 #else // !WXWIN_COMPATIBILITY_2_8
 
 // shortcut to avoid checking compatibility modes later

-// remove this and all references to wxVarVScrollLegacyAdapter once
+// remove this and all references to wxVarVScrollLegacyAdaptor once

 // wxWidgets 2.6 and 2.8 compatibility is removed
 // wxWidgets 2.6 and 2.8 compatibility is removed

-typedef wxVarVScrollLegacyAdapter wxVarVScrollHelper;
+typedef wxVarVScrollHelper wxVarVScrollLegacyAdaptor;

 
 #endif // WXWIN_COMPATIBILITY_2_8/!WXWIN_COMPATIBILITY_2_8
 
 
 #endif // WXWIN_COMPATIBILITY_2_8/!WXWIN_COMPATIBILITY_2_8