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

provide stubs for conversion to/from image functions even when wxUSE_WXDIB==0, this allows to not test for it in other places

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38230 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-03-20 23:23:00 +00:00
parent 511fb92a6c
commit 50a9dd77f5
2 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/wx/msw/bitmap.h
View File

@@ -64,7 +64,7 @@ public:
// Create a bitmap compatible with the given DC // Create a bitmap compatible with the given DC
wxBitmap(int width, int height, const wxDC& dc); wxBitmap(int width, int height, const wxDC& dc);
#if wxUSE_IMAGE && wxUSE_WXDIB #if wxUSE_IMAGE
// Convert from wxImage // Convert from wxImage
wxBitmap(const wxImage& image, int depth = -1) wxBitmap(const wxImage& image, int depth = -1)
{ (void)CreateFromImage(image, depth); } { (void)CreateFromImage(image, depth); }
@@ -94,7 +94,7 @@ public:
virtual ~wxBitmap(); virtual ~wxBitmap();
#if wxUSE_IMAGE && wxUSE_WXDIB #if wxUSE_IMAGE
wxImage ConvertToImage() const; wxImage ConvertToImage() const;
#endif // wxUSE_IMAGE #endif // wxUSE_IMAGE
@@ -171,7 +171,7 @@ protected:
// creates an uninitialized bitmap, called from Create()s above // creates an uninitialized bitmap, called from Create()s above
bool DoCreate(int w, int h, int depth, WXHDC hdc); bool DoCreate(int w, int h, int depth, WXHDC hdc);
#if wxUSE_IMAGE && wxUSE_WXDIB #if wxUSE_IMAGE
// creates the bitmap from wxImage, supposed to be called from ctor // creates the bitmap from wxImage, supposed to be called from ctor
bool CreateFromImage(const wxImage& image, int depth); bool CreateFromImage(const wxImage& image, int depth);
@@ -183,10 +183,9 @@ protected:
#endif // wxUSE_IMAGE #endif // wxUSE_IMAGE
private: private:
#ifdef __WIN32__
// common part of CopyFromIcon/CopyFromCursor for Win32 // common part of CopyFromIcon/CopyFromCursor for Win32
bool CopyFromIconOrCursor(const wxGDIImage& icon); bool CopyFromIconOrCursor(const wxGDIImage& icon);
#endif // __WIN32__
DECLARE_DYNAMIC_CLASS(wxBitmap) DECLARE_DYNAMIC_CLASS(wxBitmap)
}; };

21
src/msw/bitmap.cpp
View File

@@ -780,8 +780,6 @@ wxImage wxBitmap::ConvertToImage() const
// wxImage to/from conversions // wxImage to/from conversions
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#if wxUSE_WXDIB
bool wxBitmap::CreateFromImage(const wxImage& image, int depth) bool wxBitmap::CreateFromImage(const wxImage& image, int depth)
{ {
return CreateFromImage(image, depth, 0); return CreateFromImage(image, depth, 0);
@@ -795,6 +793,8 @@ bool wxBitmap::CreateFromImage(const wxImage& image, const wxDC& dc)
return CreateFromImage(image, -1, dc.GetHDC()); return CreateFromImage(image, -1, dc.GetHDC());
} }
#if wxUSE_WXDIB
bool wxBitmap::CreateFromImage(const wxImage& image, int depth, WXHDC hdc) bool wxBitmap::CreateFromImage(const wxImage& image, int depth, WXHDC hdc)
{ {
wxCHECK_MSG( image.Ok(), false, wxT("invalid image") ); wxCHECK_MSG( image.Ok(), false, wxT("invalid image") );
@@ -974,7 +974,22 @@ wxImage wxBitmap::ConvertToImage() const
return image; return image;
} }
#endif // wxUSE_WXDIB #else // !wxUSE_WXDIB
bool
wxBitmap::CreateFromImage(const wxImage& WXUNUSED(image),
int WXUNUSED(depth),
WXHDC WXUNUSED(hdc))
{
return false;
}
wxImage wxBitmap::ConvertToImage() const
{
return wxImage();
}
#endif // wxUSE_WXDIB/!wxUSE_WXDIB
#endif // wxUSE_IMAGE #endif // wxUSE_IMAGE