removed asserts to suppress gcc 3.4 warnings about condition being always true

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

diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp
index 4c21494fcb4ba8ccde1635807669420f1d111aba..f0c834bb24d19958eb2bf1d95687e426d30ffb1f 100644 (file)
--- a/src/msw/bitmap.cpp
+++ b/src/msw/bitmap.cpp
@@ -1,12 +1,12 @@
-/////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////

 // Name:        bitmap.cpp
 // Purpose:     wxBitmap
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Name:        bitmap.cpp
 // Purpose:     wxBitmap
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "bitmap.h"
 #endif
 
     #pragma implementation "bitmap.h"
 #endif
 


@@ -43,15 +43,86 @@
 #include "wx/msw/private.h"
 #include "wx/log.h"
 
 #include "wx/msw/private.h"
 #include "wx/log.h"
 

+#if wxUSE_WXDIB

 #include "wx/msw/dib.h"
 #include "wx/msw/dib.h"

+#endif
+

 #include "wx/image.h"
 #include "wx/xpmdecod.h"
 
 #include "wx/image.h"
 #include "wx/xpmdecod.h"
 

+#ifdef wxHAVE_RAW_BITMAP
+#include "wx/rawbmp.h"
+#endif
+

 // missing from mingw32 header
 #ifndef CLR_INVALID
     #define CLR_INVALID ((COLORREF)-1)
 #endif // no CLR_INVALID
 
 // 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();
+    virtual ~wxBitmapRefData() { Free(); }
+
+    virtual void Free();
+
+    // set the mask object to use as the mask, we take ownership of it
+    void SetMask(wxMask *mask)
+    {
+        delete m_bitmapMask;
+        m_bitmapMask = mask;
+    }
+
+    // set the HBITMAP to use as the mask
+    void SetMask(HBITMAP hbmpMask)
+    {
+        SetMask(new wxMask((WXHBITMAP)hbmpMask));
+    }
+
+    // return the mask
+    wxMask *GetMask() const { return m_bitmapMask; }
+
+public:
+#if wxUSE_PALETTE
+    wxPalette     m_bitmapPalette;
+#endif // wxUSE_PALETTE
+
+    // MSW-specific
+    // ------------
+
+#ifdef __WXDEBUG__
+    // this field is solely for error checking: we detect selecting a bitmap
+    // into more than one DC at once or deleting a bitmap still selected into a
+    // DC (both are serious programming errors under Windows)
+    wxDC         *m_selectedInto;
+#endif // __WXDEBUG__
+
+#if wxUSE_WXDIB
+    // when GetRawData() is called for a DDB we need to convert it to a DIB
+    // first to be able to provide direct access to it and we cache that DIB
+    // here and convert it back to DDB when UngetRawData() is called
+    wxDIB *m_dib;
+#endif
+
+    // true if we have alpha transparency info and can be drawn using
+    // AlphaBlend()
+    bool m_hasAlpha;
+
+    // true if our HBITMAP is a DIB section, false if it is a DDB
+    bool m_isDIB;
+
+private:
+    // optional mask for transparent drawing
+    wxMask       *m_bitmapMask;
+
+    DECLARE_NO_COPY_CLASS(wxBitmapRefData)
+};
+

 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------


@@ -65,17 +136,68 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, wxObject)
 // implementation
 // ============================================================================
 
 // 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()
 {
 // ----------------------------------------------------------------------------
 // wxBitmapRefData
 // ----------------------------------------------------------------------------
 
 wxBitmapRefData::wxBitmapRefData()
 {

-    m_quality = 0;
+#ifdef __WXDEBUG__

     m_selectedInto = NULL;
     m_selectedInto = NULL;

-    m_numColors = 0;
+#endif

     m_bitmapMask = NULL;
     m_bitmapMask = NULL;

+

     m_hBitmap = (WXHBITMAP) NULL;
     m_hBitmap = (WXHBITMAP) NULL;

+#if wxUSE_WXDIB
+    m_dib = NULL;
+#endif
+
+    m_isDIB =
+    m_hasAlpha = FALSE;

 }
 
 void wxBitmapRefData::Free()
 }
 
 void wxBitmapRefData::Free()


@@ -83,6 +205,10 @@ void wxBitmapRefData::Free()
     wxASSERT_MSG( !m_selectedInto,
                   wxT("deleting bitmap still selected into wxMemoryDC") );
 
     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) )
     if ( m_hBitmap)
     {
         if ( !::DeleteObject((HBITMAP)m_hBitmap) )


@@ -103,15 +229,18 @@ void wxBitmapRefData::Free()
 void wxBitmap::Init()
 {
     // m_refData = NULL; done in the base class ctor
 void wxBitmap::Init()
 {
     // m_refData = NULL; done in the base class ctor

+}

 
 

-    if ( wxTheBitmapList )
-        wxTheBitmapList->AddBitmap(this);
+wxGDIImageRefData *wxBitmap::CreateData() const
+{
+    return new wxBitmapRefData;

 }
 
 #ifdef __WIN32__
 
 bool wxBitmap::CopyFromIconOrCursor(const wxGDIImage& icon)
 {
 }
 
 #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();
 
     // it may be either HICON or HCURSOR
     HICON hicon = (HICON)icon.GetHandle();
 


@@ -137,14 +266,16 @@ bool wxBitmap::CopyFromIconOrCursor(const wxGDIImage& icon)
 
     // the mask returned by GetIconInfo() is inversed compared to the usual
     // wxWin convention
 
     // the mask returned by GetIconInfo() is inversed compared to the usual
     // wxWin convention

-    refData->m_bitmapMask = new wxMask((WXHBITMAP)
-                                        wxInvertMask(iconInfo.hbmMask, w, h));
+    refData->SetMask(wxInvertMask(iconInfo.hbmMask, w, h));
+

 
 

-#if WXWIN_COMPATIBILITY_2
-    refData->m_ok = TRUE;
-#endif // WXWIN_COMPATIBILITY_2
+    // delete the old one now as we don't need it any more
+    ::DeleteObject(iconInfo.hbmMask);

 
     return TRUE;
 
     return TRUE;

+#else
+    return FALSE;
+#endif

 }
 
 #endif // Win32
 }
 
 #endif // Win32


@@ -156,13 +287,7 @@ bool wxBitmap::CopyFromCursor(const wxCursor& cursor)
     if ( !cursor.Ok() )
         return FALSE;
 
     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);
     return CopyFromIconOrCursor(cursor);

-#endif // Win16

 }
 
 bool wxBitmap::CopyFromIcon(const wxIcon& icon)
 }
 
 bool wxBitmap::CopyFromIcon(const wxIcon& icon)


@@ -172,61 +297,64 @@ bool wxBitmap::CopyFromIcon(const wxIcon& icon)
     if ( !icon.Ok() )
         return FALSE;
 
     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();
+    return CopyFromIconOrCursor(icon);
+}

 
 

-    // copy the icon to the bitmap
-    ScreenHDC hdcScreen;
-    HDC hdc = ::CreateCompatibleDC(hdcScreen);
-    HBITMAP hbitmap = ::CreateCompatibleBitmap(hdcScreen, width, height);
-    HBITMAP hbmpOld = (HBITMAP)::SelectObject(hdc, hbitmap);
+#ifndef NEVER_USE_DIB

 
 

-    ::DrawIcon(hdc, 0, 0, GetHiconOf(icon));
+bool wxBitmap::CopyFromDIB(const wxDIB& dib)
+{
+    wxCHECK_MSG( dib.IsOk(), FALSE, _T("invalid DIB in CopyFromDIB") );

 
 

-    ::SelectObject(hdc, hbmpOld);
-    ::DeleteDC(hdc);
+#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();

 
     wxBitmapRefData *refData = new wxBitmapRefData;
     m_refData = refData;
 
 
     wxBitmapRefData *refData = new wxBitmapRefData;
     m_refData = refData;
 

-    refData->m_width = width;
-    refData->m_height = height;
-    refData->m_depth = wxDisplayDepth();
+    refData->m_width = dib.GetWidth();
+    refData->m_height = dib.GetHeight();
+    refData->m_depth = dib.GetDepth();

 
     refData->m_hBitmap = (WXHBITMAP)hbitmap;
 
 
     refData->m_hBitmap = (WXHBITMAP)hbitmap;
 

-#if WXWIN_COMPATIBILITY_2
-    refData->m_ok = TRUE;
-#endif // WXWIN_COMPATIBILITY_2
+#if wxUSE_PALETTE
+    wxPalette *palette = dib.CreatePalette();
+    if ( palette )
+    {
+        refData->m_bitmapPalette = *palette;
+    }
+
+    delete palette;
+#endif // wxUSE_PALETTE

 
     return TRUE;
 
     return TRUE;

-#else // Win32
-    return CopyFromIconOrCursor(icon);
-#endif // Win16/Win32

 }
 
 }
 

+#endif // NEVER_USE_DIB
+

 wxBitmap::~wxBitmap()
 {
 wxBitmap::~wxBitmap()
 {

-    if (wxTheBitmapList)
-        wxTheBitmapList->DeleteObject(this);

 }
 
 wxBitmap::wxBitmap(const char bits[], int width, int height, int depth)
 {
     Init();
 
 }
 
 wxBitmap::wxBitmap(const char bits[], int width, int height, int depth)
 {
     Init();
 

+#ifndef __WXMICROWIN__

     wxBitmapRefData *refData = new wxBitmapRefData;
     m_refData = refData;
 
     refData->m_width = width;
     refData->m_height = height;
     refData->m_depth = depth;
     wxBitmapRefData *refData = new wxBitmapRefData;
     m_refData = refData;
 
     refData->m_width = width;
     refData->m_height = height;
     refData->m_depth = depth;

-    refData->m_numColors = 0;
-    refData->m_selectedInto = NULL;

 
     char *data;
     if ( depth == 1 )
 
     char *data;
     if ( depth == 1 )


@@ -234,9 +362,9 @@ wxBitmap::wxBitmap(const char bits[], int width, int height, int depth)
         // 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!
         // 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 );
+        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;
         data = (char *)malloc(len);
         const char *src = bits;
         char *dst = data;


@@ -279,24 +407,29 @@ wxBitmap::wxBitmap(const char bits[], int width, int height, int depth)
     }
 
     SetHBITMAP((WXHBITMAP)hbmp);
     }
 
     SetHBITMAP((WXHBITMAP)hbmp);

+#endif

 }
 
 // Create from XPM data
 }
 
 // Create from XPM data

+#if wxUSE_IMAGE && wxUSE_XPM

 bool wxBitmap::CreateFromXpm(const char **data)
 bool wxBitmap::CreateFromXpm(const char **data)

+#else
+bool wxBitmap::CreateFromXpm(const char **WXUNUSED(data))
+#endif

 {
 #if wxUSE_IMAGE && wxUSE_XPM
     Init();
 
     wxCHECK_MSG( data != NULL, FALSE, wxT("invalid bitmap data") )
 {
 #if wxUSE_IMAGE && wxUSE_XPM
     Init();
 
     wxCHECK_MSG( data != NULL, FALSE, wxT("invalid bitmap data") )

-    
+

     wxXPMDecoder decoder;
     wxImage img = decoder.ReadData(data);
     wxCHECK_MSG( img.Ok(), FALSE, wxT("invalid bitmap data") )
     wxXPMDecoder decoder;
     wxImage img = decoder.ReadData(data);
     wxCHECK_MSG( img.Ok(), FALSE, wxT("invalid bitmap data") )

-    
+

     *this = wxBitmap(img);
     return TRUE;
 #else
     *this = wxBitmap(img);
     return TRUE;
 #else

-       return FALSE;
+    return FALSE;

 #endif
 }
 
 #endif
 }
 


@@ -307,6 +440,13 @@ wxBitmap::wxBitmap(int w, int h, int d)
     (void)Create(w, h, d);
 }
 
     (void)Create(w, h, d);
 }
 

+wxBitmap::wxBitmap(int w, int h, const wxDC& dc)
+{
+    Init();
+
+    (void)Create(w, h, dc);
+}
+

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


@@ -321,7 +461,19 @@ wxBitmap::wxBitmap(const wxString& filename, wxBitmapType type)
     LoadFile(filename, (int)type);
 }
 
     LoadFile(filename, (int)type);
 }
 

-bool wxBitmap::Create(int w, int h, int d)
+bool wxBitmap::Create(int width, int height, int depth)
+{
+    return DoCreate(width, height, depth, 0);
+}
+
+bool wxBitmap::Create(int width, int height, const wxDC& dc)
+{
+    wxCHECK_MSG( dc.Ok(), FALSE, _T("invalid HDC in wxBitmap::Create()") );
+
+    return DoCreate(width, height, -1, dc.GetHDC());
+}
+
+bool wxBitmap::DoCreate(int w, int h, int d, WXHDC hdc)

 {
     UnRef();
 
 {
     UnRef();
 


@@ -329,273 +481,200 @@ bool wxBitmap::Create(int w, int h, int d)
 
     GetBitmapData()->m_width = w;
     GetBitmapData()->m_height = h;
 
     GetBitmapData()->m_width = w;
     GetBitmapData()->m_height = h;

-    GetBitmapData()->m_depth = d;

 
 

-    HBITMAP hbmp;
+    HBITMAP hbmp    wxDUMMY_INITIALIZE(0);

 
 

-    if ( d > 0 )
+#ifndef NEVER_USE_DIB
+    if ( wxShouldCreateDIB(w, h, d, hdc) )

     {
     {

-        hbmp = ::CreateBitmap(w, h, 1, d, NULL);
-        if ( !hbmp )
+        if ( d == -1 )

         {
         {

-            wxLogLastError(wxT("CreateBitmap"));
+            // 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
+    else // create a DDB
+#endif // NEVER_USE_DIB

     {
     {

-        ScreenHDC dc;
-        hbmp = ::CreateCompatibleBitmap(dc, w, h);
-        if ( !hbmp )
+#ifndef ALWAYS_USE_DIB
+#ifndef __WXMICROWIN__
+        if ( d > 0 )

         {
         {

-            wxLogLastError(wxT("CreateCompatibleBitmap"));
+            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();
+            GetBitmapData()->m_depth = wxDisplayDepth();
+        }
+#endif // !ALWAYS_USE_DIB

     }
 
     SetHBITMAP((WXHBITMAP)hbmp);
 
     }
 
     SetHBITMAP((WXHBITMAP)hbmp);
 

-#if WXWIN_COMPATIBILITY_2
-    GetBitmapData()->m_ok = hbmp != 0;
-#endif // WXWIN_COMPATIBILITY_2
-

     return Ok();
 }
 
     return Ok();
 }
 

+#if wxUSE_IMAGE
+

 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------

-// wxImage to/from conversions
+// wxImage to/from conversions for Microwin

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-#if wxUSE_IMAGE
+// 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 )
+bool wxBitmap::CreateFromImage(const wxImage& image, int depth, const wxDC& dc)

 {
 {

-    wxCHECK_MSG( image.Ok(), FALSE, wxT("invalid image") )
+    // Set this to 1 to experiment with mask code,
+    // which currently doesn't work
+    #define USE_MASKS 0

 
     m_refData = new wxBitmapRefData();
 
 
     m_refData = new wxBitmapRefData();
 

-    // sizeLimit is the MS upper limit for the DIB size
-#ifdef  WIN32
-    int sizeLimit = 1024*768*3;
-#else
-    int sizeLimit = 0x7fff ;
-#endif
+    // Initial attempt at a simple-minded implementation.
+    // The bitmap will always be created at the screen depth,
+    // so the 'depth' argument is ignored.

 
 

-    // width and height of the device-dependent bitmap
-    int width = image.GetWidth();
-    int bmpHeight = image.GetHeight();
+    HDC hScreenDC = ::GetDC(NULL);
+    int screenDepth = ::GetDeviceCaps(hScreenDC, BITSPIXEL);

 
 

-    // calc the number of bytes per scanline and padding
-    int bytePerLine = width*3;
-    int sizeDWORD = sizeof( DWORD );
-    int lineBoundary = bytePerLine % sizeDWORD;
-    int padding = 0;
-    if( lineBoundary > 0 )
-    {
-        padding = sizeDWORD - lineBoundary;
-        bytePerLine += padding;
-    }
-    // calc the number of DIBs and heights of DIBs
-    int numDIB = 1;
-    int hRemain = 0;
-    int height = sizeLimit/bytePerLine;
-    if( height >= bmpHeight )
-        height = bmpHeight;
-    else
-    {
-        numDIB =  bmpHeight / height;
-        hRemain = bmpHeight % height;
-        if( hRemain >0 )  numDIB++;
-    }
+    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;

 
 

-    // set bitmap parameters
-    wxCHECK_MSG( image.Ok(), FALSE, wxT("invalid image") );
-    SetWidth( width );
-    SetHeight( bmpHeight );
-    if (depth == -1) depth = wxDisplayDepth();
-    SetDepth( depth );
-
-    // create a DIB header
-    int headersize = sizeof(BITMAPINFOHEADER);
-    BITMAPINFO *lpDIBh = (BITMAPINFO *) malloc( headersize );
-    wxCHECK_MSG( lpDIBh, FALSE, wxT("could not allocate memory for DIB header") );
-    // Fill in the DIB header
-    lpDIBh->bmiHeader.biSize = headersize;
-    lpDIBh->bmiHeader.biWidth = (DWORD)width;
-    lpDIBh->bmiHeader.biHeight = (DWORD)(-height);
-    lpDIBh->bmiHeader.biSizeImage = bytePerLine*height;
-    //   the general formula for biSizeImage:
-    //      ( ( ( ((DWORD)width*24) +31 ) & ~31 ) >> 3 ) * height;
-    lpDIBh->bmiHeader.biPlanes = 1;
-    lpDIBh->bmiHeader.biBitCount = 24;
-    lpDIBh->bmiHeader.biCompression = BI_RGB;
-    lpDIBh->bmiHeader.biClrUsed = 0;
-    // These seem not really needed for our purpose here.
-    lpDIBh->bmiHeader.biClrImportant = 0;
-    lpDIBh->bmiHeader.biXPelsPerMeter = 0;
-    lpDIBh->bmiHeader.biYPelsPerMeter = 0;
-    // memory for DIB data
-    unsigned char *lpBits;
-    lpBits = (unsigned char *)malloc( lpDIBh->bmiHeader.biSizeImage );
-    if( !lpBits )
+    //    printf("Created bitmap %d\n", (int) hBitmap);
+    if (hBitmap == NULL)

     {
     {

-        wxFAIL_MSG( wxT("could not allocate memory for DIB") );
-        free( lpDIBh );
+        ::ReleaseDC(NULL, hScreenDC);

         return FALSE;
     }
         return FALSE;
     }

+    HDC hMemDC = ::CreateCompatibleDC(hScreenDC);

 
 

-    // create and set the device-dependent bitmap
-    HDC hdc = ::GetDC(NULL);
-    HDC memdc = ::CreateCompatibleDC( hdc );
-    HBITMAP hbitmap;
-    hbitmap = ::CreateCompatibleBitmap( hdc, width, bmpHeight );
-    ::SelectObject( memdc, hbitmap);
-
-    HPALETTE hOldPalette = 0;
-    if (image.GetPalette().Ok())
-    {
-        hOldPalette = ::SelectPalette(memdc, (HPALETTE) image.GetPalette().GetHPALETTE(), FALSE);
-        ::RealizePalette(memdc);
-    }
+    HBITMAP hOldBitmap = ::SelectObject(hMemDC, hBitmap);
+    ::ReleaseDC(NULL, hScreenDC);

 
 

-    // copy image data into DIB data and then into DDB (in a loop)
-    unsigned char *data = image.GetData();
-    int i, j, n;
-    int origin = 0;
-    unsigned char *ptdata = data;
-    unsigned char *ptbits;
+    // created an mono-bitmap for the possible mask
+    bool hasMask = image.HasMask();

 
 

-    for( n=0; n<numDIB; n++ )
+    if ( hasMask )

     {
     {

-        if( numDIB > 1 && n == numDIB-1 && hRemain > 0 )
+#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)

         {
         {

-            // redefine height and size of the (possibly) last smaller DIB
-            // memory is not reallocated
-            height = hRemain;
-            lpDIBh->bmiHeader.biHeight = (DWORD)(-height);
-            lpDIBh->bmiHeader.biSizeImage = bytePerLine*height;
+            hasMask = FALSE;

         }
         }

-        ptbits = lpBits;
-
-        for( j=0; j<height; j++ )
+        else

         {
         {

-            for( i=0; i<width; i++ )
-            {
-                *(ptbits++) = *(ptdata+2);
-                *(ptbits++) = *(ptdata+1);
-                *(ptbits++) = *(ptdata  );
-                ptdata += 3;
-            }
-            for( i=0; i< padding; i++ )   *(ptbits++) = 0;
+            hScreenDC = ::GetDC(NULL);
+            hMaskDC = ::CreateCompatibleDC(hScreenDC);
+           ::ReleaseDC(NULL, hScreenDC);
+
+            hOldMaskBitmap = ::SelectObject( hMaskDC, hMaskBitmap);

         }
         }

-        ::StretchDIBits( memdc, 0, origin, width, height,\
-            0, 0, width, height, lpBits, lpDIBh, DIB_RGB_COLORS, SRCCOPY);
-        origin += height;
-        // if numDIB = 1,  lines below can also be used
-        //    hbitmap = CreateDIBitmap( hdc, &(lpDIBh->bmiHeader), CBM_INIT, lpBits, lpDIBh, DIB_RGB_COLORS );
-        // The above line is equivalent to the following two lines.
-        //    hbitmap = ::CreateCompatibleBitmap( hdc, width, height );
-        //    ::SetDIBits( hdc, hbitmap, 0, height, lpBits, lpDIBh, DIB_RGB_COLORS);
-        // or the following lines
-        //    hbitmap = ::CreateCompatibleBitmap( hdc, width, height );
-        //    HDC memdc = ::CreateCompatibleDC( hdc );
-        //    ::SelectObject( memdc, hbitmap);
-        //    ::SetDIBitsToDevice( memdc, 0, 0, width, height,
-        //            0, 0, 0, height, (void *)lpBits, lpDIBh, DIB_RGB_COLORS);
-        //    ::SelectObject( memdc, 0 );
-        //    ::DeleteDC( memdc );
+#else
+        hasMask = FALSE;
+#endif

     }
     }

-    SetHBITMAP( (WXHBITMAP) hbitmap );
-
-    if (hOldPalette)
-        SelectPalette(memdc, hOldPalette, FALSE);

 
 

-    // similarly, created an mono-bitmap for the possible mask
-    if( image.HasMask() )
+    int i, j;
+    for (i = 0; i < image.GetWidth(); i++)

     {
     {

-        hbitmap = ::CreateBitmap( (WORD)width, (WORD)bmpHeight, 1, 1, NULL );
-        HGDIOBJ hbmpOld = ::SelectObject( memdc, hbitmap);
-        if( numDIB == 1 )   height = bmpHeight;
-        else                height = sizeLimit/bytePerLine;
-        lpDIBh->bmiHeader.biHeight = (DWORD)(-height);
-        lpDIBh->bmiHeader.biSizeImage = bytePerLine*height;
-        origin = 0;
-        unsigned char r = image.GetMaskRed();
-        unsigned char g = image.GetMaskGreen();
-        unsigned char b = image.GetMaskBlue();
-        unsigned char zero = 0, one = 255;
-        ptdata = data;
-        for( n=0; n<numDIB; n++ )
+        for (j = 0; j < image.GetHeight(); j++)

         {
         {

-            if( numDIB > 1 && n == numDIB - 1 && hRemain > 0 )
-            {
-                // redefine height and size of the (possibly) last smaller DIB
-                // memory is not reallocated
-                height = hRemain;
-                lpDIBh->bmiHeader.biHeight = (DWORD)(-height);
-                lpDIBh->bmiHeader.biSizeImage = bytePerLine*height;
-            }
-            ptbits = lpBits;
-            for( int j=0; j<height; j++ )
-            {
-                for(i=0; i<width; i++ )
-                {
-                    // was causing a code gen bug in cw : if( ( cr !=r) || (cg!=g) || (cb!=b) )
-                    unsigned char cr = (*(ptdata++)) ;
-                    unsigned char cg = (*(ptdata++)) ;
-                    unsigned char cb = (*(ptdata++)) ;
+            unsigned char red = image.GetRed(i, j);
+            unsigned char green = image.GetGreen(i, j);
+            unsigned char blue = image.GetBlue(i, j);

 
 

-                    if( ( cr !=r) || (cg!=g) || (cb!=b) )
-                    {
-                        *(ptbits++) = one;
-                        *(ptbits++) = one;
-                        *(ptbits++) = one;
-                    }
-                    else
-                    {
-                        *(ptbits++) = zero;
-                        *(ptbits++) = zero;
-                        *(ptbits++) = zero;
-                    }
-                }
-                for( i=0; i< padding; i++ )   *(ptbits++) = zero;
+            ::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));

             }
             }

-            ::StretchDIBits( memdc, 0, origin, width, height,\
-                0, 0, width, height, lpBits, lpDIBh, DIB_RGB_COLORS, SRCCOPY);
-            origin += height;

         }
         }

-        // create a wxMask object
-        wxMask *mask = new wxMask();
-        mask->SetMaskBitmap( (WXHBITMAP) hbitmap );
-        SetMask( mask );
-        // It will be deleted when the wxBitmap object is deleted (as of 01/1999)
-        /* The following can also be used but is slow to run
-        wxColour colour( GetMaskRed(), GetMaskGreen(), GetMaskBlue());
-        wxMask *mask = new wxMask( *this, colour );
-        SetMask( mask );
-        */
-
-        ::SelectObject( memdc, hbmpOld );

     }
 
     }
 

-    // free allocated resources
-    ::DeleteDC( memdc );
-    ::ReleaseDC(NULL, hdc);
-    free(lpDIBh);
-    free(lpBits);
+    ::SelectObject(hMemDC, hOldBitmap);
+    ::DeleteDC(hMemDC);
+    if (hasMask)
+    {
+        ::SelectObject(hMaskDC, hOldMaskBitmap);
+        ::DeleteDC(hMaskDC);
+
+        ((wxBitmapRefData*)m_refData)->SetMask(hMaskBitmap);
+    }

 
 

-#if WXWIN_COMPATIBILITY_2
-    // check the wxBitmap object
-    GetBitmapData()->SetOk();
-#endif // WXWIN_COMPATIBILITY_2
+    SetWidth(image.GetWidth());
+    SetHeight(image.GetHeight());
+    SetDepth(screenDepth);
+    SetHBITMAP( (WXHBITMAP) hBitmap );

 
 

-    if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
+#if wxUSE_PALETTE
+    // Copy the palette from the source image
+    SetPalette(image.GetPalette());
+#endif // wxUSE_PALETTE

 
     return TRUE;
 }
 
 wxImage wxBitmap::ConvertToImage() const
 {
 
     return TRUE;
 }
 
 wxImage wxBitmap::ConvertToImage() const
 {

+    // Initial attempt at a simple-minded implementation.
+    // The bitmap will always be created at the screen depth,
+    // so the 'depth' argument is ignored.
+    // TODO: transparency (create a mask image)
+
+    if (!Ok())
+    {
+        wxFAIL_MSG( wxT("bitmap is invalid") );
+        return wxNullImage;
+    }
+

     wxImage image;
 
     wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") );
     wxImage image;
 
     wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") );


@@ -611,119 +690,260 @@ wxImage wxBitmap::ConvertToImage() const
         return wxNullImage;
     }
 
         return wxNullImage;
     }
 

-    // calc the number of bytes per scanline and padding in the DIB
-    int bytePerLine = width*3;
-    int sizeDWORD = sizeof( DWORD );
-    int lineBoundary =  bytePerLine % sizeDWORD;
-    int padding = 0;
-    if( lineBoundary > 0 )
+    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++)

     {
     {

-        padding = sizeDWORD - lineBoundary;
-        bytePerLine += padding;
+        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);
+        }

     }
 
     }
 

