fix to not show ampersands in the static box title (needed after the previous change)

[wxWidgets.git] / src / motif / icon.cpp

diff --git a/src/motif/icon.cpp b/src/motif/icon.cpp
index 96905576b3364d0a4eb414ec09ed18a10af92c23..a31a6f0646d3141e832f686536e7d24897d09e31 100644 (file)
--- a/src/motif/icon.cpp
+++ b/src/motif/icon.cpp
@@ -61,6 +61,12 @@ wxIcon::wxIcon(const wxString& icon_file, long flags,
     LoadFile(icon_file, flags, desiredWidth, desiredHeight);
 }
 
     LoadFile(icon_file, flags, desiredWidth, desiredHeight);
 }
 

+void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
+{
+    wxIcon *icon = (wxIcon*)(&bmp);
+    *this = *icon;
+}
+

 wxIcon::~wxIcon()
 {
 }
 wxIcon::~wxIcon()
 {
 }