AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

(blind) gcc fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6531 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2000-03-08 15:12:29 +00:00
parent 39d03faf4e
commit c77ae1d950
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/msw/ole/dataobj.cpp
View File

@ -73,6 +73,12 @@ class wxIEnumFORMATETC : public IEnumFORMATETC
{
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;
@ -97,6 +103,12 @@ class wxIDataObject : public IDataObject
{
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
@ -702,10 +714,10 @@ const char *wxDataObject::GetFormatName(wxDataFormat format)
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
sprintf(s_szBuf, "unknown CF (0x%04x)", format);
sprintf(s_szBuf, "unknown CF (0x%04x)", format.GetFormatId());
}
return s_szBuf;