Fix wxEncodingConverter::Convert(wchar_t) documentation.

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

diff --git a/src/motif/dataobj.cpp b/src/motif/dataobj.cpp
index 7b4f82f041074cf9124152ce13a087ca248b3903..0fd6bf384b565eb0a8a8a2ec555b5e7cc43c9cd8 100644 (file)
--- a/src/motif/dataobj.cpp
+++ b/src/motif/dataobj.cpp
@@ -61,12 +61,6 @@ wxDataFormat::wxDataFormat( wxDataFormatId type )
     SetType( type );
 }
 
     SetType( type );
 }
 

-wxDataFormat::wxDataFormat( const wxChar *id )
-{
-    PrepareFormats();
-    SetId( id );
-}
-

 wxDataFormat::wxDataFormat( const wxString &id )
 {
     PrepareFormats();
 wxDataFormat::wxDataFormat( const wxString &id )
 {
     PrepareFormats();


@@ -129,13 +123,12 @@ void wxDataFormat::SetId( NativeFormat format )
         m_type = wxDF_PRIVATE;
 }
 
         m_type = wxDF_PRIVATE;
 }
 

-void wxDataFormat::SetId( const wxChar *id )
+void wxDataFormat::SetId( const wxString& id )

 {
     PrepareFormats();
     m_type = wxDF_PRIVATE;
 {
     PrepareFormats();
     m_type = wxDF_PRIVATE;

-    wxString tmp( id );

     m_format = XInternAtom( wxGlobalDisplay(),
     m_format = XInternAtom( wxGlobalDisplay(),

-                            tmp.mbc_str(), False );
+                            id.mbc_str(), False );

 }
 
 void wxDataFormat::PrepareFormats()
 }
 
 void wxDataFormat::PrepareFormats()


@@ -167,7 +160,7 @@ size_t wxBitmapDataObject::GetDataSize() const
 
 bool wxBitmapDataObject::GetDataHere(void* buf) const
 {
 
 bool wxBitmapDataObject::GetDataHere(void* buf) const
 {

-    if( !GetBitmap().Ok() )
+    if( !GetBitmap().IsOk() )

         return false;
 
     (*(Pixmap*)buf) = (Pixmap)GetBitmap().GetDrawable();
         return false;
 
     (*(Pixmap*)buf) = (Pixmap)GetBitmap().GetDrawable();