Include wx/string.h according to precompiled headers of wx/wx.h (with other minor...

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

diff --git a/src/msw/imaglist.cpp b/src/msw/imaglist.cpp
index 39c071e1fdb390225b75e52737062fdc351d48aa..5b5e3541af3bf32d4589b36e76524734e4031110 100644 (file)
--- a/src/msw/imaglist.cpp
+++ b/src/msw/imaglist.cpp
@@ -24,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"


@@ -43,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


@@ -210,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()"));


@@ -293,6 +290,7 @@ bool wxImageList::Draw(int index,
 // Get the bitmap
 wxBitmap wxImageList::GetBitmap(int index) const
 {
 // 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);
 
     int bmp_width = 0, bmp_height = 0;
     GetSize(index, bmp_width, bmp_height);
 


@@ -323,7 +321,9 @@ 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);

-    
+#else
+    wxBitmap bitmap;
+#endif

     return bitmap;
 }
 
     return bitmap;
 }
 


@@ -335,14 +335,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;
 }
 


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

-
-#endif // Win95
-