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

28
include/wx/html/helpctrl.h
View File

@@ -58,10 +58,10 @@ public:
bool Display(const wxString& x);
bool Display(int id);
bool DisplayContents();
bool DisplayContents() wxOVERRIDE;
bool DisplayIndex();
bool KeywordSearch(const wxString& keyword,
wxHelpSearchMode mode = wxHELP_SEARCH_ALL);
wxHelpSearchMode mode = wxHELP_SEARCH_ALL) wxOVERRIDE;
wxHtmlHelpWindow* GetHelpWindow() { return m_helpWindow; }
void SetHelpWindow(wxHtmlHelpWindow* helpWindow);
@@ -81,30 +81,30 @@ public:
//// Backward compatibility with wxHelpController API
virtual bool Initialize(const wxString& file, int WXUNUSED(server) ) { return Initialize(file); }
virtual bool Initialize(const wxString& file);
virtual void SetViewer(const wxString& WXUNUSED(viewer), long WXUNUSED(flags) = 0) {}
virtual bool LoadFile(const wxString& file = wxT(""));
virtual bool DisplaySection(int sectionNo);
virtual bool DisplaySection(const wxString& section) { return Display(section); }
virtual bool DisplayBlock(long blockNo) { return DisplaySection(blockNo); }
virtual bool DisplayTextPopup(const wxString& text, const wxPoint& pos);
virtual bool Initialize(const wxString& file, int WXUNUSED(server) ) wxOVERRIDE { return Initialize(file); }
virtual bool Initialize(const wxString& file) wxOVERRIDE;
virtual void SetViewer(const wxString& WXUNUSED(viewer), long WXUNUSED(flags) = 0) wxOVERRIDE {}
virtual bool LoadFile(const wxString& file = wxT("")) wxOVERRIDE;
virtual bool DisplaySection(int sectionNo) wxOVERRIDE;
virtual bool DisplaySection(const wxString& section) wxOVERRIDE { return Display(section); }
virtual bool DisplayBlock(long blockNo) wxOVERRIDE { return DisplaySection(blockNo); }
virtual bool DisplayTextPopup(const wxString& text, const wxPoint& pos) wxOVERRIDE;
virtual void SetFrameParameters(const wxString& titleFormat,
const wxSize& size,
const wxPoint& pos = wxDefaultPosition,
bool newFrameEachTime = false);
bool newFrameEachTime = false) wxOVERRIDE;
/// Obtains the latest settings used by the help frame and the help
/// frame.
virtual wxFrame *GetFrameParameters(wxSize *size = NULL,
wxPoint *pos = NULL,
bool *newFrameEachTime = NULL);
bool *newFrameEachTime = NULL) wxOVERRIDE;
// Get direct access to help data:
wxHtmlHelpData *GetHelpData() { return &m_helpData; }
virtual bool Quit() ;
virtual void OnQuit() {}
virtual bool Quit() wxOVERRIDE ;
virtual void OnQuit() wxOVERRIDE {}
void OnCloseFrame(wxCloseEvent& evt);

2
include/wx/html/helpfrm.h
View File

@@ -118,7 +118,7 @@ public:
// we don't want to prevent the app from closing just because a help window
// remains opened
virtual bool ShouldPreventAppExit() const { return m_shouldPreventAppExit; }
virtual bool ShouldPreventAppExit() const wxOVERRIDE { return m_shouldPreventAppExit; }
protected:
void Init(wxHtmlHelpData* data = NULL);

56
include/wx/html/htmlcell.h
View File

