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

20
samples/propgrid/propgrid.cpp
View File

@@ -88,11 +88,11 @@ public:
virtual wxPGWindowList CreateControls( wxPropertyGrid* propGrid,
wxPGProperty* property,
const wxPoint& pos,
const wxSize& sz ) const;
const wxSize& sz ) const wxOVERRIDE;
virtual bool OnEvent( wxPropertyGrid* propGrid,
wxPGProperty* property,
wxWindow* ctrl,
wxEvent& event ) const;
wxEvent& event ) const wxOVERRIDE;
};
IMPLEMENT_DYNAMIC_CLASS(wxSampleMultiButtonEditor, wxPGTextCtrlEditor)
@@ -172,12 +172,12 @@ public:
{
}
virtual wxObject* Clone() const
virtual wxObject* Clone() const wxOVERRIDE
{
return new wxInvalidWordValidator(m_invalidWord);
}
virtual bool Validate(wxWindow* WXUNUSED(parent))
virtual bool Validate(wxWindow* WXUNUSED(parent)) wxOVERRIDE
{
wxTextCtrl* tc = wxDynamicCast(GetWindow(), wxTextCtrl);
wxCHECK_MSG(tc, true, wxT("validator window must be wxTextCtrl"));
@@ -318,7 +318,7 @@ public:
}
virtual bool DoShowDialog( wxPropertyGrid* WXUNUSED(propGrid),
wxPGProperty* WXUNUSED(property) )
wxPGProperty* WXUNUSED(property) ) wxOVERRIDE
{
wxString s = ::wxGetSingleChoice(wxT("Message"),
wxT("Caption"),
@@ -354,13 +354,13 @@ public:
}
// Set editor to have button
virtual const wxPGEditor* DoGetEditorClass() const
virtual const wxPGEditor* DoGetEditorClass() const wxOVERRIDE
{
return wxPGEditor_TextCtrlAndButton;
}
// Set what happens on button click
virtual wxPGEditorDialogAdapter* GetEditorDialog() const
virtual wxPGEditorDialogAdapter* GetEditorDialog() const wxOVERRIDE
{
return new wxSingleChoiceDialogAdapter(m_choices);
}
@@ -1745,13 +1745,13 @@ public:
// Return false here to indicate unhandled events should be
// propagated to manager's parent, as normal.
virtual bool IsHandlingAllEvents() const { return false; }
virtual bool IsHandlingAllEvents() const wxOVERRIDE { return false; }
protected:
virtual wxPGProperty* DoInsert( wxPGProperty* parent,
int index,
wxPGProperty* property )
wxPGProperty* property ) wxOVERRIDE
{
return wxPropertyGridPage::DoInsert(parent,index,property);
}
@@ -3248,7 +3248,7 @@ struct PropertyGridPopup : wxPopupWindow
Fit();
}
void Fit()
void Fit() wxOVERRIDE
{
::SetMinSize(m_grid);
m_sizer->Fit(m_panel);