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

remove if defs for DigitalMars as suggested by Vadim

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20522 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Chris Elliott
2003-05-07 09:14:14 +00:00
parent acd42a2395
commit f0fc695806
1 changed files with 5 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
include/wx/rawbmp.h
View File

@@ -101,15 +101,9 @@
- type which can contain the full pixel value (all channels) - type which can contain the full pixel value (all channels)
*/ */
#ifdef __DIGITALMARS__
template <class Channel, template <class Channel,
size_t Bpp, int R, int G, int B, int A = -1, size_t Bpp, int R, int G, int B, int A = -1,
class Pixel = wxUint32> class Pixel = wxUint32>
#else
template <typename Channel,
size_t Bpp, int R, int G, int B, int A = -1,
typename Pixel = wxUint32>
#endif
struct WXDLLEXPORT wxPixelFormat struct WXDLLEXPORT wxPixelFormat
{ {
@@ -629,49 +623,28 @@ struct WXDLLEXPORT wxPixelDataOut<wxBitmap>
}; };
}; };
#ifdef __DIGITALMARS__
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>::wxPixelDataIn<PixelFormat>
{ {
public: public:
wxPixelData(Image& image) wxPixelData(Image& image)
: wxPixelDataOut<Image>:: wxPixelDataIn<PixelFormat>(image) : wxPixelDataOut<Image>::wxPixelDataIn<PixelFormat>(image)
{ {
} }
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) : wxPixelDataOut<Image>::wxPixelDataIn<PixelFormat>(i, pt, sz)
{ {
} }
wxPixelData(Image& i, const wxRect& rect) wxPixelData(Image& i, const wxRect& rect)
: wxPixelDataOut<Image>:: wxPixelDataIn<PixelFormat>(i, rect) : wxPixelDataOut<Image>::wxPixelDataIn<PixelFormat>(i, rect)
{ {
} }
}; };
#else // not __DIGITALMARS__
template <class Image, class PixelFormat = wxPixelFormatFor<Image> >
class wxPixelData :
public wxPixelDataOut<Image>::template wxPixelDataIn<PixelFormat>
{
public:
wxPixelData(Image& image)
: wxPixelDataOut<Image>::template wxPixelDataIn<PixelFormat>(image)
{
}
wxPixelData(Image& i, const wxPoint& pt, const wxSize& sz)
: wxPixelDataOut<Image>::template wxPixelDataIn<PixelFormat>(i, pt, sz)
{
}
wxPixelData(Image& i, const wxRect& rect)
: wxPixelDataOut<Image>::template wxPixelDataIn<PixelFormat>(i, rect)
{
}
};
#endif // __DIGITALMARS__
// some "predefined" pixel data classes // some "predefined" pixel data classes
typedef wxPixelData<wxImage> wxImagePixelData; typedef wxPixelData<wxImage> wxImagePixelData;