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);

20
samples/propgrid/propgrid.h
View File

@@ -23,13 +23,13 @@ public:
const wxString& value = wxEmptyString );
virtual ~wxAdvImageFileProperty ();
virtual void OnSetValue(); // Override to allow image loading.
virtual void OnSetValue() wxOVERRIDE; // Override to allow image loading.
virtual bool IntToValue( wxVariant& variant, int number, int argFlags = 0 ) const;
virtual bool OnEvent( wxPropertyGrid* propgrid, wxWindow* primary, wxEvent& event );
virtual wxSize OnMeasureImage( int item ) const;
virtual bool IntToValue( wxVariant& variant, int number, int argFlags = 0 ) const wxOVERRIDE;
virtual bool OnEvent( wxPropertyGrid* propgrid, wxWindow* primary, wxEvent& event ) wxOVERRIDE;
virtual wxSize OnMeasureImage( int item ) const wxOVERRIDE;
virtual void OnCustomPaint( wxDC& dc,
const wxRect& rect, wxPGPaintData& paintdata );
const wxRect& rect, wxPGPaintData& paintdata ) wxOVERRIDE;
void LoadThumbnails( size_t n );
@@ -77,8 +77,8 @@ public:
virtual wxVariant ChildChanged( wxVariant& thisValue,
int childIndex,
wxVariant& childValue ) const;
virtual void RefreshChildren();
wxVariant& childValue ) const wxOVERRIDE;
virtual void RefreshChildren() wxOVERRIDE;
protected:
};
@@ -110,8 +110,8 @@ public:
virtual wxVariant ChildChanged( wxVariant& thisValue,
int childIndex,
wxVariant& childValue ) const;
virtual void RefreshChildren();
wxVariant& childValue ) const wxOVERRIDE;
virtual void RefreshChildren() wxOVERRIDE;
protected:
};
@@ -269,7 +269,7 @@ class cxApplication : public wxApp
{
public:
virtual bool OnInit();
virtual bool OnInit() wxOVERRIDE;
private:
FormMain *Form1;

12
samples/propgrid/sampleprops.cpp
View File

@@ -357,12 +357,12 @@ protected:
int m_precision;
// Mandatory overridden methods
virtual wxString ArrayGet( size_t index );
virtual size_t ArrayGetCount();
virtual bool ArrayInsert( const wxString& str, int index );
virtual bool ArraySet( size_t index, const wxString& str );
virtual void ArrayRemoveAt( int index );
virtual void ArraySwap( size_t first, size_t second );
virtual wxString ArrayGet( size_t index ) wxOVERRIDE;
virtual size_t ArrayGetCount() wxOVERRIDE;
virtual bool ArrayInsert( const wxString& str, int index ) wxOVERRIDE;
virtual bool ArraySet( size_t index, const wxString& str ) wxOVERRIDE;
virtual void ArrayRemoveAt( int index ) wxOVERRIDE;
virtual void ArraySwap( size_t first, size_t second ) wxOVERRIDE;
private:
DECLARE_DYNAMIC_CLASS_NO_COPY(wxArrayDoubleEditorDialog)

28
samples/propgrid/sampleprops.h
View File

@@ -26,19 +26,19 @@ public:
const wxFontData& value = wxFontData() );
virtual ~wxFontDataProperty ();
void OnSetValue();
void OnSetValue() wxOVERRIDE;
// In order to have different value type in a derived property
// class, we will override GetValue to return custom variant,
// instead of changing the base m_value. This allows the methods
// in base class to function properly.
virtual wxVariant DoGetValue() const;
virtual wxVariant DoGetValue() const wxOVERRIDE;
virtual wxVariant ChildChanged( wxVariant& thisValue,
int childIndex,
wxVariant& childValue ) const;
virtual void RefreshChildren();
virtual bool OnEvent( wxPropertyGrid* propgrid, wxWindow* primary, wxEvent& event );
wxVariant& childValue ) const wxOVERRIDE;
virtual void RefreshChildren() wxOVERRIDE;
virtual bool OnEvent( wxPropertyGrid* propgrid, wxWindow* primary, wxEvent& event ) wxOVERRIDE;
protected:
// Value must be stored as variant - otherwise it will be
@@ -59,8 +59,8 @@ public:
virtual wxVariant ChildChanged( wxVariant& thisValue,
int childIndex,
wxVariant& childValue ) const;
virtual void RefreshChildren();
wxVariant& childValue ) const wxOVERRIDE;
virtual void RefreshChildren() wxOVERRIDE;
protected:
@@ -84,8 +84,8 @@ public:
virtual wxVariant ChildChanged( wxVariant& thisValue,
int childIndex,
wxVariant& childValue ) const;
virtual void RefreshChildren();
wxVariant& childValue ) const wxOVERRIDE;
virtual void RefreshChildren() wxOVERRIDE;
protected:
@@ -115,13 +115,13 @@ public:
virtual ~wxArrayDoubleProperty ();
virtual void OnSetValue();
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
virtual void OnSetValue() wxOVERRIDE;
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const wxOVERRIDE;
virtual bool StringToValue( wxVariant& variant,
const wxString& text,
int argFlags = 0 ) const;
virtual bool OnEvent( wxPropertyGrid* propgrid, wxWindow* primary, wxEvent& event );
virtual bool DoSetAttribute( const wxString& name, wxVariant& value );
int argFlags = 0 ) const wxOVERRIDE;
virtual bool OnEvent( wxPropertyGrid* propgrid, wxWindow* primary, wxEvent& event ) wxOVERRIDE;
virtual bool DoSetAttribute( const wxString& name, wxVariant& value ) wxOVERRIDE;
// Generates cache for displayed text
virtual void GenerateValueAsString ( wxString& target, int prec, bool removeZeroes ) const;

6
samples/propgrid/tests.cpp
View File

@@ -63,7 +63,7 @@ public:
{
}
virtual wxColour GetColour( int index ) const
virtual wxColour GetColour( int index ) const wxOVERRIDE
{
switch (index)
{
@@ -89,7 +89,7 @@ public:
virtual wxString ColourToString( const wxColour& col,
int index,
int argFlags = 0 ) const
int argFlags = 0 ) const wxOVERRIDE
{
if ( index == (int)(m_choices.GetCount()-1) )
return wxT("");
@@ -97,7 +97,7 @@ public:
return wxColourProperty::ColourToString(col, index, argFlags);
}
virtual int GetCustomColourIndex() const
virtual int GetCustomColourIndex() const wxOVERRIDE
{
return m_choices.GetCount()-2;
}