Several corrections to wxDocManager fields documentation.

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

diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp
index 650e66e27ec128888da510fa767cf2dfafaeab23..10756fee7ca3cbb1e2bd3bb850efac72e281a58e 100644 (file)
--- a/src/msw/bitmap.cpp
+++ b/src/msw/bitmap.cpp
@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////

-// Name:        bitmap.cpp
+// Name:        src/msw/bitmap.cpp

 // Purpose:     wxBitmap
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxBitmap
 // Author:      Julian Smart
 // Modified by:


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "bitmap.h"
-#endif
-

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


@@ -28,6 +24,8 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/bitmap.h"
+

 #ifndef WX_PRECOMP
     #include <stdio.h>
 
 #ifndef WX_PRECOMP
     #include <stdio.h>
 


@@ -36,22 +34,20 @@
     #include "wx/app.h"
     #include "wx/palette.h"
     #include "wx/dcmemory.h"
     #include "wx/app.h"
     #include "wx/palette.h"
     #include "wx/dcmemory.h"

-    #include "wx/bitmap.h"

     #include "wx/icon.h"
     #include "wx/icon.h"

+    #include "wx/log.h"
+    #include "wx/image.h"

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

-#include "wx/log.h"
+#include "wx/msw/dc.h"

 
 #if wxUSE_WXDIB
 
 #if wxUSE_WXDIB

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

 #endif
 
 #endif
 

-#include "wx/image.h"
-#include "wx/xpmdecod.h"
-
-#ifdef wxHAVE_RAW_BITMAP
-#include "wx/rawbmp.h"
+#ifdef wxHAS_RAW_BITMAP
+    #include "wx/rawbmp.h"

 #endif
 
 // missing from mingw32 header
 #endif
 
 // missing from mingw32 header


@@ -60,13 +56,14 @@
 #endif // no CLR_INVALID
 
 // ----------------------------------------------------------------------------
 #endif // no CLR_INVALID
 
 // ----------------------------------------------------------------------------

-// Bitmap data
+// wxBitmapRefData

 // ----------------------------------------------------------------------------
 
 class WXDLLEXPORT wxBitmapRefData : public wxGDIImageRefData
 {
 public:
     wxBitmapRefData();
 // ----------------------------------------------------------------------------
 
 class WXDLLEXPORT wxBitmapRefData : public wxGDIImageRefData
 {
 public:
     wxBitmapRefData();

+    wxBitmapRefData(const wxBitmapRefData& data);

     virtual ~wxBitmapRefData() { Free(); }
 
     virtual void Free();
     virtual ~wxBitmapRefData() { Free(); }
 
     virtual void Free();


@@ -95,12 +92,12 @@ public:
     // MSW-specific
     // ------------
 
     // MSW-specific
     // ------------
 

-#ifdef __WXDEBUG__
+#if wxDEBUG_LEVEL

     // 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;
     // 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__
+#endif // wxDEBUG_LEVEL

 
 #if wxUSE_WXDIB
     // when GetRawData() is called for a DDB we need to convert it to a DIB
 
 #if wxUSE_WXDIB
     // when GetRawData() is called for a DDB we need to convert it to a DIB


@@ -120,7 +117,9 @@ private:
     // optional mask for transparent drawing
     wxMask       *m_bitmapMask;
 
     // optional mask for transparent drawing
     wxMask       *m_bitmapMask;
 

-    DECLARE_NO_COPY_CLASS(wxBitmapRefData)
+
+    // not implemented
+    wxBitmapRefData& operator=(const wxBitmapRefData&);

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -141,32 +140,44 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, wxObject)
 // ----------------------------------------------------------------------------
 
 // decide whether we should create a DIB or a DDB for the given parameters
 // ----------------------------------------------------------------------------
 
 // decide whether we should create a DIB or a DDB for the given parameters

-static bool wxShouldCreateDIB(int w, int h, int d, WXHDC hdc)
-{
-#if wxUSE_WXDIB
-    // 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));
-#else
-    return FALSE;
-#endif
-}
+//
+// 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


@@ -174,7 +185,7 @@ static bool wxShouldCreateDIB(int w, int h, int d, WXHDC hdc)
 
 wxBitmapRefData::wxBitmapRefData()
 {
 
 wxBitmapRefData::wxBitmapRefData()
 {

-#ifdef __WXDEBUG__
+#if wxDEBUG_LEVEL

     m_selectedInto = NULL;
 #endif
     m_bitmapMask = NULL;
     m_selectedInto = NULL;
 #endif
     m_bitmapMask = NULL;


@@ -185,7 +196,29 @@ wxBitmapRefData::wxBitmapRefData()
 #endif
 
     m_isDIB =
 #endif
 
     m_isDIB =

-    m_hasAlpha = FALSE;
+    m_hasAlpha = false;
+}
+
+wxBitmapRefData::wxBitmapRefData(const wxBitmapRefData& data)
+               : wxGDIImageRefData(data)
+{
+#if wxDEBUG_LEVEL
+    m_selectedInto = NULL;
+#endif
+
+    // (deep) copy the mask if present
+    m_bitmapMask = NULL;
+    if (data.m_bitmapMask)
+        m_bitmapMask = new wxMask(*data.m_bitmapMask);
+
+    // FIXME: we don't copy m_hBitmap currently but we should, see wxBitmap::
+    //        CloneGDIRefData()
+
+    wxASSERT_MSG( !data.m_isDIB,
+                    wxT("can't copy bitmap locked for raw access!") );
+    m_isDIB = false;
+
+    m_hasAlpha = data.m_hasAlpha;

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


@@ -194,7 +227,7 @@ void wxBitmapRefData::Free()
                   wxT("deleting bitmap still selected into wxMemoryDC") );
 
 #if wxUSE_WXDIB
                   wxT("deleting bitmap still selected into wxMemoryDC") );
 
 #if wxUSE_WXDIB

-    wxASSERT_MSG( !m_dib, _T("forgot to call wxBitmap::UngetRawData()!") );
+    wxASSERT_MSG( !m_dib, wxT("forgot to call wxBitmap::UngetRawData()!") );

 #endif
 
     if ( m_hBitmap)
 #endif
 
     if ( m_hBitmap)


@@ -205,28 +238,62 @@ void wxBitmapRefData::Free()
         }
     }
 
         }
     }
 

-    delete m_bitmapMask;
-    m_bitmapMask = NULL;
+    wxDELETE(m_bitmapMask);

 }
 
 // ----------------------------------------------------------------------------
 // wxBitmap creation
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // wxBitmap creation
 // ----------------------------------------------------------------------------
 

-// this function should be called from all wxBitmap ctors
-void wxBitmap::Init()
-{
-    // m_refData = NULL; done in the base class ctor
-}
-

 wxGDIImageRefData *wxBitmap::CreateData() const
 {
     return new wxBitmapRefData;
 }
 
 wxGDIImageRefData *wxBitmap::CreateData() const
 {
     return new wxBitmapRefData;
 }
 

-#ifdef __WIN32__
+wxGDIRefData *wxBitmap::CloneGDIRefData(const wxGDIRefData *dataOrig) const
+{
+    const wxBitmapRefData *
+        data = static_cast<const wxBitmapRefData *>(dataOrig);
+    if ( !data )
+        return NULL;
+
+    // FIXME: this method is backwards, it should just create a new
+    //        wxBitmapRefData using its copy ctor but instead it modifies this
+    //        bitmap itself and then returns its m_refData -- which works, of
+    //        course (except in !wxUSE_WXDIB), but is completely illogical
+    wxBitmap *self = const_cast<wxBitmap *>(this);
+
+    wxBitmapRefData *selfdata;
+#if wxUSE_WXDIB
+    // copy the other bitmap
+    if ( data->m_hBitmap )
+    {
+        wxDIB dib((HBITMAP)(data->m_hBitmap));
+        self->CopyFromDIB(dib);
+
+        selfdata = static_cast<wxBitmapRefData *>(m_refData);
+        selfdata->m_hasAlpha = data->m_hasAlpha;
+    }
+    else
+#endif // wxUSE_WXDIB
+    {
+        // copy the bitmap data
+        selfdata = new wxBitmapRefData(*data);
+        self->m_refData = selfdata;
+    }
+
+    // copy also the mask
+    wxMask * const maskSrc = data->GetMask();
+    if ( maskSrc )
+    {
+        selfdata->SetMask(new wxMask(*maskSrc));
+    }
+
+    return selfdata;
+}

 
 

