These at least compiles in Unicode mode...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2167 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ove Kaaven
1999-04-14 21:53:47 +00:00
parent 578c208107
commit 93c5dd39af
20 changed files with 364 additions and 356 deletions

View File

@@ -78,7 +78,7 @@ wxDataFormat::wxDataFormat( const GdkAtom atom )
m_type = wxDF_PRIVATE;
m_id = gdk_atom_name( m_atom );
if (m_id == "file:ALL")
if (m_id == _T("file:ALL"))
{
m_type = wxDF_FILENAME;
}
@@ -91,21 +91,21 @@ void wxDataFormat::SetType( wxDataType type )
if (m_type == wxDF_TEXT)
{
m_id = "STRING";
m_id = _T("STRING");
}
else
if (m_type == wxDF_BITMAP)
{
m_id = "BITMAP";
m_id = _T("BITMAP");
}
else
if (m_type == wxDF_FILENAME)
{
m_id = "file:ALL";
m_id = _T("file:ALL");
}
else
{
wxFAIL_MSG( "invalid dataformat" );
wxFAIL_MSG( _T("invalid dataformat") );
}
m_hasAtom = FALSE;
@@ -146,7 +146,7 @@ GdkAtom wxDataFormat::GetAtom()
else
if (m_type == wxDF_PRIVATE)
{
m_atom = gdk_atom_intern( WXSTRINGCAST( m_id ), FALSE );
m_atom = gdk_atom_intern( MBSTRINGCAST m_id.mbc_str(), FALSE );
}
else
if (m_type == wxDF_FILENAME)
@@ -352,7 +352,7 @@ wxFileDataObject::wxFileDataObject()
void wxFileDataObject::AddFile( const wxString &file )
{
m_files += file;
m_files += (char)0;
m_files += (wxChar)0;
}
wxString wxFileDataObject::GetFiles() const