add a critical section protecting ms_prev variables (replaces patch 1819224)

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

diff --git a/include/wx/cocoa/dataform.h b/include/wx/cocoa/dataform.h
index 17b95ee4a85c3b682085d9e318a405fe9f937a83..285a13913e814006afc6a2d9399c9825763c347e 100644 (file)
--- a/include/wx/cocoa/dataform.h
+++ b/include/wx/cocoa/dataform.h
@@ -16,7 +16,7 @@ class wxDataFormat
 {
 public:
     wxDataFormat(unsigned int uFormat = wxDF_INVALID) { m_uFormat = uFormat; }
-    wxDataFormat(const wxChar* zFormat) { SetId(zFormat); }
+    wxDataFormat(const wxString& zFormat) { SetId(zFormat); }
 
     wxDataFormat& operator=(unsigned int uFormat) { m_uFormat = uFormat; return(*this); }
     wxDataFormat& operator=(const wxDataFormat& rFormat) {m_uFormat = rFormat.m_uFormat; return(*this); }
@@ -42,7 +42,7 @@ public:
     // application-specific formats
     //
     wxString GetId(void) const;
-    void     SetId(const wxChar* WXUNUSED(pId)) { /* TODO */ }
+    void     SetId(const wxString& WXUNUSED(pId)) { /* TODO */ }
 
 private:
     unsigned int                    m_uFormat;