-bool wxBitmap::CopyFromIconOrCursor(const wxGDIImage& icon)
+bool wxBitmap::CopyFromIconOrCursor(const wxGDIImage& icon,
+                                    wxBitmapTransparency transp)

 {
 #if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
     // it may be either HICON or HCURSOR
 {
 #if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
     // it may be either HICON or HCURSOR


@@ -237,7 +304,7 @@ bool wxBitmap::CopyFromIconOrCursor(const wxGDIImage& icon)
     {
         wxLogLastError(wxT("GetIconInfo"));
 
     {
         wxLogLastError(wxT("GetIconInfo"));
 

-        return FALSE;
+        return false;

     }
 
     wxBitmapRefData *refData = new wxBitmapRefData;
     }
 
     wxBitmapRefData *refData = new wxBitmapRefData;


@@ -252,94 +319,103 @@ bool wxBitmap::CopyFromIconOrCursor(const wxGDIImage& icon)
 
     refData->m_hBitmap = (WXHBITMAP)iconInfo.hbmColor;
 
 
     refData->m_hBitmap = (WXHBITMAP)iconInfo.hbmColor;
 

-    // the mask returned by GetIconInfo() is inversed compared to the usual
-    // wxWin convention
-    refData->SetMask(wxInvertMask(iconInfo.hbmMask, w, h));
+    switch ( transp )
+    {
+        default:
+            wxFAIL_MSG( wxT("unknown wxBitmapTransparency value") );
+
+        case wxBitmapTransparency_None:
+            // nothing to do, refData->m_hasAlpha is false by default
+            break;
+
+        case wxBitmapTransparency_Auto:
+#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(bm), &bm) &&
+                        (bm.bmBitsPixel == 32) )
+                {
+                    wxDIB dib(iconInfo.hbmColor);
+                    if (dib.IsOk())
+                    {
+                        const 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 stop checking
+                                refData->m_hasAlpha = true;
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+            break;
+#endif // wxUSE_WXDIB
+
+        case wxBitmapTransparency_Always:
+            refData->m_hasAlpha = true;
+            break;
+    }

 
 

+    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);
 
 
     // delete the old one now as we don't need it any more
     ::DeleteObject(iconInfo.hbmMask);
 

-#if WXWIN_COMPATIBILITY_2
-    refData->m_ok = TRUE;
-#endif // WXWIN_COMPATIBILITY_2
+    return true;
+#else // __WXMICROWIN__ || __WXWINCE__
+    wxUnusedVar(icon);
+    wxUnusedVar(transp);

 
 

-    return TRUE;
-#else
-    return FALSE;
-#endif
+    return false;
+#endif // !__WXWINCE__/__WXWINCE__

 }
 
 }
 

-#endif // Win32
-
-bool wxBitmap::CopyFromCursor(const wxCursor& cursor)
+bool wxBitmap::CopyFromCursor(const wxCursor& cursor, wxBitmapTransparency transp)

 {
     UnRef();
 
 {
     UnRef();
 

-    if ( !cursor.Ok() )
-        return FALSE;
+    if ( !cursor.IsOk() )
+        return false;

 
 

-#ifdef __WIN16__
-    wxFAIL_MSG( _T("don't know how to convert cursor to bitmap") );
-
-    return FALSE;
-#else
-    return CopyFromIconOrCursor(cursor);
-#endif // Win16
+    return CopyFromIconOrCursor(cursor, transp);

 }
 
 }
 

-bool wxBitmap::CopyFromIcon(const wxIcon& icon)
+bool wxBitmap::CopyFromIcon(const wxIcon& icon, wxBitmapTransparency transp)

 {
     UnRef();
 
 {
     UnRef();
 

-    if ( !icon.Ok() )
-        return FALSE;
+    if ( !icon.IsOk() )
+        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();
-
-    // copy the icon to the bitmap
-    ScreenHDC hdcScreen;
-    HDC hdc = ::CreateCompatibleDC(hdcScreen);
-    HBITMAP hbitmap = ::CreateCompatibleBitmap(hdcScreen, width, height);
-    HBITMAP hbmpOld = (HBITMAP)::SelectObject(hdc, hbitmap);
-
-    ::DrawIcon(hdc, 0, 0, GetHiconOf(icon));
-
-    ::SelectObject(hdc, hbmpOld);
-    ::DeleteDC(hdc);
-
-    wxBitmapRefData *refData = new wxBitmapRefData;
-    m_refData = refData;
-
-    refData->m_width = width;
-    refData->m_height = height;
-    refData->m_depth = wxDisplayDepth();
-
-    refData->m_hBitmap = (WXHBITMAP)hbitmap;
-
-#if WXWIN_COMPATIBILITY_2
-    refData->m_ok = TRUE;
-#endif // WXWIN_COMPATIBILITY_2
-
-    return TRUE;
-#else // Win32
-    return CopyFromIconOrCursor(icon);
-#endif // Win16/Win32
+    return CopyFromIconOrCursor(icon, transp);

 }
 
 }
 

-#if wxUSE_WXDIB
+#ifndef NEVER_USE_DIB
+

 bool wxBitmap::CopyFromDIB(const wxDIB& dib)
 {
 bool wxBitmap::CopyFromDIB(const wxDIB& dib)
 {

-    wxCHECK_MSG( dib.IsOk(), FALSE, _T("invalid DIB in CopyFromDIB") );
+    wxCHECK_MSG( dib.IsOk(), false, wxT("invalid DIB in CopyFromDIB") );

 
 

+#ifdef SOMETIMES_USE_DIB

     HBITMAP hbitmap = dib.CreateDDB();
     if ( !hbitmap )
     HBITMAP hbitmap = dib.CreateDDB();
     if ( !hbitmap )

-        return FALSE;
+        return false;
+#else // ALWAYS_USE_DIB
+    HBITMAP hbitmap = const_cast<wxDIB &>(dib).Detach();
+#endif // SOMETIMES_USE_DIB/ALWAYS_USE_DIB

 
     UnRef();
 
 
     UnRef();
 


@@ -362,9 +438,10 @@ bool wxBitmap::CopyFromDIB(const wxDIB& dib)
     delete palette;
 #endif // wxUSE_PALETTE
 
     delete palette;
 #endif // wxUSE_PALETTE
 

-    return TRUE;
+    return true;

 }
 }

-#endif
+
+#endif // NEVER_USE_DIB

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


@@ -372,8 +449,6 @@ wxBitmap::~wxBitmap()
 
 wxBitmap::wxBitmap(const char bits[], int width, int height, int depth)
 {
 
 wxBitmap::wxBitmap(const char bits[], int width, int height, int depth)
 {

-    Init();
-

 #ifndef __WXMICROWIN__
     wxBitmapRefData *refData = new wxBitmapRefData;
     m_refData = refData;
 #ifndef __WXMICROWIN__
     wxBitmapRefData *refData = new wxBitmapRefData;
     m_refData = refData;


@@ -387,7 +462,7 @@ 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
     {
         // 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!
+        // line is reversed!

         const size_t bytesPerLine = (width + 7) / 8;
         const size_t padding = bytesPerLine % 2;
         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 );


@@ -405,10 +480,10 @@ wxBitmap::wxBitmap(const char bits[], int width, int height, int depth)
                 for ( int bits = 0; bits < 8; bits++)
                 {
                     reversed <<= 1;
                 for ( int bits = 0; bits < 8; bits++)
                 {
                     reversed <<= 1;

-                    reversed |= (val & 0x01);
+                    reversed |= (unsigned char)(val & 0x01);

                     val >>= 1;
                 }
                     val >>= 1;
                 }

-                *dst++ = reversed;
+                *dst++ = ~reversed;

             }
 
             if ( padding )
             }
 
             if ( padding )


@@ -418,7 +493,7 @@ wxBitmap::wxBitmap(const char bits[], int width, int height, int depth)
     else
     {
         // bits should already be in Windows standard format
     else
     {
         // bits should already be in Windows standard format

-        data = (char *)bits;    // const_cast is harmless
+        data = const_cast<char *>(bits);

     }
 
     HBITMAP hbmp = ::CreateBitmap(width, height, 1, depth, data);
     }
 
     HBITMAP hbmp = ::CreateBitmap(width, height, 1, depth, data);


@@ -436,51 +511,19 @@ wxBitmap::wxBitmap(const char bits[], int width, int height, int depth)
 #endif
 }
 
 #endif
 }
 

-// Create from XPM data
-bool wxBitmap::CreateFromXpm(const char **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") )
-
-    *this = wxBitmap(img);
-    return TRUE;
-#else
-    return FALSE;
-#endif
-}
-
-wxBitmap::wxBitmap(int w, int h, int d)
-{
-    Init();
-
-    (void)Create(w, h, d);
-}
-

 wxBitmap::wxBitmap(int w, int h, const wxDC& dc)
 {
 wxBitmap::wxBitmap(int w, int h, const wxDC& dc)
 {

-    Init();
-

     (void)Create(w, h, dc);
 }
 
     (void)Create(w, h, dc);
 }
 

-wxBitmap::wxBitmap(void *data, long type, int width, int height, int depth)
+wxBitmap::wxBitmap(const void* data, wxBitmapType type, int width, int height, int depth)

 {
 {

-    Init();
-

     (void)Create(data, type, width, height, depth);
 }
 
 wxBitmap::wxBitmap(const wxString& filename, wxBitmapType type)
 {
     (void)Create(data, type, width, height, depth);
 }
 
 wxBitmap::wxBitmap(const wxString& filename, wxBitmapType type)
 {

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

 }
 
 bool wxBitmap::Create(int width, int height, int depth)
 }
 
 bool wxBitmap::Create(int width, int height, int depth)


