blind fix for wxGIFDecoder::ReadGIF

[wxWidgets.git] / src / msw / gdiimage.cpp

diff --git a/src/msw/gdiimage.cpp b/src/msw/gdiimage.cpp
index 63673882ccc769a568341031ba6e90b328b6adac..3ead2479d1d150bc10f7df5accefc8037c70a6f8 100644 (file)
--- a/src/msw/gdiimage.cpp
+++ b/src/msw/gdiimage.cpp
@@ -37,15 +37,14 @@
 
 #include "wx/app.h"
 
 
 #include "wx/app.h"
 

+#ifndef __WXMICROWIN__

 #include "wx/msw/dib.h"
 #include "wx/msw/dib.h"

+#endif
+

 #include "wx/msw/bitmap.h"
 #include "wx/msw/gdiimage.h"
 #include "wx/bitmap.h"
 
 #include "wx/msw/bitmap.h"
 #include "wx/msw/gdiimage.h"
 #include "wx/bitmap.h"
 

-#if wxUSE_XPM_IN_MSW
-#   include "wx/xpmhand.h"
-#endif // wxUSE_XPM_IN_MSW
-

 #ifdef __WIN16__
 #   include "wx/msw/curico.h"
 #endif // __WIN16__
 #ifdef __WIN16__
 #   include "wx/msw/curico.h"
 #endif // __WIN16__


@@ -54,6 +53,8 @@
 // private classes
 // ----------------------------------------------------------------------------
 
 // private classes
 // ----------------------------------------------------------------------------
 

+#ifndef __WXMICROWIN__
+

 // all image handlers are declared/defined in this file because the outside
 // world doesn't have to know about them (but only about wxBITMAP_TYPE_XXX ids)
 
 // all image handlers are declared/defined in this file because the outside
 // world doesn't have to know about them (but only about wxBITMAP_TYPE_XXX ids)
 


@@ -184,6 +185,8 @@ private:
 // ----------------------------------------------------------------------------
 
 static wxSize GetHiconSize(HICON hicon);
 // ----------------------------------------------------------------------------
 
 static wxSize GetHiconSize(HICON hicon);

+#endif
+    // __MICROWIN__

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -299,20 +302,16 @@ void wxGDIImage::CleanUpHandlers()
 
 void wxGDIImage::InitStandardHandlers()
 {
 
 void wxGDIImage::InitStandardHandlers()
 {

+#ifndef __WXMICROWIN__

     AddHandler(new wxBMPResourceHandler);
     AddHandler(new wxBMPFileHandler);
     AddHandler(new wxBMPResourceHandler);
     AddHandler(new wxBMPFileHandler);

-
-    // GRG: Add these handlers by default if XPM support is enabled
-
-#if wxUSE_XPM_IN_MSW
-    AddHandler(new wxXPMFileHandler);
-    AddHandler(new wxXPMDataHandler);
-#endif // wxUSE_XPM_IN_MSW
-

     AddHandler(new wxICOResourceHandler);
     AddHandler(new wxICOFileHandler);
     AddHandler(new wxICOResourceHandler);
     AddHandler(new wxICOFileHandler);

+#endif

 }
 
 }
 

+#ifndef __WXMICROWIN__
+

 // ----------------------------------------------------------------------------
 // wxBitmap handlers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxBitmap handlers
 // ----------------------------------------------------------------------------


