added wxAPPLY and wxCLOSE flags to CreateStdDialogButtonSizer() (Marcin Wojdyr)

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

diff --git a/include/wx/vscroll.h b/include/wx/vscroll.h
index 06437b0a148e623e4747d226b9f1029ea25c46c0..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:
     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)