Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use wxOVERRIDE

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2014-03-30 00:02:23 +00:00
parent ddd7ce624a
commit 8b4ae731d3
460 changed files with 4103 additions and 4107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
samples/widgets/bmpcombobox.cpp
View File

@@ -103,12 +103,12 @@ class BitmapComboBoxWidgetsPage : public ItemContainerWidgetsPage
public:
BitmapComboBoxWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
virtual wxControl *GetWidget() const { return m_combobox; }
virtual wxItemContainer* GetContainer() const { return m_combobox; }
virtual void RecreateWidget() { CreateCombo(); }
virtual wxControl *GetWidget() const wxOVERRIDE { return m_combobox; }
virtual wxItemContainer* GetContainer() const wxOVERRIDE { return m_combobox; }
virtual void RecreateWidget() wxOVERRIDE { CreateCombo(); }
// lazy creation of the content
virtual void CreateContent();
virtual void CreateContent() wxOVERRIDE;
protected:
// event handlers

6
samples/widgets/button.cpp
View File

@@ -91,11 +91,11 @@ public:
ButtonWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
virtual ~ButtonWidgetsPage(){};
virtual wxControl *GetWidget() const { return m_button; }
virtual void RecreateWidget() { CreateButton(); }
virtual wxControl *GetWidget() const wxOVERRIDE { return m_button; }
virtual void RecreateWidget() wxOVERRIDE { CreateButton(); }
// lazy creation of the content
virtual void CreateContent();
virtual void CreateContent() wxOVERRIDE;
protected:
// event handlers

6
samples/widgets/checkbox.cpp
View File

@@ -75,11 +75,11 @@ public:
CheckBoxWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
virtual ~CheckBoxWidgetsPage(){};
virtual wxControl *GetWidget() const { return m_checkbox; }
virtual void RecreateWidget() { CreateCheckbox(); }
virtual wxControl *GetWidget() const wxOVERRIDE { return m_checkbox; }
virtual void RecreateWidget() wxOVERRIDE { CreateCheckbox(); }
// lazy creation of the content
virtual void CreateContent();
virtual void CreateContent() wxOVERRIDE;
protected:
// event handlers

8
samples/widgets/choice.cpp
View File

@@ -77,12 +77,12 @@ class ChoiceWidgetsPage : public ItemContainerWidgetsPage
public:
ChoiceWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
virtual wxControl *GetWidget() const { return m_choice; }
virtual wxItemContainer* GetContainer() const { return m_choice; }
virtual void RecreateWidget() { CreateChoice(); }
virtual wxControl *GetWidget() const wxOVERRIDE { return m_choice; }
virtual wxItemContainer* GetContainer() const wxOVERRIDE { return m_choice; }
virtual void RecreateWidget() wxOVERRIDE { CreateChoice(); }
// lazy creation of the content
virtual void CreateContent();
virtual void CreateContent() wxOVERRIDE;
protected:
// event handlers

6
samples/widgets/clrpicker.cpp
View File

@@ -65,11 +65,11 @@ public:
ColourPickerWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
virtual ~ColourPickerWidgetsPage(){};
virtual wxControl *GetWidget() const { return m_clrPicker; }
virtual void RecreateWidget() { RecreatePicker(); }
virtual wxControl *GetWidget() const wxOVERRIDE { return m_clrPicker; }
virtual void RecreateWidget() wxOVERRIDE { RecreatePicker(); }
// lazy creation of the content
virtual void CreateContent();
virtual void CreateContent() wxOVERRIDE;
protected:

10
samples/widgets/combobox.cpp
View File

@@ -94,13 +94,13 @@ class ComboboxWidgetsPage : public ItemContainerWidgetsPage
public:
ComboboxWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
virtual wxControl *GetWidget() const { return m_combobox; }
virtual wxTextEntryBase *GetTextEntry() const { return m_combobox; }
virtual wxItemContainer* GetContainer() const { return m_combobox; }
virtual void RecreateWidget() { CreateCombo(); }
virtual wxControl *GetWidget() const wxOVERRIDE { return m_combobox; }
virtual wxTextEntryBase *GetTextEntry() const wxOVERRIDE { return m_combobox; }
virtual wxItemContainer* GetContainer() const wxOVERRIDE { return m_combobox; }
virtual void RecreateWidget() wxOVERRIDE { CreateCombo(); }
// lazy creation of the content
virtual void CreateContent();
virtual void CreateContent() wxOVERRIDE;
protected:
// event handlers

