X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/57c208c5759da71a637f0f0f5b7d3dc3eda09c02..d8408fc65fccc866fbe5ce2a6acefa26385da8d8:/src/msw/bitmap.cpp

diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp
index 948d339184..d5b37d2cfd 100644
--- a/src/msw/bitmap.cpp
+++ b/src/msw/bitmap.cpp
@@ -9,374 +9,485 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
 #ifdef __GNUG__
-#pragma implementation "bitmap.h"
+    #pragma implementation "bitmap.h"
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #ifndef WX_PRECOMP
-#include <stdio.h>
-#include "wx/setup.h"
-#include "wx/list.h"
-#include "wx/utils.h"
-#include "wx/app.h"
-#include "wx/palette.h"
-#include "wx/dcmemory.h"
-#include "wx/bitmap.h"
-#include "wx/icon.h"
+    #include <stdio.h>
+
+    #include "wx/list.h"
+    #include "wx/utils.h"
+    #include "wx/app.h"
+    #include "wx/palette.h"
+    #include "wx/dcmemory.h"
+    #include "wx/bitmap.h"
+    #include "wx/icon.h"
 #endif
 
 #include "wx/msw/private.h"
 #include "wx/log.h"
 
-#include "assert.h"
-
 #include "wx/msw/dib.h"
+#include "wx/image.h"
+
+// missing from mingw32 header
+#ifndef CLR_INVALID
+    #define CLR_INVALID ((COLORREF)-1)
+#endif // no CLR_INVALID
+
+// ----------------------------------------------------------------------------
+// macros
+// ----------------------------------------------------------------------------
 
-#if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxGDIObject)
 IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject)
-#endif
 
