fixed crash on startup under GTK

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

diff --git a/src/msw/ole/dataobj.cpp b/src/msw/ole/dataobj.cpp
index 1f2df6cdb267540fe051636091a63ec2537d3baf..6a4ef3067093f861ca6eaf076866bf11a0d1e41d 100644 (file)
--- a/src/msw/ole/dataobj.cpp
+++ b/src/msw/ole/dataobj.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "dataobj.h"
 #endif
 
     #pragma implementation "dataobj.h"
 #endif
 


@@ -1133,6 +1133,9 @@ protected:
 
         return TRUE;
     }
 
         return TRUE;
     }

+    virtual bool GetDataHere(const wxDataFormat& WXUNUSED(format),
+                             void *buf) const
+        { return GetDataHere(buf); }

 #endif
 
     DECLARE_NO_COPY_CLASS(CFSTR_SHELLURLDataObject)
 #endif
 
     DECLARE_NO_COPY_CLASS(CFSTR_SHELLURLDataObject)