@@ -490,9 +533,14 @@ bool wxBitmap::Create(int width, int height, int depth)
 
 bool wxBitmap::Create(int width, int height, const wxDC& dc)
 {
 
 bool wxBitmap::Create(int width, int height, const wxDC& dc)
 {

-    wxCHECK_MSG( dc.Ok(), FALSE, _T("invalid HDC in wxBitmap::Create()") );
+    wxCHECK_MSG( dc.IsOk(), false, wxT("invalid HDC in wxBitmap::Create()") );
+
+    const wxMSWDCImpl *impl = wxDynamicCast( dc.GetImpl(), wxMSWDCImpl );

 
 

-    return DoCreate(width, height, -1, dc.GetHDC());
+    if (impl)
+        return DoCreate(width, height, -1, impl->GetHDC());
+    else
+        return false;

 }
 
 bool wxBitmap::DoCreate(int w, int h, int d, WXHDC hdc)
 }
 
 bool wxBitmap::DoCreate(int w, int h, int d, WXHDC hdc)


@@ -504,8 +552,9 @@ bool wxBitmap::DoCreate(int w, int h, int d, WXHDC hdc)
     GetBitmapData()->m_width = w;
     GetBitmapData()->m_height = h;
 
     GetBitmapData()->m_width = w;
     GetBitmapData()->m_height = h;
 

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

 
 

+#ifndef NEVER_USE_DIB

     if ( wxShouldCreateDIB(w, h, d, hdc) )
     {
         if ( d == -1 )
     if ( wxShouldCreateDIB(w, h, d, hdc) )
     {
         if ( d == -1 )


@@ -516,21 +565,18 @@ bool wxBitmap::DoCreate(int w, int h, int d, WXHDC hdc)
 
         wxDIB dib(w, h, d);
         if ( !dib.IsOk() )
 
         wxDIB dib(w, h, d);
         if ( !dib.IsOk() )

-           return FALSE;
+           return false;

 
         // don't delete the DIB section in dib object dtor
         hbmp = dib.Detach();
 
 
         // don't delete the DIB section in dib object dtor
         hbmp = dib.Detach();
 

-        GetBitmapData()->m_isDIB = TRUE;
+        GetBitmapData()->m_isDIB = true;

         GetBitmapData()->m_depth = d;
     }
     else // create a DDB
         GetBitmapData()->m_depth = d;
     }
     else // create a DDB

+#endif // NEVER_USE_DIB

     {
     {

-        if ( d == -1 )
-            d = wxDisplayDepth();
-
-        GetBitmapData()->m_depth = d;
-
+#ifndef ALWAYS_USE_DIB

 #ifndef __WXMICROWIN__
         if ( d > 0 )
         {
 #ifndef __WXMICROWIN__
         if ( d > 0 )
         {


@@ -539,8 +585,10 @@ bool wxBitmap::DoCreate(int w, int h, int d, WXHDC hdc)
             {
                 wxLogLastError(wxT("CreateBitmap"));
             }
             {
                 wxLogLastError(wxT("CreateBitmap"));
             }

+
+            GetBitmapData()->m_depth = d;

         }
         }

-        else
+        else // d == 0, create bitmap compatible with the screen

 #endif // !__WXMICROWIN__
         {
             ScreenHDC dc;
 #endif // !__WXMICROWIN__
         {
             ScreenHDC dc;


@@ -552,15 +600,12 @@ bool wxBitmap::DoCreate(int w, int h, int d, WXHDC hdc)
 
             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 IsOk();

 }
 
 #if wxUSE_IMAGE
 }
 
 #if wxUSE_IMAGE


@@ -600,7 +645,7 @@ bool wxBitmap::CreateFromImage(const wxImage& image, int depth, const wxDC& dc)
     if (hBitmap == NULL)
     {
         ::ReleaseDC(NULL, hScreenDC);
     if (hBitmap == NULL)
     {
         ::ReleaseDC(NULL, hScreenDC);

-        return FALSE;
+        return false;

     }
     HDC hMemDC = ::CreateCompatibleDC(hScreenDC);
 
     }
     HDC hMemDC = ::CreateCompatibleDC(hScreenDC);
 


@@ -626,7 +671,7 @@ bool wxBitmap::CreateFromImage(const wxImage& image, int depth, const wxDC& dc)
 
         if (!hMaskBitmap)
         {
 
         if (!hMaskBitmap)
         {

-            hasMask = FALSE;
+            hasMask = false;

         }
         else
         {
         }
         else
         {


@@ -637,7 +682,7 @@ bool wxBitmap::CreateFromImage(const wxImage& image, int depth, const wxDC& dc)
             hOldMaskBitmap = ::SelectObject( hMaskDC, hMaskBitmap);
         }
 #else
             hOldMaskBitmap = ::SelectObject( hMaskDC, hMaskBitmap);
         }
 #else

-        hasMask = FALSE;
+        hasMask = false;

 #endif
     }
 
 #endif
     }
 


@@ -684,12 +729,7 @@ bool wxBitmap::CreateFromImage(const wxImage& image, int depth, const wxDC& dc)
     SetPalette(image.GetPalette());
 #endif // wxUSE_PALETTE
 
     SetPalette(image.GetPalette());
 #endif // wxUSE_PALETTE
 

-#if WXWIN_COMPATIBILITY_2
-    // check the wxBitmap object
-    GetBitmapData()->SetOk();
-#endif // WXWIN_COMPATIBILITY_2
-
-    return TRUE;
+    return true;

 }
 
 wxImage wxBitmap::ConvertToImage() const
 }
 
 wxImage wxBitmap::ConvertToImage() const


@@ -699,7 +739,7 @@ wxImage wxBitmap::ConvertToImage() const
     // so the 'depth' argument is ignored.
     // TODO: transparency (create a mask image)
 
     // so the 'depth' argument is ignored.
     // TODO: transparency (create a mask image)
 