-wxBitmapRefData::wxBitmapRefData(void)
-{
-  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(void)
-{
-  if (m_selectedInto)
-  {
-    char buf[200];
-    sprintf(buf, "Bitmap was deleted without selecting out of wxMemoryDC %X.", (unsigned int) m_selectedInto);
-    wxFatalError(buf);
-  }
-  if (m_hBitmap)
-  {
-    DeleteObject((HBITMAP) m_hBitmap);
-  }
-  m_hBitmap = 0 ;
-
-  if (m_bitmapMask)
+IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, wxObject)
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxBitmapRefData
+// ----------------------------------------------------------------------------
+
+wxBitmapRefData::wxBitmapRefData()
+{
+    m_quality = 0;
+    m_selectedInto = NULL;
+    m_numColors = 0;
+    m_bitmapMask = NULL;
+    m_hBitmap = (WXHBITMAP) NULL;
+}
+
+void wxBitmapRefData::Free()
+{
+    wxASSERT_MSG( !m_selectedInto,
+                  wxT("deleting bitmap still selected into wxMemoryDC") );
+
+    if ( m_hBitmap)
+    {
+        if ( !::DeleteObject((HBITMAP)m_hBitmap) )
+        {
+            wxLogLastError(wxT("DeleteObject(hbitmap)"));
+        }
+    }
+
     delete m_bitmapMask;
-  m_bitmapMask = NULL;
+    m_bitmapMask = NULL;
+}
 
+// ----------------------------------------------------------------------------
+// wxBitmap creation
+// ----------------------------------------------------------------------------
+
+// this function should be called from all wxBitmap ctors
+void wxBitmap::Init()
+{
+    // m_refData = NULL; done in the base class ctor
+
+    if ( wxTheBitmapList )
+        wxTheBitmapList->AddBitmap(this);
 }
 
-wxList wxBitmap::sm_handlers;
+#ifdef __WIN32__
 
-wxBitmap::wxBitmap(void)
+bool wxBitmap::CopyFromIconOrCursor(const wxGDIImage& icon)
 {
-  if ( wxTheBitmapList )
-    wxTheBitmapList->AddBitmap(this);
+    // it may be either HICON or HCURSOR
+    HICON hicon = (HICON)icon.GetHandle();
+
+    ICONINFO iconInfo;
+    if ( !::GetIconInfo(hicon, &iconInfo) )
+    {
+        wxLogLastError(wxT("GetIconInfo"));
+
+        return FALSE;
+    }
+
+    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->m_bitmapMask = new wxMask((WXHBITMAP)
+                                        wxInvertMask(iconInfo.hbmMask, w, h));
+
+#if WXWIN_COMPATIBILITY_2
+    refData->m_ok = TRUE;
+#endif // WXWIN_COMPATIBILITY_2
+
+    return TRUE;
 }
 
-wxBitmap::~wxBitmap(void)
+#endif // Win32
+
+bool wxBitmap::CopyFromCursor(const wxCursor& cursor)
 {
-    if (wxTheBitmapList)
-        wxTheBitmapList->DeleteObject(this);
+    UnRef();
+
+    if ( !cursor.Ok() )
+        return FALSE;
+
+#ifdef __WIN16__
+    wxFAIL_MSG( _T("don't know how to convert cursor to bitmap") );
+
+    return FALSE;
+#else
+    return CopyFromIconOrCursor(cursor);
+#endif // Win16
 }
 
-bool wxBitmap::FreeResource(bool WXUNUSED(force))
+bool wxBitmap::CopyFromIcon(const wxIcon& icon)
 {
-  if ( !M_BITMAPDATA )
-  return FALSE;
+    UnRef();
+
+    if ( !icon.Ok() )
+        return FALSE;
+
+    // GetIconInfo() doesn't exist under Win16 and I don't know any other way
+    // to create a bitmap from icon there - but using this way we won't have
+    // the mask (FIXME)
+#ifdef __WIN16__
+    int width = icon.GetWidth(),
+        height = icon.GetHeight();
 
-  if (M_BITMAPDATA->m_selectedInto)
-  {
-    char buf[200];
-    sprintf(buf, "Bitmap %X was deleted without selecting out of wxMemoryDC %X.", (unsigned int) this, (unsigned int) M_BITMAPDATA->m_selectedInto);
-    wxFatalError(buf);
-  }
-  if (M_BITMAPDATA->m_hBitmap)
-  {
-    DeleteObject((HBITMAP) M_BITMAPDATA->m_hBitmap);
-  }
-  M_BITMAPDATA->m_hBitmap = 0 ;
+    // copy the icon to the bitmap
+    ScreenHDC hdcScreen;
+    HDC hdc = ::CreateCompatibleDC(hdcScreen);
+    HBITMAP hbitmap = ::CreateCompatibleBitmap(hdcScreen, width, height);
+    HBITMAP hbmpOld = (HBITMAP)::SelectObject(hdc, hbitmap);
 
-/*
-  if (M_BITMAPDATA->m_bitmapPalette)
-    delete M_BITMAPDATA->m_bitmapPalette;
+    ::DrawIcon(hdc, 0, 0, GetHiconOf(icon));
 
-  M_BITMAPDATA->m_bitmapPalette = NULL ;
-*/
+    ::SelectObject(hdc, hbmpOld);
+    ::DeleteDC(hdc);
 
-  return TRUE;
+    wxBitmapRefData *refData = new wxBitmapRefData;
+    m_refData = refData;
+
+    refData->m_width = width;
+    refData->m_height = height;
+    refData->m_depth = wxDisplayDepth();
+
+    refData->m_hBitmap = (WXHBITMAP)hbitmap;
+
+#if WXWIN_COMPATIBILITY_2
+    refData->m_ok = TRUE;
+#endif // WXWIN_COMPATIBILITY_2
+
+    return TRUE;
+#else // Win32
+    return CopyFromIconOrCursor(icon);
+#endif // Win16/Win32
 }
 
+wxBitmap::~wxBitmap()
+{
+    if (wxTheBitmapList)
+        wxTheBitmapList->DeleteObject(this);
+}
 
-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;
+    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;
+    refData->m_numColors = 0;
+    refData->m_selectedInto = NULL;
 
-  if (M_BITMAPDATA->m_hBitmap)
-    M_BITMAPDATA->m_ok = TRUE;
-  else
-    M_BITMAPDATA->m_ok = FALSE;
+    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!
+        static const size_t bytesPerLine = (width + 7) / 8;
+        static const size_t padding = bytesPerLine % 2;
+        static 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
+    }
+
+    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);
 }
 
 // Create from XPM data
