solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Replace wxOVERRIDE and wxNOEXCEPT with override and noexcept

Browse source 
Don't use deprecated macros in wxWidgets itself.
This commit is contained in:
PB 2022-10-12 17:07:48 +02:00 • committed by Vadim Zeitlin
parent be5095acdd
commit 88d526660f
1282 changed files with 11878 additions and 11878 deletions
Download patch file Download diff file Expand all files Collapse all files

42
samples/access/accesstest.cpp
View file

@ -73,7 +73,7 @@ public:
// this one is called on application startup and is a good place for the app
// initialization (doing it here and not in the ctor allows to have an error
// return: if OnInit() returns false, the application terminates)
virtual bool OnInit() wxOVERRIDE;
virtual bool OnInit() override;
};
@ -196,7 +196,7 @@ public:
FrameAccessible(wxWindow* win): wxWindowAccessible(win) {}
// Gets the name of the specified object.
virtual wxAccStatus GetName(int childId, wxString* name) wxOVERRIDE
virtual wxAccStatus GetName(int childId, wxString* name) override
{
if (childId == wxACC_SELF)
{
@ -214,7 +214,7 @@ public:
ScrolledWindowAccessible(wxWindow* win): wxWindowAccessible(win) {}
// Gets the name of the specified object.
virtual wxAccStatus GetName(int childId, wxString* name) wxOVERRIDE
virtual wxAccStatus GetName(int childId, wxString* name) override
{
if (childId == wxACC_SELF)
{
@ -232,36 +232,36 @@ public:
SplitterWindowAccessible(wxWindow* win): wxWindowAccessible(win) {}
// Gets the name of the specified object.
virtual wxAccStatus GetName(int childId, wxString* name) wxOVERRIDE;
virtual wxAccStatus GetName(int childId, wxString* name) override;
// Can return either a child object, or an integer
// representing the child element, starting from 1.
virtual wxAccStatus HitTest(const wxPoint& pt, int* childId, wxAccessible** childObject) wxOVERRIDE;
virtual wxAccStatus HitTest(const wxPoint& pt, int* childId, wxAccessible** childObject) override;
// Returns the rectangle for this object (id = 0) or a child element (id > 0).
virtual wxAccStatus GetLocation(wxRect& rect, int elementId) wxOVERRIDE;
virtual wxAccStatus GetLocation(wxRect& rect, int elementId) override;
// Navigates from fromId to toId/toObject.
virtual wxAccStatus Navigate(wxNavDir navDir, int fromId,
int* toId, wxAccessible** toObject) wxOVERRIDE;
int* toId, wxAccessible** toObject) override;
// Gets the number of children.
virtual wxAccStatus GetChildCount(int* childCount) wxOVERRIDE;
virtual wxAccStatus GetChildCount(int* childCount) override;
// Gets the specified child (starting from 1).
// If *child is NULL and return value is wxACC_OK,
// this means that the child is a simple element and
// not an accessible object.
virtual wxAccStatus GetChild(int childId, wxAccessible** child) wxOVERRIDE;
virtual wxAccStatus GetChild(int childId, wxAccessible** child) override;
// Gets the parent, or NULL.
virtual wxAccStatus GetParent(wxAccessible** parent) wxOVERRIDE;
virtual wxAccStatus GetParent(wxAccessible** parent) override;
// Performs the default action. childId is 0 (the action for this object)
// or > 0 (the action for a child).
// Return wxACC_NOT_SUPPORTED if there is no default action for this
// window (e.g. an edit control).
virtual wxAccStatus DoDefaultAction(int childId) wxOVERRIDE;
virtual wxAccStatus DoDefaultAction(int childId) override;
// Gets the default action for this object (0) or > 0 (the action for a child).
// Return wxACC_OK even if there is no action. actionName is the action, or the empty
@ -269,36 +269,36 @@ public:
// The retrieved string describes the action that is performed on an object,
// not what the object does as a result. For example, a toolbar button that prints
// a document has a default action of "Press" rather than "Prints the current document."
virtual wxAccStatus GetDefaultAction(int childId, wxString* actionName) wxOVERRIDE;
virtual wxAccStatus GetDefaultAction(int childId, wxString* actionName) override;
// Returns the description for this object or a child.
virtual wxAccStatus GetDescription(int childId, wxString* description) wxOVERRIDE;
virtual wxAccStatus GetDescription(int childId, wxString* description) override;
// Returns help text for this object or a child, similar to tooltip text.
virtual wxAccStatus GetHelpText(int childId, wxString* helpText) wxOVERRIDE;
virtual wxAccStatus GetHelpText(int childId, wxString* helpText) override;
// Returns the keyboard shortcut for this object or child.
// Return e.g. ALT+K
virtual wxAccStatus GetKeyboardShortcut(int childId, wxString* shortcut) wxOVERRIDE;
virtual wxAccStatus GetKeyboardShortcut(int childId, wxString* shortcut) override;
// Returns a role constant.
virtual wxAccStatus GetRole(int childId, wxAccRole* role) wxOVERRIDE;
virtual wxAccStatus GetRole(int childId, wxAccRole* role) override;
// Returns a state constant.
virtual wxAccStatus GetState(int childId, long* state) wxOVERRIDE;
virtual wxAccStatus GetState(int childId, long* state) override;
// Returns a localized string representing the value for the object
// or child.
virtual wxAccStatus GetValue(int childId, wxString* strValue) wxOVERRIDE;
virtual wxAccStatus GetValue(int childId, wxString* strValue) override;
// Selects the object or child.
virtual wxAccStatus Select(int childId, wxAccSelectionFlags selectFlags) wxOVERRIDE;
virtual wxAccStatus Select(int childId, wxAccSelectionFlags selectFlags) override;
// Gets the window with the keyboard focus.
// If childId is 0 and child is NULL, no object in
// this subhierarchy has the focus.
// If this object has the focus, child should be 'this'.
virtual wxAccStatus GetFocus(int* childId, wxAccessible** child) wxOVERRIDE;
virtual wxAccStatus GetFocus(int* childId, wxAccessible** child) override;
// Gets a variant representing the selected children
// of this object.
@ -308,7 +308,7 @@ public:
// - an integer representing the selected child element,
// or 0 if this object is selected (GetType() == "long")
// - a "void*" pointer to a wxAccessible child object
virtual wxAccStatus GetSelections(wxVariant* selections) wxOVERRIDE;
virtual wxAccStatus GetSelections(wxVariant* selections) override;
};

2
samples/animate/anitest.h
View file

@ -14,7 +14,7 @@
class MyApp : public wxApp
{
public:
bool OnInit() wxOVERRIDE;
bool OnInit() override;
};
// Define a new frame

6
samples/archive/archive.cpp
View file

@ -33,11 +33,11 @@ public:
m_filterClassFactory = NULL;
}
virtual void OnInitCmdLine(wxCmdLineParser& parser) wxOVERRIDE;
virtual void OnInitCmdLine(wxCmdLineParser& parser) override;
virtual bool OnCmdLineParsed(wxCmdLineParser& parser) wxOVERRIDE;
virtual bool OnCmdLineParsed(wxCmdLineParser& parser) override;
virtual int OnRun() wxOVERRIDE;
virtual int OnRun() override;
private:
enum ArchiveCommandType

4
samples/artprov/arttest.cpp
View file

@ -30,7 +30,7 @@
class MyApp : public wxApp
{
public:
virtual bool OnInit() wxOVERRIDE;
virtual bool OnInit() override;
};
class MyFrame : public wxFrame
@ -110,7 +110,7 @@ class MyArtProvider : public wxArtProvider
{
protected:
virtual wxBitmap CreateBitmap(const wxArtID& id, const wxArtClient& client,
const wxSize& size) wxOVERRIDE;
const wxSize& size) override;
};
#include "info.xpm"

2
samples/aui/auidemo.cpp
View file

@ -39,7 +39,7 @@
class MyApp : public wxApp
{
public:
bool OnInit() wxOVERRIDE;
bool OnInit() override;
};
wxDECLARE_APP(MyApp);

2
samples/calendar/calendar.cpp
View file

@ -75,7 +75,7 @@ public:
// this one is called on application startup and is a good place for the app
// initialization (doing it here and not in the ctor allows to have an error
// return: if OnInit() returns false, the application terminates)
virtual bool OnInit() wxOVERRIDE;
virtual bool OnInit() override;
private:
wxLocale m_locale;

2
samples/caret/caret.cpp
View file

@ -45,7 +45,7 @@ public:
// this one is called on application startup and is a good place for the app
// initialization (doing it here and not in the ctor allows to have an error
// return: if OnInit() returns false, the application terminates)
virtual bool OnInit() wxOVERRIDE;
virtual bool OnInit() override;
};
// MyCanvas is a canvas on which you can type

2
samples/clipboard/clipboard.cpp
View file

@ -28,7 +28,7 @@
class MyApp : public wxApp
{
public:
virtual bool OnInit() wxOVERRIDE;
virtual bool OnInit() override;
};
#if USE_ASYNCHRONOUS_CLIPBOARD_REQUEST

2
samples/collpane/collpane.cpp
View file

@ -73,7 +73,7 @@ class MyApp: public wxApp
public:
MyApp() { }
virtual bool OnInit() wxOVERRIDE;
virtual bool OnInit() override;
wxDECLARE_NO_COPY_CLASS(MyApp);
};

38
samples/combo/combo.cpp
View file

