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

8
samples/dialogs/dialogs.cpp
View File

@@ -2141,14 +2141,14 @@ void MyFrame::OnModalHook(wxCommandEvent& event)
class TestModalHook : public wxModalDialogHook
{
protected:
virtual int Enter(wxDialog* dialog)
virtual int Enter(wxDialog* dialog) wxOVERRIDE
{
wxLogStatus("Showing %s modal dialog",
dialog->GetClassInfo()->GetClassName());
return wxID_NONE;
}
virtual void Exit(wxDialog* dialog)
virtual void Exit(wxDialog* dialog) wxOVERRIDE
{
wxLogStatus("Leaving %s modal dialog",
dialog->GetClassInfo()->GetClassName());
@@ -2359,7 +2359,7 @@ public:
}
// add some custom controls
virtual void DoAddCustomControls()
virtual void DoAddCustomControls() wxOVERRIDE
{
AddControl(new wxStaticLine(this), wxSizerFlags().Expand());
AddText(wxT("Some custom text"));
@@ -3332,7 +3332,7 @@ class MyLogGui : public wxLogGui
private:
virtual void DoShowSingleLogMessage(const wxString& message,
const wxString& title,
int style)
int style) wxOVERRIDE
{
wxMessageDialog dlg(NULL, message, title,
wxOK | wxCANCEL | wxCANCEL_DEFAULT | style);

14
samples/dialogs/dialogs.h
View File

@@ -105,7 +105,7 @@ of MSW, MAC and OS2
class MyAppTraits : public wxGUIAppTraits
{
public:
virtual wxLog *CreateLogTarget();
virtual wxLog *CreateLogTarget() wxOVERRIDE;
};
#endif // wxUSE_LOG
@@ -116,16 +116,16 @@ class MyApp: public wxApp
public:
MyApp() { m_startupProgressStyle = -1; }
virtual bool OnInit();
virtual bool OnInit() wxOVERRIDE;
#if wxUSE_CMDLINE_PARSER
virtual void OnInitCmdLine(wxCmdLineParser& parser);
virtual bool OnCmdLineParsed(wxCmdLineParser& parser);
virtual void OnInitCmdLine(wxCmdLineParser& parser) wxOVERRIDE;
virtual bool OnCmdLineParsed(wxCmdLineParser& parser) wxOVERRIDE;
#endif // wxUSE_CMDLINE_PARSER
protected:
#if wxUSE_LOG
virtual wxAppTraits *CreateTraits() { return new MyAppTraits; }
virtual wxAppTraits *CreateTraits() wxOVERRIDE { return new MyAppTraits; }
#endif // wxUSE_LOG
private:
@@ -276,8 +276,8 @@ public:
protected:
// overrides method in base class
virtual void AddAdditionalTextOptions(wxSizer *sizer);
virtual void AddAdditionalFlags(wxSizer *sizer);
virtual void AddAdditionalTextOptions(wxSizer *sizer) wxOVERRIDE;
virtual void AddAdditionalFlags(wxSizer *sizer) wxOVERRIDE;
void OnApply(wxCommandEvent& event);