Added wxDataViewCtrl::AppendIconTextColumn

[wxWidgets.git] / include / wx / archive.h

diff --git a/include/wx/archive.h b/include/wx/archive.h
index 7acebd1e28e6be3b68a23fe0f77cb2086fa19a63..67419a91fc2364dc710bb0fe72abf68f9099c8e5 100644 (file)
--- a/include/wx/archive.h
+++ b/include/wx/archive.h
@@ -341,11 +341,13 @@ public:
         const wxString& name,
         wxPathFormat format = wxPATH_NATIVE) const = 0;
 
         const wxString& name,
         wxPathFormat format = wxPATH_NATIVE) const = 0;
 

+    // FIXME-UTF8: remove these from this file, they are used for ANSI
+    //             build only

     void SetConv(wxMBConv& conv) { m_pConv = &conv; }
     wxMBConv& GetConv() const
         { if (m_pConv) return *m_pConv; else return wxConvLocal; }
 
     void SetConv(wxMBConv& conv) { m_pConv = &conv; }
     wxMBConv& GetConv() const
         { if (m_pConv) return *m_pConv; else return wxConvLocal; }
 

-    static const wxArchiveClassFactory *Find(const wxChar *protocol,
+    static const wxArchiveClassFactory *Find(const wxString& protocol,

                                              wxStreamProtocolType type
                                              = wxSTREAM_PROTOCOL);
 
                                              wxStreamProtocolType type
                                              = wxSTREAM_PROTOCOL);