-    // create a DIB header
-    int headersize = sizeof(BITMAPINFOHEADER);
-    BITMAPINFO *lpDIBh = (BITMAPINFO *) malloc( headersize );
-    if( !lpDIBh )
+    ::SelectObject(hMemDC, hOldBitmap);
+    ::DeleteDC(hMemDC);
+
+#if wxUSE_PALETTE
+    // Copy the palette from the source image
+    if (GetPalette())
+        image.SetPalette(* GetPalette());
+#endif // wxUSE_PALETTE
+
+    return image;
+}
+
+#endif // __WXMICROWIN__
+
+// ----------------------------------------------------------------------------
+// wxImage to/from conversions
+// ----------------------------------------------------------------------------
+
+#if wxUSE_WXDIB
+
+bool wxBitmap::CreateFromImage(const wxImage& image, int depth)
+{
+    return CreateFromImage(image, depth, 0);
+}
+
+bool wxBitmap::CreateFromImage(const wxImage& image, const wxDC& dc)
+{
+    wxCHECK_MSG( dc.Ok(), FALSE,
+                    _T("invalid HDC in wxBitmap::CreateFromImage()") );
+
+    return CreateFromImage(image, -1, dc.GetHDC());
+}
+
+bool wxBitmap::CreateFromImage(const wxImage& image, int depth, WXHDC hdc)
+{
+    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;
+
+
+    // store the bitmap parameters
+    wxBitmapRefData *refData = new wxBitmapRefData;
+    refData->m_width = w;
+    refData->m_height = h;
+    refData->m_hasAlpha = image.HasAlpha();
+
+    m_refData = refData;
+
+
+    // next either store DIB as is or create a DDB from it
+    HBITMAP hbitmap     wxDUMMY_INITIALIZE(0);
+
+    // are we going to use DIB?
+    //
+    // NB: DDBs don't support alpha so if we have alpha channel we must use DIB
+    if ( image.HasAlpha() || wxShouldCreateDIB(w, h, depth, hdc) )
+    {
+        // don't delete the DIB section in dib object dtor
+        hbitmap = dib.Detach();
+
+        refData->m_isDIB = TRUE;
+        refData->m_depth = dib.GetDepth();
+    }
+#ifndef ALWAYS_USE_DIB
+    else // we need to convert DIB to DDB
+    {
+        hbitmap = dib.CreateDDB((HDC)hdc);
+
+        refData->m_depth = depth == -1 ? dib.GetDepth() : depth;
+    }
+#endif // !ALWAYS_USE_DIB
+
+    // validate this object
+    SetHBITMAP((WXHBITMAP)hbitmap);
+
+    // finally also set the mask if we have one
+    if ( image.HasMask() )
+    {
+        SetMask(new wxMask(*this, wxColour(image.GetMaskRed(),
+                                           image.GetMaskGreen(),
+                                           image.GetMaskBlue())));
+    }
+
+    return TRUE;
+}
+
+wxImage wxBitmap::ConvertToImage() const
+{
+    wxDIB dib(*this);
+
+    if ( !dib.IsOk() )

     {
     {

-        wxFAIL_MSG( wxT("could not allocate data for DIB header") );
-        free( data );

         return wxNullImage;
     }
         return wxNullImage;
     }

-    // Fill in the DIB header
-    lpDIBh->bmiHeader.biSize = headersize;
-    lpDIBh->bmiHeader.biWidth = width;
-    lpDIBh->bmiHeader.biHeight = -height;
-    lpDIBh->bmiHeader.biSizeImage = bytePerLine * height;
-    lpDIBh->bmiHeader.biPlanes = 1;
-    lpDIBh->bmiHeader.biBitCount = 24;
-    lpDIBh->bmiHeader.biCompression = BI_RGB;
-    lpDIBh->bmiHeader.biClrUsed = 0;
-    // These seem not really needed for our purpose here.
-    lpDIBh->bmiHeader.biClrImportant = 0;
-    lpDIBh->bmiHeader.biXPelsPerMeter = 0;
-    lpDIBh->bmiHeader.biYPelsPerMeter = 0;
-    // memory for DIB data
-    unsigned char *lpBits;
-    lpBits = (unsigned char *) malloc( lpDIBh->bmiHeader.biSizeImage );
-    if( !lpBits )
+
+    wxImage image = dib.ConvertToImage();
+    if ( !image.Ok() )

     {
     {

-        wxFAIL_MSG( wxT("could not allocate data for DIB") );
-        free( data );
-        free( lpDIBh );

         return wxNullImage;
     }
 
         return wxNullImage;
     }
 

-    // copy data from the device-dependent bitmap to the DIB
-    HDC hdc = ::GetDC(NULL);
-    HBITMAP hbitmap;
-    hbitmap = (HBITMAP) GetHBITMAP();
-    ::GetDIBits( hdc, hbitmap, 0, height, lpBits, lpDIBh, DIB_RGB_COLORS );
+    // set mask

 
 

-    // copy DIB data into the wxImage object
-    int i, j;
-    unsigned char *ptdata = data;
-    unsigned char *ptbits = lpBits;
-    for( i=0; i<height; i++ )
+    // TODO: WinCE mask-copying support and use wxDIB
+#ifndef __WXWINCE__
+
+    if( GetMask() && GetMask()->GetMaskBitmap() )

     {
     {

-        for( j=0; j<width; j++ )
+        static const int MASK_RED = 1;
+        static const int MASK_GREEN = 2;
+        static const int MASK_BLUE = 3;
+        static const int MASK_BLUE_REPLACEMENT = 2;
+
+        HBITMAP hbitmap = (HBITMAP) GetMask()->GetMaskBitmap();
+        int width = GetWidth();
+        int height = GetHeight();
+
+        int bytesPerLine = width*3;
+        int sizeDWORD = sizeof( DWORD );
+        int lineBoundary =  bytesPerLine % sizeDWORD;
+        int padding = 0;
+        if( lineBoundary > 0 )

         {
         {

-            *(ptdata++) = *(ptbits+2);
-            *(ptdata++) = *(ptbits+1);
-            *(ptdata++) = *(ptbits  );
-            ptbits += 3;
+            padding = sizeDWORD - lineBoundary;
+            bytesPerLine += padding;

         }
         }

-        ptbits += padding;
-    }

 
 

-    // similarly, set data according to the possible mask bitmap
-    if( GetMask() && GetMask()->GetMaskBitmap() )
-    {
-        hbitmap = (HBITMAP) GetMask()->GetMaskBitmap();
+        // create a DIB header
+        int headersize = sizeof(BITMAPINFOHEADER);
+        BITMAPINFO *lpDIBh = (BITMAPINFO *) malloc( headersize );
+        if( !lpDIBh )
+        {
+            wxFAIL_MSG( wxT("could not allocate data for DIB header") );
+            //free( data );
+            return wxNullImage;
+        }
+
+        // Fill in the DIB header
+        lpDIBh->bmiHeader.biSize = headersize;
+        lpDIBh->bmiHeader.biWidth = width;
+        lpDIBh->bmiHeader.biHeight = -height;
+        lpDIBh->bmiHeader.biSizeImage = bytesPerLine * height;
+        lpDIBh->bmiHeader.biPlanes = 1;
+        lpDIBh->bmiHeader.biBitCount = 24;
+        lpDIBh->bmiHeader.biCompression = BI_RGB;
+        lpDIBh->bmiHeader.biClrUsed = 0;
+        // These seem not really needed for our purpose here.
+        lpDIBh->bmiHeader.biClrImportant = 0;
+        lpDIBh->bmiHeader.biXPelsPerMeter = 0;
+        lpDIBh->bmiHeader.biYPelsPerMeter = 0;
+

         // memory DC created, color set, data copied, and memory DC deleted
         // memory DC created, color set, data copied, and memory DC deleted

+
+        // memory for DIB data
+        unsigned char *lpBits
+            = (unsigned char *) malloc( lpDIBh->bmiHeader.biSizeImage );
+        if( !lpBits )
+        {
+            wxFAIL_MSG( wxT("could not allocate data for DIB") );
+            free( lpDIBh );
+            return wxNullImage;
+        }
+
+
+        HDC hdc = ::GetDC(NULL);
+

         HDC memdc = ::CreateCompatibleDC( hdc );
         ::SetTextColor( memdc, RGB( 0, 0, 0 ) );
         ::SetBkColor( memdc, RGB( 255, 255, 255 ) );
         ::GetDIBits( memdc, hbitmap, 0, height, lpBits, lpDIBh, DIB_RGB_COLORS );
         ::DeleteDC( memdc );
         HDC memdc = ::CreateCompatibleDC( hdc );
         ::SetTextColor( memdc, RGB( 0, 0, 0 ) );
         ::SetBkColor( memdc, RGB( 255, 255, 255 ) );
         ::GetDIBits( memdc, hbitmap, 0, height, lpBits, lpDIBh, DIB_RGB_COLORS );
         ::DeleteDC( memdc );

-        // background color set to RGB(16,16,16) in consistent with wxGTK
-        unsigned char r=16, g=16, b=16;
-        ptdata = data;
-        ptbits = lpBits;
+        unsigned char *ptdata = image.GetData();//data;
+        unsigned char *ptbits = lpBits;
+        int i, j;

         for( i=0; i<height; i++ )
         {
             for( j=0; j<width; j++ )
             {
         for( i=0; i<height; i++ )
         {
             for( j=0; j<width; j++ )
             {

-                if( *ptbits != 0 )
+                // is this pixel transparent?
+                if ( *ptbits != 0 )
+                {
+                    if ( (ptdata[0] == MASK_RED) &&
+                            (ptdata[1] == MASK_GREEN) &&
+                                (ptdata[2] == MASK_BLUE) )
+                    {
+                        // we have to fudge the colour a bit to prevent this
+                        // pixel from appearing transparent
+                        ptdata[2] = MASK_BLUE_REPLACEMENT;
+                    }

                     ptdata += 3;
                     ptdata += 3;

-                else
+                }
+                else // masked pixel

                 {
                 {

-                    *(ptdata++)  = r;
-                    *(ptdata++)  = g;
-                    *(ptdata++)  = b;
+                    *(ptdata++)  = MASK_RED;
+                    *(ptdata++)  = MASK_GREEN;
+                    *(ptdata++)  = MASK_BLUE;

                 }
                 ptbits += 3;
             }
             ptbits += padding;
         }
                 }
                 ptbits += 3;
             }
             ptbits += padding;
         }

-        image.SetMaskColour( r, g, b );
-        image.SetMask( TRUE );
-    }
-    else
-    {
-        image.SetMask( FALSE );
+
+        image.SetMaskColour( MASK_RED, MASK_GREEN, MASK_BLUE );
+        image.SetMask( true );
+
+        // free allocated resources
+        ::ReleaseDC(NULL, hdc);
+        free(lpDIBh);
+        free(lpBits);

     }
     }

-    // free allocated resources
-    ::ReleaseDC(NULL, hdc);
-    free(lpDIBh);
-    free(lpBits);
+#endif // __WXWINCE__

 
     return image;
 }
 
 
     return image;
 }
 

