wxMac: wxUniversal integration steps

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

diff --git a/include/wx/gtk1/icon.h b/include/wx/gtk1/icon.h
index 9455d6c8ab0d495d8f0f6ce4e7f00a4951adbd46..4cdf6c0940288a315eb4dbb86e1f2abacad9b801 100644 (file)
--- a/include/wx/gtk1/icon.h
+++ b/include/wx/gtk1/icon.h
@@ -48,6 +48,11 @@ public:
     wxIcon& operator = (const wxIcon& icon);
     inline bool operator == (const wxIcon& icon) { return m_refData == icon.m_refData; }
     inline bool operator != (const wxIcon& icon) { return m_refData != icon.m_refData; }
     wxIcon& operator = (const wxIcon& icon);
     inline bool operator == (const wxIcon& icon) { return m_refData == icon.m_refData; }
     inline bool operator != (const wxIcon& icon) { return m_refData != icon.m_refData; }

+
+    // create from bitmap (which should have a mask unless it's monochrome):
+    // there shouldn't be any implicit bitmap -> icon conversion (i.e. no
+    // ctors, assignment operators...), but it's ok to have such function
+    void CopyFromBitmap(const wxBitmap& bmp);

   
 private:
     DECLARE_DYNAMIC_CLASS(wxIcon)
   
 private:
     DECLARE_DYNAMIC_CLASS(wxIcon)