Sophie

Sophie

distrib > Fedora > 14 > x86_64 > by-pkgid > 90faff050bf25246d60dc22451622d5a > files > 11

gridengine-6.2u5-6.fc14.src.rpm

--- gridengine/source/3rdparty/qmon/iconlist/IconList.c.lesstif	2006-11-30 06:29:21.000000000 -0700
+++ gridengine/source/3rdparty/qmon/iconlist/IconList.c	2008-07-15 16:34:19.000000000 -0600
@@ -54,50 +54,6 @@
 #undef NeedWidePrototypes
 #endif
 
-#ifndef SOLARIS
-#if XmVersion >= 2000
-extern void _XmResizeObject(
-                        Widget g,
-#ifdef NeedWidePrototypes
-                        int width,
-                        int height,
-                        int border_width) ;
-#else
-                        Dimension width,
-                        Dimension height,
-                        Dimension border_width) ;
-#endif /* NeedWidePrototypes */
-extern void _XmMoveObject(
-                        Widget g,
-#ifdef NeedWidePrototypes
-                        int x,
-                        int y) ;
-#else
-                        Position x,
-                        Position y) ;
-#endif /* NeedWidePrototypes */
-extern void _XmDrawHighlight(
-                        Display *display,
-                        Drawable d,
-                        GC gc,
-#ifdef NeedWidePrototypes
-                        int x,
-                        int y,
-                        int width,
-                        int height,
-                        int highlight_thick,
-#else
-                        Position x,
-                        Position y,
-                        Dimension width,
-                        Dimension height,
-                        Dimension highlight_thick,
-#endif /* NeedWidePrototypes */
-                        int line_style) ;
-
-#endif
-#endif
-
 #include "DumbClip.h"
 #include "IconListP.h"
 
--- gridengine/source/3rdparty/qmon/Xmt310/Xmt/PixmapCvt.c.lesstif	2001-07-18 05:06:03.000000000 -0600
+++ gridengine/source/3rdparty/qmon/Xmt310/Xmt/PixmapCvt.c	2008-07-15 16:34:19.000000000 -0600
@@ -72,13 +72,6 @@
     XmRPrimForegroundPixmap,
     XmRManForegroundPixmap,
     XmRGadgetPixmap
-#if XmVersion >= 2000
-    ,
-    XmRLargeIconPixmap ,
-    XmRSmallIconPixmap,
-    XmRDynamicPixmap
-#endif
-    
 };
 
 #if NeedFunctionPrototypes
--- gridengine/source/3rdparty/qmon/Xmt310/Xmt/Layout.c.lesstif	2001-07-18 05:06:02.000000000 -0600
+++ gridengine/source/3rdparty/qmon/Xmt310/Xmt/Layout.c	2008-07-15 16:34:19.000000000 -0600
@@ -492,6 +492,12 @@
     if (!lw->layout.font)
         XmeRenderTableGetDefaultFont(lw->layout.render_table,
                                      &lw->layout.font);
+    /*
+     * The previous fails with lesstif, try again...
+     */
+    if (!lw->layout.font)
+        _XmFontListGetDefaultFont(lw->layout.font_list,
+                                     &lw->layout.font);
 #endif
     
     /* figure out resolution independence values */