X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/174f2229cdb37772606a38a09523cdd7d091d988..63a3cd7a8c737eb4571f27e5f2af37eda0f1c5cc:/src/gtk/dataobj.cpp?ds=sidebyside diff --git a/src/gtk/dataobj.cpp b/src/gtk/dataobj.cpp index f52cdb4a3d..e8c5f3d622 100644 --- a/src/gtk/dataobj.cpp +++ b/src/gtk/dataobj.cpp @@ -7,14 +7,13 @@ // 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" + +#if wxUSE_DATAOBJ + #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(); - + m_type = type; - + #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 ); - m_format = gdk_atom_intern( (const char*) tmp.ToAscii(), FALSE ); + m_format = gdk_atom_intern( (const char*) tmp.ToAscii(), FALSE ); } void wxDataFormat::PrepareFormats() @@ -183,17 +182,17 @@ wxDataObject::~wxDataObject() bool wxDataObject::IsSupportedFormat(const wxDataFormat& format, Direction dir) const { size_t nFormatCount = GetFormatCount(dir); - if ( nFormatCount == 1 ) + if ( nFormatCount == 1 ) { return format == GetPreferredFormat(); } - else + else { 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; @@ -396,4 +395,4 @@ void wxBitmapDataObject::DoConvertToPng() image.SaveFile(mstream, wxBITMAP_TYPE_PNG); } - +#endif // wxUSE_DATAOBJ