make wxTmemchr() return (and take) char* instead of void* in ANSI build too

[wxWidgets.git] / include / wx / mac / corefoundation / stdpaths.h

diff --git a/include/wx/mac/corefoundation/stdpaths.h b/include/wx/mac/corefoundation/stdpaths.h
index a73ca4b5149b6ad7d28b8bfd48ae8505f15e8aae..3fcb8d5676beca3ffefe77773e93d225a857d867 100644 (file)
--- a/include/wx/mac/corefoundation/stdpaths.h
+++ b/include/wx/mac/corefoundation/stdpaths.h
@@ -26,13 +26,14 @@ class WXDLLIMPEXP_BASE wxStandardPathsCF : public wxStandardPathsBase
 {
 public:
     wxStandardPathsCF();
-    ~wxStandardPathsCF();
+    virtual ~wxStandardPathsCF();
 
     // wxMac specific: allow user to specify a different bundle
     wxStandardPathsCF(wxCFBundleRef bundle);
     void SetBundle(wxCFBundleRef bundle);
 
     // implement base class pure virtuals
+    virtual wxString GetExecutablePath() const;
     virtual wxString GetConfigDir() const;
     virtual wxString GetUserConfigDir() const;
     virtual wxString GetDataDir() const;
@@ -40,8 +41,9 @@ public:
     virtual wxString GetUserDataDir() const;
     virtual wxString GetPluginsDir() const;
     virtual wxString GetResourcesDir() const;
-    virtual wxString GetLocalizedResourcesDir(const wxChar *lang,
-                                              ResourceCat category) const;
+    virtual wxString
+    GetLocalizedResourcesDir(const wxString& lang,
+                             ResourceCat category = ResourceCat_None) const;
     virtual wxString GetDocumentsDir() const;
 
 protected: