external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-02-15 04:32:24 +00:00
Code Issues Releases Wiki Activity

dtprintinfo: use libXpm directly.

Browse source
This commit is contained in:
Liang Chang 2021-10-17 09:19:24 -06:00 committed by Jon Trulson
parent 94cba197d5
commit f05a7b12c8
1 changed files with 1 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
cde/programs/dtprintinfo/libUI/MotifUI/MotifUI.C
View file

@ -39,13 +39,8 @@
#include <X11/cursorfont.h> #include <X11/cursorfont.h>
#include <X11/IntrinsicP.h> #include <X11/IntrinsicP.h>
#ifdef NO_CDE #include <X11/xpm.h>
#include "xpm.h"
#include <X11/keysym.h>
#else
#include <Dt/xpm.h>
#include <Dt/Help.h> #include <Dt/Help.h>
#endif
#include <Dt/HourGlass.h> #include <Dt/HourGlass.h>
@ -715,19 +710,11 @@ void MotifUI::GetPixmaps(Widget w,
{ {
XpmAttributes attributes; XpmAttributes attributes;
memset((char *)&attributes, 0, sizeof(XpmAttributes)); memset((char *)&attributes, 0, sizeof(XpmAttributes));
#ifdef NO_CDE
XpmReadFileToPixmap(display, root, s, pixmap, &_mask, &attributes); XpmReadFileToPixmap(display, root, s, pixmap, &_mask, &attributes);
#else
_DtXpmReadFileToPixmap(display, root, s, pixmap, &_mask, &attributes);
#endif
if (_mask) if (_mask)
FillBackground(w, *pixmap, _mask); FillBackground(w, *pixmap, _mask);
#ifdef NO_CDE
XpmFreeAttributes(&attributes); XpmFreeAttributes(&attributes);
#else
_DtXpmFreeAttributes(&attributes);
#endif
} }
else else
{ {