(blind) gcc fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6531 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/msw/ole/dataobj.cpp b/src/msw/ole/dataobj.cpp
index f94872ee069ba7ea11bbe68fc5a1edd45cfcb3f1..a3ca1b1b3c30b28ec24192173c0b4fd4302ef28c 100644 (file)
--- a/src/msw/ole/dataobj.cpp
+++ b/src/msw/ole/dataobj.cpp
@@ -73,6 +73,12 @@ class wxIEnumFORMATETC : public IEnumFORMATETC
 {
 public:
     wxIEnumFORMATETC(const wxDataFormat* formats, ULONG nCount);
 {
 public:
     wxIEnumFORMATETC(const wxDataFormat* formats, ULONG nCount);

+
+    // to suppress the gcc warning about "class has virtual functions but non
+    // virtual dtor"
+#ifdef __GNUG__
+    virtual
+#endif

     ~wxIEnumFORMATETC() { delete [] m_formats; }
 
     DECLARE_IUNKNOWN_METHODS;
     ~wxIEnumFORMATETC() { delete [] m_formats; }
 
     DECLARE_IUNKNOWN_METHODS;


@@ -97,6 +103,12 @@ class wxIDataObject : public IDataObject
 {
 public:
     wxIDataObject(wxDataObject *pDataObject);
 {
 public:
     wxIDataObject(wxDataObject *pDataObject);

+
+    // to suppress the gcc warning about "class has virtual functions but non
+    // virtual dtor"
+#ifdef __GNUG__
+    virtual
+#endif

     ~wxIDataObject();
 
     // normally, wxDataObject controls our lifetime (i.e. we're deleted when it
     ~wxIDataObject();
 
     // normally, wxDataObject controls our lifetime (i.e. we're deleted when it


@@ -702,10 +714,10 @@ const char *wxDataObject::GetFormatName(wxDataFormat format)
         case CF_LOCALE:       return "CF_LOCALE";
 
         default:
         case CF_LOCALE:       return "CF_LOCALE";
 
         default:

-            if ( !GetClipboardFormatName(format, s_szBuf, WXSIZEOF(s_szBuf)) )
+            if ( !::GetClipboardFormatName(format, s_szBuf, WXSIZEOF(s_szBuf)) )

             {
                 // it must be a new predefined format we don't know the name of
             {
                 // it must be a new predefined format we don't know the name of

-                sprintf(s_szBuf, "unknown CF (0x%04x)", format);
+                sprintf(s_szBuf, "unknown CF (0x%04x)", format.GetFormatId());

             }
 
             return s_szBuf;
             }
 
             return s_szBuf;