Calculate correct client size for windows that are using deferred sizing.

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

diff --git a/src/x11/dataobj.cpp b/src/x11/dataobj.cpp
index 21e8776a298d6b461e360c3c2b0eda2d68c1bc09..fadc4afd80ed4a5a1f7e20eb254115c2e5832ac3 100644 (file)
--- a/src/x11/dataobj.cpp
+++ b/src/x11/dataobj.cpp
@@ -7,12 +7,10 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-    #pragma implementation "dataobj.h"
-#endif
-

 #include "wx/defs.h"
 
 #include "wx/defs.h"
 

+#if wxUSE_DATAOBJ
+

 #include "wx/dataobj.h"
 #include "wx/mstream.h"
 #include "wx/app.h"
 #include "wx/dataobj.h"
 #include "wx/mstream.h"
 #include "wx/app.h"


@@ -102,7 +100,7 @@ wxString wxDataFormat::GetId() const
     return wxEmptyString;
 #else
     char *t = XGetAtomName ((Display*) wxGetDisplay(), m_format);
     return wxEmptyString;
 #else
     char *t = XGetAtomName ((Display*) wxGetDisplay(), m_format);

-    wxString ret( t );  // this will convert from ascii to Unicode
+    wxString ret = wxString::FromAscii( t );

     if (t) 
         XFree( t );
     return ret;
     if (t) 
         XFree( t );
     return ret;


@@ -132,7 +130,7 @@ void wxDataFormat::SetId( const wxChar *id )
     PrepareFormats();
     m_type = wxDF_PRIVATE;
     wxString tmp( id );
     PrepareFormats();
     m_type = wxDF_PRIVATE;
     wxString tmp( id );

-    m_format = XInternAtom( (Display*) wxGetDisplay(), wxMBSTRINGCAST tmp.mbc_str(), FALSE );  // what is the string cast for?
+    m_format = XInternAtom( (Display*) wxGetDisplay(), tmp.ToAscii(), FALSE ); 

 #endif
 }
 
 #endif
 }
 


@@ -351,7 +349,7 @@ bool wxBitmapDataObject::SetData(size_t size, const void *buf)
         return FALSE;
     }
 
         return FALSE;
     }
 

-    m_bitmap = image.ConvertToBitmap();
+    m_bitmap = image;

 
     return m_bitmap.Ok();
 #else
 
     return m_bitmap.Ok();
 #else


@@ -365,7 +363,7 @@ void wxBitmapDataObject::DoConvertToPng()
     if (!m_bitmap.Ok())
         return;
 
     if (!m_bitmap.Ok())
         return;
 

-    wxImage image( m_bitmap );
+    wxImage image = m_bitmap.ConvertToImage();

     wxPNGHandler handler;
 
     wxCountingOutputStream count;
     wxPNGHandler handler;
 
     wxCountingOutputStream count;


@@ -379,3 +377,5 @@ void wxBitmapDataObject::DoConvertToPng()
 #endif
 }
 
 #endif
 }
 

+#endif // wxUSE_DATAOBJ
+