[ 1509599 ] 'Split pickers page in widgets sample' with more icons and rebaking.

[wxWidgets.git] / src / msw / bitmap.cpp

diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp
index 44099f7598b38c278d9794b4742bf772ef833d6e..af05803527087fee9fa54d648d481d0be8c50215 100644 (file)
--- a/src/msw/bitmap.cpp
+++ b/src/msw/bitmap.cpp
@@ -1,428 +1,1348 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        bitmap.cpp
+////////////////////////////////////////////////////////////////////////////
+// Name:        src/msw/bitmap.cpp

 // Purpose:     wxBitmap
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // 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

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "bitmap.h"
-#endif
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------

 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #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/bitmap.h"
 #include "wx/bitmap.h"

-#include "wx/icon.h"
+
+#ifndef WX_PRECOMP
+    #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/icon.h"
+    #include "wx/log.h"

 #endif
 
 #include "wx/msw/private.h"
 #endif
 
 #include "wx/msw/private.h"

-#include "wx/log.h"

 
 

-#include "assert.h"
+#if wxUSE_WXDIB
+#include "wx/msw/dib.h"
+#endif

 
 

-#if wxUSE_XPM_IN_MSW
-#define FOR_MSW 1
-#include "../../contrib/wxxpm/libxpm.34b/lib/xpm34.h"
+#include "wx/image.h"
+#include "wx/xpmdecod.h"
+
+#ifdef wxHAVE_RAW_BITMAP
+#include "wx/rawbmp.h"

 #endif
 
 #endif
 

-#include "wx/msw/dib.h"
+// missing from mingw32 header
+#ifndef CLR_INVALID
+    #define CLR_INVALID ((COLORREF)-1)
+#endif // no CLR_INVALID
+
+// ----------------------------------------------------------------------------
+// Bitmap data
+// ----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxBitmapRefData : public wxGDIImageRefData
+{
+public:
+    wxBitmapRefData();
+    wxBitmapRefData(const wxBitmapRefData& data);
+    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;
+
+
+    // not implemented
+    wxBitmapRefData& operator=(const wxBitmapRefData&);
+};
+
+// ----------------------------------------------------------------------------
+// macros
+// ----------------------------------------------------------------------------

 
 

-#if !USE_SHARED_LIBRARIES

 IMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxGDIObject)
 IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject)
 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()
+{
+#ifdef __WXDEBUG__
+    m_selectedInto = NULL;
+#endif
+    m_bitmapMask = NULL;
+
+    m_hBitmap = (WXHBITMAP) NULL;
+#if wxUSE_WXDIB
+    m_dib = NULL;

 #endif
 
 #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)
+    m_isDIB =
+    m_hasAlpha = false;
+}
+
+wxBitmapRefData::wxBitmapRefData(const wxBitmapRefData& data)
+               : wxGDIImageRefData(data)
+{
+#ifdef __WXDEBUG__
+    m_selectedInto = NULL;
+#endif
+
+    // can't copy the mask as the other bitmap destroys it
+    m_bitmapMask = NULL;
+
+    wxASSERT_MSG( !data.m_isDIB,
+                    _T("can't copy bitmap locked for raw access!") );
+    m_isDIB = false;
+
+    m_hasAlpha = data.m_hasAlpha;
+}
+
+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;
     delete m_bitmapMask;

-  m_bitmapMask = NULL;
+    m_bitmapMask = NULL;
+}
+
+// ----------------------------------------------------------------------------
+// wxBitmap creation
+// ----------------------------------------------------------------------------
+
+wxGDIImageRefData *wxBitmap::CreateData() const
+{
+    return new wxBitmapRefData;
+}
+
+wxObjectRefData *wxBitmap::CloneRefData(const wxObjectRefData *dataOrig) const
+{
+    const wxBitmapRefData *
+        data = wx_static_cast(const wxBitmapRefData *, dataOrig);
+    if ( !data )
+        return NULL;
+
+    wxBitmap *self = wx_const_cast(wxBitmap *, this);
+
+#if wxUSE_WXDIB
+    // copy the other bitmap
+    if ( data->m_hBitmap )
+    {
+        wxDIB dib((HBITMAP)(data->m_hBitmap));
+        self->CopyFromDIB(dib);
+    }
+    else
+#endif // wxUSE_WXDIB
+    {
+        // don't copy the bitmap data, but do copy the size, depth, ...
+        self->m_refData = new wxBitmapRefData(*data);
+    }
+
+    return m_refData;
+}
+
+#ifdef __WIN32__
+
+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) )
+    {
+        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;
+
+#if wxUSE_WXDIB
+    // If the icon is 32 bits per pixel then it may have alpha channel data,
+    // although there are some icons that are 32 bpp but have no alpha... So
+    // convert to a DIB and manually check the 4th byte for each pixel.
+    BITMAP bm;
+    if ( ::GetObject(iconInfo.hbmColor, sizeof(BITMAP), (LPVOID)&bm)
+         && bm.bmBitsPixel == 32)
+    {
+        wxDIB dib(iconInfo.hbmColor);
+        if (dib.IsOk())
+        {
+            unsigned char* pixels = dib.GetData();
+            for (int idx=0; idx<w*h*4; idx+=4)
+            {
+                if (pixels[idx+3] != 0)
+                {
+                    // If there is an alpha byte that is non-zero then set the
+                    // alpha flag and bail out of the loop.
+                    refData->m_hasAlpha = true;
+                    break;
+                }
+            }
+        }
+    }
+#endif
+    if ( !refData->m_hasAlpha )
+    {
+        // the mask returned by GetIconInfo() is inverted 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
+    wxUnusedVar(icon);
+    return false;
+#endif

 }
 
 }
 

-wxList wxBitmap::sm_handlers;
+#endif // Win32

 
 