6
samples/widgets/datepick.cpp
View File

@@ -70,11 +70,11 @@ public:
DatePickerWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
virtual ~DatePickerWidgetsPage(){};
virtual wxControl *GetWidget() const { return m_datePicker; }
virtual void RecreateWidget() { CreateDatePicker(); }
virtual wxControl *GetWidget() const wxOVERRIDE { return m_datePicker; }
virtual void RecreateWidget() wxOVERRIDE { CreateDatePicker(); }
// lazy creation of the content
virtual void CreateContent();
virtual void CreateContent() wxOVERRIDE;
protected:
// event handlers

6
samples/widgets/dirctrl.cpp
View File

@@ -98,11 +98,11 @@ public:
DirCtrlWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
virtual ~DirCtrlWidgetsPage() {}
virtual wxControl *GetWidget() const { return m_dirCtrl; }
virtual void RecreateWidget() { CreateDirCtrl(); }
virtual wxControl *GetWidget() const wxOVERRIDE { return m_dirCtrl; }
virtual void RecreateWidget() wxOVERRIDE { CreateDirCtrl(); }
// lazy creation of the content
virtual void CreateContent();
virtual void CreateContent() wxOVERRIDE;
protected:
// event handlers

6
samples/widgets/dirpicker.cpp
View File

@@ -67,11 +67,11 @@ public:
DirPickerWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
virtual ~DirPickerWidgetsPage(){};
virtual wxControl *GetWidget() const { return m_dirPicker; }
virtual void RecreateWidget() { RecreatePicker(); }
virtual wxControl *GetWidget() const wxOVERRIDE { return m_dirPicker; }
virtual void RecreateWidget() wxOVERRIDE { RecreatePicker(); }
// lazy creation of the content
virtual void CreateContent();
virtual void CreateContent() wxOVERRIDE;
protected:

6
samples/widgets/editlbox.cpp
View File

@@ -69,11 +69,11 @@ class EditableListboxWidgetsPage : public WidgetsPage
public:
EditableListboxWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
virtual wxControl *GetWidget() const { return m_lbox->GetListCtrl(); }
virtual void RecreateWidget() { CreateLbox(); }
virtual wxControl *GetWidget() const wxOVERRIDE { return m_lbox->GetListCtrl(); }
virtual void RecreateWidget() wxOVERRIDE { CreateLbox(); }
// lazy creation of the content
virtual void CreateContent();
virtual void CreateContent() wxOVERRIDE;
protected:
// event handlers

6
samples/widgets/filectrl.cpp
View File

@@ -70,11 +70,11 @@ public:
FileCtrlWidgetsPage( WidgetsBookCtrl *book, wxImageList *imaglist );
virtual ~FileCtrlWidgetsPage() {}
virtual wxControl *GetWidget() const { return m_fileCtrl; }
virtual void RecreateWidget() { CreateFileCtrl(); }
virtual wxControl *GetWidget() const wxOVERRIDE { return m_fileCtrl; }
virtual void RecreateWidget() wxOVERRIDE { CreateFileCtrl(); }
// lazy creation of the content
virtual void CreateContent();
virtual void CreateContent() wxOVERRIDE;
protected:
// event handlers

6
samples/widgets/filepicker.cpp
View File

@@ -74,11 +74,11 @@ public:
FilePickerWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
virtual ~FilePickerWidgetsPage(){};
virtual wxControl *GetWidget() const { return m_filePicker; }
virtual void RecreateWidget() { RecreatePicker(); }
virtual wxControl *GetWidget() const wxOVERRIDE { return m_filePicker; }
virtual void RecreateWidget() wxOVERRIDE { RecreatePicker(); }
// lazy creation of the content
virtual void CreateContent();
virtual void CreateContent() wxOVERRIDE;
protected:

6
samples/widgets/fontpicker.cpp
View File

@@ -65,11 +65,11 @@ public:
FontPickerWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
virtual ~FontPickerWidgetsPage(){};
virtual wxControl *GetWidget() const { return m_fontPicker; }
virtual void RecreateWidget() { RecreatePicker(); }
virtual wxControl *GetWidget() const wxOVERRIDE { return m_fontPicker; }
virtual void RecreateWidget() wxOVERRIDE { RecreatePicker(); }
// lazy creation of the content
virtual void CreateContent();
virtual void CreateContent() wxOVERRIDE;
protected:

