Applied patch for wxComboBox and wxListBox to

[wxWidgets.git] / include / wx / msw / ole / dataobj.h

diff --git a/include/wx/msw/ole/dataobj.h b/include/wx/msw/ole/dataobj.h
index fe47ce3bf3a5dfc3a09392481331af1b2a5b9280..41b013a9e8335f5cdd4821b8e5cd1e07d7abbb39 100644 (file)
--- a/include/wx/msw/ole/dataobj.h
+++ b/include/wx/msw/ole/dataobj.h
@@ -37,12 +37,17 @@ public:
     void SetAutoDelete();
 
     // return TRUE if we support this format in "Get" direction
-    bool IsSupportedFormat(const wxDataFormat& format) const;
+    bool IsSupportedFormat(const wxDataFormat& format) const
+        { return wxDataObjectBase::IsSupported(format, Get); }
 
 #ifdef __WXDEBUG__
     // function to return symbolic name of clipboard format (for debug messages)
-    static const char *GetFormatName(wxDataFormat format);
-#endif // Debug
+    static const wxChar *GetFormatName(wxDataFormat format);
+
+    #define wxGetFormatName(format) wxDataObject::GetFormatName(format)
+#else // !Debug
+    #define wxGetFormatName(format) ""
+#endif // Debug/!Debug
 
 private:
     IDataObject *m_pIDataObject; // pointer to the COM interface