1. minor fixes in wxDynLib

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

diff --git a/src/msw/imaglist.cpp b/src/msw/imaglist.cpp
index 4d969b52aba987b89fa8cbe906109c0ec37c80d4..a4e2fe629dfde1418c5a09bd3061bad5f5f9ffb4 100644 (file)
--- a/src/msw/imaglist.cpp
+++ b/src/msw/imaglist.cpp
@@ -26,13 +26,18 @@
 #include <stdio.h>
 #include "wx/setup.h"
 #include "wx/window.h"
 #include <stdio.h>
 #include "wx/setup.h"
 #include "wx/window.h"

-#include "wx/dcclient.h"
+#include "wx/icon.h"
+#include "wx/dc.h"
+#include "wx/string.h"

 #endif
 
 #endif
 

+#include "wx/log.h"
+#include "wx/intl.h"
+

 #include "wx/msw/imaglist.h"
 #include "wx/msw/private.h"
 
 #include "wx/msw/imaglist.h"
 #include "wx/msw/private.h"
 

-#ifndef __GNUWIN32__
+#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__)

 #include <commctrl.h>
 #endif
 
 #include <commctrl.h>
 #endif
 


@@ -101,9 +106,14 @@ int wxImageList::Add(const wxBitmap& bitmap, const wxBitmap& mask)
 // 'bitmap'.
 int wxImageList::Add(const wxBitmap& bitmap, const wxColour& maskColour)
 {
 // 'bitmap'.
 int wxImageList::Add(const wxBitmap& bitmap, const wxColour& maskColour)
 {

+#ifdef __TWIN32__
+        wxFAIL_MSG("ImageList_AddMasked not implemented in TWIN32");
+        return -1;
+#else

        HBITMAP hBitmap1 = (HBITMAP) bitmap.GetHBITMAP();
        COLORREF colorRef = PALETTERGB(maskColour.Red(), maskColour.Green(), maskColour.Blue());
        return ImageList_AddMasked((HIMAGELIST) GetHIMAGELIST(), hBitmap1, colorRef);
        HBITMAP hBitmap1 = (HBITMAP) bitmap.GetHBITMAP();
        COLORREF colorRef = PALETTERGB(maskColour.Red(), maskColour.Green(), maskColour.Blue());
        return ImageList_AddMasked((HIMAGELIST) GetHIMAGELIST(), hBitmap1, colorRef);

+#endif

 }
 
 // Adds a bitmap and mask from an icon.
 }
 
 // Adds a bitmap and mask from an icon.


@@ -118,11 +128,16 @@ int wxImageList::Add(const wxIcon& icon)
 // 'bitmap' and 'mask'.
 bool wxImageList::Replace(int index, const wxBitmap& bitmap, const wxBitmap& mask)
 {
 // 'bitmap' and 'mask'.
 bool wxImageList::Replace(int index, const wxBitmap& bitmap, const wxBitmap& mask)
 {

+#ifdef __TWIN32__
+        wxFAIL_MSG("ImageList_Replace not implemented in TWIN32");
+        return FALSE;
+#else

        HBITMAP hBitmap1 = (HBITMAP) bitmap.GetHBITMAP();
        HBITMAP hBitmap2 = 0;
        if ( mask.Ok() )
            hBitmap2 = (HBITMAP) mask.GetHBITMAP();
        return (ImageList_Replace((HIMAGELIST) GetHIMAGELIST(), index, hBitmap1, hBitmap2) != 0);
        HBITMAP hBitmap1 = (HBITMAP) bitmap.GetHBITMAP();
        HBITMAP hBitmap2 = 0;
        if ( mask.Ok() )
            hBitmap2 = (HBITMAP) mask.GetHBITMAP();
        return (ImageList_Replace((HIMAGELIST) GetHIMAGELIST(), index, hBitmap1, hBitmap2) != 0);

+#endif

 }
 
 /* Not supported by Win95
 }
 
 /* Not supported by Win95


@@ -147,7 +162,12 @@ bool wxImageList::Replace(int index, const wxIcon& icon)
 // Removes the image at the given index.
 bool wxImageList::Remove(int index)
 {
 // Removes the image at the given index.
 bool wxImageList::Remove(int index)
 {

+#ifdef __TWIN32__
+        wxFAIL_MSG("ImageList_Replace not implemented in TWIN32");
+        return FALSE;
+#else

        return (ImageList_Remove((HIMAGELIST) GetHIMAGELIST(), index) != 0);
        return (ImageList_Remove((HIMAGELIST) GetHIMAGELIST(), index) != 0);

+#endif

 }
 
 // Remove all images
 }
 
 // Remove all images


@@ -168,6 +188,10 @@ bool wxImageList::RemoveAll(void)
 bool wxImageList::Draw(int index, wxDC& dc, int x, int y,
     int flags, bool solidBackground)
 {
 bool wxImageList::Draw(int index, wxDC& dc, int x, int y,
     int flags, bool solidBackground)
 {

+#ifdef __TWIN32__
+        wxFAIL_MSG("ImageList_Replace not implemented in TWIN32");
+        return FALSE;
+#else

        HDC hDC = (HDC) dc.GetHDC();
        if ( !hDC )
                return FALSE;
        HDC hDC = (HDC) dc.GetHDC();
        if ( !hDC )
                return FALSE;


@@ -201,6 +225,7 @@ bool wxImageList::Draw(int index, wxDC& dc, int x, int y,
 
        return (ImageList_Draw((HIMAGELIST) GetHIMAGELIST(), index, hDC,
                x, y, style) != 0);
 
        return (ImageList_Draw((HIMAGELIST) GetHIMAGELIST(), index, hDC,
                x, y, style) != 0);

+#endif

 }
 
 #endif
 }
 
 #endif