X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fea2b62e8ef6d1dbaeea1d5506630ead9ccc23d0..ec5f0c24123fe801fb82b69771c171c0b9d064fc:/src/msw/gdiimage.cpp diff --git a/src/msw/gdiimage.cpp b/src/msw/gdiimage.cpp index ba85991599..f2e84134d0 100644 --- a/src/msw/gdiimage.cpp +++ b/src/msw/gdiimage.cpp @@ -6,7 +6,7 @@ // Created: 20.11.99 // RCS-ID: $Id$ // Copyright: (c) 1999 Vadim Zeitlin -// Licence: wxWindows license +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -17,7 +17,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "gdiimage.h" #endif @@ -37,17 +37,22 @@ #include "wx/app.h" -#ifndef __WXMICROWIN__ +#include "wx/bitmap.h" +#include "wx/msw/gdiimage.h" + +#if wxUSE_WXDIB #include "wx/msw/dib.h" #endif -#include "wx/msw/bitmap.h" -#include "wx/msw/gdiimage.h" -#include "wx/bitmap.h" +#ifdef __WXWINCE__ +#include +#include +#endif -#ifdef __WIN16__ -# include "wx/msw/curico.h" -#endif // __WIN16__ +#include "wx/file.h" + +#include "wx/listimpl.cpp" +WX_DEFINE_LIST(wxGDIImageHandlerList); // ---------------------------------------------------------------------------- // private classes @@ -110,14 +115,14 @@ public: int WXUNUSED(height), int WXUNUSED(depth) = 1) { - return FALSE; + return false; } virtual bool Save(wxGDIImage *WXUNUSED(image), const wxString& WXUNUSED(name), int WXUNUSED(type)) { - return FALSE; + return false; } virtual bool Load(wxGDIImage *image, @@ -126,7 +131,7 @@ public: int desiredWidth, int desiredHeight) { wxIcon *icon = wxDynamicCast(image, wxIcon); - wxCHECK_MSG( icon, FALSE, _T("wxIconHandler only works with icons") ); + wxCHECK_MSG( icon, false, _T("wxIconHandler only works with icons") ); return LoadIcon(icon, name, flags, desiredWidth, desiredHeight); } @@ -146,6 +151,7 @@ public: { } +protected: virtual bool LoadIcon(wxIcon *icon, const wxString& name, long flags, int desiredWidth = -1, int desiredHeight = -1); @@ -163,6 +169,7 @@ public: { } +protected: virtual bool LoadIcon(wxIcon *icon, const wxString& name, long flags, int desiredWidth = -1, int desiredHeight = -1); @@ -184,7 +191,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxICOResourceHandler, wxObject) // private functions // ---------------------------------------------------------------------------- -static wxSize GetHiconSize(HICON hicon); #endif // __MICROWIN__ @@ -192,7 +198,7 @@ static wxSize GetHiconSize(HICON hicon); // implementation // ============================================================================ -wxList wxGDIImage::ms_handlers; +wxGDIImageHandlerList wxGDIImage::ms_handlers; // ---------------------------------------------------------------------------- // wxGDIImage functions forwarded to wxGDIImageRefData @@ -206,10 +212,10 @@ bool wxGDIImage::FreeResource(bool WXUNUSED(force)) GetGDIImageData()->m_handle = 0; } - return TRUE; + return true; } -WXHANDLE wxGDIImage::GetResourceHandle() +WXHANDLE wxGDIImage::GetResourceHandle() const { return GetHandle(); } @@ -234,21 +240,21 @@ bool wxGDIImage::RemoveHandler(const wxString& name) if ( handler ) { ms_handlers.DeleteObject(handler); - return TRUE; + return true; } else - return FALSE; + return false; } wxGDIImageHandler *wxGDIImage::FindHandler(const wxString& name) { - wxNode *node = ms_handlers.First(); + wxGDIImageHandlerList::compatibility_iterator node = ms_handlers.GetFirst(); while ( node ) { - wxGDIImageHandler *handler = (wxGDIImageHandler *)node->Data(); + wxGDIImageHandler *handler = node->GetData(); if ( handler->GetName() == name ) return handler; - node = node->Next(); + node = node->GetNext(); } return NULL; @@ -257,31 +263,31 @@ wxGDIImageHandler *wxGDIImage::FindHandler(const wxString& name) wxGDIImageHandler *wxGDIImage::FindHandler(const wxString& extension, long type) { - wxNode *node = ms_handlers.First(); + wxGDIImageHandlerList::compatibility_iterator node = ms_handlers.GetFirst(); while ( node ) { - wxGDIImageHandler *handler = (wxGDIImageHandler *)node->Data(); - if ( (handler->GetExtension() = extension) && + wxGDIImageHandler *handler = node->GetData(); + if ( (handler->GetExtension() == extension) && (type == -1 || handler->GetType() == type) ) { return handler; } - node = node->Next(); + node = node->GetNext(); } return NULL; } wxGDIImageHandler *wxGDIImage::FindHandler(long type) { - wxNode *node = ms_handlers.First(); + wxGDIImageHandlerList::compatibility_iterator node = ms_handlers.GetFirst(); while ( node ) { - wxGDIImageHandler *handler = (wxGDIImageHandler *)node->Data(); + wxGDIImageHandler *handler = node->GetData(); if ( handler->GetType() == type ) return handler; - node = node->Next(); + node = node->GetNext(); } return NULL; @@ -289,13 +295,13 @@ wxGDIImageHandler *wxGDIImage::FindHandler(long type) void wxGDIImage::CleanUpHandlers() { - wxNode *node = ms_handlers.First(); + wxGDIImageHandlerList::compatibility_iterator node = ms_handlers.GetFirst(); while ( node ) { - wxGDIImageHandler *handler = (wxGDIImageHandler *)node->Data(); - wxNode *next = node->Next(); + wxGDIImageHandler *handler = node->GetData(); + wxGDIImageHandlerList::compatibility_iterator next = node->GetNext(); delete handler; - delete node; + ms_handlers.Erase( node ); node = next; } } @@ -324,27 +330,29 @@ bool wxBMPResourceHandler::LoadFile(wxBitmap *bitmap, // TODO: load colourmap. bitmap->SetHBITMAP((WXHBITMAP)::LoadBitmap(wxGetInstance(), name)); - wxBitmapRefData *data = bitmap->GetBitmapData(); - if ( bitmap->Ok() ) - { - BITMAP bm; - if ( !::GetObject(GetHbitmapOf(*bitmap), sizeof(BITMAP), (LPSTR) &bm) ) - { - wxLogLastError(wxT("GetObject(HBITMAP)")); - } - - data->m_width = bm.bmWidth; - data->m_height = bm.bmHeight; - data->m_depth = bm.bmBitsPixel; - } - else + if ( !bitmap->Ok() ) { // it's probably not found wxLogError(wxT("Can't load bitmap '%s' from resources! Check .rc file."), name.c_str()); + + return false; } - return bitmap->Ok(); + BITMAP bm; + if ( !::GetObject(GetHbitmapOf(*bitmap), sizeof(BITMAP), (LPSTR) &bm) ) + { + wxLogLastError(wxT("GetObject(HBITMAP)")); + } + + bitmap->SetWidth(bm.bmWidth); + bitmap->SetHeight(bm.bmHeight); + bitmap->SetDepth(bm.bmBitsPixel); + + // use 0xc0c0c0 as transparent colour by default + bitmap->SetMask(new wxMask(*bitmap, *wxLIGHT_GREY)); + + return true; } bool wxBMPFileHandler::LoadFile(wxBitmap *bitmap, @@ -352,44 +360,30 @@ bool wxBMPFileHandler::LoadFile(wxBitmap *bitmap, int WXUNUSED(desiredWidth), int WXUNUSED(desiredHeight)) { -#if wxUSE_IMAGE_LOADING_IN_MSW - wxPalette *palette = NULL; - bool success = wxLoadIntoBitmap(WXSTRINGCAST name, bitmap, &palette) != 0; - -#if wxUSE_PALETTE - if ( success && palette ) - { - bitmap->SetPalette(*palette); - } +#if wxUSE_WXDIB + wxCHECK_MSG( bitmap, false, _T("NULL bitmap in LoadFile") ); - // it was copied by the bitmap if it was loaded successfully - delete palette; -#endif // wxUSE_PALETTE + wxDIB dib(name); - return success; + return dib.IsOk() && bitmap->CopyFromDIB(dib); #else - return FALSE; + return false; #endif } bool wxBMPFileHandler::SaveFile(wxBitmap *bitmap, const wxString& name, int WXUNUSED(type), - const wxPalette *pal) + const wxPalette * WXUNUSED(pal)) { -#if wxUSE_IMAGE_LOADING_IN_MSW +#if wxUSE_WXDIB + wxCHECK_MSG( bitmap, false, _T("NULL bitmap in SaveFile") ); -#if wxUSE_PALETTE - wxPalette *actualPalette = (wxPalette *)pal; - if ( !actualPalette ) - actualPalette = bitmap->GetPalette(); -#else - wxPalette *actualPalette = NULL; -#endif // wxUSE_PALETTE + wxDIB dib(*bitmap); - return wxSaveBitmap(WXSTRINGCAST name, bitmap, actualPalette) != 0; + return dib.Save(name); #else - return FALSE; + return false; #endif } @@ -402,13 +396,11 @@ bool wxICOFileHandler::LoadIcon(wxIcon *icon, long WXUNUSED(flags), int desiredWidth, int desiredHeight) { -#if wxUSE_RESOURCE_LOADING_IN_MSW icon->UnRef(); // actual size wxSize size; -#ifdef __WIN32__ HICON hicon = NULL; // Parse the filename: it may be of the form "filename;n" in order to @@ -425,7 +417,28 @@ bool wxICOFileHandler::LoadIcon(wxIcon *icon, nameReal = name.BeforeLast(wxT(';')); } - // were we asked for a large icon? +#if 0 + // If we don't know what size icon we're looking for, + // try to find out what's there. + // Unfortunately this doesn't work, because ExtractIconEx + // will scale the icon to the 'desired' size, even if that + // size of icon isn't explicitly stored. So we would have + // to parse the icon file outselves. + if ( desiredWidth == -1 && + desiredHeight == -1) + { + // Try loading a large icon first + if ( ::ExtractIconEx(nameReal, iconIndex, &hicon, NULL, 1) == 1) + { + } + // Then try loading a small icon + else if ( ::ExtractIconEx(nameReal, iconIndex, NULL, &hicon, 1) == 1) + { + } + } + else +#endif + // were we asked for a large icon? if ( desiredWidth == ::GetSystemMetrics(SM_CXICON) && desiredHeight == ::GetSystemMetrics(SM_CYICON) ) { @@ -452,47 +465,41 @@ bool wxICOFileHandler::LoadIcon(wxIcon *icon, } //else: not standard size, load below +#ifndef __WXWINCE__ if ( !hicon ) { - // take any (the first one) icon from the file by default - hicon = ::ExtractIcon(wxGetInstance(), nameReal, 0 /* first */); + // take any size icon from the file by index + hicon = ::ExtractIcon(wxGetInstance(), nameReal, iconIndex); } +#endif if ( !hicon ) { wxLogSysError(_T("Failed to load icon from the file '%s'"), name.c_str()); - return FALSE; + return false; } - size = GetHiconSize(hicon); -#else // Win16 - HICON hicon = ReadIconFile((wxChar *)name.c_str(), - wxGetInstance(), - &size.x, &size.y); -#endif // Win32/Win16 + size = wxGetHiconSize(hicon); if ( (desiredWidth != -1 && desiredWidth != size.x) || (desiredHeight != -1 && desiredHeight != size.y) ) { wxLogTrace(_T("iconload"), - _T("Returning FALSE from wxICOFileHandler::Load because of the size mismatch: actual (%d, %d), requested (%d, %d)"), + _T("Returning false from wxICOFileHandler::Load because of the size mismatch: actual (%d, %d), requested (%d, %d)"), size.x, size.y, desiredWidth, desiredHeight); ::DestroyIcon(hicon); - return FALSE; + return false; } icon->SetHICON((WXHICON)hicon); icon->SetSize(size.x, size.y); return icon->Ok(); -#else - return FALSE; -#endif } bool wxICOResourceHandler::LoadIcon(wxIcon *icon, @@ -511,23 +518,22 @@ bool wxICOResourceHandler::LoadIcon(wxIcon *icon, // try to load the icon from this program first to allow overriding the // standard icons (although why one would want to do it considering that // we already have wxApp::GetStdIcon() is unclear) -#if defined(__WIN32__) && !defined(__SC__) - if ( !hasSize ) + + // note that we can't just always call LoadImage() because it seems to do + // some icon rescaling internally which results in very ugly 16x16 icons + if ( hasSize ) { - // use the actual size of the resource (as we don't specify - // LR_DEFAULTSIZE) - desiredWidth = - desiredHeight = 0; + hicon = (HICON)::LoadImage(wxGetInstance(), name, IMAGE_ICON, + desiredWidth, desiredHeight, + LR_DEFAULTCOLOR); + } + else + { + hicon = ::LoadIcon(wxGetInstance(), name); } - - hicon = (HICON)::LoadImage(wxGetInstance(), name, IMAGE_ICON, - desiredWidth, desiredHeight, - LR_DEFAULTCOLOR); -#else // !Win32 - hicon = ::LoadIcon(wxGetInstance(), name); -#endif // Win32/!Win32 // next check if it's not a standard icon +#ifndef __WXWINCE__ if ( !hicon && !hasSize ) { static const struct @@ -539,7 +545,7 @@ bool wxICOResourceHandler::LoadIcon(wxIcon *icon, { wxT("wxICON_QUESTION"), IDI_QUESTION }, { wxT("wxICON_WARNING"), IDI_EXCLAMATION }, { wxT("wxICON_ERROR"), IDI_HAND }, - { wxT("wxICON_INFO"), IDI_ASTERISK }, + { wxT("wxICON_INFORMATION"), IDI_ASTERISK }, }; for ( size_t nIcon = 0; !hicon && nIcon < WXSIZEOF(stdIcons); nIcon++ ) @@ -550,16 +556,11 @@ bool wxICOResourceHandler::LoadIcon(wxIcon *icon, } } } +#endif - wxSize size = GetHiconSize(hicon); + wxSize size = wxGetHiconSize(hicon); icon->SetSize(size.x, size.y); - // Override the found values with desired values - if ( hasSize ) - { - icon->SetSize(desiredWidth, desiredHeight); - } - icon->SetHICON((WXHICON)hicon); return icon->Ok(); @@ -569,12 +570,13 @@ bool wxICOResourceHandler::LoadIcon(wxIcon *icon, // private functions // ---------------------------------------------------------------------------- -static wxSize GetHiconSize(HICON hicon) +wxSize wxGetHiconSize(HICON hicon) { - wxSize size(32, 32); // default + // default icon size on this hardware + // usually 32x32 but can be other (smaller) on pocket devices + wxSize size(::GetSystemMetrics(SM_CXICON), ::GetSystemMetrics(SM_CYICON)); -#ifdef __WIN32__ - // Win32s doesn't have GetIconInfo function... +#ifndef __WXWINCE__ if ( hicon && wxGetOsVersion() != wxWIN32S ) { ICONINFO info; @@ -599,9 +601,11 @@ static wxSize GetHiconSize(HICON hicon) ::DeleteObject(info.hbmColor); } } +#else + wxUnusedVar(hicon); #endif - return size; } -#endif - // __WXMICROWIN__ + +#endif // __WXMICROWIN__ +