Committing in .

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

diff --git a/src/motif/icon.cpp b/src/motif/icon.cpp
index 55d70fdd9af63070d1236cd6f7da51110649cd3b..a31a6f0646d3141e832f686536e7d24897d09e31 100644 (file)
--- a/src/motif/icon.cpp
+++ b/src/motif/icon.cpp
@@ -16,14 +16,18 @@
 #include "wx/icon.h"
 #include "wx/window.h"
 
+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif
 #include <Xm/Xm.h>
 #include <X11/cursorfont.h>
+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif
 
 #include "wx/motif/private.h"
 
-#if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap)
-#endif
 
 /*
 * Icons
@@ -45,6 +49,11 @@ wxIcon::wxIcon(char **data)
     (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)
                
@@ -52,6 +61,12 @@ wxIcon::wxIcon(const wxString& icon_file, long flags,
     LoadFile(icon_file, flags, desiredWidth, desiredHeight);
 }
 
+void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
+{
+    wxIcon *icon = (wxIcon*)(&bmp);
+    *this = *icon;
+}
+
 wxIcon::~wxIcon()
 {
 }