-wxBitmap::wxBitmap(char **data, wxItem *WXUNUSED(anItem))
+bool wxBitmap::CreateFromXpm(const char **data)
 {
-  (void) Create((void *)data, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0);
+    Init();
+
+    return Create((void *)data, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0);
 }
 
 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)
 {
-  (void) Create(data, type, width, height, depth);
+    Init();
 
-  if ( wxTheBitmapList )
-    wxTheBitmapList->AddBitmap(this);
+    (void)Create(data, type, width, height, depth);
 }
 
 wxBitmap::wxBitmap(const wxString& filename, long type)
 {
-  LoadFile(filename, (int)type);
+    Init();
 
-  if ( wxTheBitmapList )
-    wxTheBitmapList->AddBitmap(this);
+    LoadFile(filename, (int)type);
 }
 
 bool wxBitmap::Create(int w, int h, int d)
 {
-  UnRef();
+    UnRef();
+
+    m_refData = new wxBitmapRefData;
+
+    GetBitmapData()->m_width = w;
+    GetBitmapData()->m_height = h;
+    GetBitmapData()->m_depth = d;
+
+    HBITMAP hbmp;
+
+    if ( d > 0 )
+    {
+        hbmp = ::CreateBitmap(w, h, 1, d, NULL);
+        if ( !hbmp )
+        {
+            wxLogLastError(wxT("CreateBitmap"));
+        }
+    }
+    else
+    {
+        ScreenHDC dc;
+        hbmp = ::CreateCompatibleBitmap(dc, w, h);
+        if ( !hbmp )
+        {
+            wxLogLastError(wxT("CreateCompatibleBitmap"));
+        }
+
+        GetBitmapData()->m_depth = wxDisplayDepth();
+    }
 
-  m_refData = new wxBitmapRefData;
+    SetHBITMAP((WXHBITMAP)hbmp);
 
-  M_BITMAPDATA->m_width = w;
-  M_BITMAPDATA->m_height = h;
-  M_BITMAPDATA->m_depth = d;
+#if WXWIN_COMPATIBILITY_2
+    GetBitmapData()->m_ok = hbmp != 0;
+#endif // WXWIN_COMPATIBILITY_2
 
-  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 Ok();
 }
 
 bool wxBitmap::LoadFile(const wxString& filename, long type)
 {
-  UnRef();
+    UnRef();
 
-  m_refData = new wxBitmapRefData;
+    wxBitmapHandler *handler = wxDynamicCast(FindHandler(type), wxBitmapHandler);
 
-  wxBitmapHandler *handler = FindHandler(type);
+    if ( handler )
+    {
+        m_refData = new wxBitmapRefData;
 
-  if ( handler == NULL ) {
-    wxLogWarning("no bitmap handler for type %d defined.", type);
+        return handler->LoadFile(this, filename, type, -1, -1);
+    }
+    else
+    {
+        wxImage image;
+        if ( !image.LoadFile( filename, type ) || !image.Ok() )
+            return FALSE;
 
-    return FALSE;
-  }
+        *this = image.ConvertToBitmap();
 
-  return handler->LoadFile(this, filename, type, -1, -1);
+        return TRUE;
+    }
 }
 
 bool wxBitmap::Create(void *data, long type, int width, int height, int depth)
 {
-  UnRef();
+    UnRef();
 
-  m_refData = new wxBitmapRefData;
+    wxBitmapHandler *handler = wxDynamicCast(FindHandler(type), wxBitmapHandler);
 
-  wxBitmapHandler *handler = FindHandler(type);
+    if ( !handler )
+    {
+        wxLogDebug(wxT("Failed to create bitmap: no bitmap handler for type %d defined."), type);
 
-  if ( handler == NULL ) {
-    wxLogWarning("no bitmap handler for type %d defined.", type);
+        return FALSE;
+    }
 
-    return FALSE;
-  }
+    m_refData = new wxBitmapRefData;
 
-  return handler->Create(this, data, type, width, height, depth);
+    return handler->Create(this, data, type, width, height, depth);
 }
 
 bool wxBitmap::SaveFile(const wxString& filename, int type, const wxPalette *palette)
 {
-  wxBitmapHandler *handler = FindHandler(type);
+    wxBitmapHandler *handler = wxDynamicCast(FindHandler(type), wxBitmapHandler);
 
-  if ( handler == NULL ) {
-    wxLogWarning("no bitmap handler for type %d defined.", type);
-
-    return FALSE;
-  }
-
-  return handler->SaveFile(this, filename, type, palette);
-}
-
-void wxBitmap::SetWidth(int w)
-{
-  if (!M_BITMAPDATA)
-  m_refData = new wxBitmapRefData;
+    if ( handler )
+    {
+        return handler->SaveFile(this, filename, type, palette);
+    }
+    else
+    {
+        // FIXME what about palette? shouldn't we use it?
+        wxImage image( *this );
+        if (!image.Ok())
+            return FALSE;
 
-  M_BITMAPDATA->m_width = w;
+        return image.SaveFile( filename, type );
+    }
 }
 