-wxBitmap::wxBitmap(void)
+bool wxBitmap::CopyFromCursor(const wxCursor& cursor)

 {
 {

-  if ( wxTheBitmapList )
-    wxTheBitmapList->AddBitmap(this);
+    UnRef();
+
+    if ( !cursor.Ok() )
+        return false;
+
+    return CopyFromIconOrCursor(cursor);

 }
 
 }
 

-wxBitmap::~wxBitmap(void)
+bool wxBitmap::CopyFromIcon(const wxIcon& icon)

 {
 {

-    if (wxTheBitmapList)
-        wxTheBitmapList->DeleteObject(this);
+    UnRef();
+
+    if ( !icon.Ok() )
+        return false;
+
+    return CopyFromIconOrCursor(icon);

 }
 
 }
 

-bool wxBitmap::FreeResource(bool 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
+
+    UnRef();

 
 

-  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 ;
+    wxBitmapRefData *refData = new wxBitmapRefData;
+    m_refData = refData;

 
 

-/*
-  if (M_BITMAPDATA->m_bitmapPalette)
-    delete M_BITMAPDATA->m_bitmapPalette;
+    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;
+#ifndef __WXMICROWIN__
+    wxBitmapRefData *refData = new wxBitmapRefData;
+    m_refData = refData;
+
+    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 reversed!
+        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 |= (unsigned char)(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
+    }

 
 

-  M_BITMAPDATA->m_width = the_width ;
-  M_BITMAPDATA->m_height = the_height ;
-  M_BITMAPDATA->m_depth = no_bits ;
-  M_BITMAPDATA->m_numColors = 0;
+    HBITMAP hbmp = ::CreateBitmap(width, height, 1, depth, data);
+    if ( !hbmp )
+    {
+        wxLogLastError(wxT("CreateBitmap"));
+    }

 
 

-  M_BITMAPDATA->m_hBitmap = (WXHBITMAP) CreateBitmap(the_width, the_height, 1, no_bits, bits);
+    if ( data != bits )
+    {
+        free(data);
+    }

 
 

-  if (M_BITMAPDATA->m_hBitmap)
-    M_BITMAPDATA->m_ok = TRUE;
-  else
-    M_BITMAPDATA->m_ok = FALSE;
+    SetHBITMAP((WXHBITMAP)hbmp);
+#endif
+}
+
+// Create from XPM data
+bool wxBitmap::CreateFromXpm(const char **data)
+{
+#if wxUSE_IMAGE && wxUSE_XPM && wxUSE_WXDIB
+    wxCHECK_MSG( data != NULL, false, wxT("invalid bitmap data") );

 
 

-  M_BITMAPDATA->m_selectedInto = NULL;
+    wxXPMDecoder decoder;
+    wxImage img = decoder.ReadData(data);
+    wxCHECK_MSG( img.Ok(), false, wxT("invalid bitmap data") );

 
 

-  if ( wxTheBitmapList )
-    wxTheBitmapList->AddBitmap(this);
+    *this = wxBitmap(img);
+    return true;
+#else
+    wxUnusedVar(data);
+    return false;
+#endif

 }
 
 wxBitmap::wxBitmap(int w, int h, int d)
 {
 }
 
 wxBitmap::wxBitmap(int w, int h, int d)
 {

-  (void)Create(w, h, d);
+    (void)Create(w, h, d);
+}

 
 

-  if ( wxTheBitmapList )
-    wxTheBitmapList->AddBitmap(this);
+wxBitmap::wxBitmap(int w, int h, const wxDC& dc)
+{
+    (void)Create(w, h, dc);

 }
 
 wxBitmap::wxBitmap(void *data, long type, int width, int height, int depth)
 {
 }
 
 wxBitmap::wxBitmap(void *data, long type, int width, int height, int depth)
 {

-  (void) Create(data, type, width, height, depth);
-
-  if ( wxTheBitmapList )
-    wxTheBitmapList->AddBitmap(this);
+    (void)Create(data, type, width, height, depth);

 }
 
 }
 

-wxBitmap::wxBitmap(const wxString& filename, long type)
+wxBitmap::wxBitmap(const wxString& filename, wxBitmapType type)

 {
 {

-  LoadFile(filename, (int)type);
+    LoadFile(filename, (int)type);
+}

 
 

-  if ( wxTheBitmapList )
-    wxTheBitmapList->AddBitmap(this);
+bool wxBitmap::Create(int width, int height, int depth)
+{
+    return DoCreate(width, height, depth, 0);

 }
 
 }
 

-#if wxUSE_XPM_IN_MSW
-// Create from data
-wxBitmap::wxBitmap(const char **data, wxItem *WXUNUSED(anItem))
+bool wxBitmap::Create(int width, int height, const wxDC& dc)

 {
 {

-  (void) Create((void *)data, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0);
+    wxCHECK_MSG( dc.Ok(), false, _T("invalid HDC in wxBitmap::Create()") );
+
+    return DoCreate(width, height, -1, dc.GetHDC());

 }
 }

-#endif

 
 

-bool wxBitmap::Create(int w, int h, int d)
+bool wxBitmap::DoCreate(int w, int h, int d, WXHDC hdc)

 {
 {

-  UnRef();
+    UnRef();
+
+    m_refData = new wxBitmapRefData;

 
 

-  m_refData = new wxBitmapRefData;
+    GetBitmapData()->m_width = w;
+    GetBitmapData()->m_height = h;

 
 

-  M_BITMAPDATA->m_width = w;
-  M_BITMAPDATA->m_height = h;
-  M_BITMAPDATA->m_depth = d;
+    HBITMAP hbmp    wxDUMMY_INITIALIZE(0);

 
 

-  if (d > 0)
-  {
-    M_BITMAPDATA->m_hBitmap = (WXHBITMAP) CreateBitmap(w, h, 1, d, NULL);
-  }
-  else
-  {
-    HDC dc = GetDC(NULL);
-    M_BITMAPDATA->m_hBitmap = (WXHBITMAP) CreateCompatibleBitmap(dc, w, h);
-    ReleaseDC(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;
+#ifndef NEVER_USE_DIB
+    if ( wxShouldCreateDIB(w, h, d, hdc) )
+    {
+        if ( d == -1 )
+        {
+            // create DIBs without alpha channel by default
+            d = 24;
+        }
+
+        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::LoadFile(const wxString& filename, long type)
+#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();
+
+    // Initial attempt at a simple-minded implementation.
+    // The bitmap will always be created at the screen depth,
+    // so the 'depth' argument is ignored.
+
+    HDC hScreenDC = ::GetDC(NULL);
+    int screenDepth = ::GetDeviceCaps(hScreenDC, BITSPIXEL);
+
+    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);

 
 

-  m_refData = new wxBitmapRefData;
+    // created an mono-bitmap for the possible mask
+    bool hasMask = image.HasMask();

 
 

-  wxBitmapHandler *handler = FindHandler(type);
+    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);
+
+            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));
+            }
+        }
+    }

 
 

-  if ( handler == NULL ) {
-    wxLogWarning("no bitmap handler for type %d defined.", type);
+    ::SelectObject(hMemDC, hOldBitmap);
+    ::DeleteDC(hMemDC);
+    if (hasMask)
+    {
+        ::SelectObject(hMaskDC, hOldMaskBitmap);
+        ::DeleteDC(hMaskDC);

 
 

-    return FALSE;
-  }
+        ((wxBitmapRefData*)m_refData)->SetMask(hMaskBitmap);
+    }

 
 

-  return handler->LoadFile(this, filename, type, -1, -1);
+    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::Create(void *data, long type, int width, int height, int depth)
+wxImage wxBitmap::ConvertToImage() const

 {
 {

-  UnRef();
+    // 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)

 
 

-  m_refData = new wxBitmapRefData;
+    if (!Ok())
+    {
+        wxFAIL_MSG( wxT("bitmap is invalid") );
+        return wxNullImage;
+    }
+
+    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;
+    }
+
+    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);
+        }
+    }

 
 

-  wxBitmapHandler *handler = FindHandler(type);
+    ::SelectObject(hMemDC, hOldBitmap);
+    ::DeleteDC(hMemDC);

 
 

-  if ( handler == NULL ) {
-    wxLogWarning("no bitmap handler for type %d defined.", type);
+#if wxUSE_PALETTE
+    // Copy the palette from the source image
+    if (GetPalette())
+        image.SetPalette(* GetPalette());
+#endif // wxUSE_PALETTE

 
 

-    return FALSE;
-  }
+    return image;
+}
+
+#endif // __WXMICROWIN__
+
+// ----------------------------------------------------------------------------
+// wxImage to/from conversions
+// ----------------------------------------------------------------------------
+
+bool wxBitmap::CreateFromImage(const wxImage& image, int depth)
+{
+    return CreateFromImage(image, depth, 0);
+}
+
+bool wxBitmap::CreateFromImage(const wxImage& image, const wxDC& dc)
+{
+    wxCHECK_MSG( dc.Ok(), false,
+                    _T("invalid HDC in wxBitmap::CreateFromImage()") );

 
 

-  return handler->Create(this, data, type, width, height, depth);
+    return CreateFromImage(image, -1, dc.GetHDC());

 }
 
 }
 

-bool wxBitmap::SaveFile(const wxString& filename, int type, const wxPalette *palette)
+#if wxUSE_WXDIB
+
+bool wxBitmap::CreateFromImage(const wxImage& image, int depth, WXHDC hdc)

 {
 {

-  wxBitmapHandler *handler = FindHandler(type);
+    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;
+
+    if ( depth == -1 )
+        depth = dib.GetDepth(); // Get depth from image if none specified
+
+    // store the bitmap parameters
+    wxBitmapRefData *refData = new wxBitmapRefData;
+    refData->m_width = w;
+    refData->m_height = h;
+    refData->m_hasAlpha = image.HasAlpha();

 
 

-  if ( handler == NULL ) {
-    wxLogWarning("no bitmap handler for type %d defined.", type);
+    m_refData = refData;

 
 

-    return FALSE;
-  }

 
 

-  return handler->SaveFile(this, filename, type, palette);
+    // 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 = depth;
+    }
+#ifndef ALWAYS_USE_DIB
+    else // we need to convert DIB to DDB
+    {
+        hbitmap = dib.CreateDDB((HDC)hdc);
+
+        refData->m_depth = depth;
+    }
+#endif // !ALWAYS_USE_DIB
+
+    // validate this object
+    SetHBITMAP((WXHBITMAP)hbitmap);
+
+    // finally also set the mask if we have one
+    if ( image.HasMask() )
+    {
+        const size_t len  = 2*((w+15)/16);
+        BYTE *src  = image.GetData();
+        BYTE *data = new BYTE[h*len];
+        memset(data, 0, h*len);
+        BYTE r = image.GetMaskRed(),
+             g = image.GetMaskGreen(),
+             b = image.GetMaskBlue();
+        BYTE *dst = data;
+        for ( int y = 0; y < h; y++, dst += len )
+        {
+            BYTE *dstLine = dst;
+            BYTE mask = 0x80;
+            for ( int x = 0; x < w; x++, src += 3 )
+            {
+                if (src[0] != r || src[1] != g || src[2] != b)
+                    *dstLine |= mask;
+
+                if ( (mask >>= 1) == 0 )
+                {
+                    dstLine++;
+                    mask = 0x80;
+                }
+            }
+        }
+
+        hbitmap = ::CreateBitmap(w, h, 1, 1, data);
+        if ( !hbitmap )
+        {
+            wxLogLastError(_T("CreateBitmap(mask)"));
+        }
+        else
+        {
+            SetMask(new wxMask((WXHBITMAP)hbitmap));
+        }
+
+        delete[] data;
+    }
+
+    return true;

 }
 
 }
 

-void wxBitmap::SetWidth(int w)
+wxImage wxBitmap::ConvertToImage() const

 {
 {

-  if (!M_BITMAPDATA)
-  m_refData = new wxBitmapRefData;
+    // convert DDB to DIB
+    wxDIB dib(*this);
+
+    if ( !dib.IsOk() )
+    {
+        return wxNullImage;
+    }
+
+    // and then DIB to our wxImage
+    wxImage image = dib.ConvertToImage();
+    if ( !image.Ok() )
+    {
+        return wxNullImage;
+    }
+
+    // now do the same for the mask, if we have any
+    HBITMAP hbmpMask = GetMask() ? (HBITMAP) GetMask()->GetMaskBitmap() : NULL;
+    if ( hbmpMask )
+    {
+        wxDIB dibMask(hbmpMask);
+        if ( dibMask.IsOk() )
+        {
+            // TODO: use wxRawBitmap to iterate over DIB
+
+            // we hard code the mask colour for now but we could also make an
+            // effort (and waste time) to choose a colour not present in the
+            // image already to avoid having to fudge the pixels below --
+            // whether it's worth to do it is unclear however
+            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;
+
+            const int h = dibMask.GetHeight();
+            const int w = dibMask.GetWidth();
+            const int bpp = dibMask.GetDepth();
+            const int maskBytesPerPixel = bpp >> 3;
+            const int maskBytesPerLine = wxDIB::GetLineSize(w, bpp);
+            unsigned char *data = image.GetData();
+
+            // remember that DIBs are stored in bottom to top order
+            unsigned char *
+                maskLineStart = dibMask.GetData() + ((h - 1) * maskBytesPerLine);
+
+            for ( int y = 0; y < h; y++, maskLineStart -= maskBytesPerLine )
+            {
+                // traverse one mask DIB line
+                unsigned char *mask = maskLineStart;
+                for ( int x = 0; x < w; x++, mask += maskBytesPerPixel )
+                {
+                    // should this pixel be transparent?
+                    if ( *mask )
+                    {
+                        // no, check that it isn't transparent by accident
+                        if ( (data[0] == MASK_RED) &&
+                                (data[1] == MASK_GREEN) &&
+                                    (data[2] == MASK_BLUE) )
+                        {
+                            // we have to fudge the colour a bit to prevent
+                            // this pixel from appearing transparent
+                            data[2] = MASK_BLUE_REPLACEMENT;
+                        }
+
+                        data += 3;
+                    }
+                    else // yes, transparent pixel
+                    {
+                        *data++ = MASK_RED;
+                        *data++ = MASK_GREEN;
+                        *data++ = MASK_BLUE;
+                    }
+                }
+            }
+
+            image.SetMaskColour(MASK_RED, MASK_GREEN, MASK_BLUE);
+        }
+    }

 
 

-  M_BITMAPDATA->m_width = w;
+    return image;

 }
 
 }
 

-void wxBitmap::SetHeight(int h)
+#else // !wxUSE_WXDIB
+
+bool
+wxBitmap::CreateFromImage(const wxImage& WXUNUSED(image),
+                          int WXUNUSED(depth),
+                          WXHDC WXUNUSED(hdc))

 {
 {

-  if (!M_BITMAPDATA)
-  m_refData = new wxBitmapRefData;
+    return false;
+}

 
 

-  M_BITMAPDATA->m_height = h;
+wxImage wxBitmap::ConvertToImage() const
+{
+    return wxImage();

 }
 
 }
 

-void wxBitmap::SetDepth(int d)
+#endif // wxUSE_WXDIB/!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();

 
 

-  M_BITMAPDATA->m_depth = d;
+    wxBitmapHandler *handler = wxDynamicCast(FindHandler(type), wxBitmapHandler);
+
+    if ( handler )
+    {
+        m_refData = new wxBitmapRefData;
+
+        return handler->LoadFile(this, filename, type, -1, -1);
+    }
+#if wxUSE_IMAGE && wxUSE_WXDIB
+    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);
+
+        return false;
+    }
+
+    m_refData = new wxBitmapRefData;

 
 

-  M_BITMAPDATA->m_quality = q;
+    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);

 
 

-  M_BITMAPDATA->m_ok = isOk;
+    if ( handler )
+    {
+        return handler->SaveFile(this, filename, type, palette);
+    }
+#if wxUSE_IMAGE && wxUSE_WXDIB
+    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
+
+    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") );

 
 

-  M_BITMAPDATA->m_bitmapPalette = palette ;
+    wxBitmap ret( rect.width, rect.height, GetDepth() );
+    wxASSERT_MSG( ret.Ok(), wxT("GetSubBitmap error") );
+
+#ifndef __WXMICROWIN__
+    // handle alpha channel, if any
+    if (HasAlpha())
+        ret.UseAlpha();
+
+    // 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__
+
+    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)
+wxBitmap wxBitmap::GetMaskBitmap() const

 {
 {

-  if (!M_BITMAPDATA)
-  m_refData = new wxBitmapRefData;
+    wxBitmap bmp;
+    wxMask *mask = GetMask();
+    if ( mask )
+        bmp.SetHBITMAP(mask->GetMaskBitmap());
+    return bmp;
+}

 
 

-  M_BITMAPDATA->m_hBitmap = bmp;
+#ifdef __WXDEBUG__
+
+wxDC *wxBitmap::GetSelectedInto() const
+{
+    return GetBitmapData() ? GetBitmapData()->m_selectedInto : (wxDC *) NULL;

 }
 
 }
 

-void wxBitmap::AddHandler(wxBitmapHandler *handler)
+#endif
+
+#if WXWIN_COMPATIBILITY_2_4
+
+int wxBitmap::GetQuality() const

 {
 {

-  sm_handlers.Append(handler);
+    return 0;

 }
 
 }
 

-void wxBitmap::InsertHandler(wxBitmapHandler *handler)
+#endif // WXWIN_COMPATIBILITY_2_4
+
+void wxBitmap::UseAlpha()

 {
 {

-  sm_handlers.Insert(handler);
+    if ( GetBitmapData() )
+        GetBitmapData()->m_hasAlpha = true;

 }
 
 }
 

-bool wxBitmap::RemoveHandler(const wxString& name)
+bool wxBitmap::HasAlpha() const

 {
 {

-  wxBitmapHandler *handler = FindHandler(name);
-  if ( handler )
-  {
-    sm_handlers.DeleteObject(handler);
-    return TRUE;
-  }
-  else
-    return FALSE;
+    return GetBitmapData() && GetBitmapData()->m_hasAlpha;

 }
 
 }
 

-wxBitmapHandler *wxBitmap::FindHandler(const wxString& name)
+// ----------------------------------------------------------------------------
+// wxBitmap setters
+// ----------------------------------------------------------------------------
+
+#ifdef __WXDEBUG__
+
+void wxBitmap::SetSelectedInto(wxDC *dc)

 {
 {

-  wxNode *node = sm_handlers.First();
-  while ( node )
-  {
-    wxBitmapHandler *handler = (wxBitmapHandler *)node->Data();
-    if ( handler->GetName() == name )
-      return handler;
-    node = node->Next();
-  }
-  return NULL;
+    if ( GetBitmapData() )
+        GetBitmapData()->m_selectedInto = dc;

 }
 
 }
 

-wxBitmapHandler *wxBitmap::FindHandler(const wxString& extension, long bitmapType)
+#endif
+
+#if wxUSE_PALETTE
+
+void wxBitmap::SetPalette(const wxPalette& palette)

 {
 {

-  wxNode *node = sm_handlers.First();
-  while ( node )
-  {
-    wxBitmapHandler *handler = (wxBitmapHandler *)node->Data();
-    if ( handler->GetExtension() == extension &&
-          (bitmapType == -1 || handler->GetType() == bitmapType) )
-      return handler;
-    node = node->Next();
-  }
-  return NULL;
+    AllocExclusive();
+
+    GetBitmapData()->m_bitmapPalette = palette;

 }
 
 }
 

-wxBitmapHandler *wxBitmap::FindHandler(long bitmapType)
+#endif // wxUSE_PALETTE
+
+void wxBitmap::SetMask(wxMask *mask)

 {
 {

-  wxNode *node = sm_handlers.First();
-  while ( node )
-  {
-    wxBitmapHandler *handler = (wxBitmapHandler *)node->Data();
-    if (handler->GetType() == bitmapType)
-      return handler;
-    node = node->Next();
-  }
-  return NULL;
+    AllocExclusive();
+
+    GetBitmapData()->SetMask(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);
+#if 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
+void wxBitmap::SetQuality(int WXUNUSED(quality))

 {
 {

-    wxMemoryDC      memDC;
-    wxBitmap        tmpBitmap(this->GetWidth(), this->GetHeight(), dc.GetDepth());
-    HPALETTE        hPal = NULL;
-    LPBITMAPINFO    lpDib;
-    void            *lpBits = NULL;
+}

 
 

-    wxASSERT( this->GetPalette() && this->GetPalette()->Ok() && (this->GetPalette()->GetHPALETTE() != 0) );
+#endif // WXWIN_COMPATIBILITY_2_4

 
 

-    tmpBitmap.SetPalette(this->GetPalette());
-    memDC.SelectObject(tmpBitmap);
-    memDC.SetPalette(this->GetPalette());
+// ----------------------------------------------------------------------------
+// raw bitmap access support
+// ----------------------------------------------------------------------------

 
 

-    hPal = (HPALETTE) this->GetPalette()->GetHPALETTE();
+#ifdef wxHAVE_RAW_BITMAP
+void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp)
+{
+#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, NULL,
+                        _T("GetRawData() may be called only once") );
+
+        wxDIB *dib = new wxDIB(*this);
+        if ( !dib->IsOk() )
+        {
+            delete dib;
+
+            return NULL;
+        }
+
+        // we'll free it in UngetRawData()
+        GetBitmapData()->m_dib = dib;
+
+        hDIB = dib->GetHandle();
+    }
+    else // we're a DIB
+    {
+        hDIB = GetHbitmap();
+    }
+
+    DIBSECTION ds;
+    if ( ::GetObject(hDIB, sizeof(ds), &ds) != sizeof(DIBSECTION) )
+    {
+        wxFAIL_MSG( _T("failed to get DIBSECTION from a DIB?") );

 
 

-    // set the height negative because in a DIB the order of the lines is reversed
-    createDIB(this->GetWidth(), -this->GetHeight(), this->GetDepth(), hPal, &lpDib);
+        return NULL;
+    }
+
+    // check that the bitmap is in correct format
+    if ( ds.dsBm.bmBitsPixel != bpp )
+    {
+        wxFAIL_MSG( _T("incorrect bitmap type in wxBitmap::GetRawData()") );
+
+        return NULL;
+    }
+
+    // ok, store the relevant info in wxPixelDataBase
+    const LONG h = ds.dsBm.bmHeight;
+
+    data.m_width = ds.dsBm.bmWidth;
+    data.m_height = h;
+
+    // remember that DIBs are stored in top to bottom order!
+    // (We can't just use ds.dsBm.bmWidthBytes here, because it isn't always a
+    // multiple of 2, as required by the documentation.  So we use the official
+    // formula, which we already use elsewhere.)
+    const LONG bytesPerRow =
+        wxDIB::GetLineSize(ds.dsBm.bmWidth, ds.dsBm.bmBitsPixel);
+    data.m_stride = -bytesPerRow;
+
+    char *bits = (char *)ds.dsBm.bmBits;
+    if ( h > 1 )
+    {
+        bits += (h - 1)*bytesPerRow;
+    }
+
+    return bits;
+#else
+    return NULL;
+#endif
+}

 
 

-    lpBits = malloc(lpDib->bmiHeader.biSizeImage);
+void wxBitmap::UngetRawData(wxPixelDataBase& dataBase)
+{
+#if wxUSE_WXDIB
+    if ( !Ok() )
+        return;

 
 

-    ::GetBitmapBits((HBITMAP)GetHBITMAP(), lpDib->bmiHeader.biSizeImage, lpBits);
+    if ( !&dataBase )
+    {
+        // 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;
+    }

 
 

-    ::SetDIBitsToDevice((HDC) memDC.GetHDC(), 0, 0, this->GetWidth(), this->GetHeight(),
-                        0, 0, 0, this->GetHeight(), lpBits, lpDib, DIB_RGB_COLORS);
+    // 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;

 
 

-    free(lpBits);
+        // TODO: convert

 
 

-    freeDIB(lpDib);
-    return (tmpBitmap);
+        delete dib;
+    }
+#endif // wxUSE_WXDIB

 }
 }

+#endif // #ifdef wxHAVE_RAW_BITMAP

 
 

-/*
- * wxMask
- */
+// ----------------------------------------------------------------------------
+// wxMask
+// ----------------------------------------------------------------------------

 
 

-wxMask::wxMask(void)
+wxMask::wxMask()

 {
     m_maskBitmap = 0;
 }
 {
     m_maskBitmap = 0;
 }


@@ -432,7 +1352,7 @@ wxMask::wxMask(void)
 wxMask::wxMask(const wxBitmap& bitmap, const wxColour& colour)
 {
     m_maskBitmap = 0;
 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
 }
 
 // Construct a mask from a bitmap and a palette index indicating


@@ -440,17 +1360,17 @@ wxMask::wxMask(const wxBitmap& bitmap, const wxColour& colour)
 wxMask::wxMask(const wxBitmap& bitmap, int paletteIndex)
 {
     m_maskBitmap = 0;
 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;
 }
 
 // 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);
 {
     if ( m_maskBitmap )
         ::DeleteObject((HBITMAP) m_maskBitmap);


@@ -459,30 +1379,35 @@ wxMask::~wxMask(void)
 // Create a mask from a mono bitmap (copies the bitmap).
 bool wxMask::Create(const wxBitmap& bitmap)
 {
 // 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 )
     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;
+#else
+    wxUnusedVar(bitmap);
+    return false;
+#endif

 }
 
 // Create a mask from a bitmap and a palette index indicating
 }
 
 // Create a mask from a bitmap and a palette index indicating


@@ -490,397 +1415,177 @@ bool wxMask::Create(const wxBitmap& bitmap)
 bool wxMask::Create(const wxBitmap& bitmap, int paletteIndex)
 {
     if ( m_maskBitmap )
 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;

     }
     }

