eVC3 (older WinCE) build fix.

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

diff --git a/src/msw/gdiimage.cpp b/src/msw/gdiimage.cpp
index f2e84134d0765c6496c2d0d934a720810379e4c4..65b239a09c805527314b6ab75e0ef05911e48e79 100644 (file)
--- a/src/msw/gdiimage.cpp
+++ b/src/msw/gdiimage.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        msw/gdiimage.cpp
+// Name:        src/msw/gdiimage.cpp

 // Purpose:     wxGDIImage implementation
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     wxGDIImage implementation
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "gdiimage.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -31,12 +27,11 @@
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/log.h"
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/log.h"

+    #include "wx/app.h"

 #endif // WX_PRECOMP
 
 #include "wx/msw/private.h"
 
 #endif // WX_PRECOMP
 
 #include "wx/msw/private.h"
 

-#include "wx/app.h"
-

 #include "wx/bitmap.h"
 #include "wx/msw/gdiimage.h"
 
 #include "wx/bitmap.h"
 #include "wx/msw/gdiimage.h"
 


@@ -52,7 +47,7 @@
 #include "wx/file.h"
 
 #include "wx/listimpl.cpp"
 #include "wx/file.h"
 
 #include "wx/listimpl.cpp"

-WX_DEFINE_LIST(wxGDIImageHandlerList);
+WX_DEFINE_LIST(wxGDIImageHandlerList)

 
 // ----------------------------------------------------------------------------
 // private classes
 
 // ----------------------------------------------------------------------------
 // private classes


@@ -570,7 +565,7 @@ bool wxICOResourceHandler::LoadIcon(wxIcon *icon,
 // private functions
 // ----------------------------------------------------------------------------
 
 // 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
 {
     // default icon size on this hardware
     // usually 32x32 but can be other (smaller) on pocket devices


@@ -601,11 +596,9 @@ wxSize wxGetHiconSize(HICON hicon)
                 ::DeleteObject(info.hbmColor);
         }
     }
                 ::DeleteObject(info.hbmColor);
         }
     }

-#else
-    wxUnusedVar(hicon);

 #endif
 #endif

+

     return size;
 }
 
 #endif // __WXMICROWIN__
     return size;
 }
 
 #endif // __WXMICROWIN__

-