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

20
samples/grid/griddemo.cpp
View File

@@ -59,7 +59,7 @@ public:
const wxRect& rect,
int horizAlign,
int vertAlign,
int WXUNUSED(textOrientation)) const
int WXUNUSED(textOrientation)) const wxOVERRIDE
{
dc.SetTextForeground(m_colFg);
dc.SetFont(wxITALIC_FONT->Bold());
@@ -68,7 +68,7 @@ public:
virtual void DrawBorder(const wxGrid& WXUNUSED(grid),
wxDC& dc,
wxRect& rect) const
wxRect& rect) const wxOVERRIDE
{
dc.SetPen(*wxTRANSPARENT_PEN);
dc.SetBrush(wxBrush(m_colBg));
@@ -99,7 +99,7 @@ public:
void UseCustomColHeaders(bool use = true) { m_useCustom = use; }
protected:
virtual const wxGridColumnHeaderRenderer& GetColumnHeaderRenderer(int col)
virtual const wxGridColumnHeaderRenderer& GetColumnHeaderRenderer(int col) wxOVERRIDE
{
// if enabled, use custom renderers
if ( m_useCustom )
@@ -1789,10 +1789,10 @@ public:
TabularGridTable() { m_sortOrder = NULL; }
virtual int GetNumberRows() { return ROW_MAX; }
virtual int GetNumberCols() { return COL_MAX; }
virtual int GetNumberRows() wxOVERRIDE { return ROW_MAX; }
virtual int GetNumberCols() wxOVERRIDE { return COL_MAX; }
virtual wxString GetValue(int row, int col)
virtual wxString GetValue(int row, int col) wxOVERRIDE
{
if ( m_sortOrder )
row = m_sortOrder[row];
@@ -1817,12 +1817,12 @@ public:
return wxString();
}
virtual void SetValue(int, int, const wxString&)
virtual void SetValue(int, int, const wxString&) wxOVERRIDE
{
wxFAIL_MSG( "shouldn't be called" );
}
virtual wxString GetColLabelValue(int col)
virtual wxString GetColLabelValue(int col) wxOVERRIDE
{
// notice that column parameter here always refers to the internal
// column index, independently of its position on the screen
@@ -1832,7 +1832,7 @@ public:
return labels[col];
}
virtual void SetColLabelValue(int, const wxString&)
virtual void SetColLabelValue(int, const wxString&) wxOVERRIDE
{
wxFAIL_MSG( "shouldn't be called" );
}
@@ -1909,7 +1909,7 @@ public:
}
protected:
virtual wxSize DoGetBestSize() const
virtual wxSize DoGetBestSize() const wxOVERRIDE
{
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();
bool OnInit() wxOVERRIDE;
};
@@ -228,7 +228,7 @@ public:
wxDC& dc,
const wxRect& rect,
int row, int col,
bool isSelected);
bool isSelected) wxOVERRIDE;
};
// ----------------------------------------------------------------------------
@@ -241,15 +241,15 @@ class BigGridTable : public wxGridTableBase
public:
BigGridTable(long sizeGrid) { m_sizeGrid = sizeGrid; }
int GetNumberRows() { return m_sizeGrid; }
int GetNumberCols() { return m_sizeGrid; }
wxString GetValue( int row, int col )
int GetNumberRows() wxOVERRIDE { return m_sizeGrid; }
int GetNumberCols() wxOVERRIDE { return m_sizeGrid; }
wxString GetValue( int row, int col ) wxOVERRIDE
{
return wxString::Format(wxT("(%d, %d)"), row, col);
}
void SetValue( int , int , const wxString& ) { /* ignore */ }
bool IsEmptyCell( int , int ) { return false; }
void SetValue( int , int , const wxString& ) wxOVERRIDE { /* ignore */ }
bool IsEmptyCell( int , int ) wxOVERRIDE { return false; }
private:
long m_sizeGrid;
@@ -276,7 +276,7 @@ public:
virtual ~MyGridCellAttrProvider();
virtual wxGridCellAttr *GetAttr(int row, int col,
wxGridCellAttr::wxAttrKind kind) const;
wxGridCellAttr::wxAttrKind kind) const wxOVERRIDE;
private:
wxGridCellAttr *m_attrForOddRows;
@@ -291,23 +291,23 @@ class BugsGridTable : public wxGridTableBase
public:
BugsGridTable() { }
virtual int GetNumberRows();
virtual int GetNumberCols();
virtual bool IsEmptyCell( int row, int col );
virtual wxString GetValue( int row, int col );
virtual void SetValue( int row, int col, const wxString& value );
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 wxString GetColLabelValue( int col );
virtual wxString GetColLabelValue( int col ) wxOVERRIDE;
virtual wxString GetTypeName( int row, int col );
virtual bool CanGetValueAs( int row, int col, const wxString& typeName );
virtual bool CanSetValueAs( int row, int col, const wxString& typeName );
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 long GetValueAsLong( int row, int col );
virtual bool GetValueAsBool( int row, int col );
virtual long GetValueAsLong( int row, int col ) wxOVERRIDE;
virtual bool GetValueAsBool( int row, int col ) wxOVERRIDE;
virtual void SetValueAsLong( int row, int col, long value );
virtual void SetValueAsBool( int row, int col, bool value );
virtual void SetValueAsLong( int row, int col, long value ) wxOVERRIDE;
virtual void SetValueAsBool( int row, int col, bool value ) wxOVERRIDE;
};
class BugsGridFrame : public wxFrame