wxBase compilation fixes

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

diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp
index dbb6114bee59ec7d9c3b5f7421d0231320a305d3..bcf8a618f0778dddf32c50f90fb05b8fc6a6980f 100644 (file)
--- a/src/msw/bitmap.cpp
+++ b/src/msw/bitmap.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "bitmap.h"
 #endif
 
@@ -1865,6 +1865,7 @@ HICON wxBitmapToIconOrCursor(const wxBitmap& bmp,
     }
 
     ICONINFO iconInfo;
+    wxZeroMemory(iconInfo);
     iconInfo.fIcon = iconWanted;  // do we want an icon or a cursor?
     if ( !iconWanted )
     {