6
samples/widgets/gauge.cpp
View File

@@ -75,11 +75,11 @@ public:
GaugeWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
virtual ~GaugeWidgetsPage();
virtual wxControl *GetWidget() const { return m_gauge; }
virtual void RecreateWidget() { CreateGauge(); }
virtual wxControl *GetWidget() const wxOVERRIDE { return m_gauge; }
virtual void RecreateWidget() wxOVERRIDE { CreateGauge(); }
// lazy creation of the content
virtual void CreateContent();
virtual void CreateContent() wxOVERRIDE;
protected:
// event handlers

6
samples/widgets/hyperlnk.cpp
View File

@@ -79,11 +79,11 @@ public:
HyperlinkWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
virtual ~HyperlinkWidgetsPage() {}
virtual wxControl *GetWidget() const { return m_hyperlink; }
virtual void RecreateWidget() { CreateHyperlink(); }
virtual wxControl *GetWidget() const wxOVERRIDE { return m_hyperlink; }
virtual void RecreateWidget() wxOVERRIDE { CreateHyperlink(); }
// lazy creation of the content
virtual void CreateContent();
virtual void CreateContent() wxOVERRIDE;
protected:
// event handlers

8
samples/widgets/listbox.cpp
View File

@@ -81,12 +81,12 @@ class ListboxWidgetsPage : public ItemContainerWidgetsPage
public:
ListboxWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
virtual wxControl *GetWidget() const { return m_lbox; }
virtual wxItemContainer* GetContainer() const { return m_lbox; }
virtual void RecreateWidget() { CreateLbox(); }
virtual wxControl *GetWidget() const wxOVERRIDE { return m_lbox; }
virtual wxItemContainer* GetContainer() const wxOVERRIDE { return m_lbox; }
virtual void RecreateWidget() wxOVERRIDE { CreateLbox(); }
// lazy creation of the content
virtual void CreateContent();
virtual void CreateContent() wxOVERRIDE;
protected:
// event handlers

12
samples/widgets/notebook.cpp
View File