@@ -114,8 +114,8 @@ public:
class WXDLLIMPEXP_HTML wxDefaultHtmlRenderingStyle : public wxHtmlRenderingStyle
{
public:
virtual wxColour GetSelectedTextColour(const wxColour& clr);
virtual wxColour GetSelectedTextBgColour(const wxColour& clr);
virtual wxColour GetSelectedTextColour(const wxColour& clr) wxOVERRIDE;
virtual wxColour GetSelectedTextBgColour(const wxColour& clr) wxOVERRIDE;
};
@@ -378,10 +378,10 @@ class WXDLLIMPEXP_HTML wxHtmlWordCell : public wxHtmlCell
public:
wxHtmlWordCell(const wxString& word, const wxDC& dc);
void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2,
wxHtmlRenderingInfo& info);
virtual wxCursor GetMouseCursor(wxHtmlWindowInterface *window) const;
virtual wxString ConvertToText(wxHtmlSelection *sel) const;
bool IsLinebreakAllowed() const { return m_allowLinebreak; }
wxHtmlRenderingInfo& info) wxOVERRIDE;
virtual wxCursor GetMouseCursor(wxHtmlWindowInterface *window) const wxOVERRIDE;
virtual wxString ConvertToText(wxHtmlSelection *sel) const wxOVERRIDE;
bool IsLinebreakAllowed() const wxOVERRIDE { return m_allowLinebreak; }
void SetPreviousWord(wxHtmlWordCell *cell);
@@ -420,8 +420,8 @@ public:
{}
protected:
virtual wxString GetAllAsText() const;
virtual wxString GetPartAsText(int begin, int end) const;
virtual wxString GetAllAsText() const wxOVERRIDE;
virtual wxString GetPartAsText(int begin, int end) const wxOVERRIDE;
wxString m_wordOrig;
size_t m_linepos;
@@ -436,15 +436,15 @@ public:
wxHtmlContainerCell(wxHtmlContainerCell *parent);
virtual ~wxHtmlContainerCell();
virtual void Layout(int w);
virtual void Layout(int w) wxOVERRIDE;
virtual void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2,
wxHtmlRenderingInfo& info);
wxHtmlRenderingInfo& info) wxOVERRIDE;
virtual void DrawInvisible(wxDC& dc, int x, int y,
wxHtmlRenderingInfo& info);
wxHtmlRenderingInfo& info) wxOVERRIDE;
virtual bool AdjustPagebreak(int *pagebreak,
const wxArrayInt& known_pagebreaks,
int pageHeight) const;
int pageHeight) const wxOVERRIDE;
// insert cell at the end of m_Cells list
void InsertCell(wxHtmlCell *cell);
@@ -478,26 +478,26 @@ public:
// adapt to it:
wxColour GetBackgroundColour();
void SetBorder(const wxColour& clr1, const wxColour& clr2, int border = 1) {m_Border = border; m_BorderColour1 = clr1, m_BorderColour2 = clr2;}
virtual wxHtmlLinkInfo* GetLink(int x = 0, int y = 0) const;
virtual const wxHtmlCell* Find(int condition, const void* param) const;
virtual wxHtmlLinkInfo* GetLink(int x = 0, int y = 0) const wxOVERRIDE;
virtual const wxHtmlCell* Find(int condition, const void* param) const wxOVERRIDE;
virtual bool ProcessMouseClick(wxHtmlWindowInterface *window,
const wxPoint& pos,
const wxMouseEvent& event);
const wxMouseEvent& event) wxOVERRIDE;
virtual wxHtmlCell* GetFirstChild() const { return m_Cells; }
virtual wxHtmlCell* GetFirstChild() const wxOVERRIDE { return m_Cells; }
// returns last child cell:
wxHtmlCell* GetLastChild() const { return m_LastCell; }
// see comment in wxHtmlCell about this method
virtual bool IsTerminalCell() const { return false; }
virtual bool IsTerminalCell() const wxOVERRIDE { return false; }
virtual wxHtmlCell *FindCellByPos(wxCoord x, wxCoord y,
unsigned flags = wxHTML_FIND_EXACT) const;
unsigned flags = wxHTML_FIND_EXACT) const wxOVERRIDE;
virtual wxHtmlCell *GetFirstTerminal() const;
virtual wxHtmlCell *GetLastTerminal() const;
virtual wxHtmlCell *GetFirstTerminal() const wxOVERRIDE;
virtual wxHtmlCell *GetLastTerminal() const wxOVERRIDE;
// Removes indentation on top or bottom of the container (i.e. above or
@@ -506,7 +506,7 @@ public:
// Returns the maximum possible length of the container.
// Call Layout at least once before using GetMaxTotalWidth()
virtual int GetMaxTotalWidth() const { return m_MaxTotalWidth; }
virtual int GetMaxTotalWidth() const wxOVERRIDE { return m_MaxTotalWidth; }
protected:
void UpdateRenderingStatePre(wxHtmlRenderingInfo& info,
@@ -557,9 +557,9 @@ class WXDLLIMPEXP_HTML wxHtmlColourCell : public wxHtmlCell
public:
wxHtmlColourCell(const wxColour& clr, int flags = wxHTML_CLR_FOREGROUND) : wxHtmlCell() {m_Colour = clr; m_Flags = flags;}
virtual void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2,
wxHtmlRenderingInfo& info);
wxHtmlRenderingInfo& info) wxOVERRIDE;
virtual void DrawInvisible(wxDC& dc, int x, int y,
wxHtmlRenderingInfo& info);
wxHtmlRenderingInfo& info) wxOVERRIDE;
protected:
wxColour m_Colour;
@@ -582,9 +582,9 @@ class WXDLLIMPEXP_HTML wxHtmlFontCell : public wxHtmlCell
public:
wxHtmlFontCell(wxFont *font) : wxHtmlCell() { m_Font = (*font); }
virtual void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2,
wxHtmlRenderingInfo& info);
wxHtmlRenderingInfo& info) wxOVERRIDE;
virtual void DrawInvisible(wxDC& dc, int x, int y,
wxHtmlRenderingInfo& info);
wxHtmlRenderingInfo& info) wxOVERRIDE;
protected:
wxFont m_Font;
@@ -615,10 +615,10 @@ public:
wxHtmlWidgetCell(wxWindow *wnd, int w = 0);
virtual ~wxHtmlWidgetCell() { m_Wnd->Destroy(); }
virtual void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2,
wxHtmlRenderingInfo& info);
wxHtmlRenderingInfo& info) wxOVERRIDE;
virtual void DrawInvisible(wxDC& dc, int x, int y,
wxHtmlRenderingInfo& info);
virtual void Layout(int w);
wxHtmlRenderingInfo& info) wxOVERRIDE;
virtual void Layout(int w) wxOVERRIDE;
protected:
wxWindow* m_Wnd;

