fixed WX_CLEAR_HASH_SET to compile

[wxWidgets.git] / include / wx / mac / carbon / dialog.h

diff --git a/include/wx/mac/carbon/dialog.h b/include/wx/mac/carbon/dialog.h
index 2cd80c2b759389ab89ce1ec9bd46aead16ff8480..6b03257503d68c625fdb6258bd0bc4ce34c86b7a 100644 (file)
--- a/include/wx/mac/carbon/dialog.h
+++ b/include/wx/mac/carbon/dialog.h
@@ -16,7 +16,7 @@
 
 WXDLLEXPORT_DATA(extern const wxChar) wxDialogNameStr[];
 
-class WXDLLEXPORT wxMacToolTip ;
+class WXDLLIMPEXP_FWD_CORE wxMacToolTip ;
 
 // Dialog boxes
 class WXDLLEXPORT wxDialog : public wxDialogBase
@@ -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