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

use more wxOVERRIDE (#329)

Browse Source
This commit is contained in:
Maarten
2016-09-25 22:21:28 +02:00
committed by paulcor
parent d0c57dbef0
commit 977a826639
66 changed files with 456 additions and 455 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
include/wx/generic/hyperlink.h
View File

@@ -45,20 +45,20 @@ public:
// get/set
wxColour GetHoverColour() const { return m_hoverColour; }
void SetHoverColour(const wxColour &colour) { m_hoverColour = colour; }
wxColour GetHoverColour() const wxOVERRIDE { return m_hoverColour; }
void SetHoverColour(const wxColour &colour) wxOVERRIDE { m_hoverColour = colour; }
wxColour GetNormalColour() const { return m_normalColour; }
void SetNormalColour(const wxColour &colour);
wxColour GetNormalColour() const wxOVERRIDE { return m_normalColour; }
void SetNormalColour(const wxColour &colour) wxOVERRIDE;
wxColour GetVisitedColour() const { return m_visitedColour; }
void SetVisitedColour(const wxColour &colour);
wxColour GetVisitedColour() const wxOVERRIDE { return m_visitedColour; }
void SetVisitedColour(const wxColour &colour) wxOVERRIDE;
wxString GetURL() const { return m_url; }
void SetURL (const wxString &url) { m_url=url; }
wxString GetURL() const wxOVERRIDE { return m_url; }
void SetURL (const wxString &url) wxOVERRIDE { m_url=url; }
void SetVisited(bool visited = true) { m_visited=visited; }
bool GetVisited() const { return m_visited; }
void SetVisited(bool visited = true) wxOVERRIDE { m_visited=visited; }
bool GetVisited() const wxOVERRIDE { return m_visited; }
// NOTE: also wxWindow::Set/GetLabel, wxWindow::Set/GetBackgroundColour,
// wxWindow::Get/SetFont, wxWindow::Get/SetCursor are important !
@@ -110,7 +110,7 @@ protected:
// Returns the best size for the window, which is the size needed
// to display the text label.
virtual wxSize DoGetBestClientSize() const;
virtual wxSize DoGetBestClientSize() const wxOVERRIDE;
// creates a context menu with "Copy URL" menuitem
virtual void DoContextMenu(const wxPoint &);