From 0859109ba031453a5c21a0d0e743f243c7abbe5b Mon Sep 17 00:00:00 2001
From: Peter Howkins <flibble@users.sourceforge.net>
Date: Thu, 12 Apr 2012 17:36:54 +0100
Subject: [PATCH] Linux compilation of dtbuilder (Matthew Howkins)

---
 cde/programs/dtappbuilder/src/ab/Imakefile             | 6 ++++++
 cde/programs/dtappbuilder/src/ab/ab_utils.c            | 6 +++---
 cde/programs/dtappbuilder/src/ab/appfw_stubs.c         | 8 ++++----
 cde/programs/dtappbuilder/src/ab/attch_ed_stubs.c      | 6 +++---
 cde/programs/dtappbuilder/src/ab/brws.c                | 2 +-
 cde/programs/dtappbuilder/src/ab/brws_mthds.c          | 2 ++
 cde/programs/dtappbuilder/src/ab/cgen_props_stubs.c    | 2 +-
 cde/programs/dtappbuilder/src/ab/cgen_win_stubs.c      | 2 +-
 cde/programs/dtappbuilder/src/ab/dnd_ed_stubs.c        | 8 ++++----
 cde/programs/dtappbuilder/src/ab/help_ed_stubs.c       | 8 ++++----
 cde/programs/dtappbuilder/src/ab/message_ed_stubs.c    | 8 ++++----
 cde/programs/dtappbuilder/src/ab/palette_stubs.c       | 2 ++
 cde/programs/dtappbuilder/src/ab/proj.c                | 4 +++-
 cde/programs/dtappbuilder/src/ab/projP_utils.c         | 2 ++
 cde/programs/dtappbuilder/src/ab/proj_utils.c          | 2 ++
 cde/programs/dtappbuilder/src/ab/ui_msg.c              | 4 ++--
 cde/programs/dtappbuilder/src/abmf/lib_func_strings.c  | 2 +-
 cde/programs/dtappbuilder/src/abmf/lib_func_stringsP.h | 4 ++--
 18 files changed, 47 insertions(+), 31 deletions(-)

diff --git a/cde/programs/dtappbuilder/src/ab/Imakefile b/cde/programs/dtappbuilder/src/ab/Imakefile
index 1339d87f..1b369c2a 100644
--- a/cde/programs/dtappbuilder/src/ab/Imakefile
+++ b/cde/programs/dtappbuilder/src/ab/Imakefile
@@ -249,6 +249,12 @@ SYS_LIBRARIES = -lm $(ICONVSYSLIB) $(DYNLIBSYSLIB) $(REGEXSYSLIB)
 WAITTARGET = .WAIT
 #endif	/* SunArchitecture */
 
+XCOMM On Linux once you link against a C++ library the whole program 
+XCOMM has to be linked with the C++ linker
+#if defined(LinuxDistribution)
+CCLINK = $(CXX)
+#endif
+
 PROGRAMS = dtbuilder
 LINTLIBS = $(XINPUTLIB) $(DTHELPLIB) $(DTSVCLIB) $(XMLIB) $(XTOOLLIB) $(XLIB)
 
diff --git a/cde/programs/dtappbuilder/src/ab/ab_utils.c b/cde/programs/dtappbuilder/src/ab/ab_utils.c
index 548c2677..6a2c4af4 100644
--- a/cde/programs/dtappbuilder/src/ab/ab_utils.c
+++ b/cde/programs/dtappbuilder/src/ab/ab_utils.c
@@ -421,7 +421,7 @@ ab_show_window(
 		    /* Window is iconified, unmap it so we can change its
 		     * initial state and remap it as Opened
 		     */
-		    ui_win_show(widget, False, NULL);
+		    ui_win_show(widget, False, XtGrabNone);
             	}
 		else /* Window is already Open */
 		{
@@ -551,7 +551,7 @@ popdown_winCB(
     XtPointer   call_data
 )
 {
-    ui_win_show(shell, False, NULL);
+    ui_win_show(shell, False, XtGrabNone);
 }
 
 static void
@@ -1324,7 +1324,7 @@ exit_mboxCB(
 )
 {
     DTB_MODAL_ANSWER     op = (DTB_MODAL_ANSWER) client_data;
-    DTB_MODAL_ANSWER     *answerp = (DTB_MODAL_ANSWER) NULL;
+    DTB_MODAL_ANSWER     *answerp = NULL;
 
     XtVaGetValues(widget, XmNuserData, &answerp, NULL);
 
diff --git a/cde/programs/dtappbuilder/src/ab/appfw_stubs.c b/cde/programs/dtappbuilder/src/ab/appfw_stubs.c
index f1698fa0..7b249ace 100644
--- a/cde/programs/dtappbuilder/src/ab/appfw_stubs.c
+++ b/cde/programs/dtappbuilder/src/ab/appfw_stubs.c
@@ -709,14 +709,14 @@ appfw_editor_prevent_closeCB(
 	     * Do Apply and pop down dialog
 	     */
             appfw_editor_apply(proj_get_project());
-            ui_win_show(AB_appfw_dialog, False, NULL);
+            ui_win_show(AB_appfw_dialog, False, XtGrabNone);
 	}
     }
     else
 	/*
 	 * Pop down dialog if no edits pending
 	 */
-        ui_win_show(AB_appfw_dialog, False, NULL);
+        ui_win_show(AB_appfw_dialog, False, XtGrabNone);
 }
 
 /*** DTB_USER_CODE_END
@@ -1010,7 +1010,7 @@ appfw_applyCB(
 
     XtVaGetValues(widget, XmNuserData, &dismiss, NULL);
     if (dismiss)
-	ui_win_show(widget, False, NULL);
+	ui_win_show(widget, False, XtGrabNone);
 
     /*** DTB_USER_CODE_END   ^^^ Add C variables and code above ^^^ ***/
     
