This simple function can be used to create a wxBitmap from the raw image data
in PNG format. It is just a thin wrapper around wxImage load functions under
almost all platforms but has two advantages:
1. It can be implemented natively for some platforms (currently only OS X).
2. It can be used in a single expression as it doesn't require creating a
temporary wxMemoryInputStream and this will be required by wxBITMAP_PNG()
macro that will be added soon.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72476
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
#define wxBITMAP_SCREEN_DEPTH (-1)
+// ----------------------------------------------------------------------------
+// wxBitmapHelpers: container for various bitmap methods common to all ports.
+// ----------------------------------------------------------------------------
+
+// Unfortunately, currently wxBitmap does not inherit from wxBitmapBase on all
+// platforms and this is not easy to fix. So we extract at least some common
+// methods into this class from which both wxBitmapBase (and hase wxBitmap on
+// all platforms where it does inherit from it) and wxBitmap in wxMSW and other
+// exceptional ports (only wxPM and old wxCocoa) inherit.
+class WXDLLIMPEXP_CORE wxBitmapHelpers
+{
+public:
+ // Create a new wxBitmap from the PNG data in the given buffer.
+ static wxBitmap NewFromPNGData(const void* data, size_t size);
+};
+
+
// All ports except wxMSW and wxOS2 use wxBitmapHandler and wxBitmapBase as
// base class for wxBitmapHandler; wxMSW and wxOS2 use wxGDIImageHandler as
// base class since it allows some code reuse there.
DECLARE_ABSTRACT_CLASS(wxBitmapHandler)
};
-
// ----------------------------------------------------------------------------
// wxBitmap: class which represents platform-dependent bitmap (unlike wxImage)
// ----------------------------------------------------------------------------
-class WXDLLIMPEXP_CORE wxBitmapBase : public wxGDIObject
+class WXDLLIMPEXP_CORE wxBitmapBase : public wxGDIObject,
+ public wxBitmapHelpers
{
public:
/*
// wxBitmap
// ========================================================================
-class WXDLLIMPEXP_CORE wxBitmap: public wxGDIObject
+class WXDLLIMPEXP_CORE wxBitmap: public wxGDIObject,
+ public wxBitmapHelpers
{
// ------------------------------------------------------------------------
// initialization
// NOTE: for wxMSW we don't use the wxBitmapBase base class declared in bitmap.h!
// ----------------------------------------------------------------------------
-class WXDLLIMPEXP_CORE wxBitmap : public wxGDIImage
+class WXDLLIMPEXP_CORE wxBitmap : public wxGDIImage,
+ public wxBitmapHelpers
{
public:
// default ctor creates an invalid bitmap, you must Create() it later
// wxBitmap: a mono or colour bitmap
// ----------------------------------------------------------------------------
-class WXDLLIMPEXP_CORE wxBitmap : public wxGDIImage
+class WXDLLIMPEXP_CORE wxBitmap : public wxGDIImage,
+ public wxBitmapHelpers
{
public:
// default ctor creates an invalid bitmap, you must Create() it later
*/
virtual bool LoadFile(const wxString& name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE);
+ /**
+ Loads a bitmap from the memory containing image data in PNG format.
+
+ This helper function provides the simplest way to create a wxBitmap
+ from PNG image data. On most platforms, it's simply a wrapper around
+ wxImage loading functions and so requires the PNG image handler to be
+ registered by either calling wxInitAllImageHandlers() which also
+ registers all the other image formats or including the necessary
+ header:
+ @code
+ #include <wx/imagpng.h>
+ @endcode
+ and calling
+ @code
+ wxImage::AddHandler(new wxPNGHandler);
+ @endcode
+ in your application startup code.
+
+ However under OS X this function uses native image loading and so
+ doesn't require wxWidgets PNG support.
+
+ @since 2.9.5
+ */
+ static wxBitmap NewFromPNGData(const void* data, size_t size);
+
/**
Finds the handler with the given name, and removes it.
The handler is not deleted.
#include "wx/image.h"
#endif // WX_PRECOMP
+#if wxUSE_IMAGE && wxUSE_LIBPNG && wxUSE_STREAMS
+ #define wxHAS_PNG_LOAD
+
+ #include "wx/mstream.h"
+#endif
+
// ----------------------------------------------------------------------------
// wxVariant support
// ----------------------------------------------------------------------------
//WX_IMPLEMENT_ANY_VALUE_TYPE(wxAnyValueTypeImpl<wxIcon>)
#endif
+// ----------------------------------------------------------------------------
+// wxBitmapHelpers
+// ----------------------------------------------------------------------------
+
+// wxOSX has a native version and doesn't use this one.
+
+#ifndef __WXOSX__
+
+/* static */
+wxBitmap wxBitmapHelpers::NewFromPNGData(const void* data, size_t size)
+{
+ wxBitmap bitmap;
+
+#ifdef wxHAS_PNG_LOAD
+ wxMemoryInputStream is(data, size);
+ wxImage image(is, wxBITMAP_TYPE_PNG);
+ if ( image.IsOk() )
+ bitmap = wxBitmap(image);
+#endif // wxHAS_PNG_LOAD
+
+ return bitmap;
+}
+
+#endif // !__WXOSX__
+
// ----------------------------------------------------------------------------
// wxBitmapBase
// ----------------------------------------------------------------------------
return false ;
}
+/* static */
+wxBitmap wxBitmapHelpers::NewFromPNGData(const void* data, size_t size)
+{
+ wxCFRef<CGDataProviderRef>
+ provider(CGDataProviderCreateWithData(NULL, data, size, NULL) );
+ wxCFRef<CGImageRef>
+ image(CGImageCreateWithPNGDataProvider(provider, NULL, true,
+ kCGRenderingIntentDefault));
+
+ return wxBitmap(image);
+}
+
void wxBitmap::InitStandardHandlers()
{
#if wxOSX_USE_COCOA_OR_CARBON
projects / wxWidgets.git / commitdiff
