avoid setting initial position if it was not specified, broken in r70734

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

diff --git a/src/x11/dataobj.cpp b/src/x11/dataobj.cpp
index b9b8f7a37d259fa8dd4e89d287287749d1cda3d9..06f650c652a6a2529a87d1c9a5f0bafc909965de 100644 (file)
--- a/src/x11/dataobj.cpp
+++ b/src/x11/dataobj.cpp
@@ -2,7 +2,6 @@
 // Name:        src/x11/dataobj.cpp
 // Purpose:     wxDataObject class
 // Author:      Julian Smart
 // Name:        src/x11/dataobj.cpp
 // Purpose:     wxDataObject class
 // Author:      Julian Smart

-// Id:          $Id$

 // Copyright:   (c) 1998 Julian Smart
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1998 Julian Smart
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -243,12 +242,12 @@ bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *buf)
         if ( (*p == '\r' && *(p+1) == '\n') || !*p )
         {
             size_t lenPrefix = 5; // strlen("file:")
         if ( (*p == '\r' && *(p+1) == '\n') || !*p )
         {
             size_t lenPrefix = 5; // strlen("file:")

-            if ( filename.Left(lenPrefix).MakeLower() == _T("file:") )
+            if ( filename.Left(lenPrefix).MakeLower() == wxT("file:") )

             {
                 // sometimes the syntax is "file:filename", sometimes it's
                 // URL-like: "file://filename" - deal with both
             {
                 // sometimes the syntax is "file:filename", sometimes it's
                 // URL-like: "file://filename" - deal with both

-                if ( filename[lenPrefix] == _T('/') &&
-                     filename[lenPrefix + 1] == _T('/') )
+                if ( filename[lenPrefix] == wxT('/') &&
+                     filename[lenPrefix + 1] == wxT('/') )

                 {
                     // skip the slashes
                     lenPrefix += 2;
                 {
                     // skip the slashes
                     lenPrefix += 2;


@@ -259,7 +258,7 @@ bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *buf)
             }
             else
             {
             }
             else
             {

-                wxLogDebug(_T("Unsupported URI '%s' in wxFileDataObject"),
+                wxLogDebug(wxT("Unsupported URI '%s' in wxFileDataObject"),

                            filename.c_str());
             }
 
                            filename.c_str());
             }
 


@@ -349,7 +348,7 @@ bool wxBitmapDataObject::SetData(size_t size, const void *buf)
 
     m_bitmap = image;
 
 
     m_bitmap = image;
 

-    return m_bitmap.Ok();
+    return m_bitmap.IsOk();

 #else
     return false;
 #endif
 #else
     return false;
 #endif


@@ -358,7 +357,7 @@ bool wxBitmapDataObject::SetData(size_t size, const void *buf)
 void wxBitmapDataObject::DoConvertToPng()
 {
 #if wxUSE_LIBPNG
 void wxBitmapDataObject::DoConvertToPng()
 {
 #if wxUSE_LIBPNG

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

         return;
 
     wxImage image = m_bitmap.ConvertToImage();
         return;
 
     wxImage image = m_bitmap.ConvertToImage();