-void wxBitmap::SetHeight(int h)
-{
-  if (!M_BITMAPDATA)
-  m_refData = new wxBitmapRefData;
-
-  M_BITMAPDATA->m_height = h;
-}
+// ----------------------------------------------------------------------------
+// sub bitmap extraction
+// ----------------------------------------------------------------------------
 
-void wxBitmap::SetDepth(int d)
+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") );
 
-  M_BITMAPDATA->m_depth = d;
-}
+    wxBitmap ret( rect.width, rect.height, GetDepth() );
+    wxASSERT_MSG( ret.Ok(), wxT("GetSubBitmap error") );
 
-void wxBitmap::SetQuality(int q)
-{
-  if (!M_BITMAPDATA)
-  m_refData = new wxBitmapRefData;
+    // copy bitmap data
+    HDC dcSrc = ::CreateCompatibleDC(NULL);
+    HDC dcDst = ::CreateCompatibleDC(NULL);
+    SelectObject(dcSrc, (HBITMAP) GetHBITMAP());
+    SelectObject(dcDst, (HBITMAP) ret.GetHBITMAP());
+    BitBlt(dcDst, 0, 0, rect.width, rect.height, dcSrc, rect.x, rect.y, SRCCOPY);
 
-  M_BITMAPDATA->m_quality = q;
-}
+    // copy mask if there is one
+    if (GetMask())
+    {
+        HBITMAP hbmpMask = ::CreateBitmap(rect.width, rect.height, 1, 1, 0);
 
-void wxBitmap::SetOk(bool isOk)
-{
-  if (!M_BITMAPDATA)
-  m_refData = new wxBitmapRefData;
+        SelectObject(dcSrc, (HBITMAP) GetMask()->GetMaskBitmap());
+        SelectObject(dcDst, (HBITMAP) hbmpMask);
+        BitBlt(dcDst, 0, 0, rect.width, rect.height, dcSrc, rect.x, rect.y, SRCCOPY);
 
-  M_BITMAPDATA->m_ok = isOk;
-}
+        wxMask *mask = new wxMask((WXHBITMAP) hbmpMask);
+        ret.SetMask(mask);
+    }
 
-void wxBitmap::SetPalette(const wxPalette& palette)
-{
-  if (!M_BITMAPDATA)
-  m_refData = new wxBitmapRefData;
+    SelectObject(dcDst, NULL);
+    SelectObject(dcSrc, NULL);
+    DeleteDC(dcDst);
+    DeleteDC(dcSrc);
 
-  M_BITMAPDATA->m_bitmapPalette = palette ;
+    return ret;
 }
 