+#endif // wxUSE_WXDIB
+

 #endif // wxUSE_IMAGE
 
 #endif // wxUSE_IMAGE
 

+// ----------------------------------------------------------------------------
+// loading and saving bitmaps
+// ----------------------------------------------------------------------------
+

 bool wxBitmap::LoadFile(const wxString& filename, long type)
 {
     UnRef();
 bool wxBitmap::LoadFile(const wxString& filename, long type)
 {
     UnRef();


@@ -737,12 +957,12 @@ bool wxBitmap::LoadFile(const wxString& filename, long type)
         return handler->LoadFile(this, filename, type, -1, -1);
     }
 #if wxUSE_IMAGE
         return handler->LoadFile(this, filename, type, -1, -1);
     }
 #if wxUSE_IMAGE

-    else
+    else // no bitmap handler found

     {
         wxImage image;
         if ( image.LoadFile( filename, type ) && image.Ok() )
         {
     {
         wxImage image;
         if ( image.LoadFile( filename, type ) && image.Ok() )
         {

-            *this = image.ConvertToBitmap();
+            *this = wxBitmap(image);

 
             return TRUE;
         }
 
             return TRUE;
         }


@@ -760,7 +980,7 @@ bool wxBitmap::Create(void *data, long type, int width, int height, int depth)
 
     if ( !handler )
     {
 
     if ( !handler )
     {

-        wxLogDebug(wxT("Failed to create bitmap: no bitmap handler for type %d defined."), type);
+        wxLogDebug(wxT("Failed to create bitmap: no bitmap handler for type %ld defined."), type);

 
         return FALSE;
     }
 
         return FALSE;
     }


@@ -770,7 +990,9 @@ bool wxBitmap::Create(void *data, long type, int width, int height, int depth)
     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)
+bool wxBitmap::SaveFile(const wxString& filename,
+                        int type,
+                        const wxPalette *palette)

 {
     wxBitmapHandler *handler = wxDynamicCast(FindHandler(type), wxBitmapHandler);
 
 {
     wxBitmapHandler *handler = wxDynamicCast(FindHandler(type), wxBitmapHandler);
 


@@ -779,10 +1001,10 @@ bool wxBitmap::SaveFile(const wxString& filename, int type, const wxPalette *pal
         return handler->SaveFile(this, filename, type, palette);
     }
 #if wxUSE_IMAGE
         return handler->SaveFile(this, filename, type, palette);
     }
 #if wxUSE_IMAGE

-    else
+    else // no bitmap handler found

     {
         // FIXME what about palette? shouldn't we use it?
     {
         // FIXME what about palette? shouldn't we use it?

-        wxImage image( *this );
+        wxImage image = ConvertToImage();

         if ( image.Ok() )
         {
             return image.SaveFile(filename, type);
         if ( image.Ok() )
         {
             return image.SaveFile(filename, type);


@@ -805,33 +1027,50 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
                  (rect.y+rect.height <= GetHeight()),
                  wxNullBitmap, wxT("Invalid bitmap or bitmap region") );
 
                  (rect.y+rect.height <= GetHeight()),
                  wxNullBitmap, wxT("Invalid bitmap or bitmap region") );
 

-    wxBitmap ret( rect.width, rect.height, GetDepth() );
+    wxBitmap ret( rect.width, rect.height );

     wxASSERT_MSG( ret.Ok(), wxT("GetSubBitmap error") );
 
     wxASSERT_MSG( ret.Ok(), wxT("GetSubBitmap error") );
 

+#ifndef __WXMICROWIN__
+    // TODO: copy alpha channel data if any
+

     // copy bitmap data
     // 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);
+    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
 
     // copy mask if there is one

-    if (GetMask())
+    if ( GetMask() )

     {
         HBITMAP hbmpMask = ::CreateBitmap(rect.width, rect.height, 1, 1, 0);
 
     {
         HBITMAP hbmpMask = ::CreateBitmap(rect.width, rect.height, 1, 1, 0);
 

-        SelectObject(dcSrc, (HBITMAP) GetMask()->GetMaskBitmap());
-        SelectObject(dcDst, (HBITMAP) hbmpMask);
-        BitBlt(dcDst, 0, 0, rect.width, rect.height, dcSrc, rect.x, rect.y, SRCCOPY);
+        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);
     }
 
         wxMask *mask = new wxMask((WXHBITMAP) hbmpMask);
         ret.SetMask(mask);
     }

-
-    SelectObject(dcDst, NULL);
-    SelectObject(dcSrc, NULL);
-    DeleteDC(dcDst);
-    DeleteDC(dcSrc);
+#endif // !__WXMICROWIN__

 
     return ret;
 }
 
     return ret;
 }


@@ -840,21 +1079,63 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
 // wxBitmap accessors
 // ----------------------------------------------------------------------------
 
 // wxBitmap accessors
 // ----------------------------------------------------------------------------
 

-void wxBitmap::SetQuality(int q)
+#if wxUSE_PALETTE
+wxPalette* wxBitmap::GetPalette() const

 {
 {

-    EnsureHasData();
+    return GetBitmapData() ? &GetBitmapData()->m_bitmapPalette
+                           : (wxPalette *) NULL;
+}
+#endif
+
+wxMask *wxBitmap::GetMask() const
+{
+    return GetBitmapData() ? GetBitmapData()->GetMask() : (wxMask *) NULL;
+}
+
+#ifdef __WXDEBUG__

 
 

-    GetBitmapData()->m_quality = q;
+wxDC *wxBitmap::GetSelectedInto() const
+{
+    return GetBitmapData() ? GetBitmapData()->m_selectedInto : (wxDC *) NULL;

 }
 
 }
 

-#if WXWIN_COMPATIBILITY_2
-void wxBitmap::SetOk(bool isOk)
+#endif
+
+#if WXWIN_COMPATIBILITY_2_4
+
+int wxBitmap::GetQuality() const

 {
 {

-    EnsureHasData();
+    return 0;
+}

 
 

-    GetBitmapData()->m_ok = isOk;
+#endif // WXWIN_COMPATIBILITY_2_4
+
+void wxBitmap::UseAlpha()
+{
+    if ( GetBitmapData() )
+        GetBitmapData()->m_hasAlpha = true;

 }
 }

-#endif // WXWIN_COMPATIBILITY_2
+
+bool wxBitmap::HasAlpha() const
+{
+    return GetBitmapData() && GetBitmapData()->m_hasAlpha;
+}
+
+// ----------------------------------------------------------------------------
+// wxBitmap setters
+// ----------------------------------------------------------------------------
+
+#ifdef __WXDEBUG__
+
+void wxBitmap::SetSelectedInto(wxDC *dc)
+{
+    if ( GetBitmapData() )
+        GetBitmapData()->m_selectedInto = dc;
+}
+
+#endif
+
+#if wxUSE_PALETTE

 
 void wxBitmap::SetPalette(const wxPalette& palette)
 {
 
 void wxBitmap::SetPalette(const wxPalette& palette)
 {


@@ -863,65 +1144,166 @@ void wxBitmap::SetPalette(const wxPalette& palette)
     GetBitmapData()->m_bitmapPalette = palette;
 }
 
     GetBitmapData()->m_bitmapPalette = palette;
 }
 

+#endif // wxUSE_PALETTE
+

 void wxBitmap::SetMask(wxMask *mask)
 {
     EnsureHasData();
 
 void wxBitmap::SetMask(wxMask *mask)
 {
     EnsureHasData();
 

-    GetBitmapData()->m_bitmapMask = mask;
+    GetBitmapData()->SetMask(mask);

 }
 
 }
 

-// 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
+#if WXWIN_COMPATIBILITY_2_4
+
+void wxBitmap::SetQuality(int WXUNUSED(quality))

 {
 {

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

 
 

-    if( GetPalette() && GetPalette()->Ok() )
+#endif // WXWIN_COMPATIBILITY_2_4
+
+// ----------------------------------------------------------------------------
+// raw bitmap access support
+// ----------------------------------------------------------------------------
+
+#ifdef wxHAVE_RAW_BITMAP
+void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp)
+{
+#if wxUSE_WXDIB
+    if ( !Ok() )

     {
     {

-        tmpBitmap.SetPalette(*GetPalette());
-        memDC.SelectObject(tmpBitmap);
-        memDC.SetPalette(*GetPalette());
-        hPal = (HPALETTE)GetPalette()->GetHPALETTE();
+        // no bitmap, no data (raw or otherwise)
+        return NULL;

     }
     }

-    else
+
+    // 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 )

     {
     {

-        hPal = (HPALETTE) ::GetStockObject(DEFAULT_PALETTE);
-        wxPalette palette;
-        palette.SetHPALETTE( (WXHPALETTE)hPal );
-        tmpBitmap.SetPalette( palette );
-        memDC.SelectObject(tmpBitmap);
-        memDC.SetPalette( palette );
+        wxCHECK_MSG( !GetBitmapData()->m_dib, FALSE,
+                        _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();

     }
 
     }
 

-    // set the height negative because in a DIB the order of the lines is
-    // reversed
-    if ( !wxCreateDIB(GetWidth(), -GetHeight(), GetDepth(), hPal, &lpDib) )
+    DIBSECTION ds;
+    if ( ::GetObject(hDIB, sizeof(ds), &ds) != sizeof(DIBSECTION) )

     {
     {

-        return wxNullBitmap;
+        wxFAIL_MSG( _T("failed to get DIBSECTION from a DIB?") );
+
+        return NULL;

     }
 
     }
 

-    lpBits = malloc(lpDib->bmiHeader.biSizeImage);
+    // check that the bitmap is in correct format
+    if ( ds.dsBm.bmBitsPixel != bpp )
+    {
+        wxFAIL_MSG( _T("incorrect bitmap type in wxBitmap::GetRawData()") );
+
+        return NULL;
+    }

 
 

-    ::GetBitmapBits(GetHbitmap(), lpDib->bmiHeader.biSizeImage, lpBits);
+    // ok, store the relevant info in wxPixelDataBase
+    const LONG h = ds.dsBm.bmHeight;

 
 

-    ::SetDIBitsToDevice(GetHdcOf(memDC), 0, 0,
-                        GetWidth(), GetHeight(),
-                        0, 0, 0, GetHeight(),
-                        lpBits, lpDib, DIB_RGB_COLORS);
+    data.m_width = ds.dsBm.bmWidth;
+    data.m_height = h;

 
 

-    free(lpBits);
+    // remember that DIBs are stored in top to bottom order!
+    const LONG bytesPerRow = ds.dsBm.bmWidthBytes;
+    data.m_stride = -bytesPerRow;

 
 

-    wxFreeDIB(lpDib);
+    char *bits = (char *)ds.dsBm.bmBits;
+    if ( h > 1 )
+    {
+        bits += (h - 1)*bytesPerRow;
+    }

 
 

-    return tmpBitmap;
+    return bits;
+#else
+    return NULL;
+#endif

 }
 
 }
 

+void wxBitmap::UngetRawData(wxPixelDataBase& dataBase)
+{
+#if wxUSE_WXDIB
+    if ( !Ok() )
+        return;
+
+    // the cast is ugly but we can't do without it and without making this
+    // function template (and hence inline) unfortunately
+    typedef wxPixelData<wxBitmap, wxAlphaPixelFormat> PixelData;
+    PixelData& data = (PixelData &)dataBase;
+
+    if ( !data )
+    {
+        // invalid data, don't crash -- but don't assert neither as we're
+        // called automatically from wxPixelDataBase dtor and so there is no
+        // way to prevent this from happening
+        return;
+    }
+
+    if ( GetBitmapData()->m_hasAlpha )
+    {
+        // AlphaBlend() wants to have premultiplied source alpha but
+        // wxRawBitmap API uses normal, not premultiplied, colours, so adjust
+        // them here now
+        PixelData::Iterator p(data);
+
+        const int w = data.GetWidth();
+        const int h = data.GetHeight();
+
+        for ( int y = 0; y < h; y++ )
+        {
+            PixelData::Iterator rowStart = p;
+
+            for ( int x = 0; x < w; x++ )
+            {
+                const unsigned alpha = p.Alpha();
+
+                p.Red() = (p.Red() * alpha + 127) / 255;
+                p.Blue() = (p.Blue() * alpha + 127) / 255;
+                p.Green() = (p.Green() * alpha + 127) / 255;
+
+                ++p;
+            }
+
+            p = rowStart;
+            p.OffsetY(data, 1);
+        }
+    }
+
+    // if we're a DDB we need to convert DIB back to DDB now to make the
+    // changes made via raw bitmap access effective
+    if ( !GetBitmapData()->m_isDIB )
+    {
+        wxDIB *dib = GetBitmapData()->m_dib;
+        GetBitmapData()->m_dib = NULL;
+
+        // TODO: convert
+
+        delete dib;
+    }
+#endif // wxUSE_WXDIB
+}
+#endif // #ifdef wxHAVE_RAW_BITMAP
+

 // ----------------------------------------------------------------------------
 // wxMask
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxMask
 // ----------------------------------------------------------------------------


@@ -963,6 +1345,7 @@ wxMask::~wxMask()
 // 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") );
 
     wxCHECK_MSG( bitmap.Ok() && bitmap.GetDepth() == 1, FALSE,
                  _T("can't create mask from invalid or not monochrome bitmap") );
 


@@ -987,6 +1370,9 @@ bool wxMask::Create(const wxBitmap& bitmap)
     SelectObject(destDC, 0);
     DeleteDC(destDC);
     return TRUE;
     SelectObject(destDC, 0);
     DeleteDC(destDC);
     return TRUE;

+#else
+    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


@@ -998,6 +1384,8 @@ bool wxMask::Create(const wxBitmap& bitmap, int paletteIndex)
         ::DeleteObject((HBITMAP) m_maskBitmap);
         m_maskBitmap = 0;
     }
         ::DeleteObject((HBITMAP) m_maskBitmap);
         m_maskBitmap = 0;
     }

