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

72
include/wx/propgrid/editors.h
View File

@@ -254,24 +254,24 @@ public:
virtual wxPGWindowList CreateControls(wxPropertyGrid* propgrid,
wxPGProperty* property,
const wxPoint& pos,
const wxSize& size) const;
const wxSize& size) const wxOVERRIDE;
virtual void UpdateControl( wxPGProperty* property,
wxWindow* ctrl ) const;
wxWindow* ctrl ) const wxOVERRIDE;
virtual bool OnEvent( wxPropertyGrid* propgrid,
wxPGProperty* property,
wxWindow* primaryCtrl,
wxEvent& event ) const;
wxEvent& event ) const wxOVERRIDE;
virtual bool GetValueFromControl( wxVariant& variant,
wxPGProperty* property,
wxWindow* ctrl ) const;
wxWindow* ctrl ) const wxOVERRIDE;
virtual wxString GetName() const;
virtual wxString GetName() const wxOVERRIDE;
//virtual wxPGCellRenderer* GetCellRenderer() const;
virtual void SetControlStringValue( wxPGProperty* property,
wxWindow* ctrl,
const wxString& txt ) const;
virtual void OnFocus( wxPGProperty* property, wxWindow* wnd ) const;
const wxString& txt ) const wxOVERRIDE;
virtual void OnFocus( wxPGProperty* property, wxWindow* wnd ) const wxOVERRIDE;
// Provided so that, for example, ComboBox editor can use the same code
// (multiple inheritance would get way too messy).
@@ -297,32 +297,32 @@ public:
virtual wxPGWindowList CreateControls(wxPropertyGrid* propgrid,
wxPGProperty* property,
const wxPoint& pos,
const wxSize& size) const;
const wxSize& size) const wxOVERRIDE;
virtual void UpdateControl( wxPGProperty* property,
wxWindow* ctrl ) const;
wxWindow* ctrl ) const wxOVERRIDE;
virtual bool OnEvent( wxPropertyGrid* propgrid,
wxPGProperty* property,
wxWindow* primaryCtrl,
wxEvent& event ) const;
wxEvent& event ) const wxOVERRIDE;
virtual bool GetValueFromControl( wxVariant& variant,
wxPGProperty* property,
wxWindow* ctrl ) const;
wxWindow* ctrl ) const wxOVERRIDE;
virtual void SetValueToUnspecified( wxPGProperty* property,
wxWindow* ctrl ) const;
virtual wxString GetName() const;
wxWindow* ctrl ) const wxOVERRIDE;
virtual wxString GetName() const wxOVERRIDE;
virtual void SetControlIntValue( wxPGProperty* property,
wxWindow* ctrl,
int value ) const;
int value ) const wxOVERRIDE;
virtual void SetControlStringValue( wxPGProperty* property,
wxWindow* ctrl,
const wxString& txt ) const;
const wxString& txt ) const wxOVERRIDE;
virtual int InsertItem( wxWindow* ctrl,
const wxString& label,
int index ) const;
virtual void DeleteItem( wxWindow* ctrl, int index ) const;
virtual bool CanContainCustomImage() const;
int index ) const wxOVERRIDE;
virtual void DeleteItem( wxWindow* ctrl, int index ) const wxOVERRIDE;
virtual bool CanContainCustomImage() const wxOVERRIDE;
// CreateControls calls this with CB_READONLY in extraStyle
wxWindow* CreateControlsBase( wxPropertyGrid* propgrid,
@@ -344,20 +344,20 @@ public:
virtual wxPGWindowList CreateControls(wxPropertyGrid* propgrid,
wxPGProperty* property,
const wxPoint& pos,
const wxSize& size) const;
const wxSize& size) const wxOVERRIDE;
virtual wxString GetName() const;
virtual wxString GetName() const wxOVERRIDE;
virtual void UpdateControl( wxPGProperty* property, wxWindow* ctrl ) const;
virtual void UpdateControl( wxPGProperty* property, wxWindow* ctrl ) const wxOVERRIDE;
virtual bool OnEvent( wxPropertyGrid* propgrid, wxPGProperty* property,
wxWindow* ctrl, wxEvent& event ) const;
wxWindow* ctrl, wxEvent& event ) const wxOVERRIDE;
virtual bool GetValueFromControl( wxVariant& variant,
wxPGProperty* property,
wxWindow* ctrl ) const;
wxWindow* ctrl ) const wxOVERRIDE;
virtual void OnFocus( wxPGProperty* property, wxWindow* wnd ) const;
virtual void OnFocus( wxPGProperty* property, wxWindow* wnd ) const wxOVERRIDE;
};
@@ -367,12 +367,12 @@ class WXDLLIMPEXP_PROPGRID wxPGChoiceAndButtonEditor : public wxPGChoiceEditor
public:
wxPGChoiceAndButtonEditor() {}
virtual ~wxPGChoiceAndButtonEditor();
virtual wxString GetName() const;
virtual wxString GetName() const wxOVERRIDE;
virtual wxPGWindowList CreateControls(wxPropertyGrid* propgrid,
wxPGProperty* property,
const wxPoint& pos,
const wxSize& size) const;
const wxSize& size) const wxOVERRIDE;
wxDECLARE_DYNAMIC_CLASS(wxPGChoiceAndButtonEditor);
};
@@ -383,12 +383,12 @@ wxPGTextCtrlAndButtonEditor : public wxPGTextCtrlEditor
public:
wxPGTextCtrlAndButtonEditor() {}
virtual ~wxPGTextCtrlAndButtonEditor();
virtual wxString GetName() const;
virtual wxString GetName() const wxOVERRIDE;
virtual wxPGWindowList CreateControls(wxPropertyGrid* propgrid,
wxPGProperty* property,
const wxPoint& pos,
const wxSize& size) const;
const wxSize& size) const wxOVERRIDE;
wxDECLARE_DYNAMIC_CLASS(wxPGTextCtrlAndButtonEditor);
};
@@ -407,32 +407,32 @@ public:
wxPGCheckBoxEditor() {}
virtual ~wxPGCheckBoxEditor();
virtual wxString GetName() const;
virtual wxString GetName() const wxOVERRIDE;
virtual wxPGWindowList CreateControls(wxPropertyGrid* propgrid,
wxPGProperty* property,
const wxPoint& pos,
const wxSize& size) const;
const wxSize& size) const wxOVERRIDE;
virtual void UpdateControl( wxPGProperty* property,
wxWindow* ctrl ) const;
wxWindow* ctrl ) const wxOVERRIDE;
virtual bool OnEvent( wxPropertyGrid* propgrid,
wxPGProperty* property,
wxWindow* primaryCtrl,
wxEvent& event ) const;
wxEvent& event ) const wxOVERRIDE;
virtual bool GetValueFromControl( wxVariant& variant,
wxPGProperty* property,
wxWindow* ctrl ) const;
wxWindow* ctrl ) const wxOVERRIDE;
virtual void SetValueToUnspecified( wxPGProperty* property,
wxWindow* ctrl ) const;
wxWindow* ctrl ) const wxOVERRIDE;
virtual void DrawValue( wxDC& dc,
const wxRect& rect,
wxPGProperty* property,
const wxString& text ) const;
const wxString& text ) const wxOVERRIDE;
//virtual wxPGCellRenderer* GetCellRenderer() const;
virtual void SetControlIntValue( wxPGProperty* property,
wxWindow* ctrl,
int value ) const;
int value ) const wxOVERRIDE;
};
#endif