-void wxBitmap::SetMask(wxMask *mask)
-{
-  if (!M_BITMAPDATA)
-  m_refData = new wxBitmapRefData;
-
-  M_BITMAPDATA->m_bitmapMask = mask ;
-}
+// ----------------------------------------------------------------------------
+// wxBitmap accessors
+// ----------------------------------------------------------------------------
 
-void wxBitmap::SetHBITMAP(WXHBITMAP bmp)
+void wxBitmap::SetQuality(int q)
 {
-  if (!M_BITMAPDATA)
-  m_refData = new wxBitmapRefData;
+    EnsureHasData();
 
-  M_BITMAPDATA->m_hBitmap = bmp;
+    GetBitmapData()->m_quality = q;
 }
 
-void wxBitmap::AddHandler(wxBitmapHandler *handler)
+#if WXWIN_COMPATIBILITY_2
+void wxBitmap::SetOk(bool isOk)
 {
-  sm_handlers.Append(handler);
-}
+    EnsureHasData();
 
-void wxBitmap::InsertHandler(wxBitmapHandler *handler)
-{
-  sm_handlers.Insert(handler);
+    GetBitmapData()->m_ok = isOk;
 }
+#endif // WXWIN_COMPATIBILITY_2
 
-bool wxBitmap::RemoveHandler(const wxString& name)
+void wxBitmap::SetPalette(const wxPalette& palette)
 {
-  wxBitmapHandler *handler = FindHandler(name);
-  if ( handler )
-  {
-    sm_handlers.DeleteObject(handler);
-    return TRUE;
-  }
-  else
-    return FALSE;
-}
+    EnsureHasData();
 
-wxBitmapHandler *wxBitmap::FindHandler(const wxString& name)
-{
-  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;
+    GetBitmapData()->m_bitmapPalette = palette;
 }
 
-wxBitmapHandler *wxBitmap::FindHandler(const wxString& extension, long bitmapType)
+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();
 
-wxBitmapHandler *wxBitmap::FindHandler(long bitmapType)
-{
-  wxNode *node = sm_handlers.First();
-  while ( node )
-  {
-    wxBitmapHandler *handler = (wxBitmapHandler *)node->Data();
-    if (handler->GetType() == bitmapType)
-      return handler;
-    node = node->Next();
-  }
-  return NULL;
+    GetBitmapData()->m_bitmapMask = mask;
 }
 
-// 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);
-
 // 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.
