set m_encoding in wxCSConv ctor from name

[wxWidgets.git] / include / wx / cocoa / dialog.h

diff --git a/include/wx/cocoa/dialog.h b/include/wx/cocoa/dialog.h
index b4e0145e911d1ca548d5aaf1c0a2042c122d62ae..d5b13e7cc638d027a1d7f2bcf08fbc081a2c3d1c 100644 (file)
--- a/include/wx/cocoa/dialog.h
+++ b/include/wx/cocoa/dialog.h
@@ -17,7 +17,7 @@
 #include "wx/panel.h"
 #include "wx/cocoa/NSPanel.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxDialogNameStr[];
 
 // ========================================================================
 // wxDialog
@@ -102,6 +102,10 @@ protected:
     void OnOK(wxCommandEvent& event);
     void OnApply(wxCommandEvent& event);
     void OnCancel(wxCommandEvent& event);
+
+    // end either modal or modeless dialog
+    void EndDialog(int rc);
+
 };
 
 #endif // _WX_COCOA_DIALOG_H_