-  }
-  return FALSE;
+
+#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);
+        }
+    }
+#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)
 {
 }
 
 // Create a mask from a bitmap and a colour indicating
 // the transparent area
 bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
 {

-    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
- */
+#ifndef __WXMICROWIN__
+    wxCHECK_MSG( bitmap.Ok(), false, _T("invalid bitmap in wxMask::Create") );

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, wxObject)
+    if ( m_maskBitmap )
+    {
+        ::DeleteObject((HBITMAP) m_maskBitmap);
+        m_maskBitmap = 0;
+    }

 
 

-bool wxBitmapHandler::Create(wxBitmap *bitmap, void *data, long type, int width, int height, int depth)
-{
-  return FALSE;
-}
+    int width = bitmap.GetWidth(),
+        height = bitmap.GetHeight();

 
 

-bool wxBitmapHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long type,
-    int desiredWidth, int desiredHeight)
-{
-  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::SaveFile(wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette)
-{
-  return FALSE;
-}
+    HDC srcDC = ::CreateCompatibleDC(NULL);
+    HDC destDC = ::CreateCompatibleDC(NULL);
+    if ( !srcDC || !destDC )
+    {
+        wxLogLastError(wxT("CreateCompatibleDC"));
+    }

 
 

-/*
- * Standard handlers
- */
+    bool ok = true;

 
 

-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;
-  };
-
-  virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
-      int desiredWidth, int desiredHeight);
-};
-IMPLEMENT_DYNAMIC_CLASS(wxBMPResourceHandler, wxBitmapHandler)
+    // SelectObject() will fail
+    wxASSERT_MSG( !bitmap.GetSelectedInto(),
+                  _T("bitmap can't be selected in another DC") );

 
 

