X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e7003166c3bf8f8cbca313addc9d07fa7c21f484..58c837a4e67c0996134cc0947691dc09c5f26687:/src/msw/bitmap.cpp diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp index cbb71c3f2e..fe11b93585 100644 --- a/src/msw/bitmap.cpp +++ b/src/msw/bitmap.cpp @@ -9,380 +9,387 @@ // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// +// ============================================================================ +// declarations +// ============================================================================ + +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- + #ifdef __GNUG__ -#pragma implementation "bitmap.h" + #pragma implementation "bitmap.h" #endif // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif #ifndef WX_PRECOMP -#include -#include "wx/setup.h" -#include "wx/list.h" -#include "wx/utils.h" -#include "wx/app.h" -#include "wx/palette.h" -#include "wx/bitmap.h" -#include "wx/icon.h" + #include + + #include "wx/list.h" + #include "wx/utils.h" + #include "wx/app.h" + #include "wx/palette.h" + #include "wx/dcmemory.h" + #include "wx/bitmap.h" + #include "wx/icon.h" #endif -#include "wx/image.h" #include "wx/msw/private.h" #include "wx/log.h" -#include "assert.h" - -#if wxUSE_XPM_IN_MSW -#define FOR_MSW 1 -#include "../src/xpm/xpm34.h" -#endif - #include "wx/msw/dib.h" +#include "wx/image.h" + +// ---------------------------------------------------------------------------- +// macros +// ---------------------------------------------------------------------------- #if !USE_SHARED_LIBRARIES -IMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxGDIObject) -IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject) + IMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxGDIObject) + IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject) + + IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, wxObject) #endif -wxBitmapRefData::wxBitmapRefData(void) +// ============================================================================ +// implementation +// ============================================================================ + +// ---------------------------------------------------------------------------- +// wxBitmapRefData +// ---------------------------------------------------------------------------- + +wxBitmapRefData::wxBitmapRefData() { - m_ok = FALSE; - m_width = 0; - m_height = 0; - m_depth = 0; - m_quality = 0; - m_hBitmap = 0 ; - m_selectedInto = NULL; - m_numColors = 0; - m_bitmapMask = NULL; + m_quality = 0; + m_selectedInto = NULL; + m_numColors = 0; + m_bitmapMask = NULL; } -wxBitmapRefData::~wxBitmapRefData(void) +void wxBitmapRefData::Free() { - if (m_selectedInto) - { - char buf[200]; - sprintf(buf, "Bitmap was deleted without selecting out of wxMemoryDC %X.", (unsigned int) m_selectedInto); - wxFatalError(buf); - } - if (m_hBitmap) - { - DeleteObject((HBITMAP) m_hBitmap); - } - m_hBitmap = 0 ; - - if (m_bitmapMask) -// delete m_bitmapMask; // this line cause an exception - m_bitmapMask = NULL; + wxASSERT_MSG( !m_selectedInto, + wxT("deleting bitmap still selected into wxMemoryDC") ); -} - -wxList wxBitmap::sm_handlers; + if ( m_hBitmap) + { + if ( !::DeleteObject((HBITMAP)m_hBitmap) ) + { + wxLogLastError("DeleteObject(hbitmap)"); + } + } -wxBitmap::wxBitmap(void) -{ - if ( wxTheBitmapList ) - wxTheBitmapList->AddBitmap(this); + delete m_bitmapMask; + m_bitmapMask = NULL; } -wxBitmap::~wxBitmap(void) -{ - if (wxTheBitmapList) - wxTheBitmapList->DeleteObject(this); -} +// ---------------------------------------------------------------------------- +// wxBitmap creation +// ---------------------------------------------------------------------------- -bool wxBitmap::FreeResource(bool force) +// this function should be called from all wxBitmap ctors +void wxBitmap::Init() { - if ( !M_BITMAPDATA ) - return FALSE; - - if (M_BITMAPDATA->m_selectedInto) - { - char buf[200]; - sprintf(buf, "Bitmap %X was deleted without selecting out of wxMemoryDC %X.", (unsigned int) this, (unsigned int) M_BITMAPDATA->m_selectedInto); - wxFatalError(buf); - } - if (M_BITMAPDATA->m_hBitmap) - { - DeleteObject((HBITMAP) M_BITMAPDATA->m_hBitmap); - } - M_BITMAPDATA->m_hBitmap = 0 ; - -/* - if (M_BITMAPDATA->m_bitmapPalette) - delete M_BITMAPDATA->m_bitmapPalette; - - M_BITMAPDATA->m_bitmapPalette = NULL ; -*/ - - return TRUE; + // m_refData = NULL; done in the base class ctor + + if ( wxTheBitmapList ) + wxTheBitmapList->AddBitmap(this); } +#ifdef __WIN32__ -wxBitmap::wxBitmap(const char bits[], int the_width, int the_height, int no_bits) +bool wxBitmap::CopyFromIconOrCursor(const wxGDIImage& icon) { - m_refData = new wxBitmapRefData; + // it may be either HICON or HCURSOR + HICON hicon = (HICON)icon.GetHandle(); - M_BITMAPDATA->m_width = the_width ; - M_BITMAPDATA->m_height = the_height ; - M_BITMAPDATA->m_depth = no_bits ; - M_BITMAPDATA->m_numColors = 0; + ICONINFO iconInfo; + if ( !::GetIconInfo(hicon, &iconInfo) ) + { + wxLogLastError("GetIconInfo"); - M_BITMAPDATA->m_hBitmap = (WXHBITMAP) CreateBitmap(the_width, the_height, 1, no_bits, bits); + return FALSE; + } - if (M_BITMAPDATA->m_hBitmap) - M_BITMAPDATA->m_ok = TRUE; - else - M_BITMAPDATA->m_ok = FALSE; + wxBitmapRefData *refData = new wxBitmapRefData; + m_refData = refData; - M_BITMAPDATA->m_selectedInto = NULL; + refData->m_width = icon.GetWidth(); + refData->m_height = icon.GetHeight(); + refData->m_depth = wxDisplayDepth(); - if ( wxTheBitmapList ) - wxTheBitmapList->AddBitmap(this); -} + refData->m_hBitmap = (WXHBITMAP)iconInfo.hbmColor; + refData->m_bitmapMask = new wxMask((WXHBITMAP)iconInfo.hbmMask); -wxBitmap::wxBitmap(int w, int h, int d) -{ - (void)Create(w, h, d); +#if WXWIN_COMPATIBILITY_2 + refData->m_ok = TRUE; +#endif // WXWIN_COMPATIBILITY_2 - if ( wxTheBitmapList ) - wxTheBitmapList->AddBitmap(this); + return TRUE; } -wxBitmap::wxBitmap(void *data, long type, int width, int height, int depth) +#endif // Win32 + +bool wxBitmap::CopyFromCursor(const wxCursor& cursor) { - (void) Create(data, type, width, height, depth); + UnRef(); - if ( wxTheBitmapList ) - wxTheBitmapList->AddBitmap(this); -} + if ( !cursor.Ok() ) + return FALSE; -wxBitmap::wxBitmap(const wxString& filename, long type) -{ - LoadFile(filename, (int)type); +#ifdef __WIN16__ + wxFAIL_MSG( _T("don't know how to convert cursor to bitmap") ); - if ( wxTheBitmapList ) - wxTheBitmapList->AddBitmap(this); -} + return FALSE; +#endif // Win16 -#if wxUSE_XPM_IN_MSW -// Create from data -wxBitmap::wxBitmap(char **data, wxItem *WXUNUSED(anItem)) -{ - (void) Create((void *)data, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0); + return CopyFromIconOrCursor(cursor); } -#endif -bool wxBitmap::Create(int w, int h, int d) +bool wxBitmap::CopyFromIcon(const wxIcon& icon) { - UnRef(); - - m_refData = new wxBitmapRefData; - - M_BITMAPDATA->m_width = w; - M_BITMAPDATA->m_height = h; - M_BITMAPDATA->m_depth = d; - - if (d > 0) - { - M_BITMAPDATA->m_hBitmap = (WXHBITMAP) CreateBitmap(w, h, 1, d, NULL); - } - else - { - HDC dc = GetDC(NULL); - M_BITMAPDATA->m_hBitmap = (WXHBITMAP) CreateCompatibleBitmap(dc, w, h); - ReleaseDC(NULL, dc); - M_BITMAPDATA->m_depth = wxDisplayDepth(); - } - if (M_BITMAPDATA->m_hBitmap) - M_BITMAPDATA->m_ok = TRUE; - else - M_BITMAPDATA->m_ok = FALSE; - return M_BITMAPDATA->m_ok; -} + UnRef(); -bool wxBitmap::LoadFile(const wxString& filename, long type) -{ - UnRef(); + if ( !icon.Ok() ) + return FALSE; - m_refData = new wxBitmapRefData; + // 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(); - wxBitmapHandler *handler = FindHandler(type); + // copy the icon to the bitmap + ScreenHDC hdcScreen; + HDC hdc = ::CreateCompatibleDC(hdcScreen); + HBITMAP hbitmap = ::CreateCompatibleBitmap(hdcScreen, width, height); + HBITMAP hbmpOld = (HBITMAP)::SelectObject(hdc, hbitmap); - if ( handler == NULL ) { - wxLogWarning("no bitmap handler for type %d defined.", type); + ::DrawIcon(hdc, 0, 0, GetHiconOf(icon)); - return FALSE; - } + ::SelectObject(hdc, hbmpOld); + ::DeleteDC(hdc); - return handler->LoadFile(this, filename, type, -1, -1); -} + wxBitmapRefData *refData = new wxBitmapRefData; + m_refData = refData; -bool wxBitmap::Create(void *data, long type, int width, int height, int depth) -{ - UnRef(); - - m_refData = new wxBitmapRefData; + refData->m_width = width; + refData->m_height = height; + refData->m_depth = wxDisplayDepth(); - wxBitmapHandler *handler = FindHandler(type); + refData->m_hBitmap = (WXHBITMAP)hbitmap; - if ( handler == NULL ) { - wxLogWarning("no bitmap handler for type %d defined.", type); +#if WXWIN_COMPATIBILITY_2 + refData->m_ok = TRUE; +#endif // WXWIN_COMPATIBILITY_2 - return FALSE; - } + return TRUE; +#else // Win32 + return CopyFromIconOrCursor(icon); +#endif // Win16/Win32 +} - return handler->Create(this, data, type, width, height, depth); +wxBitmap::~wxBitmap() +{ + if (wxTheBitmapList) + wxTheBitmapList->DeleteObject(this); } -bool wxBitmap::SaveFile(const wxString& filename, int type, const wxPalette *palette) +wxBitmap::wxBitmap(const char bits[], int the_width, int the_height, int no_bits) { - wxBitmapHandler *handler = FindHandler(type); + Init(); - if ( handler == NULL ) { - wxLogWarning("no bitmap handler for type %d defined.", type); + wxBitmapRefData *refData = new wxBitmapRefData; + m_refData = refData; - return FALSE; - } + refData->m_width = the_width; + refData->m_height = the_height; + refData->m_depth = no_bits; + refData->m_numColors = 0; + refData->m_selectedInto = NULL; + + HBITMAP hbmp = ::CreateBitmap(the_width, the_height, 1, no_bits, bits); + if ( !hbmp ) + { + wxLogLastError("CreateBitmap"); + } - return handler->SaveFile(this, filename, type, palette); + SetHBITMAP((WXHBITMAP)hbmp); } -void wxBitmap::SetWidth(int w) +// Create from XPM data +wxBitmap::wxBitmap(char **data, wxControl *WXUNUSED(anItem)) { - if (!M_BITMAPDATA) - m_refData = new wxBitmapRefData; + Init(); - M_BITMAPDATA->m_width = w; + (void)Create((void *)data, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0); } -void wxBitmap::SetHeight(int h) +wxBitmap::wxBitmap(int w, int h, int d) { - if (!M_BITMAPDATA) - m_refData = new wxBitmapRefData; + Init(); - M_BITMAPDATA->m_height = h; + (void)Create(w, h, d); } -void wxBitmap::SetDepth(int d) +wxBitmap::wxBitmap(void *data, long type, int width, int height, int depth) { - if (!M_BITMAPDATA) - m_refData = new wxBitmapRefData; + Init(); - M_BITMAPDATA->m_depth = d; + (void)Create(data, type, width, height, depth); } -void wxBitmap::SetQuality(int q) +wxBitmap::wxBitmap(const wxString& filename, long type) { - if (!M_BITMAPDATA) - m_refData = new wxBitmapRefData; + Init(); - M_BITMAPDATA->m_quality = q; + LoadFile(filename, (int)type); } -void wxBitmap::SetOk(bool isOk) +bool wxBitmap::Create(int w, int h, int d) { - if (!M_BITMAPDATA) - m_refData = new wxBitmapRefData; + UnRef(); - M_BITMAPDATA->m_ok = isOk; -} + m_refData = new wxBitmapRefData; -void wxBitmap::SetPalette(const wxPalette& palette) -{ - if (!M_BITMAPDATA) - m_refData = new wxBitmapRefData; + GetBitmapData()->m_width = w; + GetBitmapData()->m_height = h; + GetBitmapData()->m_depth = d; - M_BITMAPDATA->m_bitmapPalette = palette ; -} + HBITMAP hbmp; -void wxBitmap::SetMask(wxMask *mask) -{ - if (!M_BITMAPDATA) - m_refData = new wxBitmapRefData; + if ( d > 0 ) + { + hbmp = ::CreateBitmap(w, h, 1, d, NULL); + if ( !hbmp ) + { + wxLogLastError("CreateBitmap"); + } + } + else + { + ScreenHDC dc; + hbmp = ::CreateCompatibleBitmap(dc, w, h); + if ( !hbmp ) + { + wxLogLastError("CreateCompatibleBitmap"); + } - M_BITMAPDATA->m_bitmapMask = mask ; + GetBitmapData()->m_depth = wxDisplayDepth(); + } + + SetHBITMAP((WXHBITMAP)hbmp); + +#if WXWIN_COMPATIBILITY_2 + GetBitmapData()->m_ok = hbmp != 0; +#endif // WXWIN_COMPATIBILITY_2 + + return Ok(); } -void wxBitmap::SetHBITMAP(WXHBITMAP bmp) +bool wxBitmap::LoadFile(const wxString& filename, long type) { - if (!M_BITMAPDATA) - m_refData = new wxBitmapRefData; + UnRef(); + + wxBitmapHandler *handler = wxDynamicCast(FindHandler(type), wxBitmapHandler); + + if ( handler ) + { + m_refData = new wxBitmapRefData; + + return handler->LoadFile(this, filename, type, -1, -1); + } + else + { + wxImage image; + if ( !image.LoadFile( filename, type ) || !image.Ok() ) + return FALSE; + + *this = image.ConvertToBitmap(); - M_BITMAPDATA->m_hBitmap = bmp; + return TRUE; + } } -void wxBitmap::AddHandler(wxBitmapHandler *handler) +bool wxBitmap::Create(void *data, long type, int width, int height, int depth) { - sm_handlers.Append(handler); + UnRef(); + + wxBitmapHandler *handler = wxDynamicCast(FindHandler(type), wxBitmapHandler); + + if ( !handler ) + { + wxLogDebug(wxT("Failed to create bitmap: no bitmap handler for " + "type %d defined."), type); + + return FALSE; + } + + m_refData = new wxBitmapRefData; + + return handler->Create(this, data, type, width, height, depth); } -void wxBitmap::InsertHandler(wxBitmapHandler *handler) +bool wxBitmap::SaveFile(const wxString& filename, int type, const wxPalette *palette) { - sm_handlers.Insert(handler); + wxBitmapHandler *handler = wxDynamicCast(FindHandler(type), wxBitmapHandler); + + if ( handler ) + { + return handler->SaveFile(this, filename, type, palette); + } + else + { + // FIXME what about palette? shouldn't we use it? + wxImage image( *this ); + if (!image.Ok()) + return FALSE; + + return image.SaveFile( filename, type ); + } } -bool wxBitmap::RemoveHandler(const wxString& name) +// ---------------------------------------------------------------------------- +// wxBitmap accessors +// ---------------------------------------------------------------------------- + +void wxBitmap::SetQuality(int q) { - wxBitmapHandler *handler = FindHandler(name); - if ( handler ) - { - sm_handlers.DeleteObject(handler); - return TRUE; - } - else - return FALSE; + EnsureHasData(); + + GetBitmapData()->m_quality = q; } -wxBitmapHandler *wxBitmap::FindHandler(const wxString& name) +#if WXWIN_COMPATIBILITY_2 +void wxBitmap::SetOk(bool isOk) { - wxNode *node = sm_handlers.First(); - while ( node ) - { - wxBitmapHandler *handler = (wxBitmapHandler *)node->Data(); - if ( handler->GetName() == name ) - return handler; - node = node->Next(); - } - return NULL; + EnsureHasData(); + + GetBitmapData()->m_ok = isOk; } +#endif // WXWIN_COMPATIBILITY_2 -wxBitmapHandler *wxBitmap::FindHandler(const wxString& extension, long bitmapType) +void wxBitmap::SetPalette(const wxPalette& palette) { - wxNode *node = sm_handlers.First(); - while ( node ) - { - wxBitmapHandler *handler = (wxBitmapHandler *)node->Data(); - if ( handler->GetExtension() == extension && - (bitmapType == -1 || handler->GetType() == bitmapType) ) - return handler; - node = node->Next(); - } - return NULL; + EnsureHasData(); + + GetBitmapData()->m_bitmapPalette = palette; } -wxBitmapHandler *wxBitmap::FindHandler(long bitmapType) +void wxBitmap::SetMask(wxMask *mask) { - wxNode *node = sm_handlers.First(); - while ( node ) - { - wxBitmapHandler *handler = (wxBitmapHandler *)node->Data(); - if (handler->GetType() == bitmapType) - return handler; - node = node->Next(); - } - return NULL; -} + EnsureHasData(); -// New Create/FreeDIB functions since ones in dibutils.cpp are confusing -static long createDIB(long xSize, long ySize, long bitsPerPixel, - HPALETTE hPal, LPBITMAPINFO* lpDIBHeader); -static long freeDIB(LPBITMAPINFO lpDIBHeader); + GetBitmapData()->m_bitmapMask = mask; +} // Creates a bitmap that matches the device context, from // an arbitray bitmap. At present, the original bitmap must have an @@ -392,25 +399,16 @@ wxBitmap wxBitmap::GetBitmapForDC(wxDC& dc) const { wxMemoryDC memDC; wxBitmap tmpBitmap(this->GetWidth(), this->GetHeight(), dc.GetDepth()); - HPALETTE hPal = NULL; + HPALETTE hPal = (HPALETTE) NULL; LPBITMAPINFO lpDib; - void *lpBits = NULL; + void *lpBits = (void*) NULL; -/* - wxASSERT( this->GetPalette() && this->GetPalette()->Ok() && (this->GetPalette()->GetHPALETTE() != 0) ); - - tmpBitmap.SetPalette(this->GetPalette()); - memDC.SelectObject(tmpBitmap); - memDC.SetPalette(this->GetPalette()); - - hPal = (HPALETTE) this->GetPalette()->GetHPALETTE(); -*/ - if( this->GetPalette() && this->GetPalette()->Ok() && (this->GetPalette()->GetHPALETTE() != 0) ) + if( GetPalette() && GetPalette()->Ok() ) { - tmpBitmap.SetPalette(* this->GetPalette()); + tmpBitmap.SetPalette(*GetPalette()); memDC.SelectObject(tmpBitmap); - memDC.SetPalette(* this->GetPalette()); - hPal = (HPALETTE) this->GetPalette()->GetHPALETTE(); + memDC.SetPalette(*GetPalette()); + hPal = (HPALETTE)GetPalette()->GetHPALETTE(); } else { @@ -422,27 +420,34 @@ wxBitmap wxBitmap::GetBitmapForDC(wxDC& dc) const memDC.SetPalette( palette ); } - // set the height negative because in a DIB the order of the lines is reversed - createDIB(this->GetWidth(), -this->GetHeight(), this->GetDepth(), hPal, &lpDib); + // 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((HBITMAP)GetHBITMAP(), lpDib->bmiHeader.biSizeImage, lpBits); + ::GetBitmapBits(GetHbitmap(), lpDib->bmiHeader.biSizeImage, lpBits); - ::SetDIBitsToDevice((HDC) memDC.GetHDC(), 0, 0, this->GetWidth(), this->GetHeight(), - 0, 0, 0, this->GetHeight(), lpBits, lpDib, DIB_RGB_COLORS); + ::SetDIBitsToDevice(GetHdcOf(memDC), 0, 0, + GetWidth(), GetHeight(), + 0, 0, 0, GetHeight(), + lpBits, lpDib, DIB_RGB_COLORS); free(lpBits); - freeDIB(lpDib); - return (tmpBitmap); + wxFreeDIB(lpDib); + + return tmpBitmap; } -/* - * wxMask - */ +// ---------------------------------------------------------------------------- +// wxMask +// ---------------------------------------------------------------------------- -wxMask::wxMask(void) +wxMask::wxMask() { m_maskBitmap = 0; } @@ -452,7 +457,7 @@ wxMask::wxMask(void) wxMask::wxMask(const wxBitmap& bitmap, const wxColour& colour) { m_maskBitmap = 0; - Create(bitmap, colour); + Create(bitmap, colour); } // Construct a mask from a bitmap and a palette index indicating @@ -460,17 +465,17 @@ wxMask::wxMask(const wxBitmap& bitmap, const wxColour& colour) wxMask::wxMask(const wxBitmap& bitmap, int paletteIndex) { m_maskBitmap = 0; - Create(bitmap, paletteIndex); + Create(bitmap, paletteIndex); } // Construct a mask from a mono bitmap (copies the bitmap). wxMask::wxMask(const wxBitmap& bitmap) { m_maskBitmap = 0; - Create(bitmap); + Create(bitmap); } -wxMask::~wxMask(void) +wxMask::~wxMask() { if ( m_maskBitmap ) ::DeleteObject((HBITMAP) m_maskBitmap); @@ -480,29 +485,29 @@ wxMask::~wxMask(void) bool wxMask::Create(const wxBitmap& bitmap) { if ( m_maskBitmap ) - { - ::DeleteObject((HBITMAP) m_maskBitmap); - m_maskBitmap = 0; - } - if (!bitmap.Ok() || bitmap.GetDepth() != 1) - { - return FALSE; - } - m_maskBitmap = (WXHBITMAP) CreateBitmap( - bitmap.GetWidth(), - bitmap.GetHeight(), - 1, 1, 0 - ); - HDC srcDC = CreateCompatibleDC(0); - SelectObject(srcDC, (HBITMAP) bitmap.GetHBITMAP()); - HDC destDC = CreateCompatibleDC(0); - SelectObject(destDC, (HBITMAP) m_maskBitmap); - BitBlt(destDC, 0, 0, bitmap.GetWidth(), bitmap.GetHeight(), srcDC, 0, 0, SRCCOPY); - SelectObject(srcDC, 0); - DeleteDC(srcDC); - SelectObject(destDC, 0); - DeleteDC(destDC); - return TRUE; + { + ::DeleteObject((HBITMAP) m_maskBitmap); + m_maskBitmap = 0; + } + if (!bitmap.Ok() || bitmap.GetDepth() != 1) + { + return FALSE; + } + m_maskBitmap = (WXHBITMAP) CreateBitmap( + bitmap.GetWidth(), + bitmap.GetHeight(), + 1, 1, 0 + ); + HDC srcDC = CreateCompatibleDC(0); + SelectObject(srcDC, (HBITMAP) bitmap.GetHBITMAP()); + HDC destDC = CreateCompatibleDC(0); + SelectObject(destDC, (HBITMAP) m_maskBitmap); + BitBlt(destDC, 0, 0, bitmap.GetWidth(), bitmap.GetHeight(), srcDC, 0, 0, SRCCOPY); + SelectObject(srcDC, 0); + DeleteDC(srcDC); + SelectObject(destDC, 0); + DeleteDC(destDC); + return TRUE; } // Create a mask from a bitmap and a palette index indicating @@ -510,20 +515,20 @@ bool wxMask::Create(const wxBitmap& bitmap) bool wxMask::Create(const wxBitmap& bitmap, int paletteIndex) { if ( m_maskBitmap ) - { - ::DeleteObject((HBITMAP) m_maskBitmap); - m_maskBitmap = 0; - } - if (bitmap.Ok() && bitmap.GetPalette()->Ok()) - { - unsigned char red, green, blue; - if (bitmap.GetPalette()->GetRGB(paletteIndex, &red, &green, &blue)) { - wxColour transparentColour(red, green, blue); - return Create(bitmap, transparentColour); + ::DeleteObject((HBITMAP) m_maskBitmap); + m_maskBitmap = 0; } - } - return FALSE; + if (bitmap.Ok() && bitmap.GetPalette()->Ok()) + { + unsigned char red, green, blue; + if (bitmap.GetPalette()->GetRGB(paletteIndex, &red, &green, &blue)) + { + wxColour transparentColour(red, green, blue); + return Create(bitmap, transparentColour); + } + } + return FALSE; } // Create a mask from a bitmap and a colour indicating @@ -531,359 +536,119 @@ bool wxMask::Create(const wxBitmap& bitmap, int paletteIndex) bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour) { if ( m_maskBitmap ) - { - ::DeleteObject((HBITMAP) m_maskBitmap); - m_maskBitmap = 0; - } - if (!bitmap.Ok()) - { - return FALSE; - } - - // 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()); - m_maskBitmap = (WXHBITMAP) ::CreateBitmap( - bitmap.GetWidth(), - bitmap.GetHeight(), - 1, 1, 0 - ); - HDC srcDC = ::CreateCompatibleDC(0); - ::SelectObject(srcDC, (HBITMAP) bitmap.GetHBITMAP()); - HDC destDC = ::CreateCompatibleDC(0); - ::SelectObject(destDC, (HBITMAP) m_maskBitmap); - - // this is not very efficient, but I can't think - // of a better way of doing it - for (int w = 0; w < bitmap.GetWidth(); w++) - { - for (int h = 0; h < bitmap.GetHeight(); h++) { - COLORREF col = GetPixel(srcDC, w, h); - if (col == maskColour) - { - ::SetPixel(destDC, w, h, RGB(0, 0, 0)); - } - else - { - ::SetPixel(destDC, w, h, RGB(255, 255, 255)); - } + ::DeleteObject((HBITMAP) m_maskBitmap); + m_maskBitmap = 0; + } + if (!bitmap.Ok()) + { + return FALSE; } - } - ::SelectObject(srcDC, 0); - ::DeleteDC(srcDC); - ::SelectObject(destDC, 0); - ::DeleteDC(destDC); - return TRUE; -} - -/* - * wxBitmapHandler - */ - -IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, wxObject) - -bool wxBitmapHandler::Create(wxBitmap *bitmap, void *data, long type, int width, int height, int depth) -{ - return FALSE; -} - -bool wxBitmapHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long type, - int desiredWidth, int desiredHeight) -{ - return FALSE; -} -bool wxBitmapHandler::SaveFile(wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette) -{ - return FALSE; + // 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()); + m_maskBitmap = (WXHBITMAP) ::CreateBitmap( + bitmap.GetWidth(), + bitmap.GetHeight(), + 1, 1, 0 + ); + HDC srcDC = ::CreateCompatibleDC(0); + ::SelectObject(srcDC, (HBITMAP) bitmap.GetHBITMAP()); + HDC destDC = ::CreateCompatibleDC(0); + ::SelectObject(destDC, (HBITMAP) m_maskBitmap); + + // this is not very efficient, but I can't think + // of a better way of doing it + for (int w = 0; w < bitmap.GetWidth(); w++) + { + for (int h = 0; h < bitmap.GetHeight(); h++) + { + COLORREF col = GetPixel(srcDC, w, h); + if (col == maskColour) + { + ::SetPixel(destDC, w, h, RGB(0, 0, 0)); + } + else + { + ::SetPixel(destDC, w, h, RGB(255, 255, 255)); + } + } + } + ::SelectObject(srcDC, 0); + ::DeleteDC(srcDC); + ::SelectObject(destDC, 0); + ::DeleteDC(destDC); + return TRUE; } -/* - * Standard handlers - */ +// ---------------------------------------------------------------------------- +// wxBitmapHandler +// ---------------------------------------------------------------------------- -class WXDLLEXPORT wxBMPResourceHandler: public wxBitmapHandler -{ - DECLARE_DYNAMIC_CLASS(wxBMPResourceHandler) -public: - inline wxBMPResourceHandler(void) - { - m_name = "Windows bitmap resource"; - m_extension = ""; - m_type = wxBITMAP_TYPE_BMP_RESOURCE; - }; - - virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags, - int desiredWidth, int desiredHeight); -}; -IMPLEMENT_DYNAMIC_CLASS(wxBMPResourceHandler, wxBitmapHandler) - -bool wxBMPResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags, - int desiredWidth, int desiredHeight) +bool wxBitmapHandler::Create(wxGDIImage *image, + void *data, + long flags, + int width, int height, int depth) { - // TODO: load colourmap. - M_BITMAPHANDLERDATA->m_hBitmap = (WXHBITMAP) ::LoadBitmap(wxGetInstance(), name); - if (M_BITMAPHANDLERDATA->m_hBitmap) - { - M_BITMAPHANDLERDATA->m_ok = TRUE; - BITMAP bm; - GetObject((HBITMAP) M_BITMAPHANDLERDATA->m_hBitmap, sizeof(BITMAP), (LPSTR) &bm); - M_BITMAPHANDLERDATA->m_width = bm.bmWidth; - M_BITMAPHANDLERDATA->m_height = bm.bmHeight; - M_BITMAPHANDLERDATA->m_depth = bm.bmBitsPixel; - return TRUE; - } - - // it's probably not found - wxLogError("Can't load bitmap '%s' from resources! Check .rc file.", name.c_str()); + wxBitmap *bitmap = wxDynamicCast(image, wxBitmap); - return FALSE; + return bitmap ? Create(bitmap, data, width, height, depth) : FALSE; } -class WXDLLEXPORT wxBMPFileHandler: public wxBitmapHandler +bool wxBitmapHandler::Load(wxGDIImage *image, + const wxString& name, + long flags, + int width, int height) { - DECLARE_DYNAMIC_CLASS(wxBMPFileHandler) -public: - inline wxBMPFileHandler(void) - { - m_name = "Windows bitmap file"; - m_extension = "bmp"; - m_type = wxBITMAP_TYPE_BMP; - }; - - virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags, - int desiredWidth, int desiredHeight); - virtual bool SaveFile(wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette = NULL); -}; -IMPLEMENT_DYNAMIC_CLASS(wxBMPFileHandler, wxBitmapHandler) - -bool wxBMPFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags, - int desiredWidth, int desiredHeight) -{ -#if wxUSE_IMAGE_LOADING_IN_MSW - wxPalette *palette = NULL; - bool success = FALSE; -/* - if (type & wxBITMAP_DISCARD_COLOURMAP) - success = wxLoadIntoBitmap(WXSTRINGCAST name, bitmap); - else -*/ - success = (wxLoadIntoBitmap(WXSTRINGCAST name, bitmap, &palette) != 0); - if (!success && palette) - { - delete palette; - palette = NULL; - } - if (palette) - M_BITMAPHANDLERDATA->m_bitmapPalette = *palette; - return success; -#else - return FALSE; -#endif -} + wxBitmap *bitmap = wxDynamicCast(image, wxBitmap); -bool wxBMPFileHandler::SaveFile(wxBitmap *bitmap, const wxString& name, int type, const wxPalette *pal) -{ -#if wxUSE_IMAGE_LOADING_IN_MSW - wxPalette *actualPalette = (wxPalette *)pal; - if (!actualPalette && (!M_BITMAPHANDLERDATA->m_bitmapPalette.IsNull())) - actualPalette = & (M_BITMAPHANDLERDATA->m_bitmapPalette); - return (wxSaveBitmap(WXSTRINGCAST name, bitmap, actualPalette) != 0); -#else - return FALSE; -#endif + return bitmap ? LoadFile(bitmap, name, flags, width, height) : FALSE; } -class WXDLLEXPORT wxXPMFileHandler: public wxBitmapHandler -{ - DECLARE_DYNAMIC_CLASS(wxXPMFileHandler) -public: - inline wxXPMFileHandler(void) - { - m_name = "XPM bitmap file"; - m_extension = "xpm"; - m_type = wxBITMAP_TYPE_XPM; - }; - - virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags, - int desiredWidth = -1, int desiredHeight = -1); - virtual bool SaveFile(wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette = NULL); -}; -IMPLEMENT_DYNAMIC_CLASS(wxXPMFileHandler, wxBitmapHandler) - -bool wxXPMFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags, - int desiredWidth, int desiredHeight) +bool wxBitmapHandler::Save(wxGDIImage *image, + const wxString& name, + int type) { -#if wxUSE_XPM_IN_MSW - XImage *ximage; - XpmAttributes xpmAttr; - HDC dc; - - M_BITMAPHANDLERDATA->m_ok = FALSE; - dc = CreateCompatibleDC(NULL); - if (dc) - { - xpmAttr.valuemask = XpmReturnPixels; - int errorStatus = XpmReadFileToImage(&dc, WXSTRINGCAST name, &ximage, (XImage **) NULL, &xpmAttr); - DeleteDC(dc); - if (errorStatus == XpmSuccess) - { - M_BITMAPHANDLERDATA->m_hBitmap = (WXHBITMAP) ximage->bitmap; - - BITMAP bm; - GetObject((HBITMAP)M_BITMAPHANDLERDATA->m_hBitmap, sizeof(bm), (LPSTR) & bm); - - M_BITMAPHANDLERDATA->m_width = (bm.bmWidth); - M_BITMAPHANDLERDATA->m_height = (bm.bmHeight); - M_BITMAPHANDLERDATA->m_depth = (bm.bmPlanes * bm.bmBitsPixel); - M_BITMAPHANDLERDATA->m_numColors = xpmAttr.npixels; - XpmFreeAttributes(&xpmAttr); - XImageFree(ximage); - - M_BITMAPHANDLERDATA->m_ok = TRUE; - return TRUE; - } - else - { - M_BITMAPHANDLERDATA->m_ok = FALSE; - return FALSE; - } - } -#endif + wxBitmap *bitmap = wxDynamicCast(image, wxBitmap); - return FALSE; + return bitmap ? SaveFile(bitmap, name, type) : FALSE; } -bool wxXPMFileHandler::SaveFile(wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette) +bool wxBitmapHandler::Create(wxBitmap *WXUNUSED(bitmap), + void *WXUNUSED(data), + long WXUNUSED(type), + int WXUNUSED(width), + int WXUNUSED(height), + int WXUNUSED(depth)) { -#if wxUSE_XPM_IN_MSW - HDC dc = NULL; - - XImage ximage; - - dc = CreateCompatibleDC(NULL); - if (dc) - { - if (SelectObject(dc, (HBITMAP) M_BITMAPHANDLERDATA->m_hBitmap)) - { - /* for following SetPixel */ - /* fill the XImage struct 'by hand' */ - ximage.width = M_BITMAPHANDLERDATA->m_width; - ximage.height = M_BITMAPHANDLERDATA->m_height; - ximage.depth = M_BITMAPHANDLERDATA->m_depth; - ximage.bitmap = (HBITMAP)M_BITMAPHANDLERDATA->m_hBitmap; - int errorStatus = XpmWriteFileFromImage(&dc, WXSTRINGCAST name, - &ximage, (XImage *) NULL, (XpmAttributes *) NULL); - - if (dc) - DeleteDC(dc); - - if (errorStatus == XpmSuccess) - return TRUE; /* no error */ - else - return FALSE; - } else return FALSE; - } else return FALSE; -#else return FALSE; -#endif } -class WXDLLEXPORT wxXPMDataHandler: public wxBitmapHandler -{ - DECLARE_DYNAMIC_CLASS(wxXPMDataHandler) -public: - inline wxXPMDataHandler(void) - { - m_name = "XPM bitmap data"; - m_extension = "xpm"; - m_type = wxBITMAP_TYPE_XPM_DATA; - }; - - virtual bool Create(wxBitmap *bitmap, void *data, long flags, int width, int height, int depth = 1); -}; -IMPLEMENT_DYNAMIC_CLASS(wxXPMDataHandler, wxBitmapHandler) - -bool wxXPMDataHandler::Create(wxBitmap *bitmap, void *data, long flags, int width, int height, int depth) +bool wxBitmapHandler::LoadFile(wxBitmap *WXUNUSED(bitmap), + const wxString& WXUNUSED(name), + long WXUNUSED(type), + int WXUNUSED(desiredWidth), + int WXUNUSED(desiredHeight)) { -#if wxUSE_XPM_IN_MSW - XImage *ximage; - int ErrorStatus; - XpmAttributes xpmAttr; - HDC dc; - - M_BITMAPHANDLERDATA->m_ok = FALSE; - M_BITMAPHANDLERDATA->m_numColors = 0; - - dc = CreateCompatibleDC(NULL); /* memory DC */ - - if (dc) - { - xpmAttr.valuemask = XpmReturnInfos; /* get infos back */ - ErrorStatus = XpmCreateImageFromData(&dc, (char **)data, - &ximage, (XImage **) NULL, &xpmAttr); - - if (ErrorStatus == XpmSuccess) - { - /* ximage is malloced and contains bitmap and attributes */ - M_BITMAPHANDLERDATA->m_hBitmap = (WXHBITMAP) ximage->bitmap; - - BITMAP bm; - GetObject((HBITMAP) M_BITMAPHANDLERDATA->m_hBitmap, sizeof(bm), (LPSTR) & bm); - - M_BITMAPHANDLERDATA->m_width = (bm.bmWidth); - M_BITMAPHANDLERDATA->m_height = (bm.bmHeight); - M_BITMAPHANDLERDATA->m_depth = (bm.bmPlanes * bm.bmBitsPixel); - M_BITMAPHANDLERDATA->m_numColors = xpmAttr.npixels; - XpmFreeAttributes(&xpmAttr); - - XImageFree(ximage); // releases the malloc, but does not detroy - // the bitmap - M_BITMAPHANDLERDATA->m_ok = TRUE; - DeleteDC(dc); - - return TRUE; - } - else - { - M_BITMAPHANDLERDATA->m_ok = FALSE; -// XpmDebugError(ErrorStatus, NULL); - DeleteDC(dc); - return FALSE; - } - } -#endif - - return FALSE; + return FALSE; } -void wxBitmap::CleanUpHandlers(void) +bool wxBitmapHandler::SaveFile(wxBitmap *WXUNUSED(bitmap), + const wxString& WXUNUSED(name), + int WXUNUSED(type), + const wxPalette *WXUNUSED(palette)) { - wxNode *node = sm_handlers.First(); - while ( node ) - { - wxBitmapHandler *handler = (wxBitmapHandler *)node->Data(); - wxNode *next = node->Next(); - delete handler; - delete node; - node = next; - } + return FALSE; } -void wxBitmap::InitStandardHandlers(void) -{ - AddHandler(new wxBMPResourceHandler); - AddHandler(new wxBMPFileHandler); - AddHandler(new wxXPMFileHandler); - AddHandler(new wxXPMDataHandler); - AddHandler(new wxICOResourceHandler); - AddHandler(new wxICOFileHandler); -} +// ---------------------------------------------------------------------------- +// DIB functions +// ---------------------------------------------------------------------------- -static long createDIB(long xSize, long ySize, long bitsPerPixel, - HPALETTE hPal, LPBITMAPINFO* lpDIBHeader) +bool wxCreateDIB(long xSize, long ySize, long bitsPerPixel, + HPALETTE hPal, LPBITMAPINFO* lpDIBHeader) { unsigned long i, headerSize; LPBITMAPINFO lpDIBheader = NULL; @@ -897,10 +662,8 @@ static long createDIB(long xSize, long ySize, long bitsPerPixel, 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; @@ -910,8 +673,7 @@ static long createDIB(long xSize, long ySize, long bitsPerPixel, // 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.biSizeImage = xSize * abs(ySize) * bitsPerPixel >> 3; lpDIBheader->bmiHeader.biClrUsed = 256; @@ -925,248 +687,12 @@ static long createDIB(long xSize, long ySize, long bitsPerPixel, *lpDIBHeader = lpDIBheader; - - return (0); - + return TRUE; } - - -static long freeDIB(LPBITMAPINFO lpDIBHeader) +void wxFreeDIB(LPBITMAPINFO lpDIBHeader) { - - if (lpDIBHeader != NULL) { - free(lpDIBHeader); - } - - return (0); -} - - -//----------------------------------------------------------------------------- -// also implemented here from wxImage -//----------------------------------------------------------------------------- - -/* -class wxImage : wxGDIObject -{ - wxImage( const wxBitmap &bitmap ); - wxBitmap ConvertToBitmap() const; -} -*/ - - -wxBitmap wxImage::ConvertToBitmap() const -{ - - wxBitmap bitmap; - wxCHECK_MSG( Ok(), bitmap, "invalid image" ); - int width = GetWidth(); - int height = GetHeight(); - bitmap.SetWidth( width ); - bitmap.SetHeight( height ); - bitmap.SetDepth( wxDisplayDepth() ); - - int headersize = sizeof(BITMAPINFOHEADER); - LPBITMAPINFO lpDIBh = (BITMAPINFO *) malloc( headersize ); - wxCHECK_MSG( lpDIBh, bitmap, "could not allocate memory for DIB header" ); - -// Fill in the DIB header - lpDIBh->bmiHeader.biSize = headersize; - lpDIBh->bmiHeader.biWidth = width; - lpDIBh->bmiHeader.biHeight = -height; - lpDIBh->bmiHeader.biSizeImage = width * height * 3; - - lpDIBh->bmiHeader.biPlanes = 1; - lpDIBh->bmiHeader.biBitCount = 24; - lpDIBh->bmiHeader.biCompression = BI_RGB; - lpDIBh->bmiHeader.biClrUsed = 0; - -// These seem not needed for our purpose here. -// lpDIBh->bmiHeader.biClrImportant = 0; -// lpDIBh->bmiHeader.biXPelsPerMeter = 0; -// lpDIBh->bmiHeader.biYPelsPerMeter = 0; - - unsigned char *lpBits = (unsigned char *) malloc( width*height*3 ); - if( !lpBits ) - { - wxFAIL_MSG( "could not allocate memory for DIB" ); - free( lpDIBh ); - return bitmap; - } - - unsigned char *data = GetData(); - - unsigned char *ptdata = data, *ptbits = lpBits; - for( int i=0; ibmiHeader), 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 ); - - bitmap.SetHBITMAP( (WXHBITMAP) hbitmap ); - - if( HasMask() ) - { - unsigned char r = GetMaskRed(); - unsigned char g = GetMaskGreen(); - unsigned char b = GetMaskBlue(); - unsigned char zero = 0, one = 255; - ptdata = data; - ptbits = lpBits; - for( int i=0; ibmiHeader.biSize = headersize; - lpDIBh->bmiHeader.biWidth = width; - lpDIBh->bmiHeader.biHeight = -height; - lpDIBh->bmiHeader.biSizeImage = width * height * 3; - - lpDIBh->bmiHeader.biPlanes = 1; - lpDIBh->bmiHeader.biBitCount = 24; - lpDIBh->bmiHeader.biCompression = BI_RGB; - lpDIBh->bmiHeader.biClrUsed = 0; - -// These seem not needed for our purpose here. -// lpDIBh->bmiHeader.biClrImportant = 0; -// lpDIBh->bmiHeader.biXPelsPerMeter = 0; -// lpDIBh->bmiHeader.biYPelsPerMeter = 0; - - unsigned char *lpBits = (unsigned char *) malloc( width*height*3 ); - if( !lpBits ) - { - wxFAIL_MSG( "could not allocate data for DIB" ); - free( data ); - free( lpDIBh ); - return; - } - - HBITMAP hbitmap; - hbitmap = (HBITMAP) bitmap.GetHBITMAP(); - HDC hdc = ::GetDC(NULL); - ::GetDIBits( hdc, hbitmap, 0, height, lpBits, lpDIBh, DIB_RGB_COLORS ); - - unsigned char *ptdata = data, *ptbits = lpBits; - for( int i=0; iGetMaskBitmap() ) - { - hbitmap = (HBITMAP) bitmap.GetMask()->GetMaskBitmap(); - 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 ); - unsigned char r=16, g=16, b=16; // background set to RGB(16,16,16) - ptdata = data; - ptbits = lpBits; - for( int i=0; i