-    if (!Ok())
+    if (!IsOk())

     {
         wxFAIL_MSG( wxT("bitmap is invalid") );
         return wxNullImage;
     {
         wxFAIL_MSG( wxT("bitmap is invalid") );
         return wxNullImage;


@@ -707,7 +747,7 @@ wxImage wxBitmap::ConvertToImage() const
 
     wxImage image;
 
 
     wxImage image;
 

-    wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") );
+    wxCHECK_MSG( IsOk(), wxNullImage, wxT("invalid bitmap") );

 
     // create an wxImage object
     int width = GetWidth();
 
     // create an wxImage object
     int width = GetWidth();


@@ -768,15 +808,22 @@ bool wxBitmap::CreateFromImage(const wxImage& image, int depth)
 
 bool wxBitmap::CreateFromImage(const wxImage& image, const wxDC& dc)
 {
 
 bool wxBitmap::CreateFromImage(const wxImage& image, const wxDC& dc)
 {

-    wxCHECK_MSG( dc.Ok(), FALSE,
-                    _T("invalid HDC in wxBitmap::CreateFromImage()") );
+    wxCHECK_MSG( dc.IsOk(), false,
+                    wxT("invalid HDC in wxBitmap::CreateFromImage()") );
+
+    const wxMSWDCImpl *impl = wxDynamicCast( dc.GetImpl(), wxMSWDCImpl );

 
 

-    return CreateFromImage(image, -1, dc.GetHDC());
+    if (impl)
+        return CreateFromImage(image, -1, impl->GetHDC());
+    else
+        return false;

 }
 
 }
 

-bool wxBitmap::CreateFromImage(const wxImage& image, int depth, WXHDC hdc )
+#if wxUSE_WXDIB
+
+bool wxBitmap::CreateFromImage(const wxImage& image, int depth, WXHDC hdc)

 {
 {

-    wxCHECK_MSG( image.Ok(), FALSE, wxT("invalid image") );
+    wxCHECK_MSG( image.IsOk(), false, wxT("invalid image") );

 
     UnRef();
 
 
     UnRef();
 


@@ -786,402 +833,197 @@ bool wxBitmap::CreateFromImage(const wxImage& image, int depth, WXHDC hdc )
 
     wxDIB dib(image);
     if ( !dib.IsOk() )
 
     wxDIB dib(image);
     if ( !dib.IsOk() )

-        return FALSE;
+        return false;
+
+    const bool hasAlpha = image.HasAlpha();

 
 

+    if (depth == -1)
+      depth = dib.GetDepth();

 
     // store the bitmap parameters
 
     // store the bitmap parameters

-    wxBitmapRefData *refData = new wxBitmapRefData;
+    wxBitmapRefData * const refData = new wxBitmapRefData;

     refData->m_width = w;
     refData->m_height = h;
     refData->m_width = w;
     refData->m_height = h;

-    refData->m_hasAlpha = image.HasAlpha();
+    refData->m_hasAlpha = hasAlpha;
+    refData->m_depth = depth;

 
     m_refData = refData;
 
 
     // next either store DIB as is or create a DDB from it
 
     m_refData = refData;
 
 
     // next either store DIB as is or create a DDB from it

-    HBITMAP hbitmap;
+    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
 
     // 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) )
+    if ( hasAlpha || wxShouldCreateDIB(w, h, depth, hdc) )

     {
         // don't delete the DIB section in dib object dtor
         hbitmap = dib.Detach();
 
     {
         // don't delete the DIB section in dib object dtor
         hbitmap = dib.Detach();
 

-        refData->m_isDIB = TRUE;
-        refData->m_depth = dib.GetDepth();
+        refData->m_isDIB = true;

     }
     }

+#ifndef ALWAYS_USE_DIB

     else // we need to convert DIB to DDB
     {
         hbitmap = dib.CreateDDB((HDC)hdc);
     else // we need to convert DIB to DDB
     {
         hbitmap = dib.CreateDDB((HDC)hdc);

-
-        refData->m_depth = depth == -1 ? wxDisplayDepth() : depth;

     }
     }

+#endif // !ALWAYS_USE_DIB

 
     // validate this object
     SetHBITMAP((WXHBITMAP)hbitmap);
 
 
     // validate this object
     SetHBITMAP((WXHBITMAP)hbitmap);
 

-#if WXWIN_COMPATIBILITY_2
-    m_refData->m_ok = TRUE;
-#endif // WXWIN_COMPATIBILITY_2
-

     // finally also set the mask if we have one
     if ( image.HasMask() )
     {
     // 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
-{
-    // FIXME: this is untested code for WinCE, and
-    // the mask is not yet handled.
-    // For tips, see:
-    // http://www.codeproject.com/bitmap/dibsection.asp?print=true
-
-#ifdef __WXWINCE__
-    // the colour used as transparent one in wxImage and the one it is replaced
-    // with when it really occurs in the bitmap
-    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;
-
-    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;
-    }
-
-    // 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 )
-    {
-        padding = sizeDWORD - lineBoundary;
-        bytePerLine += padding;
-    }
-
-    // create a DIB header
-    int headersize = sizeof(BITMAPINFOHEADER);
-    BITMAPINFO *lpDIBh = (BITMAPINFO *) malloc( headersize );
-    if( !lpDIBh )
-    {
-        wxFAIL_MSG( wxT("could not allocate data for DIB header") );
-        free( data );
-        return wxNullImage;
-    }
-    // Fill in the DIB header
-    lpDIBh->bmiHeader.biSize = headersize;
-    lpDIBh->bmiHeader.biWidth = width;
-    lpDIBh->bmiHeader.biHeight = -height;
-    lpDIBh->bmiHeader.biSizeImage = 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 is allocated by CreateDIBSection
-    void *lpBits = NULL;
-
-    // copy data from the device-dependent bitmap to the DIB
-    HDC hdc = ::GetDC(NULL);
-    HBITMAP hBitmap = (HBITMAP) GetHBITMAP();
-
-    HBITMAP hBitmapSection = ::CreateDIBSection( hdc, lpDIBh, DIB_RGB_COLORS, & lpBits, NULL, 0 );
-    if (!hBitmapSection)
-    {
-        wxFAIL_MSG( wxT("could not create a DIB section") );
-        return wxNullImage;
-    }
-
-    // Copy the image from the DDB to the DIBSection
-    // Need to copy the supplied bitmap onto the newly created DIBsection
-    HDC hMemDC = CreateCompatibleDC(hdc);
-       HDC hCopyDC = CreateCompatibleDC(hdc);
-       
-    if (! hMemDC || ! hCopyDC) 
-    {
-        wxFAIL_MSG( wxT("unable to create compatible DCs") );
-        return wxNullImage;
-    }
-
-#if 0
-    if (m_hPal)
-    {
-        SelectPalette(hMemDC, m_hPal, FALSE);   RealizePalette(hMemDC);
-        SelectPalette(hCopyDC, m_hPal, FALSE);  RealizePalette(hCopyDC);
-    }
-#endif
-
-    HBITMAP hOldMemBitmap  = (HBITMAP) SelectObject(hMemDC,  hBitmap);
-    HBITMAP hOldCopyBitmap = (HBITMAP) SelectObject(hCopyDC, hBitmapSection);
-
-    BitBlt(hCopyDC, 0, 0, GetWidth(), GetHeight(), hMemDC, 0, 0, SRCCOPY);
-
-    SelectObject(hMemDC,  hOldMemBitmap);
-    SelectObject(hCopyDC, hOldCopyBitmap);
-    DeleteDC(hMemDC);
-    DeleteDC(hCopyDC);
-
-#if 0
-    if (m_hPal)
-    {
-               HGDIOBJ hObj = ::GetStockObject(DEFAULT_PALETTE);
-        SelectObject(hMemDC, hObj);
-        SelectObject(hCopyDC, hObj);
-    }
-#endif
-
-       ReleaseDC(NULL, hdc);
-
-    // copy DIB data into the wxImage object
-    int i, j;
-    unsigned char *ptdata = data;
-    unsigned char *ptbits = (unsigned char*) lpBits;
-    for( i=0; i<height; i++ )
-    {
-        for( j=0; j<width; j++ )
+        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 )

         {
         {

-            *(ptdata++) = *(ptbits+2);
-            *(ptdata++) = *(ptbits+1);
-            *(ptdata++) = *(ptbits  );
-            ptbits += 3;
-        }
-        ptbits += padding;
-    }
-
-    // TODO
-#if 0
-    // similarly, set data according to the possible mask bitmap
-    if( GetMask() && GetMask()->GetMaskBitmap() )
-    {
-        hbitmap = (HBITMAP) GetMask()->GetMaskBitmap();
-        // memory DC created, color set, data copied, and memory DC deleted
-        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 );
-        ptdata = data;
-        ptbits = lpBits;
-        for( i=0; i<height; i++ )
-        {
-            for( j=0; j<width; j++ )
+            BYTE *dstLine = dst;
+            BYTE mask = 0x80;
+            for ( int x = 0; x < w; x++, src += 3 )

             {
             {

-                // is this pixel transparent?
-                if ( *ptbits != 0 )
-                {
-                    if ( (ptdata[0] == MASK_RED) &&
-                            (ptdata[1] == MASK_GREEN) &&
-                                (ptdata[2] == MASK_BLUE) )
-                    {
-                        // we have to fudge the colour a bit to prevent this
-                        // pixel from appearing transparent
-                        ptdata[2] = MASK_BLUE_REPLACEMENT;
-                    }
-                    ptdata += 3;
-                }
-                else // masked pixel
+                if (src[0] != r || src[1] != g || src[2] != b)
+                    *dstLine |= mask;
+
+                if ( (mask >>= 1) == 0 )

                 {
                 {

-                    *(ptdata++)  = MASK_RED;
-                    *(ptdata++)  = MASK_GREEN;
-                    *(ptdata++)  = MASK_BLUE;
+                    dstLine++;
+                    mask = 0x80;

                 }
                 }

-                ptbits += 3;

             }
             }

-            ptbits += padding;

         }
 
         }
 

-        image.SetMaskColour( MASK_RED, MASK_GREEN, MASK_BLUE );
-        image.SetMask( TRUE );
-    }
-    else
-#endif
-    {
-        image.SetMask( FALSE );
-    }
-
-    // free allocated resources
-    ::ReleaseDC(NULL, hdc);
-    free(lpDIBh);
-
-    // Delete the DIB section
-    ::DeleteObject(hBitmapSection);
+        hbitmap = ::CreateBitmap(w, h, 1, 1, data);
+        if ( !hbitmap )
+        {
+            wxLogLastError(wxT("CreateBitmap(mask)"));
+        }
+        else
+        {
+            SetMask(new wxMask((WXHBITMAP)hbitmap));
+        }

 
 

-    return image;
-#else
-    // the colour used as transparent one in wxImage and the one it is replaced
-    // with when it really occurs in the bitmap
-    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;
+        delete[] data;
+    }

 
 

-    wxImage image;
+    return true;
+}

 
 

-    wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") );
+wxImage wxBitmap::ConvertToImage() const
+{
+    // convert DDB to DIB
+    wxDIB dib(*this);

 
 

-    // create an wxImage object
-    int width = GetWidth();
-    int height = GetHeight();
-    image.Create( width, height );
-    unsigned char *data = image.GetData();
-    if( !data )
+    if ( !dib.IsOk() )

     {
     {

-        wxFAIL_MSG( wxT("could not allocate data for image") );

         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 )
+    // and then DIB to our wxImage
+    wxImage image = dib.ConvertToImage();
+    if ( !image.IsOk() )

     {
     {

-        padding = sizeDWORD - lineBoundary;
-        bytePerLine += padding;
-    }
-
-    // create a DIB header
-    int headersize = sizeof(BITMAPINFOHEADER);
-    BITMAPINFO *lpDIBh = (BITMAPINFO *) malloc( headersize );
-    if( !lpDIBh )
-    {
-        wxFAIL_MSG( wxT("could not allocate data for DIB header") );
-        free( data );

         return wxNullImage;
     }
         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 )
-    {
-        wxFAIL_MSG( wxT("could not allocate data for DIB") );
-        free( data );
-        free( lpDIBh );
-        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 );

 
 

-    // copy DIB data into the wxImage object
-    int i, j;
-    unsigned char *ptdata = data;
-    unsigned char *ptbits = lpBits;
-    for( i=0; i<height; i++ )
+    // now do the same for the mask, if we have any
+    HBITMAP hbmpMask = GetMask() ? (HBITMAP) GetMask()->GetMaskBitmap() : NULL;
+    if ( hbmpMask )

     {
     {

-        for( j=0; j<width; j++ )
+        wxDIB dibMask(hbmpMask);
+        if ( dibMask.IsOk() )

         {
         {

-            *(ptdata++) = *(ptbits+2);
-            *(ptdata++) = *(ptbits+1);
-            *(ptdata++) = *(ptbits  );
-            ptbits += 3;
-        }
-        ptbits += padding;
-    }
-
-    // similarly, set data according to the possible mask bitmap
-    if( GetMask() && GetMask()->GetMaskBitmap() )
-    {
-        hbitmap = (HBITMAP) GetMask()->GetMaskBitmap();
-        // memory DC created, color set, data copied, and memory DC deleted
-        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 );
-        ptdata = data;
-        ptbits = lpBits;
-        for( i=0; i<height; i++ )
-        {
-            for( j=0; j<width; j++ )
+            // 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 )

             {
             {

-                // is this pixel transparent?
-                if ( *ptbits != 0 )
+                // traverse one mask DIB line
+                unsigned char *mask = maskLineStart;
+                for ( int x = 0; x < w; x++, mask += maskBytesPerPixel )

                 {
                 {

-                    if ( (ptdata[0] == MASK_RED) &&
-                            (ptdata[1] == MASK_GREEN) &&
-                                (ptdata[2] == MASK_BLUE) )
+                    // should this pixel be transparent?
+                    if ( *mask )

                     {
                     {

-                        // we have to fudge the colour a bit to prevent this
-                        // pixel from appearing transparent
-                        ptdata[2] = MASK_BLUE_REPLACEMENT;
+                        // 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;

                     }
                     }

-                    ptdata += 3;
-                }
-                else // masked pixel
-                {
-                    *(ptdata++)  = MASK_RED;
-                    *(ptdata++)  = MASK_GREEN;
-                    *(ptdata++)  = MASK_BLUE;

                 }
                 }

-                ptbits += 3;

             }
             }

-            ptbits += padding;
-        }

 
 

-        image.SetMaskColour( MASK_RED, MASK_GREEN, MASK_BLUE );
-        image.SetMask( TRUE );
-    }
-    else
-    {
-        image.SetMask( FALSE );
+            image.SetMaskColour(MASK_RED, MASK_GREEN, MASK_BLUE);
+        }

     }
     }

-    // free allocated resources
-    ::ReleaseDC(NULL, hdc);
-    free(lpDIBh);
-    free(lpBits);

 
     return image;
 
     return image;

-#endif

 }
 
 }
 

