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

12
samples/dataview/dataview.cpp
View File

@@ -53,7 +53,7 @@
class MyApp: public wxApp
{
public:
virtual bool OnInit();
virtual bool OnInit() wxOVERRIDE;
};
// ----------------------------------------------------------------------------
@@ -176,7 +176,7 @@ public:
wxALIGN_CENTER)
{ }
virtual bool Render( wxRect rect, wxDC *dc, int state )
virtual bool Render( wxRect rect, wxDC *dc, int state ) wxOVERRIDE
{
dc->SetBrush( *wxLIGHT_GREY_BRUSH );
dc->SetPen( *wxTRANSPARENT_PEN );
@@ -196,7 +196,7 @@ public:
wxDataViewModel *WXUNUSED(model),
const wxDataViewItem &WXUNUSED(item),
unsigned int WXUNUSED(col),
const wxMouseEvent *mouseEvent)
const wxMouseEvent *mouseEvent) wxOVERRIDE
{
wxString position;
if ( mouseEvent )
@@ -207,18 +207,18 @@ public:
return false;
}
virtual wxSize GetSize() const
virtual wxSize GetSize() const wxOVERRIDE
{
return wxSize(60,20);
}
virtual bool SetValue( const wxVariant &value )
virtual bool SetValue( const wxVariant &value ) wxOVERRIDE
{
m_value = value.GetString();
return true;
}
virtual bool GetValue( wxVariant &WXUNUSED(value) ) const { return true; }
virtual bool GetValue( wxVariant &WXUNUSED(value) ) const wxOVERRIDE { return true; }
private:
wxString m_value;

30
samples/dataview/mymodels.h
View File

@@ -140,16 +140,16 @@ public:
// override sorting to always sort branches ascendingly
int Compare( const wxDataViewItem &item1, const wxDataViewItem &item2,
unsigned int column, bool ascending ) const;
unsigned int column, bool ascending ) const wxOVERRIDE;
// implementation of base class virtuals to define model
virtual unsigned int GetColumnCount() const
virtual unsigned int GetColumnCount() const wxOVERRIDE
{
return 6;
}
virtual wxString GetColumnType( unsigned int col ) const
virtual wxString GetColumnType( unsigned int col ) const wxOVERRIDE
{
if (col == 2)
return wxT("long");
@@ -158,17 +158,17 @@ public:
}
virtual void GetValue( wxVariant &variant,
const wxDataViewItem &item, unsigned int col ) const;
const wxDataViewItem &item, unsigned int col ) const wxOVERRIDE;
virtual bool SetValue( const wxVariant &variant,
const wxDataViewItem &item, unsigned int col );
const wxDataViewItem &item, unsigned int col ) wxOVERRIDE;
virtual bool IsEnabled( const wxDataViewItem &item,
unsigned int col ) const;
unsigned int col ) const wxOVERRIDE;
virtual wxDataViewItem GetParent( const wxDataViewItem &item ) const;
virtual bool IsContainer( const wxDataViewItem &item ) const;
virtual wxDataViewItem GetParent( const wxDataViewItem &item ) const wxOVERRIDE;
virtual bool IsContainer( const wxDataViewItem &item ) const wxOVERRIDE;
virtual unsigned int GetChildren( const wxDataViewItem &parent,
wxDataViewItemArray &array ) const;
wxDataViewItemArray &array ) const wxOVERRIDE;
private:
MyMusicTreeModelNode* m_root;
@@ -211,12 +211,12 @@ public:
// implementation of base class virtuals to define model
virtual unsigned int GetColumnCount() const
virtual unsigned int GetColumnCount() const wxOVERRIDE
{
return Col_Max;
}
virtual wxString GetColumnType( unsigned int col ) const
virtual wxString GetColumnType( unsigned int col ) const wxOVERRIDE
{
if (col == Col_IconText)
return wxT("wxDataViewIconText");
@@ -225,11 +225,11 @@ public:
}
virtual void GetValueByRow( wxVariant &variant,
unsigned int row, unsigned int col ) const;
unsigned int row, unsigned int col ) const wxOVERRIDE;
virtual bool GetAttrByRow( unsigned int row, unsigned int col,
wxDataViewItemAttr &attr ) const;
wxDataViewItemAttr &attr ) const wxOVERRIDE;
virtual bool SetValueByRow( const wxVariant &variant,
unsigned int row, unsigned int col );
unsigned int row, unsigned int col ) wxOVERRIDE;
private:
wxArrayString m_textColValues;
@@ -244,5 +244,5 @@ private:
class MyListStoreDerivedModel : public wxDataViewListStore
{
public:
virtual bool IsEnabledByRow(unsigned int row, unsigned int col) const;
virtual bool IsEnabledByRow(unsigned int row, unsigned int col) const wxOVERRIDE;
};