@@ -1038,7 +1038,7 @@ appfw_resetCB(
 
     XtVaGetValues(widget, XmNuserData, &dismiss, NULL);
     if (dismiss)
-	ui_win_show(widget, False, NULL);
+	ui_win_show(widget, False, XtGrabNone);
 
     /*** DTB_USER_CODE_END   ^^^ Add C variables and code above ^^^ ***/
     
diff --git a/cde/programs/dtappbuilder/src/ab/attch_ed_stubs.c b/cde/programs/dtappbuilder/src/ab/attch_ed_stubs.c
index 32534549..8ce06d62 100644
--- a/cde/programs/dtappbuilder/src/ab/attch_ed_stubs.c
+++ b/cde/programs/dtappbuilder/src/ab/attch_ed_stubs.c
@@ -3490,7 +3490,7 @@ attch_edP_prevent_closeCB(
      * No pending changes OR applied existing changes, so just 
      * dismiss the Attachments Editor 
      */
-    ui_win_show(AB_attch_ed_dialog, False, NULL);
+    ui_win_show(AB_attch_ed_dialog, False, XtGrabNone);
 }
 
 static DTB_MODAL_ANSWER
@@ -3950,7 +3950,7 @@ attch_ed_okCB(
     AttchEditorSettingsRec      *ats = &attch_editor_settings_rec;
 
     attch_editor_apply(ats->cur_object);
-    ui_win_show(AB_attch_ed_dialog, False, NULL);
+    ui_win_show(AB_attch_ed_dialog, False, XtGrabNone);
 
     /*** DTB_USER_CODE_END   ^^^ Add C variables and code above ^^^ ***/
     
@@ -3971,7 +3971,7 @@ attch_ed_cancelCB(
     AttchEditorSettingsRec      *ats = &attch_editor_settings_rec;
 
     attch_editor_load(ats->cur_object);
-    ui_win_show(AB_attch_ed_dialog, False, NULL); 
+    ui_win_show(AB_attch_ed_dialog, False, XtGrabNone); 
 
     /*** DTB_USER_CODE_END   ^^^ Add C variables and code above ^^^ ***/
     
diff --git a/cde/programs/dtappbuilder/src/ab/brws.c b/cde/programs/dtappbuilder/src/ab/brws.c
index 0d84ab02..cfbfb2a5 100644
--- a/cde/programs/dtappbuilder/src/ab/brws.c
+++ b/cde/programs/dtappbuilder/src/ab/brws.c
@@ -1651,7 +1651,7 @@ brws_popdown
     if (!shell)
 	return;
 
-    ui_win_show(shell, False, NULL);
+    ui_win_show(shell, False, XtGrabNone);
 }
 
 /*
diff --git a/cde/programs/dtappbuilder/src/ab/brws_mthds.c b/cde/programs/dtappbuilder/src/ab/brws_mthds.c
index 2e71f3be..c4b8f65d 100644
--- a/cde/programs/dtappbuilder/src/ab/brws_mthds.c
+++ b/cde/programs/dtappbuilder/src/ab/brws_mthds.c
@@ -65,11 +65,13 @@
 #define BRWS_DASH_WIDTH		3
 #define BRWS_NUM_DASHES		3
 
+#if !defined(linux)
 /*
  * Somehow the compiler is not picking up strdup()
  * from string.h properly...
  */
 extern char		*strdup();
+#endif
 
 /*
  * Misc functions used only in this file
diff --git a/cde/programs/dtappbuilder/src/ab/cgen_props_stubs.c b/cde/programs/dtappbuilder/src/ab/cgen_props_stubs.c
index 4d6daf9b..ae2fc7f9 100644
--- a/cde/programs/dtappbuilder/src/ab/cgen_props_stubs.c
+++ b/cde/programs/dtappbuilder/src/ab/cgen_props_stubs.c
@@ -459,7 +459,7 @@ cgenP_ok_propsCB(
     
     /*** DTB_USER_CODE_START vvv Add C code below vvv ***/
     cgenP_apply_propsCB(widget, clientData, callData);
-    ui_win_show(dtb_cgen_props_cgen_props_dlg.cgen_props_dlg_shellform,False,NULL);
+    ui_win_show(dtb_cgen_props_cgen_props_dlg.cgen_props_dlg_shellform,False,XtGrabNone);
     /*** DTB_USER_CODE_END   ^^^ Add C code above ^^^ ***/
 }
 
diff --git a/cde/programs/dtappbuilder/src/ab/cgen_win_stubs.c b/cde/programs/dtappbuilder/src/ab/cgen_win_stubs.c
index a7b61050..84bd65e4 100644
--- a/cde/programs/dtappbuilder/src/ab/cgen_win_stubs.c
+++ b/cde/programs/dtappbuilder/src/ab/cgen_win_stubs.c
@@ -305,7 +305,7 @@ cgenP_close_cgen_winCB(
     DtbCgenWinMainwindowInfo cgen_win =
                         (DtbCgenWinMainwindowInfo)clientData;
 
-    ui_win_show(cgen_win->mainwindow, False, NULL);
+    ui_win_show(cgen_win->mainwindow, False, XtGrabNone);
 
     /*** DTB_USER_CODE_END   ^^^ Add C variables and code above ^^^ ***/
     
diff --git a/cde/programs/dtappbuilder/src/ab/dnd_ed_stubs.c b/cde/programs/dtappbuilder/src/ab/dnd_ed_stubs.c
index bbf59b87..74cf4c0b 100644
--- a/cde/programs/dtappbuilder/src/ab/dnd_ed_stubs.c
+++ b/cde/programs/dtappbuilder/src/ab/dnd_ed_stubs.c
@@ -1024,12 +1024,12 @@ dnd_prevent_closeCB(
     {
 	answer = do_auto_apply(widget, dds->curObj, dds->curObj);
 	if (answer == DTB_ANSWER_ACTION1) 
-	    ui_win_show(AB_dnd_dialog, False, NULL);
+	    ui_win_show(AB_dnd_dialog, False, XtGrabNone);
     }
     else 
     {
 	/* Nope, no pending changes, so just dismiss the Dnd Editor */
-	ui_win_show(AB_dnd_dialog, False, NULL); 
+	ui_win_show(AB_dnd_dialog, False, XtGrabNone); 
     }
 }
 
@@ -1195,7 +1195,7 @@ dnd_okCB(
     
     /*** DTB_USER_CODE_START vvv Add C code below vvv ***/
     dnd_applyCB(widget, clientData, callData);
-    ui_win_show(dtb_dnd_ed_dialog.dialog, False, NULL);
+    ui_win_show(dtb_dnd_ed_dialog.dialog, False, XtGrabNone);
     /*** DTB_USER_CODE_END   ^^^ Add C code above ^^^ ***/
 }
 
@@ -1247,7 +1247,7 @@ dnd_cancelCB(
     
     /*** DTB_USER_CODE_START vvv Add C code below vvv ***/
     dnd_resetCB(widget, clientData, callData);
-    ui_win_show(dtb_dnd_ed_dialog.dialog, False, NULL);
+    ui_win_show(dtb_dnd_ed_dialog.dialog, False, XtGrabNone);
     /*** DTB_USER_CODE_END   ^^^ Add C code above ^^^ ***/
 }
 
diff --git a/cde/programs/dtappbuilder/src/ab/help_ed_stubs.c b/cde/programs/dtappbuilder/src/ab/help_ed_stubs.c
index cc8cb5fb..bba563fd 100644
--- a/cde/programs/dtappbuilder/src/ab/help_ed_stubs.c
+++ b/cde/programs/dtappbuilder/src/ab/help_ed_stubs.c
@@ -1083,12 +1083,12 @@ verify_closeCB(
     {
 	answer = do_auto_apply(widget, HelpObj, HelpObj);
 	if (answer == DTB_ANSWER_ACTION1) 
-	    ui_win_show(AB_help_dialog, False, NULL);
+	    ui_win_show(AB_help_dialog, False, XtGrabNone);
     }
     else 
     {
 	 /* Nope, no pending changes, so just dismiss the Help Editor */
-	 ui_win_show(AB_help_dialog, False, NULL);
+	 ui_win_show(AB_help_dialog, False, XtGrabNone);
     }
 }
 
@@ -1266,7 +1266,7 @@ help_okCB(
     prop_changebars_cleared(hes->prop_sheet);
 
     /* Dismiss the dialog */
-    ui_win_show(AB_help_dialog, False, NULL);
+    ui_win_show(AB_help_dialog, False, XtGrabNone);
 
     /*** DTB_USER_CODE_END   ^^^ Add C variables and code above ^^^ ***/
     
@@ -1292,7 +1292,7 @@ help_cancelCB(
     clear_editor_fields();
 
     /* Dismiss the dialog */
-    ui_win_show(AB_help_dialog, False, NULL);
+    ui_win_show(AB_help_dialog, False, XtGrabNone);
 
     /*** DTB_USER_CODE_END   ^^^ Add C variables and code above ^^^ ***/
     
diff --git a/cde/programs/dtappbuilder/src/ab/message_ed_stubs.c b/cde/programs/dtappbuilder/src/ab/message_ed_stubs.c
index 1b0e5b4a..c93505e6 100644
--- a/cde/programs/dtappbuilder/src/ab/message_ed_stubs.c
+++ b/cde/programs/dtappbuilder/src/ab/message_ed_stubs.c
@@ -2183,7 +2183,7 @@ msgEdP_okCB(
      * applied successfully.  Otherwise, keep it up.
      */
     if (ChangesApplied)
-	ui_win_show(AB_msgEd_dialog, False, NULL);
+	ui_win_show(AB_msgEd_dialog, False, XtGrabNone);
 
     /*** DTB_USER_CODE_END   ^^^ Add C code above ^^^ ***/
 }
@@ -2204,7 +2204,7 @@ msgEdP_cancelCB(
     msg_editor_clear();
 
     /* Dismiss the Message Editor */
-    ui_win_show(AB_msgEd_dialog, False, NULL);
+    ui_win_show(AB_msgEd_dialog, False, XtGrabNone);
 
     /*** DTB_USER_CODE_END   ^^^ Add C code above ^^^ ***/
 }
@@ -2494,14 +2494,14 @@ msgEdP_prevent_closeCB(
         answer = msgEdP_do_auto_apply(widget, mes->current_obj,
 				      mes->current_obj);
 	if (answer == DTB_ANSWER_ACTION1)
-	    ui_win_show(AB_msgEd_dialog, False, NULL);
+	    ui_win_show(AB_msgEd_dialog, False, XtGrabNone);
     }
     else
     {   
          /* No pending changes. Just dismiss the 
 	  * Message Editor. 
 	  */
-   	ui_win_show(AB_msgEd_dialog, False, NULL);
+   	ui_win_show(AB_msgEd_dialog, False, XtGrabNone);
     }
 }
 
diff --git a/cde/programs/dtappbuilder/src/ab/palette_stubs.c b/cde/programs/dtappbuilder/src/ab/palette_stubs.c
index 44c9a96a..40c5d1bc 100644
--- a/cde/programs/dtappbuilder/src/ab/palette_stubs.c
+++ b/cde/programs/dtappbuilder/src/ab/palette_stubs.c
@@ -159,7 +159,9 @@ static void 	register_palette_info(
 **                                                                      **
 **************************************************************************/
 
+#if !defined(linux)
 extern char     *sys_errlist[];
+#endif
 
 static Widget 	HelpDialog;
 
diff --git a/cde/programs/dtappbuilder/src/ab/proj.c b/cde/programs/dtappbuilder/src/ab/proj.c
index befdce11..a2cb1fc5 100644
--- a/cde/programs/dtappbuilder/src/ab/proj.c
+++ b/cde/programs/dtappbuilder/src/ab/proj.c
@@ -228,7 +228,9 @@ static XtTranslations proj_transtbl = NULL;
 static XRectangle       *rband_rect = NULL;
 static Boolean          mselect_adjust = False;
 
+#if !defined(linux)
 extern char             *sys_errlist[];
+#endif
 char			Buf[MAXPATHLEN];	/* Work buffer */
 
 /*************************************************************************
@@ -338,7 +340,7 @@ popdown_proj_window(
     XtPointer   call_data
 )
 {
-    ui_win_show(widget, False, NULL);
+    ui_win_show(widget, False, XtGrabNone);
 }
 
 static void
diff --git a/cde/programs/dtappbuilder/src/ab/projP_utils.c b/cde/programs/dtappbuilder/src/ab/projP_utils.c
index 50d663a5..e44764bd 100644
--- a/cde/programs/dtappbuilder/src/ab/projP_utils.c
+++ b/cde/programs/dtappbuilder/src/ab/projP_utils.c
@@ -93,7 +93,9 @@ static void     mult_module_selected(
 **                                                                      **
 **************************************************************************/
 
+#if !defined(linux)
 extern char	*sys_errlist[];
+#endif
 char		Buf[MAXPATHLEN];	/* Work buffer */
 
 /*************************************************************************
diff --git a/cde/programs/dtappbuilder/src/ab/proj_utils.c b/cde/programs/dtappbuilder/src/ab/proj_utils.c
index f133c280..0256c0f0 100644
--- a/cde/programs/dtappbuilder/src/ab/proj_utils.c
+++ b/cde/programs/dtappbuilder/src/ab/proj_utils.c
@@ -180,7 +180,9 @@ static void	notify_proj_save_as_okCB(
 **                                                                      **
 **************************************************************************/
 
+#if !defined(linux)
 extern char             *sys_errlist[];
+#endif
 
 /*************************************************************************
 **                                                                      **
diff --git a/cde/programs/dtappbuilder/src/ab/ui_msg.c b/cde/programs/dtappbuilder/src/ab/ui_msg.c
index 05aa4d31..dedf682e 100644
--- a/cde/programs/dtappbuilder/src/ab/ui_msg.c
+++ b/cde/programs/dtappbuilder/src/ab/ui_msg.c
@@ -547,7 +547,7 @@ prompt_ok_modal_dlgCB(
          * answerp, because that will cause ui_popup_modal_prompt() to
          * return to the routine which is calling it. 
          */
-	ui_win_show(widget, False, NULL);
+	ui_win_show(widget, False, XtGrabNone);
 	*answerp = UI_ANSWER_OK;
     }
 }
@@ -570,7 +570,7 @@ prompt_cancel_modal_dlgCB(
      * answerp, because that will cause ui_popup_modal_prompt() to
      * return to the routine which is calling it.
      */
-    ui_win_show(widget, False, NULL);
+    ui_win_show(widget, False, XtGrabNone);
     *answerp = UI_ANSWER_CANCEL;
 }
 
diff --git a/cde/programs/dtappbuilder/src/abmf/lib_func_strings.c b/cde/programs/dtappbuilder/src/abmf/lib_func_strings.c
index 30a0e2b0..dacf362b 100644
--- a/cde/programs/dtappbuilder/src/abmf/lib_func_strings.c
+++ b/cde/programs/dtappbuilder/src/abmf/lib_func_strings.c
@@ -2123,7 +2123,7 @@ static LibFuncRec abmfP_lrc_modal_dlgCB =
     ")\n"
     "{\n"
     "    DTB_MODAL_ANSWER     op = (DTB_MODAL_ANSWER) client_data;\n"
-    "    DTB_MODAL_ANSWER     *answerp = (DTB_MODAL_ANSWER) NULL;\n"
+    "    DTB_MODAL_ANSWER     *answerp = NULL;\n"
     " \n"
     "    XtVaGetValues(widget, XmNuserData, &answerp, NULL);\n"
     " \n"
diff --git a/cde/programs/dtappbuilder/src/abmf/lib_func_stringsP.h b/cde/programs/dtappbuilder/src/abmf/lib_func_stringsP.h
index 6954f602..6e5b5ab4 100644
--- a/cde/programs/dtappbuilder/src/abmf/lib_func_stringsP.h
+++ b/cde/programs/dtappbuilder/src/abmf/lib_func_stringsP.h
@@ -52,8 +52,8 @@
 typedef struct
 {
     STRING	name;		/* name */
-    STRING	proto;		/* prototype */
-    STRING	def;		/* actual code */
+    char	proto[512];	/* prototype */
+    char	def[4096];	/* actual code */
 } LibFuncRec, *LibFunc;
 
 
-- 
2.25.1