A little better failure message

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

diff --git a/src/msw/imaglist.cpp b/src/msw/imaglist.cpp
index 342b7da070d45af37fa5e616513777f59e55328a..af74e0328f5f17e981d5f731e5b138f39f047284 100644 (file)
--- a/src/msw/imaglist.cpp
+++ b/src/msw/imaglist.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "imaglist.h"
 #endif
 
     #pragma implementation "imaglist.h"
 #endif
 


@@ -85,10 +85,11 @@ bool wxImageList::Create(int width, int height, bool mask, int initial)
     UINT flags = 0;
 
     // set appropriate color depth
     UINT flags = 0;
 
     // set appropriate color depth

-    int dd = wxDisplayDepth();

 #ifdef __WXWINCE__
     flags |= ILC_COLOR;
 #else
 #ifdef __WXWINCE__
     flags |= ILC_COLOR;
 #else

+    int dd = wxDisplayDepth();
+

     if (dd <= 4)       flags |= ILC_COLOR;     // 16 color
     else if (dd <= 8)  flags |= ILC_COLOR8;    // 256 color
     else if (dd <= 16) flags |= ILC_COLOR16;   // 64k hi-color
     if (dd <= 4)       flags |= ILC_COLOR;     // 16 color
     else if (dd <= 8)  flags |= ILC_COLOR8;    // 256 color
     else if (dd <= 16) flags |= ILC_COLOR16;   // 64k hi-color


@@ -264,10 +265,10 @@ bool wxImageList::Draw(int index,
     COLORREF clr = CLR_NONE;    // transparent by default
     if ( solidBackground )
     {
     COLORREF clr = CLR_NONE;    // transparent by default
     if ( solidBackground )
     {

-        wxBrush *brush = & dc.GetBackground();
-        if ( brush && brush->Ok() )
+        const wxBrush& brush = dc.GetBackground();
+        if ( brush.Ok() )

         {
         {

-            clr = wxColourToRGB(brush->GetColour());
+            clr = wxColourToRGB(brush.GetColour());

         }
     }
 
         }
     }
 


@@ -327,7 +328,7 @@ static HBITMAP GetMaskForImage(const wxBitmap& bitmap, const wxBitmap& mask)
         hbmpMask = (HBITMAP)pMask->GetMaskBitmap();
     }
 
         hbmpMask = (HBITMAP)pMask->GetMaskBitmap();
     }
 

-    // windows mask convention is opposite to the wxWindows one
+    // windows mask convention is opposite to the wxWidgets one

     HBITMAP hbmpMaskInv = wxInvertMask(hbmpMask);
 
     if ( deleteMask )
     HBITMAP hbmpMaskInv = wxInvertMask(hbmpMask);
 
     if ( deleteMask )