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

Unicode fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5189 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ove Kaaven
2000-01-03 02:24:26 +00:00
parent e9fa75816c
commit cbf97a6cd6
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gtk/clipbrd.cpp
View File

@@ -42,7 +42,7 @@ GdkAtom g_targetsAtom = 0;
// the trace mask we use with wxLogTrace() - call // the trace mask we use with wxLogTrace() - call
// wxLog::AddTraceMask(TRACE_CLIPBOARD) to enable the trace messages from here // wxLog::AddTraceMask(TRACE_CLIPBOARD) to enable the trace messages from here
// (there will be a *lot* of them!) // (there will be a *lot* of them!)
static const char *TRACE_CLIPBOARD = _T("clipboard"); static const wxChar *TRACE_CLIPBOARD = _T("clipboard");
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// reminder // reminder

4
src/gtk/utilsres.cpp
View File

@@ -58,7 +58,7 @@ bool wxWriteResource(const wxString& section, const wxString& entry, int value,
return wxWriteResource(section, entry, buf, file); 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 ); wxString filename( file );
if (filename.IsEmpty()) filename = wxT(".wxWindows"); if (filename.IsEmpty()) filename = wxT(".wxWindows");
@@ -72,7 +72,7 @@ bool wxGetResource(const wxString& section, const wxString& entry, char **value,
{ {
if (!result.IsEmpty()) if (!result.IsEmpty())
{ {
char *s = new char[result.Len()+1]; wxChar *s = new wxChar[result.Len()+1];
wxStrcpy( s, result.c_str() ); wxStrcpy( s, result.c_str() );
*value = s; *value = s;
return TRUE; return TRUE;

2
src/gtk1/clipbrd.cpp
View File

@@ -42,7 +42,7 @@ GdkAtom g_targetsAtom = 0;
// the trace mask we use with wxLogTrace() - call // the trace mask we use with wxLogTrace() - call
// wxLog::AddTraceMask(TRACE_CLIPBOARD) to enable the trace messages from here // wxLog::AddTraceMask(TRACE_CLIPBOARD) to enable the trace messages from here
// (there will be a *lot* of them!) // (there will be a *lot* of them!)
static const char *TRACE_CLIPBOARD = _T("clipboard"); static const wxChar *TRACE_CLIPBOARD = _T("clipboard");
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// reminder // reminder

4
src/gtk1/utilsres.cpp
View File

@@ -58,7 +58,7 @@ bool wxWriteResource(const wxString& section, const wxString& entry, int value,
return wxWriteResource(section, entry, buf, file); 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 ); wxString filename( file );
if (filename.IsEmpty()) filename = wxT(".wxWindows"); if (filename.IsEmpty()) filename = wxT(".wxWindows");
@@ -72,7 +72,7 @@ bool wxGetResource(const wxString& section, const wxString& entry, char **value,
{ {
if (!result.IsEmpty()) if (!result.IsEmpty())
{ {
char *s = new char[result.Len()+1]; wxChar *s = new wxChar[result.Len()+1];
wxStrcpy( s, result.c_str() ); wxStrcpy( s, result.c_str() );
*value = s; *value = s;
return TRUE; return TRUE;