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

use wxOVERRIDE

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2014-03-30 00:02:23 +00:00
parent ddd7ce624a
commit 8b4ae731d3
460 changed files with 4103 additions and 4107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
include/wx/htmllbox.h
View File

@@ -68,10 +68,10 @@ public:
virtual ~wxHtmlListBox();
// override some base class virtuals
virtual void RefreshRow(size_t line);
virtual void RefreshRows(size_t from, size_t to);
virtual void RefreshAll();
virtual void SetItemCount(size_t count);
virtual void RefreshRow(size_t line) wxOVERRIDE;
virtual void RefreshRows(size_t from, size_t to) wxOVERRIDE;
virtual void RefreshAll() wxOVERRIDE;
virtual void SetItemCount(size_t count) wxOVERRIDE;
#if wxUSE_FILESYSTEM
// retrieve the file system used by the wxHtmlWinParser: if you use
@@ -80,7 +80,7 @@ public:
const wxFileSystem& GetFileSystem() const { return m_filesystem; }
#endif // wxUSE_FILESYSTEM
virtual void OnInternalIdle();
virtual void OnInternalIdle() wxOVERRIDE;
protected:
// this method must be implemented in the derived class and should return
@@ -107,11 +107,11 @@ protected:
// we implement both of these functions in terms of OnGetItem(), they are
// not supposed to be overridden by our descendants
virtual void OnDrawItem(wxDC& dc, const wxRect& rect, size_t n) const;
virtual wxCoord OnMeasureItem(size_t n) const;
virtual void OnDrawItem(wxDC& dc, const wxRect& rect, size_t n) const wxOVERRIDE;
virtual wxCoord OnMeasureItem(size_t n) const wxOVERRIDE;
// override this one to draw custom background for selected items correctly
virtual void OnDrawBackground(wxDC& dc, const wxRect& rect, size_t n) const;
virtual void OnDrawBackground(wxDC& dc, const wxRect& rect, size_t n) const wxOVERRIDE;
// this method may be overridden to handle clicking on a link in the
// listbox (by default, clicks on links are simply ignored)
@@ -131,19 +131,19 @@ protected:
private:
// wxHtmlWindowInterface methods:
virtual void SetHTMLWindowTitle(const wxString& title);
virtual void OnHTMLLinkClicked(const wxHtmlLinkInfo& link);
virtual void SetHTMLWindowTitle(const wxString& title) wxOVERRIDE;
virtual void OnHTMLLinkClicked(const wxHtmlLinkInfo& link) wxOVERRIDE;
virtual wxHtmlOpeningStatus OnHTMLOpeningURL(wxHtmlURLType type,
const wxString& url,
wxString *redirect) const;
wxString *redirect) const wxOVERRIDE;
virtual wxPoint HTMLCoordsToWindow(wxHtmlCell *cell,
const wxPoint& pos) const;
virtual wxWindow* GetHTMLWindow();
virtual wxColour GetHTMLBackgroundColour() const;
virtual void SetHTMLBackgroundColour(const wxColour& clr);
virtual void SetHTMLBackgroundImage(const wxBitmap& bmpBg);
virtual void SetHTMLStatusText(const wxString& text);
virtual wxCursor GetHTMLCursor(HTMLCursor type) const;
const wxPoint& pos) const wxOVERRIDE;
virtual wxWindow* GetHTMLWindow() wxOVERRIDE;
virtual wxColour GetHTMLBackgroundColour() const wxOVERRIDE;
virtual void SetHTMLBackgroundColour(const wxColour& clr) wxOVERRIDE;
virtual void SetHTMLBackgroundImage(const wxBitmap& bmpBg) wxOVERRIDE;
virtual void SetHTMLStatusText(const wxString& text) wxOVERRIDE;
virtual wxCursor GetHTMLCursor(HTMLCursor type) const wxOVERRIDE;
// returns index of item that contains given HTML cell
size_t GetItemForCell(const wxHtmlCell *cell) const;
@@ -248,25 +248,25 @@ public:
// these must be overloaded otherwise the compiler will complain
// about wxItemContainerImmutable::[G|S]etSelection being pure virtuals...
void SetSelection(int n)
void SetSelection(int n) wxOVERRIDE
{ wxVListBox::SetSelection(n); }
int GetSelection() const
int GetSelection() const wxOVERRIDE
{ return wxVListBox::GetSelection(); }
// accessing strings
// -----------------
virtual unsigned int GetCount() const
virtual unsigned int GetCount() const wxOVERRIDE
{ return m_items.GetCount(); }
virtual wxString GetString(unsigned int n) const;
virtual wxString GetString(unsigned int n) const wxOVERRIDE;
// override default unoptimized wxItemContainer::GetStrings() function
wxArrayString GetStrings() const
{ return m_items; }
virtual void SetString(unsigned int n, const wxString& s);
virtual void SetString(unsigned int n, const wxString& s) wxOVERRIDE;
// resolve ambiguity between wxItemContainer and wxVListBox versions
void Clear();
@@ -274,32 +274,32 @@ public:
protected:
virtual int DoInsertItems(const wxArrayStringsAdapter & items,
unsigned int pos,
void **clientData, wxClientDataType type);
void **clientData, wxClientDataType type) wxOVERRIDE;
virtual void DoSetItemClientData(unsigned int n, void *clientData)
virtual void DoSetItemClientData(unsigned int n, void *clientData) wxOVERRIDE
{ m_HTMLclientData[n] = clientData; }
virtual void *DoGetItemClientData(unsigned int n) const
virtual void *DoGetItemClientData(unsigned int n) const wxOVERRIDE
{ return m_HTMLclientData[n]; }
// wxItemContainer methods
virtual void DoClear();
virtual void DoDeleteOneItem(unsigned int n);
virtual void DoClear() wxOVERRIDE;
virtual void DoDeleteOneItem(unsigned int n) wxOVERRIDE;
// calls wxHtmlListBox::SetItemCount() and RefreshAll()
void UpdateCount();
// override these functions just to change their visibility: users of
// wxSimpleHtmlListBox shouldn't be allowed to call them directly!
virtual void SetItemCount(size_t count)
virtual void SetItemCount(size_t count) wxOVERRIDE
{ wxHtmlListBox::SetItemCount(count); }
virtual void SetRowCount(size_t count)
{ wxHtmlListBox::SetRowCount(count); }
virtual wxString OnGetItem(size_t n) const
virtual wxString OnGetItem(size_t n) const wxOVERRIDE
{ return m_items[n]; }
virtual void InitEvent(wxCommandEvent& event, int n)
virtual void InitEvent(wxCommandEvent& event, int n) wxOVERRIDE
{
// we're not a virtual control and we can include the string
// of the item which was clicked: