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

use wxOVERRIDE in wxMSW sources

Browse Source
This commit is contained in:
Paul Cornett
2016-09-23 07:59:11 -07:00
parent 9b477e46e5
commit 9b19a6e529
121 changed files with 1454 additions and 1454 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
include/wx/msw/helpbest.h
View File

@@ -32,52 +32,52 @@ public:
virtual ~wxBestHelpController() { delete m_helpController; }
// Must call this to set the filename
virtual bool Initialize(const wxString& file);
virtual bool Initialize(const wxString& file, int WXUNUSED(server) ) { return Initialize( file ); }
virtual bool Initialize(const wxString& file) wxOVERRIDE;
virtual bool Initialize(const wxString& file, int WXUNUSED(server) ) wxOVERRIDE { return Initialize( file ); }
// If file is "", reloads file given in Initialize
virtual bool LoadFile(const wxString& file = wxEmptyString)
virtual bool LoadFile(const wxString& file = wxEmptyString) wxOVERRIDE
{
return m_helpController->LoadFile( GetValidFilename( file ) );
}
virtual bool DisplayContents()
virtual bool DisplayContents() wxOVERRIDE
{
return m_helpController->DisplayContents();
}
virtual bool DisplaySection(int sectionNo)
virtual bool DisplaySection(int sectionNo) wxOVERRIDE
{
return m_helpController->DisplaySection( sectionNo );
}
virtual bool DisplaySection(const wxString& section)
virtual bool DisplaySection(const wxString& section) wxOVERRIDE
{
return m_helpController->DisplaySection( section );
}
virtual bool DisplayBlock(long blockNo)
virtual bool DisplayBlock(long blockNo) wxOVERRIDE
{
return m_helpController->DisplayBlock( blockNo );
}
virtual bool DisplayContextPopup(int contextId)
virtual bool DisplayContextPopup(int contextId) wxOVERRIDE
{
return m_helpController->DisplayContextPopup( contextId );
}
virtual bool DisplayTextPopup(const wxString& text, const wxPoint& pos)
virtual bool DisplayTextPopup(const wxString& text, const wxPoint& pos) wxOVERRIDE
{
return m_helpController->DisplayTextPopup( text, pos );
}
virtual bool KeywordSearch(const wxString& k,
wxHelpSearchMode mode = wxHELP_SEARCH_ALL)
wxHelpSearchMode mode = wxHELP_SEARCH_ALL) wxOVERRIDE
{
return m_helpController->KeywordSearch( k, mode );
}
virtual bool Quit()
virtual bool Quit() wxOVERRIDE
{
return m_helpController->Quit();
}
@@ -86,7 +86,7 @@ public:
virtual void SetFrameParameters(const wxString& title,
const wxSize& size,
const wxPoint& pos = wxDefaultPosition,
bool newFrameEachTime = false)
bool newFrameEachTime = false) wxOVERRIDE
{
m_helpController->SetFrameParameters( title, size, pos,
newFrameEachTime );
@@ -95,17 +95,17 @@ public:
// 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
{
return m_helpController->GetFrameParameters( size, pos,
newFrameEachTime );
}
/// Set the window that can optionally be used for the help window's parent.
virtual void SetParentWindow(wxWindow* win) { m_helpController->SetParentWindow(win); }
virtual void SetParentWindow(wxWindow* win) wxOVERRIDE { m_helpController->SetParentWindow(win); }
/// Get the window that can optionally be used for the help window's parent.
virtual wxWindow* GetParentWindow() const { return m_helpController->GetParentWindow(); }
virtual wxWindow* GetParentWindow() const wxOVERRIDE { return m_helpController->GetParentWindow(); }
protected:
// Append/change extension if necessary.