@ -59,7 +59,7 @@ public:
// this one is called on application startup and is a good place for the app
// initialization (doing it here and not in the ctor allows to have an error
// return: if OnInit() returns false, the application terminates)
virtual bool OnInit() wxOVERRIDE;
virtual bool OnInit() override;
};
// Define a new frame type: this is going to be our main frame
@ -176,7 +176,7 @@ public:
virtual void OnDrawItem( wxDC& dc,
const wxRect& rect,
int item,
int flags ) const wxOVERRIDE
int flags ) const override
{
if ( item == wxNOT_FOUND )
return;
@ -230,7 +230,7 @@ public:
}
virtual void OnDrawBackground( wxDC& dc, const wxRect& rect,
int item, int flags ) const wxOVERRIDE
int item, int flags ) const override
{
// If item is selected or even, or we are painting the
@ -249,13 +249,13 @@ public:
dc.DrawRectangle(rect);
}
virtual wxCoord OnMeasureItem( size_t item ) const wxOVERRIDE
virtual wxCoord OnMeasureItem( size_t item ) const override
{
// Simply demonstrate the ability to have variable-height items
return FromDIP( item & 1 ? 36 : 24 );
}
virtual wxCoord OnMeasureItemWidth( size_t WXUNUSED(item) ) const wxOVERRIDE
virtual wxCoord OnMeasureItemWidth( size_t WXUNUSED(item) ) const override
{
return -1; // default - will be measured from text width
}
@ -273,13 +273,13 @@ class ListViewComboPopup : public wxListView, public wxComboPopup
{
public:
virtual void Init() wxOVERRIDE
virtual void Init() override
{
m_value = -1;
m_itemHere = -1; // hot item in list
}
virtual bool Create( wxWindow* parent ) wxOVERRIDE
virtual bool Create( wxWindow* parent ) override
{
return wxListView::Create(parent,1,
wxPoint(0,0),wxDefaultSize,
@ -287,16 +287,16 @@ public:
wxLC_SORT_ASCENDING|wxSIMPLE_BORDER);
}
virtual wxWindow *GetControl() wxOVERRIDE { return this; }
virtual wxWindow *GetControl() override { return this; }
virtual void SetStringValue( const wxString& s ) wxOVERRIDE
virtual void SetStringValue( const wxString& s ) override
{
int n = wxListView::FindItem(-1,s);
if ( n >= 0 && n < GetItemCount() )
wxListView::Select(n);
}
virtual wxString GetStringValue() const wxOVERRIDE
virtual wxString GetStringValue() const override
{
if ( m_value >= 0 )
return wxListView::GetItemText(m_value);
@ -367,7 +367,7 @@ class TreeCtrlComboPopup : public wxTreeCtrl, public wxComboPopup
{
public:
virtual void Init() wxOVERRIDE
virtual void Init() override
{
}
virtual ~TreeCtrlComboPopup()
@ -379,7 +379,7 @@ public:
SendDestroyEvent();
}
virtual bool Create( wxWindow* parent ) wxOVERRIDE
virtual bool Create( wxWindow* parent ) override
{
return wxTreeCtrl::Create(parent,1,
wxPoint(0,0),wxDefaultSize,
@ -395,12 +395,12 @@ public:
virtual wxSize GetAdjustedSize( int minWidth,
int WXUNUSED(prefHeight),
int maxHeight ) wxOVERRIDE
int maxHeight ) override
{
return wxSize(wxMax(300,minWidth),wxMin(250,maxHeight));
}
virtual wxWindow *GetControl() wxOVERRIDE { return this; }
virtual wxWindow *GetControl() override { return this; }
// Needed by SetStringValue
wxTreeItemId FindItemByText( wxTreeItemId parent, const wxString& text )
@ -424,7 +424,7 @@ public:
return wxTreeItemId();
}
virtual void SetStringValue( const wxString& s ) wxOVERRIDE
virtual void SetStringValue( const wxString& s ) override
{
wxTreeItemId root = GetRootItem();
if ( !root.IsOk() )
@ -438,7 +438,7 @@ public:
}
}
virtual wxString GetStringValue() const wxOVERRIDE
virtual wxString GetStringValue() const override
{
if ( m_value.IsOk() )
return wxTreeCtrl::GetItemText(m_value);
@ -501,7 +501,7 @@ wxEND_EVENT_TABLE()
class wxComboCtrlWithCustomPopupAnim : public wxComboCtrl
{
protected:
virtual bool AnimateShow( const wxRect& rect, int WXUNUSED(flags) ) wxOVERRIDE
virtual bool AnimateShow( const wxRect& rect, int WXUNUSED(flags) ) override
{
wxWindow* win = GetPopupWindow();
win->SetSize(rect);
@ -543,7 +543,7 @@ public:
#endif
}
virtual void OnButtonClick() wxOVERRIDE
virtual void OnButtonClick() override
{
// Show standard wxFileDialog on button click
@ -561,7 +561,7 @@ public:
}
// Implement empty DoSetPopupControl to prevent assertion failure.
virtual void DoSetPopupControl(wxComboPopup* WXUNUSED(popup)) wxOVERRIDE
virtual void DoSetPopupControl(wxComboPopup* WXUNUSED(popup)) override
{
}

4
samples/config/conftest.cpp
View file

@ -37,8 +37,8 @@ class MyApp: public wxApp
{
public:
// implement base class virtuals
virtual bool OnInit() wxOVERRIDE;
virtual int OnExit() wxOVERRIDE;
virtual bool OnInit() override;
virtual int OnExit() override;
};
class MyFrame: public wxFrame

30
samples/dataview/dataview.cpp
View file

@ -54,7 +54,7 @@
class MyApp: public wxApp
{
public:
virtual bool OnInit() wxOVERRIDE;
virtual bool OnInit() override;
};
// ----------------------------------------------------------------------------
@ -237,7 +237,7 @@ public:
: wxDataViewCustomRenderer("string", mode, wxALIGN_CENTER)
{ }
virtual bool Render( wxRect rect, wxDC *dc, int state ) wxOVERRIDE
virtual bool Render( wxRect rect, wxDC *dc, int state ) override
{
dc->SetBrush( *wxLIGHT_GREY_BRUSH );
dc->SetPen( *wxTRANSPARENT_PEN );
@ -257,7 +257,7 @@ public:
wxDataViewModel *WXUNUSED(model),
const wxDataViewItem &WXUNUSED(item),
unsigned int WXUNUSED(col),
const wxMouseEvent *mouseEvent) wxOVERRIDE
const wxMouseEvent *mouseEvent) override
{
wxString position;
if ( mouseEvent )
@ -268,32 +268,32 @@ public:
return false;
}
virtual wxSize GetSize() const wxOVERRIDE
virtual wxSize GetSize() const override
{
return GetView()->FromDIP(wxSize(60, 20));
}
virtual bool SetValue( const wxVariant &value ) wxOVERRIDE
virtual bool SetValue( const wxVariant &value ) override
{
m_value = value.GetString();
return true;
}
virtual bool GetValue( wxVariant &WXUNUSED(value) ) const wxOVERRIDE { return true; }
virtual bool GetValue( wxVariant &WXUNUSED(value) ) const override { return true; }
#if wxUSE_ACCESSIBILITY
virtual wxString GetAccessibleDescription() const wxOVERRIDE
virtual wxString GetAccessibleDescription() const override
{
return m_value;
}
#endif // wxUSE_ACCESSIBILITY
virtual bool HasEditorCtrl() const wxOVERRIDE { return true; }
virtual bool HasEditorCtrl() const override { return true; }
virtual wxWindow*
CreateEditorCtrl(wxWindow* parent,
wxRect labelRect,
const wxVariant& value) wxOVERRIDE
const wxVariant& value) override
{
wxTextCtrl* text = new wxTextCtrl(parent, wxID_ANY, value,
labelRect.GetPosition(),
@ -305,7 +305,7 @@ public:
}
virtual bool
GetValueFromEditorCtrl(wxWindow* ctrl, wxVariant& value) wxOVERRIDE
GetValueFromEditorCtrl(wxWindow* ctrl, wxVariant& value) override
{
wxTextCtrl* text = wxDynamicCast(ctrl, wxTextCtrl);
if ( !text )
@ -333,13 +333,13 @@ public:
: wxDataViewCustomRenderer("string", wxDATAVIEW_CELL_INERT, 0)
{ }
virtual bool Render(wxRect rect, wxDC *dc, int state) wxOVERRIDE
virtual bool Render(wxRect rect, wxDC *dc, int state) override
{
RenderText(m_value, 0, rect, dc, state);
return true;
}
virtual wxSize GetSize() const wxOVERRIDE
virtual wxSize GetSize() const override
{
wxSize txtSize = GetTextExtent(m_value);
int lines = m_value.Freq('\n') + 1;
@ -347,17 +347,17 @@ public:
return txtSize;
}
virtual bool SetValue(const wxVariant &value) wxOVERRIDE
virtual bool SetValue(const wxVariant &value) override
{
m_value = value.GetString();
m_value.Replace(" ", "\n");
return true;
}
virtual bool GetValue(wxVariant &WXUNUSED(value)) const wxOVERRIDE { return true; }
virtual bool GetValue(wxVariant &WXUNUSED(value)) const override { return true; }
#if wxUSE_ACCESSIBILITY
virtual wxString GetAccessibleDescription() const wxOVERRIDE
virtual wxString GetAccessibleDescription() const override
{
return m_value;
}

30
samples/dataview/mymodels.h
View file

@ -146,22 +146,22 @@ public:
// override sorting to always sort branches ascendingly
int Compare( const wxDataViewItem &item1, const wxDataViewItem &item2,
unsigned int column, bool ascending ) const wxOVERRIDE;
unsigned int column, bool ascending ) const override;
// implementation of base class virtuals to define model
virtual void GetValue( wxVariant &variant,
const wxDataViewItem &item, unsigned int col ) const wxOVERRIDE;
const wxDataViewItem &item, unsigned int col ) const override;
virtual bool SetValue( const wxVariant &variant,
const wxDataViewItem &item, unsigned int col ) wxOVERRIDE;
const wxDataViewItem &item, unsigned int col ) override;
virtual bool IsEnabled( const wxDataViewItem &item,
unsigned int col ) const wxOVERRIDE;
unsigned int col ) const override;
virtual wxDataViewItem GetParent( const wxDataViewItem &item ) const wxOVERRIDE;
virtual bool IsContainer( const wxDataViewItem &item ) const wxOVERRIDE;
virtual wxDataViewItem GetParent( const wxDataViewItem &item ) const override;
virtual bool IsContainer( const wxDataViewItem &item ) const override;
virtual unsigned int GetChildren( const wxDataViewItem &parent,
wxDataViewItemArray &array ) const wxOVERRIDE;
wxDataViewItemArray &array ) const override;
private:
MyMusicTreeModelNode* m_root;
@ -216,11 +216,11 @@ public:
// implementation of base class virtuals to define model
virtual void GetValueByRow( wxVariant &variant,
unsigned int row, unsigned int col ) const wxOVERRIDE;
unsigned int row, unsigned int col ) const override;
virtual bool GetAttrByRow( unsigned int row, unsigned int col,
wxDataViewItemAttr &attr ) const wxOVERRIDE;
wxDataViewItemAttr &attr ) const override;
virtual bool SetValueByRow( const wxVariant &variant,
unsigned int row, unsigned int col ) wxOVERRIDE;
unsigned int row, unsigned int col ) override;
private:
wxVector<bool> m_toggleColValues;
@ -237,7 +237,7 @@ private:
class MyListStoreDerivedModel : public wxDataViewListStore
{
public:
virtual bool IsEnabledByRow(unsigned int row, unsigned int col) const wxOVERRIDE;
virtual bool IsEnabledByRow(unsigned int row, unsigned int col) const override;
};
// ----------------------------------------------------------------------------
@ -247,7 +247,7 @@ public:
class MyListStoreHasValueModel : public MyListStoreDerivedModel
{
public:
virtual bool HasValue(const wxDataViewItem &item, unsigned int col) const wxOVERRIDE;
virtual bool HasValue(const wxDataViewItem &item, unsigned int col) const override;
};
// ----------------------------------------------------------------------------
@ -267,12 +267,12 @@ public:
}
// Implement base class pure virtual methods.
unsigned GetCount() const wxOVERRIDE { return m_strings.size(); }
void GetValueByRow(wxVariant& val, unsigned row, unsigned) const wxOVERRIDE
unsigned GetCount() const override { return m_strings.size(); }
void GetValueByRow(wxVariant& val, unsigned row, unsigned) const override
{
val = m_strings[row];
}
bool SetValueByRow(const wxVariant&, unsigned, unsigned) wxOVERRIDE
bool SetValueByRow(const wxVariant&, unsigned, unsigned) override
{
return false;
}

8
samples/debugrpt/debugrpt.cpp
View file

