debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dtudcfonted: use libXpm directly.

Browse Source
This commit is contained in:
Liang Chang
2021-10-17 09:05:43 -06:00
committed by Jon Trulson
parent 0672e9e0cf
commit 94cba197d5
2 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cde/programs/dtudcfonted/cpyx.c
View File

@@ -38,6 +38,7 @@
#include<X11/Xlib.h> #include<X11/Xlib.h>
#include<X11/Xutil.h> #include<X11/Xutil.h>
#include<X11/Xatom.h> #include<X11/Xatom.h>
#include<X11/xpm.h>
#include <Xm/XmAll.h> #include <Xm/XmAll.h>
@@ -54,12 +55,7 @@ extern XtPointer _XmStringUngenerate (XmString string,
#include "selectxlfd.h" #include "selectxlfd.h"
#include "xoakufont.h" #include "xoakufont.h"
#include "xpm.h"
#ifdef XPM
#define ReadXpm XpmCreatePixmapFromData #define ReadXpm XpmCreatePixmapFromData
#else
#define ReadXpm _DtXpmCreatePixmapFromData
#endif
#include "pixmaps/arrow.pm" #include "pixmaps/arrow.pm"
static Widget CreateCopyXLFD(Widget Top); static Widget CreateCopyXLFD(Widget Top);

6
cde/programs/dtudcfonted/util.c
View File

@@ -34,6 +34,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <wchar.h> #include <wchar.h>
#include <X11/xpm.h>
#include <Xm/XmAll.h> #include <Xm/XmAll.h>
#include <Xm/RowColumn.h> #include <Xm/RowColumn.h>
#include <Xm/MainW.h> #include <Xm/MainW.h>
@@ -51,7 +52,6 @@ void _unmap( Widget w, XtPointer closure, XtPointer call_data);
extern Resource resource ; extern Resource resource ;
#include "xpm.h"
#include "pixmaps/Pencil.pm" #include "pixmaps/Pencil.pm"
#include "pixmaps/Line.pm" #include "pixmaps/Line.pm"
#include "pixmaps/Rectangle.pm" #include "pixmaps/Rectangle.pm"
@@ -59,11 +59,7 @@ extern Resource resource ;
#include "pixmaps/Eraser.pm" #include "pixmaps/Eraser.pm"
#include "pixmaps/SelectArea.pm" #include "pixmaps/SelectArea.pm"
#ifdef XPM
#define ReadXpm XpmCreatePixmapFromData #define ReadXpm XpmCreatePixmapFromData
#else
#define ReadXpm _DtXpmCreatePixmapFromData
#endif
#define NUMPIX 6 #define NUMPIX 6
#include "pixmaps/arrow.pm" #include "pixmaps/arrow.pm"