compilation fix after last change

[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 c1e0c03e45f1d39fa1584bd77767c70e68fc67a1..5fa0912f67b5fdb501bf203224e661de0aff6896 100644 (file)
--- a/include/wx/mac/carbon/dialog.h
+++ b/include/wx/mac/carbon/dialog.h
@@ -14,7 +14,7 @@
 
 #include "wx/panel.h"
 
 
 #include "wx/panel.h"
 

-WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxDialogNameStr[];

 
 class WXDLLEXPORT wxMacToolTip ;
 
 
 class WXDLLEXPORT wxMacToolTip ;
 


@@ -58,7 +58,7 @@ public:
                 long style = wxDEFAULT_DIALOG_STYLE,
                 const wxString& name = wxDialogNameStr);
 
                 long style = wxDEFAULT_DIALOG_STYLE,
                 const wxString& name = wxDialogNameStr);
 

-    ~wxDialog();
+    virtual ~wxDialog();

 
 //    virtual bool Destroy();
     virtual bool Show(bool show = true);
 
 //    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);
 
     // 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
     // --------------
 
     // 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();
     // show modal dialog and enter modal loop
     void DoShowModal();
 
 private:
     void Init();

+

     bool m_isModalStyle;
     bool m_isModalStyle;

-    DECLARE_EVENT_TABLE()

 };
 
 #endif
 };
 
 #endif