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

38
samples/combo/combo.cpp
View File

@@ -62,7 +62,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
@@ -179,7 +179,7 @@ public:
virtual void OnDrawItem( wxDC& dc,
const wxRect& rect,
int item,
int flags ) const
int flags ) const wxOVERRIDE
{
if ( item == wxNOT_FOUND )
return;
@@ -233,7 +233,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
@@ -252,7 +252,7 @@ public:
dc.DrawRectangle(rect);
}
virtual wxCoord OnMeasureItem( size_t item ) const
virtual wxCoord OnMeasureItem( size_t item ) const wxOVERRIDE
{
// Simply demonstrate the ability to have variable-height items
if ( item & 1 )
@@ -261,7 +261,7 @@ public:
return 24;
}
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
}
@@ -279,13 +279,13 @@ class ListViewComboPopup : public wxListView, public wxComboPopup
{
public:
virtual void Init()
virtual void Init() wxOVERRIDE
{
m_value = -1;
m_itemHere = -1; // hot item in list
}
virtual bool Create( wxWindow* parent )
virtual bool Create( wxWindow* parent ) wxOVERRIDE
{
return wxListView::Create(parent,1,
wxPoint(0,0),wxDefaultSize,
@@ -293,16 +293,16 @@ public:
wxLC_SORT_ASCENDING|wxSIMPLE_BORDER);
}
virtual wxWindow *GetControl() { return this; }
virtual wxWindow *GetControl() wxOVERRIDE { return this; }
virtual void SetStringValue( const wxString& s )
virtual void SetStringValue( const wxString& s ) wxOVERRIDE
{
int n = wxListView::FindItem(-1,s);
if ( n >= 0 && n < GetItemCount() )
wxListView::Select(n);
}
virtual wxString GetStringValue() const
virtual wxString GetStringValue() const wxOVERRIDE
{
if ( m_value >= 0 )
return wxListView::GetItemText(m_value);
@@ -373,7 +373,7 @@ class TreeCtrlComboPopup : public wxTreeCtrl, public wxComboPopup
{
public:
virtual void Init()
virtual void Init() wxOVERRIDE
{
}
virtual ~TreeCtrlComboPopup()
@@ -385,7 +385,7 @@ public:
SendDestroyEvent();
}
virtual bool Create( wxWindow* parent )
virtual bool Create( wxWindow* parent ) wxOVERRIDE
{
return wxTreeCtrl::Create(parent,1,
wxPoint(0,0),wxDefaultSize,
@@ -401,12 +401,12 @@ public:
virtual wxSize GetAdjustedSize( int minWidth,
int WXUNUSED(prefHeight),
int maxHeight )
int maxHeight ) wxOVERRIDE
{
return wxSize(wxMax(300,minWidth),wxMin(250,maxHeight));
}
virtual wxWindow *GetControl() { return this; }
virtual wxWindow *GetControl() wxOVERRIDE { return this; }
// Needed by SetStringValue
wxTreeItemId FindItemByText( wxTreeItemId parent, const wxString& text )
@@ -430,7 +430,7 @@ public:
return wxTreeItemId();
}
virtual void SetStringValue( const wxString& s )
virtual void SetStringValue( const wxString& s ) wxOVERRIDE
{
wxTreeItemId root = GetRootItem();
if ( !root.IsOk() )
@@ -444,7 +444,7 @@ public:
}
}
virtual wxString GetStringValue() const
virtual wxString GetStringValue() const wxOVERRIDE
{
if ( m_value.IsOk() )
return wxTreeCtrl::GetItemText(m_value);
@@ -507,7 +507,7 @@ END_EVENT_TABLE()
class wxComboCtrlWithCustomPopupAnim : public wxComboCtrl
{
protected:
virtual bool AnimateShow( const wxRect& rect, int WXUNUSED(flags) )
virtual bool AnimateShow( const wxRect& rect, int WXUNUSED(flags) ) wxOVERRIDE
{
wxWindow* win = GetPopupWindow();
win->SetSize(rect);
@@ -572,7 +572,7 @@ public:
SetButtonBitmaps(bmp,true);
}
virtual void OnButtonClick()
virtual void OnButtonClick() wxOVERRIDE
{
// Show standard wxFileDialog on button click
@@ -590,7 +590,7 @@ public:
}
// Implement empty DoSetPopupControl to prevent assertion failure.
virtual void DoSetPopupControl(wxComboPopup* WXUNUSED(popup))
virtual void DoSetPopupControl(wxComboPopup* WXUNUSED(popup)) wxOVERRIDE
{
}