+#else // !wxUSE_WXDIB
+
+bool
+wxBitmap::CreateFromImage(const wxImage& WXUNUSED(image),
+                          int WXUNUSED(depth),
+                          WXHDC WXUNUSED(hdc))
+{
+    return false;
+}
+
+wxImage wxBitmap::ConvertToImage() const
+{
+    return wxImage();
+}
+
+#endif // wxUSE_WXDIB/!wxUSE_WXDIB
+

 #endif // wxUSE_IMAGE
 
 // ----------------------------------------------------------------------------
 // loading and saving bitmaps
 // ----------------------------------------------------------------------------
 
 #endif // wxUSE_IMAGE
 
 // ----------------------------------------------------------------------------
 // loading and saving bitmaps
 // ----------------------------------------------------------------------------
 

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

 {
     UnRef();
 
 {
     UnRef();
 


@@ -1193,23 +1035,23 @@ bool wxBitmap::LoadFile(const wxString& filename, long type)
 
         return handler->LoadFile(this, filename, type, -1, -1);
     }
 
         return handler->LoadFile(this, filename, type, -1, -1);
     }

-#if wxUSE_IMAGE
-    else
+#if wxUSE_IMAGE && wxUSE_WXDIB
+    else // no bitmap handler found

     {
         wxImage image;
     {
         wxImage image;

-        if ( image.LoadFile( filename, type ) && image.Ok() )
+        if ( image.LoadFile( filename, type ) && image.IsOk() )

         {
             *this = wxBitmap(image);
 
         {
             *this = wxBitmap(image);
 

-            return TRUE;
+            return true;

         }
     }
 #endif // wxUSE_IMAGE
 
         }
     }
 #endif // wxUSE_IMAGE
 

-    return FALSE;
+    return false;

 }
 
 }
 

-bool wxBitmap::Create(void *data, long type, int width, int height, int depth)
+bool wxBitmap::Create(const void* data, wxBitmapType type, int width, int height, int depth)

 {
     UnRef();
 
 {
     UnRef();
 


@@ -1219,7 +1061,7 @@ bool wxBitmap::Create(void *data, long type, int width, int height, int depth)
     {
         wxLogDebug(wxT("Failed to create bitmap: no bitmap handler for type %ld defined."), type);
 
     {
         wxLogDebug(wxT("Failed to create bitmap: no bitmap handler for type %ld defined."), type);
 

-        return FALSE;
+        return false;

     }
 
     m_refData = new wxBitmapRefData;
     }
 
     m_refData = new wxBitmapRefData;


@@ -1228,8 +1070,8 @@ bool wxBitmap::Create(void *data, long type, int width, int height, int depth)
 }
 
 bool wxBitmap::SaveFile(const wxString& filename,
 }
 
 bool wxBitmap::SaveFile(const wxString& filename,

-                        int type,
-                        const wxPalette *palette)
+                        wxBitmapType type,
+                        const wxPalette *palette) const

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


@@ -1237,56 +1079,63 @@ bool wxBitmap::SaveFile(const wxString& filename,
     {
         return handler->SaveFile(this, filename, type, palette);
     }
     {
         return handler->SaveFile(this, filename, type, palette);
     }

-#if wxUSE_IMAGE
-    else
+#if wxUSE_IMAGE && wxUSE_WXDIB
+    else // no bitmap handler found

     {
         // FIXME what about palette? shouldn't we use it?
         wxImage image = ConvertToImage();
     {
         // FIXME what about palette? shouldn't we use it?
         wxImage image = ConvertToImage();

-        if ( image.Ok() )
+        if ( image.IsOk() )

         {
             return image.SaveFile(filename, type);
         }
     }
 #endif // wxUSE_IMAGE
 
         {
             return image.SaveFile(filename, type);
         }
     }
 #endif // wxUSE_IMAGE
 

-    return FALSE;
+    return false;

 }
 
 // ----------------------------------------------------------------------------
 // sub bitmap extraction
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------
 // sub bitmap extraction
 // ----------------------------------------------------------------------------

+wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect ) const
+{
+        MemoryHDC dcSrc;
+        SelectInHDC selectSrc(dcSrc, GetHbitmap());
+        return GetSubBitmapOfHDC( rect, (WXHDC)dcSrc );
+}

 
 

-wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
+wxBitmap wxBitmap::GetSubBitmapOfHDC( const wxRect& rect, WXHDC hdc ) const

 {
 {

-    wxCHECK_MSG( Ok() &&
+    wxCHECK_MSG( IsOk() &&

                  (rect.x >= 0) && (rect.y >= 0) &&
                  (rect.x+rect.width <= GetWidth()) &&
                  (rect.y+rect.height <= GetHeight()),
                  wxNullBitmap, wxT("Invalid bitmap or bitmap region") );
 
                  (rect.x >= 0) && (rect.y >= 0) &&
                  (rect.x+rect.width <= GetWidth()) &&
                  (rect.y+rect.height <= GetHeight()),
                  wxNullBitmap, wxT("Invalid bitmap or bitmap region") );
 

-    wxBitmap ret( rect.width, rect.height );
-    wxASSERT_MSG( ret.Ok(), wxT("GetSubBitmap error") );
+    wxBitmap ret( rect.width, rect.height, GetDepth() );
+    wxASSERT_MSG( ret.IsOk(), wxT("GetSubBitmap error") );

 
 #ifndef __WXMICROWIN__
 
 #ifndef __WXMICROWIN__

-    // TODO: copy alpha channel data if any
+    // handle alpha channel, if any
+    if (HasAlpha())
+        ret.UseAlpha();

 
     // copy bitmap data
     MemoryHDC dcSrc,
               dcDst;
 
     {
 
     // copy bitmap data
     MemoryHDC dcSrc,
               dcDst;
 
     {

-        SelectInHDC selectSrc(dcSrc, GetHbitmap()),
-                    selectDst(dcDst, GetHbitmapOf(ret));
+        SelectInHDC selectDst(dcDst, GetHbitmapOf(ret));

 
 

-        if ( !selectSrc || !selectDst )
+        if ( !selectDst )

         {
         {

-            wxLogLastError(_T("SelectObjct(hBitmap)"));
+            wxLogLastError(wxT("SelectObject(destBitmap)"));

         }
 
         if ( !::BitBlt(dcDst, 0, 0, rect.width, rect.height,
         }
 
         if ( !::BitBlt(dcDst, 0, 0, rect.width, rect.height,

-                       dcSrc, rect.x, rect.y, SRCCOPY) )
+                       (HDC)hdc, rect.x, rect.y, SRCCOPY) )

         {
         {

-            wxLogLastError(_T("BitBlt"));
+            wxLogLastError(wxT("BitBlt"));

         }
     }
 
         }
     }
 


@@ -1301,7 +1150,7 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
         if ( !::BitBlt(dcDst, 0, 0, rect.width, rect.height,
                        dcSrc, rect.x, rect.y, SRCCOPY) )
         {
         if ( !::BitBlt(dcDst, 0, 0, rect.width, rect.height,
                        dcSrc, rect.x, rect.y, SRCCOPY) )
         {

-            wxLogLastError(_T("BitBlt"));
+            wxLogLastError(wxT("BitBlt"));

         }
 
         wxMask *mask = new wxMask((WXHBITMAP) hbmpMask);
         }
 
         wxMask *mask = new wxMask((WXHBITMAP) hbmpMask);


@@ -1320,33 +1169,33 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
 wxPalette* wxBitmap::GetPalette() const
 {
     return GetBitmapData() ? &GetBitmapData()->m_bitmapPalette
 wxPalette* wxBitmap::GetPalette() const
 {
     return GetBitmapData() ? &GetBitmapData()->m_bitmapPalette

-                           : (wxPalette *) NULL;
+                           : NULL;

 }
 #endif
 
 wxMask *wxBitmap::GetMask() const
 {
 }
 #endif
 
 wxMask *wxBitmap::GetMask() const
 {

-    return GetBitmapData() ? GetBitmapData()->GetMask() : (wxMask *) NULL;
+    return GetBitmapData() ? GetBitmapData()->GetMask() : NULL;

 }
 
 }
 

-#ifdef __WXDEBUG__
-
-wxDC *wxBitmap::GetSelectedInto() const
+wxBitmap wxBitmap::GetMaskBitmap() const

 {
 {

-    return GetBitmapData() ? GetBitmapData()->m_selectedInto : (wxDC *) NULL;
+    wxBitmap bmp;
+    wxMask *mask = GetMask();
+    if ( mask )
+        bmp.SetHBITMAP(mask->GetMaskBitmap());
+    return bmp;

 }
 
 }
 

-#endif
-
-#if WXWIN_COMPATIBILITY_2_4
-
-int wxBitmap::GetQuality() const
+wxDC *wxBitmap::GetSelectedInto() const

 {
 {

-    return 0;
+#if wxDEBUG_LEVEL
+    return GetBitmapData() ? GetBitmapData()->m_selectedInto : NULL;
+#else
+    return NULL;
+#endif

 }
 
 }
 

-#endif // WXWIN_COMPATIBILITY_2_4
-

 void wxBitmap::UseAlpha()
 {
     if ( GetBitmapData() )
 void wxBitmap::UseAlpha()
 {
     if ( GetBitmapData() )


@@ -1362,21 +1211,21 @@ bool wxBitmap::HasAlpha() const
 // wxBitmap setters
 // ----------------------------------------------------------------------------
 
 // wxBitmap setters
 // ----------------------------------------------------------------------------
 

-#ifdef __WXDEBUG__
-

 void wxBitmap::SetSelectedInto(wxDC *dc)
 {
 void wxBitmap::SetSelectedInto(wxDC *dc)
 {

+#if wxDEBUG_LEVEL

     if ( GetBitmapData() )
         GetBitmapData()->m_selectedInto = dc;
     if ( GetBitmapData() )
         GetBitmapData()->m_selectedInto = dc;

-}
-
+#else
+    wxUnusedVar(dc);

 #endif
 #endif

+}

 
 #if wxUSE_PALETTE
 
 void wxBitmap::SetPalette(const wxPalette& palette)
 {
 
 #if wxUSE_PALETTE
 
 void wxBitmap::SetPalette(const wxPalette& palette)
 {

-    EnsureHasData();
+    AllocExclusive();

 
     GetBitmapData()->m_bitmapPalette = palette;
 }
 
     GetBitmapData()->m_bitmapPalette = palette;
 }


@@ -1385,39 +1234,21 @@ void wxBitmap::SetPalette(const wxPalette& palette)
 
 void wxBitmap::SetMask(wxMask *mask)
 {
 
 void wxBitmap::SetMask(wxMask *mask)
 {

-    EnsureHasData();
+    AllocExclusive();

 
     GetBitmapData()->SetMask(mask);
 }
 
 
     GetBitmapData()->SetMask(mask);
 }
 

-#if WXWIN_COMPATIBILITY_2
-
-void wxBitmap::SetOk(bool isOk)
-{
-    EnsureHasData();
-
-    GetBitmapData()->m_ok = isOk;
-}
-
-#endif // WXWIN_COMPATIBILITY_2
-
-#if WXWIN_COMPATIBILITY_2_4
-
-void wxBitmap::SetQuality(int WXUNUSED(quality))
-{
-}
-
-#endif // WXWIN_COMPATIBILITY_2_4
-

 // ----------------------------------------------------------------------------
 // raw bitmap access support
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // raw bitmap access support
 // ----------------------------------------------------------------------------
 

-#ifdef wxHAVE_RAW_BITMAP
+#ifdef wxHAS_RAW_BITMAP
+

 void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp)
 {
 #if wxUSE_WXDIB
 void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp)
 {
 #if wxUSE_WXDIB

-    if ( !Ok() )
+    if ( !IsOk() )

     {
         // no bitmap, no data (raw or otherwise)
         return NULL;
     {
         // no bitmap, no data (raw or otherwise)
         return NULL;


@@ -1429,8 +1260,8 @@ void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp)
     HBITMAP hDIB;
     if ( !GetBitmapData()->m_isDIB )
     {
     HBITMAP hDIB;
     if ( !GetBitmapData()->m_isDIB )
     {

-        wxCHECK_MSG( !GetBitmapData()->m_dib, FALSE,
-                        _T("GetRawData() may be called only once") );
+        wxCHECK_MSG( !GetBitmapData()->m_dib, NULL,
+                        wxT("GetRawData() may be called only once") );

 
         wxDIB *dib = new wxDIB(*this);
         if ( !dib->IsOk() )
 
         wxDIB *dib = new wxDIB(*this);
         if ( !dib->IsOk() )


@@ -1453,7 +1284,7 @@ void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp)
     DIBSECTION ds;
     if ( ::GetObject(hDIB, sizeof(ds), &ds) != sizeof(DIBSECTION) )
     {
     DIBSECTION ds;
     if ( ::GetObject(hDIB, sizeof(ds), &ds) != sizeof(DIBSECTION) )
     {

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

 
         return NULL;
     }
 
         return NULL;
     }


@@ -1461,7 +1292,7 @@ void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp)
     // check that the bitmap is in correct format
     if ( ds.dsBm.bmBitsPixel != bpp )
     {
     // check that the bitmap is in correct format
     if ( ds.dsBm.bmBitsPixel != bpp )
     {

-        wxFAIL_MSG( _T("incorrect bitmap type in wxBitmap::GetRawData()") );
+        wxFAIL_MSG( wxT("incorrect bitmap type in wxBitmap::GetRawData()") );

 
         return NULL;
     }
 
         return NULL;
     }


@@ -1473,7 +1304,11 @@ void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp)
     data.m_height = h;
 
     // remember that DIBs are stored in top to bottom order!
     data.m_height = h;
 
     // remember that DIBs are stored in top to bottom order!

-    const LONG bytesPerRow = ds.dsBm.bmWidthBytes;
+    // (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;
     data.m_stride = -bytesPerRow;
 
     char *bits = (char *)ds.dsBm.bmBits;


@@ -1491,15 +1326,10 @@ void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp)
 void wxBitmap::UngetRawData(wxPixelDataBase& dataBase)
 {
 #if wxUSE_WXDIB
 void wxBitmap::UngetRawData(wxPixelDataBase& dataBase)
 {
 #if wxUSE_WXDIB

-    if ( !Ok() )
+    if ( !IsOk() )

         return;
 
         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 )
+    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
     {
         // invalid data, don't crash -- but don't assert neither as we're
         // called automatically from wxPixelDataBase dtor and so there is no


@@ -1507,50 +1337,20 @@ void wxBitmap::UngetRawData(wxPixelDataBase& dataBase)
         return;
     }
 
         return;
     }
 

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

     {
     {

-        // AlphaBlend() wants to have premultiplied source alpha but
-        // wxRawBitmap API uses normal, not premultiplied, colours, so adjust
-        // them here now
-        PixelData::Iterator p(data);
+        wxDIB *dib = GetBitmapData()->m_dib;
+        GetBitmapData()->m_dib = NULL;

 
 

-        const int w = data.GetWidth();
-        const int h = data.GetHeight();
-
-        for ( int y = 0; y < h; y++ )
-        {
-            PixelData::Iterator rowStart = p;
+        // TODO: convert

 
 

-            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;
-        }
+        delete dib;

     }
     }

-#endif
+#endif // wxUSE_WXDIB

 }
 }

-#endif // #ifdef wxHAVE_RAW_BITMAP
+#endif // wxHAS_RAW_BITMAP

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


@@ -1561,6 +1361,39 @@ wxMask::wxMask()
     m_maskBitmap = 0;
 }
 
     m_maskBitmap = 0;
 }
 

