diff --git a/include/wx/html/helpdata.h b/include/wx/html/helpdata.h index 02214510c9..0d842ed2ec 100644 --- a/include/wx/html/helpdata.h +++ b/include/wx/html/helpdata.h @@ -69,8 +69,8 @@ typedef struct { short int m_Level; int m_ID; - char* m_Name; - char* m_Page; + wxChar* m_Name; + wxChar* m_Page; wxHtmlBookRecord *m_Book; } wxHtmlContentsItem; @@ -83,7 +83,7 @@ wxHtmlContentsItem; class WXDLLEXPORT wxSearchEngine : public wxObject { private: - char *m_Keyword; + wxChar *m_Keyword; public: wxSearchEngine() : wxObject() {m_Keyword = NULL; } diff --git a/include/wx/html/htmltag.h b/include/wx/html/htmltag.h index b24bdc0ec5..88aacdd4dd 100644 --- a/include/wx/html/htmltag.h +++ b/include/wx/html/htmltag.h @@ -36,7 +36,7 @@ typedef struct { // end2 is '>' or both are // -1 if there is no ending tag for this one... // or -2 if this is ending tag - char *Name; + wxChar *Name; // name of this tag } sCacheItem; @@ -93,7 +93,7 @@ class WXDLLEXPORT wxHtmlTag : public wxObject //
GetParam("SRC") returns (WhaT.jpg) // (or ("WhaT.jpg") if with_commas == TRUE) - int ScanParam(const wxString& par, char *format, void *param) const; + int ScanParam(const wxString& par, wxChar *format, void *param) const; // Scans param like scanf() functions family do. // Example : ScanParam("COLOR", "\"#%X\"", &clr); // This is always with with_commas=FALSE