give the panel 3D grey colour by default: as it's not a native control, we must give...

[wxWidgets.git] / src / msw / ole / dataobj.cpp

diff --git a/src/msw/ole/dataobj.cpp b/src/msw/ole/dataobj.cpp
index 1f2df6cdb267540fe051636091a63ec2537d3baf..68d5aa77fa65dc51f18759c9ca712d04bc27155a 100644 (file)
--- a/src/msw/ole/dataobj.cpp
+++ b/src/msw/ole/dataobj.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "dataobj.h"
 #endif
 
@@ -1133,6 +1133,9 @@ protected:
 
         return TRUE;
     }
+    virtual bool GetDataHere(const wxDataFormat& WXUNUSED(format),
+                             void *buf) const
+        { return GetDataHere(buf); }
 #endif
 
     DECLARE_NO_COPY_CLASS(CFSTR_SHELLURLDataObject)
@@ -1217,6 +1220,8 @@ static const wxChar *GetTymedName(DWORD tymed)
 // wxDataObject
 // ----------------------------------------------------------------------------
 
+#if wxUSE_DATAOBJ
+
 wxDataObject::wxDataObject()
 {
 }
@@ -1238,3 +1243,5 @@ const wxChar *wxDataObject::GetFormatName(wxDataFormat format)
 
 #endif
 
+#endif
+