@@ -384,26 +495,17 @@ static long freeDIB(LPBITMAPINFO lpDIBHeader);
 wxBitmap wxBitmap::GetBitmapForDC(wxDC& dc) const
 {
     wxMemoryDC      memDC;
-    wxBitmap        tmpBitmap(this->GetWidth(), this->GetHeight(), dc.GetDepth());
+    wxBitmap        tmpBitmap(GetWidth(), GetHeight(), dc.GetDepth());
     HPALETTE        hPal = (HPALETTE) NULL;
     LPBITMAPINFO    lpDib;
     void            *lpBits = (void*) NULL;
 
-/*
-    wxASSERT( this->GetPalette() && this->GetPalette()->Ok() && (this->GetPalette()->GetHPALETTE() != 0) );
-
-    tmpBitmap.SetPalette(this->GetPalette());
-    memDC.SelectObject(tmpBitmap);
-    memDC.SetPalette(this->GetPalette());
-
-    hPal = (HPALETTE) this->GetPalette()->GetHPALETTE();
-*/
-    if( this->GetPalette() && this->GetPalette()->Ok() && (this->GetPalette()->GetHPALETTE() != 0) )
+    if( GetPalette() && GetPalette()->Ok() )
     {
-        tmpBitmap.SetPalette(* this->GetPalette());
+        tmpBitmap.SetPalette(*GetPalette());
         memDC.SelectObject(tmpBitmap);
-        memDC.SetPalette(* this->GetPalette());
-        hPal = (HPALETTE) this->GetPalette()->GetHPALETTE();
+        memDC.SetPalette(*GetPalette());
+        hPal = (HPALETTE)GetPalette()->GetHPALETTE();
     }
     else
     {
@@ -415,27 +517,34 @@ wxBitmap wxBitmap::GetBitmapForDC(wxDC& dc) const
         memDC.SetPalette( palette );
     }
 
-    // set the height negative because in a DIB the order of the lines is reversed
-    createDIB(this->GetWidth(), -this->GetHeight(), this->GetDepth(), hPal, &lpDib);
+    // set the height negative because in a DIB the order of the lines is
+    // reversed
+    if ( !wxCreateDIB(GetWidth(), -GetHeight(), GetDepth(), hPal, &lpDib) )
+    {
+        return wxNullBitmap;
+    }
 
     lpBits = malloc(lpDib->bmiHeader.biSizeImage);
 
-    ::GetBitmapBits((HBITMAP)GetHBITMAP(), lpDib->bmiHeader.biSizeImage, lpBits);
+    ::GetBitmapBits(GetHbitmap(), lpDib->bmiHeader.biSizeImage, lpBits);
 
-    ::SetDIBitsToDevice((HDC) memDC.GetHDC(), 0, 0, this->GetWidth(), this->GetHeight(),
-                        0, 0, 0, this->GetHeight(), lpBits, lpDib, DIB_RGB_COLORS);
+    ::SetDIBitsToDevice(GetHdcOf(memDC), 0, 0,
+                        GetWidth(), GetHeight(),
+                        0, 0, 0, GetHeight(),
+                        lpBits, lpDib, DIB_RGB_COLORS);
 
     free(lpBits);
 
-    freeDIB(lpDib);
-    return (tmpBitmap);
+    wxFreeDIB(lpDib);
+
+    return tmpBitmap;
 }
 
-/*
- * wxMask
- */
+// ----------------------------------------------------------------------------
+// wxMask
+// ----------------------------------------------------------------------------
 
-wxMask::wxMask(void)
+wxMask::wxMask()
 {
     m_maskBitmap = 0;
 }
@@ -445,7 +554,7 @@ wxMask::wxMask(void)
 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
@@ -453,17 +562,17 @@ wxMask::wxMask(const wxBitmap& bitmap, const wxColour& colour)
 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(void)
+wxMask::~wxMask()
 {
     if ( m_maskBitmap )
         ::DeleteObject((HBITMAP) m_maskBitmap);
@@ -472,30 +581,30 @@ wxMask::~wxMask(void)
 // Create a mask from a mono bitmap (copies the bitmap).
 bool wxMask::Create(const wxBitmap& bitmap)
 {
+    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)
-  {
-    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;
+    {
+        ::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;
 }
 
 // Create a mask from a bitmap and a palette index indicating
@@ -503,221 +612,169 @@ bool wxMask::Create(const wxBitmap& bitmap)
 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 (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;
+    return FALSE;
 }
 
 // Create a mask from a bitmap and a colour indicating
 // the transparent area
 bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
 {
+    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));
-      }
+        ::DeleteObject((HBITMAP) m_maskBitmap);
+        m_maskBitmap = 0;
     }
-  }
-  ::SelectObject(srcDC, 0);
-  ::DeleteDC(srcDC);
-  ::SelectObject(destDC, 0);
-  ::DeleteDC(destDC);
-  return TRUE;
-}
 
-/*
- * wxBitmapHandler
- */
+    int width = bitmap.GetWidth(),
+        height = bitmap.GetHeight();
 
-IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, wxObject)
+    // scan the bitmap for the transparent colour and set the corresponding
+    // pixels in the mask to BLACK and the rest to WHITE
+    COLORREF maskColour = wxColourToRGB(colour);
+    m_maskBitmap = (WXHBITMAP)::CreateBitmap(width, height, 1, 1, 0);
 