@ -64,7 +64,7 @@ protected:
// this is called with the contents of the server response: you will
// probably want to parse the XML document in OnServerReply() instead of
// just dumping it as I do
virtual bool OnServerReply(const wxArrayString& reply) wxOVERRIDE
virtual bool OnServerReply(const wxArrayString& reply) override
{
if ( reply.IsEmpty() )
{
@ -177,7 +177,7 @@ private:
public:
BadTimer() { }
virtual void Notify() wxOVERRIDE
virtual void Notify() override
{
foo(8);
}
@ -205,10 +205,10 @@ public:
MyApp();
// create our main window here
virtual bool OnInit() wxOVERRIDE;
virtual bool OnInit() override;
// called when a crash occurs in this application
virtual void OnFatalException() wxOVERRIDE;
virtual void OnFatalException() override;
// this is where we really generate the debug report
void GenerateReport(wxDebugReport::Context ctx);

28
samples/dialogs/dialogs.cpp
View file

@ -1516,24 +1516,24 @@ void MyFrame::AddRemove(wxCommandEvent& WXUNUSED(event))
{
}
wxWindow* GetItemsCtrl() const wxOVERRIDE
wxWindow* GetItemsCtrl() const override
{
return m_lbox;
}
bool CanAdd() const wxOVERRIDE
bool CanAdd() const override
{
// Restrict the maximal number of items to 10 just for testing.
return m_lbox->GetCount() <= 10;
}
bool CanRemove() const wxOVERRIDE
bool CanRemove() const override
{
// We must have a selected item in order to be able to delete it.
return m_lbox->GetSelection() != wxNOT_FOUND;
}
void OnAdd() wxOVERRIDE
void OnAdd() override
{
// A real program would use a wxDataViewCtrl or wxListCtrl and
// allow editing the newly edited item in place, here we just use a
@ -1542,7 +1542,7 @@ void MyFrame::AddRemove(wxCommandEvent& WXUNUSED(event))
m_lbox->Append(wxString::Format("new item #%d", ++s_item));
}
void OnRemove() wxOVERRIDE
void OnRemove() override
{
// Notice that we don't need to check if we have a valid selection,
// we can be only called if CanRemove(), which already checks for
@ -1733,7 +1733,7 @@ public:
}
// Override pure virtual base class method to add our custom controls.
virtual void AddCustomControls(wxFileDialogCustomize& customizer) wxOVERRIDE
virtual void AddCustomControls(wxFileDialogCustomize& customizer) override
{
// Note: all the pointers created here cease to be valid once
// ShowModal() returns, TransferDataFromCustomControls() is the latest
@ -1751,7 +1751,7 @@ public:
}
// Override another method called whenever something changes in the dialog.
virtual void UpdateCustomControls() wxOVERRIDE
virtual void UpdateCustomControls() override
{
// Enable the button if and only if the checkbox is checked.
m_btn->Enable(m_cb->GetValue());
@ -1768,7 +1768,7 @@ public:
}
// And another one called when the dialog is accepted.
virtual void TransferDataFromCustomControls() wxOVERRIDE
virtual void TransferDataFromCustomControls() override
{
m_info.Printf("paper=%s (%s), enabled=%d, text=\"%s\"",
GetFileDialogPaperSize(m_choiceSize->GetSelection()),
@ -2030,12 +2030,12 @@ void MyFrame::FileSave(wxCommandEvent& WXUNUSED(event) )
{
}
void AddCustomControls(wxFileDialogCustomize& customizer) wxOVERRIDE
void AddCustomControls(wxFileDialogCustomize& customizer) override
{
m_checkbox = customizer.AddCheckBox("Encrypt");
}
void TransferDataFromCustomControls() wxOVERRIDE
void TransferDataFromCustomControls() override
{
m_encrypt = m_checkbox->GetValue();
}
@ -3195,14 +3195,14 @@ void MyFrame::OnModalHook(wxCommandEvent& event)
class TestModalHook : public wxModalDialogHook
{
protected:
virtual int Enter(wxDialog* dialog) wxOVERRIDE
virtual int Enter(wxDialog* dialog) override
{
wxLogStatus("Showing %s modal dialog",
dialog->GetClassInfo()->GetClassName());
return wxID_NONE;
}
virtual void Exit(wxDialog* dialog) wxOVERRIDE
virtual void Exit(wxDialog* dialog) override
{
wxLogStatus("Leaving %s modal dialog",
dialog->GetClassInfo()->GetClassName());
@ -3506,7 +3506,7 @@ public:
}
// add some custom controls
virtual void DoAddCustomControls() wxOVERRIDE
virtual void DoAddCustomControls() override
{
AddControl(new wxStaticLine(this), wxSizerFlags().Expand());
AddText("Some custom text");
@ -4563,7 +4563,7 @@ class MyLogGui : public wxLogGui
private:
virtual void DoShowSingleLogMessage(const wxString& message,
const wxString& title,
int style) wxOVERRIDE
int style) override
{
wxMessageDialog dlg(NULL, message, title,
wxOK | wxCANCEL | wxCANCEL_DEFAULT | style);

14
samples/dialogs/dialogs.h
View file

@ -92,7 +92,7 @@ of MSW, MAC and OS2
class MyAppTraits : public wxGUIAppTraits
{
public:
virtual wxLog *CreateLogTarget() wxOVERRIDE;
virtual wxLog *CreateLogTarget() override;
};
#endif // wxUSE_LOG
@ -103,16 +103,16 @@ class MyApp: public wxApp
public:
MyApp() { m_startupProgressStyle = -1; }
virtual bool OnInit() wxOVERRIDE;
virtual bool OnInit() override;
#if wxUSE_CMDLINE_PARSER
virtual void OnInitCmdLine(wxCmdLineParser& parser) wxOVERRIDE;
virtual bool OnCmdLineParsed(wxCmdLineParser& parser) wxOVERRIDE;
virtual void OnInitCmdLine(wxCmdLineParser& parser) override;
virtual bool OnCmdLineParsed(wxCmdLineParser& parser) override;
#endif // wxUSE_CMDLINE_PARSER
protected:
#if wxUSE_LOG
virtual wxAppTraits *CreateTraits() wxOVERRIDE { return new MyAppTraits; }
virtual wxAppTraits *CreateTraits() override { return new MyAppTraits; }
#endif // wxUSE_LOG
private:
@ -267,8 +267,8 @@ public:
protected:
// overrides method in base class
virtual void AddAdditionalTextOptions(wxSizer *sizer) wxOVERRIDE;
virtual void AddAdditionalFlags(wxSizer *sizer) wxOVERRIDE;
virtual void AddAdditionalTextOptions(wxSizer *sizer) override;
virtual void AddAdditionalFlags(wxSizer *sizer) override;
void OnApply(wxCommandEvent& event);

4
samples/dialup/nettest.cpp
View file

@ -50,10 +50,10 @@ public:
// this one is called on application startup and is a good place for the app
// initialization (doing it here and not in the ctor allows to have an error
// return: if OnInit() returns false, the application terminates)
virtual bool OnInit() wxOVERRIDE;
virtual bool OnInit() override;
// called before the application termination
virtual int OnExit() wxOVERRIDE;
virtual int OnExit() override;
// event handlers
void OnConnected(wxDialUpEvent& event);

2
samples/display/display.cpp
View file

@ -52,7 +52,7 @@ public:
// this one is called on application startup and is a good place for the app
// initialization (doing it here and not in the ctor allows to have an error
// return: if OnInit() returns false, the application terminates)
virtual bool OnInit() wxOVERRIDE;
virtual bool OnInit() override;
};
// Define a new frame type: this is going to be our main frame

4
samples/dll/wx_exe.cpp
View file

@ -55,8 +55,8 @@ public:
class MainApp : public wxApp
{
public:
virtual bool OnInit() wxOVERRIDE;
virtual int OnExit() wxOVERRIDE;
virtual bool OnInit() override;
virtual int OnExit() override;
};

44
samples/dnd/dnd.cpp
View file

@ -44,7 +44,7 @@ class DnDText : public wxTextDropTarget
public:
DnDText(wxListBox *pOwner) { m_pOwner = pOwner; }
virtual bool OnDropText(wxCoord x, wxCoord y, const wxString& text) wxOVERRIDE;
virtual bool OnDropText(wxCoord x, wxCoord y, const wxString& text) override;
private:
wxListBox *m_pOwner;
@ -56,7 +56,7 @@ public:
DnDFile(wxListBox *pOwner = NULL) { m_pOwner = pOwner; }
virtual bool OnDropFiles(wxCoord x, wxCoord y,
const wxArrayString& filenames) wxOVERRIDE;
const wxArrayString& filenames) override;
private:
wxListBox *m_pOwner;
@ -80,14 +80,14 @@ public:
// URLs can't be moved, only copied
virtual wxDragResult OnDragOver(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y),
wxDragResult WXUNUSED(def)) wxOVERRIDE
wxDragResult WXUNUSED(def)) override
{
return wxDragLink; // At least IE 5.x needs wxDragLink, the
// other browsers on MSW seem okay with it too.
}
// translate this to calls to OnDropURL() just for convenience
virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def) wxOVERRIDE
virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def) override
{
if ( !GetData() )
return wxDragNone;
@ -107,7 +107,7 @@ public:
class DnDApp : public wxApp
{
public:
virtual bool OnInit() wxOVERRIDE;
virtual bool OnInit() override;
};
wxIMPLEMENT_APP(DnDApp);
@ -375,8 +375,8 @@ public:
wxLogMessage("DnDTriangularShape is being deleted");
}
virtual Kind GetKind() const wxOVERRIDE { return Triangle; }
virtual void Draw(wxDC& dc) wxOVERRIDE
virtual Kind GetKind() const override { return Triangle; }
virtual void Draw(wxDC& dc) override
{
DnDShape::Draw(dc);
@ -412,8 +412,8 @@ public:
wxLogMessage("DnDRectangularShape is being deleted");
}
virtual Kind GetKind() const wxOVERRIDE { return Rectangle; }
virtual void Draw(wxDC& dc) wxOVERRIDE
virtual Kind GetKind() const override { return Rectangle; }
virtual void Draw(wxDC& dc) override
{
DnDShape::Draw(dc);
@ -448,8 +448,8 @@ public:
wxLogMessage("DnDEllipticShape is being deleted");
}
virtual Kind GetKind() const wxOVERRIDE { return Ellipse; }
virtual void Draw(wxDC& dc) wxOVERRIDE
virtual Kind GetKind() const override { return Ellipse; }
virtual void Draw(wxDC& dc) override
{
DnDShape::Draw(dc);
@ -529,12 +529,12 @@ public:
// implement base class pure virtuals
// ----------------------------------
virtual wxDataFormat GetPreferredFormat(Direction WXUNUSED(dir)) const wxOVERRIDE
virtual wxDataFormat GetPreferredFormat(Direction WXUNUSED(dir)) const override
{
return m_formatShape;
}
virtual size_t GetFormatCount(Direction dir) const wxOVERRIDE
virtual size_t GetFormatCount(Direction dir) const override
{
// our custom format is supported by both GetData() and SetData()
size_t nFormats = 1;
@ -551,7 +551,7 @@ public:
return nFormats;
}
virtual void GetAllFormats(wxDataFormat *formats, Direction dir) const wxOVERRIDE
virtual void GetAllFormats(wxDataFormat *formats, Direction dir) const override
{
formats[0] = m_formatShape;
if ( dir == Get )
@ -568,7 +568,7 @@ public:
}
}
virtual size_t GetDataSize(const wxDataFormat& format) const wxOVERRIDE
virtual size_t GetDataSize(const wxDataFormat& format) const override
{
if ( format == m_formatShape )
{
@ -595,7 +595,7 @@ public:
}
}
virtual bool GetDataHere(const wxDataFormat& format, void *pBuf) const wxOVERRIDE
virtual bool GetDataHere(const wxDataFormat& format, void *pBuf) const override
{
if ( format == m_formatShape )
{
@ -625,7 +625,7 @@ public:
}
virtual bool SetData(const wxDataFormat& format,
size_t WXUNUSED(len), const void *buf) wxOVERRIDE
size_t WXUNUSED(len), const void *buf) override
{
wxCHECK_MSG( format == m_formatShape, false,
"unsupported format");
@ -674,8 +674,8 @@ public:
DnDShape *GetShape() const;
virtual bool TransferDataToWindow() wxOVERRIDE;
virtual bool TransferDataFromWindow() wxOVERRIDE;
virtual bool TransferDataToWindow() override;
virtual bool TransferDataFromWindow() override;
void OnColour(wxCommandEvent& event);
@ -752,20 +752,20 @@ public:
}
// override base class (pure) virtuals
virtual wxDragResult OnEnter(wxCoord x, wxCoord y, wxDragResult def) wxOVERRIDE
virtual wxDragResult OnEnter(wxCoord x, wxCoord y, wxDragResult def) override
{
#if wxUSE_STATUSBAR
m_frame->SetStatusText("Mouse entered the frame");
#endif // wxUSE_STATUSBAR
return OnDragOver(x, y, def);
}
virtual void OnLeave() wxOVERRIDE
virtual void OnLeave() override
{
#if wxUSE_STATUSBAR
m_frame->SetStatusText("Mouse left the frame");
#endif // wxUSE_STATUSBAR
}
virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def) wxOVERRIDE
virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def) override
{
if ( !GetData() )
{

28
samples/docview/doc.h
View file

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

10
samples/docview/docview.h
View file

@ -37,14 +37,14 @@ public:
MyApp();
// override some wxApp virtual methods
virtual bool OnInit() wxOVERRIDE;
virtual int OnExit() wxOVERRIDE;
virtual bool OnInit() override;
virtual int OnExit() override;
virtual void OnInitCmdLine(wxCmdLineParser& parser) wxOVERRIDE;
virtual bool OnCmdLineParsed(wxCmdLineParser& parser) wxOVERRIDE;
virtual void OnInitCmdLine(wxCmdLineParser& parser) override;
virtual bool OnCmdLineParsed(wxCmdLineParser& parser) override;
#ifdef __WXMAC__
virtual void MacNewFile() wxOVERRIDE;
virtual void MacNewFile() override;
#endif // __WXMAC__
// our specific methods

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) wxOVERRIDE;
virtual void OnDraw(wxDC& dc) override;
// 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) wxOVERRIDE;
virtual void OnDraw(wxDC *dc) wxOVERRIDE;
virtual void OnUpdate(wxView *sender, wxObject *hint = NULL) wxOVERRIDE;
virtual bool OnClose(bool deleteWindow = true) wxOVERRIDE;
virtual bool OnCreate(wxDocument *doc, long flags) override;
virtual void OnDraw(wxDC *dc) override;
virtual void OnUpdate(wxView *sender, wxObject *hint = NULL) override;
virtual bool OnClose(bool deleteWindow = true) override;
DrawingDocument* GetDocument();
@ -94,9 +94,9 @@ class TextEditView : public wxView
public:
TextEditView() : wxView(), m_text(NULL) {}
virtual bool OnCreate(wxDocument *doc, long flags) wxOVERRIDE;
virtual void OnDraw(wxDC *dc) wxOVERRIDE;
virtual bool OnClose(bool deleteWindow = true) wxOVERRIDE;
virtual bool OnCreate(wxDocument *doc, long flags) override;
virtual void OnDraw(wxDC *dc) override;
virtual bool OnClose(bool deleteWindow = true) override;
wxTextCtrl *GetText() const { return m_text; }
@ -120,7 +120,7 @@ class ImageCanvas : public wxScrolledWindow
public:
ImageCanvas(wxView*);
virtual void OnDraw(wxDC& dc) wxOVERRIDE;
virtual void OnDraw(wxDC& dc) override;
private:
wxView *m_view;
};
@ -134,10 +134,10 @@ class ImageView : public wxView
public:
ImageView() : wxView() {}
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;
virtual bool OnCreate(wxDocument*, long flags) override;
virtual void OnDraw(wxDC*) override;
virtual bool OnClose(bool deleteWindow = true) override;
virtual void OnUpdate(wxView *sender, wxObject *hint = NULL) override;
ImageDocument* GetDocument();
@ -156,8 +156,8 @@ class ImageDetailsView : public wxView
public:
ImageDetailsView(ImageDetailsDocument *doc);
virtual void OnDraw(wxDC *dc) wxOVERRIDE;
virtual bool OnClose(bool deleteWindow) wxOVERRIDE;
virtual void OnDraw(wxDC *dc) override;
virtual bool OnClose(bool deleteWindow) override;
private:
wxFrame *m_frame;

6
samples/dragimag/dragimag.h
View file

@ -44,8 +44,8 @@ class MyApp: public wxApp
{
public:
MyApp();
virtual bool OnInit() wxOVERRIDE;
virtual int OnExit() wxOVERRIDE;
virtual bool OnInit() override;
virtual int OnExit() override;
//// Operations
@ -181,7 +181,7 @@ public:
// On some platforms, notably Mac OS X with Core Graphics, we can't blit from
// a window, so we need to draw the background explicitly.
virtual bool UpdateBackingFromWindow(wxDC& windowDC, wxMemoryDC& destDC, const wxRect& sourceRect,
const wxRect& destRect) const wxOVERRIDE;
const wxRect& destRect) const override;
#endif
protected:

8
samples/drawing/drawing.cpp
View file

@ -85,9 +85,9 @@ public:
// this one is called on application startup and is a good place for the app
// initialization (doing it here and not in the ctor allows to have an error
// return: if OnInit() returns false, the application terminates)
virtual bool OnInit() wxOVERRIDE;
virtual bool OnInit() override;
virtual int OnExit() wxOVERRIDE { DeleteBitmaps(); return 0; }
virtual int OnExit() override { DeleteBitmaps(); return 0; }
protected:
void DeleteBitmaps();
@ -248,7 +248,7 @@ public:
#if wxUSE_COLOURDLG
wxColour SelectColour();
#endif // wxUSE_COLOURDLG
void PrepareDC(wxDC& dc) wxOVERRIDE;
void PrepareDC(wxDC& dc) override;
int m_backgroundMode;
int m_textureBackground;
@ -2176,7 +2176,7 @@ public:
SetSizerAndFit(sizer);
}
virtual bool TransferDataFromWindow() wxOVERRIDE
virtual bool TransferDataFromWindow() override
{
if ( !wxDialog::TransferDataFromWindow() )
return false;

2
samples/erase/erase.cpp
View file

@ -46,7 +46,7 @@
class MyApp : public wxApp
{
public:
virtual bool OnInit() wxOVERRIDE;
virtual bool OnInit() override;
};

2
samples/event/chessboard.cpp
View file

@ -42,7 +42,7 @@ private:
void OnMouseLeftDown(wxMouseEvent& event);
void OnMouseLeftUp(wxMouseEvent& event);
virtual wxSize DoGetBestClientSize() const wxOVERRIDE;
virtual wxSize DoGetBestClientSize() const override;
};
ChessBoard::ChessBoard(wxWindow* parent)

2
samples/event/chessboard.h
View file

@ -45,7 +45,7 @@ public:
void SetFileTo(char file) { m_fileTo = file; }
void SetRankTo(wxUint8 rank) { m_rankTo = rank; }
virtual wxEvent* Clone() const wxOVERRIDE { return new ChessBoardEvent(*this); }
virtual wxEvent* Clone() const override { return new ChessBoardEvent(*this); }
private:
char m_file;
wxUint8 m_rank;

4
samples/event/event.cpp
View file

@ -65,7 +65,7 @@ public:
// this one is called on application startup and is a good place for the app
// initialization (doing it here and not in the ctor allows to have an error
// return: if OnInit() returns false, the application terminates)
virtual bool OnInit() wxOVERRIDE;
virtual bool OnInit() override;
// these are regular event handlers used to highlight the events handling
// order
@ -74,7 +74,7 @@ public:
// we override wxAppConsole::FilterEvent used to highlight the events
// handling order
virtual int FilterEvent(wxEvent& event) wxOVERRIDE;
virtual int FilterEvent(wxEvent& event) override;
private:
wxDECLARE_EVENT_TABLE();