@@ -356,6 +355,8 @@ bool wxBMPFileHandler::LoadFile(wxBitmap *bitmap,
 #if wxUSE_IMAGE_LOADING_IN_MSW
     wxPalette *palette = NULL;
     bool success = wxLoadIntoBitmap(WXSTRINGCAST name, bitmap, &palette) != 0;
 #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 ( success && palette )
     {
         bitmap->SetPalette(*palette);


@@ -363,6 +364,7 @@ bool wxBMPFileHandler::LoadFile(wxBitmap *bitmap,
 
     // it was copied by the bitmap if it was loaded successfully
     delete palette;
 
     // it was copied by the bitmap if it was loaded successfully
     delete palette;

+#endif // wxUSE_PALETTE

 
     return success;
 #else
 
     return success;
 #else


@@ -376,9 +378,15 @@ bool wxBMPFileHandler::SaveFile(wxBitmap *bitmap,
                                 const wxPalette *pal)
 {
 #if wxUSE_IMAGE_LOADING_IN_MSW
                                 const wxPalette *pal)
 {
 #if wxUSE_IMAGE_LOADING_IN_MSW

+
+#if wxUSE_PALETTE

     wxPalette *actualPalette = (wxPalette *)pal;
     if ( !actualPalette )
         actualPalette = bitmap->GetPalette();
     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;
     return wxSaveBitmap(WXSTRINGCAST name, bitmap, actualPalette) != 0;
 #else
     return FALSE;


@@ -391,7 +399,7 @@ bool wxBMPFileHandler::SaveFile(wxBitmap *bitmap,
 
 bool wxICOFileHandler::LoadIcon(wxIcon *icon,
                                 const wxString& name,
 
 bool wxICOFileHandler::LoadIcon(wxIcon *icon,
                                 const wxString& name,

-                                long flags,
+                                long WXUNUSED(flags),

                                 int desiredWidth, int desiredHeight)
 {
 #if wxUSE_RESOURCE_LOADING_IN_MSW
                                 int desiredWidth, int desiredHeight)
 {
 #if wxUSE_RESOURCE_LOADING_IN_MSW


@@ -403,12 +411,26 @@ bool wxICOFileHandler::LoadIcon(wxIcon *icon,
 #ifdef __WIN32__
     HICON hicon = NULL;
 
 #ifdef __WIN32__
     HICON hicon = NULL;
 

+    // Parse the filename: it may be of the form "filename;n" in order to
+    // specify the nth icon in the file.
+    //
+    // For the moment, ignore the issue of possible semicolons in the
+    // filename.
+    int iconIndex = 0;
+    wxString nameReal(name);
+    wxString strIconIndex = name.AfterLast(wxT(';'));
+    if (strIconIndex != name)
+    {
+        iconIndex = wxAtoi(strIconIndex);
+        nameReal = name.BeforeLast(wxT(';'));
+    }
+

     // were we asked for a large icon?
     if ( desiredWidth == ::GetSystemMetrics(SM_CXICON) &&
          desiredHeight == ::GetSystemMetrics(SM_CYICON) )
     {
     // were we asked for a large icon?
     if ( desiredWidth == ::GetSystemMetrics(SM_CXICON) &&
          desiredHeight == ::GetSystemMetrics(SM_CYICON) )
     {

-        // get the first large icon from file
-        if ( !::ExtractIconEx(name, 0, &hicon, NULL, 1) )
+        // get the specified large icon from file
+        if ( !::ExtractIconEx(nameReal, iconIndex, &hicon, NULL, 1) )

         {
             // it is not an error, but it might still be useful to be informed
             // about it optionally
         {
             // it is not an error, but it might still be useful to be informed
             // about it optionally


@@ -420,8 +442,8 @@ bool wxICOFileHandler::LoadIcon(wxIcon *icon,
     else if ( desiredWidth == ::GetSystemMetrics(SM_CXSMICON) &&
               desiredHeight == ::GetSystemMetrics(SM_CYSMICON) )
     {
     else if ( desiredWidth == ::GetSystemMetrics(SM_CXSMICON) &&
               desiredHeight == ::GetSystemMetrics(SM_CYSMICON) )
     {

-        // get the first small icon from file
-        if ( !::ExtractIconEx(name, 0, NULL, &hicon, 1) )
+        // get the specified small icon from file
+        if ( !::ExtractIconEx(nameReal, iconIndex, NULL, &hicon, 1) )

         {
             wxLogTrace(_T("iconload"),
                        _T("No small icons found in the file '%s'."),
         {
             wxLogTrace(_T("iconload"),
                        _T("No small icons found in the file '%s'."),


@@ -433,7 +455,7 @@ bool wxICOFileHandler::LoadIcon(wxIcon *icon,
     if ( !hicon )
     {
         // take any (the first one) icon from the file by default
     if ( !hicon )
     {
         // take any (the first one) icon from the file by default

-        hicon = ::ExtractIcon(wxGetInstance(), name, 0 /* first */);
+        hicon = ::ExtractIcon(wxGetInstance(), nameReal, 0 /* first */);

     }
 
     if ( !hicon )
     }
 
     if ( !hicon )


@@ -475,13 +497,22 @@ bool wxICOFileHandler::LoadIcon(wxIcon *icon,
 
 bool wxICOResourceHandler::LoadIcon(wxIcon *icon,
                                     const wxString& name,
 
 bool wxICOResourceHandler::LoadIcon(wxIcon *icon,
                                     const wxString& name,

-                                    long flags,
+                                    long WXUNUSED(flags),

                                     int desiredWidth, int desiredHeight)
 {
     HICON hicon;
 
                                     int desiredWidth, int desiredHeight)
 {
     HICON hicon;
 

+    // do we need the icon of the specific size or would any icon do?
+    bool hasSize = desiredWidth != -1 || desiredHeight != -1;
+
+    wxASSERT_MSG( !hasSize || (desiredWidth != -1 && desiredHeight != -1),
+                  _T("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 defined(__WIN32__) && !defined(__SC__)

-    if ( desiredWidth != -1 && desiredHeight != -1 )
+    if ( hasSize )

     {
         hicon = (HICON)::LoadImage(wxGetInstance(), name, IMAGE_ICON,
                                     desiredWidth, desiredHeight,
     {
         hicon = (HICON)::LoadImage(wxGetInstance(), name, IMAGE_ICON,
                                     desiredWidth, desiredHeight,


@@ -493,6 +524,30 @@ bool wxICOResourceHandler::LoadIcon(wxIcon *icon,
         hicon = ::LoadIcon(wxGetInstance(), name);
     }
 
         hicon = ::LoadIcon(wxGetInstance(), name);
     }
 

+    // next check if it's not a standard icon
+    if ( !hicon && !hasSize )
+    {
+        static const struct
+        {
+            const wxChar *name;
+            LPTSTR id;
+        } stdIcons[] =
+        {
+            { wxT("wxICON_QUESTION"),   IDI_QUESTION    },
+            { wxT("wxICON_WARNING"),    IDI_EXCLAMATION },
+            { wxT("wxICON_ERROR"),      IDI_HAND        },
+            { wxT("wxICON_INFO"),       IDI_ASTERISK    },
+        };
+
+        for ( size_t nIcon = 0; !hicon && nIcon < WXSIZEOF(stdIcons); nIcon++ )
+        {
+            if ( name == stdIcons[nIcon].name )
+            {
+                hicon = ::LoadIcon((HINSTANCE)NULL, stdIcons[nIcon].id);
+            }
+        }
+    }
+

     wxSize size = GetHiconSize(hicon);
     icon->SetSize(size.x, size.y);
 
     wxSize size = GetHiconSize(hicon);
     icon->SetSize(size.x, size.y);
 


@@ -545,3 +600,5 @@ static wxSize GetHiconSize(HICON hicon)
 
     return size;
 }
 
     return size;
 }

+#endif
+    // __WXMICROWIN__