A few tweaks and cleanups

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

diff --git a/src/motif/icon.cpp b/src/motif/icon.cpp
index fb9802ebfa21d8b886b2dd1c899fb1419f46129b..a31a6f0646d3141e832f686536e7d24897d09e31 100644 (file)
--- a/src/motif/icon.cpp
+++ b/src/motif/icon.cpp
@@ -49,6 +49,11 @@ wxIcon::wxIcon(char **data)
     (void) Create((void*) data, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0);
 }
 
     (void) Create((void*) data, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0);
 }
 

+wxIcon::wxIcon(const char **data)
+{
+    (void) Create((void*) data, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0);
+}
+

 wxIcon::wxIcon(const wxString& icon_file, long flags,
                int desiredWidth, int desiredHeight)
                
 wxIcon::wxIcon(const wxString& icon_file, long flags,
                int desiredWidth, int desiredHeight)
                


@@ -56,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()
 {
 }