+
+#if wxUSE_PALETTE

     if (bitmap.Ok() && bitmap.GetPalette()->Ok())
     {
         unsigned char red, green, blue;
     if (bitmap.Ok() && bitmap.GetPalette()->Ok())
     {
         unsigned char red, green, blue;


@@ -1007,6 +1395,8 @@ bool wxMask::Create(const wxBitmap& bitmap, int paletteIndex)
             return Create(bitmap, transparentColour);
         }
     }
             return Create(bitmap, transparentColour);
         }
     }

+#endif // wxUSE_PALETTE
+

     return FALSE;
 }
 
     return FALSE;
 }
 


@@ -1014,6 +1404,7 @@ bool wxMask::Create(const wxBitmap& bitmap, int paletteIndex)
 // the transparent area
 bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
 {
 // the transparent area
 bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
 {

+#ifndef __WXMICROWIN__

     wxCHECK_MSG( bitmap.Ok(), FALSE, _T("invalid bitmap in wxMask::Create") );
 
     if ( m_maskBitmap )
     wxCHECK_MSG( bitmap.Ok(), FALSE, _T("invalid bitmap in wxMask::Create") );
 
     if ( m_maskBitmap )


@@ -1027,7 +1418,7 @@ bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
 
     // scan the bitmap for the transparent colour and set the corresponding
     // pixels in the mask to BLACK and the rest to WHITE
 
     // 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);
+    COLORREF maskColour = wxColourToPalRGB(colour);

     m_maskBitmap = (WXHBITMAP)::CreateBitmap(width, height, 1, 1, 0);
 
     HDC srcDC = ::CreateCompatibleDC(NULL);
     m_maskBitmap = (WXHBITMAP)::CreateBitmap(width, height, 1, 1, 0);
 
     HDC srcDC = ::CreateCompatibleDC(NULL);


@@ -1039,6 +1430,10 @@ bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
 
     bool ok = TRUE;
 
 
     bool ok = TRUE;
 

+    // SelectObject() will fail
+    wxASSERT_MSG( !bitmap.GetSelectedInto(),
+                  _T("bitmap can't be selected in another DC") );
+

     HGDIOBJ hbmpSrcOld = ::SelectObject(srcDC, GetHbitmapOf(bitmap));
     if ( !hbmpSrcOld )
     {
     HGDIOBJ hbmpSrcOld = ::SelectObject(srcDC, GetHbitmapOf(bitmap));
     if ( !hbmpSrcOld )
     {


@@ -1055,32 +1450,13 @@ bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
         ok = FALSE;
     }
 
         ok = FALSE;
     }
 

-    // 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++ )
+    if ( ok )

     {
     {

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

     }
 
     ::SelectObject(srcDC, hbmpSrcOld);
     }
 
     ::SelectObject(srcDC, hbmpSrcOld);


@@ -1089,6 +1465,9 @@ bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
     ::DeleteDC(destDC);
 
     return ok;
     ::DeleteDC(destDC);
 
     return ok;

+#else // __WXMICROWIN__
+    return FALSE;
+#endif // __WXMICROWIN__/!__WXMICROWIN__

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -1155,18 +1534,16 @@ bool wxBitmapHandler::SaveFile(wxBitmap *WXUNUSED(bitmap),
 // DIB functions
 // ----------------------------------------------------------------------------
 
 // DIB functions
 // ----------------------------------------------------------------------------
 

+#ifndef __WXMICROWIN__

 bool wxCreateDIB(long xSize, long ySize, long bitsPerPixel,
                  HPALETTE hPal, LPBITMAPINFO* lpDIBHeader)
 {
    unsigned long   i, headerSize;
 bool wxCreateDIB(long xSize, long ySize, long bitsPerPixel,
                  HPALETTE hPal, LPBITMAPINFO* lpDIBHeader)
 {
    unsigned long   i, headerSize;

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

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


@@ -1202,13 +1579,87 @@ void wxFreeDIB(LPBITMAPINFO lpDIBHeader)
 {
     free(lpDIBHeader);
 }
 {
     free(lpDIBHeader);
 }

+#endif

 
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------

-// other helper functions
+// global helper functions implemented here

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-extern HBITMAP wxInvertMask(HBITMAP hbmpMask, int w, int h)
+// helper of wxBitmapToHICON/HCURSOR
+static
+HICON wxBitmapToIconOrCursor(const wxBitmap& bmp,
+                             bool iconWanted,
+                             int hotSpotX,
+                             int hotSpotY)

 {
 {

+    if ( !bmp.Ok() )
+    {
+        // we can't create an icon/cursor form nothing
+        return 0;
+    }
+
+    wxMask *mask = bmp.GetMask();
+    if ( !mask )
+    {
+        // we must have a mask for an icon, so even if it's probably incorrect,
+        // do create it (grey is the "standard" transparent colour)
+        mask = new wxMask(bmp, *wxLIGHT_GREY);
+    }
+
+    ICONINFO iconInfo;
+    wxZeroMemory(iconInfo);
+    iconInfo.fIcon = iconWanted;  // do we want an icon or a cursor?
+    if ( !iconWanted )
+    {
+        iconInfo.xHotspot = hotSpotX;
+        iconInfo.yHotspot = hotSpotY;
+    }
+
+    iconInfo.hbmMask = wxInvertMask((HBITMAP)mask->GetMaskBitmap());
+    iconInfo.hbmColor = GetHbitmapOf(bmp);
+
+    // black out the transparent area to preserve background colour, because
+    // Windows blits the original bitmap using SRCINVERT (XOR) after applying
+    // the mask to the dest rect.
+    {
+        MemoryHDC dcSrc, dcDst;
+        SelectInHDC selectMask(dcSrc, (HBITMAP)mask->GetMaskBitmap()),
+                    selectBitmap(dcDst, iconInfo.hbmColor);
+
+        if ( !::BitBlt(dcDst, 0, 0, bmp.GetWidth(), bmp.GetHeight(),
+                       dcSrc, 0, 0, SRCAND) )
+        {
+            wxLogLastError(_T("BitBlt"));
+        }
+    }
+
+    HICON hicon = ::CreateIconIndirect(&iconInfo);
+
+    if ( !bmp.GetMask() )
+    {
+        // we created the mask, now delete it
+        delete mask;
+    }
+
+    // delete the inverted mask bitmap we created as well
+    ::DeleteObject(iconInfo.hbmMask);
+
+    return hicon;
+}
+
+HICON wxBitmapToHICON(const wxBitmap& bmp)
+{
+    return wxBitmapToIconOrCursor(bmp, TRUE, 0, 0);
+}
+
+HCURSOR wxBitmapToHCURSOR(const wxBitmap& bmp, int hotSpotX, int hotSpotY)
+{
+    return (HCURSOR)wxBitmapToIconOrCursor(bmp, FALSE, hotSpotX, hotSpotY);
+}
+
+HBITMAP wxInvertMask(HBITMAP hbmpMask, int w, int h)
+{
+#ifndef __WXMICROWIN__

     wxCHECK_MSG( hbmpMask, 0, _T("invalid bitmap in wxInvertMask") );
 
     // get width/height from the bitmap if not given
     wxCHECK_MSG( hbmpMask, 0, _T("invalid bitmap in wxInvertMask") );
 
     // get width/height from the bitmap if not given


@@ -1233,8 +1684,8 @@ extern HBITMAP wxInvertMask(HBITMAP hbmpMask, int w, int h)
         wxLogLastError(wxT("CreateBitmap"));
     }
 
         wxLogLastError(wxT("CreateBitmap"));
     }
 

-    ::SelectObject(hdcSrc, hbmpMask);
-    ::SelectObject(hdcDst, hbmpInvMask);
+    HGDIOBJ srcTmp = ::SelectObject(hdcSrc, hbmpMask);
+    HGDIOBJ dstTmp = ::SelectObject(hdcDst, hbmpInvMask);

     if ( !::BitBlt(hdcDst, 0, 0, w, h,
                    hdcSrc, 0, 0,
                    NOTSRCCOPY) )
     if ( !::BitBlt(hdcDst, 0, 0, w, h,
                    hdcSrc, 0, 0,
                    NOTSRCCOPY) )


@@ -1242,8 +1693,15 @@ extern HBITMAP wxInvertMask(HBITMAP hbmpMask, int w, int h)
         wxLogLastError(wxT("BitBlt"));
     }
 
         wxLogLastError(wxT("BitBlt"));
     }
 

+    // Deselect objects
+    SelectObject(hdcSrc,srcTmp);
+    SelectObject(hdcDst,dstTmp);
+    

     ::DeleteDC(hdcSrc);
     ::DeleteDC(hdcDst);
 
     return hbmpInvMask;
     ::DeleteDC(hdcSrc);
     ::DeleteDC(hdcDst);
 
     return hbmpInvMask;

+#else
+    return 0;
+#endif

 }
 }