From f05a7b12c8088e95904f7bc1d500d69f2b2ad4e1 Mon Sep 17 00:00:00 2001
From: Liang Chang <l-chang@users.sourceforge.net>
Date: Sun, 17 Oct 2021 09:19:24 -0600
Subject: [PATCH] dtprintinfo: use libXpm directly.

---
 cde/programs/dtprintinfo/libUI/MotifUI/MotifUI.C | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

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