Amebis/wxWidgets
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix new wxHVScroll code to build with WXWIN_COMPATIBILITY_2_8==0

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45333 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-04-08 13:55:36 +00:00
parent 52d16c5e3b
commit e02c72fa45
11 changed files with 64 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/htmllbox.h
View File

@@ -69,8 +69,8 @@ public:
virtual ~wxHtmlListBox();
// override some base class virtuals
virtual void RefreshLine(size_t line);
virtual void RefreshLines(size_t from, size_t to);
virtual void RefreshRow(size_t line);
virtual void RefreshRows(size_t from, size_t to);
virtual void RefreshAll();
virtual void SetItemCount(size_t count);

2
include/wx/odcombo.h
View File

@@ -113,7 +113,7 @@ public:
// helpers
int GetItemAtPosition( const wxPoint& pos ) { return HitTest(pos); }
wxCoord GetTotalHeight() const { return EstimateTotalHeight(); }
wxCoord GetLineHeight(int line) const { return OnGetLineHeight(line); }
wxCoord GetLineHeight(int line) const { return OnGetRowHeight(line); }
protected:

2
include/wx/richtext/richtextsymboldlg.h
View File

@@ -284,7 +284,7 @@ protected:
virtual void OnDrawItem(wxDC& dc, const wxRect& rect, size_t n) const;
// gets the line height
virtual wxCoord OnGetLineHeight(size_t line) const;
virtual wxCoord OnGetRowHeight(size_t line) const;
// event handlers
void OnPaint(wxPaintEvent& event);

4
include/wx/vlbox.h
View File

@@ -226,11 +226,11 @@ protected:
// current
virtual void OnDrawBackground(wxDC& dc, const wxRect& rect, size_t n) const;
// we implement OnGetLineHeight() in terms of OnMeasureItem() because this
// we implement OnGetRowHeight() in terms of OnMeasureItem() because this
// allows us to add borders to the items easily
//
// this function is not supposed to be overridden by the derived classes
virtual wxCoord OnGetLineHeight(size_t line) const;
virtual wxCoord OnGetRowHeight(size_t line) const;
// event handlers

4
include/wx/vscroll.h
View File

@@ -660,9 +660,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