Only give capture to wxPopupTransientWindow child if it's the only one.

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

diff --git a/src/motif/dataobj.cpp b/src/motif/dataobj.cpp
index bdecb6f26bd94844ecb7395092feba2fcdfddd81..2a4eb9404d0f4fe7cb80bb1d7feac0de08b50f2d 100644 (file)
--- a/src/motif/dataobj.cpp
+++ b/src/motif/dataobj.cpp
@@ -2,7 +2,6 @@
 // Name:        src/motif/dataobj.cpp
 // Purpose:     wxDataObject class
 // Author:      Julian Smart
-// Id:          $Id$
 // Copyright:   (c) 1998 Julian Smart
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -16,10 +15,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
+    #include "wx/utils.h"
 #endif
 
-#include "wx/utils.h"
-
 #ifdef __VMS__
 #pragma message disable nosimpint
 #endif
@@ -62,12 +60,6 @@ wxDataFormat::wxDataFormat( wxDataFormatId type )
     SetType( type );
 }
 
-wxDataFormat::wxDataFormat( const wxChar *id )
-{
-    PrepareFormats();
-    SetId( id );
-}
-
 wxDataFormat::wxDataFormat( const wxString &id )
 {
     PrepareFormats();
@@ -130,13 +122,12 @@ void wxDataFormat::SetId( NativeFormat format )
         m_type = wxDF_PRIVATE;
 }
 
-void wxDataFormat::SetId( const wxChar *id )
+void wxDataFormat::SetId( const wxString& id )
 {
     PrepareFormats();
     m_type = wxDF_PRIVATE;
-    wxString tmp( id );
     m_format = XInternAtom( wxGlobalDisplay(),
-                            tmp.mbc_str(), False );
+                            id.mbc_str(), False );
 }
 
 void wxDataFormat::PrepareFormats()
@@ -168,7 +159,7 @@ size_t wxBitmapDataObject::GetDataSize() const
 
 bool wxBitmapDataObject::GetDataHere(void* buf) const
 {
-    if( !GetBitmap().Ok() )
+    if( !GetBitmap().IsOk() )
         return false;
 
     (*(Pixmap*)buf) = (Pixmap)GetBitmap().GetDrawable();