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

@@ -46,18 +46,18 @@ public:
virtual ~wxDialog();
// virtual bool Destroy();
virtual bool Show(bool show = true);
virtual bool Show(bool show = true) wxOVERRIDE;
// return true if we're showing the dialog modally
virtual bool IsModal() const;
virtual bool IsModal() const wxOVERRIDE;
// show the dialog modally and return the value passed to EndModal()
virtual int ShowModal();
virtual int ShowModal() wxOVERRIDE;
virtual void ShowWindowModal();
virtual void ShowWindowModal() wxOVERRIDE;
// may be called to terminate the dialog with the given return code
virtual void EndModal(int retCode);
virtual void EndModal(int retCode) wxOVERRIDE;
static bool OSXHasModalDialogsOpen();
void OSXBeginModalDialog();
@@ -71,7 +71,7 @@ public:
// implementation
// --------------
wxDialogModality GetModality() const;
wxDialogModality GetModality() const wxOVERRIDE;
#if wxOSX_USE_COCOA
virtual void ModalFinishedCallback(void* WXUNUSED(panel), int WXUNUSED(returnCode)) {}
@@ -85,7 +85,7 @@ protected:
void EndWindowModal();
// mac also takes command-period as cancel
virtual bool IsEscapeKey(const wxKeyEvent& event);
virtual bool IsEscapeKey(const wxKeyEvent& event) wxOVERRIDE;
wxDialogModality m_modality;