Unicode fix.

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

diff --git a/src/gtk/dataobj.cpp b/src/gtk/dataobj.cpp
index 913ee2eca38af0d69387d25d5e058f5c60aa4e37..246e603722921806ec760265806a6c5a9a72481c 100644 (file)
--- a/src/gtk/dataobj.cpp
+++ b/src/gtk/dataobj.cpp
@@ -44,7 +44,7 @@ wxDataFormat::wxDataFormat( wxDataType type )
     SetType( type );
 }
 
     SetType( type );
 }
 

-wxDataFormat::wxDataFormat( const char *id )
+wxDataFormat::wxDataFormat( const wxChar *id )

 {
     if (!g_textAtom) g_textAtom = gdk_atom_intern( "STRING", FALSE );
     SetId( id );
 {
     if (!g_textAtom) g_textAtom = gdk_atom_intern( "STRING", FALSE );
     SetId( id );


@@ -127,7 +127,7 @@ wxString wxDataFormat::GetId() const
     return m_id;
 }
 
     return m_id;
 }
 

-void wxDataFormat::SetId( const char *id )
+void wxDataFormat::SetId( const wxChar *id )

 {
     m_type = wxDF_PRIVATE;
     m_id = id;
 {
     m_type = wxDF_PRIVATE;
     m_id = id;


@@ -427,7 +427,7 @@ IMPLEMENT_DYNAMIC_CLASS( wxPrivateDataObject, wxDataObject )
 
 wxPrivateDataObject::wxPrivateDataObject() 
 { 
 
 wxPrivateDataObject::wxPrivateDataObject() 
 { 

-    m_id = "application/";
+    m_id = _T("application/");

     m_id += wxTheApp->GetAppName();
     
     m_format.SetId( m_id );
     m_id += wxTheApp->GetAppName();
     
     m_format.SetId( m_id );

diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp
index 34139b626c9384d4beaef18394bee36a572e5613..402a02c244f38b11d08b8de081939ca410964059 100644 (file)
--- a/src/gtk/listbox.cpp
+++ b/src/gtk/listbox.cpp
@@ -769,7 +769,7 @@ int wxListBox::GetIndex( GtkWidget *item ) const
 }
 
 #if wxUSE_TOOLTIPS
 }
 
 #if wxUSE_TOOLTIPS

-void wxListBox::ApplyToolTip( GtkTooltips *tips, const char *tip )
+void wxListBox::ApplyToolTip( GtkTooltips *tips, const wxChar *tip )

 {
     GList *child = m_list->children;
     while (child)
 {
     GList *child = m_list->children;
     while (child)

diff --git a/src/gtk1/dataobj.cpp b/src/gtk1/dataobj.cpp
index 913ee2eca38af0d69387d25d5e058f5c60aa4e37..246e603722921806ec760265806a6c5a9a72481c 100644 (file)
--- a/src/gtk1/dataobj.cpp
+++ b/src/gtk1/dataobj.cpp
@@ -44,7 +44,7 @@ wxDataFormat::wxDataFormat( wxDataType type )
     SetType( type );
 }
 
     SetType( type );
 }
 

-wxDataFormat::wxDataFormat( const char *id )
+wxDataFormat::wxDataFormat( const wxChar *id )

 {
     if (!g_textAtom) g_textAtom = gdk_atom_intern( "STRING", FALSE );
     SetId( id );
 {
     if (!g_textAtom) g_textAtom = gdk_atom_intern( "STRING", FALSE );
     SetId( id );


@@ -127,7 +127,7 @@ wxString wxDataFormat::GetId() const
     return m_id;
 }
 
     return m_id;
 }
 

-void wxDataFormat::SetId( const char *id )
+void wxDataFormat::SetId( const wxChar *id )

 {
     m_type = wxDF_PRIVATE;
     m_id = id;
 {
     m_type = wxDF_PRIVATE;
     m_id = id;


@@ -427,7 +427,7 @@ IMPLEMENT_DYNAMIC_CLASS( wxPrivateDataObject, wxDataObject )
 
 wxPrivateDataObject::wxPrivateDataObject() 
 { 
 
 wxPrivateDataObject::wxPrivateDataObject() 
 { 

-    m_id = "application/";
+    m_id = _T("application/");

     m_id += wxTheApp->GetAppName();
     
     m_format.SetId( m_id );
     m_id += wxTheApp->GetAppName();
     
     m_format.SetId( m_id );

diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp
index 34139b626c9384d4beaef18394bee36a572e5613..402a02c244f38b11d08b8de081939ca410964059 100644 (file)
--- a/src/gtk1/listbox.cpp
+++ b/src/gtk1/listbox.cpp
@@ -769,7 +769,7 @@ int wxListBox::GetIndex( GtkWidget *item ) const
 }
 
 #if wxUSE_TOOLTIPS
 }
 
 #if wxUSE_TOOLTIPS

-void wxListBox::ApplyToolTip( GtkTooltips *tips, const char *tip )
+void wxListBox::ApplyToolTip( GtkTooltips *tips, const wxChar *tip )

 {
     GList *child = m_list->children;
     while (child)
 {
     GList *child = m_list->children;
     while (child)