Include wx/menu.h according to precompiled headers of wx/wx.h (with other minor clean...

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

diff --git a/src/gtk/dataobj.cpp b/src/gtk/dataobj.cpp
index e8c5f3d62237d4c8c6cd29e3701574af68c69488..c9e08da558ff2f556bea9f7c5b8daefe0288cb8b 100644 (file)
--- a/src/gtk/dataobj.cpp
+++ b/src/gtk/dataobj.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        dataobj.cpp
+// Name:        src/gtk/dataobj.cpp

 // Purpose:     wxDataObject class
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:     wxDataObject class
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -10,15 +10,18 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

+#if wxUSE_DATAOBJ
+

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

-#if wxUSE_DATAOBJ
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/app.h"
+#endif

 
 

-#include "wx/app.h"

 #include "wx/debug.h"
 #include "wx/mstream.h"
 #include "wx/image.h"
 #include "wx/debug.h"
 #include "wx/mstream.h"
 #include "wx/image.h"

-#include "wx/log.h"

 #include "wx/uri.h"
 
 #include <gdk/gdk.h>
 #include "wx/uri.h"
 
 #include <gdk/gdk.h>


@@ -108,7 +111,9 @@ wxDataFormatId wxDataFormat::GetType() const
 
 wxString wxDataFormat::GetId() const
 {
 
 wxString wxDataFormat::GetId() const
 {

-    wxString ret = wxString::FromAscii( gdk_atom_name( m_format ) );
+    gchar* atom_name = gdk_atom_name( m_format );
+    wxString ret = wxString::FromAscii( atom_name );
+    g_free(atom_name);

     return ret;
 }
 
     return ret;
 }
 


@@ -234,7 +239,7 @@ bool wxFileDataObject::GetDataHere(void *buf) const
 
     memcpy( buf, filenames.mbc_str(), filenames.Len() + 1 );
 
 
     memcpy( buf, filenames.mbc_str(), filenames.Len() + 1 );
 

-    return TRUE;
+    return true;

 }
 
 size_t wxFileDataObject::GetDataSize() const
 }
 
 size_t wxFileDataObject::GetDataSize() const


@@ -280,9 +285,9 @@ bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *buf)
                 AddFile(wxURI::Unescape(filename.c_str() + lenPrefix));
                 filename.Empty();
             }
                 AddFile(wxURI::Unescape(filename.c_str() + lenPrefix));
                 filename.Empty();
             }

-            else
+            else if ( !filename.empty() )

             {
             {

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

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


@@ -298,7 +303,7 @@ bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *buf)
         }
     }
 
         }
     }
 

-    return TRUE;
+    return true;

 }
 
 void wxFileDataObject::AddFile( const wxString &filename )
 }
 
 void wxFileDataObject::AddFile( const wxString &filename )


@@ -343,12 +348,12 @@ bool wxBitmapDataObject::GetDataHere(void *buf) const
     {
         wxFAIL_MSG( wxT("attempt to copy empty bitmap failed") );
 
     {
         wxFAIL_MSG( wxT("attempt to copy empty bitmap failed") );
 

-        return FALSE;
+        return false;

     }
 
     memcpy(buf, m_pngData, m_pngSize);
 
     }
 
     memcpy(buf, m_pngData, m_pngSize);
 

-    return TRUE;
+    return true;

 }
 
 bool wxBitmapDataObject::SetData(size_t size, const void *buf)
 }
 
 bool wxBitmapDataObject::SetData(size_t size, const void *buf)


@@ -356,7 +361,7 @@ bool wxBitmapDataObject::SetData(size_t size, const void *buf)
     Clear();
 
     wxCHECK_MSG( wxImage::FindHandler(wxBITMAP_TYPE_PNG) != NULL,
     Clear();
 
     wxCHECK_MSG( wxImage::FindHandler(wxBITMAP_TYPE_PNG) != NULL,

-                 FALSE, wxT("You must call wxImage::AddHandler(new wxPNGHandler); to be able to use clipboard with bitmaps!") );
+                 false, wxT("You must call wxImage::AddHandler(new wxPNGHandler); to be able to use clipboard with bitmaps!") );

 
     m_pngSize = size;
     m_pngData = malloc(m_pngSize);
 
     m_pngSize = size;
     m_pngData = malloc(m_pngSize);


@@ -367,7 +372,7 @@ bool wxBitmapDataObject::SetData(size_t size, const void *buf)
     wxImage image;
     if ( !image.LoadFile( mstream, wxBITMAP_TYPE_PNG ) )
     {
     wxImage image;
     if ( !image.LoadFile( mstream, wxBITMAP_TYPE_PNG ) )
     {

-        return FALSE;
+        return false;

     }
 
     m_bitmap = wxBitmap(image);
     }
 
     m_bitmap = wxBitmap(image);