-bool wxBMPResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
-    int desiredWidth, int desiredHeight)
-{
-    // TODO: load colourmap.
-    M_BITMAPHANDLERDATA->m_hBitmap = (WXHBITMAP) ::LoadBitmap(wxGetInstance(), name);
-    if (M_BITMAPHANDLERDATA->m_hBitmap)
+    HGDIOBJ hbmpSrcOld = ::SelectObject(srcDC, GetHbitmapOf(bitmap));
+    if ( !hbmpSrcOld )

     {
     {

-      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;
-    }
+        wxLogLastError(wxT("SelectObject"));

 
 

-  // it's probably not found
-  wxLogError("Can't load bitmap '%s' from resources! Check .rc file.", name.c_str());
+        ok = false;
+    }

 
 

-  return FALSE;
-}
+    HGDIOBJ hbmpDstOld = ::SelectObject(destDC, (HBITMAP)m_maskBitmap);
+    if ( !hbmpDstOld )
+    {
+        wxLogLastError(wxT("SelectObject"));

 
 

-class WXDLLEXPORT wxBMPFileHandler: public wxBitmapHandler
-{
-  DECLARE_DYNAMIC_CLASS(wxBMPFileHandler)
-public:
-  inline wxBMPFileHandler(void)
-  {
-  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)
+        ok = false;
+    }

 
 

-bool wxBMPFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
-    int desiredWidth, int desiredHeight)
-{
-#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)
+    if ( ok )

     {
     {

-      delete palette;
-      palette = NULL;
+        // 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);

     }
     }

-    if (palette)
-      M_BITMAPHANDLERDATA->m_bitmapPalette = *palette;
-    return success;
-#else
-  return FALSE;
-#endif
-}

 
 