-bool wxBitmapHandler::Create(wxBitmap *WXUNUSED(bitmap), void *WXUNUSED(data), long WXUNUSED(type), int WXUNUSED(width), int WXUNUSED(height), int WXUNUSED(depth))
-{
-  return FALSE;
-}
+    HDC srcDC = ::CreateCompatibleDC(NULL);
+    HDC destDC = ::CreateCompatibleDC(NULL);
+    if ( !srcDC || !destDC )
+    {
+        wxLogLastError(wxT("CreateCompatibleDC"));
+    }
 
-bool wxBitmapHandler::LoadFile(wxBitmap *WXUNUSED(bitmap), const wxString& WXUNUSED(name), long WXUNUSED(type),
-    int WXUNUSED(desiredWidth), int WXUNUSED(desiredHeight))
-{
-  return FALSE;
-}
+    bool ok = TRUE;
 
-bool wxBitmapHandler::SaveFile(wxBitmap *WXUNUSED(bitmap), const wxString& WXUNUSED(name), int WXUNUSED(type), const wxPalette *WXUNUSED(palette))
-{
-  return FALSE;
-}
+    HGDIOBJ hbmpSrcOld = ::SelectObject(srcDC, GetHbitmapOf(bitmap));
+    if ( !hbmpSrcOld )
+    {
+        wxLogLastError(wxT("SelectObject"));
 
-/*
- * Standard handlers
- */
+        ok = FALSE;
+    }
 
-class WXDLLEXPORT wxBMPResourceHandler: public wxBitmapHandler
-{
-  DECLARE_DYNAMIC_CLASS(wxBMPResourceHandler)
-public:
-  inline wxBMPResourceHandler(void)
-  {
-  m_name = "Windows bitmap resource";
-  m_extension = "";
-  m_type = wxBITMAP_TYPE_BMP_RESOURCE;
-  };
+    HGDIOBJ hbmpDstOld = ::SelectObject(destDC, (HBITMAP)m_maskBitmap);
+    if ( !hbmpDstOld )
+    {
+        wxLogLastError(wxT("SelectObject"));
 
-  virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
-      int desiredWidth, int desiredHeight);
-};
-IMPLEMENT_DYNAMIC_CLASS(wxBMPResourceHandler, wxBitmapHandler)
+        ok = FALSE;
+    }
 
-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)
+    // this is not very efficient, but I can't think of a better way of doing
+    // it
+    for ( int w = 0; ok && (w < width); w++ )
     {
-      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;
-      return TRUE;
+        for ( int h = 0; ok && (h < height); h++ )
+        {
+            COLORREF col = GetPixel(srcDC, w, h);
+            if ( col == CLR_INVALID )
+            {
+                wxLogLastError(wxT("GetPixel"));
+
+                // doesn't make sense to continue
+                ok = FALSE;
+
+                break;
+            }
+
+            if ( col == maskColour )
+            {
+                ::SetPixel(destDC, w, h, RGB(0, 0, 0));
+            }
+            else
+            {
+                ::SetPixel(destDC, w, h, RGB(255, 255, 255));
+            }
+        }
     }
 
-  // it's probably not found
-  wxLogError("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;
 }
 
-class WXDLLEXPORT wxBMPFileHandler: public wxBitmapHandler
+// ----------------------------------------------------------------------------
+// wxBitmapHandler
+// ----------------------------------------------------------------------------
+
+bool wxBitmapHandler::Create(wxGDIImage *image,
+                             void *data,
+                             long flags,
+                             int width, int height, int depth)
 {
-  DECLARE_DYNAMIC_CLASS(wxBMPFileHandler)
-public:
-  inline wxBMPFileHandler(void)
-  {
-  m_name = "Windows bitmap file";
-  m_extension = "bmp";
-  m_type = wxBITMAP_TYPE_BMP;
-  };
+    wxBitmap *bitmap = wxDynamicCast(image, wxBitmap);
 
-  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)
+    return bitmap ? Create(bitmap, data, flags, width, height, depth) : FALSE;
+}
 