+// Copy constructor
+wxMask::wxMask(const wxMask &mask)
+      : wxObject()
+{
+    BITMAP bmp;
+
+    HDC srcDC = CreateCompatibleDC(0);
+    HDC destDC = CreateCompatibleDC(0);
+
+    // GetBitmapDimensionEx won't work if SetBitmapDimensionEx wasn't used
+    // so we'll use GetObject() API here:
+    if (::GetObject((HGDIOBJ)mask.m_maskBitmap, sizeof(bmp), &bmp) == 0)
+    {
+        wxFAIL_MSG(wxT("Cannot retrieve the dimensions of the wxMask to copy"));
+        return;
+    }
+
+    // create our HBITMAP
+    int w = bmp.bmWidth, h = bmp.bmHeight;
+    m_maskBitmap = (WXHBITMAP)CreateCompatibleBitmap(srcDC, w, h);
+
+    // copy the mask's HBITMAP into our HBITMAP
+    SelectObject(srcDC, (HBITMAP) mask.m_maskBitmap);
+    SelectObject(destDC, (HBITMAP) m_maskBitmap);
+
+    BitBlt(destDC, 0, 0, w, h, srcDC, 0, 0, SRCCOPY);
+
+    SelectObject(srcDC, 0);
+    DeleteDC(srcDC);
+    SelectObject(destDC, 0);
+    DeleteDC(destDC);
+}
+

 // Construct a mask from a bitmap and a colour indicating
 // the transparent area
 wxMask::wxMask(const wxBitmap& bitmap, const wxColour& colour)
 // Construct a mask from a bitmap and a colour indicating
 // the transparent area
 wxMask::wxMask(const wxBitmap& bitmap, const wxColour& colour)


@@ -1594,8 +1427,8 @@ wxMask::~wxMask()
 bool wxMask::Create(const wxBitmap& bitmap)
 {
 #ifndef __WXMICROWIN__
 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.IsOk() && bitmap.GetDepth() == 1, false,
+                 wxT("can't create mask from invalid or not monochrome bitmap") );

 
     if ( m_maskBitmap )
     {
 
     if ( m_maskBitmap )
     {


@@ -1617,9 +1450,10 @@ bool wxMask::Create(const wxBitmap& bitmap)
     DeleteDC(srcDC);
     SelectObject(destDC, 0);
     DeleteDC(destDC);
     DeleteDC(srcDC);
     SelectObject(destDC, 0);
     DeleteDC(destDC);

-    return TRUE;
+    return true;

 #else
 #else

-    return FALSE;
+    wxUnusedVar(bitmap);
+    return false;

 #endif
 }
 
 #endif
 }
 


@@ -1634,7 +1468,7 @@ bool wxMask::Create(const wxBitmap& bitmap, int paletteIndex)
     }
 
 #if wxUSE_PALETTE
     }
 
 #if wxUSE_PALETTE

-    if (bitmap.Ok() && bitmap.GetPalette()->Ok())
+    if (bitmap.IsOk() && bitmap.GetPalette()->IsOk())

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


@@ -1645,7 +1479,7 @@ bool wxMask::Create(const wxBitmap& bitmap, int paletteIndex)
     }
 #endif // wxUSE_PALETTE
 
     }
 #endif // wxUSE_PALETTE
 

-    return FALSE;
+    return false;

 }
 
 // Create a mask from a bitmap and a colour indicating
 }
 
 // Create a mask from a bitmap and a colour indicating


@@ -1653,7 +1487,7 @@ bool wxMask::Create(const wxBitmap& bitmap, int paletteIndex)
 bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
 {
 #ifndef __WXMICROWIN__
 bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
 {
 #ifndef __WXMICROWIN__

-    wxCHECK_MSG( bitmap.Ok(), FALSE, _T("invalid bitmap in wxMask::Create") );
+    wxCHECK_MSG( bitmap.IsOk(), false, wxT("invalid bitmap in wxMask::Create") );

 
     if ( m_maskBitmap )
     {
 
     if ( m_maskBitmap )
     {


@@ -1676,18 +1510,18 @@ bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
         wxLogLastError(wxT("CreateCompatibleDC"));
     }
 
         wxLogLastError(wxT("CreateCompatibleDC"));
     }
 

-    bool ok = TRUE;
+    bool ok = true;

 
     // SelectObject() will fail
     wxASSERT_MSG( !bitmap.GetSelectedInto(),
 
     // SelectObject() will fail
     wxASSERT_MSG( !bitmap.GetSelectedInto(),

-                  _T("bitmap can't be selected in another DC") );
+                  wxT("bitmap can't be selected in another DC") );

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

-        ok = FALSE;
+        ok = false;

     }
 
     HGDIOBJ hbmpDstOld = ::SelectObject(destDC, (HBITMAP)m_maskBitmap);
     }
 
     HGDIOBJ hbmpDstOld = ::SelectObject(destDC, (HBITMAP)m_maskBitmap);


@@ -1695,7 +1529,7 @@ bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
     {
         wxLogLastError(wxT("SelectObject"));
 
     {
         wxLogLastError(wxT("SelectObject"));
 

-        ok = FALSE;
+        ok = false;

     }
 
     if ( ok )
     }
 
     if ( ok )


@@ -1714,7 +1548,9 @@ bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
 
     return ok;
 #else // __WXMICROWIN__
 
     return ok;
 #else // __WXMICROWIN__

-    return FALSE;
+    wxUnusedVar(bitmap);
+    wxUnusedVar(colour);
+    return false;

 #endif // __WXMICROWIN__/!__WXMICROWIN__
 }
 
 #endif // __WXMICROWIN__/!__WXMICROWIN__
 }
 


@@ -1723,114 +1559,60 @@ bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
 // ----------------------------------------------------------------------------
 
 bool wxBitmapHandler::Create(wxGDIImage *image,
 // ----------------------------------------------------------------------------
 
 bool wxBitmapHandler::Create(wxGDIImage *image,

-                             void *data,
-                             long flags,
+                             const void* data,
+                             wxBitmapType type,

                              int width, int height, int depth)
 {
     wxBitmap *bitmap = wxDynamicCast(image, wxBitmap);
 
                              int width, int height, int depth)
 {
     wxBitmap *bitmap = wxDynamicCast(image, wxBitmap);
 

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

 }
 
 bool wxBitmapHandler::Load(wxGDIImage *image,
                            const wxString& name,
 }
 
 bool wxBitmapHandler::Load(wxGDIImage *image,
                            const wxString& name,

-                           long flags,
+                           wxBitmapType type,

                            int width, int height)
 {
     wxBitmap *bitmap = wxDynamicCast(image, wxBitmap);
 
                            int width, int height)
 {
     wxBitmap *bitmap = wxDynamicCast(image, wxBitmap);
 

-    return bitmap ? LoadFile(bitmap, name, flags, width, height) : FALSE;
+    return bitmap && LoadFile(bitmap, name, type, width, height);

 }
 
 }
 

-bool wxBitmapHandler::Save(wxGDIImage *image,
+bool wxBitmapHandler::Save(const wxGDIImage *image,

                            const wxString& name,
                            const wxString& name,

-                           int type)
+                           wxBitmapType type) const

 {
     wxBitmap *bitmap = wxDynamicCast(image, wxBitmap);
 
 {
     wxBitmap *bitmap = wxDynamicCast(image, wxBitmap);
 

-    return bitmap ? SaveFile(bitmap, name, type) : FALSE;
+    return bitmap && SaveFile(bitmap, name, type);

 }
 
 bool wxBitmapHandler::Create(wxBitmap *WXUNUSED(bitmap),
 }
 
 bool wxBitmapHandler::Create(wxBitmap *WXUNUSED(bitmap),

-                             void *WXUNUSED(data),
-                             long WXUNUSED(type),
+                             const void* WXUNUSED(data),
+                             wxBitmapType WXUNUSED(type),

                              int WXUNUSED(width),
                              int WXUNUSED(height),
                              int WXUNUSED(depth))
 {
                              int WXUNUSED(width),
                              int WXUNUSED(height),
                              int WXUNUSED(depth))
 {

-    return FALSE;
+    return false;

 }
 
 bool wxBitmapHandler::LoadFile(wxBitmap *WXUNUSED(bitmap),
                                const wxString& WXUNUSED(name),
 }
 
 bool wxBitmapHandler::LoadFile(wxBitmap *WXUNUSED(bitmap),
                                const wxString& WXUNUSED(name),

-                               long WXUNUSED(type),
+                               wxBitmapType WXUNUSED(type),

                                int WXUNUSED(desiredWidth),
                                int WXUNUSED(desiredHeight))
 {
                                int WXUNUSED(desiredWidth),
                                int WXUNUSED(desiredHeight))
 {

-    return FALSE;
+    return false;

 }
 
 }
 

