Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dont use wxChar* arguments in wxHTML API

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47005 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-06-28 17:33:59 +00:00
parent 330e8ab901
commit d7640339e9
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/html/htmltag.h
View File

@@ -105,7 +105,8 @@ public:
// (like sscanf() does) // (like sscanf() does)
// NOTE: unlike scanf family, this function only accepts // NOTE: unlike scanf family, this function only accepts
// *one* parameter ! // *one* parameter !
int ScanParam(const wxString& par, const wxChar *format, void *param) const; int ScanParam(const wxString& par, const char *format, void *param) const;
int ScanParam(const wxString& par, const wchar_t *format, void *param) const;
// Returns string containing all params. // Returns string containing all params.
wxString GetAllParams() const; wxString GetAllParams() const;

10
src/html/htmltag.cpp
View File

@@ -407,7 +407,15 @@ wxString wxHtmlTag::GetParam(const wxString& par, bool with_commas) const
} }
int wxHtmlTag::ScanParam(const wxString& par, int wxHtmlTag::ScanParam(const wxString& par,
const wxChar *format, const char *format,
void *param) const
{
wxString parval = GetParam(par);
return wxSscanf(parval, format, param);
}
int wxHtmlTag::ScanParam(const wxString& par,
const wchar_t *format,
void *param) const void *param) const
{ {
wxString parval = GetParam(par); wxString parval = GetParam(par);