use Print Manager session APIs if PM_USE_SESSION_APIS is true

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

diff --git a/src/motif/icon.cpp b/src/motif/icon.cpp
index 55d70fdd9af63070d1236cd6f7da51110649cd3b..96905576b3364d0a4eb414ec09ed18a10af92c23 100644 (file)
--- a/src/motif/icon.cpp
+++ b/src/motif/icon.cpp
@@ -16,14 +16,18 @@
 #include "wx/icon.h"
 #include "wx/window.h"
 
 #include "wx/icon.h"
 #include "wx/window.h"
 

+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif

 #include <Xm/Xm.h>
 #include <X11/cursorfont.h>
 #include <Xm/Xm.h>
 #include <X11/cursorfont.h>

+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif

 
 #include "wx/motif/private.h"
 
 
 #include "wx/motif/private.h"
 

-#if !USE_SHARED_LIBRARIES

 IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap)
 IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap)

-#endif

 
 /*
 * Icons
 
 /*
 * Icons


@@ -45,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)