18
samples/except/except.cpp
View file

@ -82,11 +82,11 @@ public:
// ----------------------------
// program startup
virtual bool OnInit() wxOVERRIDE;
virtual bool OnInit() override;
// 2nd-level exception handling: we get all the exceptions occurring in any
// event handler here
virtual bool OnExceptionInMainLoop() wxOVERRIDE;
virtual bool OnExceptionInMainLoop() override;
// 2nd-level exception handling helpers: if we can't deal with the
// exception immediately, we may also store it and rethrow it later, when
@ -95,16 +95,16 @@ public:
// Notice that overriding these methods is not necessary when using C++11
// as they have a perfectly serviceable implementation inside the library
// itself in this case.
virtual bool StoreCurrentException() wxOVERRIDE;
virtual void RethrowStoredException() wxOVERRIDE;
virtual bool StoreCurrentException() override;
virtual void RethrowStoredException() override;
// 3rd, and final, level exception handling: whenever an unhandled
// exception is caught, this function is called
virtual void OnUnhandledException() wxOVERRIDE;
virtual void OnUnhandledException() override;
// and now for something different: this function is called in case of a
// crash (e.g. dereferencing null pointer, division by 0, ...)
virtual void OnFatalException() wxOVERRIDE;
virtual void OnFatalException() override;
// you can override this function to do something different (e.g. log the
// assert to file) whenever an assertion fails
@ -112,7 +112,7 @@ public:
int line,
const wxChar *func,
const wxChar *cond,
const wxChar *msg) wxOVERRIDE;
const wxChar *msg) override;
private:
// This stores the number of times StoreCurrentException() was called,
@ -148,7 +148,7 @@ protected:
// 1st-level exception handling: we overload ProcessEvent() to be able to
// catch exceptions which occur in MyFrame methods here
virtual bool ProcessEvent(wxEvent& event) wxOVERRIDE;
virtual bool ProcessEvent(wxEvent& event) override;
// provoke assert in main or worker thread
//
@ -580,7 +580,7 @@ void MyFrame::OnShowAssertInThread(wxCommandEvent& WXUNUSED(event))
}
protected:
virtual void *Entry() wxOVERRIDE
virtual void *Entry() override
{
wxFAIL_MSG("Test assert in another thread.");

8
samples/exec/exec.cpp
View file

@ -81,7 +81,7 @@ public:
// this one is called on application startup and is a good place for the app
// initialization (doing it here and not in the ctor allows to have an error
// return: if OnInit() returns false, the application terminates)
virtual bool OnInit() wxOVERRIDE;
virtual bool OnInit() override;
};
// Define an array of process pointers used by MyFrame
@ -261,7 +261,7 @@ public:
// instead of overriding this virtual function we might as well process the
// event from it in the frame class - this might be more convenient in some
// cases
virtual void OnTerminate(int pid, int status) wxOVERRIDE;
virtual void OnTerminate(int pid, int status) override;
protected:
MyFrame *m_parent;
@ -278,7 +278,7 @@ public:
Redirect();
}
virtual void OnTerminate(int pid, int status) wxOVERRIDE;
virtual void OnTerminate(int pid, int status) override;
virtual bool HasInput();
};
@ -293,7 +293,7 @@ public:
{
}
virtual bool HasInput() wxOVERRIDE;
virtual bool HasInput() override;
private:
wxString m_input;

8
samples/font/font.cpp
View file

@ -61,7 +61,7 @@ public:
// this one is called on application startup and is a good place for the app
// initialization (doing it here and not in the ctor allows to have an error
// return: if OnInit() returns false, the application terminates)
virtual bool OnInit() wxOVERRIDE;
virtual bool OnInit() override;
};
// FontPanel contains controls allowing to specify the font properties
@ -152,7 +152,7 @@ public:
void OnPaint( wxPaintEvent &event );
protected:
virtual wxSize DoGetBestClientSize() const wxOVERRIDE
virtual wxSize DoGetBestClientSize() const override
{
return wxSize(80*GetCharWidth(), 15*GetCharHeight());
}
@ -575,7 +575,7 @@ public:
protected:
virtual bool OnFontEncoding(const wxString& facename,
const wxString& encoding) wxOVERRIDE
const wxString& encoding) override
{
wxString text;
text.Printf("Encoding %u: %s (available in facename '%s')\n",
@ -611,7 +611,7 @@ public:
{ return m_facenames; }
protected:
virtual bool OnFacename(const wxString& facename) wxOVERRIDE
virtual bool OnFacename(const wxString& facename) override
{
m_facenames.Add(facename);
return true;

8
samples/fswatcher/fswatcher.cpp
View file

@ -70,7 +70,7 @@ class MyApp : public wxApp
{
public:
// 'Main program' equivalent: the program execution "starts" here
virtual bool OnInit() wxOVERRIDE
virtual bool OnInit() override
{
if ( !wxApp::OnInit() )
return false;
@ -86,7 +86,7 @@ public:
}
// create the file system watcher here, because it needs an active loop
virtual void OnEventLoopEnter(wxEventLoopBase* WXUNUSED(loop)) wxOVERRIDE
virtual void OnEventLoopEnter(wxEventLoopBase* WXUNUSED(loop)) override
{
if ( m_frame->CreateWatcherIfNecessary() )
{
@ -95,7 +95,7 @@ public:
}
}
virtual void OnInitCmdLine(wxCmdLineParser& parser) wxOVERRIDE
virtual void OnInitCmdLine(wxCmdLineParser& parser) override
{
wxApp::OnInitCmdLine(parser);
parser.AddParam("directory to watch",
@ -103,7 +103,7 @@ public:
wxCMD_LINE_PARAM_OPTIONAL);
}
virtual bool OnCmdLineParsed(wxCmdLineParser& parser) wxOVERRIDE
virtual bool OnCmdLineParsed(wxCmdLineParser& parser) override
{
if ( !wxApp::OnCmdLineParsed(parser) )
return false;

32
samples/grid/griddemo.cpp
View file

@ -56,7 +56,7 @@ public:
const wxRect& rect,
int horizAlign,
int vertAlign,
int WXUNUSED(textOrientation)) const wxOVERRIDE
int WXUNUSED(textOrientation)) const override
{
dc.SetTextForeground(m_colFg);
dc.SetFont(wxITALIC_FONT->Bold());
@ -65,7 +65,7 @@ public:
virtual void DrawBorder(const wxGrid& WXUNUSED(grid),
wxDC& dc,
wxRect& rect) const wxOVERRIDE
wxRect& rect) const override
{
dc.SetPen(*wxTRANSPARENT_PEN);
dc.SetBrush(wxBrush(m_colBg));
@ -96,7 +96,7 @@ public:
void UseCustomColHeaders(bool use = true) { m_useCustom = use; }
protected:
virtual const wxGridColumnHeaderRenderer& GetColumnHeaderRenderer(int col) wxOVERRIDE
virtual const wxGridColumnHeaderRenderer& GetColumnHeaderRenderer(int col) override
{
// if enabled, use custom renderers
if ( m_useCustom )
@ -158,7 +158,7 @@ public:
wxDC& dc,
const wxRect& rect,
int row, int col,
bool isSelected) wxOVERRIDE
bool isSelected) override
{
wxGridCellRenderer::Draw(grid, attr, dc, rect, row, col, isSelected);
@ -172,13 +172,13 @@ public:
wxGridCellAttr& attr,
wxDC& dc,
int WXUNUSED(row),
int WXUNUSED(col)) wxOVERRIDE
int WXUNUSED(col)) override
{
dc.SetFont(attr.GetFont());
return dc.GetTextExtent(GetStarString(MAX_STARS));
}
virtual wxGridCellRenderer *Clone() const wxOVERRIDE
virtual wxGridCellRenderer *Clone() const override
{
return new MyGridStarRenderer();
}
@ -190,7 +190,7 @@ class MyGridStarEditor : public wxGridCellActivatableEditor
public:
virtual wxGridActivationResult
TryActivate(int row, int col, wxGrid* grid,
const wxGridActivationSource& actSource) wxOVERRIDE
const wxGridActivationSource& actSource) override
{
int numStars = -1;
@ -235,12 +235,12 @@ public:
return wxGridActivationResult::DoChange(m_value);
}
virtual void DoActivate(int row, int col, wxGrid* grid) wxOVERRIDE
virtual void DoActivate(int row, int col, wxGrid* grid) override
{
grid->SetCellValue(row, col, m_value);
}
virtual wxGridCellEditor *Clone() const wxOVERRIDE
virtual wxGridCellEditor *Clone() const override
{
return new MyGridStarEditor();
}
@ -2305,10 +2305,10 @@ public:
TabularGridTable() { m_sortOrder = NULL; }
virtual int GetNumberRows() wxOVERRIDE { return ROW_MAX; }
virtual int GetNumberCols() wxOVERRIDE { return COL_MAX; }
virtual int GetNumberRows() override { return ROW_MAX; }
virtual int GetNumberCols() override { return COL_MAX; }
virtual wxString GetValue(int row, int col) wxOVERRIDE
virtual wxString GetValue(int row, int col) override
{
if ( m_sortOrder )
row = m_sortOrder[row];
@ -2333,12 +2333,12 @@ public:
return wxString();
}
virtual void SetValue(int, int, const wxString&) wxOVERRIDE
virtual void SetValue(int, int, const wxString&) override
{
wxFAIL_MSG( "shouldn't be called" );
}
virtual wxString GetColLabelValue(int col) wxOVERRIDE
virtual wxString GetColLabelValue(int col) override
{
// notice that column parameter here always refers to the internal
// column index, independently of its position on the screen
@ -2348,7 +2348,7 @@ public:
return labels[col];
}
virtual void SetColLabelValue(int, const wxString&) wxOVERRIDE
virtual void SetColLabelValue(int, const wxString&) override
{
wxFAIL_MSG( "shouldn't be called" );
}
@ -2425,7 +2425,7 @@ public:
}
protected:
virtual wxSize DoGetBestSize() const wxOVERRIDE
virtual wxSize DoGetBestSize() const override
{
wxSize size = wxTextCtrl::DoGetBestSize();
size.x = 3*GetCharWidth();

42
samples/grid/griddemo.h
View file

@ -16,7 +16,7 @@ class wxGrid;
class GridApp : public wxApp
{
public:
bool OnInit() wxOVERRIDE;
bool OnInit() override;
};
@ -261,7 +261,7 @@ public:
wxDC& dc,
const wxRect& rect,
int row, int col,
bool isSelected) wxOVERRIDE;
bool isSelected) override;
};
// ----------------------------------------------------------------------------
@ -274,15 +274,15 @@ class BigGridTable : public wxGridTableBase
public:
BigGridTable(long sizeGrid) { m_sizeGrid = sizeGrid; }
int GetNumberRows() wxOVERRIDE { return m_sizeGrid; }
int GetNumberCols() wxOVERRIDE { return m_sizeGrid; }
wxString GetValue( int row, int col ) wxOVERRIDE
int GetNumberRows() override { return m_sizeGrid; }
int GetNumberCols() override { return m_sizeGrid; }
wxString GetValue( int row, int col ) override
{
return wxString::Format("(%d, %d)", row, col);
}
void SetValue( int , int , const wxString& ) wxOVERRIDE { /* ignore */ }
bool IsEmptyCell( int , int ) wxOVERRIDE { return false; }
void SetValue( int , int , const wxString& ) override { /* ignore */ }
bool IsEmptyCell( int , int ) override { return false; }
private:
long m_sizeGrid;
@ -308,7 +308,7 @@ public:
MyGridCellAttrProvider();
virtual wxGridCellAttr *GetAttr(int row, int col,
wxGridCellAttr::wxAttrKind kind) const wxOVERRIDE;
wxGridCellAttr::wxAttrKind kind) const override;
private:
wxGridCellAttrPtr m_attrForOddRows;
@ -323,23 +323,23 @@ class BugsGridTable : public wxGridTableBase
public:
BugsGridTable() { }
virtual int GetNumberRows() wxOVERRIDE;
virtual int GetNumberCols() wxOVERRIDE;
virtual bool IsEmptyCell( int row, int col ) wxOVERRIDE;
virtual wxString GetValue( int row, int col ) wxOVERRIDE;
virtual void SetValue( int row, int col, const wxString& value ) wxOVERRIDE;
virtual int GetNumberRows() override;
virtual int GetNumberCols() override;
virtual bool IsEmptyCell( int row, int col ) override;
virtual wxString GetValue( int row, int col ) override;
virtual void SetValue( int row, int col, const wxString& value ) override;
virtual wxString GetColLabelValue( int col ) wxOVERRIDE;
virtual wxString GetColLabelValue( int col ) override;
virtual wxString GetTypeName( int row, int col ) wxOVERRIDE;
virtual bool CanGetValueAs( int row, int col, const wxString& typeName ) wxOVERRIDE;
virtual bool CanSetValueAs( int row, int col, const wxString& typeName ) wxOVERRIDE;
virtual wxString GetTypeName( int row, int col ) override;
virtual bool CanGetValueAs( int row, int col, const wxString& typeName ) override;
virtual bool CanSetValueAs( int row, int col, const wxString& typeName ) override;
virtual long GetValueAsLong( int row, int col ) wxOVERRIDE;
virtual bool GetValueAsBool( int row, int col ) wxOVERRIDE;
virtual long GetValueAsLong( int row, int col ) override;
virtual bool GetValueAsBool( int row, int col ) override;
virtual void SetValueAsLong( int row, int col, long value ) wxOVERRIDE;
virtual void SetValueAsBool( int row, int col, bool value ) wxOVERRIDE;
virtual void SetValueAsLong( int row, int col, long value ) override;
virtual void SetValueAsBool( int row, int col, bool value ) override;
};
class BugsGridFrame : public wxFrame

4
samples/help/demo.cpp
View file

@ -92,10 +92,10 @@ public:
// this one is called on application startup and is a good place for the app
// initialization (doing it here and not in the ctor allows to have an error
// return: if OnInit() returns false, the application terminates)
virtual bool OnInit() wxOVERRIDE;
virtual bool OnInit() override;
// do some clean up here
virtual int OnExit() wxOVERRIDE;
virtual int OnExit() override;
};
// Define a new frame type: this is going to be our main frame

