Unicode fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5189 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
e9fa75816c
commit
cbf97a6cd6
@ -42,7 +42,7 @@ GdkAtom g_targetsAtom = 0;
|
||||
// the trace mask we use with wxLogTrace() - call
|
||||
// wxLog::AddTraceMask(TRACE_CLIPBOARD) to enable the trace messages from here
|
||||
// (there will be a *lot* of them!)
|
||||
static const char *TRACE_CLIPBOARD = _T("clipboard");
|
||||
static const wxChar *TRACE_CLIPBOARD = _T("clipboard");
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// reminder
|
||||
|
@ -58,7 +58,7 @@ bool wxWriteResource(const wxString& section, const wxString& entry, int value,
|
||||
return wxWriteResource(section, entry, buf, file);
|
||||
}
|
||||
|
||||
bool wxGetResource(const wxString& section, const wxString& entry, char **value, const wxString& file )
|
||||
bool wxGetResource(const wxString& section, const wxString& entry, wxChar **value, const wxString& file )
|
||||
{
|
||||
wxString filename( file );
|
||||
if (filename.IsEmpty()) filename = wxT(".wxWindows");
|
||||
@ -72,7 +72,7 @@ bool wxGetResource(const wxString& section, const wxString& entry, char **value,
|
||||
{
|
||||
if (!result.IsEmpty())
|
||||
{
|
||||
char *s = new char[result.Len()+1];
|
||||
wxChar *s = new wxChar[result.Len()+1];
|
||||
wxStrcpy( s, result.c_str() );
|
||||
*value = s;
|
||||
return TRUE;
|
||||
|
@ -42,7 +42,7 @@ GdkAtom g_targetsAtom = 0;
|
||||
// the trace mask we use with wxLogTrace() - call
|
||||
// wxLog::AddTraceMask(TRACE_CLIPBOARD) to enable the trace messages from here
|
||||
// (there will be a *lot* of them!)
|
||||
static const char *TRACE_CLIPBOARD = _T("clipboard");
|
||||
static const wxChar *TRACE_CLIPBOARD = _T("clipboard");
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// reminder
|
||||
|
@ -58,7 +58,7 @@ bool wxWriteResource(const wxString& section, const wxString& entry, int value,
|
||||
return wxWriteResource(section, entry, buf, file);
|
||||
}
|
||||
|
||||
bool wxGetResource(const wxString& section, const wxString& entry, char **value, const wxString& file )
|
||||
bool wxGetResource(const wxString& section, const wxString& entry, wxChar **value, const wxString& file )
|
||||
{
|
||||
wxString filename( file );
|
||||
if (filename.IsEmpty()) filename = wxT(".wxWindows");
|
||||
@ -72,7 +72,7 @@ bool wxGetResource(const wxString& section, const wxString& entry, char **value,
|
||||
{
|
||||
if (!result.IsEmpty())
|
||||
{
|
||||
char *s = new char[result.Len()+1];
|
||||
wxChar *s = new wxChar[result.Len()+1];
|
||||
wxStrcpy( s, result.c_str() );
|
||||
*value = s;
|
||||
return TRUE;
|
||||
|
Loading…
Reference in New Issue
Block a user