-bool wxBMPFileHandler::SaveFile(wxBitmap *bitmap, const wxString& name, int type, const wxPalette *pal)
-{
-#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
+    ::SelectObject(srcDC, hbmpSrcOld);
+    ::DeleteDC(srcDC);
+    ::SelectObject(destDC, hbmpDstOld);
+    ::DeleteDC(destDC);
+
+    return ok;
+#else // __WXMICROWIN__
+    wxUnusedVar(bitmap);
+    wxUnusedVar(colour);
+    return false;
+#endif // __WXMICROWIN__/!__WXMICROWIN__

 }
 
 }
 

-class WXDLLEXPORT wxXPMFileHandler: public wxBitmapHandler
+// ----------------------------------------------------------------------------
+// wxBitmapHandler
+// ----------------------------------------------------------------------------
+
+bool wxBitmapHandler::Create(wxGDIImage *image,
+                             void *data,
+                             long flags,
+                             int width, int height, int depth)

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxXPMFileHandler)
-public:
-  inline wxXPMFileHandler(void)
-  {
-  m_name = "XPM bitmap file";
-  m_extension = "xpm";
-  m_type = wxBITMAP_TYPE_XPM;
-  };
-
-  virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
-    int desiredWidth = -1, int desiredHeight = -1);
-  virtual bool SaveFile(wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette = NULL);
-};
-IMPLEMENT_DYNAMIC_CLASS(wxXPMFileHandler, wxBitmapHandler)
-
-bool wxXPMFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
-    int desiredWidth, int desiredHeight)
-{
-#if wxUSE_XPM_IN_MSW
-    XImage *ximage;
-    XpmAttributes xpmAttr;
-    HDC     dc;
-
-    M_BITMAPHANDLERDATA->m_ok = FALSE;
-    dc = CreateCompatibleDC(NULL);
-    if (dc)
-    {
-      xpmAttr.valuemask = XpmReturnPixels;
-      int errorStatus = XpmReadFileToImage(&dc, WXSTRINGCAST name, &ximage, (XImage **) NULL, &xpmAttr);
-      DeleteDC(dc);
-      if (errorStatus == XpmSuccess)
-      {
-        M_BITMAPHANDLERDATA->m_hBitmap = (WXHBITMAP) ximage->bitmap;
-
-        BITMAP  bm;
-        GetObject((HBITMAP)M_BITMAPHANDLERDATA->m_hBitmap, sizeof(bm), (LPSTR) & bm);
-
-        M_BITMAPHANDLERDATA->m_width = (bm.bmWidth);
-        M_BITMAPHANDLERDATA->m_height = (bm.bmHeight);
-        M_BITMAPHANDLERDATA->m_depth = (bm.bmPlanes * bm.bmBitsPixel);
-        M_BITMAPHANDLERDATA->m_numColors = xpmAttr.npixels;
-        XpmFreeAttributes(&xpmAttr);
-        XImageFree(ximage);
-
-        M_BITMAPHANDLERDATA->m_ok = TRUE;
-        return TRUE;
-      }
-      else
-      {
-        M_BITMAPHANDLERDATA->m_ok = FALSE;
-        return FALSE;
-      }
-    }
-#endif
+    wxBitmap *bitmap = wxDynamicCast(image, wxBitmap);

 
 

-    return FALSE;
+    return bitmap ? Create(bitmap, data, flags, width, height, depth) : false;

 }
 
 }
 

