From: Václav Slavík <vslavik@fastmail.fm>
Date: Tue, 15 Aug 2000 21:44:18 +0000 (+0000)
Subject: added wxIcon::CopyFromBitmap to wxGTK
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/019faef468c1558315586be8f9071acbdbc6a385

added wxIcon::CopyFromBitmap to wxGTK


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8109 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/docs/latex/wx/icon.tex b/docs/latex/wx/icon.tex
index b7659df6c9..fb8b0eb930 100644
--- a/docs/latex/wx/icon.tex
+++ b/docs/latex/wx/icon.tex
@@ -181,6 +181,15 @@ Under X, {\it type} defaults to wxBITMAP\_TYPE\_XPM.
 
 \wxheading{See also}
 
+
+\membersection{wxIcon::CopyFromBitmap}\label{wxiconcopyfrombitmap}
+
+\func{void}{CopyFromBitmap}{\param{const wxBitmap\&}{ bmp}}
+
+Copies {\it bmp} bitmap to this icon. Under MS Windows the bitmap
+must have mask colour set.
+
+
 \helpref{wxIcon::LoadFile}{wxiconloadfile}
 
 \membersection{wxIcon::\destruct{wxIcon}}
diff --git a/include/wx/gtk/icon.h b/include/wx/gtk/icon.h
index 9455d6c8ab..4cdf6c0940 100644
--- a/include/wx/gtk/icon.h
+++ b/include/wx/gtk/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; }
+
+    // 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)
diff --git a/include/wx/gtk1/icon.h b/include/wx/gtk1/icon.h
index 9455d6c8ab..4cdf6c0940 100644
--- 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; }
+
+    // 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)
diff --git a/src/gtk/icon.cpp b/src/gtk/icon.cpp
index a372cb9869..05c1089158 100644
--- a/src/gtk/icon.cpp
+++ b/src/gtk/icon.cpp
@@ -45,3 +45,8 @@ wxIcon& wxIcon::operator = ( const wxIcon& icon )
     return *this;
 }
 
+void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
+{
+    wxIcon *icon = (wxIcon*)(&bmp);
+    *this = *icon;
+}
diff --git a/src/gtk1/icon.cpp b/src/gtk1/icon.cpp
index a372cb9869..05c1089158 100644
--- a/src/gtk1/icon.cpp
+++ b/src/gtk1/icon.cpp
@@ -45,3 +45,8 @@ wxIcon& wxIcon::operator = ( const wxIcon& icon )
     return *this;
 }
 
+void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
+{
+    wxIcon *icon = (wxIcon*)(&bmp);
+    *this = *icon;
+}