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

Wrap wxImage specifics in wxUSE_IMAGE and wxBitmap specifics in wxUSE_GUI.

Browse Source 
This allows the code to be used from wxBase with other image classes.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30921 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
2004-12-10 01:53:31 +00:00
parent 55b5ddad74
commit 4c683a3021
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/wx/rawbmp.h
View File

@@ -176,6 +176,7 @@ typedef wxPixelFormat<unsigned char, 24, 0, 1, 2> wxImagePixelFormat;
// used as default value for the pixel format in wxPixelIterator template // used as default value for the pixel format in wxPixelIterator template
template <class T> struct wxPixelFormatFor; template <class T> struct wxPixelFormatFor;
#if wxUSE_IMAGE
// wxPixelFormatFor is only defined for wxImage, attempt to use it with other // wxPixelFormatFor is only defined for wxImage, attempt to use it with other
// classes (wxBitmap...) will result in compile errors which is exactly what we // classes (wxBitmap...) will result in compile errors which is exactly what we
// want // want
@@ -184,6 +185,7 @@ struct WXDLLEXPORT wxPixelFormatFor<wxImage>
{ {
typedef wxImagePixelFormat Format; typedef wxImagePixelFormat Format;
}; };
#endif //wxUSE_IMAGE
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxPixelData // wxPixelData
@@ -271,6 +273,7 @@ struct WXDLLEXPORT wxPixelDataOut
}; };
}; };
#if wxUSE_IMAGE
// wxPixelData specialization for wxImage: this is the simplest case as we // wxPixelData specialization for wxImage: this is the simplest case as we
// don't have to care about different pixel formats here // don't have to care about different pixel formats here
template <> template <>
@@ -455,7 +458,9 @@ struct WXDLLEXPORT wxPixelDataOut<wxImage>
Iterator m_pixels; Iterator m_pixels;
}; };
}; };
#endif //wxUSE_IMAGE
#if wxUSE_GUI
// wxPixelData specialization for wxBitmap: here things are more interesting as // wxPixelData specialization for wxBitmap: here things are more interesting as
// we also have to support different pixel formats // we also have to support different pixel formats
template <> template <>
@@ -637,6 +642,7 @@ struct WXDLLEXPORT wxPixelDataOut<wxBitmap>
} }
}; };
}; };
#endif //wxUSE_GUI
#ifdef __VISUALC__ #ifdef __VISUALC__
// typedef-name 'foo' used as synonym for class-name 'bar' // typedef-name 'foo' used as synonym for class-name 'bar'
@@ -667,9 +673,13 @@ public:
// some "predefined" pixel data classes // some "predefined" pixel data classes
#if wxUSE_IMAGE
typedef wxPixelData<wxImage> wxImagePixelData; typedef wxPixelData<wxImage> wxImagePixelData;
#endif //wxUSE_IMAGE
#if wxUSE_GUI
typedef wxPixelData<wxBitmap, wxNativePixelFormat> wxNativePixelData; typedef wxPixelData<wxBitmap, wxNativePixelFormat> wxNativePixelData;
typedef wxPixelData<wxBitmap, wxAlphaPixelFormat> wxAlphaPixelData; typedef wxPixelData<wxBitmap, wxAlphaPixelFormat> wxAlphaPixelData;
#endif //wxUSE_GUI
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxPixelIterator // wxPixelIterator