X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..a69aabc360d54a93e355fab72c6513c75aaa7337:/include/wx/mac/carbon/dialog.h diff --git a/include/wx/mac/carbon/dialog.h b/include/wx/mac/carbon/dialog.h index 490cd0af5c..aadb9849b7 100644 --- a/include/wx/mac/carbon/dialog.h +++ b/include/wx/mac/carbon/dialog.h @@ -12,15 +12,9 @@ #ifndef _WX_DIALOG_H_ #define _WX_DIALOG_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "dialog.h" -#endif - #include "wx/panel.h" -WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr; - -WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr; +WXDLLEXPORT_DATA(extern const wxChar) wxDialogNameStr[]; class WXDLLEXPORT wxMacToolTip ; @@ -67,7 +61,7 @@ public: ~wxDialog(); // virtual bool Destroy(); - bool Show(bool show = true); + virtual bool Show(bool show = true); void SetModal(bool flag); virtual bool IsModal() const; @@ -78,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