Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More use of wxOVERRIDE

Browse Source
This commit is contained in:
Paul Cornett
2019-04-05 11:08:53 -07:00
parent 794c1374b8
commit 9511ab08f1
116 changed files with 874 additions and 873 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/wx/osx/carbon/private/print.h
View File

@@ -23,13 +23,13 @@ public:
wxOSXPrintData();
virtual ~wxOSXPrintData();
virtual bool TransferTo( wxPrintData &data );
virtual bool TransferFrom( const wxPrintData &data );
virtual bool TransferTo( wxPrintData &data ) wxOVERRIDE;
virtual bool TransferFrom( const wxPrintData &data ) wxOVERRIDE;
virtual bool IsOk() const ;
virtual bool IsOk() const wxOVERRIDE;
virtual void TransferFrom( const wxPageSetupDialogData * );
virtual void TransferTo( wxPageSetupDialogData * );
virtual void TransferFrom( const wxPageSetupDialogData * ) wxOVERRIDE;
virtual void TransferTo( wxPageSetupDialogData * ) wxOVERRIDE;
virtual void TransferFrom( const wxPrintDialogData * );
virtual void TransferTo( wxPrintDialogData * );
@@ -69,8 +69,8 @@ public:
WX_NSPrintInfo GetNSPrintInfo() { return m_macPrintInfo; }
protected:
virtual void UpdateFromPMState();
virtual void UpdateToPMState();
virtual void UpdateFromPMState() wxOVERRIDE;
virtual void UpdateToPMState() wxOVERRIDE;
WX_NSPrintInfo m_macPrintInfo;
private:

22
include/wx/osx/carbon/region.h
View File

@@ -37,24 +37,24 @@ public:
virtual ~wxRegion();
// wxRegionBase methods
virtual void Clear();
virtual bool IsEmpty() const;
virtual void Clear() wxOVERRIDE;
virtual bool IsEmpty() const wxOVERRIDE;
// Internal
WXHRGN GetWXHRGN() const ;
protected:
virtual wxGDIRefData *CreateGDIRefData() const;
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE;
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE;
virtual bool DoIsEqual(const wxRegion& region) const;
virtual bool DoGetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const;
virtual wxRegionContain DoContainsPoint(wxCoord x, wxCoord y) const;
virtual wxRegionContain DoContainsRect(const wxRect& rect) const;
virtual bool DoIsEqual(const wxRegion& region) const wxOVERRIDE;
virtual bool DoGetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const wxOVERRIDE;
virtual wxRegionContain DoContainsPoint(wxCoord x, wxCoord y) const wxOVERRIDE;
virtual wxRegionContain DoContainsRect(const wxRect& rect) const wxOVERRIDE;
virtual bool DoOffset(wxCoord x, wxCoord y);
virtual bool DoCombine(const wxRegion& region, wxRegionOp op);
virtual bool DoUnionWithRect(const wxRect& rect);
virtual bool DoOffset(wxCoord x, wxCoord y) wxOVERRIDE;
virtual bool DoCombine(const wxRegion& region, wxRegionOp op) wxOVERRIDE;
virtual bool DoUnionWithRect(const wxRect& rect) wxOVERRIDE;
private:
wxDECLARE_DYNAMIC_CLASS(wxRegion);