added wxBitmap::CopyFromIcon to wxGTK

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

diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h
index a6c24d9c068a3d80e4270889f45e23017f411f04..3de03236153221e6b60d863221369668cdd28a30 100644 (file)
--- a/include/wx/gtk/bitmap.h
+++ b/include/wx/gtk/bitmap.h
@@ -84,6 +84,9 @@ public:
     
     wxImage ConvertToImage() const;
 
+    // copies the contents and mask of the given (colour) icon to the bitmap
+    virtual bool CopyFromIcon(const wxIcon& icon);
+
     wxMask *GetMask() const;
     void SetMask( wxMask *mask );
     

diff --git a/include/wx/gtk1/bitmap.h b/include/wx/gtk1/bitmap.h
index a6c24d9c068a3d80e4270889f45e23017f411f04..3de03236153221e6b60d863221369668cdd28a30 100644 (file)
--- a/include/wx/gtk1/bitmap.h
+++ b/include/wx/gtk1/bitmap.h
@@ -84,6 +84,9 @@ public:
     
     wxImage ConvertToImage() const;
 
+    // copies the contents and mask of the given (colour) icon to the bitmap
+    virtual bool CopyFromIcon(const wxIcon& icon);
+
     wxMask *GetMask() const;
     void SetMask( wxMask *mask );
     

diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp
index 30fa4db6fa2b16f123c99721c7bebd1af6c6673e..e104eb7e82bde8bc90e0985e8d5adc9af9529ca5 100644 (file)
--- a/src/gtk/bitmap.cpp
+++ b/src/gtk/bitmap.cpp
@@ -865,6 +865,12 @@ void wxBitmap::SetMask( wxMask *mask )
     M_BMPDATA->m_mask = mask;
 }
 
+bool wxBitmap::CopyFromIcon(const wxIcon& icon)
+{
+    *this = icon;
+    return TRUE;
+}
+
 wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
 {
     wxCHECK_MSG( Ok() &&

diff --git a/src/gtk1/bitmap.cpp b/src/gtk1/bitmap.cpp
index 30fa4db6fa2b16f123c99721c7bebd1af6c6673e..e104eb7e82bde8bc90e0985e8d5adc9af9529ca5 100644 (file)
--- a/src/gtk1/bitmap.cpp
+++ b/src/gtk1/bitmap.cpp
@@ -865,6 +865,12 @@ void wxBitmap::SetMask( wxMask *mask )
     M_BMPDATA->m_mask = mask;
 }
 
+bool wxBitmap::CopyFromIcon(const wxIcon& icon)
+{
+    *this = icon;
+    return TRUE;
+}
+
 wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
 {
     wxCHECK_MSG( Ok() &&