don't crash under GTK1 if we failed to get GdkFont in GetTextExtent()

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

diff --git a/src/gtk/icon.cpp b/src/gtk/icon.cpp
index a372cb986937e65e06db475ee2835faae3b52271..ef9780a56cabe17cdc35978a8e3523cc2f748bf2 100644 (file)
--- a/src/gtk/icon.cpp
+++ b/src/gtk/icon.cpp
@@ -7,10 +7,13 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "icon.h"
 #endif
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
 #include "wx/icon.h"
 
 //-----------------------------------------------------------------------------
@@ -45,3 +48,8 @@ wxIcon& wxIcon::operator = ( const wxIcon& icon )
     return *this;
 }
 
+void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
+{
+    wxIcon *icon = (wxIcon*)(&bmp);
+    *this = *icon;
+}