more combobox appearance fixes

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

diff --git a/src/motif/icon.cpp b/src/motif/icon.cpp
index 8a46da14127317b64a63e03f0aee5af21454248e..96905576b3364d0a4eb414ec09ed18a10af92c23 100644 (file)
--- a/src/motif/icon.cpp
+++ b/src/motif/icon.cpp
@@ -16,18 +16,22 @@
 #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
- */
+* Icons
+*/
 
 wxIcon::wxIcon()
 {
@@ -45,9 +49,14 @@ wxIcon::wxIcon(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 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)
+               
 {
     LoadFile(icon_file, flags, desiredWidth, desiredHeight);
 }
@@ -57,17 +66,17 @@ wxIcon::~wxIcon()
 }
 
 bool wxIcon::LoadFile(const wxString& filename, long type,
-    int desiredWidth, int desiredHeight)
+                      int desiredWidth, int desiredHeight)
 {
-  UnRef();
-
-  m_refData = new wxBitmapRefData;
-
-  wxBitmapHandler *handler = FindHandler(type);
-
-  if ( handler )
-       return handler->LoadFile(this, filename, type, desiredWidth, desiredHeight);
-  else
-       return FALSE;
+    UnRef();
+    
+    m_refData = new wxBitmapRefData;
+    
+    wxBitmapHandler *handler = FindHandler(type);
+    
+    if ( handler )
+        return handler->LoadFile(this, filename, type, desiredWidth, desiredHeight);
+    else
+        return FALSE;
 }