define (empty) SetIcon() method in wxGenericMDIChildFrame for compatibility with...

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

diff --git a/include/wx/datetime.h b/include/wx/datetime.h
index b990cfb508af923ca19211b5b1c45b3864e476db..5aac2b16d40046d8ee11a11bf2f9ffe7ba78ce70 100644 (file)
--- a/include/wx/datetime.h
+++ b/include/wx/datetime.h
@@ -1108,11 +1108,11 @@ public:
         return date + (end - datestr.begin());
     }
 
-    const wchar_t *ParseFormat(const wchar_t *date,
-                               const wchar_t *format = wxDefaultDateTimeFormat,
-                               const wxDateTime& dateDef = wxDefaultDateTime)
+    const char *ParseFormat(const char *date,
+                            const wxString& format = L"%c",
+                            const wxDateTime& dateDef = wxDefaultDateTime)
     {
-        return ParseFormat(date, wxString(format), dateDef);
+        return ParseFormat(wxString(date), format, dateDef);
     }
 
     const char *ParseFormat(const char *date,