X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fea2b62e8ef6d1dbaeea1d5506630ead9ccc23d0..1b48beaaf07513d9924b3b84e148957d4e69cfa2:/src/msw/gdiimage.cpp diff --git a/src/msw/gdiimage.cpp b/src/msw/gdiimage.cpp index ba85991599..d19d26afd9 100644 --- a/src/msw/gdiimage.cpp +++ b/src/msw/gdiimage.cpp @@ -1,12 +1,12 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: msw/gdiimage.cpp +// Name: src/msw/gdiimage.cpp // Purpose: wxGDIImage implementation // Author: Vadim Zeitlin // Modified by: // Created: 20.11.99 // RCS-ID: $Id$ // Copyright: (c) 1999 Vadim Zeitlin -// Licence: wxWindows license +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "gdiimage.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -31,23 +27,39 @@ #ifndef WX_PRECOMP #include "wx/string.h" #include "wx/log.h" + #include "wx/app.h" + #include "wx/bitmap.h" #endif // WX_PRECOMP #include "wx/msw/private.h" -#include "wx/app.h" +#include "wx/msw/gdiimage.h" -#ifndef __WXMICROWIN__ +#if wxUSE_WXDIB #include "wx/msw/dib.h" #endif -#include "wx/msw/bitmap.h" -#include "wx/msw/gdiimage.h" -#include "wx/bitmap.h" +// By default, use PNG resource handler if we can, i.e. have support for +// loading PNG images in the library. This symbol could be predefined as 0 to +// avoid doing this if anybody ever needs to do it for some reason. +#if !defined(wxUSE_PNG_RESOURCE_HANDLER) && wxUSE_LIBPNG && wxUSE_IMAGE + #define wxUSE_PNG_RESOURCE_HANDLER 1 +#endif + +#if wxUSE_PNG_RESOURCE_HANDLER + #include "wx/image.h" + #include "wx/utils.h" // For wxLoadUserResource() +#endif + +#ifdef __WXWINCE__ +#include +#include +#endif + +#include "wx/file.h" -#ifdef __WIN16__ -# include "wx/msw/curico.h" -#endif // __WIN16__ +#include "wx/listimpl.cpp" +WX_DEFINE_LIST(wxGDIImageHandlerList) // ---------------------------------------------------------------------------- // private classes @@ -61,17 +73,17 @@ class WXDLLEXPORT wxBMPFileHandler : public wxBitmapHandler { public: - wxBMPFileHandler() : wxBitmapHandler(_T("Windows bitmap file"), _T("bmp"), + wxBMPFileHandler() : wxBitmapHandler(wxT("Windows bitmap file"), wxT("bmp"), wxBITMAP_TYPE_BMP) { } virtual bool LoadFile(wxBitmap *bitmap, - const wxString& name, long flags, + const wxString& name, wxBitmapType flags, int desiredWidth, int desiredHeight); - virtual bool SaveFile(wxBitmap *bitmap, - const wxString& name, int type, - const wxPalette *palette = NULL); + virtual bool SaveFile(const wxBitmap *bitmap, + const wxString& name, wxBitmapType type, + const wxPalette *palette = NULL) const; private: DECLARE_DYNAMIC_CLASS(wxBMPFileHandler) @@ -80,14 +92,14 @@ private: class WXDLLEXPORT wxBMPResourceHandler: public wxBitmapHandler { public: - wxBMPResourceHandler() : wxBitmapHandler(_T("Windows bitmap resource"), + wxBMPResourceHandler() : wxBitmapHandler(wxT("Windows bitmap resource"), wxEmptyString, wxBITMAP_TYPE_BMP_RESOURCE) { } virtual bool LoadFile(wxBitmap *bitmap, - const wxString& name, long flags, + const wxString& name, wxBitmapType flags, int desiredWidth, int desiredHeight); private: @@ -97,57 +109,58 @@ private: class WXDLLEXPORT wxIconHandler : public wxGDIImageHandler { public: - wxIconHandler(const wxString& name, const wxString& ext, long type) + wxIconHandler(const wxString& name, const wxString& ext, wxBitmapType type) : wxGDIImageHandler(name, ext, type) { } // creating and saving icons is not supported virtual bool Create(wxGDIImage *WXUNUSED(image), - void *WXUNUSED(data), - long WXUNUSED(flags), + const void* WXUNUSED(data), + wxBitmapType WXUNUSED(flags), int WXUNUSED(width), int WXUNUSED(height), int WXUNUSED(depth) = 1) { - return FALSE; + return false; } - virtual bool Save(wxGDIImage *WXUNUSED(image), + virtual bool Save(const wxGDIImage *WXUNUSED(image), const wxString& WXUNUSED(name), - int WXUNUSED(type)) + wxBitmapType WXUNUSED(type)) const { - return FALSE; + return false; } virtual bool Load(wxGDIImage *image, const wxString& name, - long flags, + wxBitmapType flags, int desiredWidth, int desiredHeight) { wxIcon *icon = wxDynamicCast(image, wxIcon); - wxCHECK_MSG( icon, FALSE, _T("wxIconHandler only works with icons") ); + wxCHECK_MSG( icon, false, wxT("wxIconHandler only works with icons") ); return LoadIcon(icon, name, flags, desiredWidth, desiredHeight); } protected: virtual bool LoadIcon(wxIcon *icon, - const wxString& name, long flags, + const wxString& name, wxBitmapType flags, int desiredWidth = -1, int desiredHeight = -1) = 0; }; class WXDLLEXPORT wxICOFileHandler : public wxIconHandler { public: - wxICOFileHandler() : wxIconHandler(_T("ICO icon file"), - _T("ico"), + wxICOFileHandler() : wxIconHandler(wxT("ICO icon file"), + wxT("ico"), wxBITMAP_TYPE_ICO) { } +protected: virtual bool LoadIcon(wxIcon *icon, - const wxString& name, long flags, + const wxString& name, wxBitmapType flags, int desiredWidth = -1, int desiredHeight = -1); private: @@ -157,20 +170,42 @@ private: class WXDLLEXPORT wxICOResourceHandler: public wxIconHandler { public: - wxICOResourceHandler() : wxIconHandler(_T("ICO resource"), - _T("ico"), + wxICOResourceHandler() : wxIconHandler(wxT("ICO resource"), + wxT("ico"), wxBITMAP_TYPE_ICO_RESOURCE) { } +protected: virtual bool LoadIcon(wxIcon *icon, - const wxString& name, long flags, + const wxString& name, wxBitmapType flags, int desiredWidth = -1, int desiredHeight = -1); private: DECLARE_DYNAMIC_CLASS(wxICOResourceHandler) }; +#if wxUSE_PNG_RESOURCE_HANDLER + +class WXDLLEXPORT wxPNGResourceHandler : public wxBitmapHandler +{ +public: + wxPNGResourceHandler() : wxBitmapHandler(wxS("Windows PNG resource"), + wxString(), + wxBITMAP_TYPE_PNG_RESOURCE) + { + } + + virtual bool LoadFile(wxBitmap *bitmap, + const wxString& name, wxBitmapType flags, + int desiredWidth, int desiredHeight); + +private: + wxDECLARE_DYNAMIC_CLASS(wxPNGResourceHandler); +}; + +#endif // wxUSE_PNG_RESOURCE_HANDLER + // ---------------------------------------------------------------------------- // wxWin macros // ---------------------------------------------------------------------------- @@ -179,12 +214,14 @@ IMPLEMENT_DYNAMIC_CLASS(wxBMPFileHandler, wxBitmapHandler) IMPLEMENT_DYNAMIC_CLASS(wxBMPResourceHandler, wxBitmapHandler) IMPLEMENT_DYNAMIC_CLASS(wxICOFileHandler, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxICOResourceHandler, wxObject) +#if wxUSE_PNG_RESOURCE_HANDLER +IMPLEMENT_DYNAMIC_CLASS(wxPNGResourceHandler, wxBitmapHandler) +#endif // wxUSE_PNG_RESOURCE_HANDLER // ---------------------------------------------------------------------------- // private functions // ---------------------------------------------------------------------------- -static wxSize GetHiconSize(HICON hicon); #endif // __MICROWIN__ @@ -192,7 +229,7 @@ static wxSize GetHiconSize(HICON hicon); // implementation // ============================================================================ -wxList wxGDIImage::ms_handlers; +wxGDIImageHandlerList wxGDIImage::ms_handlers; // ---------------------------------------------------------------------------- // wxGDIImage functions forwarded to wxGDIImageRefData @@ -206,10 +243,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 +271,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 +294,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 +326,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; } } @@ -305,8 +342,11 @@ void wxGDIImage::InitStandardHandlers() #ifndef __WXMICROWIN__ AddHandler(new wxBMPResourceHandler); AddHandler(new wxBMPFileHandler); - AddHandler(new wxICOResourceHandler); AddHandler(new wxICOFileHandler); + AddHandler(new wxICOResourceHandler); +#if wxUSE_PNG_RESOURCE_HANDLER + AddHandler(new wxPNGResourceHandler); +#endif // wxUSE_PNG_RESOURCE_HANDLER #endif } @@ -317,79 +357,67 @@ void wxGDIImage::InitStandardHandlers() // ---------------------------------------------------------------------------- bool wxBMPResourceHandler::LoadFile(wxBitmap *bitmap, - const wxString& name, long WXUNUSED(flags), + const wxString& name, wxBitmapType WXUNUSED(flags), int WXUNUSED(desiredWidth), int WXUNUSED(desiredHeight)) { // TODO: load colourmap. - bitmap->SetHBITMAP((WXHBITMAP)::LoadBitmap(wxGetInstance(), name)); + bitmap->SetHBITMAP((WXHBITMAP)::LoadBitmap(wxGetInstance(), name.t_str())); - 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->IsOk() ) { // it's probably not found wxLogError(wxT("Can't load bitmap '%s' from resources! Check .rc file."), name.c_str()); + + return false; + } + + BITMAP bm; + if ( !::GetObject(GetHbitmapOf(*bitmap), sizeof(BITMAP), (LPSTR) &bm) ) + { + wxLogLastError(wxT("GetObject(HBITMAP)")); } - return bitmap->Ok(); + 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, - const wxString& name, long WXUNUSED(flags), + const wxString& name, wxBitmapType WXUNUSED(flags), 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, wxT("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, +bool wxBMPFileHandler::SaveFile(const wxBitmap *bitmap, const wxString& name, - int WXUNUSED(type), - const wxPalette *pal) + wxBitmapType WXUNUSED(type), + const wxPalette * WXUNUSED(pal)) const { -#if wxUSE_IMAGE_LOADING_IN_MSW +#if wxUSE_WXDIB + wxCHECK_MSG( bitmap, false, wxT("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 } @@ -399,16 +427,11 @@ bool wxBMPFileHandler::SaveFile(wxBitmap *bitmap, bool wxICOFileHandler::LoadIcon(wxIcon *icon, const wxString& name, - long WXUNUSED(flags), + wxBitmapType 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,17 +448,38 @@ 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) ) { // get the specified large icon from file - if ( !::ExtractIconEx(nameReal, iconIndex, &hicon, NULL, 1) ) + if ( !::ExtractIconEx(nameReal.t_str(), iconIndex, &hicon, NULL, 1) ) { // it is not an error, but it might still be useful to be informed // about it optionally - wxLogTrace(_T("iconload"), - _T("No large icons found in the file '%s'."), + wxLogTrace(wxT("iconload"), + wxT("No large icons found in the file '%s'."), name.c_str()); } } @@ -443,61 +487,53 @@ bool wxICOFileHandler::LoadIcon(wxIcon *icon, desiredHeight == ::GetSystemMetrics(SM_CYSMICON) ) { // get the specified small icon from file - if ( !::ExtractIconEx(nameReal, iconIndex, NULL, &hicon, 1) ) + if ( !::ExtractIconEx(nameReal.t_str(), iconIndex, NULL, &hicon, 1) ) { - wxLogTrace(_T("iconload"), - _T("No small icons found in the file '%s'."), + wxLogTrace(wxT("iconload"), + wxT("No small icons found in the file '%s'."), name.c_str()); } } //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.t_str(), iconIndex); } +#endif if ( !hicon ) { - wxLogSysError(_T("Failed to load icon from the file '%s'"), + wxLogSysError(wxT("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 + if ( !icon->CreateFromHICON(hicon) ) + return false; - if ( (desiredWidth != -1 && desiredWidth != size.x) || - (desiredHeight != -1 && desiredHeight != size.y) ) + if ( (desiredWidth != -1 && desiredWidth != icon->GetWidth()) || + (desiredHeight != -1 && desiredHeight != icon->GetHeight()) ) { - wxLogTrace(_T("iconload"), - _T("Returning FALSE from wxICOFileHandler::Load because of the size mismatch: actual (%d, %d), requested (%d, %d)"), - size.x, size.y, + wxLogTrace(wxT("iconload"), + wxT("Returning false from wxICOFileHandler::Load because of the size mismatch: actual (%d, %d), requested (%d, %d)"), + icon->GetWidth(), icon->GetHeight(), desiredWidth, desiredHeight); - ::DestroyIcon(hicon); + icon->UnRef(); - return FALSE; + return false; } - icon->SetHICON((WXHICON)hicon); - icon->SetSize(size.x, size.y); - - return icon->Ok(); -#else - return FALSE; -#endif + return true; } bool wxICOResourceHandler::LoadIcon(wxIcon *icon, const wxString& name, - long WXUNUSED(flags), + wxBitmapType WXUNUSED(flags), int desiredWidth, int desiredHeight) { HICON hicon; @@ -506,28 +542,27 @@ bool wxICOResourceHandler::LoadIcon(wxIcon *icon, bool hasSize = desiredWidth != -1 || desiredHeight != -1; wxASSERT_MSG( !hasSize || (desiredWidth != -1 && desiredHeight != -1), - _T("width and height should be either both -1 or not") ); + wxT("width and height should be either both -1 or not") ); // 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.t_str(), IMAGE_ICON, + desiredWidth, desiredHeight, + LR_DEFAULTCOLOR); + } + else + { + hicon = ::LoadIcon(wxGetInstance(), name.t_str()); } - - 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 +574,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++ ) @@ -547,35 +582,74 @@ bool wxICOResourceHandler::LoadIcon(wxIcon *icon, if ( name == stdIcons[nIcon].name ) { hicon = ::LoadIcon((HINSTANCE)NULL, stdIcons[nIcon].id); + break; } } } +#endif - wxSize size = GetHiconSize(hicon); - icon->SetSize(size.x, size.y); + return icon->CreateFromHICON((WXHICON)hicon); +} - // Override the found values with desired values - if ( hasSize ) +#if wxUSE_PNG_RESOURCE_HANDLER + +// ---------------------------------------------------------------------------- +// PNG handler +// ---------------------------------------------------------------------------- + +bool wxPNGResourceHandler::LoadFile(wxBitmap *bitmap, + const wxString& name, + wxBitmapType WXUNUSED(flags), + int WXUNUSED(desiredWidth), + int WXUNUSED(desiredHeight)) +{ + const void* pngData = NULL; + size_t pngSize = 0; + + // Currently we hardcode RCDATA resource type as this is what is usually + // used for the embedded images. We could allow specifying the type as part + // of the name in the future (e.g. "type:name" or something like this) if + // really needed. + if ( !wxLoadUserResource(&pngData, &pngSize, + name, + RT_RCDATA, + wxGetInstance()) ) { - icon->SetSize(desiredWidth, desiredHeight); + // Notice that this message is not translated because only the + // programmer (and not the end user) can make any use of it. + wxLogError(wxS("Bitmap in PNG format \"%s\" not found, check ") + wxS("that the resource file contains \"RCDATA\" ") + wxS("resource with this name."), + name); + + return false; } - icon->SetHICON((WXHICON)hicon); + *bitmap = wxBitmap::NewFromPNGData(pngData, pngSize); + if ( !bitmap->IsOk() ) + { + wxLogError(wxS("Couldn't load resource bitmap \"%s\" as a PNG. "), + wxS("Have you registered PNG image handler?"), + name); - return icon->Ok(); + return false; + } + + return true; } +#endif // wxUSE_PNG_RESOURCE_HANDLER + // ---------------------------------------------------------------------------- // private functions // ---------------------------------------------------------------------------- -static wxSize GetHiconSize(HICON hicon) +wxSize wxGetHiconSize(HICON WXUNUSED_IN_WINCE(hicon)) { - wxSize size(32, 32); // default + wxSize size; -#ifdef __WIN32__ - // Win32s doesn't have GetIconInfo function... - if ( hicon && wxGetOsVersion() != wxWIN32S ) +#ifndef __WXWINCE__ + if ( hicon ) { ICONINFO info; if ( !::GetIconInfo(hicon, &info) ) @@ -599,9 +673,16 @@ static wxSize GetHiconSize(HICON hicon) ::DeleteObject(info.hbmColor); } } -#endif + + if ( !size.x ) +#endif // !__WXWINCE__ + { + // use default icon size on this hardware + size.x = ::GetSystemMetrics(SM_CXICON); + size.y = ::GetSystemMetrics(SM_CYICON); + } return size; } -#endif - // __WXMICROWIN__ + +#endif // __WXMICROWIN__