Applied patch [ 1374215 ] Bug fix to wxSpinCtrl for Windows

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

diff --git a/src/msw/imaglist.cpp b/src/msw/imaglist.cpp
index 785a18c637274512ec79dd1400f007fbb81e7450..7fab0d3724f67af30f2f90ebced7cdc3c59a08a3 100644 (file)
--- a/src/msw/imaglist.cpp
+++ b/src/msw/imaglist.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "imaglist.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -28,8 +24,6 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#if defined(__WIN95__)
-

 #ifndef WX_PRECOMP
     #include "wx/window.h"
     #include "wx/icon.h"
 #ifndef WX_PRECOMP
     #include "wx/window.h"
     #include "wx/icon.h"


@@ -47,9 +41,8 @@
 #include "wx/msw/imaglist.h"
 #include "wx/msw/private.h"
 
 #include "wx/msw/imaglist.h"
 #include "wx/msw/private.h"
 

-#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__))
-    #include <commctrl.h>
-#endif
+// include <commctrl.h> "properly"
+#include "wx/msw/wrapcctl.h"

 
 // ----------------------------------------------------------------------------
 // wxWin macros
 
 // ----------------------------------------------------------------------------
 // wxWin macros


@@ -203,7 +196,7 @@ bool wxImageList::Replace(int index,
                                 GetHbitmapOf(bitmap), hbmpMask) != 0;
     if ( !ok )
     {
                                 GetHbitmapOf(bitmap), hbmpMask) != 0;
     if ( !ok )
     {

-        wxLogLastError(wxT("ImageList_Add()"));
+        wxLogLastError(wxT("ImageList_Replace()"));

     }
 
     ::DeleteObject(hbmpMask);
     }
 
     ::DeleteObject(hbmpMask);


@@ -214,7 +207,7 @@ bool wxImageList::Replace(int index,
 // Replaces a bitmap and mask from an icon.
 bool wxImageList::Replace(int i, const wxIcon& icon)
 {
 // Replaces a bitmap and mask from an icon.
 bool wxImageList::Replace(int i, const wxIcon& icon)
 {

-    bool ok = ImageList_ReplaceIcon(GetHImageList(), i, GetHiconOf(icon)) != 0;
+    bool ok = ImageList_ReplaceIcon(GetHImageList(), i, GetHiconOf(icon)) != -1;

     if ( !ok )
     {
         wxLogLastError(wxT("ImageList_ReplaceIcon()"));
     if ( !ok )
     {
         wxLogLastError(wxT("ImageList_ReplaceIcon()"));


@@ -327,7 +320,7 @@ wxBitmap wxImageList::GetBitmap(int index) const
     image = bitmap.ConvertToImage();
     image.SetMaskColour(r, g, b);
     bitmap = wxBitmap(image);
     image = bitmap.ConvertToImage();
     image.SetMaskColour(r, g, b);
     bitmap = wxBitmap(image);

-    
+

     return bitmap;
 }
 
     return bitmap;
 }
 


@@ -339,14 +332,14 @@ wxIcon wxImageList::GetIcon(int index) const
     {
         wxIcon icon;
         icon.SetHICON((WXHICON)hIcon);
     {
         wxIcon icon;
         icon.SetHICON((WXHICON)hIcon);

-        
+

         int iconW, iconH;
         GetSize(index, iconW, iconH);
         icon.SetSize(iconW, iconH);
         int iconW, iconH;
         GetSize(index, iconW, iconH);
         icon.SetSize(iconW, iconH);

-        
+

         return icon;
     }
         return icon;
     }

-    else               
+    else

         return wxNullIcon;
 }
 
         return wxNullIcon;
 }
 


@@ -395,6 +388,3 @@ static HBITMAP GetMaskForImage(const wxBitmap& bitmap, const wxBitmap& mask)
 
     return hbmpMaskInv;
 }
 
     return hbmpMaskInv;
 }

-
-#endif // Win95
-