X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..34b1fdebbf3d40caaffad62b5bf89604213afb4a:/include/wx/mac/carbon/dialog.h

diff --git a/include/wx/mac/carbon/dialog.h b/include/wx/mac/carbon/dialog.h
index b73d05e911..fab1aabaec 100644
--- a/include/wx/mac/carbon/dialog.h
+++ b/include/wx/mac/carbon/dialog.h
@@ -14,11 +14,9 @@
 
 #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 ;
+class WXDLLIMPEXP_FWD_CORE wxMacToolTip ;
 
 // Dialog boxes
 class WXDLLEXPORT wxDialog : public wxDialogBase
@@ -28,19 +26,6 @@ class WXDLLEXPORT wxDialog : public wxDialogBase
 public:
     wxDialog() { Init(); }
 
-    // Constructor with a modal flag, but no window id - the old convention
-    wxDialog(wxWindow *parent,
-             const wxString& title, bool modal,
-             int x = -1, int y= -1, int width = 500, int height = 500,
-             long style = wxDEFAULT_DIALOG_STYLE,
-             const wxString& name = wxDialogNameStr)
-    {
-        Init();
-        m_isModalStyle = modal;
-        Create(parent, -1, title, wxPoint(x, y), wxSize(width, height),
-               style, name);
-    }
-
     // Constructor with no modal flag - the new convention.
     wxDialog(wxWindow *parent, wxWindowID id,
              const wxString& title,
@@ -60,7 +45,7 @@ public:
                 long style = wxDEFAULT_DIALOG_STYLE,
                 const wxString& name = wxDialogNameStr);
 
-    ~wxDialog();
+    virtual ~wxDialog();
 
 //    virtual bool Destroy();
     virtual bool Show(bool show = true);
@@ -74,31 +59,20 @@ public:
     // may be called to terminate the dialog with the given return code
     virtual void EndModal(int retCode);
 
-    // 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();
 
+protected:
+    // mac also takes command-period as cancel
+    virtual bool IsEscapeKey(const wxKeyEvent& event);
+
 private:
     void Init();
+
     bool m_isModalStyle;
-    DECLARE_EVENT_TABLE()
 };
 
 #endif