mirror of
git://git.code.sf.net/p/cdesktopenv/code
synced 2025-03-09 15:50:02 +00:00
Linux compilation of dtbuilder (Matthew Howkins)
This commit is contained in:
parent
1d97f19166
commit
0859109ba0
18 changed files with 47 additions and 31 deletions
|
@ -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)
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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 ^^^ ***/
|
||||
|
||||
|
|
|
@ -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 ^^^ ***/
|
||||
|
||||
|
|
|
@ -1651,7 +1651,7 @@ brws_popdown
|
|||
if (!shell)
|
||||
return;
|
||||
|
||||
ui_win_show(shell, False, NULL);
|
||||
ui_win_show(shell, False, XtGrabNone);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 ^^^ ***/
|
||||
}
|
||||
|
||||
|
|
|
@ -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 ^^^ ***/
|
||||
|
||||
|
|
|
@ -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 ^^^ ***/
|
||||
}
|
||||
|
||||
|
|
|
@ -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 ^^^ ***/
|
||||
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -159,7 +159,9 @@ static void register_palette_info(
|
|||
** **
|
||||
**************************************************************************/
|
||||
|
||||
#if !defined(linux)
|
||||
extern char *sys_errlist[];
|
||||
#endif
|
||||
|
||||
static Widget HelpDialog;
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -93,7 +93,9 @@ static void mult_module_selected(
|
|||
** **
|
||||
**************************************************************************/
|
||||
|
||||
#if !defined(linux)
|
||||
extern char *sys_errlist[];
|
||||
#endif
|
||||
char Buf[MAXPATHLEN]; /* Work buffer */
|
||||
|
||||
/*************************************************************************
|
||||
|
|
|
@ -180,7 +180,9 @@ static void notify_proj_save_as_okCB(
|
|||
** **
|
||||
**************************************************************************/
|
||||
|
||||
#if !defined(linux)
|
||||
extern char *sys_errlist[];
|
||||
#endif
|
||||
|
||||
/*************************************************************************
|
||||
** **
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue