-/////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
// Name: bitmap.cpp
// Purpose: wxBitmap
// Author: Julian Smart
// Modified by:
// Created: 04/01/98
// RCS-ID: $Id$
-// Copyright: (c) Julian Smart and Markus Holzem
-// Licence: wxWindows license
+// Copyright: (c) Julian Smart
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// ============================================================================
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "bitmap.h"
#endif
#include "wx/msw/private.h"
#include "wx/log.h"
+#if wxUSE_WXDIB
#include "wx/msw/dib.h"
+#endif
+
+#include "wx/image.h"
+#include "wx/xpmdecod.h"
+
+#ifdef wxHAVE_RAW_BITMAP
+#include "wx/rawbmp.h"
+#endif
+
+// missing from mingw32 header
+#ifndef CLR_INVALID
+ #define CLR_INVALID ((COLORREF)-1)
+#endif // no CLR_INVALID
// ----------------------------------------------------------------------------
-// macros
+// Bitmap data
// ----------------------------------------------------------------------------
-#if !USE_SHARED_LIBRARIES
- IMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxGDIObject)
- IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject)
+class WXDLLEXPORT wxBitmapRefData : public wxGDIImageRefData
+{
+public:
+ wxBitmapRefData();
+ virtual ~wxBitmapRefData() { Free(); }
+
+ virtual void Free();
+
+ // set the mask object to use as the mask, we take ownership of it
+ void SetMask(wxMask *mask)
+ {
+ delete m_bitmapMask;
+ m_bitmapMask = mask;
+ }
+
+ // set the HBITMAP to use as the mask
+ void SetMask(HBITMAP hbmpMask)
+ {
+ SetMask(new wxMask((WXHBITMAP)hbmpMask));
+ }
+
+ // return the mask
+ wxMask *GetMask() const { return m_bitmapMask; }
+
+public:
+#if wxUSE_PALETTE
+ wxPalette m_bitmapPalette;
+#endif // wxUSE_PALETTE
+
+ // MSW-specific
+ // ------------
+
+#ifdef __WXDEBUG__
+ // this field is solely for error checking: we detect selecting a bitmap
+ // into more than one DC at once or deleting a bitmap still selected into a
+ // DC (both are serious programming errors under Windows)
+ wxDC *m_selectedInto;
+#endif // __WXDEBUG__
+
+#if wxUSE_WXDIB
+ // when GetRawData() is called for a DDB we need to convert it to a DIB
+ // first to be able to provide direct access to it and we cache that DIB
+ // here and convert it back to DDB when UngetRawData() is called
+ wxDIB *m_dib;
#endif
+ // true if we have alpha transparency info and can be drawn using
+ // AlphaBlend()
+ bool m_hasAlpha;
+
+ // true if our HBITMAP is a DIB section, false if it is a DDB
+ bool m_isDIB;
+
+private:
+ // optional mask for transparent drawing
+ wxMask *m_bitmapMask;
+
+ DECLARE_NO_COPY_CLASS(wxBitmapRefData)
+};
+
+// ----------------------------------------------------------------------------
+// macros
+// ----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxGDIObject)
+IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject)
+
+IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, wxObject)
+
// ============================================================================
// implementation
// ============================================================================
+// ----------------------------------------------------------------------------
+// helper functions
+// ----------------------------------------------------------------------------
+
+// decide whether we should create a DIB or a DDB for the given parameters
+//
+// NB: we always use DIBs under Windows CE as this is much simpler (even if
+// also less efficient...) and we obviously can't use them if there is no
+// DIB support compiled in at all
+#ifdef __WXWINCE__
+ static inline bool wxShouldCreateDIB(int, int, int, WXHDC) { return true; }
+
+ #define ALWAYS_USE_DIB
+#elif !wxUSE_WXDIB
+ // no sense in defining wxShouldCreateDIB() as we can't compile code
+ // executed if it is true, so we have to use #if's anyhow
+ #define NEVER_USE_DIB
+#else // wxUSE_WXDIB && !__WXWINCE__
+ static inline bool wxShouldCreateDIB(int w, int h, int d, WXHDC hdc)
+ {
+ // here is the logic:
+ //
+ // (a) if hdc is specified, the caller explicitly wants DDB
+ // (b) otherwise, create a DIB if depth >= 24 (we don't support 16bpp
+ // or less DIBs anyhow)
+ // (c) finally, create DIBs under Win9x even if the depth hasn't been
+ // explicitly specified but the current display depth is 24 or
+ // more and the image is "big", i.e. > 16Mb which is the
+ // theoretical limit for DDBs under Win9x
+ //
+ // consequences (all of which seem to make sense):
+ //
+ // (i) by default, DDBs are created (depth == -1 usually)
+ // (ii) DIBs can be created by explicitly specifying the depth
+ // (iii) using a DC always forces creating a DDB
+ return !hdc &&
+ (d >= 24 ||
+ (d == -1 &&
+ wxDIB::GetLineSize(w, wxDisplayDepth())*h > 16*1024*1024));
+ }
+
+ #define SOMETIMES_USE_DIB
+#endif // different DIB usage scenarious
+
// ----------------------------------------------------------------------------
// wxBitmapRefData
// ----------------------------------------------------------------------------
wxBitmapRefData::wxBitmapRefData()
{
- m_ok = FALSE;
- m_width = 0;
- m_height = 0;
- m_depth = 0;
- m_quality = 0;
- m_hBitmap = 0 ;
- m_selectedInto = NULL;
- m_numColors = 0;
- m_bitmapMask = NULL;
-}
-
-wxBitmapRefData::~wxBitmapRefData()
-{
- if (m_selectedInto)
- {
- wxChar buf[200];
- wxSprintf(buf, wxT("Bitmap was deleted without selecting out of wxMemoryDC %lX."), (unsigned long) m_selectedInto);
- wxFatalError(buf);
- }
- if (m_hBitmap)
- {
- DeleteObject((HBITMAP) m_hBitmap);
- }
- m_hBitmap = 0 ;
-
- if (m_bitmapMask)
- delete m_bitmapMask;
- m_bitmapMask = NULL;
+#ifdef __WXDEBUG__
+ m_selectedInto = NULL;
+#endif
+ m_bitmapMask = NULL;
+
+ m_hBitmap = (WXHBITMAP) NULL;
+#if wxUSE_WXDIB
+ m_dib = NULL;
+#endif
+
+ m_isDIB =
+ m_hasAlpha = FALSE;
+}
+
+void wxBitmapRefData::Free()
+{
+ wxASSERT_MSG( !m_selectedInto,
+ wxT("deleting bitmap still selected into wxMemoryDC") );
+
+#if wxUSE_WXDIB
+ wxASSERT_MSG( !m_dib, _T("forgot to call wxBitmap::UngetRawData()!") );
+#endif
+ if ( m_hBitmap)
+ {
+ if ( !::DeleteObject((HBITMAP)m_hBitmap) )
+ {
+ wxLogLastError(wxT("DeleteObject(hbitmap)"));
+ }
+ }
+
+ delete m_bitmapMask;
+ m_bitmapMask = NULL;
}
// ----------------------------------------------------------------------------
-// wxBitmap
+// wxBitmap creation
// ----------------------------------------------------------------------------
-wxList wxBitmap::sm_handlers;
-
-wxBitmap::wxBitmap()
+// this function should be called from all wxBitmap ctors
+void wxBitmap::Init()
{
- if ( wxTheBitmapList )
- wxTheBitmapList->AddBitmap(this);
+ // m_refData = NULL; done in the base class ctor
}
-wxBitmap::wxBitmap(const wxBitmap& bitmap)
+wxGDIImageRefData *wxBitmap::CreateData() const
{
- wxIcon *icon = wxDynamicCast(&bitmap, wxIcon);
- if ( icon )
- {
- HDC hdc = ::CreateCompatibleDC(NULL); // screen DC
- HBITMAP hbitmap = ::CreateCompatibleBitmap(hdc,
- icon->GetWidth(),
- icon->GetHeight());
- ::SelectObject(hdc, hbitmap);
- ::DrawIcon(hdc, 0, 0, (HICON)icon->GetHICON());
+ return new wxBitmapRefData;
+}
- ::DeleteDC(hdc);
+#ifdef __WIN32__
- SetHBITMAP((WXHBITMAP)hbitmap);
- }
- else
+bool wxBitmap::CopyFromIconOrCursor(const wxGDIImage& icon)
+{
+#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
+ // it may be either HICON or HCURSOR
+ HICON hicon = (HICON)icon.GetHandle();
+
+ ICONINFO iconInfo;
+ if ( !::GetIconInfo(hicon, &iconInfo) )
{
- Ref(bitmap);
+ wxLogLastError(wxT("GetIconInfo"));
+
+ return FALSE;
}
- if ( wxTheBitmapList )
- wxTheBitmapList->AddBitmap(this);
+ wxBitmapRefData *refData = new wxBitmapRefData;
+ m_refData = refData;
+
+ int w = icon.GetWidth(),
+ h = icon.GetHeight();
+
+ refData->m_width = w;
+ refData->m_height = h;
+ refData->m_depth = wxDisplayDepth();
+
+ refData->m_hBitmap = (WXHBITMAP)iconInfo.hbmColor;
+
+ // the mask returned by GetIconInfo() is inversed compared to the usual
+ // wxWin convention
+ refData->SetMask(wxInvertMask(iconInfo.hbmMask, w, h));
+
+
+ // delete the old one now as we don't need it any more
+ ::DeleteObject(iconInfo.hbmMask);
+
+ return TRUE;
+#else
+ return FALSE;
+#endif
}
-wxBitmap::~wxBitmap()
+#endif // Win32
+
+bool wxBitmap::CopyFromCursor(const wxCursor& cursor)
+{
+ UnRef();
+
+ if ( !cursor.Ok() )
+ return FALSE;
+
+ return CopyFromIconOrCursor(cursor);
+}
+
+bool wxBitmap::CopyFromIcon(const wxIcon& icon)
{
- if (wxTheBitmapList)
- wxTheBitmapList->DeleteObject(this);
+ UnRef();
+
+ if ( !icon.Ok() )
+ return FALSE;
+
+ return CopyFromIconOrCursor(icon);
}
-bool wxBitmap::FreeResource(bool WXUNUSED(force))
+#ifndef NEVER_USE_DIB
+
+bool wxBitmap::CopyFromDIB(const wxDIB& dib)
{
- if ( !M_BITMAPDATA )
- return FALSE;
+ wxCHECK_MSG( dib.IsOk(), FALSE, _T("invalid DIB in CopyFromDIB") );
+
+#ifdef SOMETIMES_USE_DIB
+ HBITMAP hbitmap = dib.CreateDDB();
+ if ( !hbitmap )
+ return FALSE;
+#else // ALWAYS_USE_DIB
+ HBITMAP hbitmap = ((wxDIB &)dib).Detach(); // const_cast
+#endif // SOMETIMES_USE_DIB/ALWAYS_USE_DIB
- if (M_BITMAPDATA->m_selectedInto)
- {
- wxChar buf[200];
- wxSprintf(buf, wxT("Bitmap %lX was deleted without selecting out of wxMemoryDC %lX."), (unsigned long) this, (unsigned long) M_BITMAPDATA->m_selectedInto);
- wxFatalError(buf);
- }
- if (M_BITMAPDATA->m_hBitmap)
- {
- DeleteObject((HBITMAP) M_BITMAPDATA->m_hBitmap);
- }
- M_BITMAPDATA->m_hBitmap = 0 ;
+ UnRef();
-/*
- if (M_BITMAPDATA->m_bitmapPalette)
- delete M_BITMAPDATA->m_bitmapPalette;
+ wxBitmapRefData *refData = new wxBitmapRefData;
+ m_refData = refData;
+
+ refData->m_width = dib.GetWidth();
+ refData->m_height = dib.GetHeight();
+ refData->m_depth = dib.GetDepth();
+
+ refData->m_hBitmap = (WXHBITMAP)hbitmap;
+
+#if wxUSE_PALETTE
+ wxPalette *palette = dib.CreatePalette();
+ if ( palette )
+ {
+ refData->m_bitmapPalette = *palette;
+ }
- M_BITMAPDATA->m_bitmapPalette = NULL ;
-*/
+ delete palette;
+#endif // wxUSE_PALETTE
- return TRUE;
+ return TRUE;
}
+#endif // NEVER_USE_DIB
+
+wxBitmap::~wxBitmap()
+{
+}
-wxBitmap::wxBitmap(const char bits[], int the_width, int the_height, int no_bits)
+wxBitmap::wxBitmap(const char bits[], int width, int height, int depth)
{
- m_refData = new wxBitmapRefData;
+ Init();
- M_BITMAPDATA->m_width = the_width ;
- M_BITMAPDATA->m_height = the_height ;
- M_BITMAPDATA->m_depth = no_bits ;
- M_BITMAPDATA->m_numColors = 0;
+#ifndef __WXMICROWIN__
+ wxBitmapRefData *refData = new wxBitmapRefData;
+ m_refData = refData;
- M_BITMAPDATA->m_hBitmap = (WXHBITMAP) CreateBitmap(the_width, the_height, 1, no_bits, bits);
+ refData->m_width = width;
+ refData->m_height = height;
+ refData->m_depth = depth;
+
+ char *data;
+ if ( depth == 1 )
+ {
+ // we assume that it is in XBM format which is not quite the same as
+ // the format CreateBitmap() wants because the order of bytes in the
+ // line is inversed!
+ const size_t bytesPerLine = (width + 7) / 8;
+ const size_t padding = bytesPerLine % 2;
+ const size_t len = height * ( padding + bytesPerLine );
+ data = (char *)malloc(len);
+ const char *src = bits;
+ char *dst = data;
+
+ for ( int rows = 0; rows < height; rows++ )
+ {
+ for ( size_t cols = 0; cols < bytesPerLine; cols++ )
+ {
+ unsigned char val = *src++;
+ unsigned char reversed = 0;
+
+ for ( int bits = 0; bits < 8; bits++)
+ {
+ reversed <<= 1;
+ reversed |= (val & 0x01);
+ val >>= 1;
+ }
+ *dst++ = reversed;
+ }
+
+ if ( padding )
+ *dst++ = 0;
+ }
+ }
+ else
+ {
+ // bits should already be in Windows standard format
+ data = (char *)bits; // const_cast is harmless
+ }
- if (M_BITMAPDATA->m_hBitmap)
- M_BITMAPDATA->m_ok = TRUE;
- else
- M_BITMAPDATA->m_ok = FALSE;
+ HBITMAP hbmp = ::CreateBitmap(width, height, 1, depth, data);
+ if ( !hbmp )
+ {
+ wxLogLastError(wxT("CreateBitmap"));
+ }
- M_BITMAPDATA->m_selectedInto = NULL;
+ if ( data != bits )
+ {
+ free(data);
+ }
- if ( wxTheBitmapList )
- wxTheBitmapList->AddBitmap(this);
+ SetHBITMAP((WXHBITMAP)hbmp);
+#endif
}
// Create from XPM data
-wxBitmap::wxBitmap(char **data, wxControl *WXUNUSED(anItem))
+#if wxUSE_IMAGE && wxUSE_XPM
+bool wxBitmap::CreateFromXpm(const char **data)
+#else
+bool wxBitmap::CreateFromXpm(const char **WXUNUSED(data))
+#endif
{
- (void) Create((void *)data, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0);
+#if wxUSE_IMAGE && wxUSE_XPM
+ Init();
+
+ wxCHECK_MSG( data != NULL, FALSE, wxT("invalid bitmap data") )
+
+ wxXPMDecoder decoder;
+ wxImage img = decoder.ReadData(data);
+ wxCHECK_MSG( img.Ok(), FALSE, wxT("invalid bitmap data") )
+
+ *this = wxBitmap(img);
+ return TRUE;
+#else
+ return FALSE;
+#endif
}
wxBitmap::wxBitmap(int w, int h, int d)
{
- (void)Create(w, h, d);
+ Init();
- if ( wxTheBitmapList )
- wxTheBitmapList->AddBitmap(this);
+ (void)Create(w, h, d);
}
-wxBitmap::wxBitmap(void *data, long type, int width, int height, int depth)
+wxBitmap::wxBitmap(int w, int h, const wxDC& dc)
{
- (void) Create(data, type, width, height, depth);
+ Init();
- if ( wxTheBitmapList )
- wxTheBitmapList->AddBitmap(this);
+ (void)Create(w, h, dc);
}
-wxBitmap::wxBitmap(const wxString& filename, long type)
+wxBitmap::wxBitmap(void *data, long type, int width, int height, int depth)
{
- LoadFile(filename, (int)type);
+ Init();
- if ( wxTheBitmapList )
- wxTheBitmapList->AddBitmap(this);
+ (void)Create(data, type, width, height, depth);
}
-bool wxBitmap::Create(int w, int h, int d)
+wxBitmap::wxBitmap(const wxString& filename, wxBitmapType type)
{
- UnRef();
+ Init();
+
+ LoadFile(filename, (int)type);
+}
- m_refData = new wxBitmapRefData;
+bool wxBitmap::Create(int width, int height, int depth)
+{
+ return DoCreate(width, height, depth, 0);
+}
- M_BITMAPDATA->m_width = w;
- M_BITMAPDATA->m_height = h;
- M_BITMAPDATA->m_depth = d;
+bool wxBitmap::Create(int width, int height, const wxDC& dc)
+{
+ wxCHECK_MSG( dc.Ok(), FALSE, _T("invalid HDC in wxBitmap::Create()") );
- if (d > 0)
- {
- M_BITMAPDATA->m_hBitmap = (WXHBITMAP) CreateBitmap(w, h, 1, d, NULL);
- }
- else
- {
- HDC dc = GetDC((HWND) NULL);
- M_BITMAPDATA->m_hBitmap = (WXHBITMAP) CreateCompatibleBitmap(dc, w, h);
- ReleaseDC((HWND) NULL, dc);
- M_BITMAPDATA->m_depth = wxDisplayDepth();
- }
- if (M_BITMAPDATA->m_hBitmap)
- M_BITMAPDATA->m_ok = TRUE;
- else
- M_BITMAPDATA->m_ok = FALSE;
- return M_BITMAPDATA->m_ok;
+ return DoCreate(width, height, -1, dc.GetHDC());
}
-bool wxBitmap::LoadFile(const wxString& filename, long type)
+bool wxBitmap::DoCreate(int w, int h, int d, WXHDC hdc)
{
- UnRef();
+ UnRef();
- m_refData = new wxBitmapRefData;
+ m_refData = new wxBitmapRefData;
- wxBitmapHandler *handler = FindHandler(type);
+ GetBitmapData()->m_width = w;
+ GetBitmapData()->m_height = h;
- if ( handler == NULL ) {
- wxLogWarning(wxT("no bitmap handler for type %d defined."), type);
+ HBITMAP hbmp wxDUMMY_INITIALIZE(0);
- return FALSE;
- }
+#ifndef NEVER_USE_DIB
+ if ( wxShouldCreateDIB(w, h, d, hdc) )
+ {
+ if ( d == -1 )
+ {
+ // create DIBs without alpha channel by default
+ d = 24;
+ }
- return handler->LoadFile(this, filename, type, -1, -1);
+ wxDIB dib(w, h, d);
+ if ( !dib.IsOk() )
+ return FALSE;
+
+ // don't delete the DIB section in dib object dtor
+ hbmp = dib.Detach();
+
+ GetBitmapData()->m_isDIB = TRUE;
+ GetBitmapData()->m_depth = d;
+ }
+ else // create a DDB
+#endif // NEVER_USE_DIB
+ {
+#ifndef ALWAYS_USE_DIB
+#ifndef __WXMICROWIN__
+ if ( d > 0 )
+ {
+ hbmp = ::CreateBitmap(w, h, 1, d, NULL);
+ if ( !hbmp )
+ {
+ wxLogLastError(wxT("CreateBitmap"));
+ }
+
+ GetBitmapData()->m_depth = d;
+ }
+ else // d == 0, create bitmap compatible with the screen
+#endif // !__WXMICROWIN__
+ {
+ ScreenHDC dc;
+ hbmp = ::CreateCompatibleBitmap(dc, w, h);
+ if ( !hbmp )
+ {
+ wxLogLastError(wxT("CreateCompatibleBitmap"));
+ }
+
+ GetBitmapData()->m_depth = wxDisplayDepth();
+ }
+#endif // !ALWAYS_USE_DIB
+ }
+
+ SetHBITMAP((WXHBITMAP)hbmp);
+
+ return Ok();
}
-bool wxBitmap::Create(void *data, long type, int width, int height, int depth)
+#if wxUSE_IMAGE
+
+// ----------------------------------------------------------------------------
+// wxImage to/from conversions for Microwin
+// ----------------------------------------------------------------------------
+
+// Microwin versions are so different from normal ones that it really doesn't
+// make sense to use #ifdefs inside the function bodies
+#ifdef __WXMICROWIN__
+
+bool wxBitmap::CreateFromImage(const wxImage& image, int depth, const wxDC& dc)
{
- UnRef();
+ // Set this to 1 to experiment with mask code,
+ // which currently doesn't work
+ #define USE_MASKS 0
- m_refData = new wxBitmapRefData;
+ m_refData = new wxBitmapRefData();
- wxBitmapHandler *handler = FindHandler(type);
+ // Initial attempt at a simple-minded implementation.
+ // The bitmap will always be created at the screen depth,
+ // so the 'depth' argument is ignored.
- if ( handler == NULL ) {
- wxLogWarning(wxT("no bitmap handler for type %d defined."), type);
+ HDC hScreenDC = ::GetDC(NULL);
+ int screenDepth = ::GetDeviceCaps(hScreenDC, BITSPIXEL);
- return FALSE;
- }
+ HBITMAP hBitmap = ::CreateCompatibleBitmap(hScreenDC, image.GetWidth(), image.GetHeight());
+ HBITMAP hMaskBitmap = NULL;
+ HBITMAP hOldMaskBitmap = NULL;
+ HDC hMaskDC = NULL;
+ unsigned char maskR = 0;
+ unsigned char maskG = 0;
+ unsigned char maskB = 0;
+
+ // printf("Created bitmap %d\n", (int) hBitmap);
+ if (hBitmap == NULL)
+ {
+ ::ReleaseDC(NULL, hScreenDC);
+ return FALSE;
+ }
+ HDC hMemDC = ::CreateCompatibleDC(hScreenDC);
+
+ HBITMAP hOldBitmap = ::SelectObject(hMemDC, hBitmap);
+ ::ReleaseDC(NULL, hScreenDC);
+
+ // created an mono-bitmap for the possible mask
+ bool hasMask = image.HasMask();
+
+ if ( hasMask )
+ {
+#if USE_MASKS
+ // FIXME: we should be able to pass bpp = 1, but
+ // GdBlit can't handle a different depth
+#if 0
+ hMaskBitmap = ::CreateBitmap( (WORD)image.GetWidth(), (WORD)image.GetHeight(), 1, 1, NULL );
+#else
+ hMaskBitmap = ::CreateCompatibleBitmap( hMemDC, (WORD)image.GetWidth(), (WORD)image.GetHeight());
+#endif
+ maskR = image.GetMaskRed();
+ maskG = image.GetMaskGreen();
+ maskB = image.GetMaskBlue();
+
+ if (!hMaskBitmap)
+ {
+ hasMask = FALSE;
+ }
+ else
+ {
+ hScreenDC = ::GetDC(NULL);
+ hMaskDC = ::CreateCompatibleDC(hScreenDC);
+ ::ReleaseDC(NULL, hScreenDC);
- return handler->Create(this, data, type, width, height, depth);
+ hOldMaskBitmap = ::SelectObject( hMaskDC, hMaskBitmap);
+ }
+#else
+ hasMask = FALSE;
+#endif
+ }
+
+ int i, j;
+ for (i = 0; i < image.GetWidth(); i++)
+ {
+ for (j = 0; j < image.GetHeight(); j++)
+ {
+ unsigned char red = image.GetRed(i, j);
+ unsigned char green = image.GetGreen(i, j);
+ unsigned char blue = image.GetBlue(i, j);
+
+ ::SetPixel(hMemDC, i, j, PALETTERGB(red, green, blue));
+
+ if (hasMask)
+ {
+ // scan the bitmap for the transparent colour and set the corresponding
+ // pixels in the mask to BLACK and the rest to WHITE
+ if (maskR == red && maskG == green && maskB == blue)
+ ::SetPixel(hMaskDC, i, j, PALETTERGB(0, 0, 0));
+ else
+ ::SetPixel(hMaskDC, i, j, PALETTERGB(255, 255, 255));
+ }
+ }
+ }
+
+ ::SelectObject(hMemDC, hOldBitmap);
+ ::DeleteDC(hMemDC);
+ if (hasMask)
+ {
+ ::SelectObject(hMaskDC, hOldMaskBitmap);
+ ::DeleteDC(hMaskDC);
+
+ ((wxBitmapRefData*)m_refData)->SetMask(hMaskBitmap);
+ }
+
+ SetWidth(image.GetWidth());
+ SetHeight(image.GetHeight());
+ SetDepth(screenDepth);
+ SetHBITMAP( (WXHBITMAP) hBitmap );
+
+#if wxUSE_PALETTE
+ // Copy the palette from the source image
+ SetPalette(image.GetPalette());
+#endif // wxUSE_PALETTE
+
+ return TRUE;
}
-bool wxBitmap::SaveFile(const wxString& filename, int type, const wxPalette *palette)
+wxImage wxBitmap::ConvertToImage() const
{
- wxBitmapHandler *handler = FindHandler(type);
+ // Initial attempt at a simple-minded implementation.
+ // The bitmap will always be created at the screen depth,
+ // so the 'depth' argument is ignored.
+ // TODO: transparency (create a mask image)
- if ( handler == NULL ) {
- wxLogWarning(wxT("no bitmap handler for type %d defined."), type);
+ if (!Ok())
+ {
+ wxFAIL_MSG( wxT("bitmap is invalid") );
+ return wxNullImage;
+ }
- return FALSE;
- }
+ wxImage image;
+
+ wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") );
+
+ // create an wxImage object
+ int width = GetWidth();
+ int height = GetHeight();
+ image.Create( width, height );
+ unsigned char *data = image.GetData();
+ if( !data )
+ {
+ wxFAIL_MSG( wxT("could not allocate data for image") );
+ return wxNullImage;
+ }
- return handler->SaveFile(this, filename, type, palette);
+ HDC hScreenDC = ::GetDC(NULL);
+
+ HDC hMemDC = ::CreateCompatibleDC(hScreenDC);
+ ::ReleaseDC(NULL, hScreenDC);
+
+ HBITMAP hBitmap = (HBITMAP) GetHBITMAP();
+
+ HBITMAP hOldBitmap = ::SelectObject(hMemDC, hBitmap);
+
+ int i, j;
+ for (i = 0; i < GetWidth(); i++)
+ {
+ for (j = 0; j < GetHeight(); j++)
+ {
+ COLORREF color = ::GetPixel(hMemDC, i, j);
+ unsigned char red = GetRValue(color);
+ unsigned char green = GetGValue(color);
+ unsigned char blue = GetBValue(color);
+
+ image.SetRGB(i, j, red, green, blue);
+ }
+ }
+
+ ::SelectObject(hMemDC, hOldBitmap);
+ ::DeleteDC(hMemDC);
+
+#if wxUSE_PALETTE
+ // Copy the palette from the source image
+ if (GetPalette())
+ image.SetPalette(* GetPalette());
+#endif // wxUSE_PALETTE
+
+ return image;
+}
+
+#endif // __WXMICROWIN__
+
+// ----------------------------------------------------------------------------
+// wxImage to/from conversions
+// ----------------------------------------------------------------------------
+
+#if wxUSE_WXDIB
+
+bool wxBitmap::CreateFromImage(const wxImage& image, int depth)
+{
+ return CreateFromImage(image, depth, 0);
}
-void wxBitmap::SetWidth(int w)
+bool wxBitmap::CreateFromImage(const wxImage& image, const wxDC& dc)
{
- if (!M_BITMAPDATA)
- m_refData = new wxBitmapRefData;
+ wxCHECK_MSG( dc.Ok(), FALSE,
+ _T("invalid HDC in wxBitmap::CreateFromImage()") );
- M_BITMAPDATA->m_width = w;
+ return CreateFromImage(image, -1, dc.GetHDC());
}
-void wxBitmap::SetHeight(int h)
+bool wxBitmap::CreateFromImage(const wxImage& image, int depth, WXHDC hdc)
{
- if (!M_BITMAPDATA)
- m_refData = new wxBitmapRefData;
+ wxCHECK_MSG( image.Ok(), FALSE, wxT("invalid image") );
+
+ UnRef();
+
+ // first convert the image to DIB
+ const int h = image.GetHeight();
+ const int w = image.GetWidth();
+
+ wxDIB dib(image);
+ if ( !dib.IsOk() )
+ return FALSE;
+
- M_BITMAPDATA->m_height = h;
+ // store the bitmap parameters
+ wxBitmapRefData *refData = new wxBitmapRefData;
+ refData->m_width = w;
+ refData->m_height = h;
+ refData->m_hasAlpha = image.HasAlpha();
+
+ m_refData = refData;
+
+
+ // next either store DIB as is or create a DDB from it
+ HBITMAP hbitmap wxDUMMY_INITIALIZE(0);
+
+ // are we going to use DIB?
+ //
+ // NB: DDBs don't support alpha so if we have alpha channel we must use DIB
+ if ( image.HasAlpha() || wxShouldCreateDIB(w, h, depth, hdc) )
+ {
+ // don't delete the DIB section in dib object dtor
+ hbitmap = dib.Detach();
+
+ refData->m_isDIB = TRUE;
+ refData->m_depth = dib.GetDepth();
+ }
+#ifndef ALWAYS_USE_DIB
+ else // we need to convert DIB to DDB
+ {
+ hbitmap = dib.CreateDDB((HDC)hdc);
+
+ refData->m_depth = depth == -1 ? dib.GetDepth() : depth;
+ }
+#endif // !ALWAYS_USE_DIB
+
+ // validate this object
+ SetHBITMAP((WXHBITMAP)hbitmap);
+
+ // finally also set the mask if we have one
+ if ( image.HasMask() )
+ {
+ SetMask(new wxMask(*this, wxColour(image.GetMaskRed(),
+ image.GetMaskGreen(),
+ image.GetMaskBlue())));
+ }
+
+ return TRUE;
}
-void wxBitmap::SetDepth(int d)
+wxImage wxBitmap::ConvertToImage() const
+{
+ wxDIB dib(*this);
+
+ if ( !dib.IsOk() )
+ {
+ return wxNullImage;
+ }
+
+ wxImage image = dib.ConvertToImage();
+ if ( !image.Ok() )
+ {
+ return wxNullImage;
+ }
+
+ // set mask
+
+ // TODO: WinCE mask-copying support and use wxDIB
+#ifndef __WXWINCE__
+
+ if( GetMask() && GetMask()->GetMaskBitmap() )
+ {
+ static const int MASK_RED = 1;
+ static const int MASK_GREEN = 2;
+ static const int MASK_BLUE = 3;
+ static const int MASK_BLUE_REPLACEMENT = 2;
+
+ HBITMAP hbitmap = (HBITMAP) GetMask()->GetMaskBitmap();
+ int width = GetWidth();
+ int height = GetHeight();
+
+ int bytesPerLine = width*3;
+ int sizeDWORD = sizeof( DWORD );
+ int lineBoundary = bytesPerLine % sizeDWORD;
+ int padding = 0;
+ if( lineBoundary > 0 )
+ {
+ padding = sizeDWORD - lineBoundary;
+ bytesPerLine += padding;
+ }
+
+ // create a DIB header
+ int headersize = sizeof(BITMAPINFOHEADER);
+ BITMAPINFO *lpDIBh = (BITMAPINFO *) malloc( headersize );
+ if( !lpDIBh )
+ {
+ wxFAIL_MSG( wxT("could not allocate data for DIB header") );
+ //free( data );
+ return wxNullImage;
+ }
+
+ // Fill in the DIB header
+ lpDIBh->bmiHeader.biSize = headersize;
+ lpDIBh->bmiHeader.biWidth = width;
+ lpDIBh->bmiHeader.biHeight = -height;
+ lpDIBh->bmiHeader.biSizeImage = bytesPerLine * height;
+ lpDIBh->bmiHeader.biPlanes = 1;
+ lpDIBh->bmiHeader.biBitCount = 24;
+ lpDIBh->bmiHeader.biCompression = BI_RGB;
+ lpDIBh->bmiHeader.biClrUsed = 0;
+ // These seem not really needed for our purpose here.
+ lpDIBh->bmiHeader.biClrImportant = 0;
+ lpDIBh->bmiHeader.biXPelsPerMeter = 0;
+ lpDIBh->bmiHeader.biYPelsPerMeter = 0;
+
+ // memory DC created, color set, data copied, and memory DC deleted
+
+ // memory for DIB data
+ unsigned char *lpBits
+ = (unsigned char *) malloc( lpDIBh->bmiHeader.biSizeImage );
+ if( !lpBits )
+ {
+ wxFAIL_MSG( wxT("could not allocate data for DIB") );
+ free( lpDIBh );
+ return wxNullImage;
+ }
+
+
+ HDC hdc = ::GetDC(NULL);
+
+ HDC memdc = ::CreateCompatibleDC( hdc );
+ ::SetTextColor( memdc, RGB( 0, 0, 0 ) );
+ ::SetBkColor( memdc, RGB( 255, 255, 255 ) );
+ ::GetDIBits( memdc, hbitmap, 0, height, lpBits, lpDIBh, DIB_RGB_COLORS );
+ ::DeleteDC( memdc );
+ unsigned char *ptdata = image.GetData();//data;
+ unsigned char *ptbits = lpBits;
+ int i, j;
+ for( i=0; i<height; i++ )
+ {
+ for( j=0; j<width; j++ )
+ {
+ // is this pixel transparent?
+ if ( *ptbits != 0 )
+ {
+ if ( (ptdata[0] == MASK_RED) &&
+ (ptdata[1] == MASK_GREEN) &&
+ (ptdata[2] == MASK_BLUE) )
+ {
+ // we have to fudge the colour a bit to prevent this
+ // pixel from appearing transparent
+ ptdata[2] = MASK_BLUE_REPLACEMENT;
+ }
+ ptdata += 3;
+ }
+ else // masked pixel
+ {
+ *(ptdata++) = MASK_RED;
+ *(ptdata++) = MASK_GREEN;
+ *(ptdata++) = MASK_BLUE;
+ }
+ ptbits += 3;
+ }
+ ptbits += padding;
+ }
+
+ image.SetMaskColour( MASK_RED, MASK_GREEN, MASK_BLUE );
+ image.SetMask( true );
+
+ // free allocated resources
+ ::ReleaseDC(NULL, hdc);
+ free(lpDIBh);
+ free(lpBits);
+ }
+#endif // __WXWINCE__
+
+ return image;
+}
+
+#endif // wxUSE_WXDIB
+
+#endif // wxUSE_IMAGE
+
+// ----------------------------------------------------------------------------
+// loading and saving bitmaps
+// ----------------------------------------------------------------------------
+
+bool wxBitmap::LoadFile(const wxString& filename, long type)
{
- if (!M_BITMAPDATA)
- m_refData = new wxBitmapRefData;
+ UnRef();
+
+ wxBitmapHandler *handler = wxDynamicCast(FindHandler(type), wxBitmapHandler);
+
+ if ( handler )
+ {
+ m_refData = new wxBitmapRefData;
- M_BITMAPDATA->m_depth = d;
+ return handler->LoadFile(this, filename, type, -1, -1);
+ }
+#if wxUSE_IMAGE
+ else // no bitmap handler found
+ {
+ wxImage image;
+ if ( image.LoadFile( filename, type ) && image.Ok() )
+ {
+ *this = wxBitmap(image);
+
+ return TRUE;
+ }
+ }
+#endif // wxUSE_IMAGE
+
+ return FALSE;
}
-void wxBitmap::SetQuality(int q)
+bool wxBitmap::Create(void *data, long type, int width, int height, int depth)
{
- if (!M_BITMAPDATA)
- m_refData = new wxBitmapRefData;
+ UnRef();
+
+ wxBitmapHandler *handler = wxDynamicCast(FindHandler(type), wxBitmapHandler);
+
+ if ( !handler )
+ {
+ wxLogDebug(wxT("Failed to create bitmap: no bitmap handler for type %ld defined."), type);
- M_BITMAPDATA->m_quality = q;
+ return FALSE;
+ }
+
+ m_refData = new wxBitmapRefData;
+
+ return handler->Create(this, data, type, width, height, depth);
}
-void wxBitmap::SetOk(bool isOk)
+bool wxBitmap::SaveFile(const wxString& filename,
+ int type,
+ const wxPalette *palette)
{
- if (!M_BITMAPDATA)
- m_refData = new wxBitmapRefData;
+ wxBitmapHandler *handler = wxDynamicCast(FindHandler(type), wxBitmapHandler);
+
+ if ( handler )
+ {
+ return handler->SaveFile(this, filename, type, palette);
+ }
+#if wxUSE_IMAGE
+ else // no bitmap handler found
+ {
+ // FIXME what about palette? shouldn't we use it?
+ wxImage image = ConvertToImage();
+ if ( image.Ok() )
+ {
+ return image.SaveFile(filename, type);
+ }
+ }
+#endif // wxUSE_IMAGE
- M_BITMAPDATA->m_ok = isOk;
+ return FALSE;
}
-void wxBitmap::SetPalette(const wxPalette& palette)
+// ----------------------------------------------------------------------------
+// sub bitmap extraction
+// ----------------------------------------------------------------------------
+
+wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
{
- if (!M_BITMAPDATA)
- m_refData = new wxBitmapRefData;
+ wxCHECK_MSG( Ok() &&
+ (rect.x >= 0) && (rect.y >= 0) &&
+ (rect.x+rect.width <= GetWidth()) &&
+ (rect.y+rect.height <= GetHeight()),
+ wxNullBitmap, wxT("Invalid bitmap or bitmap region") );
+
+ wxBitmap ret( rect.width, rect.height );
+ wxASSERT_MSG( ret.Ok(), wxT("GetSubBitmap error") );
+
+#ifndef __WXMICROWIN__
+ // TODO: copy alpha channel data if any
+
+ // copy bitmap data
+ MemoryHDC dcSrc,
+ dcDst;
+
+ {
+ SelectInHDC selectSrc(dcSrc, GetHbitmap()),
+ selectDst(dcDst, GetHbitmapOf(ret));
+
+ if ( !selectSrc || !selectDst )
+ {
+ wxLogLastError(_T("SelectObjct(hBitmap)"));
+ }
+
+ if ( !::BitBlt(dcDst, 0, 0, rect.width, rect.height,
+ dcSrc, rect.x, rect.y, SRCCOPY) )
+ {
+ wxLogLastError(_T("BitBlt"));
+ }
+ }
+
+ // copy mask if there is one
+ if ( GetMask() )
+ {
+ HBITMAP hbmpMask = ::CreateBitmap(rect.width, rect.height, 1, 1, 0);
+
+ SelectInHDC selectSrc(dcSrc, (HBITMAP) GetMask()->GetMaskBitmap()),
+ selectDst(dcDst, hbmpMask);
+
+ if ( !::BitBlt(dcDst, 0, 0, rect.width, rect.height,
+ dcSrc, rect.x, rect.y, SRCCOPY) )
+ {
+ wxLogLastError(_T("BitBlt"));
+ }
+
+ wxMask *mask = new wxMask((WXHBITMAP) hbmpMask);
+ ret.SetMask(mask);
+ }
+#endif // !__WXMICROWIN__
- M_BITMAPDATA->m_bitmapPalette = palette ;
+ return ret;
}
-void wxBitmap::SetMask(wxMask *mask)
+// ----------------------------------------------------------------------------
+// wxBitmap accessors
+// ----------------------------------------------------------------------------
+
+#if wxUSE_PALETTE
+wxPalette* wxBitmap::GetPalette() const
{
- if (!M_BITMAPDATA)
- m_refData = new wxBitmapRefData;
+ return GetBitmapData() ? &GetBitmapData()->m_bitmapPalette
+ : (wxPalette *) NULL;
+}
+#endif
- M_BITMAPDATA->m_bitmapMask = mask ;
+wxMask *wxBitmap::GetMask() const
+{
+ return GetBitmapData() ? GetBitmapData()->GetMask() : (wxMask *) NULL;
}
-void wxBitmap::SetHBITMAP(WXHBITMAP bmp)
+#ifdef __WXDEBUG__
+
+wxDC *wxBitmap::GetSelectedInto() const
{
- if (!M_BITMAPDATA)
- m_refData = new wxBitmapRefData;
+ return GetBitmapData() ? GetBitmapData()->m_selectedInto : (wxDC *) NULL;
+}
- M_BITMAPDATA->m_hBitmap = bmp;
+#endif
+
+#if WXWIN_COMPATIBILITY_2_4
+
+int wxBitmap::GetQuality() const
+{
+ return 0;
}
-void wxBitmap::AddHandler(wxBitmapHandler *handler)
+#endif // WXWIN_COMPATIBILITY_2_4
+
+void wxBitmap::UseAlpha()
{
- sm_handlers.Append(handler);
+ if ( GetBitmapData() )
+ GetBitmapData()->m_hasAlpha = true;
}
-void wxBitmap::InsertHandler(wxBitmapHandler *handler)
+bool wxBitmap::HasAlpha() const
{
- sm_handlers.Insert(handler);
+ return GetBitmapData() && GetBitmapData()->m_hasAlpha;
}
-bool wxBitmap::RemoveHandler(const wxString& name)
+// ----------------------------------------------------------------------------
+// wxBitmap setters
+// ----------------------------------------------------------------------------
+
+#ifdef __WXDEBUG__
+
+void wxBitmap::SetSelectedInto(wxDC *dc)
{
- wxBitmapHandler *handler = FindHandler(name);
- if ( handler )
- {
- sm_handlers.DeleteObject(handler);
- return TRUE;
- }
- else
- return FALSE;
+ if ( GetBitmapData() )
+ GetBitmapData()->m_selectedInto = dc;
}
-wxBitmapHandler *wxBitmap::FindHandler(const wxString& name)
+#endif
+
+#if wxUSE_PALETTE
+
+void wxBitmap::SetPalette(const wxPalette& palette)
{
- wxNode *node = sm_handlers.First();
- while ( node )
- {
- wxBitmapHandler *handler = (wxBitmapHandler *)node->Data();
- if ( (handler->GetName().Cmp(name) == 0) )
- return handler;
- node = node->Next();
- }
- return NULL;
+ EnsureHasData();
+
+ GetBitmapData()->m_bitmapPalette = palette;
}
-wxBitmapHandler *wxBitmap::FindHandler(const wxString& extension, long bitmapType)
+#endif // wxUSE_PALETTE
+
+void wxBitmap::SetMask(wxMask *mask)
{
- wxNode *node = sm_handlers.First();
- while ( node )
- {
- wxBitmapHandler *handler = (wxBitmapHandler *)node->Data();
- if ( (handler->GetExtension().Cmp(extension) == 0) &&
- (bitmapType == -1 || (handler->GetType() == bitmapType)) )
- return handler;
- node = node->Next();
- }
- return NULL;
+ EnsureHasData();
+
+ GetBitmapData()->SetMask(mask);
}
-wxBitmapHandler *wxBitmap::FindHandler(long bitmapType)
+#if WXWIN_COMPATIBILITY_2_4
+
+void wxBitmap::SetQuality(int WXUNUSED(quality))
{
- wxNode *node = sm_handlers.First();
- while ( node )
- {
- wxBitmapHandler *handler = (wxBitmapHandler *)node->Data();
- if (handler->GetType() == bitmapType)
- return handler;
- node = node->Next();
- }
- return NULL;
}
-// New Create/FreeDIB functions since ones in dibutils.cpp are confusing
-static long createDIB(long xSize, long ySize, long bitsPerPixel,
- HPALETTE hPal, LPBITMAPINFO* lpDIBHeader);
-static long freeDIB(LPBITMAPINFO lpDIBHeader);
+#endif // WXWIN_COMPATIBILITY_2_4
-// Creates a bitmap that matches the device context, from
-// an arbitray bitmap. At present, the original bitmap must have an
-// associated palette. TODO: use a default palette if no palette exists.
-// Contributed by Frederic Villeneuve <frederic.villeneuve@natinst.com>
-wxBitmap wxBitmap::GetBitmapForDC(wxDC& dc) const
+// ----------------------------------------------------------------------------
+// raw bitmap access support
+// ----------------------------------------------------------------------------
+
+#ifdef wxHAVE_RAW_BITMAP
+void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp)
{
- wxMemoryDC memDC;
- wxBitmap tmpBitmap(this->GetWidth(), this->GetHeight(), dc.GetDepth());
- HPALETTE hPal = (HPALETTE) NULL;
- LPBITMAPINFO lpDib;
- void *lpBits = (void*) NULL;
+#if wxUSE_WXDIB
+ if ( !Ok() )
+ {
+ // no bitmap, no data (raw or otherwise)
+ return NULL;
+ }
+
+ // if we're already a DIB we can access our data directly, but if not we
+ // need to convert this DDB to a DIB section and use it for raw access and
+ // then convert it back
+ HBITMAP hDIB;
+ if ( !GetBitmapData()->m_isDIB )
+ {
+ wxCHECK_MSG( !GetBitmapData()->m_dib, FALSE,
+ _T("GetRawData() may be called only once") );
+
+ wxDIB *dib = new wxDIB(*this);
+ if ( !dib->IsOk() )
+ {
+ delete dib;
-/*
- wxASSERT( this->GetPalette() && this->GetPalette()->Ok() && (this->GetPalette()->GetHPALETTE() != 0) );
+ return NULL;
+ }
- tmpBitmap.SetPalette(this->GetPalette());
- memDC.SelectObject(tmpBitmap);
- memDC.SetPalette(this->GetPalette());
+ // we'll free it in UngetRawData()
+ GetBitmapData()->m_dib = dib;
- hPal = (HPALETTE) this->GetPalette()->GetHPALETTE();
-*/
- if( this->GetPalette() && this->GetPalette()->Ok() && (this->GetPalette()->GetHPALETTE() != 0) )
+ hDIB = dib->GetHandle();
+ }
+ else // we're a DIB
{
- tmpBitmap.SetPalette(* this->GetPalette());
- memDC.SelectObject(tmpBitmap);
- memDC.SetPalette(* this->GetPalette());
- hPal = (HPALETTE) this->GetPalette()->GetHPALETTE();
+ hDIB = GetHbitmap();
}
- else
+
+ DIBSECTION ds;
+ if ( ::GetObject(hDIB, sizeof(ds), &ds) != sizeof(DIBSECTION) )
{
- hPal = (HPALETTE) ::GetStockObject(DEFAULT_PALETTE);
- wxPalette palette;
- palette.SetHPALETTE( (WXHPALETTE)hPal );
- tmpBitmap.SetPalette( palette );
- memDC.SelectObject(tmpBitmap);
- memDC.SetPalette( palette );
+ wxFAIL_MSG( _T("failed to get DIBSECTION from a DIB?") );
+
+ return NULL;
}
- // set the height negative because in a DIB the order of the lines is reversed
- createDIB(this->GetWidth(), -this->GetHeight(), this->GetDepth(), hPal, &lpDib);
+ // check that the bitmap is in correct format
+ if ( ds.dsBm.bmBitsPixel != bpp )
+ {
+ wxFAIL_MSG( _T("incorrect bitmap type in wxBitmap::GetRawData()") );
+
+ return NULL;
+ }
- lpBits = malloc(lpDib->bmiHeader.biSizeImage);
+ // ok, store the relevant info in wxPixelDataBase
+ const LONG h = ds.dsBm.bmHeight;
- ::GetBitmapBits((HBITMAP)GetHBITMAP(), lpDib->bmiHeader.biSizeImage, lpBits);
+ data.m_width = ds.dsBm.bmWidth;
+ data.m_height = h;
- ::SetDIBitsToDevice((HDC) memDC.GetHDC(), 0, 0, this->GetWidth(), this->GetHeight(),
- 0, 0, 0, this->GetHeight(), lpBits, lpDib, DIB_RGB_COLORS);
+ // remember that DIBs are stored in top to bottom order!
+ const LONG bytesPerRow = ds.dsBm.bmWidthBytes;
+ data.m_stride = -bytesPerRow;
- free(lpBits);
+ char *bits = (char *)ds.dsBm.bmBits;
+ if ( h > 1 )
+ {
+ bits += (h - 1)*bytesPerRow;
+ }
- freeDIB(lpDib);
- return (tmpBitmap);
+ return bits;
+#else
+ return NULL;
+#endif
}
-/*
- * wxMask
- */
+void wxBitmap::UngetRawData(wxPixelDataBase& dataBase)
+{
+#if wxUSE_WXDIB
+ if ( !Ok() )
+ return;
+
+ // the cast is ugly but we can't do without it and without making this
+ // function template (and hence inline) unfortunately
+ typedef wxPixelData<wxBitmap, wxAlphaPixelFormat> PixelData;
+ PixelData& data = (PixelData &)dataBase;
+
+ if ( !data )
+ {
+ // invalid data, don't crash -- but don't assert neither as we're
+ // called automatically from wxPixelDataBase dtor and so there is no
+ // way to prevent this from happening
+ return;
+ }
+
+ if ( GetBitmapData()->m_hasAlpha )
+ {
+ // AlphaBlend() wants to have premultiplied source alpha but
+ // wxRawBitmap API uses normal, not premultiplied, colours, so adjust
+ // them here now
+ PixelData::Iterator p(data);
+
+ const int w = data.GetWidth();
+ const int h = data.GetHeight();
+
+ for ( int y = 0; y < h; y++ )
+ {
+ PixelData::Iterator rowStart = p;
+
+ for ( int x = 0; x < w; x++ )
+ {
+ const unsigned alpha = p.Alpha();
+
+ p.Red() = (p.Red() * alpha + 127) / 255;
+ p.Blue() = (p.Blue() * alpha + 127) / 255;
+ p.Green() = (p.Green() * alpha + 127) / 255;
+
+ ++p;
+ }
+
+ p = rowStart;
+ p.OffsetY(data, 1);
+ }
+ }
+
+ // if we're a DDB we need to convert DIB back to DDB now to make the
+ // changes made via raw bitmap access effective
+ if ( !GetBitmapData()->m_isDIB )
+ {
+ wxDIB *dib = GetBitmapData()->m_dib;
+ GetBitmapData()->m_dib = NULL;
+
+ // TODO: convert
+
+ delete dib;
+ }
+#endif // wxUSE_WXDIB
+}
+#endif // #ifdef wxHAVE_RAW_BITMAP
+
+// ----------------------------------------------------------------------------
+// wxMask
+// ----------------------------------------------------------------------------
wxMask::wxMask()
{
wxMask::wxMask(const wxBitmap& bitmap, const wxColour& colour)
{
m_maskBitmap = 0;
- Create(bitmap, colour);
+ Create(bitmap, colour);
}
// Construct a mask from a bitmap and a palette index indicating
wxMask::wxMask(const wxBitmap& bitmap, int paletteIndex)
{
m_maskBitmap = 0;
- Create(bitmap, paletteIndex);
+ Create(bitmap, paletteIndex);
}
// Construct a mask from a mono bitmap (copies the bitmap).
wxMask::wxMask(const wxBitmap& bitmap)
{
m_maskBitmap = 0;
- Create(bitmap);
+ Create(bitmap);
}
wxMask::~wxMask()
// Create a mask from a mono bitmap (copies the bitmap).
bool wxMask::Create(const wxBitmap& bitmap)
{
+#ifndef __WXMICROWIN__
+ wxCHECK_MSG( bitmap.Ok() && bitmap.GetDepth() == 1, FALSE,
+ _T("can't create mask from invalid or not monochrome bitmap") );
+
if ( m_maskBitmap )
- {
- ::DeleteObject((HBITMAP) m_maskBitmap);
- m_maskBitmap = 0;
- }
- if (!bitmap.Ok() || bitmap.GetDepth() != 1)
- {
+ {
+ ::DeleteObject((HBITMAP) m_maskBitmap);
+ m_maskBitmap = 0;
+ }
+
+ m_maskBitmap = (WXHBITMAP) CreateBitmap(
+ bitmap.GetWidth(),
+ bitmap.GetHeight(),
+ 1, 1, 0
+ );
+ HDC srcDC = CreateCompatibleDC(0);
+ SelectObject(srcDC, (HBITMAP) bitmap.GetHBITMAP());
+ HDC destDC = CreateCompatibleDC(0);
+ SelectObject(destDC, (HBITMAP) m_maskBitmap);
+ BitBlt(destDC, 0, 0, bitmap.GetWidth(), bitmap.GetHeight(), srcDC, 0, 0, SRCCOPY);
+ SelectObject(srcDC, 0);
+ DeleteDC(srcDC);
+ SelectObject(destDC, 0);
+ DeleteDC(destDC);
+ return TRUE;
+#else
return FALSE;
- }
- m_maskBitmap = (WXHBITMAP) CreateBitmap(
- bitmap.GetWidth(),
- bitmap.GetHeight(),
- 1, 1, 0
- );
- HDC srcDC = CreateCompatibleDC(0);
- SelectObject(srcDC, (HBITMAP) bitmap.GetHBITMAP());
- HDC destDC = CreateCompatibleDC(0);
- SelectObject(destDC, (HBITMAP) m_maskBitmap);
- BitBlt(destDC, 0, 0, bitmap.GetWidth(), bitmap.GetHeight(), srcDC, 0, 0, SRCCOPY);
- SelectObject(srcDC, 0);
- DeleteDC(srcDC);
- SelectObject(destDC, 0);
- DeleteDC(destDC);
- return TRUE;
+#endif
}
// Create a mask from a bitmap and a palette index indicating
bool wxMask::Create(const wxBitmap& bitmap, int paletteIndex)
{
if ( m_maskBitmap )
- {
- ::DeleteObject((HBITMAP) m_maskBitmap);
- m_maskBitmap = 0;
- }
- if (bitmap.Ok() && bitmap.GetPalette()->Ok())
- {
- unsigned char red, green, blue;
- if (bitmap.GetPalette()->GetRGB(paletteIndex, &red, &green, &blue))
{
- wxColour transparentColour(red, green, blue);
- return Create(bitmap, transparentColour);
+ ::DeleteObject((HBITMAP) m_maskBitmap);
+ m_maskBitmap = 0;
+ }
+
+#if wxUSE_PALETTE
+ if (bitmap.Ok() && bitmap.GetPalette()->Ok())
+ {
+ unsigned char red, green, blue;
+ if (bitmap.GetPalette()->GetRGB(paletteIndex, &red, &green, &blue))
+ {
+ wxColour transparentColour(red, green, blue);
+ return Create(bitmap, transparentColour);
+ }
}
- }
- return FALSE;
+#endif // wxUSE_PALETTE
+
+ return FALSE;
}
// Create a mask from a bitmap and a colour indicating
// the transparent area
bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
{
+#ifndef __WXMICROWIN__
+ wxCHECK_MSG( bitmap.Ok(), FALSE, _T("invalid bitmap in wxMask::Create") );
+
if ( m_maskBitmap )
- {
- ::DeleteObject((HBITMAP) m_maskBitmap);
- m_maskBitmap = 0;
- }
- if (!bitmap.Ok())
- {
- return FALSE;
- }
-
- // scan the bitmap for the transparent colour and set
- // the corresponding pixels in the mask to BLACK and
- // the rest to WHITE
- COLORREF maskColour = RGB(colour.Red(), colour.Green(), colour.Blue());
- m_maskBitmap = (WXHBITMAP) ::CreateBitmap(
- bitmap.GetWidth(),
- bitmap.GetHeight(),
- 1, 1, 0
- );
- HDC srcDC = ::CreateCompatibleDC(0);
- ::SelectObject(srcDC, (HBITMAP) bitmap.GetHBITMAP());
- HDC destDC = ::CreateCompatibleDC(0);
- ::SelectObject(destDC, (HBITMAP) m_maskBitmap);
-
- // this is not very efficient, but I can't think
- // of a better way of doing it
- for (int w = 0; w < bitmap.GetWidth(); w++)
- {
- for (int h = 0; h < bitmap.GetHeight(); h++)
- {
- COLORREF col = GetPixel(srcDC, w, h);
- if (col == maskColour)
- {
- ::SetPixel(destDC, w, h, RGB(0, 0, 0));
- }
- else
- {
- ::SetPixel(destDC, w, h, RGB(255, 255, 255));
- }
- }
- }
- ::SelectObject(srcDC, 0);
- ::DeleteDC(srcDC);
- ::SelectObject(destDC, 0);
- ::DeleteDC(destDC);
- return TRUE;
-}
-
-/*
- * wxBitmapHandler
- */
+ {
+ ::DeleteObject((HBITMAP) m_maskBitmap);
+ m_maskBitmap = 0;
+ }
-IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, wxObject)
+ int width = bitmap.GetWidth(),
+ height = bitmap.GetHeight();
-bool wxBitmapHandler::Create(wxBitmap *WXUNUSED(bitmap), void *WXUNUSED(data), long WXUNUSED(type), int WXUNUSED(width), int WXUNUSED(height), int WXUNUSED(depth))
-{
- return FALSE;
-}
+ // scan the bitmap for the transparent colour and set the corresponding
+ // pixels in the mask to BLACK and the rest to WHITE
+ COLORREF maskColour = wxColourToPalRGB(colour);
+ m_maskBitmap = (WXHBITMAP)::CreateBitmap(width, height, 1, 1, 0);
-bool wxBitmapHandler::LoadFile(wxBitmap *WXUNUSED(bitmap), const wxString& WXUNUSED(name), long WXUNUSED(type),
- int WXUNUSED(desiredWidth), int WXUNUSED(desiredHeight))
-{
- return FALSE;
-}
+ HDC srcDC = ::CreateCompatibleDC(NULL);
+ HDC destDC = ::CreateCompatibleDC(NULL);
+ if ( !srcDC || !destDC )
+ {
+ wxLogLastError(wxT("CreateCompatibleDC"));
+ }
-bool wxBitmapHandler::SaveFile(wxBitmap *WXUNUSED(bitmap), const wxString& WXUNUSED(name), int WXUNUSED(type), const wxPalette *WXUNUSED(palette))
-{
- return FALSE;
-}
+ bool ok = TRUE;
-/*
- * Standard handlers
- */
+ // SelectObject() will fail
+ wxASSERT_MSG( !bitmap.GetSelectedInto(),
+ _T("bitmap can't be selected in another DC") );
-class WXDLLEXPORT wxBMPResourceHandler: public wxBitmapHandler
-{
- DECLARE_DYNAMIC_CLASS(wxBMPResourceHandler)
-public:
- inline wxBMPResourceHandler()
- {
- m_name = "Windows bitmap resource";
- m_extension = "";
- m_type = wxBITMAP_TYPE_BMP_RESOURCE;
- };
-
- virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
- int desiredWidth, int desiredHeight);
-};
-IMPLEMENT_DYNAMIC_CLASS(wxBMPResourceHandler, wxBitmapHandler)
+ HGDIOBJ hbmpSrcOld = ::SelectObject(srcDC, GetHbitmapOf(bitmap));
+ if ( !hbmpSrcOld )
+ {
+ wxLogLastError(wxT("SelectObject"));
-bool wxBMPResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long WXUNUSED(flags),
- int WXUNUSED(desiredWidth), int WXUNUSED(desiredHeight))
-{
- // TODO: load colourmap.
- M_BITMAPHANDLERDATA->m_hBitmap = (WXHBITMAP) ::LoadBitmap(wxGetInstance(), name);
- if (M_BITMAPHANDLERDATA->m_hBitmap)
+ ok = FALSE;
+ }
+
+ HGDIOBJ hbmpDstOld = ::SelectObject(destDC, (HBITMAP)m_maskBitmap);
+ if ( !hbmpDstOld )
{
- M_BITMAPHANDLERDATA->m_ok = TRUE;
- BITMAP bm;
- GetObject((HBITMAP) M_BITMAPHANDLERDATA->m_hBitmap, sizeof(BITMAP), (LPSTR) &bm);
- M_BITMAPHANDLERDATA->m_width = bm.bmWidth;
- M_BITMAPHANDLERDATA->m_height = bm.bmHeight;
- M_BITMAPHANDLERDATA->m_depth = bm.bmBitsPixel;
+ wxLogLastError(wxT("SelectObject"));
- if ( bitmap->IsKindOf(CLASSINFO(wxIcon)) )
- {
- }
+ ok = FALSE;
+ }
- return TRUE;
+ if ( ok )
+ {
+ // this will create a monochrome bitmap with 0 points for the pixels
+ // which have the same value as the background colour and 1 for the
+ // others
+ ::SetBkColor(srcDC, maskColour);
+ ::BitBlt(destDC, 0, 0, width, height, srcDC, 0, 0, NOTSRCCOPY);
}
- // it's probably not found
- wxLogError(wxT("Can't load bitmap '%s' from resources! Check .rc file."), name.c_str());
+ ::SelectObject(srcDC, hbmpSrcOld);
+ ::DeleteDC(srcDC);
+ ::SelectObject(destDC, hbmpDstOld);
+ ::DeleteDC(destDC);
- return FALSE;
+ return ok;
+#else // __WXMICROWIN__
+ return FALSE;
+#endif // __WXMICROWIN__/!__WXMICROWIN__
}
-class WXDLLEXPORT wxBMPFileHandler: public wxBitmapHandler
-{
- DECLARE_DYNAMIC_CLASS(wxBMPFileHandler)
-public:
- inline wxBMPFileHandler()
- {
- m_name = "Windows bitmap file";
- m_extension = "bmp";
- m_type = wxBITMAP_TYPE_BMP;
- };
-
- virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
- int desiredWidth, int desiredHeight);
- virtual bool SaveFile(wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette = NULL);
-};
-IMPLEMENT_DYNAMIC_CLASS(wxBMPFileHandler, wxBitmapHandler)
+// ----------------------------------------------------------------------------
+// wxBitmapHandler
+// ----------------------------------------------------------------------------
-bool wxBMPFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long WXUNUSED(flags),
- int WXUNUSED(desiredWidth), int WXUNUSED(desiredHeight))
+bool wxBitmapHandler::Create(wxGDIImage *image,
+ void *data,
+ long flags,
+ int width, int height, int depth)
{
-#if wxUSE_IMAGE_LOADING_IN_MSW
- wxPalette *palette = NULL;
- bool success = FALSE;
-/*
- if (type & wxBITMAP_DISCARD_COLOURMAP)
- success = wxLoadIntoBitmap(WXSTRINGCAST name, bitmap);
- else
-*/
- success = (wxLoadIntoBitmap(WXSTRINGCAST name, bitmap, &palette) != 0);
- if (!success && palette)
- {
- delete palette;
- palette = NULL;
- }
- if (palette)
- {
- M_BITMAPHANDLERDATA->m_bitmapPalette = *palette;
- delete palette;
- }
- return success;
-#else
- return FALSE;
-#endif
+ wxBitmap *bitmap = wxDynamicCast(image, wxBitmap);
+
+ return bitmap ? Create(bitmap, data, flags, width, height, depth) : FALSE;
}
-bool wxBMPFileHandler::SaveFile(wxBitmap *bitmap, const wxString& name, int WXUNUSED(type), const wxPalette *pal)
+bool wxBitmapHandler::Load(wxGDIImage *image,
+ const wxString& name,
+ long flags,
+ int width, int height)
{
-#if wxUSE_IMAGE_LOADING_IN_MSW
- wxPalette *actualPalette = (wxPalette *)pal;
- if (!actualPalette && (!M_BITMAPHANDLERDATA->m_bitmapPalette.IsNull()))
- actualPalette = & (M_BITMAPHANDLERDATA->m_bitmapPalette);
- return (wxSaveBitmap(WXSTRINGCAST name, bitmap, actualPalette) != 0);
-#else
- return FALSE;
-#endif
+ wxBitmap *bitmap = wxDynamicCast(image, wxBitmap);
+
+ return bitmap ? LoadFile(bitmap, name, flags, width, height) : FALSE;
}
-void wxBitmap::CleanUpHandlers()
+bool wxBitmapHandler::Save(wxGDIImage *image,
+ const wxString& name,
+ int type)
{
- wxNode *node = sm_handlers.First();
- while ( node )
- {
- wxBitmapHandler *handler = (wxBitmapHandler *)node->Data();
- wxNode *next = node->Next();
- delete handler;
- delete node;
- node = next;
- }
+ wxBitmap *bitmap = wxDynamicCast(image, wxBitmap);
+
+ return bitmap ? SaveFile(bitmap, name, type) : FALSE;
}
-void wxBitmap::InitStandardHandlers()
+bool wxBitmapHandler::Create(wxBitmap *WXUNUSED(bitmap),
+ void *WXUNUSED(data),
+ long WXUNUSED(type),
+ int WXUNUSED(width),
+ int WXUNUSED(height),
+ int WXUNUSED(depth))
{
- AddHandler(new wxBMPResourceHandler);
- AddHandler(new wxBMPFileHandler);
+ return FALSE;
+}
- // Not added by default: include xpmhand.h in your app
- // and call these in your wxApp::OnInit.
-// AddHandler(new wxXPMFileHandler);
-// AddHandler(new wxXPMDataHandler);
+bool wxBitmapHandler::LoadFile(wxBitmap *WXUNUSED(bitmap),
+ const wxString& WXUNUSED(name),
+ long WXUNUSED(type),
+ int WXUNUSED(desiredWidth),
+ int WXUNUSED(desiredHeight))
+{
+ return FALSE;
+}
- AddHandler(new wxICOResourceHandler);
- AddHandler(new wxICOFileHandler);
+bool wxBitmapHandler::SaveFile(wxBitmap *WXUNUSED(bitmap),
+ const wxString& WXUNUSED(name),
+ int WXUNUSED(type),
+ const wxPalette *WXUNUSED(palette))
+{
+ return FALSE;
}
-static long createDIB(long xSize, long ySize, long bitsPerPixel,
- HPALETTE hPal, LPBITMAPINFO* lpDIBHeader)
+// ----------------------------------------------------------------------------
+// DIB functions
+// ----------------------------------------------------------------------------
+
+#ifndef __WXMICROWIN__
+bool wxCreateDIB(long xSize, long ySize, long bitsPerPixel,
+ HPALETTE hPal, LPBITMAPINFO* lpDIBHeader)
{
unsigned long i, headerSize;
- LPBITMAPINFO lpDIBheader = NULL;
- LPPALETTEENTRY lpPe = NULL;
-
// Allocate space for a DIB header
headerSize = (sizeof(BITMAPINFOHEADER) + (256 * sizeof(PALETTEENTRY)));
- lpDIBheader = (BITMAPINFO *) malloc(headerSize);
- lpPe = (PALETTEENTRY *)((BYTE*)lpDIBheader + sizeof(BITMAPINFOHEADER));
+ LPBITMAPINFO lpDIBheader = (BITMAPINFO *) malloc(headerSize);
+ LPPALETTEENTRY lpPe = (PALETTEENTRY *)((BYTE*)lpDIBheader + sizeof(BITMAPINFOHEADER));
GetPaletteEntries(hPal, 0, 256, lpPe);
-
memset(lpDIBheader, 0x00, sizeof(BITMAPINFOHEADER));
-
// Fill in the static parts of the DIB header
lpDIBheader->bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
lpDIBheader->bmiHeader.biWidth = xSize;
// this value must be 1, 4, 8 or 24 so PixelDepth can only be
lpDIBheader->bmiHeader.biBitCount = (WORD)(bitsPerPixel);
lpDIBheader->bmiHeader.biCompression = BI_RGB;
- lpDIBheader->bmiHeader.biSizeImage = xSize * abs(ySize) * bitsPerPixel >>
-3;
+ lpDIBheader->bmiHeader.biSizeImage = xSize * abs(ySize) * bitsPerPixel >> 3;
lpDIBheader->bmiHeader.biClrUsed = 256;
*lpDIBHeader = lpDIBheader;
+ return TRUE;
+}
+
+void wxFreeDIB(LPBITMAPINFO lpDIBHeader)
+{
+ free(lpDIBHeader);
+}
+#endif
+
+// ----------------------------------------------------------------------------
+// global helper functions implemented here
+// ----------------------------------------------------------------------------
+
+// helper of wxBitmapToHICON/HCURSOR
+static
+HICON wxBitmapToIconOrCursor(const wxBitmap& bmp,
+ bool iconWanted,
+ int hotSpotX,
+ int hotSpotY)
+{
+ if ( !bmp.Ok() )
+ {
+ // we can't create an icon/cursor form nothing
+ return 0;
+ }
+
+ wxMask *mask = bmp.GetMask();
+ if ( !mask )
+ {
+ // we must have a mask for an icon, so even if it's probably incorrect,
+ // do create it (grey is the "standard" transparent colour)
+ mask = new wxMask(bmp, *wxLIGHT_GREY);
+ }
+
+ ICONINFO iconInfo;
+ wxZeroMemory(iconInfo);
+ iconInfo.fIcon = iconWanted; // do we want an icon or a cursor?
+ if ( !iconWanted )
+ {
+ iconInfo.xHotspot = hotSpotX;
+ iconInfo.yHotspot = hotSpotY;
+ }
- return (0);
+ iconInfo.hbmMask = wxInvertMask((HBITMAP)mask->GetMaskBitmap());
+ iconInfo.hbmColor = GetHbitmapOf(bmp);
+ // black out the transparent area to preserve background colour, because
+ // Windows blits the original bitmap using SRCINVERT (XOR) after applying
+ // the mask to the dest rect.
+ {
+ MemoryHDC dcSrc, dcDst;
+ SelectInHDC selectMask(dcSrc, (HBITMAP)mask->GetMaskBitmap()),
+ selectBitmap(dcDst, iconInfo.hbmColor);
+
+ if ( !::BitBlt(dcDst, 0, 0, bmp.GetWidth(), bmp.GetHeight(),
+ dcSrc, 0, 0, SRCAND) )
+ {
+ wxLogLastError(_T("BitBlt"));
+ }
+ }
+
+ HICON hicon = ::CreateIconIndirect(&iconInfo);
+
+ if ( !bmp.GetMask() )
+ {
+ // we created the mask, now delete it
+ delete mask;
+ }
+
+ // delete the inverted mask bitmap we created as well
+ ::DeleteObject(iconInfo.hbmMask);
+
+ return hicon;
}
+HICON wxBitmapToHICON(const wxBitmap& bmp)
+{
+ return wxBitmapToIconOrCursor(bmp, TRUE, 0, 0);
+}
+HCURSOR wxBitmapToHCURSOR(const wxBitmap& bmp, int hotSpotX, int hotSpotY)
+{
+ return (HCURSOR)wxBitmapToIconOrCursor(bmp, FALSE, hotSpotX, hotSpotY);
+}
-static long freeDIB(LPBITMAPINFO lpDIBHeader)
+HBITMAP wxInvertMask(HBITMAP hbmpMask, int w, int h)
{
+#ifndef __WXMICROWIN__
+ wxCHECK_MSG( hbmpMask, 0, _T("invalid bitmap in wxInvertMask") );
- if (lpDIBHeader != NULL) {
- free(lpDIBHeader);
- }
+ // get width/height from the bitmap if not given
+ if ( !w || !h )
+ {
+ BITMAP bm;
+ ::GetObject(hbmpMask, sizeof(BITMAP), (LPVOID)&bm);
+ w = bm.bmWidth;
+ h = bm.bmHeight;
+ }
- return (0);
-}
+ HDC hdcSrc = ::CreateCompatibleDC(NULL);
+ HDC hdcDst = ::CreateCompatibleDC(NULL);
+ if ( !hdcSrc || !hdcDst )
+ {
+ wxLogLastError(wxT("CreateCompatibleDC"));
+ }
+ HBITMAP hbmpInvMask = ::CreateBitmap(w, h, 1, 1, 0);
+ if ( !hbmpInvMask )
+ {
+ wxLogLastError(wxT("CreateBitmap"));
+ }
+ HGDIOBJ srcTmp = ::SelectObject(hdcSrc, hbmpMask);
+ HGDIOBJ dstTmp = ::SelectObject(hdcDst, hbmpInvMask);
+ if ( !::BitBlt(hdcDst, 0, 0, w, h,
+ hdcSrc, 0, 0,
+ NOTSRCCOPY) )
+ {
+ wxLogLastError(wxT("BitBlt"));
+ }
+
+ // Deselect objects
+ SelectObject(hdcSrc,srcTmp);
+ SelectObject(hdcDst,dstTmp);
+
+ ::DeleteDC(hdcSrc);
+ ::DeleteDC(hdcDst);
+
+ return hbmpInvMask;
+#else
+ return 0;
+#endif
+}
projects / wxWidgets.git / blobdiff