@@ -88,11 +88,11 @@ public:
BookWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist, const char *const icon[]);
virtual ~BookWidgetsPage();
virtual wxControl *GetWidget() const { return m_book; }
virtual void RecreateWidget() { RecreateBook(); }
virtual wxControl *GetWidget() const wxOVERRIDE { return m_book; }
virtual void RecreateWidget() wxOVERRIDE { RecreateBook(); }
// lazy creation of the content
virtual void CreateContent();
virtual void CreateContent() wxOVERRIDE;
protected:
// event handlers
@@ -560,7 +560,7 @@ protected:
void OnPageChanged(wxNotebookEvent& event);
// (re)create book
virtual wxBookCtrlBase *CreateBook(long flags)
virtual wxBookCtrlBase *CreateBook(long flags) wxOVERRIDE
{
return new wxNotebook(this, BookPage_Book,
wxDefaultPosition, wxDefaultSize,
@@ -641,7 +641,7 @@ protected:
void OnPageChanged(wxListbookEvent& event);
// (re)create book
virtual wxBookCtrlBase *CreateBook(long flags)
virtual wxBookCtrlBase *CreateBook(long flags) wxOVERRIDE
{
return new wxListbook(this, BookPage_Book,
wxDefaultPosition, wxDefaultSize,
@@ -714,7 +714,7 @@ protected:
void OnPageChanged(wxChoicebookEvent& event);
// (re)create book
virtual wxBookCtrlBase *CreateBook(long flags)
virtual wxBookCtrlBase *CreateBook(long flags) wxOVERRIDE
{
return new wxChoicebook(this, BookPage_Book,
wxDefaultPosition, wxDefaultSize,

18
samples/widgets/odcombobox.cpp
View File

@@ -90,14 +90,14 @@ class ODComboboxWidgetsPage : public ItemContainerWidgetsPage
public:
ODComboboxWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
virtual wxControl *GetWidget() const { return m_combobox; }
virtual wxTextEntryBase *GetTextEntry() const
virtual wxControl *GetWidget() const wxOVERRIDE { return m_combobox; }
virtual wxTextEntryBase *GetTextEntry() const wxOVERRIDE
{ return m_combobox ? m_combobox->GetTextCtrl() : NULL; }
virtual wxItemContainer* GetContainer() const { return m_combobox; }
virtual void RecreateWidget() { CreateCombo(); }
virtual wxItemContainer* GetContainer() const wxOVERRIDE { return m_combobox; }
virtual void RecreateWidget() wxOVERRIDE { CreateCombo(); }
// lazy creation of the content
virtual void CreateContent();
virtual void CreateContent() wxOVERRIDE;
protected:
// event handlers
@@ -242,7 +242,7 @@ public:
virtual void OnDrawItem(wxDC& dc,
const wxRect& rect,
int item,
int WXUNUSED(flags)) const
int WXUNUSED(flags)) const wxOVERRIDE
{
if ( item == wxNOT_FOUND )
return;
@@ -268,7 +268,7 @@ public:
}
virtual void OnDrawBackground(wxDC& dc, const wxRect& rect,
int item, int flags ) const
int item, int flags ) const wxOVERRIDE
{
// If item is selected or even, or we are painting the
@@ -287,12 +287,12 @@ public:
dc.DrawRectangle(rect);
}
virtual wxCoord OnMeasureItem(size_t WXUNUSED(item)) const
virtual wxCoord OnMeasureItem(size_t WXUNUSED(item)) const wxOVERRIDE
{
return 48;
}
virtual wxCoord OnMeasureItemWidth(size_t WXUNUSED(item)) const
virtual wxCoord OnMeasureItemWidth(size_t WXUNUSED(item)) const wxOVERRIDE
{
return -1; // default - will be measured from text width
}

6
samples/widgets/radiobox.cpp
View File

@@ -85,11 +85,11 @@ public:
RadioWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
virtual ~RadioWidgetsPage(){};
virtual wxControl *GetWidget() const { return m_radio; }
virtual void RecreateWidget() { CreateRadio(); }
virtual wxControl *GetWidget() const wxOVERRIDE { return m_radio; }
virtual void RecreateWidget() wxOVERRIDE { CreateRadio(); }
// lazy creation of the content
virtual void CreateContent();
virtual void CreateContent() wxOVERRIDE;
protected:
// event handlers

8
samples/widgets/searchctrl.cpp
View File

@@ -70,12 +70,12 @@ public:
SearchCtrlWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
virtual ~SearchCtrlWidgetsPage(){};
virtual wxControl *GetWidget() const { return m_srchCtrl; }
virtual wxTextEntryBase *GetTextEntry() const { return m_srchCtrl; }
virtual void RecreateWidget();
virtual wxControl *GetWidget() const wxOVERRIDE { return m_srchCtrl; }
virtual wxTextEntryBase *GetTextEntry() const wxOVERRIDE { return m_srchCtrl; }
virtual void RecreateWidget() wxOVERRIDE;
// lazy creation of the content
virtual void CreateContent();
virtual void CreateContent() wxOVERRIDE;
protected:

6
samples/widgets/slider.cpp
View File

@@ -96,11 +96,11 @@ public:
SliderWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
virtual ~SliderWidgetsPage(){};
virtual wxControl *GetWidget() const { return m_slider; }
virtual void RecreateWidget() { CreateSlider(); }
virtual wxControl *GetWidget() const wxOVERRIDE { return m_slider; }
virtual void RecreateWidget() wxOVERRIDE { CreateSlider(); }
// lazy creation of the content
virtual void CreateContent();
virtual void CreateContent() wxOVERRIDE;
protected:
// event handlers

8
samples/widgets/spinbtn.cpp
View File

@@ -86,8 +86,8 @@ public:
SpinBtnWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
virtual ~SpinBtnWidgetsPage(){};
virtual wxControl *GetWidget() const { return m_spinbtn; }
virtual Widgets GetWidgets() const
virtual wxControl *GetWidget() const wxOVERRIDE { return m_spinbtn; }
virtual Widgets GetWidgets() const wxOVERRIDE
{
Widgets widgets(WidgetsPage::GetWidgets());
widgets.push_back(m_spinctrl);
@@ -95,10 +95,10 @@ public:
return widgets;
}
virtual void RecreateWidget() { CreateSpin(); }
virtual void RecreateWidget() wxOVERRIDE { CreateSpin(); }
// lazy creation of the content
virtual void CreateContent();
virtual void CreateContent() wxOVERRIDE;
protected:
// event handlers

6
samples/widgets/statbmp.cpp
View File

@@ -51,9 +51,9 @@ public:
StatBmpWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist)
: WidgetsPage(book, imaglist, statbmp_xpm) {}
virtual void CreateContent();
virtual wxControl *GetWidget() const { return m_statbmp; }
virtual void RecreateWidget();
virtual void CreateContent() wxOVERRIDE;
virtual wxControl *GetWidget() const wxOVERRIDE { return m_statbmp; }
virtual void RecreateWidget() wxOVERRIDE;
private:
void OnFileChange(wxFileDirPickerEvent &WXUNUSED(ev)) { RecreateWidget(); }

8
samples/widgets/static.cpp
View File

@@ -93,8 +93,8 @@ public:
StaticWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
virtual ~StaticWidgetsPage(){};
virtual wxControl *GetWidget() const { return m_statText; }
virtual Widgets GetWidgets() const
virtual wxControl *GetWidget() const wxOVERRIDE { return m_statText; }
virtual Widgets GetWidgets() const wxOVERRIDE
{
Widgets widgets;
widgets.push_back(m_sizerStatBox->GetStaticBox());
@@ -108,10 +108,10 @@ public:
return widgets;
}
virtual void RecreateWidget() { CreateStatic(); }
virtual void RecreateWidget() wxOVERRIDE { CreateStatic(); }
// lazy creation of the content
virtual void CreateContent();
virtual void CreateContent() wxOVERRIDE;
protected:
// event handlers

8
samples/widgets/textctrl.cpp
View File

@@ -138,12 +138,12 @@ public:
TextWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
virtual ~TextWidgetsPage(){};
virtual wxControl *GetWidget() const { return m_text; }
virtual wxTextEntryBase *GetTextEntry() const { return m_text; }
virtual void RecreateWidget() { CreateText(); }
virtual wxControl *GetWidget() const wxOVERRIDE { return m_text; }
virtual wxTextEntryBase *GetTextEntry() const wxOVERRIDE { return m_text; }
virtual void RecreateWidget() wxOVERRIDE { CreateText(); }
// lazy creation of the content
virtual void CreateContent();
virtual void CreateContent() wxOVERRIDE;
protected:
// create an info text contorl

6
samples/widgets/timepick.cpp
View File

@@ -66,11 +66,11 @@ public:
TimePickerWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
virtual ~TimePickerWidgetsPage(){};
virtual wxControl *GetWidget() const { return m_timePicker; }
virtual void RecreateWidget() { CreateTimePicker(); }
virtual wxControl *GetWidget() const wxOVERRIDE { return m_timePicker; }
virtual void RecreateWidget() wxOVERRIDE { CreateTimePicker(); }
// lazy creation of the content
virtual void CreateContent();
virtual void CreateContent() wxOVERRIDE;
protected:
// event handlers

6
samples/widgets/toggle.cpp
View File

@@ -89,11 +89,11 @@ public:
ToggleWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
virtual ~ToggleWidgetsPage(){};
virtual wxControl *GetWidget() const { return m_toggle; }
virtual void RecreateWidget() { CreateToggle(); }
virtual wxControl *GetWidget() const wxOVERRIDE { return m_toggle; }
virtual void RecreateWidget() wxOVERRIDE { CreateToggle(); }
// lazy creation of the content
virtual void CreateContent();
virtual void CreateContent() wxOVERRIDE;
protected:
// event handlers

6
samples/widgets/widgets.cpp
View File

@@ -136,7 +136,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();
virtual bool OnInit() wxOVERRIDE;
};
// Define a new frame type: this is going to be our main frame
@@ -240,7 +240,7 @@ public:
private:
// implement sink functions
virtual void DoLogTextAtLevel(wxLogLevel level, const wxString& msg)
virtual void DoLogTextAtLevel(wxLogLevel level, const wxString& msg) wxOVERRIDE
{
if ( level == wxLOG_Trace )
{
@@ -1053,7 +1053,7 @@ void WidgetsFrame::OnAutoCompleteCustom(wxCommandEvent& WXUNUSED(event))
class CustomTextCompleter : public wxTextCompleterSimple
{
public:
virtual void GetCompletions(const wxString& prefix, wxArrayString& res)
virtual void GetCompletions(const wxString& prefix, wxArrayString& res) wxOVERRIDE
{
// This is used for illustrative purposes only and shows how many
// completions we return every time when we're called.