X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4b912ef220f5509b4d6a09a38c9e7839b5f11a6b..9d9ad67384e5dc658c4de46e49113c321489bf81:/include/wx/gtk1/icon.h

diff --git a/include/wx/gtk1/icon.h b/include/wx/gtk1/icon.h
index f537cb131f..0bcbf462c0 100644
--- a/include/wx/gtk1/icon.h
+++ b/include/wx/gtk1/icon.h
@@ -11,7 +11,7 @@
 #ifndef __GTKICONH__
 #define __GTKICONH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface
 #endif
 
@@ -38,13 +38,18 @@ public:
 
     // For compatibility with wxMSW where desired size is sometimes required to
     // distinguish between multiple icons in a resource.
-    wxIcon( const wxString& filename, int type = wxBITMAP_TYPE_XPM,
+    wxIcon( const wxString& filename, wxBitmapType type = wxBITMAP_TYPE_XPM,
             int WXUNUSED(desiredWidth)=-1, int WXUNUSED(desiredHeight)=-1 ) :
         wxBitmap(filename, type)
     {
     }
     wxIcon( char **bits, int width=-1, int height=-1 );
 
+    wxIcon(const wxIconLocation& loc)
+        : wxBitmap(loc.GetFileName(), wxBITMAP_TYPE_ANY)
+    {
+    }
+
     wxIcon& operator=(const wxIcon& icon);
     bool operator==(const wxIcon& icon) const { return m_refData == icon.m_refData; }
     bool operator!=(const wxIcon& icon) const { return !(*this == icon); }