wxMotif now works with wx-config and make install

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

diff --git a/src/msw/imaglist.cpp b/src/msw/imaglist.cpp
index e6ca103540ceae81a791a5e230341e2057ee316b..4d969b52aba987b89fa8cbe906109c0ec37c80d4 100644 (file)
--- a/src/msw/imaglist.cpp
+++ b/src/msw/imaglist.cpp
@@ -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
@@ -167,7 +174,7 @@ bool wxImageList::Draw(int index, wxDC& dc, int x, int y,
 
        if ( solidBackground )
        {
-               wxBrush *brush = dc.GetBackground();
+               wxBrush *brush = & dc.GetBackground();
                if ( brush && brush->Ok())
                {
                        wxColour col(brush->GetColour());