fixed tests for dashed/dotted pens under OS != NT (bug 1182319)

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

diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp
index 9be4159f4833641d2293749155477b578b95d3d0..adb8e3f5ba33c0f45c1ec2f9074764734d19e247 100644 (file)
--- a/src/msw/bitmap.cpp
+++ b/src/msw/bitmap.cpp
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // 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,13 +43,17 @@
 #include "wx/msw/private.h"
 #include "wx/log.h"
 
 #include "wx/msw/private.h"
 #include "wx/log.h"
 

-#if !defined(__WXMICROWIN__)
+#if wxUSE_WXDIB

 #include "wx/msw/dib.h"
 #endif
 
 #include "wx/image.h"
 #include "wx/xpmdecod.h"
 
 #include "wx/msw/dib.h"
 #endif
 
 #include "wx/image.h"
 #include "wx/xpmdecod.h"
 

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

 // missing from mingw32 header
 #ifndef CLR_INVALID
     #define CLR_INVALID ((COLORREF)-1)
 // missing from mingw32 header
 #ifndef CLR_INVALID
     #define CLR_INVALID ((COLORREF)-1)


@@ -63,6 +67,7 @@ class WXDLLEXPORT wxBitmapRefData : public wxGDIImageRefData
 {
 public:
     wxBitmapRefData();
 {
 public:
     wxBitmapRefData();

+    wxBitmapRefData(const wxBitmapRefData& data);

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


@@ -98,15 +103,27 @@ public:
     wxDC         *m_selectedInto;
 #endif // __WXDEBUG__
 
     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 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;
 
 private:
     // optional mask for transparent drawing
     wxMask       *m_bitmapMask;
 

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

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


@@ -122,6 +139,50 @@ 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
 // ----------------------------------------------------------------------------


@@ -132,8 +193,31 @@ wxBitmapRefData::wxBitmapRefData()
     m_selectedInto = NULL;
 #endif
     m_bitmapMask = NULL;
     m_selectedInto = NULL;
 #endif
     m_bitmapMask = NULL;

+

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

-    m_hasAlpha = FALSE;
+#if wxUSE_WXDIB
+    m_dib = NULL;
+#endif
+
+    m_isDIB =
+    m_hasAlpha = false;
+}
+
+wxBitmapRefData::wxBitmapRefData(const wxBitmapRefData& data)
+               : wxGDIImageRefData(data)
+{
+#ifdef __WXDEBUG__
+    m_selectedInto = NULL;
+#endif
+
+    // can't copy the mask as the other bitmap destroys it
+    m_bitmapMask = NULL;
+
+    wxASSERT_MSG( !data.m_isDIB,
+                    _T("can't copy bitmap locked for raw access!") );
+    m_isDIB = false;
+
+    m_hasAlpha = data.m_hasAlpha;

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


@@ -141,6 +225,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) )


@@ -161,7 +249,6 @@ 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

-

 }
 
 wxGDIImageRefData *wxBitmap::CreateData() const
 }
 
 wxGDIImageRefData *wxBitmap::CreateData() const


@@ -169,11 +256,37 @@ wxGDIImageRefData *wxBitmap::CreateData() const
     return new wxBitmapRefData;
 }
 
     return new wxBitmapRefData;
 }
 

+wxObjectRefData *wxBitmap::CloneRefData(const wxObjectRefData *dataOrig) const
+{
+    const wxBitmapRefData *
+        data = wx_static_cast(const wxBitmapRefData *, dataOrig);
+    if ( !data )
+        return NULL;
+
+    wxBitmap *self = wx_const_cast(wxBitmap *, this);
+
+#if wxUSE_WXDIB
+    // copy the other bitmap
+    if ( data->m_hBitmap )
+    {
+        wxDIB dib((HBITMAP)(data->m_hBitmap));
+        self->CopyFromDIB(dib);
+    }
+    else
+#endif // wxUSE_WXDIB
+    {
+        // don't copy the bitmap data, but do copy the size, depth, ...
+        self->m_refData = new wxBitmapRefData(*data);
+    }
+
+    return m_refData;
+}
+

 #ifdef __WIN32__
 
 bool wxBitmap::CopyFromIconOrCursor(const wxGDIImage& icon)
 {
 #ifdef __WIN32__
 
 bool wxBitmap::CopyFromIconOrCursor(const wxGDIImage& icon)
 {

-#ifndef __WXMICROWIN__
+#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();
 


@@ -182,7 +295,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;


@@ -205,13 +318,10 @@ bool wxBitmap::CopyFromIconOrCursor(const wxGDIImage& icon)
     // 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;
+    return true;

 #else
 #else

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

 #endif
 }
 
 #endif
 }
 