-bool wxXPMFileHandler::SaveFile(wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette)
+bool wxBitmapHandler::Load(wxGDIImage *image,
+                           const wxString& name,
+                           long flags,
+                           int width, int height)

 {
 {

-#if wxUSE_XPM_IN_MSW
-      HDC     dc = NULL;
-
-      Visual *visual = NULL;
-      XImage  ximage;
+    wxBitmap *bitmap = wxDynamicCast(image, wxBitmap);

 
 

-      dc = CreateCompatibleDC(NULL);
-      if (dc)
-      {
-        if (SelectObject(dc, (HBITMAP) M_BITMAPHANDLERDATA->m_hBitmap))
-        { /* for following SetPixel */
-          /* fill the XImage struct 'by hand' */
-    ximage.width = M_BITMAPHANDLERDATA->m_width; 
-     ximage.height = M_BITMAPHANDLERDATA->m_height;
-    ximage.depth = M_BITMAPHANDLERDATA->m_depth; 
-     ximage.bitmap = (void *)M_BITMAPHANDLERDATA->m_hBitmap;
-    int errorStatus = XpmWriteFileFromImage(&dc, WXSTRINGCAST name,
-              &ximage, (XImage *) NULL, (XpmAttributes *) NULL);
-
-          if (dc)
-      DeleteDC(dc);
-
-    if (errorStatus == XpmSuccess)
-      return TRUE;    /* no error */
-    else
-      return FALSE;
-        } else return FALSE;
-      } else return FALSE;
-#else
-  return FALSE;
-#endif
+    return bitmap ? LoadFile(bitmap, name, flags, width, height) : false;

 }
 
 }
 