8
include/wx/html/htmlfilt.h
View File

@@ -55,8 +55,8 @@ class WXDLLIMPEXP_HTML wxHtmlFilterPlainText : public wxHtmlFilter
DECLARE_DYNAMIC_CLASS(wxHtmlFilterPlainText)
public:
virtual bool CanRead(const wxFSFile& file) const;
virtual wxString ReadFile(const wxFSFile& file) const;
virtual bool CanRead(const wxFSFile& file) const wxOVERRIDE;
virtual wxString ReadFile(const wxFSFile& file) const wxOVERRIDE;
};
//--------------------------------------------------------------------------------
@@ -69,8 +69,8 @@ class wxHtmlFilterHTML : public wxHtmlFilter
DECLARE_DYNAMIC_CLASS(wxHtmlFilterHTML)
public:
virtual bool CanRead(const wxFSFile& file) const;
virtual wxString ReadFile(const wxFSFile& file) const;
virtual bool CanRead(const wxFSFile& file) const wxOVERRIDE;
virtual wxString ReadFile(const wxFSFile& file) const wxOVERRIDE;
};

26
include/wx/html/htmlwin.h
View File

@@ -383,7 +383,7 @@ public:
wxString ToText();
#endif // wxUSE_CLIPBOARD
virtual void OnInternalIdle();
virtual void OnInternalIdle() wxOVERRIDE;
/// Returns standard HTML cursor as used by wxHtmlWindow
static wxCursor GetDefaultHTMLCursor(HTMLCursor type);
@@ -448,19 +448,19 @@ protected:
public:
// 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;
// implementation of SetPage()
bool DoSetPage(const wxString& source);
@@ -593,7 +593,7 @@ public:
bool GetLinkClicked() const { return m_bLinkWasClicked; }
// default copy ctor, assignment operator and dtor are ok
virtual wxEvent *Clone() const { return new wxHtmlCellEvent(*this); }
virtual wxEvent *Clone() const wxOVERRIDE { return new wxHtmlCellEvent(*this); }
private:
wxHtmlCell *m_cell;
@@ -624,7 +624,7 @@ public:
const wxHtmlLinkInfo &GetLinkInfo() const { return m_linkInfo; }
// default copy ctor, assignment operator and dtor are ok
virtual wxEvent *Clone() const { return new wxHtmlLinkEvent(*this); }
virtual wxEvent *Clone() const wxOVERRIDE { return new wxHtmlLinkEvent(*this); }
private:
wxHtmlLinkInfo m_linkInfo;