@@ -222,15 +332,9 @@ bool wxBitmap::CopyFromCursor(const wxCursor& cursor)
     UnRef();
 
     if ( !cursor.Ok() )
     UnRef();
 
     if ( !cursor.Ok() )

-        return FALSE;
-
-#ifdef __WIN16__
-    wxFAIL_MSG( _T("don't know how to convert cursor to bitmap") );
+        return false;

 
 

-    return FALSE;
-#else

     return CopyFromIconOrCursor(cursor);
     return CopyFromIconOrCursor(cursor);

-#endif // Win16

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


@@ -238,45 +342,51 @@ bool wxBitmap::CopyFromIcon(const wxIcon& icon)
     UnRef();
 
     if ( !icon.Ok() )
     UnRef();
 
     if ( !icon.Ok() )

-        return FALSE;
+        return false;
+
+    return CopyFromIconOrCursor(icon);
+}

 
 

-    // 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();
+#ifndef NEVER_USE_DIB

 
 

-    // copy the icon to the bitmap
-    ScreenHDC hdcScreen;
-    HDC hdc = ::CreateCompatibleDC(hdcScreen);
-    HBITMAP hbitmap = ::CreateCompatibleBitmap(hdcScreen, width, height);
-    HBITMAP hbmpOld = (HBITMAP)::SelectObject(hdc, hbitmap);
+bool wxBitmap::CopyFromDIB(const wxDIB& dib)
+{
+    wxCHECK_MSG( dib.IsOk(), false, _T("invalid DIB in CopyFromDIB") );

 
 

-    ::DrawIcon(hdc, 0, 0, GetHiconOf(icon));
+#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

 
 

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

 
 

-    return TRUE;
-#else // Win32
-    return CopyFromIconOrCursor(icon);
-#endif // Win16/Win32
+    delete palette;
+#endif // wxUSE_PALETTE
+
+    return true;

 }
 
 }
 

+#endif // NEVER_USE_DIB
+

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


@@ -316,7 +426,7 @@ 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;
                 }
                 *dst++ = reversed;
                     val >>= 1;
                 }
                 *dst++ = reversed;


@@ -353,16 +463,17 @@ bool wxBitmap::CreateFromXpm(const char **data)
 #if wxUSE_IMAGE && wxUSE_XPM
     Init();
 
 #if wxUSE_IMAGE && wxUSE_XPM
     Init();
 

-    wxCHECK_MSG( data != NULL, FALSE, wxT("invalid bitmap data") )
+    wxCHECK_MSG( data != NULL, false, wxT("invalid bitmap data") )

 
     wxXPMDecoder decoder;
     wxImage img = decoder.ReadData(data);
 
     wxXPMDecoder decoder;
     wxImage img = decoder.ReadData(data);

-    wxCHECK_MSG( img.Ok(), FALSE, wxT("invalid bitmap data") )
+    wxCHECK_MSG( img.Ok(), false, wxT("invalid bitmap data") )

 
     *this = wxBitmap(img);
 
     *this = wxBitmap(img);

-    return TRUE;
+    return true;

 #else
 #else

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

 #endif
 }
 
 #endif
 }
 


@@ -373,6 +484,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();


