X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8ecff18117f8cabc0f515ad81aa4ad265e5e17d3..64ea838d8f4d1853b7d850db93ee565e901d099a:/src/gtk1/utilsres.cpp diff --git a/src/gtk1/utilsres.cpp b/src/gtk1/utilsres.cpp index 76deb2b6be..f8f41519a6 100644 --- a/src/gtk1/utilsres.cpp +++ b/src/gtk1/utilsres.cpp @@ -10,15 +10,16 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" +#include "wx/utils.h" + #ifndef WX_PRECOMP #include "wx/list.h" + #include "wx/string.h" + #include "wx/log.h" + #include "wx/app.h" #endif -#include "wx/utils.h" -#include "wx/string.h" -#include "wx/log.h" #include "wx/config.h" -#include "wx/app.h" //----------------------------------------------------------------------------- // resource functions @@ -90,7 +91,7 @@ bool wxGetResource(const wxString& section, const wxString& entry, float *value, bool succ = wxGetResource(section, entry, (wxChar **)&s, file); if (succ) { - *value = (float)wxStrtod(s, NULL); + *value = (float)wxStrtod(s, (wchar_t **) NULL); delete[] s; return true; } @@ -103,7 +104,7 @@ bool wxGetResource(const wxString& section, const wxString& entry, long *value, bool succ = wxGetResource(section, entry, (wxChar **)&s, file); if (succ) { - *value = wxStrtol(s, NULL, 10); + *value = wxStrtol(s, (wchar_t **) NULL, 10); delete[] s; return true; } @@ -116,7 +117,7 @@ bool wxGetResource(const wxString& section, const wxString& entry, int *value, c bool succ = wxGetResource(section, entry, (wxChar **)&s, file); if (succ) { - *value = (int)wxStrtol(s, NULL, 10); + *value = (int)wxStrtol(s, (wchar_t **) NULL, 10); delete[] s; return true; }