Unicode fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5189 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/clipbrd.cpp b/src/gtk/clipbrd.cpp
index 32d0991d3e6cc9fdaabe7184d3b6b0ddf33ad40b..bfd34502bd093dbe5072221979d0b8f55ab728ca 100644 (file)
--- a/src/gtk/clipbrd.cpp
+++ b/src/gtk/clipbrd.cpp
@@ -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

diff --git a/src/gtk/utilsres.cpp b/src/gtk/utilsres.cpp
index 749a722e1de4fdd46bcfdaa71e6bb8e1a36660cf..cf2e22fa6962f05e48828dc11e5014059dbe8017 100644 (file)
--- a/src/gtk/utilsres.cpp
+++ b/src/gtk/utilsres.cpp
@@ -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;

diff --git a/src/gtk1/clipbrd.cpp b/src/gtk1/clipbrd.cpp
index 32d0991d3e6cc9fdaabe7184d3b6b0ddf33ad40b..bfd34502bd093dbe5072221979d0b8f55ab728ca 100644 (file)
--- a/src/gtk1/clipbrd.cpp
+++ b/src/gtk1/clipbrd.cpp
@@ -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

diff --git a/src/gtk1/utilsres.cpp b/src/gtk1/utilsres.cpp
index 749a722e1de4fdd46bcfdaa71e6bb8e1a36660cf..cf2e22fa6962f05e48828dc11e5014059dbe8017 100644 (file)
--- a/src/gtk1/utilsres.cpp
+++ b/src/gtk1/utilsres.cpp
@@ -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;