Fix for daily builds

[wxWidgets.git] / src / unix / utilsx11.cpp

diff --git a/src/unix/utilsx11.cpp b/src/unix/utilsx11.cpp
index 44dcaeebe7051aa450692516613ee6b87b358af1..d09ae2499268987d980d7276fa6872b84acf0711 100644 (file)
--- a/src/unix/utilsx11.cpp
+++ b/src/unix/utilsx11.cpp
@@ -16,8 +16,14 @@
 #include "wx/image.h"
 #include "wx/icon.h"
 
+#ifdef __VMS
+#pragma message disable nosimpint
+#endif
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
+#ifdef __VMS
+#pragma message enable nosimpint
+#endif
 
 void wxSetIconsX11( WXDisplay* display, WXWindow window,
                     const wxIconBundle& ib )
@@ -26,7 +32,8 @@ void wxSetIconsX11( WXDisplay* display, WXWindow window,
     size_t i, max = ib.m_icons.GetCount();
 
     for( i = 0; i < max; ++i )
-        size += 2 + ib.m_icons[i].GetWidth() * ib.m_icons[i].GetHeight();
+        if( ib.m_icons[i].Ok() )
+            size += 2 + ib.m_icons[i].GetWidth() * ib.m_icons[i].GetHeight();
 
     Atom net_wm_icon = XInternAtom( (Display*)display, "_NET_WM_ICON", 0 );