Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compilation fix for BCC (and probably others)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20575 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-05-10 12:53:08 +00:00
parent 73baf01ab3
commit 8fa97a5819
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
include/wx/rawbmp.h
View File

@@ -623,26 +623,29 @@ struct WXDLLEXPORT wxPixelDataOut<wxBitmap>
}; };
}; };
#ifdef __VISUALC__
// typedef-name 'foo' used as synonym for class-name 'bar'
// (VC++ gives this warning each time wxPixelData::Base is used but it
// doesn't make any sense here -- what's wrong with using typedef instead
// of class, this is what it is here for!)
#pragma warning(disable: 4097)
#endif // __VISUALC__
template <class Image, class PixelFormat = wxPixelFormatFor<Image> > template <class Image, class PixelFormat = wxPixelFormatFor<Image> >
class wxPixelData : class wxPixelData :
public wxPixelDataOut<Image>::wxPixelDataIn<PixelFormat> public wxPixelDataOut<Image>::template wxPixelDataIn<PixelFormat>
{ {
public: public:
wxPixelData(Image& image) typedef wxPixelDataOut<Image>::template wxPixelDataIn<PixelFormat> Base;
: wxPixelDataOut<Image>::wxPixelDataIn<PixelFormat>(image)
{ wxPixelData(Image& image) : Base(image) { }
}
wxPixelData(Image& i, const wxRect& rect) : Base(i, rect) { }
wxPixelData(Image& i, const wxPoint& pt, const wxSize& sz) wxPixelData(Image& i, const wxPoint& pt, const wxSize& sz)
: wxPixelDataOut<Image>::wxPixelDataIn<PixelFormat>(i, pt, sz) : Base(i, pt, sz)
{ {
} }
wxPixelData(Image& i, const wxRect& rect)
: wxPixelDataOut<Image>::wxPixelDataIn<PixelFormat>(i, rect)
{
}
}; };
@@ -674,6 +677,7 @@ struct WXDLLEXPORT wxPixelIterator : wxPixelData<Image, PixelFormat>::Iterator
#ifdef __VISUALC__ #ifdef __VISUALC__
#pragma warning(default: 4355) #pragma warning(default: 4355)
#pragma warning(default: 4097)
#endif #endif
#endif // _WX_RAWBMP_H_BASE_ #endif // _WX_RAWBMP_H_BASE_