Killing more wxConvLibc calls...

[wxWidgets.git] / src / x11 / dataobj.cpp

diff --git a/src/x11/dataobj.cpp b/src/x11/dataobj.cpp
index 75028159fe61d74a5aeffaa20fecd956f4147f2c..c3730280895b95324d169a3ab9938408457df91a 100644 (file)
--- a/src/x11/dataobj.cpp
+++ b/src/x11/dataobj.cpp
@@ -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
 }
 
 //-------------------------------------------------------------------------