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

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
}