fix for not sending a native click to a control if it is not enabled (does an enable...

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

diff --git a/src/msw/icon.cpp b/src/msw/icon.cpp
index 74460dff34f35c1ed7421a7d927676ca4224564d..658c537e8867091d394176c2f622f7ed5fc62980 100644 (file)
--- a/src/msw/icon.cpp
+++ b/src/msw/icon.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "icon.h"
 #endif
 
@@ -95,7 +95,7 @@ wxIcon::wxIcon(const wxIconLocation& loc)
     }
     //else: 0 is default
 
-    LoadFile(fullname);
+    LoadFile(fullname, wxBITMAP_TYPE_ICO);
 }
 
 wxIcon::~wxIcon()
@@ -135,7 +135,7 @@ bool wxIcon::LoadFile(const wxString& filename,
     if ( !handler )
     {
         // say something?
-        return FALSE;
+        return false;
     }
 
     return handler->Load(this, filename, type, desiredWidth, desiredHeight);