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

22
include/wx/propgrid/propgrid.h
View File

@@ -834,7 +834,7 @@ public:
/** Deletes all properties.
*/
virtual void Clear();
virtual void Clear() wxOVERRIDE;
/** Clears action triggers for given action.
@param action
@@ -1090,7 +1090,7 @@ public:
/** Redraws given property.
*/
virtual void RefreshProperty( wxPGProperty* p );
virtual void RefreshProperty( wxPGProperty* p ) wxOVERRIDE;
/** Registers a new editor class.
@return
@@ -1700,7 +1700,7 @@ public:
*/
bool UnfocusEditor();
virtual void SetWindowStyleFlag( long style );
virtual void SetWindowStyleFlag( long style ) wxOVERRIDE;
void DrawItems( const wxPGProperty* p1, const wxPGProperty* p2 );
@@ -1763,20 +1763,20 @@ public:
bool DoSelectProperty( wxPGProperty* p, unsigned int flags = 0 );
// Overridden functions.
virtual bool Destroy();
virtual bool Destroy() wxOVERRIDE;
// Returns property at given y coordinate (relative to grid's top left).
wxPGProperty* GetItemAtY( int y ) const { return DoGetItemAtY(y); }
virtual void Refresh( bool eraseBackground = true,
const wxRect *rect = (const wxRect *) NULL );
virtual bool SetFont( const wxFont& font );
virtual void SetExtraStyle( long exStyle );
virtual bool Reparent( wxWindowBase *newParent );
const wxRect *rect = (const wxRect *) NULL ) wxOVERRIDE;
virtual bool SetFont( const wxFont& font ) wxOVERRIDE;
virtual void SetExtraStyle( long exStyle ) wxOVERRIDE;
virtual bool Reparent( wxWindowBase *newParent ) wxOVERRIDE;
protected:
virtual void DoThaw();
virtual void DoThaw() wxOVERRIDE;
virtual wxSize DoGetBestSize() const;
virtual wxSize DoGetBestSize() const wxOVERRIDE;
#ifndef wxPG_ICON_WIDTH
wxBitmap *m_expandbmp, *m_collbmp;
@@ -2392,7 +2392,7 @@ public:
~wxPropertyGridEvent();
/** Copyer. */
virtual wxEvent* Clone() const;
virtual wxEvent* Clone() const wxOVERRIDE;
/**
Returns the column index associated with this event.