From 6f306644284111a1400bbf13feebb44226c5b7b2 Mon Sep 17 00:00:00 2001
From: Liang Chang <l-chang@users.sourceforge.net>
Date: Sun, 17 Oct 2021 10:03:58 -0600
Subject: [PATCH] dtappbuilder: use libXpm directly.

---
 cde/programs/dtappbuilder/src/ab/abobj_align.c        | 2 +-
 cde/programs/dtappbuilder/src/ab/dtbuilder.c.src      | 4 ++--
 cde/programs/dtappbuilder/src/ab/ui_util.c            | 2 +-
 cde/programs/dtappbuilder/src/abmf/lib_func_strings.c | 2 +-
 cde/programs/dtappbuilder/src/abmf/lib_funcs.c        | 4 ++--
 cde/programs/dtappbuilder/src/libABobjXm/objxm_util.c | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/cde/programs/dtappbuilder/src/ab/abobj_align.c b/cde/programs/dtappbuilder/src/ab/abobj_align.c
index 2b9385751..ff88b913d 100644
--- a/cde/programs/dtappbuilder/src/ab/abobj_align.c
+++ b/cde/programs/dtappbuilder/src/ab/abobj_align.c
@@ -52,6 +52,7 @@
 #include <X11/Intrinsic.h>
 #include <X11/Composite.h>
 #include <X11/Shell.h>
+#include <X11/xpm.h>
 #include <Xm/Xm.h>
 #include <Xm/CascadeB.h>
 #include <Xm/ScrolledW.h>
@@ -61,7 +62,6 @@
 #include "dtb_utils.h"
 #include <ab_private/trav.h>
 #include <ab_private/proj.h>
-#include <Dt/xpm.h>		/* will this be in include/Dt? */
 #include "abobjP.h"
 
 
diff --git a/cde/programs/dtappbuilder/src/ab/dtbuilder.c.src b/cde/programs/dtappbuilder/src/ab/dtbuilder.c.src
index 8777fb25f..54500197c 100644
--- a/cde/programs/dtappbuilder/src/ab/dtbuilder.c.src
+++ b/cde/programs/dtappbuilder/src/ab/dtbuilder.c.src
@@ -103,13 +103,13 @@
 
 #include <ctype.h>
 #include <signal.h>
+#include <X11/xpm.h>
 #include <Xm/FileSB.h>
 #include <Xm/Label.h>
 #include <Xm/RowColumn.h>
 #include <Xm/ToggleB.h>
 #include <Dt/Dt.h>
 #include <Dt/Term.h>
-#include <Dt/xpm.h>
 #include <Dt/Action.h>
 #include <Dt/Dts.h>
 #include "dt_envcontrol.h"
@@ -1339,7 +1339,7 @@ main(int argc, char **argv)
     DtDbReloadNotify(reloadDB, (XtPointer) NULL);
 
     /* Set icon pixmap, if there is one */
-    /* status = _DtXpmCreatePixmapFromData(XtDisplay(dtb_get_toplevel_widget()),
+    /* status = XpmCreatePixmapFromData(XtDisplay(dtb_get_toplevel_widget()),
         DefaultRootWindow(XtDisplay(dtb_get_toplevel_widget())),
         ab_pm, &xpm_pixmap, (Pixmap *)NULL, (XpmAttributes *)NULL); */
     if(status == XpmSuccess)
diff --git a/cde/programs/dtappbuilder/src/ab/ui_util.c b/cde/programs/dtappbuilder/src/ab/ui_util.c
index fbc1be6d7..780141b9e 100644
--- a/cde/programs/dtappbuilder/src/ab/ui_util.c
+++ b/cde/programs/dtappbuilder/src/ab/ui_util.c
@@ -60,6 +60,7 @@
 #include <X11/Composite.h>
 #include <X11/Shell.h>
 #include <X11/cursorfont.h>
+#include <X11/xpm.h>
 #include <Xm/XmAll.h>
 /*
 #include <Xm/Protocols.h>
@@ -83,7 +84,6 @@
 #include <ab_private/ui_util.h>
 #include <ab_private/objxm.h>
 #include <ab_private/ab.h>
-#include <Dt/xpm.h>		/* will this be in include/Dt? */
 #include "dtbuilder.h"
 #include "dtb_utils.h"
 
diff --git a/cde/programs/dtappbuilder/src/abmf/lib_func_strings.c b/cde/programs/dtappbuilder/src/abmf/lib_func_strings.c
index 77d514b9e..cb9bf804b 100644
--- a/cde/programs/dtappbuilder/src/abmf/lib_func_strings.c
+++ b/cde/programs/dtappbuilder/src/abmf/lib_func_strings.c
@@ -628,7 +628,7 @@ static LibFuncRec abmfP_lrc_set_label_from_xpm_data =
     "        window = RootWindowOfScreen(screen);\n"
     "    }\n"
     "\n"
-    "    status = _DtXpmCreatePixmapFromData(\n"
+    "    status = XpmCreatePixmapFromData(\n"
     "            display,\n"
     "            window,\n"
     "            xpmData,\n"
diff --git a/cde/programs/dtappbuilder/src/abmf/lib_funcs.c b/cde/programs/dtappbuilder/src/abmf/lib_funcs.c
index 18aeb47af..969df1390 100644
--- a/cde/programs/dtappbuilder/src/abmf/lib_funcs.c
+++ b/cde/programs/dtappbuilder/src/abmf/lib_funcs.c
@@ -70,6 +70,7 @@
 #include <stdlib.h>
 #include <Tt/tttk.h>
 #include <X11/Intrinsic.h>
+#include <X11/xpm.h>
 #include <Xm/XmStrDefs.h>
 #include <Xm/Xm.h>
 #include <Xm/Form.h>
@@ -80,7 +81,6 @@
 #include <Dt/HelpDialog.h>
 #include <Dt/HelpQuickD.h>
 #include <Dt/Session.h>
-#include <Dt/xpm.h>		/* doesn't exist in CDE, but OK for testing */
 
 
 /*
@@ -906,7 +906,7 @@ dtb_set_label_from_xpm_data(
         window = RootWindowOfScreen(screen);
     }
 
-    status = _DtXpmCreatePixmapFromData(
+    status = XpmCreatePixmapFromData(
             display,
             window,
             xpmData,
diff --git a/cde/programs/dtappbuilder/src/libABobjXm/objxm_util.c b/cde/programs/dtappbuilder/src/libABobjXm/objxm_util.c
index 894922396..64638c4ac 100644
--- a/cde/programs/dtappbuilder/src/libABobjXm/objxm_util.c
+++ b/cde/programs/dtappbuilder/src/libABobjXm/objxm_util.c
@@ -54,8 +54,8 @@
 #include <sys/param.h>
 #include <X11/Intrinsic.h>
 #include <X11/StringDefs.h>
+#include <X11/xpm.h>
 #include <Xm/MenuShell.h>
-#include <Dt/xpm.h>
 #include <ab_private/obj.h>
 #include <ab_private/trav.h>
 #include "objxmP.h"