Update to Scintilla 1.53

[wxWidgets.git] / include / wx / gtk1 / icon.h

diff --git a/include/wx/gtk1/icon.h b/include/wx/gtk1/icon.h
index f537cb131fa669d305e4c5be77543f7219f8d3b2..10bb5b12a27bcbd7690ec3a9599b7c9c1152b1e3 100644 (file)
--- a/include/wx/gtk1/icon.h
+++ b/include/wx/gtk1/icon.h
@@ -11,7 +11,7 @@
 #ifndef __GTKICONH__
 #define __GTKICONH__
 
 #ifndef __GTKICONH__
 #define __GTKICONH__
 

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

 #pragma interface
 #endif
 
 #pragma interface
 #endif
 


@@ -45,6 +45,11 @@ public:
     }
     wxIcon( char **bits, int width=-1, int height=-1 );
 
     }
     wxIcon( char **bits, int width=-1, int height=-1 );
 

+    wxIcon(const wxIconLocation& loc)
+        : wxBitmap(loc.GetFileName(), wxBITMAP_TYPE_XPM)
+    {
+    }
+

     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); }
     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); }