X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2bda0e173844e8e0f8acf4e8ad8b5c26e5c6fe5d..8c73964939048d046c50ec0240d26d9c36a4e424:/src/msw/imaglist.cpp

diff --git a/src/msw/imaglist.cpp b/src/msw/imaglist.cpp
index 49ce321f41..4d969b52ab 100644
--- a/src/msw/imaglist.cpp
+++ b/src/msw/imaglist.cpp
@@ -66,7 +66,7 @@ int wxImageList::GetImageCount(void) const
 ////////////////////////////////////////////////////////////////////////////
 
 // Creates an image list
-bool wxImageList::Create(const int width, const int height, const bool mask, const int initial)
+bool wxImageList::Create(int width, int height, bool mask, int initial)
 {
 	UINT flags = 0;
 	if ( mask )
@@ -86,7 +86,14 @@ int wxImageList::Add(const wxBitmap& bitmap, const wxBitmap& mask)
 	HBITMAP hBitmap2 = 0;
 	if ( mask.Ok() )
 	    hBitmap2 = (HBITMAP) mask.GetHBITMAP();
-	return ImageList_Add((HIMAGELIST) GetHIMAGELIST(), hBitmap1, hBitmap2);
+
+    int index = ImageList_Add((HIMAGELIST) GetHIMAGELIST(), hBitmap1, hBitmap2);
+	if ( index == -1 )
+    {
+        wxLogError(_("Couldn't add an image to the image list."));
+    }
+
+    return index;
 }
 
 // Adds a bitmap, using the specified colour to create the mask bitmap
@@ -109,7 +116,7 @@ int wxImageList::Add(const wxIcon& icon)
 // Replaces a bitmap, optionally passing a mask bitmap.
 // Note that wxImageList creates new bitmaps, so you may delete
 // 'bitmap' and 'mask'.
-bool wxImageList::Replace(const int index, const wxBitmap& bitmap, const wxBitmap& mask)
+bool wxImageList::Replace(int index, const wxBitmap& bitmap, const wxBitmap& mask)
 {
 	HBITMAP hBitmap1 = (HBITMAP) bitmap.GetHBITMAP();
 	HBITMAP hBitmap2 = 0;
@@ -122,7 +129,7 @@ bool wxImageList::Replace(const int index, const wxBitmap& bitmap, const wxBitma
 // Replacing a bitmap, using the specified colour to create the mask bitmap
 // Note that wxImageList creates new bitmaps, so you may delete
 // 'bitmap'.
-bool wxImageList::Replace(const int index, const wxBitmap& bitmap, const wxColour& maskColour)
+bool wxImageList::Replace(int index, const wxBitmap& bitmap, const wxColour& maskColour)
 {
 	HBITMAP hBitmap1 = (HBITMAP) bitmap.GetHBITMAP();
 	COLORREF colorRef = PALETTERGB(maskColour.Red(), maskColour.Green(), maskColour.Blue());
@@ -131,14 +138,14 @@ bool wxImageList::Replace(const int index, const wxBitmap& bitmap, const wxColou
 */
 
 // Replaces a bitmap and mask from an icon.
-bool wxImageList::Replace(const int index, const wxIcon& icon)
+bool wxImageList::Replace(int index, const wxIcon& icon)
 {
 	HICON hIcon = (HICON) icon.GetHICON();
 	return (ImageList_ReplaceIcon((HIMAGELIST) GetHIMAGELIST(), index, hIcon) != 0);
 }
 
 // Removes the image at the given index.
-bool wxImageList::Remove(const int index)
+bool wxImageList::Remove(int index)
 {
 	return (ImageList_Remove((HIMAGELIST) GetHIMAGELIST(), index) != 0);
 }
@@ -158,8 +165,8 @@ bool wxImageList::RemoveAll(void)
 // If 'solidBackground' is TRUE, Draw sets the image list background
 // colour to the background colour of the wxDC, to speed up
 // drawing by eliminating masked drawing where possible.
-bool wxImageList::Draw(const int index, wxDC& dc, const int x, const int y,
-    const int flags, const bool solidBackground)
+bool wxImageList::Draw(int index, wxDC& dc, int x, int y,
+    int flags, bool solidBackground)
 {
 	HDC hDC = (HDC) dc.GetHDC();
 	if ( !hDC )
@@ -167,7 +174,7 @@ bool wxImageList::Draw(const int index, wxDC& dc, const int x, const int y,
 
 	if ( solidBackground )
 	{
-		wxBrush *brush = dc.GetBackground();
+		wxBrush *brush = & dc.GetBackground();
 		if ( brush && brush->Ok())
 		{
 			wxColour col(brush->GetColour());