moved vararg handling code in wxMessageOutput to single method and added simple Outpu...

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

diff --git a/include/wx/vscroll.h b/include/wx/vscroll.h
index 1d15edfb5d92270425a1fb04e6902ef8e2c66109..f5b0a2fc5b2a94f8b250361e1f4e7511d7b8f33b 100644 (file)
--- a/include/wx/vscroll.h
+++ b/include/wx/vscroll.h
@@ -618,9 +618,15 @@ public:
     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
-    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)
@@ -660,9 +666,9 @@ protected:
 #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
-typedef wxVarVScrollLegacyAdapter wxVarVScrollHelper;
+typedef wxVarVScrollHelper wxVarVScrollLegacyAdaptor;
 
 #endif // WXWIN_COMPATIBILITY_2_8/!WXWIN_COMPATIBILITY_2_8