8
samples/htlbox/htlbox.cpp
View file

@ -68,11 +68,11 @@ public:
protected:
// override this method to return data to be shown in the listbox (this is
// mandatory)
virtual wxString OnGetItem(size_t n) const wxOVERRIDE;
virtual wxString OnGetItem(size_t n) const override;
// change the appearance by overriding these functions (this is optional)
virtual void OnDrawSeparator(wxDC& dc, wxRect& rect, size_t n) const wxOVERRIDE;
virtual wxColour GetSelectedTextColour(const wxColour& colFg) const wxOVERRIDE;
virtual void OnDrawSeparator(wxDC& dc, wxRect& rect, size_t n) const override;
virtual wxColour GetSelectedTextColour(const wxColour& colFg) const override;
// flag telling us whether we should use fg colour even for the selected
// item
@ -149,7 +149,7 @@ private:
class MyApp : public wxApp
{
public:
virtual bool OnInit() wxOVERRIDE { (new MyFrame())->Show(); return true; }
virtual bool OnInit() override { (new MyFrame())->Show(); return true; }
};
// ----------------------------------------------------------------------------

2
samples/html/about/about.cpp
View file

@ -43,7 +43,7 @@ public:
// this one is called on application startup and is a good place for the app
// initialization (doing it here and not in the ctor allows to have an error
// return: if OnInit() returns false, the application terminates)
virtual bool OnInit() wxOVERRIDE;
virtual bool OnInit() override;
};
// Define a new frame type: this is going to be our main frame

2
samples/html/help/help.cpp
View file

@ -44,7 +44,7 @@ public:
// this one is called on application startup and is a good place for the app
// initialization (doing it here and not in the ctor allows to have an error
// return: if OnInit() returns false, the application terminates)
virtual bool OnInit() wxOVERRIDE;
virtual bool OnInit() override;
};

4
samples/html/helpview/helpview.cpp
View file

@ -43,8 +43,8 @@ public:
// initialization (doing it here and not in the ctor allows to have an error
// return: if OnInit() returns false, the application terminates)
virtual bool OnInit() wxOVERRIDE;
virtual int OnExit() wxOVERRIDE;
virtual bool OnInit() override;
virtual int OnExit() override;
private:
wxHtmlHelpController *help;

2
samples/html/printing/printing.cpp
View file

@ -41,7 +41,7 @@ public:
// initialization (doing it here and not in the ctor allows to have an error
// return: if OnInit() returns false, the application terminates)
virtual bool OnInit() wxOVERRIDE;
virtual bool OnInit() override;
};
// Define a new frame type: this is going to be our main frame

6
samples/html/test/test.cpp
View file

@ -38,7 +38,7 @@
class MyApp : public wxApp
{
public:
virtual bool OnInit() wxOVERRIDE;
virtual bool OnInit() override;
};
// Define a new html window type: this is a wrapper for handling wxHtmlWindow events
@ -53,7 +53,7 @@ public:
virtual wxHtmlOpeningStatus OnOpeningURL(wxHtmlURLType WXUNUSED(type),
const wxString& WXUNUSED(url),
wxString *WXUNUSED(redirect)) const wxOVERRIDE;
wxString *WXUNUSED(redirect)) const override;
// toggle drawing of custom background
void DrawCustomBg(bool draw)
@ -107,7 +107,7 @@ private:
class BoldProcessor : public wxHtmlProcessor
{
public:
virtual wxString Process(const wxString& s) const wxOVERRIDE
virtual wxString Process(const wxString& s) const override
{
wxString r(s);
r.Replace("<b>", wxEmptyString);

6
samples/html/virtual/virtual.cpp
View file

@ -39,8 +39,8 @@ class MyVFS : public wxFileSystemHandler
public:
MyVFS() : wxFileSystemHandler() {}
wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location) wxOVERRIDE;
bool CanOpen(const wxString& location) wxOVERRIDE;
wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location) override;
bool CanOpen(const wxString& location) override;
};
bool MyVFS::CanOpen(const wxString& location)
@ -91,7 +91,7 @@ public:
// this one is called on application startup and is a good place for the app
// initialization (doing it here and not in the ctor allows to have an error
// return: if OnInit() returns false, the application terminates)
virtual bool OnInit() wxOVERRIDE;
virtual bool OnInit() override;
};
// Define a new frame type: this is going to be our main frame

2
samples/html/widget/widget.cpp
View file

@ -84,7 +84,7 @@ public:
// this one is called on application startup and is a good place for the app
// initialization (doing it here and not in the ctor allows to have an error
// return: if OnInit() returns false, the application terminates)
virtual bool OnInit() wxOVERRIDE;
virtual bool OnInit() override;
};
// Define a new frame type: this is going to be our main frame

2
samples/html/zip/zip.cpp
View file

@ -40,7 +40,7 @@ public:
// this one is called on application startup and is a good place for the app
// initialization (doing it here and not in the ctor allows to have an error
// return: if OnInit() returns false, the application terminates)
virtual bool OnInit() wxOVERRIDE;
virtual bool OnInit() override;
};
// Define a new frame type: this is going to be our main frame

2
samples/image/image.cpp
View file

@ -63,7 +63,7 @@
class MyApp: public wxApp
{
public:
virtual bool OnInit() wxOVERRIDE;
virtual bool OnInit() override;
};
// ----------------------------------------------------------------------------

6
samples/internat/internat.cpp
View file

@ -61,9 +61,9 @@ class MyApp: public wxApp
public:
MyApp() { m_setLocale = Locale_Ask; }
virtual void OnInitCmdLine(wxCmdLineParser& parser) wxOVERRIDE;
virtual bool OnCmdLineParsed(wxCmdLineParser& parser) wxOVERRIDE;
virtual bool OnInit() wxOVERRIDE;
virtual void OnInitCmdLine(wxCmdLineParser& parser) override;
virtual bool OnCmdLineParsed(wxCmdLineParser& parser) override;
virtual bool OnInit() override;
protected:
// Specifies whether we should use the current locale or not. By default we

18
samples/ipc/baseclient.cpp
View file

@ -46,8 +46,8 @@ class MyApp : public wxApp
public:
MyApp() { Bind(wxEVT_IDLE, &MyApp::OnIdle, this); }
virtual bool OnInit() wxOVERRIDE;
virtual int OnExit() wxOVERRIDE;
virtual bool OnInit() override;
virtual int OnExit() override;
private:
void OnIdle(wxIdleEvent& event);
@ -58,11 +58,11 @@ private:
class MyConnection : public MyConnectionBase
{
public:
virtual bool DoExecute(const void *data, size_t size, wxIPCFormat format) wxOVERRIDE;
virtual const void *Request(const wxString& item, size_t *size = NULL, wxIPCFormat format = wxIPC_TEXT) wxOVERRIDE;
virtual bool DoPoke(const wxString& item, const void* data, size_t size, wxIPCFormat format) wxOVERRIDE;
virtual bool OnAdvise(const wxString& topic, const wxString& item, const void *data, size_t size, wxIPCFormat format) wxOVERRIDE;
virtual bool OnDisconnect() wxOVERRIDE;
virtual bool DoExecute(const void *data, size_t size, wxIPCFormat format) override;
virtual const void *Request(const wxString& item, size_t *size = NULL, wxIPCFormat format = wxIPC_TEXT) override;
virtual bool DoPoke(const wxString& item, const void* data, size_t size, wxIPCFormat format) override;
virtual bool OnAdvise(const wxString& topic, const wxString& item, const void *data, size_t size, wxIPCFormat format) override;
virtual bool OnDisconnect() override;
};
class MyClient : public wxClient,
@ -74,10 +74,10 @@ public:
bool Connect(const wxString& sHost, const wxString& sService, const wxString& sTopic);
void Disconnect();
wxConnectionBase *OnMakeConnection() wxOVERRIDE;
wxConnectionBase *OnMakeConnection() override;
bool IsConnected() { return m_connection != NULL; }
virtual void Notify() wxOVERRIDE;
virtual void Notify() override;
void StartNextTestIfNecessary();

28
samples/ipc/baseserver.cpp
View file

