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

more use of wxOVERRIDE

Browse Source
This commit is contained in:
Paul Cornett
2015-09-06 17:20:42 -07:00
parent 4177593aef
commit 27a8d28029
131 changed files with 1059 additions and 1059 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/generic/srchctlg.cpp
View File

@@ -60,24 +60,24 @@ public:
InvalidateBestSize();
}
virtual wxWindow* GetMainWindowOfCompositeControl()
virtual wxWindow* GetMainWindowOfCompositeControl() wxOVERRIDE
{
return m_search;
}
// provide access to the base class protected methods to wxSearchCtrl which
// needs to forward to them
void DoSetValue(const wxString& value, int flags)
void DoSetValue(const wxString& value, int flags) wxOVERRIDE
{
wxTextCtrl::DoSetValue(value, flags);
}
bool DoLoadFile(const wxString& file, int fileType)
bool DoLoadFile(const wxString& file, int fileType) wxOVERRIDE
{
return wxTextCtrl::DoLoadFile(file, fileType);
}
bool DoSaveFile(const wxString& file, int fileType)
bool DoSaveFile(const wxString& file, int fileType) wxOVERRIDE
{
return wxTextCtrl::DoSaveFile(file, fileType);
}
@@ -180,15 +180,15 @@ public:
// control and not give it to the button inside the same control. Besides,
// the search button can be already activated by pressing "Enter" so there
// is really no reason for it to be able to get focus from keyboard.
virtual bool AcceptsFocusFromKeyboard() const { return false; }
virtual bool AcceptsFocusFromKeyboard() const wxOVERRIDE { return false; }
virtual wxWindow* GetMainWindowOfCompositeControl()
virtual wxWindow* GetMainWindowOfCompositeControl() wxOVERRIDE
{
return m_search;
}
protected:
wxSize DoGetBestSize() const
wxSize DoGetBestSize() const wxOVERRIDE
{
return wxSize(m_bmp.GetWidth(), m_bmp.GetHeight());
}