X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1cfa5d8e39c6572fd20438d5bc29360a56ac328b..d0b50ad93942338301a318eda78f7d3999a93fab:/src/msw/gdiimage.cpp diff --git a/src/msw/gdiimage.cpp b/src/msw/gdiimage.cpp index b327dd1969..1e7606bcbe 100644 --- a/src/msw/gdiimage.cpp +++ b/src/msw/gdiimage.cpp @@ -37,22 +37,13 @@ #include "wx/app.h" -#ifndef __WXMICROWIN__ -#include "wx/msw/dib.h" -#endif - -#include "wx/msw/bitmap.h" -#include "wx/msw/gdiimage.h" #include "wx/bitmap.h" +#include "wx/msw/gdiimage.h" +#include "wx/msw/dib.h" #include "wx/listimpl.cpp" WX_DEFINE_LIST(wxGDIImageHandlerList); - -#ifdef __WIN16__ -# include "wx/msw/curico.h" -#endif // __WIN16__ - // ---------------------------------------------------------------------------- // private classes // ---------------------------------------------------------------------------- @@ -354,45 +345,23 @@ 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); - } + 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; -#else - return false; -#endif + return dib.IsOk() && bitmap->CopyFromDIB(dib); } 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_PALETTE - wxPalette *actualPalette = (wxPalette *)pal; - if ( !actualPalette ) - actualPalette = bitmap->GetPalette(); -#else - wxPalette *actualPalette = NULL; -#endif // wxUSE_PALETTE - - return wxSaveBitmap(WXSTRINGCAST name, bitmap, actualPalette) != 0; -#else - return false; -#endif + wxCHECK_MSG( bitmap, false, _T("NULL bitmap in SaveFile") ); + + wxDIB dib(*bitmap); + + return dib.Save(name); } // ---------------------------------------------------------------------------- @@ -404,13 +373,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 @@ -490,21 +457,6 @@ bool wxICOFileHandler::LoadIcon(wxIcon *icon, } size = wxGetHiconSize(hicon); -#else // Win16 - HICON hicon = ReadIconFile((wxChar *)name.c_str(), - wxGetInstance(), - &size.x, &size.y); - HICON hIcon = 0; - HANDLE hDIB = 0; - - // Read the icon DIB from file - if( (hDIB = ReadIcon((wxChar *)name.c_str(), &size.x, &size.y)) == (HANDLE) NULL) - return false; - - // Create an icon from DIB - hicon = MakeIcon( hDIB, wxGetInstance()); - GlobalFree( hDIB); -#endif // Win32/Win16 if ( (desiredWidth != -1 && desiredWidth != size.x) || (desiredHeight != -1 && desiredHeight != size.y) ) @@ -523,9 +475,6 @@ bool wxICOFileHandler::LoadIcon(wxIcon *icon, icon->SetSize(size.x, size.y); return icon->Ok(); -#else - return false; -#endif } bool wxICOResourceHandler::LoadIcon(wxIcon *icon, @@ -547,7 +496,6 @@ bool wxICOResourceHandler::LoadIcon(wxIcon *icon, // 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 defined(__WIN32__) && !defined(__SC__) if ( hasSize ) { hicon = (HICON)::LoadImage(wxGetInstance(), name, IMAGE_ICON, @@ -555,7 +503,6 @@ bool wxICOResourceHandler::LoadIcon(wxIcon *icon, LR_DEFAULTCOLOR); } else -#endif // Win32/!Win32 { hicon = ::LoadIcon(wxGetInstance(), name); } @@ -600,8 +547,6 @@ wxSize wxGetHiconSize(HICON hicon) { wxSize size(32, 32); // default -#ifdef __WIN32__ - // Win32s doesn't have GetIconInfo function... if ( hicon && wxGetOsVersion() != wxWIN32S ) { ICONINFO info; @@ -626,9 +571,9 @@ wxSize wxGetHiconSize(HICON hicon) ::DeleteObject(info.hbmColor); } } -#endif return size; } -#endif - // __WXMICROWIN__ + +#endif // __WXMICROWIN__ +