Add GetDrawable convenience function that returns m_bitmap

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

diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp
index 170c5b789754cf6c4538dd33b9b50630481f217f..8cc1e1b180ab0a9c27de5b71d6f98021f17a0acd 100644 (file)
--- a/src/msw/bitmap.cpp
+++ b/src/msw/bitmap.cpp
@@ -306,6 +306,38 @@ bool wxBitmap::CopyFromIcon(const wxIcon& icon)
 #endif // Win16/Win32
 }
 
+bool wxBitmap::CopyFromDIB(const wxDIB& dib)
+{
+    wxCHECK_MSG( dib.IsOk(), FALSE, _T("invalid DIB in CopyFromDIB") );
+
+    HBITMAP hbitmap = dib.CreateDDB();
+    if ( !hbitmap )
+        return FALSE;
+
+    UnRef();
+
+    wxBitmapRefData *refData = new wxBitmapRefData;
+    m_refData = refData;
+
+    refData->m_width = dib.GetWidth();
+    refData->m_height = dib.GetHeight();
+    refData->m_depth = dib.GetDepth();
+
+    refData->m_hBitmap = (WXHBITMAP)hbitmap;
+
+#if wxUSE_PALETTE
+    wxPalette *palette = dib.CreatePalette();
+    if ( palette )
+    {
+        refData->m_bitmapPalette = *palette;
+    }
+
+    delete palette;
+#endif // wxUSE_PALETTE
+
+    return TRUE;
+}
+
 wxBitmap::~wxBitmap()
 {
 }
@@ -455,7 +487,6 @@ bool wxBitmap::DoCreate(int w, int h, int d, WXHDC hdc)
         hbmp = dib.Detach();
 
         GetBitmapData()->m_depth = d;
-        GetBitmapData()->m_hasAlpha = d == 32; // 32bpp DIBs have alpha channel
     }
     else // create a DDB
     {
@@ -744,81 +775,7 @@ bool wxBitmap::CreateFromImage(const wxImage& image, int depth, WXHDC hdc )
     }
     else // we need to convert DIB to DDB
     {
-        // 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(hdc ? (HDC)hdc : ScreenHDC(), w, h);
-        if ( !hbitmap )
-        {
-            wxLogLastError(_T("CreateCompatibleBitmap()"));
-
-            return FALSE;
-        }
-
-        MemoryHDC hdcMem;
-        SelectInHDC select(hdcMem, hbitmap);
-        if ( !select )
-        {
-            wxLogLastError(_T("SelectObjct(hBitmap)"));
-        }
-
-#if wxUSE_PALETTE
-        const wxPalette& palette = image.GetPalette();
-
-        HPALETTE hOldPalette;
-        if ( palette.Ok() )
-        {
-            SetPalette(palette);
-
-            hOldPalette = ::SelectPalette
-                            (
-                                hdcMem,
-                                GetHpaletteOf(palette),
-                                FALSE                   // ignored for hdcMem
-                            );
-
-            if ( !hOldPalette )
-            {
-                wxLogLastError(_T("SelectPalette()"));
-            }
-
-            if ( ::RealizePalette(hdcMem) == GDI_ERROR )
-            {
-                wxLogLastError(_T("RealizePalette()"));
-            }
-        }
-        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 )
-        {
-            wxLogLastError(_T("StretchDIBits()"));
-
-            return FALSE;
-        }
-
-#if wxUSE_PALETTE
-        if ( hOldPalette )
-        {
-            ::SelectPalette(hdcMem, hOldPalette, FALSE);
-        }
-#endif // wxUSE_PALETTE
+        hbitmap = dib.CreateDDB((HDC)hdc);
 
         refData->m_depth = depth == -1 ? wxDisplayDepth() : depth;
     }
@@ -1235,70 +1192,6 @@ bool wxBitmap::GetRawData(wxRawBitmapData *data)
     return TRUE;
 }
 
-// ----------------------------------------------------------------------------
-// TODO: to be replaced by something better
-// ----------------------------------------------------------------------------
-
-// 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 __WXMICROWIN__
-    return *this;
-#else
-    wxMemoryDC      memDC;
-    wxBitmap        tmpBitmap(GetWidth(), GetHeight(), dc.GetDepth());
-    HPALETTE        hPal = (HPALETTE) NULL;
-    LPBITMAPINFO    lpDib;
-    void            *lpBits = (void*) NULL;
-
-#if wxUSE_PALETTE
-    if( GetPalette() && GetPalette()->Ok() )
-    {
-        tmpBitmap.SetPalette(*GetPalette());
-        memDC.SelectObject(tmpBitmap);
-        memDC.SetPalette(*GetPalette());
-        hPal = (HPALETTE)GetPalette()->GetHPALETTE();
-    }
-    else
-    {
-        hPal = (HPALETTE) ::GetStockObject(DEFAULT_PALETTE);
-        wxPalette palette;
-        palette.SetHPALETTE( (WXHPALETTE)hPal );
-        tmpBitmap.SetPalette( palette );
-        memDC.SelectObject(tmpBitmap);
-        memDC.SetPalette( palette );
-    }
-#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) )
-    {
-        return wxNullBitmap;
-    }
-
-    lpBits = malloc(lpDib->bmiHeader.biSizeImage);
-
-    ::GetBitmapBits(GetHbitmap(), lpDib->bmiHeader.biSizeImage, lpBits);
-
-    ::SetDIBitsToDevice(GetHdcOf(memDC), 0, 0,
-                        GetWidth(), GetHeight(),
-                        0, 0, 0, GetHeight(),
-                        lpBits, lpDib, DIB_RGB_COLORS);
-
-    free(lpBits);
-
-    wxFreeDIB(lpDib);
-
-    return tmpBitmap;
-#endif
-}
-
 // ----------------------------------------------------------------------------
 // wxMask
 // ----------------------------------------------------------------------------