X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/63ec432bd7b9c93961e85e871bcb31758364a634..8a7e4b38b8fa4d31b805a0cf1779a9b95142f05b:/include/wx/mac/carbon/dialog.h diff --git a/include/wx/mac/carbon/dialog.h b/include/wx/mac/carbon/dialog.h index 2cd80c2b75..5fa0912f67 100644 --- a/include/wx/mac/carbon/dialog.h +++ b/include/wx/mac/carbon/dialog.h @@ -58,7 +58,7 @@ public: long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxDialogNameStr); - ~wxDialog(); + virtual ~wxDialog(); // virtual bool Destroy(); virtual bool Show(bool show = true); @@ -72,31 +72,22 @@ public: // may be called to terminate the dialog with the given return code virtual void EndModal(int retCode); + // mac also takes command-period as cancel + virtual bool IsEscapeKey(const wxKeyEvent& event); + // returns TRUE if we're in a modal loop bool IsModalShowing() const; // implementation // -------------- - // event handlers - void OnCharHook(wxKeyEvent& event); - void OnCloseWindow(wxCloseEvent& event); - - // Standard buttons - void OnOK(wxCommandEvent& event); - void OnApply(wxCommandEvent& event); - void OnCancel(wxCommandEvent& event); - - // Responds to colour changes - void OnSysColourChanged(wxSysColourChangedEvent& event); - // show modal dialog and enter modal loop void DoShowModal(); private: void Init(); + bool m_isModalStyle; - DECLARE_EVENT_TABLE() }; #endif