X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/45b81639ef31938fbcf512519dbd74a54fbcd1d5..13d4419b86d028b3e7e32b0f94cc45c40dd9551c:/include/wx/mac/carbon/dialog.h diff --git a/include/wx/mac/carbon/dialog.h b/include/wx/mac/carbon/dialog.h index 39d3ec0ad0..351f6b8aee 100644 --- a/include/wx/mac/carbon/dialog.h +++ b/include/wx/mac/carbon/dialog.h @@ -14,12 +14,12 @@ #include "wx/panel.h" -WXDLLEXPORT_DATA(extern const wxChar) wxDialogNameStr[]; +WXDLLIMPEXP_DATA_CORE(extern const char) wxDialogNameStr[]; class WXDLLIMPEXP_FWD_CORE wxMacToolTip ; // Dialog boxes -class WXDLLEXPORT wxDialog : public wxDialogBase +class WXDLLIMPEXP_CORE wxDialog : public wxDialogBase { DECLARE_DYNAMIC_CLASS(wxDialog) @@ -59,15 +59,16 @@ 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); - // implementation // -------------- // show modal dialog and enter modal loop void DoShowModal(); +protected: + // mac also takes command-period as cancel + virtual bool IsEscapeKey(const wxKeyEvent& event); + private: void Init();