X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/670f9935630beb2123a5ca62894ae92a3f0efa4f..c12822fec7f87e7734cabbfcf23b99685fc371ce:/src/msw/gdiimage.cpp?ds=sidebyside diff --git a/src/msw/gdiimage.cpp b/src/msw/gdiimage.cpp index 65b239a09c..e7aaa0c36f 100644 --- a/src/msw/gdiimage.cpp +++ b/src/msw/gdiimage.cpp @@ -28,11 +28,11 @@ #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/bitmap.h" #include "wx/msw/gdiimage.h" #if wxUSE_WXDIB @@ -67,11 +67,11 @@ public: } 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) @@ -87,7 +87,7 @@ public: } virtual bool LoadFile(wxBitmap *bitmap, - const wxString& name, long flags, + const wxString& name, wxBitmapType flags, int desiredWidth, int desiredHeight); private: @@ -97,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) @@ -113,16 +113,16 @@ 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); @@ -133,7 +133,7 @@ public: protected: virtual bool LoadIcon(wxIcon *icon, - const wxString& name, long flags, + const wxString& name, wxBitmapType flags, int desiredWidth = -1, int desiredHeight = -1) = 0; }; @@ -148,7 +148,7 @@ public: protected: virtual bool LoadIcon(wxIcon *icon, - const wxString& name, long flags, + const wxString& name, wxBitmapType flags, int desiredWidth = -1, int desiredHeight = -1); private: @@ -166,7 +166,7 @@ public: protected: virtual bool LoadIcon(wxIcon *icon, - const wxString& name, long flags, + const wxString& name, wxBitmapType flags, int desiredWidth = -1, int desiredHeight = -1); private: @@ -318,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() ) { @@ -351,7 +351,7 @@ bool wxBMPResourceHandler::LoadFile(wxBitmap *bitmap, } bool wxBMPFileHandler::LoadFile(wxBitmap *bitmap, - const wxString& name, long WXUNUSED(flags), + const wxString& name, wxBitmapType WXUNUSED(flags), int WXUNUSED(desiredWidth), int WXUNUSED(desiredHeight)) { @@ -366,10 +366,10 @@ bool wxBMPFileHandler::LoadFile(wxBitmap *bitmap, #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") ); @@ -388,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(); @@ -438,7 +438,7 @@ 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 @@ -451,7 +451,7 @@ 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'."), @@ -464,7 +464,7 @@ 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 @@ -499,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; @@ -518,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 @@ -548,6 +548,7 @@ bool wxICOResourceHandler::LoadIcon(wxIcon *icon, if ( name == stdIcons[nIcon].name ) { hicon = ::LoadIcon((HINSTANCE)NULL, stdIcons[nIcon].id); + break; } } } @@ -567,12 +568,10 @@ bool wxICOResourceHandler::LoadIcon(wxIcon *icon, wxSize wxGetHiconSize(HICON WXUNUSED_IN_WINCE(hicon)) { - // default icon size on this hardware - // usually 32x32 but can be other (smaller) on pocket devices - wxSize size(::GetSystemMetrics(SM_CXICON), ::GetSystemMetrics(SM_CYICON)); + wxSize size; #ifndef __WXWINCE__ - if ( hicon && wxGetOsVersion() != wxWIN32S ) + if ( hicon ) { ICONINFO info; if ( !::GetIconInfo(hicon, &info) ) @@ -596,7 +595,14 @@ wxSize wxGetHiconSize(HICON WXUNUSED_IN_WINCE(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; }