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

40
include/wx/propgrid/manager.h
View File

@@ -75,7 +75,7 @@ public:
/** Deletes all properties on page.
*/
virtual void Clear();
virtual void Clear() wxOVERRIDE;
/**
Reduces column sizes to minimum possible that contents are still
@@ -147,7 +147,7 @@ public:
*/
virtual void OnShow();
virtual void RefreshProperty( wxPGProperty* p );
virtual void RefreshProperty( wxPGProperty* p ) wxOVERRIDE;
/** Sets splitter position on page.
@remarks
@@ -163,7 +163,7 @@ protected:
*/
virtual void DoSetSplitterPosition( int pos,
int splitterColumn = 0,
int flags = wxPG_SPLITTER_REFRESH );
int flags = wxPG_SPLITTER_REFRESH ) wxOVERRIDE;
/** Page label (may be referred as name in some parts of documentation).
Can be set in constructor, or passed in
@@ -268,7 +268,7 @@ public:
/** Deletes all all properties and all pages.
*/
virtual void Clear();
virtual void Clear() wxOVERRIDE;
/** Deletes all properties on given page.
*/
@@ -385,7 +385,7 @@ public:
which can be useful for forward-iterating through arbitrary property
containers.
*/
virtual wxPGVIterator GetVIterator( int flags ) const;
virtual wxPGVIterator GetVIterator( int flags ) const wxOVERRIDE;
/** Returns currently selected page.
*/
@@ -424,7 +424,7 @@ public:
protected:
/** Returns wxPropertyGridPageState of given page, current page's for -1.
*/
virtual wxPropertyGridPageState* GetPageState( int page ) const;
virtual wxPropertyGridPageState* GetPageState( int page ) const wxOVERRIDE;
public:
/** Returns number of managed pages. */
@@ -496,7 +496,7 @@ public:
virtual bool IsPropertySelected( wxPGPropArg id ) const;
virtual void Refresh( bool eraseBackground = true,
const wxRect* rect = (const wxRect*) NULL );
const wxRect* rect = (const wxRect*) NULL ) wxOVERRIDE;
/** Removes a page.
@return
@@ -622,23 +622,23 @@ protected:
virtual wxPropertyGrid* CreatePropertyGrid() const;
public:
virtual void RefreshProperty( wxPGProperty* p );
virtual void RefreshProperty( wxPGProperty* p ) wxOVERRIDE;
//
// Overridden functions - no documentation required.
//
void SetId( wxWindowID winid );
virtual void SetExtraStyle ( long exStyle );
virtual bool SetFont ( const wxFont& font );
virtual void SetWindowStyleFlag ( long style );
virtual bool Reparent( wxWindowBase *newParent );
virtual void SetExtraStyle ( long exStyle ) wxOVERRIDE;
virtual bool SetFont ( const wxFont& font ) wxOVERRIDE;
virtual void SetWindowStyleFlag ( long style ) wxOVERRIDE;
virtual bool Reparent( wxWindowBase *newParent ) wxOVERRIDE;
protected:
virtual wxSize DoGetBestSize() const;
virtual wxSize DoGetBestSize() const wxOVERRIDE;
virtual void DoFreeze();
virtual void DoThaw();
virtual void DoFreeze() wxOVERRIDE;
virtual void DoThaw() wxOVERRIDE;
//
// Event handlers
@@ -704,10 +704,10 @@ protected:
bool m_showHeader;
virtual wxPGProperty* DoGetPropertyByName( const wxString& name ) const;
virtual wxPGProperty* DoGetPropertyByName( const wxString& name ) const wxOVERRIDE;
/** Select and displays a given page. */
virtual bool DoSelectPage( int index );
virtual bool DoSelectPage( int index ) wxOVERRIDE;
// Sets some members to defaults.
void Init1();
@@ -719,7 +719,7 @@ protected:
virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle) const;
#endif*/
virtual bool ProcessEvent( wxEvent& event );
virtual bool ProcessEvent( wxEvent& event ) wxOVERRIDE;
/** Recalculates new positions for components, according to the
given size.
@@ -739,8 +739,8 @@ protected:
void SetDescribedProperty( wxPGProperty* p );
// Reimplement these to handle "descboxheight" state item
virtual bool SetEditableStateItem( const wxString& name, wxVariant value );
virtual wxVariant GetEditableStateItem( const wxString& name ) const;
virtual bool SetEditableStateItem( const wxString& name, wxVariant value ) wxOVERRIDE;
virtual wxVariant GetEditableStateItem( const wxString& name ) const wxOVERRIDE;
private:
DECLARE_EVENT_TABLE()

4
include/wx/propgrid/property.h
View File

@@ -313,10 +313,10 @@ public:
}
private:
virtual wxObjectRefData *CreateRefData() const
virtual wxObjectRefData *CreateRefData() const wxOVERRIDE
{ return new wxPGCellData(); }
virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const wxOVERRIDE;
};
// -----------------------------------------------------------------------

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.