-bool wxBitmapHandler::SaveFile(wxBitmap *WXUNUSED(bitmap),
+bool wxBitmapHandler::SaveFile(const wxBitmap *WXUNUSED(bitmap),

                                const wxString& WXUNUSED(name),
                                const wxString& WXUNUSED(name),

-                               int WXUNUSED(type),
-                               const wxPalette *WXUNUSED(palette))
-{
-    return FALSE;
-}
-
-// ----------------------------------------------------------------------------
-// DIB functions
-// ----------------------------------------------------------------------------
-
-#ifndef __WXMICROWIN__
-bool wxCreateDIB(long xSize, long ySize, long bitsPerPixel,
-                 HPALETTE hPal, LPBITMAPINFO* lpDIBHeader)
-{
-   unsigned long   i, headerSize;
-   LPBITMAPINFO    lpDIBheader = NULL;
-   LPPALETTEENTRY  lpPe = NULL;
-
-
-   // Allocate space for a DIB header
-   headerSize = (sizeof(BITMAPINFOHEADER) + (256 * sizeof(PALETTEENTRY)));
-   lpDIBheader = (BITMAPINFO *) malloc(headerSize);
-   lpPe = (PALETTEENTRY *)((BYTE*)lpDIBheader + sizeof(BITMAPINFOHEADER));
-
-   GetPaletteEntries(hPal, 0, 256, lpPe);
-
-   memset(lpDIBheader, 0x00, sizeof(BITMAPINFOHEADER));
-
-   // Fill in the static parts of the DIB header
-   lpDIBheader->bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
-   lpDIBheader->bmiHeader.biWidth = xSize;
-   lpDIBheader->bmiHeader.biHeight = ySize;
-   lpDIBheader->bmiHeader.biPlanes = 1;
-
-   // 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.biClrUsed = 256;
-
-
-   // Initialize the DIB palette
-   for (i = 0; i < 256; i++) {
-      lpDIBheader->bmiColors[i].rgbReserved = lpPe[i].peFlags;
-      lpDIBheader->bmiColors[i].rgbRed = lpPe[i].peRed;
-      lpDIBheader->bmiColors[i].rgbGreen = lpPe[i].peGreen;
-      lpDIBheader->bmiColors[i].rgbBlue = lpPe[i].peBlue;
-   }
-
-   *lpDIBHeader = lpDIBheader;
-
-   return TRUE;
-}
-
-void wxFreeDIB(LPBITMAPINFO lpDIBHeader)
+                               wxBitmapType WXUNUSED(type),
+                               const wxPalette *WXUNUSED(palette)) const

 {
 {

-    free(lpDIBHeader);
+    return false;

 }
 }

-#endif

 
 // ----------------------------------------------------------------------------
 // global helper functions implemented here
 
 // ----------------------------------------------------------------------------
 // global helper functions implemented here


@@ -1843,13 +1625,51 @@ HICON wxBitmapToIconOrCursor(const wxBitmap& bmp,
                              int hotSpotX,
                              int hotSpotY)
 {
                              int hotSpotX,
                              int hotSpotY)
 {

-    if ( !bmp.Ok() )
+    if ( !bmp.IsOk() )

     {
         // we can't create an icon/cursor form nothing
         return 0;
     }
 
     {
         // we can't create an icon/cursor form nothing
         return 0;
     }
 

-    wxMask *mask = bmp.GetMask();
+    if ( bmp.HasAlpha() )
+    {
+        HBITMAP hbmp;
+
+#if wxUSE_WXDIB && wxUSE_IMAGE
+        // CreateIconIndirect() requires non-pre-multiplied pixel data on input
+        // as it does pre-multiplication internally itself so we need to create
+        // a special DIB in such format to pass to it. This is inefficient but
+        // better than creating an icon with wrong colours.
+        AutoHBITMAP hbmpRelease;
+        hbmp = wxDIB(bmp.ConvertToImage(),
+                     wxDIB::PixelFormat_NotPreMultiplied).Detach();
+        hbmpRelease.Init(hbmp);
+#else // !(wxUSE_WXDIB && wxUSE_IMAGE)
+        hbmp = GetHbitmapOf(bmp);
+#endif // wxUSE_WXDIB && wxUSE_IMAGE
+
+        // Create an empty mask bitmap.
+        // it doesn't seem to work if we mess with the mask at all.
+        AutoHBITMAP
+            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 = hbmp;
+
+        return ::CreateIconIndirect(&iconInfo);
+    }
+
+    wxMask* mask = bmp.GetMask();
+

     if ( !mask )
     {
         // we must have a mask for an icon, so even if it's probably incorrect,
     if ( !mask )
     {
         // we must have a mask for an icon, so even if it's probably incorrect,


@@ -1858,6 +1678,7 @@ HICON wxBitmapToIconOrCursor(const wxBitmap& bmp,
     }
 
     ICONINFO iconInfo;
     }
 
     ICONINFO iconInfo;

+    wxZeroMemory(iconInfo);

     iconInfo.fIcon = iconWanted;  // do we want an icon or a cursor?
     if ( !iconWanted )
     {
     iconInfo.fIcon = iconWanted;  // do we want an icon or a cursor?
     if ( !iconWanted )
     {


@@ -1865,7 +1686,8 @@ HICON wxBitmapToIconOrCursor(const wxBitmap& bmp,
         iconInfo.yHotspot = hotSpotY;
     }
 
         iconInfo.yHotspot = hotSpotY;
     }
 

-    iconInfo.hbmMask = wxInvertMask((HBITMAP)mask->GetMaskBitmap());
+    AutoHBITMAP hbmpMask(wxInvertMask((HBITMAP)mask->GetMaskBitmap()));
+    iconInfo.hbmMask = hbmpMask;

     iconInfo.hbmColor = GetHbitmapOf(bmp);
 
     // black out the transparent area to preserve background colour, because
     iconInfo.hbmColor = GetHbitmapOf(bmp);
 
     // black out the transparent area to preserve background colour, because


@@ -1879,38 +1701,35 @@ HICON wxBitmapToIconOrCursor(const wxBitmap& bmp,
         if ( !::BitBlt(dcDst, 0, 0, bmp.GetWidth(), bmp.GetHeight(),
                        dcSrc, 0, 0, SRCAND) )
         {
         if ( !::BitBlt(dcDst, 0, 0, bmp.GetWidth(), bmp.GetHeight(),
                        dcSrc, 0, 0, SRCAND) )
         {

-            wxLogLastError(_T("BitBlt"));
+            wxLogLastError(wxT("BitBlt"));

         }
     }
 
     HICON hicon = ::CreateIconIndirect(&iconInfo);
 
         }
     }
 
     HICON hicon = ::CreateIconIndirect(&iconInfo);
 

-    if ( !bmp.GetMask() )
+    if ( !bmp.GetMask() && !bmp.HasAlpha() )

     {
         // we created the mask, now delete it
         delete mask;
     }
 
     {
         // 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 hicon;
 }
 
 HICON wxBitmapToHICON(const wxBitmap& bmp)
 {

-    return wxBitmapToIconOrCursor(bmp, TRUE, 0, 0);
+    return wxBitmapToIconOrCursor(bmp, true, 0, 0);

 }
 
 HCURSOR wxBitmapToHCURSOR(const wxBitmap& bmp, int hotSpotX, int hotSpotY)
 {
 }
 
 HCURSOR wxBitmapToHCURSOR(const wxBitmap& bmp, int hotSpotX, int hotSpotY)
 {

-    return (HCURSOR)wxBitmapToIconOrCursor(bmp, FALSE, hotSpotX, hotSpotY);
+    return (HCURSOR)wxBitmapToIconOrCursor(bmp, false, hotSpotX, hotSpotY);

 }
 
 HBITMAP wxInvertMask(HBITMAP hbmpMask, int w, int h)
 {
 #ifndef __WXMICROWIN__
 }
 
 HBITMAP wxInvertMask(HBITMAP hbmpMask, int w, int h)
 {
 #ifndef __WXMICROWIN__

-    wxCHECK_MSG( hbmpMask, 0, _T("invalid bitmap in wxInvertMask") );
+    wxCHECK_MSG( hbmpMask, 0, wxT("invalid bitmap in wxInvertMask") );

 
     // get width/height from the bitmap if not given
     if ( !w || !h )
 
     // get width/height from the bitmap if not given
     if ( !w || !h )


@@ -1934,8 +1753,8 @@ 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) )


@@ -1943,6 +1762,10 @@ 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);
 
     ::DeleteDC(hdcSrc);
     ::DeleteDC(hdcDst);