do take the toolbar into account for Windows CE, otherwise the menus overlap with...

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

diff --git a/src/msw/icon.cpp b/src/msw/icon.cpp
index 74460dff34f35c1ed7421a7d927676ca4224564d..9064101a533de02749fcbe0c99db24f9b51630f9 100644 (file)
--- a/src/msw/icon.cpp
+++ b/src/msw/icon.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "icon.h"
 #endif
 
     #pragma implementation "icon.h"
 #endif
 


@@ -95,7 +95,7 @@ wxIcon::wxIcon(const wxIconLocation& loc)
     }
     //else: 0 is default
 
     }
     //else: 0 is default
 

-    LoadFile(fullname);
+    LoadFile(fullname, wxBITMAP_TYPE_ICO);

 }
 
 wxIcon::~wxIcon()
 }
 
 wxIcon::~wxIcon()