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

28
samples/docview/doc.h
View File

@@ -80,8 +80,8 @@ class DrawingDocument : public wxDocument
public:
DrawingDocument() : wxDocument() { }
DocumentOstream& SaveObject(DocumentOstream& stream);
DocumentIstream& LoadObject(DocumentIstream& stream);
DocumentOstream& SaveObject(DocumentOstream& stream) wxOVERRIDE;
DocumentIstream& LoadObject(DocumentIstream& stream) wxOVERRIDE;
// add a new segment to the document
void AddDoodleSegment(const DoodleSegment& segment);
@@ -138,8 +138,8 @@ public:
{
}
virtual bool Do() { return DoAdd(); }
virtual bool Undo() { return DoRemove(); }
virtual bool Do() wxOVERRIDE { return DoAdd(); }
virtual bool Undo() wxOVERRIDE { return DoRemove(); }
};
// The command for removing the last segment
@@ -151,8 +151,8 @@ public:
{
}
virtual bool Do() { return DoRemove(); }
virtual bool Undo() { return DoAdd(); }
virtual bool Do() wxOVERRIDE { return DoRemove(); }
virtual bool Undo() wxOVERRIDE { return DoAdd(); }
};
@@ -165,16 +165,16 @@ class wxTextDocument : public wxDocument
public:
wxTextDocument() : wxDocument() { }
virtual bool OnCreate(const wxString& path, long flags);
virtual bool OnCreate(const wxString& path, long flags) wxOVERRIDE;
virtual wxTextCtrl* GetTextCtrl() const = 0;
virtual bool IsModified() const;
virtual void Modify(bool mod);
virtual bool IsModified() const wxOVERRIDE;
virtual void Modify(bool mod) wxOVERRIDE;
protected:
virtual bool DoSaveDocument(const wxString& filename);
virtual bool DoOpenDocument(const wxString& filename);
virtual bool DoSaveDocument(const wxString& filename) wxOVERRIDE;
virtual bool DoOpenDocument(const wxString& filename) wxOVERRIDE;
void OnTextChange(wxCommandEvent& event);
@@ -190,7 +190,7 @@ class TextEditDocument : public wxTextDocument
{
public:
TextEditDocument() : wxTextDocument() { }
virtual wxTextCtrl* GetTextCtrl() const;
virtual wxTextCtrl* GetTextCtrl() const wxOVERRIDE;
wxDECLARE_NO_COPY_CLASS(TextEditDocument);
DECLARE_DYNAMIC_CLASS(TextEditDocument)
@@ -208,12 +208,12 @@ class ImageDocument : public wxDocument
public:
ImageDocument() : wxDocument() { }
virtual bool OnOpenDocument(const wxString& file);
virtual bool OnOpenDocument(const wxString& file) wxOVERRIDE;
wxImage GetImage() const { return m_image; }
protected:
virtual bool DoOpenDocument(const wxString& file);
virtual bool DoOpenDocument(const wxString& file) wxOVERRIDE;
private:
wxImage m_image;

8
samples/docview/docview.h
View File

@@ -33,11 +33,11 @@ public:
MyApp();
// override some wxApp virtual methods
virtual bool OnInit();
virtual int OnExit();
virtual bool OnInit() wxOVERRIDE;
virtual int OnExit() wxOVERRIDE;
virtual void OnInitCmdLine(wxCmdLineParser& parser);
virtual bool OnCmdLineParsed(wxCmdLineParser& parser);
virtual void OnInitCmdLine(wxCmdLineParser& parser) wxOVERRIDE;
virtual bool OnCmdLineParsed(wxCmdLineParser& parser) wxOVERRIDE;
// our specific methods
Mode GetMode() const { return m_mode; }

30
samples/docview/view.h
View File

@@ -27,7 +27,7 @@ public:
MyCanvas(wxView *view, wxWindow *parent = NULL);
virtual ~MyCanvas();
virtual void OnDraw(wxDC& dc);
virtual void OnDraw(wxDC& dc) wxOVERRIDE;
// in a normal multiple document application a canvas is associated with
// one view from the beginning until the end, but to support the single
@@ -68,10 +68,10 @@ class DrawingView : public wxView
public:
DrawingView() : wxView(), m_canvas(NULL) {}
virtual bool OnCreate(wxDocument *doc, long flags);
virtual void OnDraw(wxDC *dc);
virtual void OnUpdate(wxView *sender, wxObject *hint = NULL);
virtual bool OnClose(bool deleteWindow = true);
virtual bool OnCreate(wxDocument *doc, long flags) wxOVERRIDE;
virtual void OnDraw(wxDC *dc) wxOVERRIDE;
virtual void OnUpdate(wxView *sender, wxObject *hint = NULL) wxOVERRIDE;
virtual bool OnClose(bool deleteWindow = true) wxOVERRIDE;
DrawingDocument* GetDocument();
@@ -94,9 +94,9 @@ class TextEditView : public wxView
public:
TextEditView() : wxView(), m_text(NULL) {}
virtual bool OnCreate(wxDocument *doc, long flags);
virtual void OnDraw(wxDC *dc);
virtual bool OnClose(bool deleteWindow = true);
virtual bool OnCreate(wxDocument *doc, long flags) wxOVERRIDE;
virtual void OnDraw(wxDC *dc) wxOVERRIDE;
virtual bool OnClose(bool deleteWindow = true) wxOVERRIDE;
wxTextCtrl *GetText() const { return m_text; }
@@ -120,7 +120,7 @@ class ImageCanvas : public wxScrolledWindow
public:
ImageCanvas(wxView*);
virtual void OnDraw(wxDC& dc);
virtual void OnDraw(wxDC& dc) wxOVERRIDE;
private:
wxView *m_view;
};
@@ -134,10 +134,10 @@ class ImageView : public wxView
public:
ImageView() : wxView() {}
virtual bool OnCreate(wxDocument*, long flags);
virtual void OnDraw(wxDC*);
virtual bool OnClose(bool deleteWindow = true);
virtual void OnUpdate(wxView *sender, wxObject *hint = NULL);
virtual bool OnCreate(wxDocument*, long flags) wxOVERRIDE;
virtual void OnDraw(wxDC*) wxOVERRIDE;
virtual bool OnClose(bool deleteWindow = true) wxOVERRIDE;
virtual void OnUpdate(wxView *sender, wxObject *hint = NULL) wxOVERRIDE;
ImageDocument* GetDocument();
@@ -156,8 +156,8 @@ class ImageDetailsView : public wxView
public:
ImageDetailsView(ImageDetailsDocument *doc);
virtual void OnDraw(wxDC *dc);
virtual bool OnClose(bool deleteWindow);
virtual void OnDraw(wxDC *dc) wxOVERRIDE;
virtual bool OnClose(bool deleteWindow) wxOVERRIDE;
private:
wxFrame *m_frame;