@ -42,28 +42,28 @@
class MyConnection : public MyConnectionBase, public wxTimer
{
public:
virtual bool Disconnect() wxOVERRIDE { return wxConnection::Disconnect(); }
virtual bool Disconnect() override { return wxConnection::Disconnect(); }
virtual bool OnExecute(const wxString& topic,
const void *data,
size_t size,
wxIPCFormat format) wxOVERRIDE;
wxIPCFormat format) override;
virtual const void *OnRequest(const wxString& topic,
const wxString& item,
size_t *size,
wxIPCFormat format) wxOVERRIDE;
wxIPCFormat format) override;
virtual bool OnPoke(const wxString& topic,
const wxString& item,
const void *data,
size_t size,
wxIPCFormat format) wxOVERRIDE;
virtual bool OnStartAdvise(const wxString& topic, const wxString& item) wxOVERRIDE;
virtual bool OnStopAdvise(const wxString& topic, const wxString& item) wxOVERRIDE;
wxIPCFormat format) override;
virtual bool OnStartAdvise(const wxString& topic, const wxString& item) override;
virtual bool OnStopAdvise(const wxString& topic, const wxString& item) override;
virtual bool DoAdvise(const wxString& item,
const void *data,
size_t size,
wxIPCFormat format) wxOVERRIDE;
virtual bool OnDisconnect() wxOVERRIDE;
virtual void Notify() wxOVERRIDE;
wxIPCFormat format) override;
virtual bool OnDisconnect() override;
virtual void Notify() override;
private:
wxString m_sAdvise;
@ -83,9 +83,9 @@ public:
const wxString& item,
const void *data,
size_t size,
wxIPCFormat format) wxOVERRIDE;
virtual bool OnStartAdvise(const wxString& topic, const wxString& item) wxOVERRIDE;
virtual bool OnStopAdvise(const wxString& topic, const wxString& item) wxOVERRIDE;
wxIPCFormat format) override;
virtual bool OnStartAdvise(const wxString& topic, const wxString& item) override;
virtual bool OnStopAdvise(const wxString& topic, const wxString& item) override;
private:
// return true if this is the supported topic+item combination, log an
@ -112,7 +112,7 @@ public:
void Disconnect();
bool IsConnected() { return m_connection != NULL; }
virtual wxConnectionBase *OnAcceptConnection(const wxString& topic) wxOVERRIDE;
virtual wxConnectionBase *OnAcceptConnection(const wxString& topic) override;
private:
wxConnection *m_connection;
@ -122,7 +122,7 @@ private:
class MyApp : public wxApp
{
public:
virtual bool OnInit() wxOVERRIDE;
virtual bool OnInit() override;
protected:
MyServer m_server;

16
samples/ipc/client.h
View file

@ -29,8 +29,8 @@ class MyFrame;
class MyApp: public wxApp
{
public:
virtual bool OnInit() wxOVERRIDE;
virtual int OnExit() wxOVERRIDE;
virtual bool OnInit() override;
virtual int OnExit() override;
MyFrame *GetFrame() { return m_frame; }
protected:
@ -81,11 +81,11 @@ protected:
class MyConnection : public MyConnectionBase
{
public:
virtual bool DoExecute(const void *data, size_t size, wxIPCFormat format) wxOVERRIDE;
virtual const void *Request(const wxString& item, size_t *size = NULL, wxIPCFormat format = wxIPC_TEXT) wxOVERRIDE;
virtual bool DoPoke(const wxString& item, const void* data, size_t size, wxIPCFormat format) wxOVERRIDE;
virtual bool OnAdvise(const wxString& topic, const wxString& item, const void *data, size_t size, wxIPCFormat format) wxOVERRIDE;
virtual bool OnDisconnect() wxOVERRIDE;
virtual bool DoExecute(const void *data, size_t size, wxIPCFormat format) override;
virtual const void *Request(const wxString& item, size_t *size = NULL, wxIPCFormat format = wxIPC_TEXT) override;
virtual bool DoPoke(const wxString& item, const void* data, size_t size, wxIPCFormat format) override;
virtual bool OnAdvise(const wxString& topic, const wxString& item, const void *data, size_t size, wxIPCFormat format) override;
virtual bool OnDisconnect() override;
};
class MyClient: public wxClient
@ -95,7 +95,7 @@ public:
~MyClient();
bool Connect(const wxString& sHost, const wxString& sService, const wxString& sTopic);
void Disconnect();
wxConnectionBase *OnMakeConnection() wxOVERRIDE;
wxConnectionBase *OnMakeConnection() override;
bool IsConnected() { return m_connection != NULL; }
MyConnection *GetConnection() { return m_connection; }

18
samples/ipc/server.h
View file

@ -25,7 +25,7 @@ class MyFrame;
class MyApp : public wxApp
{
public:
virtual bool OnInit() wxOVERRIDE;
virtual bool OnInit() override;
MyFrame *GetFrame() { return m_frame; }
protected:
@ -65,13 +65,13 @@ protected:
class MyConnection : public MyConnectionBase
{
public:
virtual bool OnExecute(const wxString& topic, const void *data, size_t size, wxIPCFormat format) wxOVERRIDE;
virtual const void *OnRequest(const wxString& topic, const wxString& item, size_t *size, wxIPCFormat format) wxOVERRIDE;
virtual bool OnPoke(const wxString& topic, const wxString& item, const void *data, size_t size, wxIPCFormat format) wxOVERRIDE;
virtual bool OnStartAdvise(const wxString& topic, const wxString& item) wxOVERRIDE;
virtual bool OnStopAdvise(const wxString& topic, const wxString& item) wxOVERRIDE;
virtual bool DoAdvise(const wxString& item, const void *data, size_t size, wxIPCFormat format) wxOVERRIDE;
virtual bool OnDisconnect() wxOVERRIDE;
virtual bool OnExecute(const wxString& topic, const void *data, size_t size, wxIPCFormat format) override;
virtual const void *OnRequest(const wxString& topic, const wxString& item, size_t *size, wxIPCFormat format) override;
virtual bool OnPoke(const wxString& topic, const wxString& item, const void *data, size_t size, wxIPCFormat format) override;
virtual bool OnStartAdvise(const wxString& topic, const wxString& item) override;
virtual bool OnStopAdvise(const wxString& topic, const wxString& item) override;
virtual bool DoAdvise(const wxString& item, const void *data, size_t size, wxIPCFormat format) override;
virtual bool OnDisconnect() override;
// topic for which we advise the client or empty if none
wxString m_advise;
@ -95,7 +95,7 @@ public:
void Advise();
bool CanAdvise() { return m_connection && !m_connection->m_advise.empty(); }
virtual wxConnectionBase *OnAcceptConnection(const wxString& topic) wxOVERRIDE;
virtual wxConnectionBase *OnAcceptConnection(const wxString& topic) override;
protected:
MyConnection *m_connection;

2
samples/joytest/joytest.h
View file

@ -12,7 +12,7 @@
class MyApp: public wxApp
{
public:
bool OnInit() wxOVERRIDE;
bool OnInit() override;
// Joystick max values
int m_minX;

2
samples/keyboard/keyboard.cpp
View file

@ -145,7 +145,7 @@ class MyApp : public wxApp
{
public:
// 'Main program' equivalent: the program execution "starts" here
virtual bool OnInit() wxOVERRIDE
virtual bool OnInit() override
{
// create the main application window
new MyFrame("Keyboard wxWidgets App");

2
samples/layout/layout.h
View file

@ -13,7 +13,7 @@ class MyApp: public wxApp
{
public:
MyApp(){}
bool OnInit() wxOVERRIDE;
bool OnInit() override;
};
// the main frame class

14
samples/listctrl/listtest.h
View file

@ -22,7 +22,7 @@ class MyApp: public wxApp
public:
MyApp() { }
virtual bool OnInit() wxOVERRIDE;
virtual bool OnInit() override;
private:
wxDECLARE_NO_COPY_CLASS(MyApp);
@ -74,8 +74,8 @@ public:
void OnRightClick(wxMouseEvent& event);
virtual void CheckItem(long item, bool check) wxOVERRIDE;
virtual bool IsItemChecked(long item) const wxOVERRIDE;
virtual void CheckItem(long item, bool check) override;
virtual bool IsItemChecked(long item) const override;
private:
void ShowContextMenu(const wxPoint& pos, long item);
@ -84,10 +84,10 @@ private:
void LogEvent(const wxListEvent& event, const wxString& eventName);
void LogColEvent(const wxListEvent& event, const wxString& eventName);
virtual wxString OnGetItemText(long item, long column) const wxOVERRIDE;
virtual bool OnGetItemIsChecked(long item) const wxOVERRIDE;
virtual int OnGetItemColumnImage(long item, long column) const wxOVERRIDE;
virtual wxItemAttr *OnGetItemAttr(long item) const wxOVERRIDE;
virtual wxString OnGetItemText(long item, long column) const override;
virtual bool OnGetItemIsChecked(long item) const override;
virtual int OnGetItemColumnImage(long item, long column) const override;
virtual wxItemAttr *OnGetItemAttr(long item) const override;
long m_updated;

4
samples/mdi/mdi.h
View file

@ -14,7 +14,7 @@
class MyApp : public wxApp
{
public:
virtual bool OnInit() wxOVERRIDE;
virtual bool OnInit() override;
};
// Helper class logging menu open/close events.
@ -62,7 +62,7 @@ class MyCanvas : public wxScrolledWindow,
{
public:
MyCanvas(wxFrame *parent, const wxPoint& pos, const wxSize& size);
virtual void OnDraw(wxDC& dc) wxOVERRIDE;
virtual void OnDraw(wxDC& dc) override;
bool IsDirty() const { return m_dirty; }

12
samples/mediaplayer/mediaplayer.cpp
View file

@ -138,18 +138,18 @@ class wxMediaPlayerApp : public wxApp
{
public:
#ifdef __WXMAC__
virtual void MacOpenFiles(const wxArrayString & fileNames ) wxOVERRIDE;
virtual void MacOpenFiles(const wxArrayString & fileNames ) override;
#endif
#if wxUSE_CMDLINE_PARSER
virtual void OnInitCmdLine(wxCmdLineParser& parser) wxOVERRIDE;
virtual bool OnCmdLineParsed(wxCmdLineParser& parser) wxOVERRIDE;
virtual void OnInitCmdLine(wxCmdLineParser& parser) override;
virtual bool OnCmdLineParsed(wxCmdLineParser& parser) override;
// Files specified on the command line, if any.
wxVector<wxString> m_params;
#endif // wxUSE_CMDLINE_PARSER
virtual bool OnInit() wxOVERRIDE;
virtual bool OnInit() override;
protected:
class wxMediaPlayerFrame* m_frame;
@ -282,7 +282,7 @@ public:
wxMediaPlayerTimer(wxMediaPlayerFrame* frame) {m_frame = frame;}
// Called each time the timer's timeout expires
void Notify() wxOVERRIDE;
void Notify() override;
wxMediaPlayerFrame* m_frame; // The wxMediaPlayerFrame
};
@ -348,7 +348,7 @@ public:
wxPlayListDropTarget(wxMediaPlayerListCtrl& list) : m_list(list) {}
~wxPlayListDropTarget(){}
virtual bool OnDropFiles(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y),
const wxArrayString& files) wxOVERRIDE
const wxArrayString& files) override
{
for (size_t i = 0; i < files.GetCount(); ++i)
{

2
samples/memcheck/memcheck.cpp
View file

@ -35,7 +35,7 @@
// Define a new application type
class MyApp: public wxApp
{ public:
bool OnInit(void) wxOVERRIDE;
bool OnInit(void) override;
};
// Define a new frame type

2
samples/menu/menu.cpp
View file

@ -69,7 +69,7 @@
class MyApp: public wxApp
{
public:
bool OnInit() wxOVERRIDE;
bool OnInit() override;
};
// Define a new frame

2
samples/mfc/mfctest.cpp
View file

@ -89,7 +89,7 @@ SampleMFCWinApp theApp;
class MyApp: public wxAppWithMFC
{
public:
virtual bool OnInit() wxOVERRIDE;
virtual bool OnInit() override;
wxFrame *CreateFrame();
};

2
samples/mfc/mfctest.h
View file

@ -36,7 +36,7 @@ private:
class SampleMFCWinApp : public wxMFCWinApp
{
protected:
BOOL InitMainWnd() wxOVERRIDE
BOOL InitMainWnd() override
{
// Demonstrate creation of an initial MFC main window.
m_pMainWnd = new CMainWindow();

2
samples/minimal/minimal.cpp
View file

@ -50,7 +50,7 @@ public:
// this one is called on application startup and is a good place for the app
// initialization (doing it here and not in the ctor allows to have an error
// return: if OnInit() returns false, the application terminates)
virtual bool OnInit() wxOVERRIDE;
virtual bool OnInit() override;
};
// Define a new frame type: this is going to be our main frame

2
samples/nativdlg/nativdlg.h
View file

@ -13,7 +13,7 @@ class MyApp : public wxApp
{
public:
MyApp(void) {}
bool OnInit(void) wxOVERRIDE;
bool OnInit(void) override;
};
class MyFrame : public wxFrame

2
samples/notebook/notebook.h
View file

@ -26,7 +26,7 @@
class MyApp : public wxApp
{
public:
bool OnInit() wxOVERRIDE;
bool OnInit() override;
};
wxDECLARE_APP(MyApp);

2
samples/oleauto/oleauto.cpp
View file

@ -54,7 +54,7 @@ public:
// this one is called on application startup and is a good place for the app
// initialization (doing it here and not in the ctor allows to have an error
// return: if OnInit() returns false, the application terminates)
virtual bool OnInit() wxOVERRIDE;
virtual bool OnInit() override;
};
// Define a new frame type: this is going to be our main frame

4
samples/opengl/cube/cube.h
View file

@ -38,8 +38,8 @@ public:
TestGLContext& GetContext(wxGLCanvas *canvas, bool useStereo);
// virtual wxApp methods
virtual bool OnInit() wxOVERRIDE;
virtual int OnExit() wxOVERRIDE;
virtual bool OnInit() override;
virtual int OnExit() override;
private:
// the GL context we use for all our mono rendering windows

6
samples/opengl/isosurf/isosurf.h
View file

@ -33,10 +33,10 @@
class MyApp : public wxApp
{
public:
virtual bool OnInit() wxOVERRIDE;
virtual bool OnInit() override;
virtual void OnInitCmdLine(wxCmdLineParser& parser) wxOVERRIDE;
virtual bool OnCmdLineParsed(wxCmdLineParser& parser) wxOVERRIDE;
virtual void OnInitCmdLine(wxCmdLineParser& parser) override;
virtual bool OnCmdLineParsed(wxCmdLineParser& parser) override;
};

2
samples/opengl/penguin/penguin.h
View file

@ -45,7 +45,7 @@ struct GLData
class MyApp : public wxApp
{
public:
virtual bool OnInit() wxOVERRIDE;
virtual bool OnInit() override;
};

2
samples/opengl/pyramid/pyramid.h
View file

@ -15,7 +15,7 @@ class MyApp: public wxApp
{
public:
MyApp(){}
bool OnInit() wxOVERRIDE;
bool OnInit() override;
};

2
samples/ownerdrw/ownerdrw.cpp
View file

@ -28,7 +28,7 @@
class OwnerDrawnApp: public wxApp
{
public:
bool OnInit() wxOVERRIDE;
bool OnInit() override;
};
// Define a new frame type

10
samples/popup/popup.cpp
View file

@ -66,10 +66,10 @@ public:
virtual ~SimpleTransientPopup();
// wxPopupTransientWindow virtual methods are all overridden to log them
virtual void Popup(wxWindow *focus = NULL) wxOVERRIDE;
virtual void OnDismiss() wxOVERRIDE;
virtual bool ProcessLeftDown(wxMouseEvent& event) wxOVERRIDE;
virtual bool Show( bool show = true ) wxOVERRIDE;
virtual void Popup(wxWindow *focus = NULL) override;
virtual void OnDismiss() override;
virtual bool ProcessLeftDown(wxMouseEvent& event) override;
virtual bool Show( bool show = true ) override;
private:
wxScrolledWindow *m_panel;
@ -293,7 +293,7 @@ private:
class MyApp : public wxApp
{
public:
virtual bool OnInit() wxOVERRIDE;
virtual bool OnInit() override;
MyFrame *m_frame;
};

2
samples/power/power.cpp
View file

@ -263,7 +263,7 @@ wxEND_EVENT_TABLE()
class MyApp : public wxApp
{
public:
virtual bool OnInit() wxOVERRIDE
virtual bool OnInit() override
{
new MyFrame;

18
samples/preferences/preferences.cpp
View file

@ -47,7 +47,7 @@ struct MySettings
class MyApp : public wxApp
{
public:
virtual bool OnInit() wxOVERRIDE;
virtual bool OnInit() override;
void ShowPreferencesEditor(wxWindow* parent);
void DismissPreferencesEditor();
@ -153,7 +153,7 @@ public:
this);
}
virtual bool TransferDataToWindow() wxOVERRIDE
virtual bool TransferDataToWindow() override
{
m_settingsCurrent = wxGetApp().GetSettings();
m_useMarkdown->SetValue(m_settingsCurrent.m_useMarkdown);
@ -161,7 +161,7 @@ public:
return true;
}
virtual bool TransferDataFromWindow() wxOVERRIDE
virtual bool TransferDataFromWindow() override
{
// Called on platforms with modal preferences dialog to save and apply
// the changes.
@ -208,7 +208,7 @@ class PrefsPageGeneral : public wxStockPreferencesPage
{
public:
PrefsPageGeneral() : wxStockPreferencesPage(Kind_General) {}
virtual wxWindow *CreateWindow(wxWindow *parent) wxOVERRIDE
virtual wxWindow *CreateWindow(wxWindow *parent) override
{ return new PrefsPageGeneralPanel(parent); }
};
@ -236,7 +236,7 @@ public:
}
}
virtual bool TransferDataToWindow() wxOVERRIDE
virtual bool TransferDataToWindow() override
{
// This is the place where you can initialize values, e.g. from wxConfig.
// For demonstration purposes, we just set hardcoded values.
@ -245,7 +245,7 @@ public:
return true;
}
virtual bool TransferDataFromWindow() wxOVERRIDE
virtual bool TransferDataFromWindow() override
{
// Called on platforms with modal preferences dialog to save and apply
// the changes.
@ -267,10 +267,10 @@ private:
class PrefsPageTopics : public wxPreferencesPage
{
public:
virtual wxString GetName() const wxOVERRIDE { return "Topics"; }
virtual wxBitmapBundle GetIcon() const wxOVERRIDE
virtual wxString GetName() const override { return "Topics"; }
virtual wxBitmapBundle GetIcon() const override
{ return wxArtProvider::GetBitmapBundle(wxART_HELP, wxART_TOOLBAR); }
virtual wxWindow *CreateWindow(wxWindow *parent) wxOVERRIDE
virtual wxWindow *CreateWindow(wxWindow *parent) override
{ return new PrefsPageTopicsPanel(parent); }
};

14
samples/printing/printing.h
View file

@ -14,8 +14,8 @@ class MyApp: public wxApp
public:
MyApp() {}
virtual bool OnInit() wxOVERRIDE;
virtual int OnExit() wxOVERRIDE;
virtual bool OnInit() override;
virtual int OnExit() override;
void Draw(wxDC& dc);
@ -76,7 +76,7 @@ public:
MyCanvas(wxFrame *frame, long style);
//void OnPaint(wxPaintEvent& evt);
virtual void OnDraw(wxDC& dc) wxOVERRIDE;
virtual void OnDraw(wxDC& dc) override;
private:
wxDECLARE_EVENT_TABLE();
@ -89,10 +89,10 @@ public:
MyPrintout(MyFrame* frame, const wxString &title = "My printout")
: wxPrintout(title) { m_frame=frame; }
virtual bool OnPrintPage(int page) wxOVERRIDE;
virtual bool HasPage(int page) wxOVERRIDE;
virtual bool OnBeginDocument(int startPage, int endPage) wxOVERRIDE;
virtual void GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, int *selPageTo) wxOVERRIDE;
virtual bool OnPrintPage(int page) override;
virtual bool HasPage(int page) override;
virtual bool OnBeginDocument(int startPage, int endPage) override;
virtual void GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, int *selPageTo) override;
void DrawPageOne();
void DrawPageTwo();

20
samples/propgrid/propgrid.cpp
View file

@ -86,11 +86,11 @@ public:
virtual wxPGWindowList CreateControls( wxPropertyGrid* propGrid,
wxPGProperty* property,
const wxPoint& pos,
const wxSize& sz ) const wxOVERRIDE;
const wxSize& sz ) const override;
virtual bool OnEvent( wxPropertyGrid* propGrid,
wxPGProperty* property,
wxWindow* ctrl,
wxEvent& event ) const wxOVERRIDE;
wxEvent& event ) const override;
};
wxIMPLEMENT_DYNAMIC_CLASS(wxSampleMultiButtonEditor, wxPGTextCtrlEditor);
@ -170,12 +170,12 @@ public:
{
}
virtual wxObject* Clone() const wxOVERRIDE
virtual wxObject* Clone() const override
{
return new wxInvalidWordValidator(m_invalidWord);
}
virtual bool Validate(wxWindow* WXUNUSED(parent)) wxOVERRIDE
virtual bool Validate(wxWindow* WXUNUSED(parent)) override
{
wxTextCtrl* tc = wxDynamicCast(GetWindow(), wxTextCtrl);
wxCHECK_MSG(tc, true, "validator window must be wxTextCtrl");
@ -314,7 +314,7 @@ public:
}
virtual bool DoShowDialog( wxPropertyGrid* WXUNUSED(propGrid),
wxPGProperty* WXUNUSED(property) ) wxOVERRIDE
wxPGProperty* WXUNUSED(property) ) override
{
wxString s = ::wxGetSingleChoice("Message",
"Caption",
@ -350,13 +350,13 @@ public:
}
// Set editor to have button
virtual const wxPGEditor* DoGetEditorClass() const wxOVERRIDE
virtual const wxPGEditor* DoGetEditorClass() const override
{
return wxPGEditor_TextCtrlAndButton;
}
// Set what happens on button click
virtual wxPGEditorDialogAdapter* GetEditorDialog() const wxOVERRIDE
virtual wxPGEditorDialogAdapter* GetEditorDialog() const override
{
return new wxSingleChoiceDialogAdapter(m_choices);
}
@ -1760,13 +1760,13 @@ public:
// Return false here to indicate unhandled events should be
// propagated to manager's parent, as normal.
virtual bool IsHandlingAllEvents() const wxOVERRIDE { return false; }
virtual bool IsHandlingAllEvents() const override { return false; }
protected:
virtual wxPGProperty* DoInsert( wxPGProperty* parent,
int index,
wxPGProperty* property ) wxOVERRIDE
wxPGProperty* property ) override
{
return wxPropertyGridPage::DoInsert(parent,index,property);
}
@ -3329,7 +3329,7 @@ struct PropertyGridPopup : wxPopupWindow
Fit();
}
void Fit() wxOVERRIDE
void Fit() override
{
::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() wxOVERRIDE; // Override to allow image loading.
virtual void OnSetValue() override; // Override to allow image loading.
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 bool IntToValue( wxVariant& variant, int number, int argFlags = 0 ) const override;
virtual bool OnEvent( wxPropertyGrid* propgrid, wxWindow* primary, wxEvent& event ) override;
virtual wxSize OnMeasureImage( int item ) const override;
virtual void OnCustomPaint( wxDC& dc,
const wxRect& rect, wxPGPaintData& paintdata ) wxOVERRIDE;
const wxRect& rect, wxPGPaintData& paintdata ) override;
void LoadThumbnails( size_t n );
@ -77,8 +77,8 @@ public:
virtual wxVariant ChildChanged( wxVariant& thisValue,
int childIndex,
wxVariant& childValue ) const wxOVERRIDE;
virtual void RefreshChildren() wxOVERRIDE;
wxVariant& childValue ) const override;
virtual void RefreshChildren() override;
protected:
};
@ -110,8 +110,8 @@ public:
virtual wxVariant ChildChanged( wxVariant& thisValue,
int childIndex,
wxVariant& childValue ) const wxOVERRIDE;
virtual void RefreshChildren() wxOVERRIDE;
wxVariant& childValue ) const override;
virtual void RefreshChildren() override;
protected:
};
@ -275,7 +275,7 @@ class cxApplication : public wxApp
{
public:
virtual bool OnInit() wxOVERRIDE;
virtual bool OnInit() override;
};
wxDECLARE_APP(cxApplication);

