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