@@ -387,26 +505,52 @@ 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();
 
     m_refData = new wxBitmapRefData;
 
 {
     UnRef();
 
     m_refData = new wxBitmapRefData;
 

-#if wxUSE_DIB_FOR_BITMAP
-    if ( w && h && d >= 16 )
+    GetBitmapData()->m_width = w;
+    GetBitmapData()->m_height = h;
+
+    HBITMAP hbmp    wxDUMMY_INITIALIZE(0);
+
+#ifndef NEVER_USE_DIB
+    if ( wxShouldCreateDIB(w, h, d, hdc) )

     {
     {

-        if ( !CreateDIB(w, h, d) )
-           return FALSE;
+        if ( d == -1 )
+        {
+            // create DIBs without alpha channel by default
+            d = 24;
+        }
+
+        wxDIB dib(w, h, d);
+        if ( !dib.IsOk() )
+           return false;
+
+        // don't delete the DIB section in dib object dtor
+        hbmp = dib.Detach();
+
+        GetBitmapData()->m_isDIB = true;
+        GetBitmapData()->m_depth = d;

     }
     }

-    else
-#endif // wxUSE_DIB_FOR_BITMAP
+    else // create a DDB
+#endif // NEVER_USE_DIB

     {
     {

-        GetBitmapData()->m_width = w;
-        GetBitmapData()->m_height = h;
-        GetBitmapData()->m_depth = d;
-
-        HBITMAP hbmp;
+#ifndef ALWAYS_USE_DIB

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


@@ -415,8 +559,10 @@ bool wxBitmap::Create(int w, int h, int d)
             {
                 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;


@@ -428,14 +574,11 @@ bool wxBitmap::Create(int w, int h, int d)
 
             GetBitmapData()->m_depth = wxDisplayDepth();
         }
 
             GetBitmapData()->m_depth = wxDisplayDepth();
         }

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

     }
 
     }
 

+    SetHBITMAP((WXHBITMAP)hbmp);
+

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


