Unicode fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2260 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
107dcfab63
commit
b5be07d450
@ -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 );
|
if (!g_textAtom) g_textAtom = gdk_atom_intern( "STRING", FALSE );
|
||||||
SetId( id );
|
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_type = wxDF_PRIVATE;
|
||||||
m_id = id;
|
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_id += wxTheApp->GetAppName();
|
||||||
|
|
||||||
m_format.SetId( m_id );
|
m_format.SetId( m_id );
|
||||||
|
@ -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;
|
GList *child = m_list->children;
|
||||||
while (child)
|
while (child)
|
||||||
|
@ -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 );
|
if (!g_textAtom) g_textAtom = gdk_atom_intern( "STRING", FALSE );
|
||||||
SetId( id );
|
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_type = wxDF_PRIVATE;
|
||||||
m_id = id;
|
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_id += wxTheApp->GetAppName();
|
||||||
|
|
||||||
m_format.SetId( m_id );
|
m_format.SetId( m_id );
|
||||||
|
@ -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;
|
GList *child = m_list->children;
|
||||||
while (child)
|
while (child)
|
||||||
|
Loading…
Reference in New Issue
Block a user