Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compilation fixes for Nano-X

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14408 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-02-25 20:32:37 +00:00
parent 5f7dd65ef8
commit 70b8ab778f
5 changed files with 68 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/x11/dataobj.cpp
View File

@@ -97,11 +97,15 @@ wxDataFormatId wxDataFormat::GetType() const
wxString wxDataFormat::GetId() const
{
#if wxUSE_NANOX
return wxEmptyString;
#else
char *t = XGetAtomName ((Display*) wxGetDisplay(), m_format);
wxString ret( t ); // this will convert from ascii to Unicode
if (t)
XFree( t );
return ret;
#endif
}
void wxDataFormat::SetId( NativeFormat format )
@@ -123,20 +127,24 @@ void wxDataFormat::SetId( NativeFormat format )
void wxDataFormat::SetId( const wxChar *id )
{
#if !wxUSE_NANOX
PrepareFormats();
m_type = wxDF_PRIVATE;
wxString tmp( id );
m_format = XInternAtom( (Display*) wxGetDisplay(), wxMBSTRINGCAST tmp.mbc_str(), FALSE ); // what is the string cast for?
#endif
}
void wxDataFormat::PrepareFormats()
{
#if !wxUSE_NANOX
if (!g_textAtom)
g_textAtom = XInternAtom( (Display*) wxGetDisplay(), "STRING", FALSE );
if (!g_pngAtom)
g_pngAtom = XInternAtom( (Display*) wxGetDisplay(), "image/png", FALSE );
if (!g_fileAtom)
g_fileAtom = XInternAtom( (Display*) wxGetDisplay(), "text/uri-list", FALSE );
#endif
}
//-------------------------------------------------------------------------