wxChoice/wxComboBox background colour change (to get back to where we were);

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

diff --git a/src/motif/icon.cpp b/src/motif/icon.cpp
index 8a46da14127317b64a63e03f0aee5af21454248e..17e5b111c13263ef642170dd8e9afc23fc920823 100644 (file)
--- a/src/motif/icon.cpp
+++ b/src/motif/icon.cpp
@@ -16,8 +16,14 @@
 #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"
 


@@ -26,8 +32,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap)
 #endif
 
 /*
 #endif
 
 /*

- * Icons
- */
+* Icons
+*/

 
 wxIcon::wxIcon()
 {
 
 wxIcon::wxIcon()
 {


@@ -46,8 +52,8 @@ wxIcon::wxIcon(char **data)
 }
 
 wxIcon::wxIcon(const wxString& icon_file, long flags,
 }
 
 wxIcon::wxIcon(const wxString& icon_file, long flags,

-    int desiredWidth, int desiredHeight)
-
+               int desiredWidth, int desiredHeight)
+               

 {
     LoadFile(icon_file, flags, desiredWidth, desiredHeight);
 }
 {
     LoadFile(icon_file, flags, desiredWidth, desiredHeight);
 }


@@ -57,17 +63,17 @@ wxIcon::~wxIcon()
 }
 
 bool wxIcon::LoadFile(const wxString& filename, long type,
 }
 
 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;

 }
 
 }