diff --git a/src/gtk/dataobj.cpp b/src/gtk/dataobj.cpp index 913ee2eca3..246e603722 100644 --- a/src/gtk/dataobj.cpp +++ b/src/gtk/dataobj.cpp @@ -44,7 +44,7 @@ wxDataFormat::wxDataFormat( wxDataType 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 ); @@ -127,7 +127,7 @@ wxString wxDataFormat::GetId() const return m_id; } -void wxDataFormat::SetId( const char *id ) +void wxDataFormat::SetId( const wxChar *id ) { m_type = wxDF_PRIVATE; m_id = id; @@ -427,7 +427,7 @@ IMPLEMENT_DYNAMIC_CLASS( wxPrivateDataObject, wxDataObject ) wxPrivateDataObject::wxPrivateDataObject() { - m_id = "application/"; + m_id = _T("application/"); m_id += wxTheApp->GetAppName(); m_format.SetId( m_id ); diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp index 34139b626c..402a02c244 100644 --- a/src/gtk/listbox.cpp +++ b/src/gtk/listbox.cpp @@ -769,7 +769,7 @@ int wxListBox::GetIndex( GtkWidget *item ) const } #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) diff --git a/src/gtk1/dataobj.cpp b/src/gtk1/dataobj.cpp index 913ee2eca3..246e603722 100644 --- a/src/gtk1/dataobj.cpp +++ b/src/gtk1/dataobj.cpp @@ -44,7 +44,7 @@ wxDataFormat::wxDataFormat( wxDataType 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 ); @@ -127,7 +127,7 @@ wxString wxDataFormat::GetId() const return m_id; } -void wxDataFormat::SetId( const char *id ) +void wxDataFormat::SetId( const wxChar *id ) { m_type = wxDF_PRIVATE; m_id = id; @@ -427,7 +427,7 @@ IMPLEMENT_DYNAMIC_CLASS( wxPrivateDataObject, wxDataObject ) wxPrivateDataObject::wxPrivateDataObject() { - m_id = "application/"; + m_id = _T("application/"); m_id += wxTheApp->GetAppName(); m_format.SetId( m_id ); diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp index 34139b626c..402a02c244 100644 --- a/src/gtk1/listbox.cpp +++ b/src/gtk1/listbox.cpp @@ -769,7 +769,7 @@ int wxListBox::GetIndex( GtkWidget *item ) const } #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)