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/printdlg.h
View File

@@ -33,11 +33,11 @@ public:
virtual ~wxMacPrintDialog();
bool Create(wxWindow *parent, wxPrintDialogData* data = NULL);
virtual int ShowModal();
virtual int ShowModal() wxOVERRIDE;
virtual wxPrintDialogData& GetPrintDialogData() { return m_printDialogData; }
virtual wxPrintData& GetPrintData() { return m_printDialogData.GetPrintData(); }
virtual wxDC *GetPrintDC();
virtual wxPrintDialogData& GetPrintDialogData() wxOVERRIDE { return m_printDialogData; }
virtual wxPrintData& GetPrintData() wxOVERRIDE { return m_printDialogData.GetPrintData(); }
virtual wxDC *GetPrintDC() wxOVERRIDE;
private:
wxPrintDialogData m_printDialogData;
@@ -60,10 +60,10 @@ public:
wxMacPageSetupDialog(wxWindow *parent, wxPageSetupDialogData *data = NULL);
virtual ~wxMacPageSetupDialog();
virtual wxPageSetupDialogData& GetPageSetupDialogData();
virtual wxPageSetupDialogData& GetPageSetupDialogData() wxOVERRIDE;
bool Create(wxWindow *parent, wxPageSetupDialogData *data = NULL);
virtual int ShowModal();
virtual int ShowModal() wxOVERRIDE;
private:
wxPageSetupDialogData m_pageSetupData;
@@ -86,7 +86,7 @@ class WXDLLIMPEXP_CORE wxMacPageMarginsDialog : public wxDialog
public:
wxMacPageMarginsDialog(wxFrame* parent, wxPageSetupDialogData* data);
bool TransferToWindow();
bool TransferDataFromWindow();
bool TransferDataFromWindow() wxOVERRIDE;
virtual wxPageSetupDialogData& GetPageSetupDialogData() { return *m_pageSetupDialogData; }