@@ -449,7 +592,7 @@ bool wxBitmap::Create(int w, int h, int d)
 // make sense to use #ifdefs inside the function bodies
 #ifdef __WXMICROWIN__
 
 // 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)

 {
     // Set this to 1 to experiment with mask code,
     // which currently doesn't work
 {
     // Set this to 1 to experiment with mask code,
     // which currently doesn't work


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

-        return FALSE;
+        return false;

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


@@ -502,7 +645,7 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
 
         if (!hMaskBitmap)
         {
 
         if (!hMaskBitmap)
         {

-            hasMask = FALSE;
+            hasMask = false;

         }
         else
         {
         }
         else
         {


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

-        hasMask = FALSE;
+        hasMask = false;

 #endif
     }
 
 #endif
     }
 


@@ -560,12 +703,7 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
     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


@@ -637,9 +775,24 @@ wxImage wxBitmap::ConvertToImage() const
 // wxImage to/from conversions
 // ----------------------------------------------------------------------------
 
 // wxImage to/from conversions
 // ----------------------------------------------------------------------------
 

-bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
+#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") );
+    wxCHECK_MSG( image.Ok(), false, wxT("invalid image") );

 
     UnRef();
 
 
     UnRef();
 


@@ -649,250 +802,173 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
 
     wxDIB dib(image);
     if ( !dib.IsOk() )
 
     wxDIB dib(image);
     if ( !dib.IsOk() )

-        return FALSE;
+        return false;

 
 
     // store the bitmap parameters
     wxBitmapRefData *refData = new wxBitmapRefData;
     refData->m_width = w;
     refData->m_height = h;
 
 
     // store the bitmap parameters
     wxBitmapRefData *refData = new wxBitmapRefData;
     refData->m_width = w;
     refData->m_height = h;

-    refData->m_depth = dib.GetDepth();

     refData->m_hasAlpha = image.HasAlpha();
 
     m_refData = refData;
 
 
     // next either store DIB as is or create a DDB from it
     refData->m_hasAlpha = image.HasAlpha();
 
     m_refData = refData;
 
 
     // next either store DIB as is or create a DDB from it

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

 
 

-    // TODO: if we're ready to use DIB as is, we can just do this:
-    // if ( ... )
-    //  hbitmap = dib.Detach();
-    // else
+    // 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) )

     {
     {

-        // create and set the device-dependent bitmap
-        //
-        // VZ: why don't we just use SetDIBits() instead? because of the
-        //     palette or is there some other reason?
-        hbitmap = ::CreateCompatibleBitmap(ScreenHDC(), w, h);
-        if ( !hbitmap )
-        {
-            wxLogLastError(_T("CreateCompatibleBitmap()"));
+        // don't delete the DIB section in dib object dtor
+        hbitmap = dib.Detach();

 
 

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

 
 

-        MemoryHDC hdcMem;
-        SelectInHDC select(hdcMem, hbitmap);
-        if ( !select )
-        {
-            wxLogLastError(_T("SelectObjct(hBitmap)"));
-        }
+        refData->m_depth = depth == -1 ? dib.GetDepth() : depth;
+    }
+#endif // !ALWAYS_USE_DIB

 
 

-#if wxUSE_PALETTE
-        const wxPalette& palette = image.GetPalette();
+    // validate this object
+    SetHBITMAP((WXHBITMAP)hbitmap);

 
 

-        HPALETTE hOldPalette;
-        if ( palette.Ok() )
+    // finally also set the mask if we have one
+    if ( image.HasMask() )
+    {
+        const size_t len  = 2*((w+15)/16);
+        BYTE *src  = image.GetData();
+        BYTE *data = new BYTE[h*len];
+        memset(data, 0, h*len);
+        BYTE r = image.GetMaskRed(),
+             g = image.GetMaskGreen(),
+             b = image.GetMaskBlue();
+        BYTE *dst = data;
+        for ( int y = 0; y < h; y++, dst += len )

         {
         {

-            SetPalette(palette);
-
-            hOldPalette = ::SelectPalette
-                            (
-                                hdcMem,
-                                GetHpaletteOf(palette),
-                                FALSE                   // ignored for hdcMem
-                            );
-
-            if ( !hOldPalette )
+            BYTE *dstLine = dst;
+            BYTE mask = 0x80;
+            for ( int x = 0; x < w; x++, src += 3 )

             {
             {

-                wxLogLastError(_T("SelectPalette()"));
-            }
+                if (src[0] != r || src[1] != g || src[2] != b)
+                    *dstLine |= mask;

 
 

-            if ( ::RealizePalette(hdcMem) == GDI_ERROR )
-            {
-                wxLogLastError(_T("RealizePalette()"));
+                if ( (mask >>= 1) == 0 )
+                {
+                    dstLine++;
+                    mask = 0x80;
+                }

             }
         }
             }
         }

-        else // no valid palette
-        {
-            hOldPalette = 0;
-        }
-#endif // wxUSE_PALETTE
-
-        DIBSECTION ds;
-        if ( !::GetObject(dib.GetHandle(), sizeof(ds), &ds) )
-        {
-            wxLogLastError(_T("GetObject(hDIB)"));
-        }

 
 

-        if ( ::StretchDIBits(hdcMem,
-                             0, 0, w, h,
-                             0, 0, w, h,
-                             dib.GetData(),
-                             (BITMAPINFO *)&ds.dsBmih,
-                             DIB_RGB_COLORS,
-                             SRCCOPY) == GDI_ERROR )
+        hbitmap = ::CreateBitmap(w, h, 1, 1, data);
+        if ( !hbitmap )

         {
         {

-            wxLogLastError(_T("StretchDIBits()"));
-
-            return FALSE;
+            wxLogLastError(_T("CreateBitmap(mask)"));

         }
         }

-
-#if wxUSE_PALETTE
-        if ( hOldPalette )
+        else

         {
         {

-            ::SelectPalette(hdcMem, hOldPalette, FALSE);
+            SetMask(new wxMask((WXHBITMAP)hbitmap));

         }
         }

-#endif // wxUSE_PALETTE
-    }
-
-    // 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() )
-    {
-        SetMask(new wxMask(*this, wxColour(image.GetMaskRed(),
-                                           image.GetMaskGreen(),
-                                           image.GetMaskBlue())));
+        delete data;

     }
 
     }
 

-    return TRUE;
+    return true;

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

-    wxImage image;
-
-    wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") );
+    // 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 )
-    {
-        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
-    unsigned char *lpBits;
-    lpBits = (unsigned char *) malloc( lpDIBh->bmiHeader.biSizeImage );
-    if( !lpBits )
+    // and then DIB to our wxImage
+    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 );
-
-    // copy DIB data into the wxImage object
-    int i, j;
-    unsigned char *ptdata = data;
-    unsigned char *ptbits = lpBits;
-    for( i=0; i<height; i++ )
-    {
-        for( j=0; j<width; j++ )
-        {
-            *(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() )
+    // now do the same for the mask, if we have any
+    HBITMAP hbmpMask = GetMask() ? (HBITMAP) GetMask()->GetMaskBitmap() : NULL;
+    if ( hbmpMask )

     {
     {

-        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 );
-        // background color set to RGB(16,16,16) in consistent with wxGTK
-        unsigned char r=16, g=16, b=16;
-        ptdata = data;
-        ptbits = lpBits;
-        for( i=0; i<height; i++ )
+        wxDIB dibMask(hbmpMask);
+        if ( dibMask.IsOk() )

         {
         {

-            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 )

             {
             {

-                if( *ptbits != 0 )
-                    ptdata += 3;
-                else
+                // traverse one mask DIB line
+                unsigned char *mask = maskLineStart;
+                for ( int x = 0; x < w; x++, mask += maskBytesPerPixel )

                 {
                 {

-                    *(ptdata++)  = r;
-                    *(ptdata++)  = g;
-                    *(ptdata++)  = b;
+                    // should this pixel be transparent?
+                    if ( *mask )
+                    {
+                        // no, check that it isn't transparent by accident
+                        if ( (data[0] == MASK_RED) &&
+                                (data[1] == MASK_GREEN) &&
+                                    (data[2] == MASK_BLUE) )
+                        {
+                            // we have to fudge the colour a bit to prevent
+                            // this pixel from appearing transparent
+                            data[2] = MASK_BLUE_REPLACEMENT;
+                        }
+
+                        data += 3;
+                    }
+                    else // yes, transparent pixel
+                    {
+                        *data++ = MASK_RED;
+                        *data++ = MASK_GREEN;
+                        *data++ = MASK_BLUE;
+                    }

                 }
                 }

-                ptbits += 3;

             }
             }

-            ptbits += padding;
+
+            image.SetMaskColour(MASK_RED, MASK_GREEN, MASK_BLUE);

         }
         }

-        image.SetMaskColour( r, g, b );
-        image.SetMask( TRUE );
-    }
-    else
-    {
-        image.SetMask( FALSE );

     }
     }

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

 
     return image;
 }
 
 
     return image;
 }
 

+#endif // wxUSE_WXDIB
+

 #endif // wxUSE_IMAGE
 
 // ----------------------------------------------------------------------------
 #endif // wxUSE_IMAGE
 
 // ----------------------------------------------------------------------------


@@ -912,19 +988,19 @@ 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() )
         {
             *this = wxBitmap(image);
 
     {
         wxImage image;
         if ( image.LoadFile( filename, type ) && image.Ok() )
         {
             *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(void *data, long type, int width, int height, int depth)


@@ -937,7 +1013,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;


@@ -956,7 +1032,7 @@ bool wxBitmap::SaveFile(const wxString& filename,
         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?
         wxImage image = ConvertToImage();
     {
         // FIXME what about palette? shouldn't we use it?
         wxImage image = ConvertToImage();


@@ -967,7 +1043,7 @@ bool wxBitmap::SaveFile(const wxString& filename,
     }
 #endif // wxUSE_IMAGE
 
     }
 #endif // wxUSE_IMAGE
 

-    return FALSE;
+    return false;

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


@@ -982,11 +1058,13 @@ 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 );
+    wxBitmap ret( rect.width, rect.height, GetDepth() );

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

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

 
     // copy bitmap data
     MemoryHDC dcSrc,
 
     // copy bitmap data
     MemoryHDC dcSrc,


@@ -1034,17 +1112,28 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
 // wxBitmap accessors
 // ----------------------------------------------------------------------------
 
 // wxBitmap accessors
 // ----------------------------------------------------------------------------
 

+#if wxUSE_PALETTE

 wxPalette* wxBitmap::GetPalette() const
 {
     return GetBitmapData() ? &GetBitmapData()->m_bitmapPalette
                            : (wxPalette *) NULL;
 }
 wxPalette* wxBitmap::GetPalette() const
 {
     return GetBitmapData() ? &GetBitmapData()->m_bitmapPalette
                            : (wxPalette *) NULL;
 }

+#endif

 
 wxMask *wxBitmap::GetMask() const
 {
     return GetBitmapData() ? GetBitmapData()->GetMask() : (wxMask *) NULL;
 }
 
 
 wxMask *wxBitmap::GetMask() const
 {
     return GetBitmapData() ? GetBitmapData()->GetMask() : (wxMask *) NULL;
 }
 

+wxBitmap wxBitmap::GetMaskBitmap() const
+{
+    wxBitmap bmp;
+    wxMask *mask = GetMask();
+    if ( mask )
+        bmp.SetHBITMAP(mask->GetMaskBitmap());
+    return bmp;
+}
+

 #ifdef __WXDEBUG__
 
 wxDC *wxBitmap::GetSelectedInto() const
 #ifdef __WXDEBUG__
 
 wxDC *wxBitmap::GetSelectedInto() const


@@ -1063,6 +1152,12 @@ int wxBitmap::GetQuality() const
 
 #endif // WXWIN_COMPATIBILITY_2_4
 
 
 #endif // WXWIN_COMPATIBILITY_2_4
 

+void wxBitmap::UseAlpha()
+{
+    if ( GetBitmapData() )
+        GetBitmapData()->m_hasAlpha = true;
+}
+

 bool wxBitmap::HasAlpha() const
 {
     return GetBitmapData() && GetBitmapData()->m_hasAlpha;
 bool wxBitmap::HasAlpha() const
 {
     return GetBitmapData() && GetBitmapData()->m_hasAlpha;


@@ -1086,7 +1181,7 @@ void wxBitmap::SetSelectedInto(wxDC *dc)
 
 void wxBitmap::SetPalette(const wxPalette& palette)
 {
 
 void wxBitmap::SetPalette(const wxPalette& palette)
 {

-    EnsureHasData();
+    AllocExclusive();

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


@@ -1095,22 +1190,11 @@ 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))
 #if WXWIN_COMPATIBILITY_2_4
 
 void wxBitmap::SetQuality(int WXUNUSED(quality))


@@ -1120,69 +1204,117 @@ void wxBitmap::SetQuality(int WXUNUSED(quality))
 #endif // WXWIN_COMPATIBILITY_2_4
 
 // ----------------------------------------------------------------------------
 #endif // WXWIN_COMPATIBILITY_2_4
 
 // ----------------------------------------------------------------------------

-// TODO: to be replaced by something better
+// raw bitmap access support

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

-// 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
+#ifdef wxHAVE_RAW_BITMAP
+void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp)

 {
 {

-#ifdef __WXMICROWIN__
-    return *this;
-#else
-    wxMemoryDC      memDC;
-    wxBitmap        tmpBitmap(GetWidth(), GetHeight(), dc.GetDepth());
-    HPALETTE        hPal = (HPALETTE) NULL;
-    LPBITMAPINFO    lpDib;
-    void            *lpBits = (void*) NULL;
+#if wxUSE_WXDIB
+    if ( !Ok() )
+    {
+        // no bitmap, no data (raw or otherwise)
+        return NULL;
+    }

 
 

-#if wxUSE_PALETTE
-    if( GetPalette() && GetPalette()->Ok() )
+    // 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 )

     {
     {

-        tmpBitmap.SetPalette(*GetPalette());
-        memDC.SelectObject(tmpBitmap);
-        memDC.SetPalette(*GetPalette());
-        hPal = (HPALETTE)GetPalette()->GetHPALETTE();
+        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
+    else // we're a DIB

     {
     {

-        hPal = (HPALETTE) ::GetStockObject(DEFAULT_PALETTE);
-        wxPalette palette;
-        palette.SetHPALETTE( (WXHPALETTE)hPal );
-        tmpBitmap.SetPalette( palette );
-        memDC.SelectObject(tmpBitmap);
-        memDC.SetPalette( palette );
+        hDIB = GetHbitmap();

     }
     }

-#else // !wxUSE_PALETTE
-    hPal = (HPALETTE) ::GetStockObject(DEFAULT_PALETTE);
-#endif // wxUSE_PALETTE/!wxUSE_PALETTE

 
 

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

 
 

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

 
 

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

 #endif
 }
 
 #endif
 }
 

+void wxBitmap::UngetRawData(wxPixelDataBase& dataBase)
+{
+#if wxUSE_WXDIB
+    if ( !Ok() )
+        return;
+
+    if ( !&dataBase )
+    {
+        // invalid data, don't crash -- but don't assert neither as we're
+        // called automatically from wxPixelDataBase dtor and so there is no
+        // way to prevent this from happening
+        return;
+    }
+
+    // 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
 // ----------------------------------------------------------------------------


@@ -1225,7 +1357,7 @@ 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,
+    wxCHECK_MSG( bitmap.Ok() && bitmap.GetDepth() == 1, false,

                  _T("can't create mask from invalid or not monochrome bitmap") );
 
     if ( m_maskBitmap )
                  _T("can't create mask from invalid or not monochrome bitmap") );
 
     if ( m_maskBitmap )


@@ -1248,9 +1380,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
 }
 


@@ -1276,7 +1409,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


@@ -1284,7 +1417,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.Ok(), false, _T("invalid bitmap in wxMask::Create") );

 
     if ( m_maskBitmap )
     {
 
     if ( m_maskBitmap )
     {


@@ -1307,7 +1440,7 @@ 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(),


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

-        ok = FALSE;
+        ok = false;

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


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

-        ok = FALSE;
+        ok = false;

     }
 
     if ( ok )
     }
 
     if ( ok )


@@ -1345,7 +1478,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__
 }
 


@@ -1360,7 +1495,7 @@ bool wxBitmapHandler::Create(wxGDIImage *image,
 {
     wxBitmap *bitmap = wxDynamicCast(image, wxBitmap);
 
 {
     wxBitmap *bitmap = wxDynamicCast(image, wxBitmap);
 

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

 }
 
 bool wxBitmapHandler::Load(wxGDIImage *image,
 }
 
 bool wxBitmapHandler::Load(wxGDIImage *image,


@@ -1370,7 +1505,7 @@ bool wxBitmapHandler::Load(wxGDIImage *image,
 {
     wxBitmap *bitmap = wxDynamicCast(image, wxBitmap);
 
 {
     wxBitmap *bitmap = wxDynamicCast(image, wxBitmap);
 

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

 }
 
 bool wxBitmapHandler::Save(wxGDIImage *image,
 }
 
 bool wxBitmapHandler::Save(wxGDIImage *image,


@@ -1379,7 +1514,7 @@ bool wxBitmapHandler::Save(wxGDIImage *image,
 {
     wxBitmap *bitmap = wxDynamicCast(image, wxBitmap);
 
 {
     wxBitmap *bitmap = wxDynamicCast(image, wxBitmap);
 

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

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


@@ -1389,7 +1524,7 @@ bool wxBitmapHandler::Create(wxBitmap *WXUNUSED(bitmap),
                              int WXUNUSED(height),
                              int WXUNUSED(depth))
 {
                              int WXUNUSED(height),
                              int WXUNUSED(depth))
 {

-    return FALSE;
+    return false;

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


@@ -1398,7 +1533,7 @@ bool wxBitmapHandler::LoadFile(wxBitmap *WXUNUSED(bitmap),
                                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(wxBitmap *WXUNUSED(bitmap),


@@ -1406,7 +1541,7 @@ bool wxBitmapHandler::SaveFile(wxBitmap *WXUNUSED(bitmap),
                                int WXUNUSED(type),
                                const wxPalette *WXUNUSED(palette))
 {
                                int WXUNUSED(type),
                                const wxPalette *WXUNUSED(palette))
 {

-    return FALSE;
+    return false;

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


@@ -1418,14 +1553,11 @@ bool wxCreateDIB(long xSize, long ySize, long bitsPerPixel,
                  HPALETTE hPal, LPBITMAPINFO* lpDIBHeader)
 {
    unsigned long   i, headerSize;
                  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);
 


@@ -1454,7 +1586,7 @@ bool wxCreateDIB(long xSize, long ySize, long bitsPerPixel,
 
    *lpDIBHeader = lpDIBheader;
 
 
    *lpDIBHeader = lpDIBheader;
 

-   return TRUE;
+   return true;

 }
 
 void wxFreeDIB(LPBITMAPINFO lpDIBHeader)
 }
 
 void wxFreeDIB(LPBITMAPINFO lpDIBHeader)


@@ -1464,10 +1596,82 @@ void wxFreeDIB(LPBITMAPINFO lpDIBHeader)
 #endif
 
 // ----------------------------------------------------------------------------
 #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") );
 {
 #ifndef __WXMICROWIN__
     wxCHECK_MSG( hbmpMask, 0, _T("invalid bitmap in wxInvertMask") );


@@ -1494,8 +1698,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) )


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