12
samples/propgrid/sampleprops.cpp
View file

@ -349,12 +349,12 @@ protected:
int m_precision;
// Mandatory overridden methods
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;
virtual wxString ArrayGet( size_t index ) override;
virtual size_t ArrayGetCount() override;
virtual bool ArrayInsert( const wxString& str, int index ) override;
virtual bool ArraySet( size_t index, const wxString& str ) override;
virtual void ArrayRemoveAt( int index ) override;
virtual void ArraySwap( size_t first, size_t second ) override;
private:
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxArrayDoubleEditorDialog);

32
samples/propgrid/sampleprops.h
View file

@ -26,21 +26,21 @@ public:
const wxFontData& value = wxFontData() );
virtual ~wxFontDataProperty ();
void OnSetValue() wxOVERRIDE;
void OnSetValue() override;
// 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 wxOVERRIDE;
virtual wxVariant DoGetValue() const override;
virtual wxVariant ChildChanged( wxVariant& thisValue,
int childIndex,
wxVariant& childValue ) const wxOVERRIDE;
virtual void RefreshChildren() wxOVERRIDE;
wxVariant& childValue ) const override;
virtual void RefreshChildren() override;
protected:
virtual bool DisplayEditorDialog(wxPropertyGrid* pg, wxVariant& value) wxOVERRIDE;
virtual bool DisplayEditorDialog(wxPropertyGrid* pg, wxVariant& value) override;
// Value must be stored as variant - otherwise it will be
// decreffed to oblivion on GetValue().
@ -60,8 +60,8 @@ public:
virtual wxVariant ChildChanged( wxVariant& thisValue,
int childIndex,
wxVariant& childValue ) const wxOVERRIDE;
virtual void RefreshChildren() wxOVERRIDE;
wxVariant& childValue ) const override;
virtual void RefreshChildren() override;
protected:
@ -85,8 +85,8 @@ public:
virtual wxVariant ChildChanged( wxVariant& thisValue,
int childIndex,
wxVariant& childValue ) const wxOVERRIDE;
virtual void RefreshChildren() wxOVERRIDE;
wxVariant& childValue ) const override;
virtual void RefreshChildren() override;
protected:
@ -116,22 +116,22 @@ public:
virtual ~wxArrayDoubleProperty ();
virtual void OnSetValue() wxOVERRIDE;
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const wxOVERRIDE;
virtual void OnSetValue() override;
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const override;
virtual bool StringToValue( wxVariant& variant,
const wxString& text,
int argFlags = 0 ) const wxOVERRIDE;
virtual bool DoSetAttribute( const wxString& name, wxVariant& value ) wxOVERRIDE;
int argFlags = 0 ) const override;
virtual bool DoSetAttribute( const wxString& name, wxVariant& value ) override;
// Generates cache for displayed text
virtual void GenerateValueAsString ( wxString& target, int prec, bool removeZeroes ) const;
wxValidator* DoGetValidator() const wxOVERRIDE;
wxValidator* DoGetValidator() const override;
bool ValidateValue(wxVariant& value,
wxPGValidationInfo& validationInfo) const wxOVERRIDE;
wxPGValidationInfo& validationInfo) const override;
protected:
virtual bool DisplayEditorDialog(wxPropertyGrid* pg, wxVariant& value) wxOVERRIDE;
virtual bool DisplayEditorDialog(wxPropertyGrid* pg, wxVariant& value) override;
wxString m_display; // Stores cache for displayed text
int m_precision; // Used when formatting displayed string.

6
samples/propgrid/tests.cpp
View file

