many compilation fixes for WinCE using VC8 (it now build, although still doesn't...

[wxWidgets.git] / src / os2 / gdiimage.cpp

diff --git a/src/os2/gdiimage.cpp b/src/os2/gdiimage.cpp
index d19adb7e8b5f147ffd99816966431bd30f51b8d9..4c2fee54259d262a30f38f03f2d458fefa288fc6 100644 (file)
--- a/src/os2/gdiimage.cpp
+++ b/src/os2/gdiimage.cpp
@@ -113,7 +113,7 @@ public:
 
     // creating and saving icons is not supported
     virtual bool Create( wxGDIImage* WXUNUSED(pImage)
 
     // creating and saving icons is not supported
     virtual bool Create( wxGDIImage* WXUNUSED(pImage)

-                        ,void*       WXUNUSED(pData)
+                        ,const void* WXUNUSED(pData)

                         ,long        WXUNUSED(lFlags)
                         ,int         WXUNUSED(nWidth)
                         ,int         WXUNUSED(nHeight)
                         ,long        WXUNUSED(lFlags)
                         ,int         WXUNUSED(nWidth)
                         ,int         WXUNUSED(nHeight)


@@ -241,7 +241,7 @@ bool wxGDIImage::FreeResource( bool WXUNUSED(bForce) )
     return true;
 }
 
     return true;
 }
 

-WXHANDLE wxGDIImage::GetResourceHandle()
+WXHANDLE wxGDIImage::GetResourceHandle() const

 {
     return GetHandle();
 }
 {
     return GetHandle();
 }


@@ -300,7 +300,7 @@ wxGDIImageHandler* wxGDIImage::FindHandler(
     {
         wxGDIImageHandler*          pHandler = pNode->GetData();
 
     {
         wxGDIImageHandler*          pHandler = pNode->GetData();
 

-        if ( (pHandler->GetExtension() = rExtension) &&
+        if ( (pHandler->GetExtension() == rExtension) &&

              (lType == -1 || pHandler->GetType() == lType) )
         {
             return pHandler;
              (lType == -1 || pHandler->GetType() == lType) )
         {
             return pHandler;


@@ -469,7 +469,7 @@ bool wxICOResourceHandler::LoadIcon( wxIcon*         pIcon,
 {
     HPOINTER                        hIcon;
 
 {
     HPOINTER                        hIcon;
 

-    hIcon = ::WinLoadFileIcon( (PSZ)rName.c_str()
+    hIcon = ::WinLoadFileIcon( rName.c_str()

                               ,TRUE // load for private use
                              );
 
                               ,TRUE // load for private use
                              );