-class WXDLLEXPORT wxXPMDataHandler: public wxBitmapHandler
+bool wxBitmapHandler::Save(wxGDIImage *image,
+                           const wxString& name,
+                           int type)

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxXPMDataHandler)
-public:
-  inline wxXPMDataHandler(void)
-  {
-  m_name = "XPM bitmap data";
-  m_extension = "xpm";
-  m_type = wxBITMAP_TYPE_XPM_DATA;
-  };
-
-  virtual bool Create(wxBitmap *bitmap, void *data, long flags, int width, int height, int depth = 1);
-};
-IMPLEMENT_DYNAMIC_CLASS(wxXPMDataHandler, wxBitmapHandler)
-
-bool wxXPMDataHandler::Create(wxBitmap *bitmap, void *data, long flags, int width, int height, int depth)
-{
-#if wxUSE_XPM_IN_MSW
-  XImage *ximage;
-  int     ErrorStatus;
-  XpmAttributes xpmAttr;
-  HDC     dc;
-
-  M_BITMAPHANDLERDATA->m_ok = FALSE;
-  M_BITMAPHANDLERDATA->m_numColors = 0;
+    wxBitmap *bitmap = wxDynamicCast(image, wxBitmap);

 
 

-  dc = CreateCompatibleDC(NULL);  /* memory DC */
-
-  if (dc)
-  {
-    xpmAttr.valuemask = XpmReturnInfos; /* get infos back */
-    ErrorStatus = XpmCreateImageFromData(&dc, (char **)data,
-         &ximage, (XImage **) NULL, &xpmAttr);
-
-    if (ErrorStatus == XpmSuccess)
-    {
-      /* ximage is malloced and contains bitmap and attributes */
-      M_BITMAPHANDLERDATA->m_hBitmap = (WXHBITMAP) ximage->bitmap;
-
-      BITMAP  bm;
-      GetObject((HBITMAP) M_BITMAPHANDLERDATA->m_hBitmap, sizeof(bm), (LPSTR) & bm);
-
-      M_BITMAPHANDLERDATA->m_width = (bm.bmWidth);
-      M_BITMAPHANDLERDATA->m_height = (bm.bmHeight);
-      M_BITMAPHANDLERDATA->m_depth = (bm.bmPlanes * bm.bmBitsPixel);
-      M_BITMAPHANDLERDATA->m_numColors = xpmAttr.npixels;
-      XpmFreeAttributes(&xpmAttr);
-
-      XImageFree(ximage); // releases the malloc, but does not detroy
-                          // the bitmap
-      M_BITMAPHANDLERDATA->m_ok = TRUE;
-      DeleteDC(dc);
-
-      return TRUE;
-    } 
-    else
-    {
-      M_BITMAPHANDLERDATA->m_ok = FALSE;
-//    XpmDebugError(ErrorStatus, NULL);
-      DeleteDC(dc);
-      return FALSE;
-    }
-  }
-#endif
+    return bitmap ? SaveFile(bitmap, name, type) : false;
+}

 
 

