X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/51ddb341eeffeff2a8e2224b1efd35259d36a552..e136b7476372a2ce0a51a43a0ffc3f31a1e2b2d5:/src/msw/bitmap.cpp diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp index 4e62f8ebd0..9be4159f48 100644 --- a/src/msw/bitmap.cpp +++ b/src/msw/bitmap.cpp @@ -1,4 +1,4 @@ -///////////////////////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////// // Name: bitmap.cpp // Purpose: wxBitmap // Author: Julian Smart @@ -40,8 +40,6 @@ #include "wx/icon.h" #endif -//#include "device.h" - #include "wx/msw/private.h" #include "wx/log.h" @@ -57,6 +55,60 @@ #define CLR_INVALID ((COLORREF)-1) #endif // no CLR_INVALID +// ---------------------------------------------------------------------------- +// Bitmap data +// ---------------------------------------------------------------------------- + +class WXDLLEXPORT wxBitmapRefData : public wxGDIImageRefData +{ +public: + wxBitmapRefData(); + virtual ~wxBitmapRefData() { Free(); } + + virtual void Free(); + + // set the mask object to use as the mask, we take ownership of it + void SetMask(wxMask *mask) + { + delete m_bitmapMask; + m_bitmapMask = mask; + } + + // set the HBITMAP to use as the mask + void SetMask(HBITMAP hbmpMask) + { + SetMask(new wxMask((WXHBITMAP)hbmpMask)); + } + + // return the mask + wxMask *GetMask() const { return m_bitmapMask; } + +public: +#if wxUSE_PALETTE + wxPalette m_bitmapPalette; +#endif // wxUSE_PALETTE + + // MSW-specific + // ------------ + +#ifdef __WXDEBUG__ + // this field is solely for error checking: we detect selecting a bitmap + // into more than one DC at once or deleting a bitmap still selected into a + // DC (both are serious programming errors under Windows) + wxDC *m_selectedInto; +#endif // __WXDEBUG__ + + // true if we have alpha transparency info and can be drawn using + // AlphaBlend() + bool m_hasAlpha; + +private: + // optional mask for transparent drawing + wxMask *m_bitmapMask; + + DECLARE_NO_COPY_CLASS(wxBitmapRefData) +}; + // ---------------------------------------------------------------------------- // macros // ---------------------------------------------------------------------------- @@ -76,11 +128,12 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, wxObject) wxBitmapRefData::wxBitmapRefData() { - m_quality = 0; +#ifdef __WXDEBUG__ m_selectedInto = NULL; - m_numColors = 0; +#endif m_bitmapMask = NULL; m_hBitmap = (WXHBITMAP) NULL; + m_hasAlpha = FALSE; } void wxBitmapRefData::Free() @@ -90,13 +143,10 @@ void wxBitmapRefData::Free() if ( m_hBitmap) { - // printf("About to delete bitmap %d\n", (int) (HBITMAP) m_hBitmap); -#if 1 if ( !::DeleteObject((HBITMAP)m_hBitmap) ) { wxLogLastError(wxT("DeleteObject(hbitmap)")); } -#endif } delete m_bitmapMask; @@ -114,6 +164,11 @@ void wxBitmap::Init() } +wxGDIImageRefData *wxBitmap::CreateData() const +{ + return new wxBitmapRefData; +} + #ifdef __WIN32__ bool wxBitmap::CopyFromIconOrCursor(const wxGDIImage& icon) @@ -144,8 +199,7 @@ bool wxBitmap::CopyFromIconOrCursor(const wxGDIImage& icon) // the mask returned by GetIconInfo() is inversed compared to the usual // wxWin convention - refData->m_bitmapMask = new wxMask((WXHBITMAP) - wxInvertMask(iconInfo.hbmMask, w, h)); + refData->SetMask(wxInvertMask(iconInfo.hbmMask, w, h)); // delete the old one now as we don't need it any more @@ -238,8 +292,6 @@ wxBitmap::wxBitmap(const char bits[], int width, int height, int depth) refData->m_width = width; refData->m_height = height; refData->m_depth = depth; - refData->m_numColors = 0; - refData->m_selectedInto = NULL; char *data; if ( depth == 1 ) @@ -341,63 +393,75 @@ bool wxBitmap::Create(int w, int h, int d) m_refData = new wxBitmapRefData; - GetBitmapData()->m_width = w; - GetBitmapData()->m_height = h; - GetBitmapData()->m_depth = d; - - HBITMAP hbmp; -#ifndef __WXMICROWIN__ - if ( d > 0 ) +#if wxUSE_DIB_FOR_BITMAP + if ( w && h && d >= 16 ) { - hbmp = ::CreateBitmap(w, h, 1, d, NULL); - if ( !hbmp ) - { - wxLogLastError(wxT("CreateBitmap")); - } + if ( !CreateDIB(w, h, d) ) + return FALSE; } else -#endif +#endif // wxUSE_DIB_FOR_BITMAP { - ScreenHDC dc; - hbmp = ::CreateCompatibleBitmap(dc, w, h); - if ( !hbmp ) + GetBitmapData()->m_width = w; + GetBitmapData()->m_height = h; + GetBitmapData()->m_depth = d; + + HBITMAP hbmp; +#ifndef __WXMICROWIN__ + if ( d > 0 ) { - wxLogLastError(wxT("CreateCompatibleBitmap")); + hbmp = ::CreateBitmap(w, h, 1, d, NULL); + if ( !hbmp ) + { + wxLogLastError(wxT("CreateBitmap")); + } } + else +#endif // !__WXMICROWIN__ + { + ScreenHDC dc; + hbmp = ::CreateCompatibleBitmap(dc, w, h); + if ( !hbmp ) + { + wxLogLastError(wxT("CreateCompatibleBitmap")); + } - GetBitmapData()->m_depth = wxDisplayDepth(); - } + GetBitmapData()->m_depth = wxDisplayDepth(); + } - SetHBITMAP((WXHBITMAP)hbmp); + SetHBITMAP((WXHBITMAP)hbmp); #if WXWIN_COMPATIBILITY_2 - GetBitmapData()->m_ok = hbmp != 0; + GetBitmapData()->m_ok = hbmp != 0; #endif // WXWIN_COMPATIBILITY_2 + } + return Ok(); } +#if wxUSE_IMAGE + // ---------------------------------------------------------------------------- -// wxImage to/from conversions +// wxImage to/from conversions for Microwin // ---------------------------------------------------------------------------- -#if wxUSE_IMAGE +// Microwin versions are so different from normal ones that it really doesn't +// make sense to use #ifdefs inside the function bodies +#ifdef __WXMICROWIN__ bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) { -#ifdef __WXMICROWIN__ - - // Set this to 1 to experiment with mask code, - // which currently doesn't work -#define USE_MASKS 0 + // Set this to 1 to experiment with mask code, + // which currently doesn't work + #define USE_MASKS 0 m_refData = new wxBitmapRefData(); // Initial attempt at a simple-minded implementation. // The bitmap will always be created at the screen depth, // so the 'depth' argument is ignored. - + HDC hScreenDC = ::GetDC(NULL); - // printf("Screen planes = %d, bpp = %d\n", hScreenDC->psd->planes, hScreenDC->psd->bpp); int screenDepth = ::GetDeviceCaps(hScreenDC, BITSPIXEL); HBITMAP hBitmap = ::CreateCompatibleBitmap(hScreenDC, image.GetWidth(), image.GetHeight()); @@ -412,7 +476,7 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) if (hBitmap == NULL) { ::ReleaseDC(NULL, hScreenDC); - return FALSE; + return FALSE; } HDC hMemDC = ::CreateCompatibleDC(hScreenDC); @@ -439,7 +503,7 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) if (!hMaskBitmap) { hasMask = FALSE; - } + } else { hScreenDC = ::GetDC(NULL); @@ -447,7 +511,7 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) ::ReleaseDC(NULL, hScreenDC); hOldMaskBitmap = ::SelectObject( hMaskDC, hMaskBitmap); - } + } #else hasMask = FALSE; #endif @@ -456,13 +520,13 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) int i, j; for (i = 0; i < image.GetWidth(); i++) { - for (j = 0; j < image.GetHeight(); j++) - { - unsigned char red = image.GetRed(i, j); - unsigned char green = image.GetGreen(i, j); - unsigned char blue = image.GetBlue(i, j); + for (j = 0; j < image.GetHeight(); j++) + { + unsigned char red = image.GetRed(i, j); + unsigned char green = image.GetGreen(i, j); + unsigned char blue = image.GetBlue(i, j); - ::SetPixel(hMemDC, i, j, PALETTERGB(red, green, blue)); + ::SetPixel(hMemDC, i, j, PALETTERGB(red, green, blue)); if (hasMask) { @@ -472,8 +536,8 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) ::SetPixel(hMaskDC, i, j, PALETTERGB(0, 0, 0)); else ::SetPixel(hMaskDC, i, j, PALETTERGB(255, 255, 255)); - } - } + } + } } ::SelectObject(hMemDC, hOldBitmap); @@ -481,264 +545,31 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) if (hasMask) { ::SelectObject(hMaskDC, hOldMaskBitmap); - ::DeleteDC(hMaskDC); + ::DeleteDC(hMaskDC); - ((wxBitmapRefData*)m_refData)->m_bitmapMask = new wxMask((WXHBITMAP) hMaskBitmap); + ((wxBitmapRefData*)m_refData)->SetMask(hMaskBitmap); } - + SetWidth(image.GetWidth()); SetHeight(image.GetHeight()); SetDepth(screenDepth); SetHBITMAP( (WXHBITMAP) hBitmap ); - -#if wxUSE_PALETTE - // Copy the palette from the source image - SetPalette(image.GetPalette()); -#endif // wxUSE_PALETTE - -#if WXWIN_COMPATIBILITY_2 - // check the wxBitmap object - GetBitmapData()->SetOk(); -#endif // WXWIN_COMPATIBILITY_2 - - return TRUE; - -#else - wxCHECK_MSG( image.Ok(), FALSE, wxT("invalid image") ) - - m_refData = new wxBitmapRefData(); - - // sizeLimit is the MS upper limit for the DIB size -#ifdef WIN32 - int sizeLimit = 1024*768*3; -#else - int sizeLimit = 0x7fff ; -#endif - - // width and height of the device-dependent bitmap - int width = image.GetWidth(); - int bmpHeight = image.GetHeight(); - - // calc the number of bytes per scanline and padding - int bytePerLine = width*3; - int sizeDWORD = sizeof( DWORD ); - int lineBoundary = bytePerLine % sizeDWORD; - int padding = 0; - if( lineBoundary > 0 ) - { - padding = sizeDWORD - lineBoundary; - bytePerLine += padding; - } - // calc the number of DIBs and heights of DIBs - int numDIB = 1; - int hRemain = 0; - int height = sizeLimit/bytePerLine; - if( height >= bmpHeight ) - height = bmpHeight; - else - { - numDIB = bmpHeight / height; - hRemain = bmpHeight % height; - if( hRemain >0 ) numDIB++; - } - - // set bitmap parameters - wxCHECK_MSG( image.Ok(), FALSE, wxT("invalid image") ); - SetWidth( width ); - SetHeight( bmpHeight ); - if (depth == -1) depth = wxDisplayDepth(); - SetDepth( depth ); #if wxUSE_PALETTE // Copy the palette from the source image SetPalette(image.GetPalette()); #endif // wxUSE_PALETTE - // create a DIB header - int headersize = sizeof(BITMAPINFOHEADER); - BITMAPINFO *lpDIBh = (BITMAPINFO *) malloc( headersize ); - wxCHECK_MSG( lpDIBh, FALSE, wxT("could not allocate memory for DIB header") ); - // Fill in the DIB header - lpDIBh->bmiHeader.biSize = headersize; - lpDIBh->bmiHeader.biWidth = (DWORD)width; - lpDIBh->bmiHeader.biHeight = (DWORD)(-height); - lpDIBh->bmiHeader.biSizeImage = bytePerLine*height; - // the general formula for biSizeImage: - // ( ( ( ((DWORD)width*24) +31 ) & ~31 ) >> 3 ) * height; - lpDIBh->bmiHeader.biPlanes = 1; - lpDIBh->bmiHeader.biBitCount = 24; - lpDIBh->bmiHeader.biCompression = BI_RGB; - lpDIBh->bmiHeader.biClrUsed = 0; - // These seem not really needed for our purpose here. - lpDIBh->bmiHeader.biClrImportant = 0; - lpDIBh->bmiHeader.biXPelsPerMeter = 0; - lpDIBh->bmiHeader.biYPelsPerMeter = 0; - // memory for DIB data - unsigned char *lpBits; - lpBits = (unsigned char *)malloc( lpDIBh->bmiHeader.biSizeImage ); - if( !lpBits ) - { - wxFAIL_MSG( wxT("could not allocate memory for DIB") ); - free( lpDIBh ); - return FALSE; - } - - // create and set the device-dependent bitmap - HDC hdc = ::GetDC(NULL); - HDC memdc = ::CreateCompatibleDC( hdc ); - HBITMAP hbitmap; - hbitmap = ::CreateCompatibleBitmap( hdc, width, bmpHeight ); - ::SelectObject( memdc, hbitmap); - -#if wxUSE_PALETTE - HPALETTE hOldPalette = 0; - if (image.GetPalette().Ok()) - { - hOldPalette = ::SelectPalette(memdc, (HPALETTE) image.GetPalette().GetHPALETTE(), FALSE); - ::RealizePalette(memdc); - } -#endif // wxUSE_PALETTE - - // copy image data into DIB data and then into DDB (in a loop) - unsigned char *data = image.GetData(); - int i, j, n; - int origin = 0; - unsigned char *ptdata = data; - unsigned char *ptbits; - - for( n=0; n 1 && n == numDIB-1 && hRemain > 0 ) - { - // redefine height and size of the (possibly) last smaller DIB - // memory is not reallocated - height = hRemain; - lpDIBh->bmiHeader.biHeight = (DWORD)(-height); - lpDIBh->bmiHeader.biSizeImage = bytePerLine*height; - } - ptbits = lpBits; - - for( j=0; jbmiHeader), CBM_INIT, lpBits, lpDIBh, DIB_RGB_COLORS ); - // The above line is equivalent to the following two lines. - // hbitmap = ::CreateCompatibleBitmap( hdc, width, height ); - // ::SetDIBits( hdc, hbitmap, 0, height, lpBits, lpDIBh, DIB_RGB_COLORS); - // or the following lines - // hbitmap = ::CreateCompatibleBitmap( hdc, width, height ); - // HDC memdc = ::CreateCompatibleDC( hdc ); - // ::SelectObject( memdc, hbitmap); - // ::SetDIBitsToDevice( memdc, 0, 0, width, height, - // 0, 0, 0, height, (void *)lpBits, lpDIBh, DIB_RGB_COLORS); - // ::SelectObject( memdc, 0 ); - // ::DeleteDC( memdc ); - } - SetHBITMAP( (WXHBITMAP) hbitmap ); - -#if wxUSE_PALETTE - if (hOldPalette) - SelectPalette(memdc, hOldPalette, FALSE); -#endif // wxUSE_PALETTE - - // similarly, created an mono-bitmap for the possible mask - if( image.HasMask() ) - { - hbitmap = ::CreateBitmap( (WORD)width, (WORD)bmpHeight, 1, 1, NULL ); - HGDIOBJ hbmpOld = ::SelectObject( memdc, hbitmap); - if( numDIB == 1 ) height = bmpHeight; - else height = sizeLimit/bytePerLine; - lpDIBh->bmiHeader.biHeight = (DWORD)(-height); - lpDIBh->bmiHeader.biSizeImage = bytePerLine*height; - origin = 0; - unsigned char r = image.GetMaskRed(); - unsigned char g = image.GetMaskGreen(); - unsigned char b = image.GetMaskBlue(); - unsigned char zero = 0, one = 255; - ptdata = data; - for( n=0; n 1 && n == numDIB - 1 && hRemain > 0 ) - { - // redefine height and size of the (possibly) last smaller DIB - // memory is not reallocated - height = hRemain; - lpDIBh->bmiHeader.biHeight = (DWORD)(-height); - lpDIBh->bmiHeader.biSizeImage = bytePerLine*height; - } - ptbits = lpBits; - for( int j=0; jSetMaskBitmap( (WXHBITMAP) hbitmap ); - SetMask( mask ); - // It will be deleted when the wxBitmap object is deleted (as of 01/1999) - /* The following can also be used but is slow to run - wxColour colour( GetMaskRed(), GetMaskGreen(), GetMaskBlue()); - wxMask *mask = new wxMask( *this, colour ); - SetMask( mask ); - */ - - ::SelectObject( memdc, hbmpOld ); - } - - // free allocated resources - ::DeleteDC( memdc ); - ::ReleaseDC(NULL, hdc); - free(lpDIBh); - free(lpBits); - #if WXWIN_COMPATIBILITY_2 // check the wxBitmap object GetBitmapData()->SetOk(); #endif // WXWIN_COMPATIBILITY_2 return TRUE; -#endif } wxImage wxBitmap::ConvertToImage() const { -#ifdef __WXMICROWIN__ // Initial attempt at a simple-minded implementation. // The bitmap will always be created at the screen depth, // so the 'depth' argument is ignored. @@ -747,7 +578,7 @@ wxImage wxBitmap::ConvertToImage() const if (!Ok()) { wxFAIL_MSG( wxT("bitmap is invalid") ); - return wxNullImage; + return wxNullImage; } wxImage image; @@ -764,33 +595,33 @@ wxImage wxBitmap::ConvertToImage() const wxFAIL_MSG( wxT("could not allocate data for image") ); return wxNullImage; } - + HDC hScreenDC = ::GetDC(NULL); HDC hMemDC = ::CreateCompatibleDC(hScreenDC); ::ReleaseDC(NULL, hScreenDC); HBITMAP hBitmap = (HBITMAP) GetHBITMAP(); - + HBITMAP hOldBitmap = ::SelectObject(hMemDC, hBitmap); int i, j; for (i = 0; i < GetWidth(); i++) { - for (j = 0; j < GetHeight(); j++) - { - COLORREF color = ::GetPixel(hMemDC, i, j); - unsigned char red = GetRValue(color); - unsigned char green = GetGValue(color); - unsigned char blue = GetBValue(color); - - image.SetRGB(i, j, red, green, blue); - } + for (j = 0; j < GetHeight(); j++) + { + COLORREF color = ::GetPixel(hMemDC, i, j); + unsigned char red = GetRValue(color); + unsigned char green = GetGValue(color); + unsigned char blue = GetBValue(color); + + image.SetRGB(i, j, red, green, blue); + } } ::SelectObject(hMemDC, hOldBitmap); ::DeleteDC(hMemDC); - + #if wxUSE_PALETTE // Copy the palette from the source image if (GetPalette()) @@ -798,9 +629,144 @@ wxImage wxBitmap::ConvertToImage() const #endif // wxUSE_PALETTE return image; +} -#else // __MICROWIN__ +#endif // __WXMICROWIN__ +// ---------------------------------------------------------------------------- +// wxImage to/from conversions +// ---------------------------------------------------------------------------- + +bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) +{ + wxCHECK_MSG( image.Ok(), FALSE, wxT("invalid image") ); + + UnRef(); + + // first convert the image to DIB + const int h = image.GetHeight(); + const int w = image.GetWidth(); + + wxDIB dib(image); + if ( !dib.IsOk() ) + return FALSE; + + + // store the bitmap parameters + wxBitmapRefData *refData = new wxBitmapRefData; + refData->m_width = w; + refData->m_height = h; + refData->m_depth = dib.GetDepth(); + refData->m_hasAlpha = image.HasAlpha(); + + m_refData = refData; + + + // next either store DIB as is or create a DDB from it + HBITMAP hbitmap; + + // TODO: if we're ready to use DIB as is, we can just do this: + // if ( ... ) + // hbitmap = dib.Detach(); + // else + { + // 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()")); + + 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 + } + + // 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()))); + } + + return TRUE; +} + +wxImage wxBitmap::ConvertToImage() const +{ wxImage image; wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") ); @@ -925,11 +891,14 @@ wxImage wxBitmap::ConvertToImage() const free(lpBits); return image; -#endif } #endif // wxUSE_IMAGE +// ---------------------------------------------------------------------------- +// loading and saving bitmaps +// ---------------------------------------------------------------------------- + bool wxBitmap::LoadFile(const wxString& filename, long type) { UnRef(); @@ -948,7 +917,7 @@ bool wxBitmap::LoadFile(const wxString& filename, long type) wxImage image; if ( image.LoadFile( filename, type ) && image.Ok() ) { - *this = image.ConvertToBitmap(); + *this = wxBitmap(image); return TRUE; } @@ -966,7 +935,7 @@ bool wxBitmap::Create(void *data, long type, int width, int height, int depth) if ( !handler ) { - wxLogDebug(wxT("Failed to create bitmap: no bitmap handler for type %d defined."), type); + wxLogDebug(wxT("Failed to create bitmap: no bitmap handler for type %ld defined."), type); return FALSE; } @@ -990,7 +959,7 @@ bool wxBitmap::SaveFile(const wxString& filename, else { // FIXME what about palette? shouldn't we use it? - wxImage image( *this ); + wxImage image = ConvertToImage(); if ( image.Ok() ) { return image.SaveFile(filename, type); @@ -1007,66 +976,111 @@ bool wxBitmap::SaveFile(const wxString& filename, wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const { -#ifndef __WXMICROWIN__ wxCHECK_MSG( Ok() && (rect.x >= 0) && (rect.y >= 0) && (rect.x+rect.width <= GetWidth()) && (rect.y+rect.height <= GetHeight()), wxNullBitmap, wxT("Invalid bitmap or bitmap region") ); - wxBitmap ret( rect.width, rect.height, GetDepth() ); + wxBitmap ret( rect.width, rect.height ); wxASSERT_MSG( ret.Ok(), wxT("GetSubBitmap error") ); +#ifndef __WXMICROWIN__ + // TODO: copy alpha channel data if any + // copy bitmap data - HDC dcSrc = ::CreateCompatibleDC(NULL); - HDC dcDst = ::CreateCompatibleDC(NULL); - SelectObject(dcSrc, (HBITMAP) GetHBITMAP()); - SelectObject(dcDst, (HBITMAP) ret.GetHBITMAP()); - BitBlt(dcDst, 0, 0, rect.width, rect.height, dcSrc, rect.x, rect.y, SRCCOPY); + MemoryHDC dcSrc, + dcDst; + + { + SelectInHDC selectSrc(dcSrc, GetHbitmap()), + selectDst(dcDst, GetHbitmapOf(ret)); + + if ( !selectSrc || !selectDst ) + { + wxLogLastError(_T("SelectObjct(hBitmap)")); + } + + if ( !::BitBlt(dcDst, 0, 0, rect.width, rect.height, + dcSrc, rect.x, rect.y, SRCCOPY) ) + { + wxLogLastError(_T("BitBlt")); + } + } // copy mask if there is one - if (GetMask()) + if ( GetMask() ) { HBITMAP hbmpMask = ::CreateBitmap(rect.width, rect.height, 1, 1, 0); - SelectObject(dcSrc, (HBITMAP) GetMask()->GetMaskBitmap()); - SelectObject(dcDst, (HBITMAP) hbmpMask); - BitBlt(dcDst, 0, 0, rect.width, rect.height, dcSrc, rect.x, rect.y, SRCCOPY); + SelectInHDC selectSrc(dcSrc, (HBITMAP) GetMask()->GetMaskBitmap()), + selectDst(dcDst, hbmpMask); + + if ( !::BitBlt(dcDst, 0, 0, rect.width, rect.height, + dcSrc, rect.x, rect.y, SRCCOPY) ) + { + wxLogLastError(_T("BitBlt")); + } wxMask *mask = new wxMask((WXHBITMAP) hbmpMask); ret.SetMask(mask); } - - SelectObject(dcDst, NULL); - SelectObject(dcSrc, NULL); - DeleteDC(dcDst); - DeleteDC(dcSrc); +#endif // !__WXMICROWIN__ return ret; -#else - return wxBitmap(); -#endif } // ---------------------------------------------------------------------------- // wxBitmap accessors // ---------------------------------------------------------------------------- -void wxBitmap::SetQuality(int q) +wxPalette* wxBitmap::GetPalette() const { - EnsureHasData(); + return GetBitmapData() ? &GetBitmapData()->m_bitmapPalette + : (wxPalette *) NULL; +} - GetBitmapData()->m_quality = q; +wxMask *wxBitmap::GetMask() const +{ + return GetBitmapData() ? GetBitmapData()->GetMask() : (wxMask *) NULL; } -#if WXWIN_COMPATIBILITY_2 -void wxBitmap::SetOk(bool isOk) +#ifdef __WXDEBUG__ + +wxDC *wxBitmap::GetSelectedInto() const { - EnsureHasData(); + return GetBitmapData() ? GetBitmapData()->m_selectedInto : (wxDC *) NULL; +} - GetBitmapData()->m_ok = isOk; +#endif + +#if WXWIN_COMPATIBILITY_2_4 + +int wxBitmap::GetQuality() const +{ + return 0; } -#endif // WXWIN_COMPATIBILITY_2 + +#endif // WXWIN_COMPATIBILITY_2_4 + +bool wxBitmap::HasAlpha() const +{ + return GetBitmapData() && GetBitmapData()->m_hasAlpha; +} + +// ---------------------------------------------------------------------------- +// wxBitmap setters +// ---------------------------------------------------------------------------- + +#ifdef __WXDEBUG__ + +void wxBitmap::SetSelectedInto(wxDC *dc) +{ + if ( GetBitmapData() ) + GetBitmapData()->m_selectedInto = dc; +} + +#endif #if wxUSE_PALETTE @@ -1083,9 +1097,32 @@ void wxBitmap::SetMask(wxMask *mask) { EnsureHasData(); - GetBitmapData()->m_bitmapMask = 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 + +// ---------------------------------------------------------------------------- +// 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. @@ -1260,7 +1297,7 @@ bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour) // scan the bitmap for the transparent colour and set the corresponding // pixels in the mask to BLACK and the rest to WHITE - COLORREF maskColour = RGB(colour.Red(), colour.Green(), colour.Blue()); + COLORREF maskColour = wxColourToPalRGB(colour); m_maskBitmap = (WXHBITMAP)::CreateBitmap(width, height, 1, 1, 0); HDC srcDC = ::CreateCompatibleDC(NULL); @@ -1292,47 +1329,14 @@ bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour) ok = FALSE; } - // VZ: I'm leaving the old code in for now in case it is needed under Win95 - // or any other broken Windows versions but it is horribly inefficient: - // creating 100 masks for 80x80 bitmaps takes 7.8 seconds on my machine - // but only 0.2 using the new code! -#if 0 - // this is not very efficient, but I can't think of a better way of doing - // it - for ( int w = 0; ok && (w < width); w++ ) + if ( ok ) { - for ( int h = 0; ok && (h < height); h++ ) - { - COLORREF col = GetPixel(srcDC, w, h); - if ( col == CLR_INVALID ) - { - wxLogLastError(wxT("GetPixel")); - - // doesn't make sense to continue - ok = FALSE; - - break; - } - - if ( col == maskColour ) - { - ::SetPixel(destDC, w, h, RGB(0, 0, 0)); - } - else - { - ::SetPixel(destDC, w, h, RGB(255, 255, 255)); - } - } + // this will create a monochrome bitmap with 0 points for the pixels + // which have the same value as the background colour and 1 for the + // others + ::SetBkColor(srcDC, maskColour); + ::BitBlt(destDC, 0, 0, width, height, srcDC, 0, 0, NOTSRCCOPY); } -#else - HBRUSH hbrMask = ::CreateSolidBrush(maskColour); - HGDIOBJ hbrOld = ::SelectObject(destDC, hbrMask); - - // the ternary raster operation 0x3C004A is dest := src ^ brush - ::BitBlt(destDC, 0, 0, width, height, srcDC, 0, 0, 0x3C004A); - - ::SelectObject(destDC, hbrOld); -#endif ::SelectObject(srcDC, hbmpSrcOld); ::DeleteDC(srcDC); @@ -1340,9 +1344,9 @@ bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour) ::DeleteDC(destDC); return ok; -#else +#else // __WXMICROWIN__ return FALSE; -#endif +#endif // __WXMICROWIN__/!__WXMICROWIN__ } // ----------------------------------------------------------------------------