moved wxapp_install_idle_handler and g_isIdle from many cpp files into gtk/private...

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

diff --git a/src/gtk1/dataobj.cpp b/src/gtk1/dataobj.cpp
index f52cdb4a3dce6c3db149160a9337ac2669939f91..1e986e1ce02877e2ce3510c5f6f5e9e023b16692 100644 (file)
--- a/src/gtk1/dataobj.cpp
+++ b/src/gtk1/dataobj.cpp
@@ -7,14 +7,13 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "dataobj.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #include "wx/dataobj.h"
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #include "wx/dataobj.h"

+
+#if wxUSE_DATAOBJ
+

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


@@ -78,9 +77,9 @@ wxDataFormat::wxDataFormat( NativeFormat format )
 void wxDataFormat::SetType( wxDataFormatId type )
 {
     PrepareFormats();
 void wxDataFormat::SetType( wxDataFormatId type )
 {
     PrepareFormats();

-    
+

     m_type = type;
     m_type = type;

-    
+

 #if wxUSE_UNICODE
     if (m_type == wxDF_UNICODETEXT)
         m_format = g_textAtom;
 #if wxUSE_UNICODE
     if (m_type == wxDF_UNICODETEXT)
         m_format = g_textAtom;


@@ -142,7 +141,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 = gdk_atom_intern( (const char*) tmp.ToAscii(), FALSE ); 
+    m_format = gdk_atom_intern( (const char*) tmp.ToAscii(), FALSE );

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


@@ -183,17 +182,17 @@ wxDataObject::~wxDataObject()
 bool wxDataObject::IsSupportedFormat(const wxDataFormat& format, Direction dir) const
 {
     size_t nFormatCount = GetFormatCount(dir);
 bool wxDataObject::IsSupportedFormat(const wxDataFormat& format, Direction dir) const
 {
     size_t nFormatCount = GetFormatCount(dir);

-    if ( nFormatCount == 1 ) 
+    if ( nFormatCount == 1 )

     {
         return format == GetPreferredFormat();
     }
     {
         return format == GetPreferredFormat();
     }

-    else 
+    else

     {
         wxDataFormat *formats = new wxDataFormat[nFormatCount];
         GetAllFormats(formats,dir);
 
         size_t n;
     {
         wxDataFormat *formats = new wxDataFormat[nFormatCount];
         GetAllFormats(formats,dir);
 
         size_t n;

-        for ( n = 0; n < nFormatCount; n++ ) 
+        for ( n = 0; n < nFormatCount; n++ )

         {
             if ( formats[n] == format )
                 break;
         {
             if ( formats[n] == format )
                 break;


@@ -206,18 +205,6 @@ bool wxDataObject::IsSupportedFormat(const wxDataFormat& format, Direction dir)
     }
 }
 
     }
 }
 

-// ----------------------------------------------------------------------------
-// wxTextDataObject
-// ----------------------------------------------------------------------------
-
-#if defined(__WXGTK20__) && wxUSE_UNICODE
-void wxTextDataObject::GetAllFormats(wxDataFormat *formats, wxDataObjectBase::Direction dir) const
-{
-    *formats++ = GetPreferredFormat();
-    *formats = g_altTextAtom;
-}
-#endif
-

 // ----------------------------------------------------------------------------
 // wxFileDataObject
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxFileDataObject
 // ----------------------------------------------------------------------------


@@ -396,4 +383,4 @@ void wxBitmapDataObject::DoConvertToPng()
     image.SaveFile(mstream, wxBITMAP_TYPE_PNG);
 }
 
     image.SaveFile(mstream, wxBITMAP_TYPE_PNG);
 }
 

-
+#endif // wxUSE_DATAOBJ