added explicit casts for (varagr) TIFFSetField() parameters

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

diff --git a/src/x11/dataobj.cpp b/src/x11/dataobj.cpp
index 548bbe151fceb66971c77a3f6be4455981ed7fe2..aa7c8f300bf09f52af2a5a0500f2a3ea015725fb 100644 (file)
--- a/src/x11/dataobj.cpp
+++ b/src/x11/dataobj.cpp
@@ -7,12 +7,14 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "dataobj.h"
 #endif
 
 #include "wx/defs.h"
 
+#if wxUSE_DATAOBJ
+
 #include "wx/dataobj.h"
 #include "wx/mstream.h"
 #include "wx/app.h"
@@ -379,3 +381,5 @@ void wxBitmapDataObject::DoConvertToPng()
 #endif
 }
 
+#endif // wxUSE_DATAOBJ
+