10
include/wx/html/htmprint.h
View File

@@ -160,11 +160,11 @@ public:
// between text and header and/or footer
// wxPrintout stuff:
bool OnPrintPage(int page);
bool HasPage(int page);
void GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, int *selPageTo);
bool OnBeginDocument(int startPage, int endPage);
void OnPreparePrinting();
bool OnPrintPage(int page) wxOVERRIDE;
bool HasPage(int page) wxOVERRIDE;
void GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, int *selPageTo) wxOVERRIDE;
bool OnBeginDocument(int startPage, int endPage) wxOVERRIDE;
void OnPreparePrinting() wxOVERRIDE;
// Adds input filter
static void AddFilter(wxHtmlFilter *filter);

16
include/wx/html/winpars.h
View File

@@ -42,11 +42,11 @@ public:
virtual ~wxHtmlWinParser();
virtual void InitParser(const wxString& source);
virtual void DoneParser();
virtual wxObject* GetProduct();
virtual void InitParser(const wxString& source) wxOVERRIDE;
virtual void DoneParser() wxOVERRIDE;
virtual wxObject* GetProduct() wxOVERRIDE;
virtual wxFSFile *OpenURL(wxHtmlURLType type, const wxString& url) const;
virtual wxFSFile *OpenURL(wxHtmlURLType type, const wxString& url) const wxOVERRIDE;
// Set's the DC used for parsing. If SetDC() is not called,
// parsing won't proceed
@@ -163,7 +163,7 @@ public:
WhitespaceMode GetWhitespaceMode() const { return m_whitespaceMode; }
protected:
virtual void AddText(const wxString& txt);
virtual void AddText(const wxString& txt) wxOVERRIDE;
private:
void FlushWordBuf(wxChar *temp, int& len);
@@ -263,7 +263,7 @@ class WXDLLIMPEXP_HTML wxHtmlWinTagHandler : public wxHtmlTagHandler
public:
wxHtmlWinTagHandler() : wxHtmlTagHandler() {}
virtual void SetParser(wxHtmlParser *parser) {wxHtmlTagHandler::SetParser(parser); m_WParser = (wxHtmlWinParser*) parser;}
virtual void SetParser(wxHtmlParser *parser) wxOVERRIDE {wxHtmlTagHandler::SetParser(parser); m_WParser = (wxHtmlWinParser*) parser;}
protected:
wxHtmlWinParser *m_WParser; // same as m_Parser, but overcasted
@@ -293,8 +293,8 @@ class WXDLLIMPEXP_HTML wxHtmlTagsModule : public wxModule
public:
wxHtmlTagsModule() : wxModule() {}
virtual bool OnInit();
virtual void OnExit();
virtual bool OnInit() wxOVERRIDE;
virtual void OnExit() wxOVERRIDE;
// This is called by wxHtmlWinParser.
// The method must simply call parser->AddTagHandler(new