X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4c444f19cf1bdb3cb26bb3c123434fe23c808093..d01cc696fca6de1e1fa3ebcd10eefc6596d629f9:/src/msw/bitmap.cpp diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp index d3ed8bc019..fe11b93585 100644 --- a/src/msw/bitmap.cpp +++ b/src/msw/bitmap.cpp @@ -9,381 +9,445 @@ // 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/msw/private.h" #include "wx/log.h" -#include "assert.h" - -#if USE_XPM_IN_MSW -#define FOR_MSW 1 -#include "../../contrib/wxxpm/libxpm.34b/lib/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) -{ - 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; -} - -wxBitmapRefData::~wxBitmapRefData(void) -{ - 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) +// ============================================================================ +// implementation +// ============================================================================ + +// ---------------------------------------------------------------------------- +// wxBitmapRefData +// ---------------------------------------------------------------------------- + +wxBitmapRefData::wxBitmapRefData() +{ + m_quality = 0; + m_selectedInto = NULL; + m_numColors = 0; + m_bitmapMask = NULL; +} + +void wxBitmapRefData::Free() +{ + wxASSERT_MSG( !m_selectedInto, + wxT("deleting bitmap still selected into wxMemoryDC") ); + + if ( m_hBitmap) + { + if ( !::DeleteObject((HBITMAP)m_hBitmap) ) + { + wxLogLastError("DeleteObject(hbitmap)"); + } + } + delete m_bitmapMask; - m_bitmapMask = NULL; + m_bitmapMask = NULL; } -wxList wxBitmap::sm_handlers; +// ---------------------------------------------------------------------------- +// wxBitmap creation +// ---------------------------------------------------------------------------- -wxBitmap::wxBitmap(void) +// this function should be called from all wxBitmap ctors +void wxBitmap::Init() { - m_refData = NULL; // new wxBitmapRefData; + // m_refData = NULL; done in the base class ctor - if ( wxTheBitmapList ) - wxTheBitmapList->AddBitmap(this); + if ( wxTheBitmapList ) + wxTheBitmapList->AddBitmap(this); } -wxBitmap::~wxBitmap(void) +#ifdef __WIN32__ + +bool wxBitmap::CopyFromIconOrCursor(const wxGDIImage& icon) { - if (wxTheBitmapList) - wxTheBitmapList->DeleteObject(this); + // it may be either HICON or HCURSOR + HICON hicon = (HICON)icon.GetHandle(); + + ICONINFO iconInfo; + if ( !::GetIconInfo(hicon, &iconInfo) ) + { + wxLogLastError("GetIconInfo"); + + return FALSE; + } + + wxBitmapRefData *refData = new wxBitmapRefData; + m_refData = refData; + + refData->m_width = icon.GetWidth(); + refData->m_height = icon.GetHeight(); + refData->m_depth = wxDisplayDepth(); + + refData->m_hBitmap = (WXHBITMAP)iconInfo.hbmColor; + refData->m_bitmapMask = new wxMask((WXHBITMAP)iconInfo.hbmMask); + +#if WXWIN_COMPATIBILITY_2 + refData->m_ok = TRUE; +#endif // WXWIN_COMPATIBILITY_2 + + return TRUE; } -bool wxBitmap::FreeResource(bool force) +#endif // Win32 + +bool wxBitmap::CopyFromCursor(const wxCursor& cursor) { - if ( !M_BITMAPDATA ) - return FALSE; + UnRef(); - 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 ( !cursor.Ok() ) + return FALSE; -/* - if (M_BITMAPDATA->m_bitmapPalette) - delete M_BITMAPDATA->m_bitmapPalette; +#ifdef __WIN16__ + wxFAIL_MSG( _T("don't know how to convert cursor to bitmap") ); - M_BITMAPDATA->m_bitmapPalette = NULL ; -*/ + return FALSE; +#endif // Win16 - return TRUE; + return CopyFromIconOrCursor(cursor); } - -wxBitmap::wxBitmap(const char bits[], int the_width, int the_height, int no_bits) +bool wxBitmap::CopyFromIcon(const wxIcon& icon) { - m_refData = new wxBitmapRefData; + UnRef(); + + if ( !icon.Ok() ) + return FALSE; + + // GetIconInfo() doesn't exist under Win16 and I don't know any other way + // to create a bitmap from icon there - but using this way we won't have + // the mask (FIXME) +#ifdef __WIN16__ + int width = icon.GetWidth(), + height = icon.GetHeight(); + + // copy the icon to the bitmap + ScreenHDC hdcScreen; + HDC hdc = ::CreateCompatibleDC(hdcScreen); + HBITMAP hbitmap = ::CreateCompatibleBitmap(hdcScreen, width, height); + HBITMAP hbmpOld = (HBITMAP)::SelectObject(hdc, hbitmap); - M_BITMAPDATA->m_width = the_width ; - M_BITMAPDATA->m_height = the_height ; - M_BITMAPDATA->m_depth = no_bits ; - M_BITMAPDATA->m_numColors = 0; + ::DrawIcon(hdc, 0, 0, GetHiconOf(icon)); - M_BITMAPDATA->m_hBitmap = (WXHBITMAP) CreateBitmap(the_width, the_height, 1, no_bits, bits); + ::SelectObject(hdc, hbmpOld); + ::DeleteDC(hdc); - 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 = width; + refData->m_height = height; + refData->m_depth = wxDisplayDepth(); - if ( wxTheBitmapList ) - wxTheBitmapList->AddBitmap(this); + refData->m_hBitmap = (WXHBITMAP)hbitmap; + +#if WXWIN_COMPATIBILITY_2 + refData->m_ok = TRUE; +#endif // WXWIN_COMPATIBILITY_2 + + return TRUE; +#else // Win32 + return CopyFromIconOrCursor(icon); +#endif // Win16/Win32 } -wxBitmap::wxBitmap(int w, int h, int d) +wxBitmap::~wxBitmap() { - (void)Create(w, h, d); - - if ( wxTheBitmapList ) - wxTheBitmapList->AddBitmap(this); + if (wxTheBitmapList) + wxTheBitmapList->DeleteObject(this); } -wxBitmap::wxBitmap(void *data, long type, int width, int height, int depth) +wxBitmap::wxBitmap(const char bits[], int the_width, int the_height, int no_bits) { - (void) Create(data, type, width, height, depth); + Init(); - if ( wxTheBitmapList ) - wxTheBitmapList->AddBitmap(this); + wxBitmapRefData *refData = new wxBitmapRefData; + m_refData = refData; + + 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"); + } + + SetHBITMAP((WXHBITMAP)hbmp); } -wxBitmap::wxBitmap(const wxString& filename, long type) +// Create from XPM data +wxBitmap::wxBitmap(char **data, wxControl *WXUNUSED(anItem)) { - LoadFile(filename, (int)type); + Init(); - if ( wxTheBitmapList ) - wxTheBitmapList->AddBitmap(this); + (void)Create((void *)data, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0); } -#if USE_XPM_IN_MSW -// Create from data -wxBitmap::wxBitmap(const char **data, wxItem *WXUNUSED(anItem)) +wxBitmap::wxBitmap(int w, int h, int d) { - (void) Create((void *)data, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0); + Init(); + + (void)Create(w, h, d); } -#endif -bool wxBitmap::Create(int w, int h, int d) +wxBitmap::wxBitmap(void *data, long type, int width, int height, int depth) { - UnRef(); + Init(); - m_refData = new wxBitmapRefData; + (void)Create(data, type, width, height, depth); +} - M_BITMAPDATA->m_width = w; - M_BITMAPDATA->m_height = h; - M_BITMAPDATA->m_depth = d; +wxBitmap::wxBitmap(const wxString& filename, long type) +{ + Init(); - 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; + LoadFile(filename, (int)type); } -bool wxBitmap::LoadFile(const wxString& filename, long type) +bool wxBitmap::Create(int w, int h, int d) { - UnRef(); + UnRef(); - m_refData = new wxBitmapRefData; + m_refData = new wxBitmapRefData; - wxBitmapHandler *handler = FindHandler(type); + GetBitmapData()->m_width = w; + GetBitmapData()->m_height = h; + GetBitmapData()->m_depth = d; - if ( handler == NULL ) { - wxLogWarning("no bitmap handler for type %d defined.", type); + HBITMAP hbmp; - return FALSE; - } + 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"); + } + + GetBitmapData()->m_depth = wxDisplayDepth(); + } + + SetHBITMAP((WXHBITMAP)hbmp); + +#if WXWIN_COMPATIBILITY_2 + GetBitmapData()->m_ok = hbmp != 0; +#endif // WXWIN_COMPATIBILITY_2 - return handler->LoadFile(this, filename, type, -1, -1); + return Ok(); } -bool wxBitmap::Create(void *data, long type, int width, int height, int depth) +bool wxBitmap::LoadFile(const wxString& filename, long type) { - UnRef(); + UnRef(); - m_refData = new wxBitmapRefData; + wxBitmapHandler *handler = wxDynamicCast(FindHandler(type), wxBitmapHandler); - wxBitmapHandler *handler = FindHandler(type); + if ( handler ) + { + m_refData = new wxBitmapRefData; - if ( handler == NULL ) { - wxLogWarning("no bitmap handler for type %d defined.", type); + return handler->LoadFile(this, filename, type, -1, -1); + } + else + { + wxImage image; + if ( !image.LoadFile( filename, type ) || !image.Ok() ) + return FALSE; - return FALSE; - } + *this = image.ConvertToBitmap(); - return handler->Create(this, data, type, width, height, depth); + return TRUE; + } } -bool wxBitmap::SaveFile(const wxString& filename, int type, const wxPalette *palette) +bool wxBitmap::Create(void *data, long type, int width, int height, int depth) { - wxBitmapHandler *handler = FindHandler(type); + UnRef(); - if ( handler == NULL ) { - wxLogWarning("no bitmap handler for type %d defined.", type); + wxBitmapHandler *handler = wxDynamicCast(FindHandler(type), wxBitmapHandler); - return FALSE; - } + if ( !handler ) + { + wxLogDebug(wxT("Failed to create bitmap: no bitmap handler for " + "type %d defined."), type); - return handler->SaveFile(this, filename, type, palette); -} + return FALSE; + } -void wxBitmap::SetWidth(int w) -{ - if (!M_BITMAPDATA) - m_refData = new wxBitmapRefData; + m_refData = new wxBitmapRefData; - M_BITMAPDATA->m_width = w; + return handler->Create(this, data, type, width, height, depth); } -void wxBitmap::SetHeight(int h) +bool wxBitmap::SaveFile(const wxString& filename, int type, const wxPalette *palette) { - if (!M_BITMAPDATA) - m_refData = new wxBitmapRefData; + wxBitmapHandler *handler = wxDynamicCast(FindHandler(type), wxBitmapHandler); - M_BITMAPDATA->m_height = h; -} - -void wxBitmap::SetDepth(int d) -{ - if (!M_BITMAPDATA) - m_refData = new wxBitmapRefData; + 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; - M_BITMAPDATA->m_depth = d; + return image.SaveFile( filename, type ); + } } +// ---------------------------------------------------------------------------- +// wxBitmap accessors +// ---------------------------------------------------------------------------- + void wxBitmap::SetQuality(int q) { - if (!M_BITMAPDATA) - m_refData = new wxBitmapRefData; + EnsureHasData(); - M_BITMAPDATA->m_quality = q; + GetBitmapData()->m_quality = q; } +#if WXWIN_COMPATIBILITY_2 void wxBitmap::SetOk(bool isOk) { - if (!M_BITMAPDATA) - m_refData = new wxBitmapRefData; + EnsureHasData(); - M_BITMAPDATA->m_ok = isOk; + GetBitmapData()->m_ok = isOk; } +#endif // WXWIN_COMPATIBILITY_2 void wxBitmap::SetPalette(const wxPalette& palette) { - if (!M_BITMAPDATA) - m_refData = new wxBitmapRefData; + EnsureHasData(); - M_BITMAPDATA->m_bitmapPalette = palette ; + GetBitmapData()->m_bitmapPalette = palette; } void wxBitmap::SetMask(wxMask *mask) { - if (!M_BITMAPDATA) - m_refData = new wxBitmapRefData; + EnsureHasData(); - M_BITMAPDATA->m_bitmapMask = mask ; + GetBitmapData()->m_bitmapMask = mask; } -void wxBitmap::SetHBITMAP(WXHBITMAP bmp) +// 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 +wxBitmap wxBitmap::GetBitmapForDC(wxDC& dc) const { - if (!M_BITMAPDATA) - m_refData = new wxBitmapRefData; + wxMemoryDC memDC; + wxBitmap tmpBitmap(this->GetWidth(), this->GetHeight(), dc.GetDepth()); + HPALETTE hPal = (HPALETTE) NULL; + LPBITMAPINFO lpDib; + void *lpBits = (void*) NULL; - M_BITMAPDATA->m_hBitmap = bmp; -} + 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 ); + } -void wxBitmap::AddHandler(wxBitmapHandler *handler) -{ - sm_handlers.Append(handler); -} + // set the height negative because in a DIB the order of the lines is + // reversed + if ( !wxCreateDIB(GetWidth(), -GetHeight(), GetDepth(), hPal, &lpDib) ) + { + return wxNullBitmap; + } -void wxBitmap::InsertHandler(wxBitmapHandler *handler) -{ - sm_handlers.Insert(handler); -} + lpBits = malloc(lpDib->bmiHeader.biSizeImage); -bool wxBitmap::RemoveHandler(const wxString& name) -{ - wxBitmapHandler *handler = FindHandler(name); - if ( handler ) - { - sm_handlers.DeleteObject(handler); - return TRUE; - } - else - return FALSE; -} + ::GetBitmapBits(GetHbitmap(), lpDib->bmiHeader.biSizeImage, lpBits); -wxBitmapHandler *wxBitmap::FindHandler(const wxString& name) -{ - wxNode *node = sm_handlers.First(); - while ( node ) - { - wxBitmapHandler *handler = (wxBitmapHandler *)node->Data(); - if ( handler->GetName() == name ) - return handler; - node = node->Next(); - } - return NULL; -} + ::SetDIBitsToDevice(GetHdcOf(memDC), 0, 0, + GetWidth(), GetHeight(), + 0, 0, 0, GetHeight(), + lpBits, lpDib, DIB_RGB_COLORS); -wxBitmapHandler *wxBitmap::FindHandler(const wxString& extension, long bitmapType) -{ - 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; -} + free(lpBits); -wxBitmapHandler *wxBitmap::FindHandler(long bitmapType) -{ - wxNode *node = sm_handlers.First(); - while ( node ) - { - wxBitmapHandler *handler = (wxBitmapHandler *)node->Data(); - if (handler->GetType() == bitmapType) - return handler; - node = node->Next(); - } - return NULL; + wxFreeDIB(lpDib); + + return tmpBitmap; } -/* - * wxMask - */ +// ---------------------------------------------------------------------------- +// wxMask +// ---------------------------------------------------------------------------- -wxMask::wxMask(void) +wxMask::wxMask() { m_maskBitmap = 0; } @@ -393,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 @@ -401,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); @@ -421,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 @@ -451,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; + } + 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; + return FALSE; } // Create a mask from a bitmap and a colour indicating @@ -472,353 +536,163 @@ 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 +bool wxBitmapHandler::Create(wxGDIImage *image, + void *data, + long flags, + int width, int height, int depth) { - DECLARE_DYNAMIC_CLASS(wxBMPResourceHandler) -public: - inline wxBMPResourceHandler(void) - { - m_name = "Windows bitmap resource"; - m_extension = ""; - m_type = wxBITMAP_TYPE_BMP_RESOURCE; - }; + wxBitmap *bitmap = wxDynamicCast(image, wxBitmap); - virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags, - int desiredWidth, int desiredHeight); -}; -IMPLEMENT_DYNAMIC_CLASS(wxBMPResourceHandler, wxBitmapHandler) + return bitmap ? Create(bitmap, data, width, height, depth) : FALSE; +} -bool wxBMPResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags, - int desiredWidth, int desiredHeight) +bool wxBitmapHandler::Load(wxGDIImage *image, + const wxString& name, + long flags, + int width, int height) { - // 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.bmPlanes; - return TRUE; - } + wxBitmap *bitmap = wxDynamicCast(image, wxBitmap); - // it's probably not found - wxLogError("Can't load bitmap '%s' from resources! Check .rc file.", name.c_str()); - - return FALSE; + return bitmap ? LoadFile(bitmap, name, flags, width, height) : FALSE; } -class WXDLLEXPORT wxBMPFileHandler: public wxBitmapHandler +bool wxBitmapHandler::Save(wxGDIImage *image, + const wxString& name, + int type) { - 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) + wxBitmap *bitmap = wxDynamicCast(image, wxBitmap); -bool wxBMPFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags, - int desiredWidth, int desiredHeight) -{ -#if USE_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 + return bitmap ? SaveFile(bitmap, name, type) : FALSE; } -bool wxBMPFileHandler::SaveFile(wxBitmap *bitmap, const wxString& name, int type, const wxPalette *pal) +bool wxBitmapHandler::Create(wxBitmap *WXUNUSED(bitmap), + void *WXUNUSED(data), + long WXUNUSED(type), + int WXUNUSED(width), + int WXUNUSED(height), + int WXUNUSED(depth)) { -#if USE_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 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::LoadFile(wxBitmap *WXUNUSED(bitmap), + const wxString& WXUNUSED(name), + long WXUNUSED(type), + int WXUNUSED(desiredWidth), + int WXUNUSED(desiredHeight)) { -#if USE_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 - return FALSE; } -bool wxXPMFileHandler::SaveFile(wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette) +bool wxBitmapHandler::SaveFile(wxBitmap *WXUNUSED(bitmap), + const wxString& WXUNUSED(name), + int WXUNUSED(type), + const wxPalette *WXUNUSED(palette)) { -#if USE_XPM_IN_MSW - HDC dc = NULL; - - Visual *visual = 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 = (void *)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 + return FALSE; } -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) +// ---------------------------------------------------------------------------- +// DIB functions +// ---------------------------------------------------------------------------- -bool wxXPMDataHandler::Create(wxBitmap *bitmap, void *data, long flags, int width, int height, int depth) +bool wxCreateDIB(long xSize, long ySize, long bitsPerPixel, + HPALETTE hPal, LPBITMAPINFO* lpDIBHeader) { -#if USE_XPM_IN_MSW - XImage *ximage; - int ErrorStatus; - XpmAttributes xpmAttr; - HDC dc; + unsigned long i, headerSize; + LPBITMAPINFO lpDIBheader = NULL; + LPPALETTEENTRY lpPe = NULL; - M_BITMAPHANDLERDATA->m_ok = FALSE; - M_BITMAPHANDLERDATA->m_numColors = 0; - dc = CreateCompatibleDC(NULL); /* memory DC */ + // Allocate space for a DIB header + headerSize = (sizeof(BITMAPINFOHEADER) + (256 * sizeof(PALETTEENTRY))); + lpDIBheader = (BITMAPINFO *) malloc(headerSize); + lpPe = (PALETTEENTRY *)((BYTE*)lpDIBheader + sizeof(BITMAPINFOHEADER)); - if (dc) - { - xpmAttr.valuemask = XpmReturnInfos; /* get infos back */ - ErrorStatus = XpmCreateImageFromData(&dc, (char **)data, - &ximage, (XImage **) NULL, &xpmAttr); + GetPaletteEntries(hPal, 0, 256, lpPe); - if (ErrorStatus == XpmSuccess) - { - /* ximage is malloced and contains bitmap and attributes */ - M_BITMAPHANDLERDATA->m_hBitmap = (WXHBITMAP) ximage->bitmap; + memset(lpDIBheader, 0x00, sizeof(BITMAPINFOHEADER)); - BITMAP bm; - GetObject((HBITMAP) M_BITMAPHANDLERDATA->m_hBitmap, sizeof(bm), (LPSTR) & bm); + // Fill in the static parts of the DIB header + lpDIBheader->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + lpDIBheader->bmiHeader.biWidth = xSize; + lpDIBheader->bmiHeader.biHeight = ySize; + lpDIBheader->bmiHeader.biPlanes = 1; - 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); + // this value must be 1, 4, 8 or 24 so PixelDepth can only be + lpDIBheader->bmiHeader.biBitCount = (WORD)(bitsPerPixel); + lpDIBheader->bmiHeader.biCompression = BI_RGB; + lpDIBheader->bmiHeader.biSizeImage = xSize * abs(ySize) * bitsPerPixel >> 3; + lpDIBheader->bmiHeader.biClrUsed = 256; - 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 + // Initialize the DIB palette + for (i = 0; i < 256; i++) { + lpDIBheader->bmiColors[i].rgbReserved = lpPe[i].peFlags; + lpDIBheader->bmiColors[i].rgbRed = lpPe[i].peRed; + lpDIBheader->bmiColors[i].rgbGreen = lpPe[i].peGreen; + lpDIBheader->bmiColors[i].rgbBlue = lpPe[i].peBlue; + } - return FALSE; + *lpDIBHeader = lpDIBheader; + + return TRUE; } -void wxBitmap::CleanUpHandlers(void) +void wxFreeDIB(LPBITMAPINFO lpDIBHeader) { - wxNode *node = sm_handlers.First(); - while ( node ) - { - wxBitmapHandler *handler = (wxBitmapHandler *)node->Data(); - wxNode *next = node->Next(); - delete handler; - delete node; - node = next; - } + free(lpDIBHeader); } -void wxBitmap::InitStandardHandlers(void) -{ - AddHandler(new wxBMPResourceHandler); - AddHandler(new wxBMPFileHandler); - AddHandler(new wxXPMFileHandler); - AddHandler(new wxXPMDataHandler); - AddHandler(new wxICOResourceHandler); - AddHandler(new wxICOFileHandler); -} \ No newline at end of file +