X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4676948b6814c97b93c431a8cbcd8c0352c87ba9..69d31e313035d5e22d9400ec946f6007f710910c:/src/msw/gdiimage.cpp diff --git a/src/msw/gdiimage.cpp b/src/msw/gdiimage.cpp index 9ac518a065..5b4c3d6b13 100644 --- a/src/msw/gdiimage.cpp +++ b/src/msw/gdiimage.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: msw/gdiimage.cpp +// Name: src/msw/gdiimage.cpp // Purpose: wxGDIImage implementation // Author: Vadim Zeitlin // Modified by: @@ -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,13 +27,12 @@ #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/bitmap.h" #include "wx/msw/gdiimage.h" #if wxUSE_WXDIB @@ -49,8 +44,10 @@ #include #endif +#include "wx/file.h" + #include "wx/listimpl.cpp" -WX_DEFINE_LIST(wxGDIImageHandlerList); +WX_DEFINE_LIST(wxGDIImageHandlerList) // ---------------------------------------------------------------------------- // private classes @@ -64,17 +61,17 @@ WX_DEFINE_LIST(wxGDIImageHandlerList); 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) @@ -83,14 +80,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: @@ -100,15 +97,15 @@ 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) @@ -116,41 +113,42 @@ public: 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; } 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: @@ -160,14 +158,15 @@ 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: @@ -263,7 +262,7 @@ wxGDIImageHandler *wxGDIImage::FindHandler(const wxString& extension, while ( node ) { wxGDIImageHandler *handler = node->GetData(); - if ( (handler->GetExtension() = extension) && + if ( (handler->GetExtension() == extension) && (type == -1 || handler->GetType() == type) ) { return handler; @@ -319,12 +318,12 @@ 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.wx_str())); if ( !bitmap->Ok() ) { @@ -345,38 +344,41 @@ bool wxBMPResourceHandler::LoadFile(wxBitmap *bitmap, 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_WXDIB - wxCHECK_MSG( bitmap, false, _T("NULL bitmap in LoadFile") ); + wxCHECK_MSG( bitmap, false, wxT("NULL bitmap in LoadFile") ); wxDIB dib(name); 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 * WXUNUSED(pal)) + wxBitmapType WXUNUSED(type), + const wxPalette * WXUNUSED(pal)) const { #if wxUSE_WXDIB - wxCHECK_MSG( bitmap, false, _T("NULL bitmap in SaveFile") ); + wxCHECK_MSG( bitmap, false, wxT("NULL bitmap in SaveFile") ); wxDIB dib(*bitmap); return dib.Save(name); #else - return FALSE; + return false; #endif } @@ -386,7 +388,7 @@ bool wxBMPFileHandler::SaveFile(wxBitmap *bitmap, bool wxICOFileHandler::LoadIcon(wxIcon *icon, const wxString& name, - long WXUNUSED(flags), + wxBitmapType WXUNUSED(flags), int desiredWidth, int desiredHeight) { icon->UnRef(); @@ -436,12 +438,12 @@ bool wxICOFileHandler::LoadIcon(wxIcon *icon, desiredHeight == ::GetSystemMetrics(SM_CYICON) ) { // get the specified large icon from file - if ( !::ExtractIconEx(nameReal, iconIndex, &hicon, NULL, 1) ) + if ( !::ExtractIconEx(nameReal.wx_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()); } } @@ -449,10 +451,10 @@ 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.wx_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()); } } @@ -462,13 +464,13 @@ bool wxICOFileHandler::LoadIcon(wxIcon *icon, if ( !hicon ) { // take any size icon from the file by index - hicon = ::ExtractIcon(wxGetInstance(), nameReal, iconIndex); + hicon = ::ExtractIcon(wxGetInstance(), nameReal.wx_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; @@ -479,8 +481,8 @@ bool wxICOFileHandler::LoadIcon(wxIcon *icon, 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)"), + wxLogTrace(wxT("iconload"), + wxT("Returning false from wxICOFileHandler::Load because of the size mismatch: actual (%d, %d), requested (%d, %d)"), size.x, size.y, desiredWidth, desiredHeight); @@ -497,7 +499,7 @@ bool wxICOFileHandler::LoadIcon(wxIcon *icon, bool wxICOResourceHandler::LoadIcon(wxIcon *icon, const wxString& name, - long WXUNUSED(flags), + wxBitmapType WXUNUSED(flags), int desiredWidth, int desiredHeight) { HICON hicon; @@ -506,7 +508,7 @@ 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 @@ -516,13 +518,13 @@ bool wxICOResourceHandler::LoadIcon(wxIcon *icon, // some icon rescaling internally which results in very ugly 16x16 icons if ( hasSize ) { - hicon = (HICON)::LoadImage(wxGetInstance(), name, IMAGE_ICON, + hicon = (HICON)::LoadImage(wxGetInstance(), name.wx_str(), IMAGE_ICON, desiredWidth, desiredHeight, LR_DEFAULTCOLOR); } else { - hicon = ::LoadIcon(wxGetInstance(), name); + hicon = ::LoadIcon(wxGetInstance(), name.wx_str()); } // next check if it's not a standard icon @@ -546,6 +548,7 @@ bool wxICOResourceHandler::LoadIcon(wxIcon *icon, if ( name == stdIcons[nIcon].name ) { hicon = ::LoadIcon((HINSTANCE)NULL, stdIcons[nIcon].id); + break; } } } @@ -563,11 +566,12 @@ bool wxICOResourceHandler::LoadIcon(wxIcon *icon, // private functions // ---------------------------------------------------------------------------- -wxSize wxGetHiconSize(HICON hicon) +wxSize wxGetHiconSize(HICON WXUNUSED_IN_WINCE(hicon)) { - wxSize size(32, 32); // default + wxSize size; + #ifndef __WXWINCE__ - if ( hicon && wxGetOsVersion() != wxWIN32S ) + if ( hicon ) { ICONINFO info; if ( !::GetIconInfo(hicon, &info) ) @@ -591,9 +595,16 @@ wxSize wxGetHiconSize(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__ -