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 50785849f8db93f5dd3253f2198964a4416b5f1e..d5b13e7cc638d027a1d7f2bcf08fbc081a2c3d1c 100644 (file)
--- a/include/wx/cocoa/dialog.h
+++ b/include/wx/cocoa/dialog.h
@@ -6,7 +6,7 @@
 // Created:     2002/12/15
 // RCS-ID:      $Id:
 // Copyright:   David Elliott
 // Created:     2002/12/15
 // RCS-ID:      $Id:
 // Copyright:   David Elliott

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COCOA_DIALOG_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COCOA_DIALOG_H_


@@ -17,7 +17,7 @@
 #include "wx/panel.h"
 #include "wx/cocoa/NSPanel.h"
 
 #include "wx/panel.h"
 #include "wx/cocoa/NSPanel.h"
 

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

 
 // ========================================================================
 // wxDialog
 
 // ========================================================================
 // wxDialog


@@ -81,7 +81,7 @@ protected:
 // Implementation
 // ------------------------------------------------------------------------
 public:
 // Implementation
 // ------------------------------------------------------------------------
 public:

-    bool Show(bool show = true);
+    virtual bool Show(bool show = true);

 
     void SetModal(bool flag);
     virtual bool IsModal() const { return m_isModal; }
 
     void SetModal(bool flag);
     virtual bool IsModal() const { return m_isModal; }


@@ -102,6 +102,10 @@ protected:
     void OnOK(wxCommandEvent& event);
     void OnApply(wxCommandEvent& event);
     void OnCancel(wxCommandEvent& event);
     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_
 };
 
 #endif // _WX_COCOA_DIALOG_H_