X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a91bcd3b54fe663b3ee78e995cf3e1aeff1a34b4..95dc6a2b1d14c2ddb121cdff52a6b013293ae4f1:/src/msw/gdiimage.cpp?ds=sidebyside

diff --git a/src/msw/gdiimage.cpp b/src/msw/gdiimage.cpp
index 99ffb48afc..4f73c774b1 100644
--- a/src/msw/gdiimage.cpp
+++ b/src/msw/gdiimage.cpp
@@ -151,6 +151,7 @@ public:
     {
     }
 
+protected:
     virtual bool LoadIcon(wxIcon *icon,
                           const wxString& name, long flags,
                           int desiredWidth = -1, int desiredHeight = -1);
@@ -168,6 +169,7 @@ public:
     {
     }
 
+protected:
     virtual bool LoadIcon(wxIcon *icon,
                           const wxString& name, long flags,
                           int desiredWidth = -1, int desiredHeight = -1);
@@ -265,7 +267,7 @@ wxGDIImageHandler *wxGDIImage::FindHandler(const wxString& extension,
     while ( node )
     {
         wxGDIImageHandler *handler = node->GetData();
-        if ( (handler->GetExtension() = extension) &&
+        if ( (handler->GetExtension() == extension) &&
              (type == -1 || handler->GetType() == type) )
         {
             return handler;
@@ -568,7 +570,7 @@ bool wxICOResourceHandler::LoadIcon(wxIcon *icon,
 // private functions
 // ----------------------------------------------------------------------------
 
-wxSize wxGetHiconSize(HICON hicon)
+wxSize wxGetHiconSize(HICON WXUNUSED_IN_WINCE(hicon))
 {
     // default icon size on this hardware
     // usually 32x32 but can be other (smaller) on pocket devices
@@ -599,9 +601,8 @@ wxSize wxGetHiconSize(HICON hicon)
                 ::DeleteObject(info.hbmColor);
         }
     }
-#else
-    wxUnusedVar(hicon);
 #endif
+
     return size;
 }