-  return FALSE;
+bool wxBitmapHandler::Create(wxBitmap *WXUNUSED(bitmap),
+                             void *WXUNUSED(data),
+                             long WXUNUSED(type),
+                             int WXUNUSED(width),
+                             int WXUNUSED(height),
+                             int WXUNUSED(depth))
+{
+    return false;

 }
 
 }
 

-void wxBitmap::CleanUpHandlers(void)
+bool wxBitmapHandler::LoadFile(wxBitmap *WXUNUSED(bitmap),
+                               const wxString& WXUNUSED(name),
+                               long WXUNUSED(type),
+                               int WXUNUSED(desiredWidth),
+                               int WXUNUSED(desiredHeight))

 {
 {

-  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::SaveFile(wxBitmap *WXUNUSED(bitmap),
+                               const wxString& WXUNUSED(name),
+                               int WXUNUSED(type),
+                               const wxPalette *WXUNUSED(palette))

 {
 {

-  AddHandler(new wxBMPResourceHandler);
-  AddHandler(new wxBMPFileHandler);
-  AddHandler(new wxXPMFileHandler);
-  AddHandler(new wxXPMDataHandler);
-  AddHandler(new wxICOResourceHandler);
-  AddHandler(new wxICOFileHandler);
+    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;
 {
    unsigned long   i, headerSize;

-   LPBITMAPINFO    lpDIBheader = NULL;
-   LPPALETTEENTRY  lpPe = NULL;
-

 
    // Allocate space for a DIB header
    headerSize = (sizeof(BITMAPINFOHEADER) + (256 * sizeof(PALETTEENTRY)));
 
    // 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);
 
 
    GetPaletteEntries(hPal, 0, 256, lpPe);
 

-

    memset(lpDIBheader, 0x00, sizeof(BITMAPINFOHEADER));
 
    memset(lpDIBheader, 0x00, sizeof(BITMAPINFOHEADER));
 

-

    // Fill in the static parts of the DIB header
    lpDIBheader->bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
    lpDIBheader->bmiHeader.biWidth = xSize;
    // Fill in the static parts of the DIB header
    lpDIBheader->bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
    lpDIBheader->bmiHeader.biWidth = xSize;


@@ -890,8 +1595,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;
    // 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->bmiHeader.biClrUsed = 256;
 
 


@@ -905,21 +1609,162 @@ static long createDIB(long xSize, long ySize, long bitsPerPixel,
 
    *lpDIBHeader = lpDIBheader;
 
 
    *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;
+    }
+
+    if ( bmp.HasAlpha() )
+    {
+        // Create an empty mask bitmap.
+        // it doesn't seem to work if we mess with the mask at all.
+        HBITMAP hMonoBitmap = CreateBitmap(bmp.GetWidth(),bmp.GetHeight(),1,1,NULL);
+
+        ICONINFO iconInfo;
+        wxZeroMemory(iconInfo);
+        iconInfo.fIcon = iconWanted;  // do we want an icon or a cursor?
+        if ( !iconWanted )
+        {
+            iconInfo.xHotspot = hotSpotX;
+            iconInfo.yHotspot = hotSpotY;
+        }
+
+        iconInfo.hbmMask = hMonoBitmap;
+        iconInfo.hbmColor = GetHbitmapOf(bmp);
+
+        HICON hicon = ::CreateIconIndirect(&iconInfo);
+
+        ::DeleteObject(hMonoBitmap);
+
+        return hicon;
+    }
+
+    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;
+    }
+
+    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() && !bmp.HasAlpha() )
+    {
+        // we created the mask, now delete it
+        delete mask;
+    }

 
 

-   return (0);
+    // 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
+}