added an extra pixel to the margin in CalcSizeFromPage() (patch 1498847)

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

diff --git a/src/msw/imaglist.cpp b/src/msw/imaglist.cpp
index 7fab0d3724f67af30f2f90ebced7cdc3c59a08a3..7a42766424145339a5e2a97e26742925e07a2593 100644 (file)
--- a/src/msw/imaglist.cpp
+++ b/src/msw/imaglist.cpp
@@ -30,12 +30,12 @@
     #include "wx/dc.h"
     #include "wx/string.h"
     #include "wx/dcmemory.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
 
     #include <stdio.h>
 #endif
 
-#include "wx/log.h"
-#include "wx/intl.h"
 #include "wx/image.h"
 
 #include "wx/msw/imaglist.h"
@@ -290,6 +290,7 @@ bool wxImageList::Draw(int index,
 // Get the bitmap
 wxBitmap wxImageList::GetBitmap(int index) const
 {
+#if wxUSE_WXDIB
     int bmp_width = 0, bmp_height = 0;
     GetSize(index, bmp_width, bmp_height);
 
@@ -320,7 +321,9 @@ wxBitmap wxImageList::GetBitmap(int index) const
     image = bitmap.ConvertToImage();
     image.SetMaskColour(r, g, b);
     bitmap = wxBitmap(image);
-
+#else
+    wxBitmap bitmap;
+#endif
     return bitmap;
 }