-bool wxBMPFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long WXUNUSED(flags),
-    int WXUNUSED(desiredWidth), int WXUNUSED(desiredHeight))
+bool wxBitmapHandler::Load(wxGDIImage *image,
+                           const wxString& name,
+                           long flags,
+                           int width, int height)
 {
-#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;
-    return success;
-#else
-  return FALSE;
-#endif
+    wxBitmap *bitmap = wxDynamicCast(image, wxBitmap);
+
+    return bitmap ? LoadFile(bitmap, name, flags, width, height) : FALSE;
 }
 
-bool wxBMPFileHandler::SaveFile(wxBitmap *bitmap, const wxString& name, int WXUNUSED(type), const wxPalette *pal)
+bool wxBitmapHandler::Save(wxGDIImage *image,
+                           const wxString& name,
+                           int type)
 {
-#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 ? SaveFile(bitmap, name, type) : FALSE;
 }
 
-void wxBitmap::CleanUpHandlers(void)
+bool wxBitmapHandler::Create(wxBitmap *WXUNUSED(bitmap),
+                             void *WXUNUSED(data),
+                             long WXUNUSED(type),
+                             int WXUNUSED(width),
+                             int WXUNUSED(height),
+                             int WXUNUSED(depth))
 {
-  wxNode *node = sm_handlers.First();
-  while ( node )
-  {
-    wxBitmapHandler *handler = (wxBitmapHandler *)node->Data();
-    wxNode *next = node->Next();
-    delete handler;
-    delete node;
-    node = next;
-  }
+    return FALSE;
 }
 
-void wxBitmap::InitStandardHandlers(void)
+bool wxBitmapHandler::LoadFile(wxBitmap *WXUNUSED(bitmap),
+                               const wxString& WXUNUSED(name),
+                               long WXUNUSED(type),
+                               int WXUNUSED(desiredWidth),
+                               int WXUNUSED(desiredHeight))
 {
-  AddHandler(new wxBMPResourceHandler);
-  AddHandler(new wxBMPFileHandler);
-
-  // Not added by default: include xpmhand.h in your app
-  // and call these in your wxApp::OnInit.
-//  AddHandler(new wxXPMFileHandler);
-//  AddHandler(new wxXPMDataHandler);
+    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
+// ----------------------------------------------------------------------------
+
+bool wxCreateDIB(long xSize, long ySize, long bitsPerPixel,
+                 HPALETTE hPal, LPBITMAPINFO* lpDIBHeader)
 {
    unsigned long   i, headerSize;
    LPBITMAPINFO    lpDIBheader = NULL;
@@ -731,10 +788,8 @@ static long createDIB(long xSize, long ySize, long bitsPerPixel,
 
    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;
@@ -744,8 +799,7 @@ static long createDIB(long xSize, long ySize, long bitsPerPixel,
    // 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;
 
 
@@ -759,21 +813,55 @@ static long createDIB(long xSize, long ySize, long bitsPerPixel,
 
    *lpDIBHeader = lpDIBheader;
 
-
-   return (0);
-
+   return TRUE;
 }
 
+void wxFreeDIB(LPBITMAPINFO lpDIBHeader)
+{
+    free(lpDIBHeader);
+}
 
+// ----------------------------------------------------------------------------
+// other helper functions
+// ----------------------------------------------------------------------------
 
-static long freeDIB(LPBITMAPINFO lpDIBHeader)
+extern HBITMAP wxInvertMask(HBITMAP hbmpMask, int w, int h)
 {
+    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"));
+    }
+
+    ::SelectObject(hdcSrc, hbmpMask);
+    ::SelectObject(hdcDst, hbmpInvMask);
+    if ( !::BitBlt(hdcDst, 0, 0, w, h,
+                   hdcSrc, 0, 0,
+                   NOTSRCCOPY) )
+    {
+        wxLogLastError(wxT("BitBlt"));
+    }
 
+    ::DeleteDC(hdcSrc);
+    ::DeleteDC(hdcDst);
 
+    return hbmpInvMask;
+}