@ -60,7 +60,7 @@ public:
{
}
virtual wxColour GetColour( int index ) const wxOVERRIDE
virtual wxColour GetColour( int index ) const override
{
switch (index)
{
@ -86,7 +86,7 @@ public:
virtual wxString ColourToString( const wxColour& col,
int index,
int argFlags = 0 ) const wxOVERRIDE
int argFlags = 0 ) const override
{
if ( index == (int)(m_choices.GetCount()-1) )
return wxEmptyString;
@ -94,7 +94,7 @@ public:
return wxColourProperty::ColourToString(col, index, argFlags);
}
virtual int GetCustomColourIndex() const wxOVERRIDE
virtual int GetCustomColourIndex() const override
{
return m_choices.GetCount()-2;
}

2
samples/regtest/regtest.cpp
View file

@ -38,7 +38,7 @@
class RegApp : public wxApp
{
public:
bool OnInit() wxOVERRIDE;
bool OnInit() override;
};
// ----------------------------------------------------------------------------

4
samples/render/renddll.cpp
View file

@ -28,7 +28,7 @@ public:
const wxRect& rect,
int WXUNUSED(flags) = 0,
wxHeaderSortIconType WXUNUSED(sortArrow) = wxHDR_SORT_ICON_NONE,
wxHeaderButtonParams* WXUNUSED(params) = NULL) wxOVERRIDE
wxHeaderButtonParams* WXUNUSED(params) = NULL) override
{
dc.SetBrush(*wxCYAN_BRUSH);
dc.SetTextForeground(*wxRED);
@ -38,7 +38,7 @@ public:
return dc.GetTextExtent("MyDllRenderer").x;
}
virtual wxRendererVersion GetVersion() const wxOVERRIDE
virtual wxRendererVersion GetVersion() const override
{
return wxRendererVersion(wxRendererVersion::Current_Version,
wxRendererVersion::Current_Age);

8
samples/render/render.cpp
View file

@ -64,7 +64,7 @@ public:
int WXUNUSED(flags) = 0,
wxHeaderSortIconType WXUNUSED(sortArrow)
= wxHDR_SORT_ICON_NONE,
wxHeaderButtonParams* params = NULL) wxOVERRIDE
wxHeaderButtonParams* params = NULL) override
{
wxDCBrushChanger setBrush(dc, *wxBLUE_BRUSH);
wxDCTextColourChanger setFgCol(dc, *wxWHITE);
@ -85,7 +85,7 @@ public:
// cases, but we show this here just for completeness)
class MyTraits : public wxGUIAppTraits
{
virtual wxRendererNative *CreateRenderer() wxOVERRIDE
virtual wxRendererNative *CreateRenderer() override
{
// it will be deleted on program shutdown by wxWidgets itself
return new MyRenderer;
@ -96,10 +96,10 @@ class MyTraits : public wxGUIAppTraits
class MyApp : public wxApp
{
public:
virtual bool OnInit() wxOVERRIDE;
virtual bool OnInit() override;
// if we want MyTraits to be used we must override CreateTraits()
virtual wxAppTraits *CreateTraits() wxOVERRIDE { return new MyTraits; }
virtual wxAppTraits *CreateTraits() override { return new MyTraits; }
};
// Define a new frame type: this is going to be our main frame

2
samples/ribbon/ribbondemo.cpp
View file

@ -33,7 +33,7 @@
class MyApp : public wxApp
{
public:
bool OnInit() wxOVERRIDE;
bool OnInit() override;
};
wxDECLARE_APP(MyApp);

32
samples/richtext/richtext.cpp
View file

@ -91,15 +91,15 @@ public:
{
}
virtual bool CanEditProperties(wxRichTextField* WXUNUSED(obj)) const wxOVERRIDE { return true; }
virtual bool EditProperties(wxRichTextField* WXUNUSED(obj), wxWindow* WXUNUSED(parent), wxRichTextBuffer* WXUNUSED(buffer)) wxOVERRIDE
virtual bool CanEditProperties(wxRichTextField* WXUNUSED(obj)) const override { return true; }
virtual bool EditProperties(wxRichTextField* WXUNUSED(obj), wxWindow* WXUNUSED(parent), wxRichTextBuffer* WXUNUSED(buffer)) override
{
wxString label = GetLabel();
wxMessageBox(wxString::Format("Editing %s", label));
return true;
}
virtual wxString GetPropertiesMenuLabel(wxRichTextField* WXUNUSED(obj)) const wxOVERRIDE
virtual wxString GetPropertiesMenuLabel(wxRichTextField* WXUNUSED(obj)) const override
{
return GetLabel();
}
@ -114,7 +114,7 @@ public:
{
}
virtual bool UpdateField(wxRichTextBuffer* buffer, wxRichTextField* obj) wxOVERRIDE
virtual bool UpdateField(wxRichTextBuffer* buffer, wxRichTextField* obj) override
{
if (buffer)
{
@ -166,19 +166,19 @@ public:
Prepares the content just before insertion (or after buffer reset). Called by the same function in wxRichTextBuffer.
Currently is only called if undo mode is on.
*/
virtual void PrepareContent(wxRichTextParagraphLayoutBox& container) wxOVERRIDE;
virtual void PrepareContent(wxRichTextParagraphLayoutBox& container) override;
/**
Can we delete this range?
Sends an event to the control.
*/
virtual bool CanDeleteRange(wxRichTextParagraphLayoutBox& container, const wxRichTextRange& range) const wxOVERRIDE;
virtual bool CanDeleteRange(wxRichTextParagraphLayoutBox& container, const wxRichTextRange& range) const override;
/**
Can we insert content at this position?
Sends an event to the control.
*/
virtual bool CanInsertContent(wxRichTextParagraphLayoutBox& container, long pos) const wxOVERRIDE;
virtual bool CanInsertContent(wxRichTextParagraphLayoutBox& container, long pos) const override;
/**
Finds a table, either selected or near the cursor
@ -204,8 +204,8 @@ public:
// this one is called on application startup and is a good place for the app
// initialization (doing it here and not in the ctor allows to have an error
// return: if OnInit() returns false, the application terminates)
virtual bool OnInit() wxOVERRIDE;
virtual int OnExit() wxOVERRIDE;
virtual bool OnInit() override;
virtual int OnExit() override;
void CreateStyles();
@ -315,7 +315,7 @@ public:
protected:
// Forward command events to the current rich text control, if any
bool ProcessEvent(wxEvent& event) wxOVERRIDE;
bool ProcessEvent(wxEvent& event) override;
// Write text
void WriteInitialText();
@ -2224,37 +2224,37 @@ public:
/**
Returns @true if this object has virtual attributes that we can provide.
*/
virtual bool HasVirtualAttributes(wxRichTextObject* obj) const wxOVERRIDE;
virtual bool HasVirtualAttributes(wxRichTextObject* obj) const override;
/**
Provides virtual attributes that we can provide.
*/
virtual bool GetVirtualAttributes(wxRichTextAttr& attr, wxRichTextObject* obj) const wxOVERRIDE;
virtual bool GetVirtualAttributes(wxRichTextAttr& attr, wxRichTextObject* obj) const override;
/**
Gets the count for mixed virtual attributes for individual positions within the object.
For example, individual characters within a text object may require special highlighting.
*/
virtual int GetVirtualSubobjectAttributesCount(wxRichTextObject* WXUNUSED(obj)) const wxOVERRIDE { return 0; }
virtual int GetVirtualSubobjectAttributesCount(wxRichTextObject* WXUNUSED(obj)) const override { return 0; }
/**
Gets the mixed virtual attributes for individual positions within the object.
For example, individual characters within a text object may require special highlighting.
Returns the number of virtual attributes found.
*/
virtual int GetVirtualSubobjectAttributes(wxRichTextObject* WXUNUSED(obj), wxArrayInt& WXUNUSED(positions), wxRichTextAttrArray& WXUNUSED(attributes)) const wxOVERRIDE { return 0; }
virtual int GetVirtualSubobjectAttributes(wxRichTextObject* WXUNUSED(obj), wxArrayInt& WXUNUSED(positions), wxRichTextAttrArray& WXUNUSED(attributes)) const override { return 0; }
/**
Do we have virtual text for this object? Virtual text allows an application
to replace characters in an object for editing and display purposes, for example
for highlighting special characters.
*/
virtual bool HasVirtualText(const wxRichTextPlainText* WXUNUSED(obj)) const wxOVERRIDE { return false; }
virtual bool HasVirtualText(const wxRichTextPlainText* WXUNUSED(obj)) const override { return false; }
/**
Gets the virtual text for this object.
*/
virtual bool GetVirtualText(const wxRichTextPlainText* WXUNUSED(obj), wxString& WXUNUSED(text)) const wxOVERRIDE { return false; }
virtual bool GetVirtualText(const wxRichTextPlainText* WXUNUSED(obj), wxString& WXUNUSED(text)) const override { return false; }
wxColour m_lockBackgroundColour;
};

4
samples/sashtest/sashtest.h
View file

@ -14,14 +14,14 @@
class MyApp: public wxApp
{
public:
bool OnInit(void) wxOVERRIDE;
bool OnInit(void) override;
};
class MyCanvas: public wxScrolledWindow
{
public:
MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size);
virtual void OnDraw(wxDC& dc) wxOVERRIDE;
virtual void OnDraw(wxDC& dc) override;
void OnEvent(wxMouseEvent& event);
wxDECLARE_EVENT_TABLE();

14
samples/scroll/scroll.cpp
View file

@ -289,7 +289,7 @@ public:
// override the base class function so that when this window is scrolled,
// the labels are scrolled in sync
virtual void ScrollWindow(int dx, int dy, const wxRect *rect) wxOVERRIDE
virtual void ScrollWindow(int dx, int dy, const wxRect *rect) override
{
wxPanel::ScrollWindow( dx, dy, rect );
m_colLabels->ScrollWindow( dx, 0, rect );
@ -397,7 +397,7 @@ public:
protected:
// scrolled windows which use scroll target different from the window
// itself must override this virtual method
virtual wxSize GetSizeAvailableForScrollTarget(const wxSize& size) wxOVERRIDE
virtual wxSize GetSizeAvailableForScrollTarget(const wxSize& size) override
{
// decrease the total size by the size of the non-scrollable parts
// above/to the left of the canvas
@ -468,7 +468,7 @@ public:
DoSyncIfNecessary();
}
virtual void ScrollWindow(int dx, int dy, const wxRect *rect = NULL) wxOVERRIDE
virtual void ScrollWindow(int dx, int dy, const wxRect *rect = NULL) override
{
wxScrolled<wxWindow>::ScrollWindow(dx, dy, rect);
@ -518,7 +518,7 @@ public:
SetScrollbars(0, m_hLine, 0, m_nLines + 1, 0, 0, true /* no refresh */);
}
virtual void OnDraw(wxDC& dc) wxOVERRIDE;
virtual void OnDraw(wxDC& dc) override;
};
// this class does "smart" redrawing - only redraws the lines which must be
@ -537,7 +537,7 @@ public:
SetVirtualSize( wxDefaultCoord, ( m_nLines + 1 ) * m_hLine );
}
virtual void OnDraw(wxDC& dc) wxOVERRIDE;
virtual void OnDraw(wxDC& dc) override;
};
// ----------------------------------------------------------------------------
@ -562,7 +562,7 @@ public:
private:
// event handlers
void OnDraw(wxDC& dc) wxOVERRIDE;
void OnDraw(wxDC& dc) override;
void OnMouseLeftDown(wxMouseEvent& event);
void OnMouseLeftUp(wxMouseEvent& event);
void OnMouseMove(wxMouseEvent& event);
@ -634,7 +634,7 @@ private:
class MyApp : public wxApp
{
public:
virtual bool OnInit() wxOVERRIDE;
virtual bool OnInit() override;
};

2
samples/shaped/shaped.cpp
View file

@ -78,7 +78,7 @@ public:
// this one is called on application startup and is a good place for the app
// initialization (doing it here and not in the ctor allows to have an error
// return: if OnInit() returns false, the application terminates)
virtual bool OnInit() wxOVERRIDE;
virtual bool OnInit() override;
};

14
samples/sockets/baseclient.cpp
View file

@ -52,7 +52,7 @@ public:
void setFailed() { m_isFailed = true; }
bool isFailed() const { return m_isFailed; }
virtual wxEvent* Clone() const wxOVERRIDE
virtual wxEvent* Clone() const override
{
return new WorkerEvent(*this);
}
@ -94,11 +94,11 @@ private:
wxString m_host;
long m_stressWorkers;
virtual bool OnInit() wxOVERRIDE;
virtual int OnRun() wxOVERRIDE;
virtual int OnExit() wxOVERRIDE;
void OnInitCmdLine(wxCmdLineParser& pParser) wxOVERRIDE;
bool OnCmdLineParsed(wxCmdLineParser& pParser) wxOVERRIDE;
virtual bool OnInit() override;
virtual int OnRun() override;
virtual int OnExit() override;
void OnInitCmdLine(wxCmdLineParser& pParser) override;
bool OnCmdLineParsed(wxCmdLineParser& pParser) override;
void OnWorkerEvent(WorkerEvent& pEvent);
void OnTimerEvent(wxTimerEvent& pEvent);
@ -127,7 +127,7 @@ class ThreadWorker : public wxThread
{
public:
ThreadWorker(const wxString& p_host, char* p_buf, int p_size);
virtual ExitCode Entry() wxOVERRIDE;
virtual ExitCode Entry() override;
private:
wxString m_host;
wxSocketClient* m_clientSocket;

12
samples/sockets/baseserver.cpp
View file

@ -78,7 +78,7 @@ public:
m_workerFailed = false;
}
virtual wxEvent* Clone() const wxOVERRIDE
virtual wxEvent* Clone() const override
{
return new WorkerEvent(*this);
}
@ -112,11 +112,11 @@ private:
EVENTS
};
virtual bool OnInit() wxOVERRIDE;
virtual int OnExit() wxOVERRIDE;
virtual bool OnInit() override;
virtual int OnExit() override;
void OnInitCmdLine(wxCmdLineParser& pParser) wxOVERRIDE;
bool OnCmdLineParsed(wxCmdLineParser& pParser) wxOVERRIDE;
void OnInitCmdLine(wxCmdLineParser& pParser) override;
bool OnCmdLineParsed(wxCmdLineParser& pParser) override;
void OnSocketEvent(wxSocketEvent& pEvent);
void OnWorkerEvent(WorkerEvent& pEvent);
@ -168,7 +168,7 @@ class ThreadWorker : public wxThread, private WorkerBase
{
public:
ThreadWorker(wxSocketBase* pSocket);
virtual ExitCode Entry() wxOVERRIDE;
virtual ExitCode Entry() override;
private:
wxSocketBase* m_socket;

4
samples/sockets/client.cpp
View file

@ -47,7 +47,7 @@
class MyApp : public wxApp
{
public:
virtual bool OnInit() wxOVERRIDE;
virtual bool OnInit() override;
};
// Define a new frame type: this is going to be our main frame
@ -641,7 +641,7 @@ void MyFrame::OnTestURL(wxCommandEvent& WXUNUSED(event))
Run();
}
virtual void* Entry() wxOVERRIDE
virtual void* Entry() override
{
DoDownload(m_url);

2
samples/sockets/server.cpp
View file

@ -52,7 +52,7 @@
class MyApp : public wxApp
{
public:
virtual bool OnInit() wxOVERRIDE;
virtual bool OnInit() override;
};
// Define a new frame type: this is going to be our main frame

2
samples/sound/sound.cpp
View file

@ -45,7 +45,7 @@
class MyApp : public wxApp
{
public:
virtual bool OnInit() wxOVERRIDE;
virtual bool OnInit() override;
};

2
samples/splash/splash.cpp
View file

@ -58,7 +58,7 @@ public:
// this one is called on application startup and is a good place for the app
// initialization (doing it here and not in the ctor allows to have an error
// return: if OnInit() returns false, the application terminates)
virtual bool OnInit() wxOVERRIDE;
virtual bool OnInit() override;
void DecorateSplashScreen(wxBitmap& bmp);
};

4
samples/splitter/splitter.cpp
View file

@ -73,7 +73,7 @@ class MyApp: public wxApp
public:
MyApp() { }
virtual bool OnInit() wxOVERRIDE;
virtual bool OnInit() override;
wxDECLARE_NO_COPY_CLASS(MyApp);
};
@ -164,7 +164,7 @@ public:
MyCanvas(wxWindow* parent, bool mirror);
virtual ~MyCanvas(){}
virtual void OnDraw(wxDC& dc) wxOVERRIDE;
virtual void OnDraw(wxDC& dc) override;
private:
bool m_mirror;

2
samples/statbar/statbar.cpp
View file

@ -78,7 +78,7 @@ public:
// this one is called on application startup and is a good place for the app
// initialization (doing it here and not in the ctor allows to have an error
// return: if OnInit() returns false, the application terminates)
virtual bool OnInit() wxOVERRIDE;
virtual bool OnInit() override;
};
// A custom status bar which contains controls, icons &c

8
samples/stc/edit.h
View file

@ -176,12 +176,12 @@ public:
EditPrint (Edit *edit, const wxString& title = "");
//! event handlers
bool OnPrintPage (int page) wxOVERRIDE;
bool OnBeginDocument (int startPage, int endPage) wxOVERRIDE;
bool OnPrintPage (int page) override;
bool OnBeginDocument (int startPage, int endPage) override;
//! print functions
bool HasPage (int page) wxOVERRIDE;
void GetPageInfo (int *minPage, int *maxPage, int *selPageFrom, int *selPageTo) wxOVERRIDE;
bool HasPage (int page) override;
void GetPageInfo (int *minPage, int *maxPage, int *selPageFrom, int *selPageTo) override;
private:
Edit *m_edit;

6
samples/stc/stctest.cpp
View file

@ -86,10 +86,10 @@ class App: public wxApp {
public:
//! the main function called during application start
virtual bool OnInit () wxOVERRIDE;
virtual bool OnInit () override;
//! application exit function
virtual int OnExit () wxOVERRIDE;
virtual int OnExit () override;
private:
//! frame window
@ -781,7 +781,7 @@ public:
SetWrapMode(wxSTC_WRAP_WORD);
SetWrapVisualFlags(wxSTC_WRAPVISUALFLAG_END);
}
virtual bool SetFont(const wxFont& font) wxOVERRIDE
virtual bool SetFont(const wxFont& font) override
{
StyleSetFont(wxSTC_STYLE_DEFAULT, font);
return wxStyledTextCtrl::SetFont(font);

4
samples/svg/svgtest.cpp
View file

@ -39,7 +39,7 @@
class MyApp : public wxApp
{
public:
bool OnInit() wxOVERRIDE;
bool OnInit() override;
};
// Existing pages:
@ -91,7 +91,7 @@ class MyPage : public wxScrolledWindow
{
public:
MyPage(wxNotebook *parent, int index);
virtual void OnDraw(wxDC& dc) wxOVERRIDE;
virtual void OnDraw(wxDC& dc) override;
bool OnSave(wxString);
private:
int m_index;

2
samples/taborder/taborder.cpp
View file

@ -75,7 +75,7 @@ enum
class MyApp : public wxApp
{
public:
virtual bool OnInit() wxOVERRIDE;
virtual bool OnInit() override;
};
// and the main sample window

4
samples/taskbar/tbtest.h
View file

@ -26,7 +26,7 @@ public:
void OnMenuCheckmark(wxCommandEvent&);
void OnMenuUICheckmark(wxUpdateUIEvent&);
void OnMenuSub(wxCommandEvent&);
virtual wxMenu *CreatePopupMenu() wxOVERRIDE;
virtual wxMenu *CreatePopupMenu() override;
wxDECLARE_EVENT_TABLE();
};
@ -36,7 +36,7 @@ public:
class MyApp : public wxApp
{
public:
virtual bool OnInit() wxOVERRIDE;
virtual bool OnInit() override;
};
class MyDialog: public wxDialog

Some files were not shown because too many files have changed in this diff Show more