debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Centralize catgets() calls through MsgCat

Browse Source 
CDE has relied upon catgets() implementations following a relaxed
interpretation of the XPG internationalization standard that ignored
-1, the standard error value returned by catopen, as the catalog
argument. However, this same behavior causes segmentation faults with
the musl C library.

This patch:

- Centralizes (with the exception of ToolTalk) all calls to catopen(),
  catgets(), and catclose() through MsgCat within the DtSvc library.
- Prevents calls to catgets() and catclose() that rely upon
  undefined behavior.
- Eliminates a number of bespoke catgets() wrappers, including multiple
  redundant caching implementations designed to work around a design
  peculiarity in HP/UX.
- Eases building CDE without XPG internationalization support by providing
  the appropriate macros.
This commit is contained in:
Lev Kujawski
2021-01-30 20:05:13 -07:00
committed by Jon Trulson
parent 3379999106
commit a6ea2a2d52
241 changed files with 3154 additions and 3498 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cde/programs/dtappbuilder/src/ab/ab_bil.c
View File

@@ -165,7 +165,7 @@ ab_load_bil_file(
/* The first thing in the message is
* some general text.
*/
init_msg = catgets(Dtb_project_catd, 100, 38, "The following modules are read-only.\nIf you edit these modules, you\nwill not be able to save your edits.");
init_msg = CATGETS(Dtb_project_catd, 100, 38, "The following modules are read-only.\nIf you edit these modules, you\nwill not be able to save your edits.");
/* If we have an old buffer lying around, free it */
if (errmsg != (STRING) NULL)
@@ -194,7 +194,7 @@ ab_load_bil_file(
if (!util_strempty(errmsg))
{
util_set_help_data(catgets(Dtb_project_catd, 100, 92,
util_set_help_data(CATGETS(Dtb_project_catd, 100, 92,
"Any changes made to a read-only module cannot be saved,\nunless you save the module to a different file name."),
NULL, NULL);
util_puts(errmsg);
@@ -204,7 +204,7 @@ ab_load_bil_file(
if( obj_get_num_children(newProject) == 0 )
{
sprintf(Buf, catgets(Dtb_project_catd, 100, 23,
sprintf(Buf, CATGETS(Dtb_project_catd, 100, 23,
"%s: Empty project file loaded."), fileName);
xm_buf = XmStringCreateLocalized(Buf);
dtb_palette_empty_proj_msg_initialize(&dtb_palette_empty_proj_msg);
@@ -444,14 +444,14 @@ ab_check_and_open_bip(
else /* Read-only file */
{
/* You can read it but you can't write to it. */
sprintf(Buf, catgets(Dtb_project_catd, 100, 17,
sprintf(Buf, CATGETS(Dtb_project_catd, 100, 17,
"The file %s is a read-only file.\nYou may open the project\nor cancel the operation."), fileName);
xm_buf = XmStringCreateLocalized(Buf);
dtb_palette_open_ro_proj_msg_initialize(
&dtb_palette_open_ro_proj_msg);
help_data = (DtbObjectHelpData) util_malloc(sizeof(DtbObjectHelpDataRec));
help_data->help_text = catgets(Dtb_project_catd, 100, 90,
help_data->help_text = CATGETS(Dtb_project_catd, 100, 90,
"Opening a read-only project means that any changes that\naffect the project (.bip) file, such as creation of a\nnew module or creation of a cross-module connection,\ncannot be saved, unless you save the project to a\ndifferent file name. You have the option of continuing\nwith the open operation or cancelling it.");
help_data->help_volume = "";
help_data->help_locationID = "";
@@ -477,7 +477,7 @@ ab_check_and_open_bip(
}
else
{
sprintf(Buf, catgets(Dtb_project_catd, 100, 20,
sprintf(Buf, CATGETS(Dtb_project_catd, 100, 20,
"%s does not have read permission."), fileName);
xm_buf = XmStringCreateLocalized(Buf);
dtb_palette_error_msg_initialize(&dtb_palette_error_msg);
@@ -551,7 +551,7 @@ ab_check_and_import_bil(
else
{
/* You can read it but you can't write to it. */
sprintf(Buf, catgets(Dtb_project_catd, 100, 21,
sprintf(Buf, CATGETS(Dtb_project_catd, 100, 21,
"The file %s is a read-only file.\n\
You may import the module or cancel\n\
the operation."), fileName);
@@ -560,7 +560,7 @@ ab_check_and_import_bil(
&dtb_palette_import_ro_msg);
help_data = (DtbObjectHelpData) util_malloc(sizeof(DtbObjectHelpDataRec));
help_data->help_text = catgets(Dtb_project_catd, 100, 91,
help_data->help_text = CATGETS(Dtb_project_catd, 100, 91,
"Importing a read-only module means that any changes\nthat affect the module cannot be saved, unless you\nsave the module to a different file name. You have\nthe option of continuing with the import operation\nor cancelling it.");
help_data->help_volume = "";
@@ -586,7 +586,7 @@ ab_check_and_import_bil(
}
else
{
sprintf(Buf, catgets(Dtb_project_catd, 100, 9,
sprintf(Buf, CATGETS(Dtb_project_catd, 100, 9,
"%s does not have read permission."), fileName);
xm_buf = XmStringCreateLocalized(Buf);
dtb_palette_error_msg_initialize(&dtb_palette_error_msg);

6
cde/programs/dtappbuilder/src/ab/ab_dnd.c
View File

@@ -178,7 +178,7 @@ dnd_load_buffer(
goto epilogue;
}
fileName = dropBuf.name? dropBuf.name : catgets(Dtb_project_catd, 100, 104, "NoName");
fileName = dropBuf.name? dropBuf.name : CATGETS(Dtb_project_catd, 100, 104, "NoName");
fileName = XtNewString(fileName);
if ( (strcmp(dataType, BIX) == 0) ||
@@ -219,7 +219,7 @@ dnd_load_buffer(
}
else
{
fmtStr = XtNewString(catgets(Dtb_project_catd, 100, 103,
fmtStr = XtNewString(CATGETS(Dtb_project_catd, 100, 103,
"Cannot determine file type for %s.\nDo you want to load the file as a project or a module?"));
msg = (STRING) util_malloc(strlen(fmtStr) + strlen(fileName) + 1);
@@ -349,7 +349,7 @@ dnd_load_file(
}
else
{
fmtStr = XtNewString(catgets(Dtb_project_catd, 100, 103,
fmtStr = XtNewString(CATGETS(Dtb_project_catd, 100, 103,
"Cannot determine file type for %s.\nDo you want to load the file as a project or a module?"));
msg = (STRING) util_malloc(strlen(fmtStr) + strlen(fileName) + 1);
sprintf(msg, fmtStr, fileName);

14
cde/programs/dtappbuilder/src/ab/abobj_edit.c
View File

@@ -2270,7 +2270,7 @@ abobj_paste(
if (!obj_is_base_win(winobj))
{
Err = True;
i18n_msg = catgets(Dtb_project_catd, 100, 37,
i18n_msg = CATGETS(Dtb_project_catd, 100, 37,
"Menubar can be pasted to a Main Window only.");
if (errmsg != (STRING) NULL)
@@ -2290,7 +2290,7 @@ abobj_paste(
if (obj_is_menubar(nobj))
{
Err = True;
i18n_msg = catgets(Dtb_project_catd, 100, 27,
i18n_msg = CATGETS(Dtb_project_catd, 100, 27,
"There is already a Menubar for the selected window.");
if (errmsg != (STRING) NULL)
util_free(errmsg);
@@ -2309,7 +2309,7 @@ abobj_paste(
&& !obj_is_file_chooser(obj_get_root(root)))))
{
Err = True;
i18n_msg = catgets(Dtb_project_catd, 100, 28,
i18n_msg = CATGETS(Dtb_project_catd, 100, 28,
"Containers must be pasted to\na Main Window or Custom Dialog.");
if (errmsg != (STRING) NULL)
@@ -2325,7 +2325,7 @@ abobj_paste(
|| obj_is_group(obj_get_root(root)))))
{
Err = True;
i18n_msg = catgets(Dtb_project_catd, 100, 57,
i18n_msg = CATGETS(Dtb_project_catd, 100, 57,
"Groups must be pasted to\na group or control panel.");
if (errmsg != (STRING) NULL)
@@ -2407,7 +2407,7 @@ abobj_paste(
if (obj_is_control_panel(obj))
{
Err = True;
i18n_msg = catgets(Dtb_project_catd, 100, 59,
i18n_msg = CATGETS(Dtb_project_catd, 100, 59,
"Control Panes must be pasted to a Main Window,\nCustom Dialog, or another pane.");
/* If we have an old buffer lying around, free it */
@@ -2441,7 +2441,7 @@ abobj_paste(
!(obj_is_container(root) && !obj_is_menubar(root))))
{
Err = True;
i18n_msg = catgets(Dtb_project_catd, 100, 29,
i18n_msg = CATGETS(Dtb_project_catd, 100, 29,
"Panes must be pasted to\na Main Window, Custom Dialog or Container.");
if (errmsg != (STRING) NULL)
@@ -2460,7 +2460,7 @@ abobj_paste(
!obj_is_group(obj_get_root(newroot))))
{
Err = True;
i18n_msg = catgets(Dtb_project_catd, 100, 30,
i18n_msg = CATGETS(Dtb_project_catd, 100, 30,
"Controls must be pasted to\na Control Panel or Group.");
if (errmsg != (STRING) NULL)

42
cde/programs/dtappbuilder/src/ab/abobj_menu.c
View File

@@ -1218,40 +1218,40 @@ abobj_strings_init(void)
char *attach_str;
props_str =
XtNewString(catgets(Dtb_project_catd, 100, 137, "Props"));
XtNewString(CATGETS(Dtb_project_catd, 100, 137, "Props"));
undo_str =
XtNewString(catgets(Dtb_project_catd, 100, 138, "Undo"));
XtNewString(CATGETS(Dtb_project_catd, 100, 138, "Undo"));
cut_str =
XtNewString(catgets(Dtb_project_catd, 100, 139, "Cut"));
XtNewString(CATGETS(Dtb_project_catd, 100, 139, "Cut"));
copy_str =
XtNewString(catgets(Dtb_project_catd, 100, 140, "Copy"));
XtNewString(CATGETS(Dtb_project_catd, 100, 140, "Copy"));
paste_str =
XtNewString(catgets(Dtb_project_catd, 100, 141, "Paste"));
XtNewString(CATGETS(Dtb_project_catd, 100, 141, "Paste"));
delete_str =
XtNewString(catgets(Dtb_project_catd, 100, 142, "Delete"));
XtNewString(CATGETS(Dtb_project_catd, 100, 142, "Delete"));
align_str =
XtNewString(catgets(Dtb_project_catd, 100, 143, "Align"));
XtNewString(CATGETS(Dtb_project_catd, 100, 143, "Align"));
distr_str =
XtNewString(catgets(Dtb_project_catd, 100, 144, "Distribute"));
XtNewString(CATGETS(Dtb_project_catd, 100, 144, "Distribute"));
group_str =
XtNewString(catgets(Dtb_project_catd, 100, 145, "Group"));
XtNewString(CATGETS(Dtb_project_catd, 100, 145, "Group"));
ungroup_str =
XtNewString(catgets(Dtb_project_catd, 100, 146, "Ungroup"));
XtNewString(CATGETS(Dtb_project_catd, 100, 146, "Ungroup"));
mk_paned_win_str =
XtNewString(catgets(Dtb_project_catd, 100, 147, "Make Paned Window"));
XtNewString(CATGETS(Dtb_project_catd, 100, 147, "Make Paned Window"));
unmk_paned_win_str =
XtNewString(catgets(Dtb_project_catd, 100, 148, "Unmake Paned Window"));
XtNewString(CATGETS(Dtb_project_catd, 100, 148, "Unmake Paned Window"));
attach_str =
XtNewString(catgets(Dtb_project_catd, 100, 149, "Attachments..."));
XtNewString(CATGETS(Dtb_project_catd, 100, 149, "Attachments..."));
prop_menu[0].label =
XtNewString(catgets(Dtb_project_catd, 100, 150, "Revolving..."));
XtNewString(CATGETS(Dtb_project_catd, 100, 150, "Revolving..."));
prop_menu[1].label =
XtNewString(catgets(Dtb_project_catd, 100, 151, "Fixed..."));
XtNewString(CATGETS(Dtb_project_catd, 100, 151, "Fixed..."));
obj_menu_items[0].label = props_str;
obj_menu_items[1].label =
XtNewString(catgets(Dtb_project_catd, 100, 152, "Browse..."));
XtNewString(CATGETS(Dtb_project_catd, 100, 152, "Browse..."));
obj_menu_items[3].label = undo_str;
obj_menu_items[4].label = cut_str;
obj_menu_items[5].label = copy_str;
@@ -1265,11 +1265,11 @@ abobj_strings_init(void)
obj_menu_items[14].label = unmk_paned_win_str;
obj_menu_items[15].label = attach_str;
obj_menu_items[17].label =
XtNewString(catgets(Dtb_project_catd, 100, 153, "NextLayer"));
XtNewString(CATGETS(Dtb_project_catd, 100, 153, "NextLayer"));
browser_menu_items[0].label = props_str;
browser_menu_items[1].label =
XtNewString(catgets(Dtb_project_catd, 100, 154, "Tearoff Browser..."));
XtNewString(CATGETS(Dtb_project_catd, 100, 154, "Tearoff Browser..."));
browser_menu_items[3].label = undo_str;
browser_menu_items[4].label = cut_str;
browser_menu_items[5].label = copy_str;
@@ -1281,11 +1281,11 @@ abobj_strings_init(void)
browser_menu_items[12].label = unmk_paned_win_str;
browser_menu_items[13].label = attach_str;
browser_menu_items[15].label =
XtNewString(catgets(Dtb_project_catd, 100, 155, "Expand"));
XtNewString(CATGETS(Dtb_project_catd, 100, 155, "Expand"));
browser_menu_items[16].label =
XtNewString(catgets(Dtb_project_catd, 100, 156, "Expand All"));
XtNewString(CATGETS(Dtb_project_catd, 100, 156, "Expand All"));
browser_menu_items[17].label =
XtNewString(catgets(Dtb_project_catd, 100, 157, "Collapse"));
XtNewString(CATGETS(Dtb_project_catd, 100, 157, "Collapse"));
layout_menu_items[0].label = align_str;
layout_menu_items[1].label = distr_str;

20
cde/programs/dtappbuilder/src/ab/abobj_util.c
View File

@@ -797,19 +797,19 @@ abobj_update_proj_name(
else
{
proj_win_title = (STRING) util_malloc(
strlen(catgets(Dtb_project_catd, 100, 104, "NoName"))
strlen(CATGETS(Dtb_project_catd, 100, 104, "NoName"))
+ strlen(".bip") +1);
strcpy(proj_win_title,
catgets(Dtb_project_catd, 100, 104, "NoName"));
CATGETS(Dtb_project_catd, 100, 104, "NoName"));
}
strcat(proj_win_title, ".bip");
new_title = (STRING) util_malloc(
strlen(catgets(Dtb_project_catd, 10, 1, "Project Organizer"))
strlen(CATGETS(Dtb_project_catd, 10, 1, "Project Organizer"))
+ strlen(" - ") + strlen(proj_win_title) +1);
strcpy(new_title,
catgets(Dtb_project_catd, 10, 1, "Project Organizer"));
CATGETS(Dtb_project_catd, 10, 1, "Project Organizer"));
strcat(new_title, " - ");
strcat(new_title, proj_win_title);
util_free(proj_win_title);
@@ -849,10 +849,10 @@ abobj_update_palette_title(
else
{
proj_win_title = (STRING) util_malloc(
strlen(catgets(Dtb_project_catd, 100, 104, "NoName"))
strlen(CATGETS(Dtb_project_catd, 100, 104, "NoName"))
+ strlen(".bip") +1);
strcpy(proj_win_title,
catgets(Dtb_project_catd, 100, 104, "NoName"));
CATGETS(Dtb_project_catd, 100, 104, "NoName"));
}
strcat(proj_win_title, ".bip");
@@ -866,13 +866,13 @@ abobj_update_palette_title(
SaveNeeded = TRUE;
new_title = (STRING) util_malloc(
strlen(catgets(Dtb_project_catd, 10, 5, "Application Builder"))
strlen(CATGETS(Dtb_project_catd, 10, 5, "Application Builder"))
+ strlen(" - ") + strlen(proj_win_title) +
+ strlen(catgets(Dtb_project_catd, 100, 244, " (Save Needed)"))
+ strlen(CATGETS(Dtb_project_catd, 100, 244, " (Save Needed)"))
+1);
strcpy(new_title,
catgets(Dtb_project_catd, 10, 5, "Application Builder"));
CATGETS(Dtb_project_catd, 10, 5, "Application Builder"));
strcat(new_title, " - ");
strcat(new_title, proj_win_title);
util_free(proj_win_title);
@@ -880,7 +880,7 @@ abobj_update_palette_title(
if (SaveNeeded)
{
strcat(new_title,
catgets(Dtb_project_catd, 100, 244, " (Save Needed)"));
CATGETS(Dtb_project_catd, 100, 244, " (Save Needed)"));
}
XtVaSetValues(AB_toplevel, XmNtitle, new_title, NULL);

4
cde/programs/dtappbuilder/src/ab/appfw_stubs.c
View File

@@ -663,10 +663,10 @@ appfw_editor_prevent_closeCB(
*/
help_data = (DtbObjectHelpData) util_malloc(sizeof(DtbObjectHelpDataRec));
xm_buf = XmStringCreateLocalized(catgets(Dtb_project_catd, 100, 248, "Properties for your project have been modified on the\nApplication Framework Editor but not Applied.\nApply Changes or Cancel Close operation."));
xm_buf = XmStringCreateLocalized(CATGETS(Dtb_project_catd, 100, 248, "Properties for your project have been modified on the\nApplication Framework Editor but not Applied.\nApply Changes or Cancel Close operation."));
help_data->help_volume = help_data->help_locationID = NULL;
help_data->help_text = XtNewString(catgets(Dtb_project_catd, 100, 249, "Click Apply Changes to apply the changes \nand close the Application Framework Editor.\n\nClick Cancel if you don't want to apply the\nchanges and want the Application Framework\nEditor to remain displayed. You can then click\nReset to undo the changes before closing\nthe Application Framework Editor."));
help_data->help_text = XtNewString(CATGETS(Dtb_project_catd, 100, 249, "Click Apply Changes to apply the changes \nand close the Application Framework Editor.\n\nClick Cancel if you don't want to apply the\nchanges and want the Application Framework\nEditor to remain displayed. You can then click\nReset to undo the changes before closing\nthe Application Framework Editor."));
/*
* Pop up warning message dialog

16
cde/programs/dtappbuilder/src/ab/attch_ed_stubs.c
View File

@@ -3517,9 +3517,9 @@ get_wrn_response(
switch(wrn_type)
{
case ATTCH_ED_WRN_LOAD:
help_data->help_text = XtNewString(catgets(Dtb_project_catd, 100, 93, "Click Apply Changes to apply the changes to the\ncurrent object and load the selected object.\n\nClick Cancel if you don't want to apply the\nchanges to the current object. You can then\nclick Reset to undo the changes before loading\nthe selected object."));
help_data->help_text = XtNewString(CATGETS(Dtb_project_catd, 100, 93, "Click Apply Changes to apply the changes to the\ncurrent object and load the selected object.\n\nClick Cancel if you don't want to apply the\nchanges to the current object. You can then\nclick Reset to undo the changes before loading\nthe selected object."));
sprintf(wrn_string,
catgets(Dtb_project_catd, 100, 43,
CATGETS(Dtb_project_catd, 100, 43,
"Attachments for \"%s\"\n\
have been modified but not Applied.\n\n\
You can Apply the Changes or Cancel the\n\
@@ -3528,9 +3528,9 @@ get_wrn_response(
break;
case ATTCH_ED_WRN_CHANGE_OBJTYPE:
help_data->help_text = XtNewString(catgets(Dtb_project_catd, 100, 95, "Click Apply Changes to apply the changes to the\ncurrent object and display the new object type.\n\nClick Cancel if you don't want to apply the\nchanges to the current object. You can then\nclick Reset to undo the changes before changing\nto a different object type."));
help_data->help_text = XtNewString(CATGETS(Dtb_project_catd, 100, 95, "Click Apply Changes to apply the changes to the\ncurrent object and display the new object type.\n\nClick Cancel if you don't want to apply the\nchanges to the current object. You can then\nclick Reset to undo the changes before changing\nto a different object type."));
sprintf(wrn_string,
catgets(Dtb_project_catd, 100, 44,
CATGETS(Dtb_project_catd, 100, 44,
"Attachments for \"%s\"\n\
have been modified but not Applied.\n\n\
You can Apply the Changes or Cancel the\n\
@@ -3539,9 +3539,9 @@ get_wrn_response(
break;
case ATTCH_ED_WRN_CLOSE:
help_data->help_text = XtNewString(catgets(Dtb_project_catd, 100, 247, "Click Apply Changes to apply the changes to the\ncurrent object and close the Attachments Editor.\n\nClick Cancel if you don't want to apply the\nchanges to the current object and want the\nAttachments Editor to remain displayed. You can\nthen click Reset to undo the changes before\nclosing the Attachments Editor."));
help_data->help_text = XtNewString(CATGETS(Dtb_project_catd, 100, 247, "Click Apply Changes to apply the changes to the\ncurrent object and close the Attachments Editor.\n\nClick Cancel if you don't want to apply the\nchanges to the current object and want the\nAttachments Editor to remain displayed. You can\nthen click Reset to undo the changes before\nclosing the Attachments Editor."));
sprintf(wrn_string,
catgets(Dtb_project_catd, 100, 45,
CATGETS(Dtb_project_catd, 100, 45,
"Attachments for \"%s\"\n\
have been modified but not Applied.\n\n\
You can Apply the Changes or Cancel the\n\
@@ -3704,7 +3704,7 @@ attch_ed_verify_props(void)
/*
* Fetch format string
*/
format_str = XtNewString(catgets(Dtb_project_catd, 100, 245,
format_str = XtNewString(CATGETS(Dtb_project_catd, 100, 245,
"Attachments for \"%s\"\ncannot be modified because it is\na member of the group \"%s\"."));
/*
@@ -3733,7 +3733,7 @@ attch_ed_verify_props(void)
* Malloc/setup struct for help text
*/
help_data = (DtbObjectHelpData) util_malloc(sizeof(DtbObjectHelpDataRec));
help_data->help_text = catgets(Dtb_project_catd, 100, 246,
help_data->help_text = CATGETS(Dtb_project_catd, 100, 246,
"Group objects have attributes that determine what\nattachments their members will have, therefore setting\nattachments for group members is not allowed. This only\napplies to group objects that have layout type Vertical,\nHorizontal, or Row-column. Click Cancel or Reset to\nundo your changes on the Attachments Editor.");
help_data->help_volume = NULL;
help_data->help_locationID = NULL;

2
cde/programs/dtappbuilder/src/ab/brws.c
View File

@@ -2882,7 +2882,7 @@ brws_build_module_menu(
if (!shown_modules_exist)
{
label = XmStringCreateLocalized(
catgets(Dtb_project_catd, 100, 229, "No modules to browse"));
CATGETS(Dtb_project_catd, 100, 229, "No modules to browse"));
mpb = XtVaCreateManagedWidget(name,
xmPushButtonWidgetClass,
pulldown,

6
cde/programs/dtappbuilder/src/ab/brws_find.c
View File

@@ -123,7 +123,7 @@ brwsP_create_find_box(
args,
num_args);
title = XtNewString(catgets(Dtb_project_catd, 100, 230,
title = XtNewString(CATGETS(Dtb_project_catd, 100, 230,
"Module Browser: Find Object"));
XtVaSetValues(XtParent(ui->find_box),
XmNtitle, title,
@@ -131,9 +131,9 @@ brwsP_create_find_box(
XtFree(title);
sel_label = XmStringCreateLocalized(
catgets(Dtb_project_catd, 100, 231, "Object Name"));
CATGETS(Dtb_project_catd, 100, 231, "Object Name"));
ok_label = XmStringCreateLocalized(
catgets(Dtb_project_catd, 100, 232, "Find"));
CATGETS(Dtb_project_catd, 100, 232, "Find"));
XtVaSetValues(ui->find_box,
XmNselectionLabelString, sel_label,
XmNokLabelString, ok_label,

16
cde/programs/dtappbuilder/src/ab/brws_stubs.c
View File

@@ -179,12 +179,12 @@ brwsP_orientation(
if (props->orientation == BRWS_VERTICAL) {
props->orientation = BRWS_HORIZONTAL;
str = catgets(Dtb_project_catd, 100, 66, "Vertical");
str = CATGETS(Dtb_project_catd, 100, 66, "Vertical");
xmlabel = XmStringCreateLocalized(str);
}
else {
props->orientation = BRWS_VERTICAL;
str = catgets(Dtb_project_catd, 100, 67, "Horizontal");
str = CATGETS(Dtb_project_catd, 100, 67, "Horizontal");
xmlabel = XmStringCreateLocalized(str);
}
@@ -220,9 +220,9 @@ brwsP_obj_glyph(
if (!ab || !ab->module)
return;
hide_str = XtNewString(catgets(Dtb_project_catd, 100, 60,
hide_str = XtNewString(CATGETS(Dtb_project_catd, 100, 60,
"Hide Object Glyph"));
show_str = XtNewString(catgets(Dtb_project_catd, 100, 61,
show_str = XtNewString(CATGETS(Dtb_project_catd, 100, 61,
"Show Object Glyph"));
browser_show_view_elements(ab->module,
@@ -255,9 +255,9 @@ brwsP_obj_class(
if (!b || !b->module)
return;
hide_str = XtNewString(catgets(Dtb_project_catd, 100, 62,
hide_str = XtNewString(CATGETS(Dtb_project_catd, 100, 62,
"Hide Object Type"));
show_str = XtNewString(catgets(Dtb_project_catd, 100, 63,
show_str = XtNewString(CATGETS(Dtb_project_catd, 100, 63,
"Show Object Type"));
browser_show_view_elements(b->module,
@@ -290,9 +290,9 @@ brwsP_obj_name(
if (!ab || !ab->module)
return;
hide_str = XtNewString(catgets(Dtb_project_catd, 100, 64,
hide_str = XtNewString(CATGETS(Dtb_project_catd, 100, 64,
"Hide Object Name"));
show_str = XtNewString(catgets(Dtb_project_catd, 100, 65,
show_str = XtNewString(CATGETS(Dtb_project_catd, 100, 65,
"Show Object Name"));
browser_show_view_elements(ab->module,

4
cde/programs/dtappbuilder/src/ab/cgen_env_stubs.c
View File

@@ -105,7 +105,7 @@ cgenP_get_envCB(
}
if (var_value == NULL)
{
XmTextSetString(env_dlg->textpane, catgets(Dtb_project_catd, 100, 58, "*** Not Set ***"));
XmTextSetString(env_dlg->textpane, CATGETS(Dtb_project_catd, 100, 58, "*** Not Set ***"));
}
else
{
@@ -193,7 +193,7 @@ cgenP_reset_envCB(
if (var_value == NULL)
{
XmTextSetString(env_dlg->textpane, catgets(Dtb_project_catd, 100, 58, "*** Not Set ***"));
XmTextSetString(env_dlg->textpane, CATGETS(Dtb_project_catd, 100, 58, "*** Not Set ***"));
}
else
{

2
cde/programs/dtappbuilder/src/ab/cgen_utils.c
View File

@@ -2407,7 +2407,7 @@ check_path_to_cmd(STRING *cmdList, BOOL *allowWarnUserInOut)
util_strncpy(dirName, foundCmd, dirNameLen+1);
/*util_dprintf(2, "directory: '%s'\n", dirName);*/
sprintf(buffer, catgets(Dtb_project_catd, 100, 52,
sprintf(buffer, CATGETS(Dtb_project_catd, 100, 52,
"Your PATH does not contain the command %s.\n"
"In order to access this command, may I append this\n"
"directory to your path?:\n"

90
cde/programs/dtappbuilder/src/ab/conn_obj.c
View File

@@ -960,7 +960,7 @@ connP_make_conn_string(
strcat(conn_string, unknown_str);
}
strcat(conn_string, catgets(Dtb_project_catd, 100, 196, " on "));
strcat(conn_string, CATGETS(Dtb_project_catd, 100, 196, " on "));
modname = abobj_get_moduled_name(src_obj);
strcat(conn_string, (char*)modname);
XtFree(modname);
@@ -995,7 +995,7 @@ connP_make_conn_string(
strcat(conn_string, unknown_str);
}
strcat(conn_string, catgets(Dtb_project_catd, 100, 196, " on "));
strcat(conn_string, CATGETS(Dtb_project_catd, 100, 196, " on "));
modname = abobj_get_moduled_name(target_obj);
strcat(conn_string, (char*)modname);
XtFree(modname);
@@ -1003,7 +1003,7 @@ connP_make_conn_string(
break;
case AB_FUNC_USER_DEF:
strcat(conn_string, catgets(Dtb_project_catd, 100, 197, "Call function"));
strcat(conn_string, CATGETS(Dtb_project_catd, 100, 197, "Call function"));
strcat(conn_string, " \"");
{
ISTRING istr_val = action_info->func_value.func_name;
@@ -1015,20 +1015,20 @@ connP_make_conn_string(
break;
case AB_FUNC_CODE_FRAG:
strcat(conn_string, catgets(Dtb_project_catd, 100, 198, "Execute Code"));
strcat(conn_string, CATGETS(Dtb_project_catd, 100, 198, "Execute Code"));
break;
case AB_FUNC_ON_ITEM_HELP:
strcat(conn_string, catgets(Dtb_project_catd, 100, 199, "Activate On-Item Help"));
strcat(conn_string, CATGETS(Dtb_project_catd, 100, 199, "Activate On-Item Help"));
break;
case AB_FUNC_HELP_VOLUME:
strcat(conn_string, catgets(Dtb_project_catd, 100, 200, "Access Help Volume"));
strcat(conn_string, CATGETS(Dtb_project_catd, 100, 200, "Access Help Volume"));
strcat(conn_string, " \"");
strcat(conn_string, obj_get_func_help_volume(action_obj)?
obj_get_func_help_volume(action_obj):"");
strcat(conn_string, "\" ");
strcat(conn_string, catgets(Dtb_project_catd, 100, 201, "at location"));
strcat(conn_string, CATGETS(Dtb_project_catd, 100, 201, "at location"));
strcat(conn_string, " \"");
strcat(conn_string, obj_get_func_help_location(action_obj)?
obj_get_func_help_location(action_obj):"");
@@ -1522,85 +1522,85 @@ extern void
conn_strings_init(void)
{
unknown_str =
XtNewString(catgets(Dtb_project_catd, 100, 158, "??unknown??"));
XtNewString(CATGETS(Dtb_project_catd, 100, 158, "??unknown??"));
invalid_str =
XtNewString(catgets(Dtb_project_catd, 100, 159, "??invalid??"));
XtNewString(CATGETS(Dtb_project_catd, 100, 159, "??invalid??"));
when_labels[AB_WHEN_UNDEF] = unknown_str;
when_labels[AB_WHEN_ACTION1] =
XtNewString(catgets(Dtb_project_catd, 100, 160, "Action1 Activated"));
XtNewString(CATGETS(Dtb_project_catd, 100, 160, "Action1 Activated"));
when_labels[AB_WHEN_ACTION2] =
XtNewString(catgets(Dtb_project_catd, 100, 161, "Action2 Activated"));
XtNewString(CATGETS(Dtb_project_catd, 100, 161, "Action2 Activated"));
when_labels[AB_WHEN_ACTION3] =
XtNewString(catgets(Dtb_project_catd, 100, 162, "Action3 Activated"));
XtNewString(CATGETS(Dtb_project_catd, 100, 162, "Action3 Activated"));
when_labels[AB_WHEN_ACTIVATED] =
XtNewString(catgets(Dtb_project_catd, 100, 163, "Activated"));
XtNewString(CATGETS(Dtb_project_catd, 100, 163, "Activated"));
when_labels[AB_WHEN_AFTER_CREATED] =
XtNewString(catgets(Dtb_project_catd, 100, 164, "Created"));
XtNewString(CATGETS(Dtb_project_catd, 100, 164, "Created"));
when_labels[AB_WHEN_AFTER_RESIZED] =
XtNewString(catgets(Dtb_project_catd, 100, 165, "Resized"));
XtNewString(CATGETS(Dtb_project_catd, 100, 165, "Resized"));
when_labels[AB_WHEN_BEFORE_TEXT_CHANGED] =
XtNewString(catgets(Dtb_project_catd, 100, 166, "Before Text Changed"));
XtNewString(CATGETS(Dtb_project_catd, 100, 166, "Before Text Changed"));
when_labels[AB_WHEN_CANCEL] =
XtNewString(catgets(Dtb_project_catd, 100, 167, "Cancel Activated"));
XtNewString(CATGETS(Dtb_project_catd, 100, 167, "Cancel Activated"));
when_labels[AB_WHEN_DESTROYED] =
XtNewString(catgets(Dtb_project_catd, 100, 168, "Destroyed"));
XtNewString(CATGETS(Dtb_project_catd, 100, 168, "Destroyed"));
when_labels[AB_WHEN_DOUBLE_CLICKED_ON] =
XtNewString(catgets(Dtb_project_catd, 100, 169, "Double Clicked On"));
XtNewString(CATGETS(Dtb_project_catd, 100, 169, "Double Clicked On"));
when_labels[AB_WHEN_DRAGGED] =
XtNewString(catgets(Dtb_project_catd, 100, 170, "Dragged"));
XtNewString(CATGETS(Dtb_project_catd, 100, 170, "Dragged"));
when_labels[AB_WHEN_DRAGGED_FROM] =
XtNewString(catgets(Dtb_project_catd, 100, 171, "Dragged From"));
XtNewString(CATGETS(Dtb_project_catd, 100, 171, "Dragged From"));
when_labels[AB_WHEN_DROPPED_ON] =
XtNewString(catgets(Dtb_project_catd, 100, 172, "Dropped On"));
XtNewString(CATGETS(Dtb_project_catd, 100, 172, "Dropped On"));
when_labels[AB_WHEN_HIDDEN] =
XtNewString(catgets(Dtb_project_catd, 100, 173, "Hidden"));
XtNewString(CATGETS(Dtb_project_catd, 100, 173, "Hidden"));
when_labels[AB_WHEN_ITEM_SELECTED] =
XtNewString(catgets(Dtb_project_catd, 100, 174, "Item Selected"));
XtNewString(CATGETS(Dtb_project_catd, 100, 174, "Item Selected"));
when_labels[AB_WHEN_OK] =
XtNewString(catgets(Dtb_project_catd, 100, 175, "Ok Activated"));
XtNewString(CATGETS(Dtb_project_catd, 100, 175, "Ok Activated"));
when_labels[AB_WHEN_POPPED_DOWN] =
XtNewString(catgets(Dtb_project_catd, 100, 176, "Popped Down"));
XtNewString(CATGETS(Dtb_project_catd, 100, 176, "Popped Down"));
when_labels[AB_WHEN_POPPED_UP] =
XtNewString(catgets(Dtb_project_catd, 100, 177, "Popped Up"));
XtNewString(CATGETS(Dtb_project_catd, 100, 177, "Popped Up"));
when_labels[AB_WHEN_REPAINT_NEEDED] =
XtNewString(catgets(Dtb_project_catd, 100, 178, "Repaint Needed"));
XtNewString(CATGETS(Dtb_project_catd, 100, 178, "Repaint Needed"));
when_labels[AB_WHEN_SESSION_SAVE] =
XtNewString(catgets(Dtb_project_catd, 100, 179, "Session Save"));
XtNewString(CATGETS(Dtb_project_catd, 100, 179, "Session Save"));
when_labels[AB_WHEN_SESSION_RESTORE] =
XtNewString(catgets(Dtb_project_catd, 100, 180, "Session Restore"));
XtNewString(CATGETS(Dtb_project_catd, 100, 180, "Session Restore"));
when_labels[AB_WHEN_SHOWN] =
XtNewString(catgets(Dtb_project_catd, 100, 181, "Shown"));
XtNewString(CATGETS(Dtb_project_catd, 100, 181, "Shown"));
when_labels[AB_WHEN_TEXT_CHANGED] =
XtNewString(catgets(Dtb_project_catd, 100, 182, "Text Changed"));
XtNewString(CATGETS(Dtb_project_catd, 100, 182, "Text Changed"));
when_labels[AB_WHEN_TOGGLED] =
XtNewString(catgets(Dtb_project_catd, 100, 183, "Toggled"));
XtNewString(CATGETS(Dtb_project_catd, 100, 183, "Toggled"));
when_labels[AB_WHEN_TOOLTALK_DO_COMMAND] =
XtNewString(catgets(Dtb_project_catd, 100, 184, "ToolTalk Do Command"));
XtNewString(CATGETS(Dtb_project_catd, 100, 184, "ToolTalk Do Command"));
when_labels[AB_WHEN_TOOLTALK_GET_STATUS] =
XtNewString(catgets(Dtb_project_catd, 100, 185, "ToolTalk Get Status"));
XtNewString(CATGETS(Dtb_project_catd, 100, 185, "ToolTalk Get Status"));
when_labels[AB_WHEN_TOOLTALK_PAUSE_RESUME] =
XtNewString(catgets(Dtb_project_catd, 100, 186, "ToolTalk Pause/Resume"));
XtNewString(CATGETS(Dtb_project_catd, 100, 186, "ToolTalk Pause/Resume"));
when_labels[AB_WHEN_TOOLTALK_QUIT] =
XtNewString(catgets(Dtb_project_catd, 100, 187, "ToolTalk Quit"));
XtNewString(CATGETS(Dtb_project_catd, 100, 187, "ToolTalk Quit"));
when_labels[AB_WHEN_VALUE_CHANGED] =
XtNewString(catgets(Dtb_project_catd, 100, 188, "Value Changed"));
XtNewString(CATGETS(Dtb_project_catd, 100, 188, "Value Changed"));
when_labels[AB_WHEN_NUM_VALUES] = invalid_str;
stdact_labels[AB_STDACT_UNDEF] = unknown_str;
stdact_labels[AB_STDACT_DISABLE] =
XtNewString(catgets(Dtb_project_catd, 100, 189, "Disable"));
XtNewString(CATGETS(Dtb_project_catd, 100, 189, "Disable"));
stdact_labels[AB_STDACT_ENABLE] =
XtNewString(catgets(Dtb_project_catd, 100, 190, "Enable"));
XtNewString(CATGETS(Dtb_project_catd, 100, 190, "Enable"));
stdact_labels[AB_STDACT_HIDE] =
XtNewString(catgets(Dtb_project_catd, 100, 191, "Hide"));
XtNewString(CATGETS(Dtb_project_catd, 100, 191, "Hide"));
stdact_labels[AB_STDACT_SET_LABEL] =
XtNewString(catgets(Dtb_project_catd, 100, 192, "Set Label"));
XtNewString(CATGETS(Dtb_project_catd, 100, 192, "Set Label"));
stdact_labels[AB_STDACT_SET_TEXT] =
XtNewString(catgets(Dtb_project_catd, 100, 193, "Set Text"));
XtNewString(CATGETS(Dtb_project_catd, 100, 193, "Set Text"));
stdact_labels[AB_STDACT_SET_VALUE] =
XtNewString(catgets(Dtb_project_catd, 100, 194, "Set Value"));
XtNewString(CATGETS(Dtb_project_catd, 100, 194, "Set Value"));
stdact_labels[AB_STDACT_SHOW] =
XtNewString(catgets(Dtb_project_catd, 100, 195, "Show"));
XtNewString(CATGETS(Dtb_project_catd, 100, 195, "Show"));
stdact_labels[AB_BUILTIN_ACTION_NUM_VALUES] = invalid_str;
}

6
cde/programs/dtappbuilder/src/ab/conn_stubs.c
View File

@@ -1601,7 +1601,7 @@ set_standard_action_type(
XtUnmanageChild(volume_rowcol);
hide_execute_code_win();
xm_label_str = XmStringCreateLocalized(catgets(Dtb_project_catd,
xm_label_str = XmStringCreateLocalized(CATGETS(Dtb_project_catd,
100, 54, ARGUMENT_LABEL));
XtVaSetValues(arg_label, XmNlabelString, xm_label_str, NULL);
XmStringFree(xm_label_str);
@@ -1631,7 +1631,7 @@ set_call_function_action_type(
XtUnmanageChild(location_rowcol);
hide_execute_code_win();
xm_label_str = XmStringCreateLocalized(catgets(Dtb_project_catd,
xm_label_str = XmStringCreateLocalized(CATGETS(Dtb_project_catd,
100, 55, FUNCTION_LABEL));
XtVaSetValues(arg_label, XmNlabelString, xm_label_str, NULL);
XmStringFree(xm_label_str);
@@ -1664,7 +1664,7 @@ set_execute_code_action_type(
XtUnmanageChild(volume_rowcol);
XtUnmanageChild(location_rowcol);
xm_label_str = XmStringCreateLocalized(catgets(Dtb_project_catd,
xm_label_str = XmStringCreateLocalized(CATGETS(Dtb_project_catd,
100, 56, CODE_LABEL));
XtVaSetValues(arg_label, XmNlabelString, xm_label_str, NULL);
XmStringFree(xm_label_str);

6
cde/programs/dtappbuilder/src/ab/dnd_ed_stubs.c
View File

@@ -656,7 +656,7 @@ do_auto_apply(
{
if (changing_objects)
{
sprintf(buffer, catgets(Dtb_project_catd, 100, 31,
sprintf(buffer, CATGETS(Dtb_project_catd, 100, 31,
"Drag and drop properties for \"%s\"\n\
have been modified but not Applied.\n\n\
You can Apply the Changes or Cancel the\n\
@@ -666,7 +666,7 @@ do_auto_apply(
{
if(new_obj != (ABObj) NULL)
{
sprintf(buffer, catgets(Dtb_project_catd, 100, 32,
sprintf(buffer, CATGETS(Dtb_project_catd, 100, 32,
"Drag and drop properties for \"%s\"\n\
have been modified but not Applied.\n\n\
You can Apply the Changes or Cancel the\n\
@@ -674,7 +674,7 @@ do_auto_apply(
}
else
{
sprintf(buffer,catgets(Dtb_project_catd, 100, 33,
sprintf(buffer,CATGETS(Dtb_project_catd, 100, 33,
"Drag and drop properties for \"%s\"\n\
have been modified but not Applied.\n\n\
You can Apply the Changes or Cancel the\n\

36
cde/programs/dtappbuilder/src/ab/dtbuilder.c.src
View File

@@ -53,7 +53,7 @@
#include <Dt/HelpQuickD.h>
#include <Dt/HelpDialog.h>
#include <Dt/Session.h>
#include <nl_types.h>
#include <Dt/MsgCatP.h>
#include "palette_ui.h"
#include "about_box_ui.h"
#include "brws_ui.h"
@@ -345,7 +345,7 @@ init_ab(ABInitProcInfo init_info)
if ((*file_name) == 0)
{
sprintf(errmsg_buf, catgets(Dtb_project_catd, 100, 2, "File not found: %s"), user_file_name);
sprintf(errmsg_buf, CATGETS(Dtb_project_catd, 100, 2, "File not found: %s"), user_file_name);
errmsg = errmsg_buf;
}
else
@@ -379,7 +379,7 @@ init_ab(ABInitProcInfo init_info)
}
if ((ret < 0) && (answer != DTB_ANSWER_CANCEL))
{
sprintf(errmsg_buf, catgets(Dtb_project_catd, 100, 1, "Could not import module %s"), file_name);
sprintf(errmsg_buf, CATGETS(Dtb_project_catd, 100, 1, "Could not import module %s"), file_name);
errmsg = errmsg_buf;
}
}
@@ -388,7 +388,7 @@ init_ab(ABInitProcInfo init_info)
STRING fmtStr = NULL, msg = NULL;
XmString xm_str = NULL;
fmtStr = XtNewString(catgets(Dtb_project_catd, 100, 103,
fmtStr = XtNewString(CATGETS(Dtb_project_catd, 100, 103,
"Cannot determine file type for %s.\nDo you want to load the file as a project or a module?"));
msg = (STRING) util_malloc(strlen(fmtStr) + strlen(file_name) + 1);
sprintf(msg, fmtStr, file_name);
@@ -933,7 +933,7 @@ create_import_rbox(
NULL);
label_xmstring = XmStringCreateLocalized(
catgets(Dtb_project_catd, 100, 46,"Import Format:"));
CATGETS(Dtb_project_catd, 100, 46,"Import Format:"));
rbox_label = XtVaCreateManagedWidget("rbox_label",
xmLabelWidgetClass,
format_rbox,
@@ -956,7 +956,7 @@ create_import_rbox(
XtManageChild(rbox);
label_xmstring = XmStringCreateLocalized(
catgets(Dtb_project_catd, 100, 47,"BIL"));
CATGETS(Dtb_project_catd, 100, 47,"BIL"));
BIL_item = XtVaCreateManagedWidget("bil_item",
xmToggleButtonWidgetClass,
rbox,
@@ -970,7 +970,7 @@ create_import_rbox(
label_xmstring = NULL;
label_xmstring = XmStringCreateLocalized(
catgets(Dtb_project_catd, 100, 48,"UIL"));
CATGETS(Dtb_project_catd, 100, 48,"UIL"));
UIL_item = XtVaCreateManagedWidget("uil_item",
xmToggleButtonWidgetClass,
rbox,
@@ -1010,7 +1010,7 @@ create_import_rbox(
NULL);
label_xmstring = XmStringCreateLocalized(
catgets(Dtb_project_catd, 100, 49,"Import By:"));
CATGETS(Dtb_project_catd, 100, 49,"Import By:"));
rbox_label = XtVaCreateManagedWidget("rbox_label",
xmLabelWidgetClass,
method_rbox,
@@ -1029,7 +1029,7 @@ create_import_rbox(
XtManageChild(rbox);
label_xmstring = XmStringCreateLocalized(
catgets(Dtb_project_catd, 100, 50,"Copy"));
CATGETS(Dtb_project_catd, 100, 50,"Copy"));
Copy_item = XtVaCreateManagedWidget("Copy_item",
xmToggleButtonWidgetClass,
rbox,
@@ -1043,7 +1043,7 @@ create_import_rbox(
label_xmstring = NULL;
label_xmstring = XmStringCreateLocalized(
catgets(Dtb_project_catd, 100, 51,"Reference"));
CATGETS(Dtb_project_catd, 100, 51,"Reference"));
Ref_item = XtVaCreateManagedWidget("Ref_item",
xmToggleButtonWidgetClass,
rbox,
@@ -1293,7 +1293,7 @@ main(int argc, char **argv)
/*
* Open the standard message catalog for the project.
*/
Dtb_project_catd = catopen(DTB_PROJECT_CATALOG, NL_CAT_LOCALE);
Dtb_project_catd = CATOPEN(DTB_PROJECT_CATALOG, NL_CAT_LOCALE);
if (Dtb_project_catd == (nl_catd)-1)
{
fprintf(stderr, "WARNING: Could not open message catalog: %s. Messages will be defaults.\n",
@@ -1501,8 +1501,8 @@ main(int argc, char **argv)
XtVaSetValues(dtb_palette_ab_palette_main.ab_palette_main,
XmNallowShellResize, True,
XmNtitle, XtNewString(catgets(Dtb_project_catd, 6, 1, "Application Builder")),
XmNiconName, XtNewString(catgets(Dtb_project_catd, 6, 135, "dtbuilder")),
XmNtitle, XtNewString(CATGETS(Dtb_project_catd, 6, 1, "Application Builder")),
XmNiconName, XtNewString(CATGETS(Dtb_project_catd, 6, 135, "dtbuilder")),
XmNinitialState, NormalState,
XmNmwmDecorations, MWM_DECOR_ALL | MWM_DECOR_RESIZEH,
XmNmwmFunctions, MWM_FUNC_ALL | MWM_FUNC_RESIZE,
@@ -2018,7 +2018,7 @@ proj_show_open_chooserCB(
NULL);
/* Set up help info for shared chooser */
tmp_txt = catgets(Dtb_project_catd,110,1,"Use the File Selection Dialog to specify which file should be used for saving and loading modules or projects");
tmp_txt = CATGETS(Dtb_project_catd,110,1,"Use the File Selection Dialog to specify which file should be used for saving and loading modules or projects");
chooser_help_data.help_text = XtMalloc(strlen(tmp_txt)+1);
strcpy(chooser_help_data.help_text,tmp_txt);
}
@@ -2034,7 +2034,7 @@ proj_show_open_chooserCB(
info->child = (Widget) NULL;
info->chooser_type = AB_OPEN_PROJ_CHOOSER;
ok_label = XmStringCreateLocalized(catgets(Dtb_project_catd, 100, 233, "Open"));
ok_label = XmStringCreateLocalized(CATGETS(Dtb_project_catd, 100, 233, "Open"));
XtVaSetValues(AB_generic_chooser,
XmNautoUnmanage, FALSE,
XtVaTypedArg, XmNpattern,
@@ -2047,7 +2047,7 @@ proj_show_open_chooserCB(
NULL);
XmStringFree(ok_label);
title = XtNewString(catgets(Dtb_project_catd, 100, 234, "Open Project"));
title = XtNewString(CATGETS(Dtb_project_catd, 100, 234, "Open Project"));
XtVaSetValues(XtParent(AB_generic_chooser),
XmNtitle, title,
XmNpopdownCallback, &popdown_callback,
@@ -2240,7 +2240,7 @@ proj_show_import_chooserCB(
info->ImportAsBil = TRUE;
info->ImportByCopy = TRUE;
ok_label = XmStringCreateLocalized(catgets(Dtb_project_catd, 100, 235, "Import"));
ok_label = XmStringCreateLocalized(CATGETS(Dtb_project_catd, 100, 235, "Import"));
XtVaSetValues(AB_generic_chooser,
XmNautoUnmanage, FALSE,
XtVaTypedArg, XmNpattern,
@@ -2252,7 +2252,7 @@ proj_show_import_chooserCB(
NULL);
XmStringFree(ok_label);
title = XtNewString(catgets(Dtb_project_catd, 100, 236, "Import File"));
title = XtNewString(CATGETS(Dtb_project_catd, 100, 236, "Import File"));
XtVaSetValues(XtParent(AB_generic_chooser),
XmNtitle, title,
XmNpopdownCallback, &popdown_callback,

2
cde/programs/dtappbuilder/src/ab/dtbuilder.h
View File

@@ -42,7 +42,7 @@
#include <stdlib.h>
#include <X11/Intrinsic.h>
#include <nl_types.h>
#include <Dt/MsgCatP.h>
#define DTB_PROJECT_CATALOG "dtbuilder"
/* Handle for standard message catalog for the project */
extern nl_catd Dtb_project_catd;

12
cde/programs/dtappbuilder/src/ab/help_ed_stubs.c
View File

@@ -524,37 +524,37 @@ do_auto_apply(
if (changing_objects)
{
sprintf(buffer, catgets(Dtb_project_catd, 100, 31,
sprintf(buffer, CATGETS(Dtb_project_catd, 100, 31,
"Help properties for \"%s\"\n\
have been modified but not Applied.\n\n\
You can Apply the Changes or Cancel the\n\
Load operation for \"%s\"."),old_name, new_name);
help_data->help_text = catgets(Dtb_project_catd, 100, 93,
help_data->help_text = CATGETS(Dtb_project_catd, 100, 93,
"Click Apply Changes to apply the changes to the\ncurrent object and load the selected object.\n\nClick Cancel if you don't want to apply the\nchanges to the current object. You can then\nclick Reset to undo the changes before loading\nthe selected object.");
}
else
{
if(new_obj != (ABObj) NULL)
{
sprintf(buffer, catgets(Dtb_project_catd, 100, 32,
sprintf(buffer, CATGETS(Dtb_project_catd, 100, 32,
"Help properties for \"%s\"\n\
have been modified but not Applied.\n\n\
You can Apply the Changes or Cancel the\n\
Close operation."), old_name);
help_data->help_text = catgets(Dtb_project_catd, 100, 94,
help_data->help_text = CATGETS(Dtb_project_catd, 100, 94,
"Click Apply Changes to apply the changes to the\ncurrent object and close the Help Editor.\n\nClick Cancel if you don't want to apply the\nchanges to the current object and want the Help\nEditor to remain displayed. You can then click\nReset to undo the changes before closing the\nHelp Editor.");
}
else
{
sprintf(buffer,catgets(Dtb_project_catd, 100, 33,
sprintf(buffer,CATGETS(Dtb_project_catd, 100, 33,
"Help properties for \"%s\"\n\
have been modified but not Applied.\n\n\
You can Apply the Changes or Cancel the\n\
'Change Object-Type' operation."), old_name);
help_data->help_text = catgets(Dtb_project_catd, 100, 95,
help_data->help_text = CATGETS(Dtb_project_catd, 100, 95,
"Click Apply Changes to apply the changes to the\ncurrent object and display the new object type.\n\nClick Cancel if you don't want to apply the\nchanges to the current object. You can then\nclick Reset to undo the changes before changing\nto a different object type.");
}
}

38
cde/programs/dtappbuilder/src/ab/message_ed_stubs.c
View File

@@ -1164,23 +1164,23 @@ set_msg_textp_label(
{
case AB_MSG_QUESTION:
ui_set_label_string(mes->msg_textp_label,
catgets(Dtb_project_catd, 100, 210, "Question Message"));
CATGETS(Dtb_project_catd, 100, 210, "Question Message"));
break;
case AB_MSG_ERROR:
ui_set_label_string(mes->msg_textp_label,
catgets(Dtb_project_catd, 100, 211, "Error Message"));
CATGETS(Dtb_project_catd, 100, 211, "Error Message"));
break;
case AB_MSG_WARNING:
ui_set_label_string(mes->msg_textp_label,
catgets(Dtb_project_catd, 100, 212, "Warning Message"));
CATGETS(Dtb_project_catd, 100, 212, "Warning Message"));
break;
case AB_MSG_WORKING:
ui_set_label_string(mes->msg_textp_label,
catgets(Dtb_project_catd, 100, 213, "Working Message"));
CATGETS(Dtb_project_catd, 100, 213, "Working Message"));
break;
case AB_MSG_INFORMATION:
ui_set_label_string(mes->msg_textp_label,
catgets(Dtb_project_catd, 100, 214, "Information Message"));
CATGETS(Dtb_project_catd, 100, 214, "Information Message"));
break;
default:
break;
@@ -2361,31 +2361,31 @@ msgEdP_do_auto_apply(
if (ChangingObjects)
{
sprintf(buffer, catgets(Dtb_project_catd, 100, 36,
sprintf(buffer, CATGETS(Dtb_project_catd, 100, 36,
"Properties for \"%s\" have been modified but not\
Applied.\nApply Changes or Cancel Load operation\
for \"%s\"."), old_name, new_name);
help_data->help_text = catgets(Dtb_project_catd, 100, 98,
help_data->help_text = CATGETS(Dtb_project_catd, 100, 98,
"Click Apply Changes to apply the changes to the\ncurrent message and load the selected message.\n\nClick Cancel if you don't want to apply the\nchanges to the current message. You can then\nclick Reset to undo the changes before loading\nthe selected message.");
}
else
{
if (new_obj != (ABObj) NULL)
{
sprintf(buffer, catgets(Dtb_project_catd, 100, 35,
sprintf(buffer, CATGETS(Dtb_project_catd, 100, 35,
"Properties for \"%s\" have been modified but not\
Applied.\nApply Changes or Cancel Close operation."),
old_name);
help_data->help_text = catgets(Dtb_project_catd, 100, 99,
help_data->help_text = CATGETS(Dtb_project_catd, 100, 99,
"Click Apply Changes to apply the changes to the\ncurrent message and close the Message Editor.\n\nClick Cancel if you don't want to apply the\nchanges to the current message and want the\nMessage Editor to remain displayed. You can\nthen click Reset to undo the changes before\nclosing the Message Editor.");
}
else
{
sprintf(buffer,catgets(Dtb_project_catd, 100, 39,
sprintf(buffer,CATGETS(Dtb_project_catd, 100, 39,
"Properties for \"%s\" have been modified but not\
Applied.\nApply Changes or Cancel Add-Message\
operation."), old_name);
help_data->help_text = catgets(Dtb_project_catd, 100, 100,
help_data->help_text = CATGETS(Dtb_project_catd, 100, 100,
"Click Apply Changes to apply the changes to the\ncurrent message and add a new message to the\nmodule.\n\nClick Cancel if you don't want to apply the\nchanges to the current message. You can then\nclick Reset to undo the changes before adding\na new message.");
}
}
@@ -2553,21 +2553,21 @@ static void
msgEdP_strings_init(void)
{
msgEd_strings[MSG_ED_RETRY_STR] =
XtNewString(catgets(Dtb_project_catd, 100, 202, "Retry"));
XtNewString(CATGETS(Dtb_project_catd, 100, 202, "Retry"));
msgEd_strings[MSG_ED_OK_STR] =
XtNewString(catgets(Dtb_project_catd, 100, 203, "OK"));
XtNewString(CATGETS(Dtb_project_catd, 100, 203, "OK"));
msgEd_strings[MSG_ED_CLOSE_STR] =
XtNewString(catgets(Dtb_project_catd, 100, 204, "Close"));
XtNewString(CATGETS(Dtb_project_catd, 100, 204, "Close"));
msgEd_strings[MSG_ED_STOP_STR] =
XtNewString(catgets(Dtb_project_catd, 100, 205, "Stop"));
XtNewString(CATGETS(Dtb_project_catd, 100, 205, "Stop"));
msgEd_strings[MSG_ED_YES_STR] =
XtNewString(catgets(Dtb_project_catd, 100, 206, "Yes"));
XtNewString(CATGETS(Dtb_project_catd, 100, 206, "Yes"));
msgEd_strings[MSG_ED_NO_STR] =
XtNewString(catgets(Dtb_project_catd, 100, 207, "No"));
XtNewString(CATGETS(Dtb_project_catd, 100, 207, "No"));
msgEd_strings[MSG_ED_CONT_STR] =
XtNewString(catgets(Dtb_project_catd, 100, 208, "Continue"));
XtNewString(CATGETS(Dtb_project_catd, 100, 208, "Continue"));
msgEd_strings[MSG_ED_NO_MODULES_STR] =
XtNewString(catgets(Dtb_project_catd, 100, 209, "No Modules"));
XtNewString(CATGETS(Dtb_project_catd, 100, 209, "No Modules"));
}
/*** DTB_USER_CODE_END

4
cde/programs/dtappbuilder/src/ab/pal_button.c
View File

@@ -191,12 +191,12 @@ button_initialize(
if (obj_get_subtype(obj) == AB_BUT_MENU)
{
obj_set_unique_name(obj, "menubutton");
obj_set_label(obj, catgets(Dtb_project_catd, 6, 66, "Menu Button"));
obj_set_label(obj, CATGETS(Dtb_project_catd, 6, 66, "Menu Button"));
}
else /* Push or Drawn */
{
obj_set_unique_name(obj, "button");
obj_set_label(obj, catgets(Dtb_project_catd, 6, 65, "Button"));
obj_set_label(obj, CATGETS(Dtb_project_catd, 6, 65, "Button"));
}
obj_set_is_initially_visible(obj, True);
obj_set_is_initially_active(obj, True);

10
cde/programs/dtappbuilder/src/ab/pal_choice.c
View File

@@ -204,16 +204,16 @@ choice_initialize(
{
case AB_CHOICE_NONEXCLUSIVE:
obj_set_unique_name(obj, "checkbox");
obj_set_label(obj, catgets(Dtb_project_catd, 100, 253, "Choice:"));
obj_set_label(obj, CATGETS(Dtb_project_catd, 100, 253, "Choice:"));
break;
case AB_CHOICE_OPTION_MENU:
obj_set_unique_name(obj, "optionmenu");
obj_set_label(obj, catgets(Dtb_project_catd, 100, 254, "Options:"));
obj_set_label(obj, CATGETS(Dtb_project_catd, 100, 254, "Options:"));
break;
case AB_CHOICE_EXCLUSIVE:
default:
obj_set_unique_name(obj, "radiobox");
obj_set_label(obj, catgets(Dtb_project_catd, 100, 253, "Choice:"));
obj_set_label(obj, CATGETS(Dtb_project_catd, 100, 253, "Choice:"));
break;
}
@@ -228,8 +228,8 @@ choice_initialize(
obj_set_num_columns(obj, 1);
/* Add initial items to Choice */
items[0] = catgets(Dtb_project_catd, 6, 70, "itemA");
items[1] = catgets(Dtb_project_catd, 6, 71, "itemB");
items[0] = CATGETS(Dtb_project_catd, 6, 70, "itemA");
items[1] = CATGETS(Dtb_project_catd, 6, 71, "itemB");
for (i=0; i < XtNumber(items); i++)
{
iobj = obj_create(AB_TYPE_ITEM, NULL);

6
cde/programs/dtappbuilder/src/ab/pal_combobox.c
View File

@@ -184,13 +184,13 @@ combo_box_initialize(
obj_set_unique_name(obj, "combobox");
obj_set_label(obj, catgets(Dtb_project_catd, 100, 255, "ComboBox:"));
obj_set_label(obj, CATGETS(Dtb_project_catd, 100, 255, "ComboBox:"));
obj_set_label_position(obj, AB_CP_WEST);
obj_set_height(obj, -1);
/* Add initial items to list */
items[0] = catgets(Dtb_project_catd, 6, 70, "itemA");
items[1] = catgets(Dtb_project_catd, 6, 71, "itemB");
items[0] = CATGETS(Dtb_project_catd, 6, 70, "itemA");
items[1] = CATGETS(Dtb_project_catd, 6, 71, "itemB");
for (i=0; i < XtNumber(items); i++)
{
iobj = obj_create(AB_TYPE_ITEM, NULL);

14
cde/programs/dtappbuilder/src/ab/pal_create.c
View File

@@ -907,7 +907,7 @@ locate_obj_parent(
(nobj = trav_next(&trav)) != NULL; )
if (obj_is_menubar(nobj))
{
i18n_msg = catgets(Dtb_project_catd, 100, 11,
i18n_msg = CATGETS(Dtb_project_catd, 100, 11,
"There is already a Menubar for this window.");
/* If we have an old buffer lying around, free it */
@@ -924,7 +924,7 @@ locate_obj_parent(
}
if (obj_parent == NULL)
{
i18n_msg = catgets(Dtb_project_catd, 100, 15,
i18n_msg = CATGETS(Dtb_project_catd, 100, 15,
"Menubars must be dropped on a Main Window.");
/* If we have an old buffer lying around, free it */
@@ -945,7 +945,7 @@ locate_obj_parent(
obj_is_window(obj_get_root(obj_parent)) &&
!obj_is_file_chooser(obj_parent))))
{
i18n_msg = catgets(Dtb_project_catd, 100, 12,
i18n_msg = CATGETS(Dtb_project_catd, 100, 12,
"Containers must be dropped on\na Main Window or Custom Dialog.");
/* If we have an old buffer lying around, free it */
if (errmsg != (STRING) NULL)
@@ -1177,7 +1177,7 @@ locate_obj_parent(
{
if (obj_is_control_panel(obj))
{
i18n_msg = catgets(Dtb_project_catd, 100, 59,
i18n_msg = CATGETS(Dtb_project_catd, 100, 59,
"Control Panes must be dropped on a Main Window,\nCustom Dialog, or another pane.");
/* If we have an old buffer lying around, free it */
@@ -1212,7 +1212,7 @@ locate_obj_parent(
(!(obj_is_container(obj_parent) &&
!obj_is_menubar(obj_parent))))
{
i18n_msg = catgets(Dtb_project_catd, 100, 13,
i18n_msg = CATGETS(Dtb_project_catd, 100, 13,
"Panes must be dropped on a Main Window,\nCustom Dialog, or another pane.");
/* If we have an old buffer lying around, free it */
@@ -1232,7 +1232,7 @@ locate_obj_parent(
(!obj_is_control_panel(obj_get_root(obj_parent)) &&
!obj_is_group(obj_get_root(obj_parent))))
{
i18n_msg = catgets(Dtb_project_catd, 100, 14,
i18n_msg = CATGETS(Dtb_project_catd, 100, 14,
"Controls must be dropped on\na Control Pane or Group.");
/* If we have an old buffer lying around, free it */
if (errmsg != (STRING) NULL)
@@ -1246,7 +1246,7 @@ locate_obj_parent(
}
else
{
i18n_msg = catgets(Dtb_project_catd, 100, 16,
i18n_msg = CATGETS(Dtb_project_catd, 100, 16,
"Unknown object type.");
/* If we have an old buffer lying around, free it */

10
cde/programs/dtappbuilder/src/ab/pal_custdlg.c
View File

@@ -202,7 +202,7 @@ custdlg_initialize(
}
obj_set_unique_name(obj, "dialog");
obj_set_label(obj, catgets(Dtb_project_catd, 100, 256, "Custom Dialog"));
obj_set_label(obj, CATGETS(Dtb_project_catd, 100, 256, "Custom Dialog"));
obj_set_bg_color(obj, "white");
obj_set_is_initially_visible(obj, False);
obj_set_is_initially_active(obj, True);
@@ -814,7 +814,7 @@ custdlg_create_area(
obj_set_x(label, 1);
obj_set_y(label, 1);
pal_initialize_obj(label);
obj_set_label(label, catgets(Dtb_project_catd, 100, 264, "footer message"));
obj_set_label(label, CATGETS(Dtb_project_catd, 100, 264, "footer message"));
obj_set_label_alignment(label, AB_ALIGN_LEFT);
obj_set_unique_name(label,
ab_ident_from_name_and_label(obj_get_name(obj), "label"));
@@ -854,9 +854,9 @@ custdlg_create_buttons(
int startpos, endpos;
int i;
button_labels[0] = catgets(Dtb_project_catd, 100, 265, "Button1");
button_labels[1] = catgets(Dtb_project_catd, 100, 266, "Button2");
button_labels[2] = catgets(Dtb_project_catd, 100, 267, "Button3");
button_labels[0] = CATGETS(Dtb_project_catd, 100, 265, "Button1");
button_labels[1] = CATGETS(Dtb_project_catd, 100, 266, "Button2");
button_labels[2] = CATGETS(Dtb_project_catd, 100, 267, "Button3");
endpos = 0;
for(i=0; i < XtNumber(button_names); i++)

4
cde/programs/dtappbuilder/src/ab/pal_fchooser.c
View File

@@ -180,8 +180,8 @@ fchooser_initialize(
name = obj_get_unique_name(obj, "file_seln", 5000, nameBuf);
obj_set_name(obj, name);
obj_set_label(obj, catgets(Dtb_project_catd, 100, 257, "File Selection Dialog"));
obj_set_ok_label(obj, catgets(Dtb_project_catd, 100, 228, "Ok"));
obj_set_label(obj, CATGETS(Dtb_project_catd, 100, 257, "File Selection Dialog"));
obj_set_ok_label(obj, CATGETS(Dtb_project_catd, 100, 228, "Ok"));
obj_set_is_initially_visible(obj, False);
obj_set_is_initially_active(obj, True);

2
cde/programs/dtappbuilder/src/ab/pal_label.c
View File

@@ -162,7 +162,7 @@ label_initialize(
{
obj_set_unique_name(obj, "label");
obj_set_label(obj, catgets(Dtb_project_catd, 6, 69, "Label"));
obj_set_label(obj, CATGETS(Dtb_project_catd, 6, 69, "Label"));
obj_set_is_initially_visible(obj, True);
obj_set_is_initially_active(obj, True);

4
cde/programs/dtappbuilder/src/ab/pal_list.c
View File

@@ -198,8 +198,8 @@ list_initialize(
obj_set_is_initially_active(obj, True);
/* Add initial items to list */
items[0] = catgets(Dtb_project_catd, 6, 70, "itemA");
items[1] = catgets(Dtb_project_catd, 6, 71, "itemB");
items[0] = CATGETS(Dtb_project_catd, 6, 70, "itemA");
items[1] = CATGETS(Dtb_project_catd, 6, 71, "itemB");
for (i=0; i < XtNumber(items); i++)
{
iobj = obj_create(AB_TYPE_ITEM, NULL);

4
cde/programs/dtappbuilder/src/ab/pal_mainwin.c
View File

@@ -171,7 +171,7 @@ mainwin_initialize(
obj_set_unique_name(obj, "mainwindow");
obj_set_label(obj, catgets(Dtb_project_catd, 100, 258, "Main Window"));
obj_set_label(obj, CATGETS(Dtb_project_catd, 100, 258, "Main Window"));
obj_set_bg_color(obj, "white");
obj_set_is_initially_visible(obj, True);
obj_set_is_initially_iconic(obj, False);
@@ -798,7 +798,7 @@ mainwin_create_area(
obj_set_x(label, 1);
obj_set_y(label, 1);
pal_initialize_obj(label);
obj_set_label(label, catgets(Dtb_project_catd, 100, 264, "footer message"));
obj_set_label(label, CATGETS(Dtb_project_catd, 100, 264, "footer message"));
obj_set_label_alignment(label, AB_ALIGN_LEFT);
obj_set_unique_name(label,
ab_ident_from_name_and_label(obj_get_name(obj), "label"));

4
cde/programs/dtappbuilder/src/ab/pal_menu.c
View File

@@ -217,8 +217,8 @@ menu_initialize(
obj_set_is_initially_active(obj, True);
/* Add initial items to Choice */
items[0] = catgets(Dtb_project_catd, 6, 136, "Item1");
items[1] = catgets(Dtb_project_catd, 100, 259, "Item2");
items[0] = CATGETS(Dtb_project_catd, 6, 136, "Item1");
items[1] = CATGETS(Dtb_project_catd, 100, 259, "Item2");
for (i=0; i < XtNumber(items); i++)
{
iobj = obj_create(AB_TYPE_ITEM, NULL);

6
cde/programs/dtappbuilder/src/ab/pal_menubar.c
View File

@@ -180,9 +180,9 @@ menubar_initialize(
obj_set_is_initially_active(obj, True);
/* Add initial cascades to Choice */
cascades[0] = catgets(Dtb_project_catd, 6, 20, "File");
cascades[1] = catgets(Dtb_project_catd, 6, 21, "Edit");
cascades[2] = catgets(Dtb_project_catd, 6, 25, "Help");
cascades[0] = CATGETS(Dtb_project_catd, 6, 20, "File");
cascades[1] = CATGETS(Dtb_project_catd, 6, 21, "Edit");
cascades[2] = CATGETS(Dtb_project_catd, 6, 25, "Help");
for (i=0; i < XtNumber(cascades); i++)
{
iobj = obj_create(AB_TYPE_ITEM, NULL);

4
cde/programs/dtappbuilder/src/ab/pal_scale.c
View File

@@ -178,12 +178,12 @@ scale_initialize(
if (obj_get_read_only(obj) == False)
{
obj_set_unique_name(obj, "scale");
obj_set_label(obj, catgets(Dtb_project_catd, 100, 260, "Scale:"));
obj_set_label(obj, CATGETS(Dtb_project_catd, 100, 260, "Scale:"));
}
else /* Gauge */
{
obj_set_unique_name(obj, "gauge");
obj_set_label(obj, catgets(Dtb_project_catd, 100, 261, "Gauge:"));
obj_set_label(obj, CATGETS(Dtb_project_catd, 100, 261, "Gauge:"));
}
obj_set_label_position(obj, AB_CP_NORTH);

2
cde/programs/dtappbuilder/src/ab/pal_sep.c
View File

@@ -158,7 +158,7 @@ separator_initialize(
{
obj_set_unique_name(obj, "separator");
obj_set_label(obj, catgets(Dtb_project_catd, 22, 46, "Separator"));
obj_set_label(obj, CATGETS(Dtb_project_catd, 22, 46, "Separator"));
obj_set_line_style(obj, AB_LINE_ETCHED_IN);
obj_set_is_initially_visible(obj, True);
obj_set_is_initially_active(obj, True);

2
cde/programs/dtappbuilder/src/ab/pal_spinbox.c
View File

@@ -187,7 +187,7 @@ spinbox_initialize(
{
obj_set_unique_name(obj, "spinbox");
obj_set_label(obj, catgets(Dtb_project_catd, 100, 262, "SpinBox:"));
obj_set_label(obj, CATGETS(Dtb_project_catd, 100, 262, "SpinBox:"));
obj_set_label_position(obj, AB_CP_NORTH);
obj_set_width(obj, spinbox_init_width);
obj_set_text_type(obj, AB_TEXT_NUMERIC);

2
cde/programs/dtappbuilder/src/ab/pal_textf.c
View File

@@ -164,7 +164,7 @@ textf_initialize(
obj_set_unique_name(obj, "textfield");
obj_set_label(obj, catgets(Dtb_project_catd, 100, 263, "TextField:"));
obj_set_label(obj, CATGETS(Dtb_project_catd, 100, 263, "TextField:"));
obj_set_is_initially_visible(obj, True);
obj_set_is_initially_active(obj, True);
obj_set_num_columns(obj, 8);

14
cde/programs/dtappbuilder/src/ab/proj.c
View File

@@ -1119,20 +1119,20 @@ proj_open_proj_okCB(
}
else if (!util_file_exists(proj_filename))
{
sprintf(Buf, catgets(Dtb_project_catd, 100, 8,
sprintf(Buf, CATGETS(Dtb_project_catd, 100, 8,
"The file %s does not exist."), proj_filename);
util_printf_err(Buf);
}
else if (!util_file_is_regular_file(proj_filename))
{
sprintf(Buf, catgets(Dtb_project_catd, 100, 69,
sprintf(Buf, CATGETS(Dtb_project_catd, 100, 69,
"Cannot open %s.\n%s is not a regular file."),
proj_filename, proj_filename);
xm_buf = XmStringCreateLocalized(Buf);
dtb_proj_error_msg_initialize(&dtb_proj_error_msg);
help_data = (DtbObjectHelpData) util_malloc(sizeof(DtbObjectHelpDataRec));
help_data->help_text = catgets(Dtb_project_catd, 100, 89,
help_data->help_text = CATGETS(Dtb_project_catd, 100, 89,
"The file you specified is a directory or\nanother special file.");
help_data->help_volume = "";
help_data->help_locationID = "";
@@ -1199,20 +1199,20 @@ proj_import_okCB(
/* If the file specified does not exist, keep up the file
* chooser so that the user can specify another file.
*/
sprintf(Buf, catgets(Dtb_project_catd, 100, 8,
sprintf(Buf, CATGETS(Dtb_project_catd, 100, 8,
"The file %s does not exist."), file_name);
util_printf_err(Buf);
}
else if (!util_file_is_regular_file(file_name))
{
sprintf(Buf, catgets(Dtb_project_catd, 100, 70,
sprintf(Buf, CATGETS(Dtb_project_catd, 100, 70,
"Cannot import %s.\n%s is not a regular file."),
file_name, file_name);
xm_buf = XmStringCreateLocalized(Buf);
dtb_proj_error_msg_initialize(&dtb_proj_error_msg);
help_data = (DtbObjectHelpData) util_malloc(sizeof(DtbObjectHelpDataRec));
help_data->help_text = catgets(Dtb_project_catd, 100, 89,
help_data->help_text = CATGETS(Dtb_project_catd, 100, 89,
"The file you specified is a directory or\nanother special file.");
help_data->help_volume = "";
help_data->help_locationID = "";
@@ -1248,7 +1248,7 @@ proj_import_okCB(
}
else
{
sprintf(Buf, catgets(Dtb_project_catd, 100, 9,
sprintf(Buf, CATGETS(Dtb_project_catd, 100, 9,
"%s does not have read permission."),
file_name);
util_printf_err(Buf);

16
cde/programs/dtappbuilder/src/ab/projP_utils.c
View File

@@ -165,7 +165,7 @@ projP_show_save_as_bil_chooser(
/* Pass along the client_data to the okCallback */
ok_callback[0].closure = (XtPointer) obj;
ok_label = XmStringCreateLocalized(catgets(Dtb_project_catd, 100, 237, "Save"));
ok_label = XmStringCreateLocalized(CATGETS(Dtb_project_catd, 100, 237, "Save"));
XtVaSetValues(AB_generic_chooser,
XmNautoUnmanage, FALSE,
XtVaTypedArg, XmNpattern,
@@ -177,7 +177,7 @@ projP_show_save_as_bil_chooser(
NULL);
XmStringFree(ok_label);
title = XtNewString(catgets(Dtb_project_catd, 100, 242, "Save BIL File"));
title = XtNewString(CATGETS(Dtb_project_catd, 100, 242, "Save BIL File"));
XtVaSetValues(XtParent(AB_generic_chooser),
XmNtitle, title,
XmNpopdownCallback, &popdown_callback,
@@ -236,13 +236,13 @@ save_as_bil_okCB(
}
if (util_file_is_directory(fullpath))
{
sprintf(Buf, catgets(Dtb_project_catd, 100, 73,
sprintf(Buf, CATGETS(Dtb_project_catd, 100, 73,
"Cannot save the module to %s.\n%s is a directory not a file."), fullpath, fullpath);
xm_buf = XmStringCreateLocalized(Buf);
dtb_proj_error_msg_initialize(&dtb_proj_error_msg);
help_data = (DtbObjectHelpData) util_malloc(sizeof(DtbObjectHelpDataRec));
help_data->help_text = catgets(Dtb_project_catd, 100, 87,
help_data->help_text = CATGETS(Dtb_project_catd, 100, 87,
"The file name you specified for saving the\nmodule is a directory. Type another file name\nfor the module.");
help_data->help_volume = "";
help_data->help_locationID = "";
@@ -274,13 +274,13 @@ save_as_bil_okCB(
}
else
{
sprintf(Buf, catgets(Dtb_project_catd, 100, 76,
sprintf(Buf, CATGETS(Dtb_project_catd, 100, 76,
"Cannot save module to \"%s\".\n\"%s\" does not have write permission."), mod_dir, mod_dir);
xm_buf = XmStringCreateLocalized(Buf);
dtb_proj_error_msg_initialize(&dtb_proj_error_msg);
help_data = (DtbObjectHelpData) util_malloc(sizeof(DtbObjectHelpDataRec));
help_data->help_text = catgets(Dtb_project_catd, 100, 88,
help_data->help_text = CATGETS(Dtb_project_catd, 100, 88,
"The directory you specified for saving is not\nwritable by you. Therefore, the module cannot\nbe saved. Try saving the module to another\ndirectory.");
help_data->help_volume = "";
help_data->help_locationID = "";
@@ -342,10 +342,10 @@ projP_save_export_bil(
}
else
{
sprintf(Buf, catgets(Dtb_project_catd, 100, 7,
sprintf(Buf, CATGETS(Dtb_project_catd, 100, 7,
"%s is a read-only file."), old_filename);
util_set_help_data(catgets(Dtb_project_catd, 100, 81,
util_set_help_data(CATGETS(Dtb_project_catd, 100, 81,
"The changes that were made cannot be saved\nbecause you do not have permission to write\nto the file."), NULL, NULL);
util_printf_err(Buf);
}

10
cde/programs/dtappbuilder/src/ab/proj_stubs.c
View File

@@ -266,9 +266,9 @@ projP_save_mod_proc(
}
else
{
sprintf(Buf, catgets(Dtb_project_catd, 100, 10,
sprintf(Buf, CATGETS(Dtb_project_catd, 100, 10,
"The file %s is a read-only file.\nCannot save edits."), file);
util_set_help_data(catgets(Dtb_project_catd, 100, 81,
util_set_help_data(CATGETS(Dtb_project_catd, 100, 81,
"The changes that were made cannot be saved\nbecause you do not have permission to write\nto the file."),
NULL, NULL);
util_printf_err(Buf);
@@ -276,9 +276,9 @@ projP_save_mod_proc(
}
else
{
sprintf(Buf, catgets(Dtb_project_catd, 100, 76,
sprintf(Buf, CATGETS(Dtb_project_catd, 100, 76,
"Cannot save module to \"%s\".\n\"%s\" does not have write permission."), mod_dir, mod_dir);
sprintf(help_buf, catgets(Dtb_project_catd, 100, 82,
sprintf(help_buf, CATGETS(Dtb_project_catd, 100, 82,
"You do not have permission to write to the\ndirectory \"%s\"."), mod_dir);
util_set_help_data(help_buf, NULL, NULL);
util_printf_err(Buf);
@@ -634,7 +634,7 @@ projP_remove_proc(
/* The first thing in the message is
* some general text.
*/
init_msg = catgets(Dtb_project_catd, 100, 68,
init_msg = CATGETS(Dtb_project_catd, 100, 68,
"The following module(s) have unsaved edits. Removing the\nmodule(s) from the project will discard your changes.\nPlease confirm.");
/* If we have an old buffer lying around, free it */

82
cde/programs/dtappbuilder/src/ab/proj_utils.c
View File

@@ -439,7 +439,7 @@ proj_show_save_proj_as_chooser(
info->child = (Widget) encap_cbox;
info->chooser_type = AB_SAVE_PROJ_AS_CHOOSER;
ok_label = XmStringCreateLocalized(catgets(Dtb_project_catd, 100, 237, "Save"));
ok_label = XmStringCreateLocalized(CATGETS(Dtb_project_catd, 100, 237, "Save"));
XtVaSetValues(AB_generic_chooser,
XmNautoUnmanage, FALSE,
XtVaTypedArg, XmNpattern,
@@ -451,7 +451,7 @@ proj_show_save_proj_as_chooser(
NULL);
XmStringFree(ok_label);
title = XtNewString(catgets(Dtb_project_catd, 100, 238, "Save Project"));
title = XtNewString(CATGETS(Dtb_project_catd, 100, 238, "Save Project"));
XtVaSetValues(XtParent(AB_generic_chooser),
XmNtitle, title,
XmNpopdownCallback, &popdown_callback,
@@ -537,14 +537,14 @@ save_proj_as_okCB(
}
if (util_file_is_directory(proj_filename))
{
sprintf(Buf, catgets(Dtb_project_catd, 100, 71,
sprintf(Buf, CATGETS(Dtb_project_catd, 100, 71,
"Cannot save the project to %s.\n%s is a directory not a file."), proj_filename, proj_filename);
xm_buf = XmStringCreateLocalized(Buf);
dtb_proj_error_msg_initialize(&dtb_proj_error_msg);
help_data = (DtbObjectHelpData) util_malloc(sizeof(DtbObjectHelpDataRec));
help_data->help_text = catgets(Dtb_project_catd, 100, 85,
help_data->help_text = CATGETS(Dtb_project_catd, 100, 85,
"The file name you specified for saving the project\nis a directory. Type another file name for the project.");
help_data->help_volume = "";
help_data->help_locationID = "";
@@ -591,16 +591,16 @@ save_proj_as_okCB(
XtVaGetValues(widget, XmNuserData, &chooserInfo, NULL);
if (chooserInfo->writeEncapsulated)
{
sprintf(Buf, catgets(Dtb_project_catd, 100, 77,
sprintf(Buf, CATGETS(Dtb_project_catd, 100, 77,
"Cannot save encapsulated project to \"%s\".\n\"%s\" does not have write permission."), proj_dir, proj_dir);
}
else
{
sprintf(Buf, catgets(Dtb_project_catd, 100, 74,
sprintf(Buf, CATGETS(Dtb_project_catd, 100, 74,
"Cannot save project to \"%s\".\n\"%s\" does not have write permission."), proj_dir, proj_dir);
}
util_set_help_data(catgets(Dtb_project_catd, 100, 83,
util_set_help_data(CATGETS(Dtb_project_catd, 100, 83,
"The directory you specified for saving is not\nwritable by you. Therefore, the project cannot\nbe saved. Try saving the project to another directory."), NULL, NULL);
util_printf_err(Buf);
@@ -695,15 +695,15 @@ save_proj_as_bip(
new_file, MAXPATHLEN);
new_name_len = strlen(new_file);
old_name_len = strlen(old_file);
msg_len = strlen(catgets(Dtb_project_catd, 100, 101, MSG));
msg_len = strlen(CATGETS(Dtb_project_catd, 100, 101, MSG));
msg = (STRING)util_malloc((2*old_name_len)+new_name_len+msg_len +1);
help_data.help_text = catgets(Dtb_project_catd, 100, 102, HLP_MSG);
help_data.help_text = CATGETS(Dtb_project_catd, 100, 102, HLP_MSG);
help_data.help_volume = NULL;
help_data.help_locationID = NULL;
if (msg)
{
sprintf(msg, catgets(Dtb_project_catd, 100, 101, MSG),
sprintf(msg, CATGETS(Dtb_project_catd, 100, 101, MSG),
new_file, old_file, old_file);
xm_msg = XmStringCreateLocalized(msg);
answer = dtb_show_modal_message(AB_generic_chooser,
@@ -839,17 +839,17 @@ proj_show_name_dlg(
help_data = (DtbObjectHelpData) util_malloc(sizeof(DtbObjectHelpDataRec));
help_data->help_text = XtNewString(catgets(Dtb_project_catd, 100, 41,
help_data->help_text = XtNewString(CATGETS(Dtb_project_catd, 100, 41,
"Type in a name for the new module. A valid name\ncan consist of letters, underscore (_), and digits,\nhowever the name must begin with either a letter or\nan underscore."));
help_data->help_volume = "";
help_data->help_locationID = "";
dialog_title = XtNewString(catgets(Dtb_project_catd, 100, 40,
dialog_title = XtNewString(CATGETS(Dtb_project_catd, 100, 40,
"Application Builder"));
textf_lbl = XtNewString(catgets(Dtb_project_catd, 100, 111, "Module Name:"));
btn1_lbl = XtNewString(catgets(Dtb_project_catd, 100, 108, "Apply"));
btn2_lbl = XtNewString(catgets(Dtb_project_catd, 100, 109, "Cancel"));
btn3_lbl = XtNewString(catgets(Dtb_project_catd, 100, 110, "Help"));
textf_lbl = XtNewString(CATGETS(Dtb_project_catd, 100, 111, "Module Name:"));
btn1_lbl = XtNewString(CATGETS(Dtb_project_catd, 100, 108, "Apply"));
btn2_lbl = XtNewString(CATGETS(Dtb_project_catd, 100, 109, "Cancel"));
btn3_lbl = XtNewString(CATGETS(Dtb_project_catd, 100, 110, "Help"));
answer = ui_popup_modal_prompt( parent,
dialog_title, textf_lbl, init_name, btn1_lbl, btn2_lbl,
@@ -949,7 +949,7 @@ proj_show_export_bil_chooser(
/* Pass along the client_data to the okCallback */
ok_callback[0].closure = (XtPointer) obj;
ok_label = XmStringCreateLocalized(catgets(Dtb_project_catd, 100, 243, "Export"));
ok_label = XmStringCreateLocalized(CATGETS(Dtb_project_catd, 100, 243, "Export"));
XtVaSetValues(AB_generic_chooser,
XmNautoUnmanage, FALSE,
XtVaTypedArg, XmNpattern,
@@ -961,7 +961,7 @@ proj_show_export_bil_chooser(
NULL);
XmStringFree(ok_label);
title = XtNewString(catgets(Dtb_project_catd, 100, 239, "Export Module"));
title = XtNewString(CATGETS(Dtb_project_catd, 100, 239, "Export Module"));
XtVaSetValues(XtParent(AB_generic_chooser),
XmNtitle, title,
XmNpopdownCallback, &popdown_callback,
@@ -1013,13 +1013,13 @@ export_bil_okCB(
}
if (util_file_is_directory(fullpath))
{
sprintf(Buf, catgets(Dtb_project_catd, 100, 72,
sprintf(Buf, CATGETS(Dtb_project_catd, 100, 72,
"Cannot export the module to %s.\n%s is a directory not a file."), fullpath, fullpath);
xm_buf = XmStringCreateLocalized(Buf);
dtb_proj_error_msg_initialize(&dtb_proj_error_msg);
help_data = (DtbObjectHelpData) util_malloc(sizeof(DtbObjectHelpDataRec));
help_data->help_text = catgets(Dtb_project_catd, 100, 84,
help_data->help_text = CATGETS(Dtb_project_catd, 100, 84,
"The file name you specified for exporting the\nmodule is a directory. Type another file name\nfor the module.");
help_data->help_volume = "";
help_data->help_locationID = "";
@@ -1075,13 +1075,13 @@ export_bil_okCB(
}
else
{
sprintf(Buf, catgets(Dtb_project_catd, 100, 78,
sprintf(Buf, CATGETS(Dtb_project_catd, 100, 78,
"Cannot export module to \"%s\".\n\"%s\" does not have write permission."), mod_dir, mod_dir);
xm_buf = XmStringCreateLocalized(Buf);
dtb_proj_error_msg_initialize(&dtb_proj_error_msg);
help_data = (DtbObjectHelpData) util_malloc(sizeof(DtbObjectHelpDataRec));
help_data->help_text = catgets(Dtb_project_catd, 100, 86,
help_data->help_text = CATGETS(Dtb_project_catd, 100, 86,
"The directory you specified for exporting is not\nwritable by you. Therefore, the module cannot be\nexported. Try exporting the module to another\ndirectory.");
help_data->help_volume = "";
help_data->help_locationID = "";
@@ -1123,22 +1123,22 @@ proj_overwrite_existing_file(
{
if (!encapsulating)
{
sprintf(Buf, catgets(Dtb_project_catd, 100, 3,
sprintf(Buf, CATGETS(Dtb_project_catd, 100, 3,
"File \"%s\" exists and\nis a read-only file. You can save your\nwork by saving to a different filename."), file);
}
else
{
sprintf(Buf, catgets(Dtb_project_catd, 100, 53,
sprintf(Buf, CATGETS(Dtb_project_catd, 100, 53,
"File \"%s\" exists and\nis a read-only file. To save the encapsulated file,\nyou must save it to a different file name."), file);
}
util_set_help_data(catgets(Dtb_project_catd, 100, 79,
util_set_help_data(CATGETS(Dtb_project_catd, 100, 79,
"The file name you specified for saving already exists\nand cannot be overwritten, since it is not writable by\nyou. Your edits can be saved if you type a different\nfile name."), NULL, NULL);
util_error(Buf);
return (-1);
}
sprintf(Buf, catgets(Dtb_project_catd, 100, 4,
sprintf(Buf, CATGETS(Dtb_project_catd, 100, 4,
"File \"%s\" exists. You can:"), file);
xm_buf = XmStringCreateLocalized(Buf);
@@ -1198,7 +1198,7 @@ proj_save_needed(
*proj_dir = 0;
if (!proj_is_exploded(project))
{
sprintf(Buf, catgets(Dtb_project_catd, 100, 5,
sprintf(Buf, CATGETS(Dtb_project_catd, 100, 5,
"Project %s was loaded from an encapsulated file (%s).\n\
It will be saved as a normal project, with one file per module."),
projName,
@@ -1246,10 +1246,10 @@ proj_save_needed(
}
else
{
sprintf(Buf, catgets(Dtb_project_catd, 100, 74,
sprintf(Buf, CATGETS(Dtb_project_catd, 100, 74,
"Cannot save project to \"%s\".\n\"%s\" does not have write permission."), proj_dir, proj_dir);
util_set_help_data(catgets(Dtb_project_catd, 100, 83,
util_set_help_data(CATGETS(Dtb_project_catd, 100, 83,
"The directory you specified for saving is not\nwritable by you. Therefore, the project cannot\nbe saved. Try saving the project to another directory."), NULL, NULL);
util_printf_err(Buf);
@@ -1376,10 +1376,10 @@ proj_save_encapsulated(
}
else
{
sprintf(Buf, catgets(Dtb_project_catd, 100, 77,
sprintf(Buf, CATGETS(Dtb_project_catd, 100, 77,
"Cannot save encapsulated project to \"%s\".\n\"%s\" does not have write permission."), proj_dir, proj_dir);
util_set_help_data(catgets(Dtb_project_catd, 100, 83,
util_set_help_data(CATGETS(Dtb_project_catd, 100, 83,
"The directory you specified for saving is not\nwritable by you. Therefore, the project cannot\nbe saved. Try saving the project to another directory."), NULL, NULL);
util_printf_err(Buf);
@@ -1851,18 +1851,18 @@ proj_name_proj(void)
STRING btn3_lbl = NULL;
help_data = (DtbObjectHelpData) util_malloc(sizeof(DtbObjectHelpDataRec));
help_data->help_text = XtNewString(catgets(Dtb_project_catd, 100, 42,
help_data->help_text = XtNewString(CATGETS(Dtb_project_catd, 100, 42,
"Type in a name for the new project. A valid\nname can consist of letters, underscore (_),\nand digits, however the name must begin with\neither a letter or an underscore."));
help_data->help_volume = "";
help_data->help_locationID = "";
dialog_title = XtNewString(catgets(Dtb_project_catd, 100, 40,
dialog_title = XtNewString(CATGETS(Dtb_project_catd, 100, 40,
"Application Builder"));
textf_lbl = XtNewString(catgets(Dtb_project_catd, 100, 107, "Project Name:"));
textf_lbl = XtNewString(CATGETS(Dtb_project_catd, 100, 107, "Project Name:"));
def_name = XtNewString("project");
btn1_lbl = XtNewString(catgets(Dtb_project_catd, 100, 108, "Apply"));
btn2_lbl = XtNewString(catgets(Dtb_project_catd, 100, 109, "Cancel"));
btn3_lbl = XtNewString(catgets(Dtb_project_catd, 100, 110, "Help"));
btn1_lbl = XtNewString(CATGETS(Dtb_project_catd, 100, 108, "Apply"));
btn2_lbl = XtNewString(CATGETS(Dtb_project_catd, 100, 109, "Cancel"));
btn3_lbl = XtNewString(CATGETS(Dtb_project_catd, 100, 110, "Help"));
/* Popup the name dialog for the project */
answer = ui_popup_modal_prompt( dtb_get_toplevel_widget(),
@@ -1978,7 +1978,7 @@ create_save_encap_cbox(
XmString label_xmstring = NULL;
label_xmstring = XmStringCreateLocalized(
catgets(Dtb_project_catd, 100, 240, "Save As Encapsulated Project"));
CATGETS(Dtb_project_catd, 100, 240, "Save As Encapsulated Project"));
encap_toggle = XtVaCreateManagedWidget("encap_toggle",
xmToggleButtonWidgetClass,
parent,
@@ -2005,7 +2005,7 @@ create_export_format_cbox(
XmString label_xmstring = NULL;
label_xmstring = XmStringCreateLocalized(
catgets(Dtb_project_catd, 100, 241, "Save As UIL"));
CATGETS(Dtb_project_catd, 100, 241, "Save As UIL"));
format_toggle = XtVaCreateManagedWidget("format_toggle",
xmToggleButtonWidgetClass,
parent,
@@ -2239,7 +2239,7 @@ export_uil_file(
** The file already exists, so post an overwrite dialog and
** see what the user wants to do.
*/
sprintf(Buf, catgets(Dtb_project_catd, 100, 4,
sprintf(Buf, CATGETS(Dtb_project_catd, 100, 4,
"File \"%s\" exists. You can:"), fullpath);
xm_buf = XmStringCreateLocalized(Buf);
dtb_proj_overwrite_msg_initialize(&dtb_proj_overwrite_msg);
@@ -2555,7 +2555,7 @@ proj_verify_name(
*/
if ((obj != NULL) && (obj != newObj))
{
sprintf(Buf, catgets(Dtb_project_catd, 100, 6,
sprintf(Buf, CATGETS(Dtb_project_catd, 100, 6,
"%s is not a unique name for the module."),
new_name );
xm_buf = XmStringCreateLocalized(Buf);

96
cde/programs/dtappbuilder/src/ab/prop.c
View File

@@ -1941,9 +1941,9 @@ prop_color_ok(
if (!objxm_color_exists(colorname))
{
sprintf(Buf,
catgets(Dtb_project_catd, 100, 112, "%s is not a valid color."),
CATGETS(Dtb_project_catd, 100, 112, "%s is not a valid color."),
colorname);
util_set_help_data(catgets(Dtb_project_catd, 100, 113,
util_set_help_data(CATGETS(Dtb_project_catd, 100, 113,
"The color that was specified is not recognized\nas a valid color name."), NULL, NULL);
valid = FALSE;
@@ -1978,11 +1978,11 @@ prop_graphic_filename_ok(
valid = True; /* No Filename is valid */
else
{
util_set_help_data(catgets(Dtb_project_catd, 100, 115,
util_set_help_data(CATGETS(Dtb_project_catd, 100, 115,
"If Graphic is specified as the Label Type for\nthe object whose properties are being modified,\nthen a pixmap (.pm, .xpm) or bitmap (.bm, .xbm)\nfile name must be specified in the Graphic Filename\nfield."), NULL, NULL);
propP_popup_message(field,
catgets(Dtb_project_catd, 100, 114,
CATGETS(Dtb_project_catd, 100, 114,
"The \"Graphic Filename\" field cannot be empty."), False);
}
}
@@ -2000,11 +2000,11 @@ prop_graphic_filename_ok(
ext = strrchr(filebase, '.');
ext[0] = '\0'; /* strip off extension */
util_set_help_data(catgets(Dtb_project_catd, 100, 117,
util_set_help_data(CATGETS(Dtb_project_catd, 100, 117,
"The graphic file name extension should not be included\nwhen it is specified in the Graphic Filename field."), NULL, NULL);
propP_popup_message(field,
catgets(Dtb_project_catd, 100, 116,
CATGETS(Dtb_project_catd, 100, 116,
"\"Graphic Filename\" field expects the filename\nbase only (no extensions: .pm .xpm .bm .xbm).\nStripping off the extension."), True);
ui_field_set_string(field, filebase);
}
@@ -2056,10 +2056,10 @@ prop_help_item_ok(
}
if (exists)
{
util_set_help_data(catgets(Dtb_project_catd, 100, 119,
util_set_help_data(CATGETS(Dtb_project_catd, 100, 119,
"Two Menubar items cannot both be specified as the\nHelp cascade. To specify a different Menubar item,\nyou must first clear the item that is currently set\nto be the Help cascade, then select the new Menubar\nitem to be the Help cascade."), NULL, NULL);
sprintf(Buf, catgets(Dtb_project_catd, 100, 118,
sprintf(Buf, CATGETS(Dtb_project_catd, 100, 118,
"There can only be one Help cascade per Menubar.Item\n\"%s\" is already configured to be the Help cascade,\ntherefore Item \"%s\" cannot also be the Help cascade."),
obj_get_label(iobj_list[i]), obj_get_label(item_obj));
@@ -2105,10 +2105,10 @@ prop_name_ok(
if (!newname || !*newname)
{
util_set_help_data(catgets(Dtb_project_catd, 100, 121,
util_set_help_data(CATGETS(Dtb_project_catd, 100, 121,
"A string must be entered in the Object Name field."),
NULL, NULL);
propP_popup_message( field, catgets(Dtb_project_catd, 100, 120,
propP_popup_message( field, CATGETS(Dtb_project_catd, 100, 120,
"A name is required."), False);
valid = FALSE;
}
@@ -2122,11 +2122,11 @@ prop_name_ok(
{
if (other != obj)
{
util_set_help_data(catgets(Dtb_project_catd, 100, 123,
util_set_help_data(CATGETS(Dtb_project_catd, 100, 123,
"The name specified in the Object Name field is not\na unique name in the module. You must specify a unique\nname for the object."),
NULL, NULL);
sprintf(Buf, catgets(Dtb_project_catd, 100, 122,
sprintf(Buf, CATGETS(Dtb_project_catd, 100, 122,
"Another object in Module \"%s\"\nhas the name \"%s\".\nPlease enter a unique name."), util_strsafe(obj_get_name(module)),newname);
propP_popup_message(field, Buf, False);
valid = FALSE;
@@ -2161,9 +2161,9 @@ prop_number_ok(
if((s == p) || ((s + strlen(s)) != p))
{
util_set_help_data(catgets(Dtb_project_catd, 100, 125,
util_set_help_data(CATGETS(Dtb_project_catd, 100, 125,
"The field only accepts integers. You must enter\nan integer value."), NULL, NULL);
sprintf(Buf, catgets(Dtb_project_catd, 100, 124,
sprintf(Buf, CATGETS(Dtb_project_catd, 100, 124,
"\"%s\" must contain an integer."),
field_name);
propP_popup_message(field, Buf, False);
@@ -2175,9 +2175,9 @@ prop_number_ok(
value = prop_str_to_int(string);
if (value < min_val || value > max_val)
{
util_set_help_data(catgets(Dtb_project_catd, 100, 127,
util_set_help_data(CATGETS(Dtb_project_catd, 100, 127,
"The numerical value entered into the field is not valid. Specify a value in the given range."), NULL, NULL);
sprintf(Buf, catgets(Dtb_project_catd, 100, 126,
sprintf(Buf, CATGETS(Dtb_project_catd, 100, 126,
"\"%s\" value (%d) out of\nvalid range [%d - %d]."),
field_name, value, min_val, max_val);
propP_popup_message(field, Buf, False);
@@ -2218,20 +2218,20 @@ prop_obj_name_ok(
valid = TRUE;
else
{
util_set_help_data(catgets(Dtb_project_catd, 100, 129,
util_set_help_data(CATGETS(Dtb_project_catd, 100, 129,
"The object specified is not of the correct type.\nFor example, it is an error to specify a button\nas the Popup Menu for a Control Pane."),
NULL, NULL);
sprintf(msgbuf, catgets(Dtb_project_catd, 100, 128,
sprintf(msgbuf, CATGETS(Dtb_project_catd, 100, 128,
"\"%s\" is not an object of type %s."),
objname, objtype_name);
}
}
else
{
util_set_help_data(catgets(Dtb_project_catd, 100, 136,
util_set_help_data(CATGETS(Dtb_project_catd, 100, 136,
"The specified object does not exist or it is\nnot of the correct type."), NULL, NULL);
sprintf(msgbuf, catgets(Dtb_project_catd, 100, 130,
sprintf(msgbuf, CATGETS(Dtb_project_catd, 100, 130,
"\"%s\" is not the name of an existing %s."),
objname, objtype_name);
}
@@ -2290,7 +2290,7 @@ prop_submenu_name_ok(
valid = False;
fmtStr = XtNewString(catgets(Dtb_project_catd,
fmtStr = XtNewString(CATGETS(Dtb_project_catd,
100, 132, "Menu \"%s\" is attached as a sub-menu\nto \"%s\". You cannot create a circular\nreference within menus."));
help_buf = (STRING) util_malloc(strlen(fmtStr) +
@@ -2298,7 +2298,7 @@ prop_submenu_name_ok(
sprintf(help_buf, fmtStr, obj_get_name(owner), menu_name);
util_set_help_data(help_buf, NULL, NULL);
sprintf(msgbuf, catgets(Dtb_project_catd, 100, 131,
sprintf(msgbuf, CATGETS(Dtb_project_catd, 100, 131,
"Menu \"%s\" is an ancestor of \"%s\"\ntherefore it cannot be attached as a Sub-menu."), menu_name, obj_get_name(owner));
propP_popup_message(field, msgbuf, False);
@@ -2358,10 +2358,10 @@ prop_string_ok(
{
if (display_notice)
{
util_set_help_data(catgets(Dtb_project_catd, 10, 69,
util_set_help_data(CATGETS(Dtb_project_catd, 10, 69,
"Object names are used by the code generator to\ncreate C identifier names. C identifiers must\nbe composed of letters, digits, or underscores.\nTherefore, object names in App Builder must also\nfollow that rule."),
NULL, NULL);
sprintf(Buf, catgets(Dtb_project_catd, 100, 133,
sprintf(Buf, CATGETS(Dtb_project_catd, 100, 133,
"Only letters, digits, and [%s] allowed."), chars);
propP_popup_message(field, Buf, False);
}
@@ -3134,22 +3134,22 @@ handle_auto_apply(
{
if (changing_types)
{
sprintf(Buf, catgets(Dtb_project_catd, 100, 34,
sprintf(Buf, CATGETS(Dtb_project_catd, 100, 34,
"Properties for \"%s\" have been modified but not Applied.\
\nApply Changes or Cancel Change-ObjectType operation."),
loadedObjName);
help_data->help_text = catgets(Dtb_project_catd, 100,95,
help_data->help_text = CATGETS(Dtb_project_catd, 100,95,
"Click Apply Changes to apply the changes to the\ncurrent object and display the new object type.\n\nClick Cancel if you don't want to apply the\nchanges to the current object. You can then\nclick Reset to undo the changes before changing\nto a different object type.");
}
else
{
sprintf(Buf, catgets(Dtb_project_catd, 100, 35,
sprintf(Buf, CATGETS(Dtb_project_catd, 100, 35,
"Properties for \"%s\" have been modified but not Applied.\
\nApply Changes or Cancel Close operation."),
loadedObjName);
help_data->help_text = catgets(Dtb_project_catd, 100,96,
help_data->help_text = CATGETS(Dtb_project_catd, 100,96,
"Click Apply Changes to apply the changes to the\ncurrent object and close the Property Editor.\n\nClick Cancel if you don't want to apply the\nchanges to the current object and want the\nProperty Editor to remain displayed. You can\nthen click Reset to undo the changes before\nclosing the Property Editor.");
}
}
@@ -3157,12 +3157,12 @@ handle_auto_apply(
{
STRING newObjName = obj_get_name(new_obj);
sprintf(Buf, catgets(Dtb_project_catd, 100, 36,
sprintf(Buf, CATGETS(Dtb_project_catd, 100, 36,
"Properties for \"%s\" have been modified but not Applied.\
\nApply Changes or Cancel Load operation for \"%s\"."),
loadedObjName, newObjName);
help_data->help_text = catgets(Dtb_project_catd, 100,93,
help_data->help_text = CATGETS(Dtb_project_catd, 100,93,
"Click Apply Changes to apply the changes to the\ncurrent object and load the selected object.\n\nClick Cancel if you don't want to apply the\nchanges to the current object. You can then\nclick Reset to undo the changes before loading\nthe selected object.");
}
@@ -4379,7 +4379,7 @@ menu_editCB(
STRING help_buf = NULL;
char Buf[256];
fmtStr = XtNewString(catgets(Dtb_project_catd, 100, 135,
fmtStr = XtNewString(CATGETS(Dtb_project_catd, 100, 135,
"The menu with the name \"%s\" does not exist in\nthe module \"%s\". Specify a valid menu name."));
help_buf = (STRING) util_malloc(strlen(fmtStr) +
@@ -4387,7 +4387,7 @@ menu_editCB(
sprintf(help_buf, fmtStr, current_menuname, obj_get_name(module));
util_set_help_data(help_buf, NULL, NULL);
sprintf(Buf, catgets(Dtb_project_catd, 100, 134,
sprintf(Buf, CATGETS(Dtb_project_catd, 100, 134,
"Could not find menu \"%s\" in module \"%s\"."),
current_menuname, obj_get_name(module));
propP_popup_message(pms->field, Buf, False);
@@ -4479,35 +4479,35 @@ void
strings_init(void)
{
LabelForString =
XtNewString(catgets(Dtb_project_catd, 100, 215, "Label:"));
XtNewString(CATGETS(Dtb_project_catd, 100, 215, "Label:"));
LabelForGraphic =
XtNewString(catgets(Dtb_project_catd, 100, 216, "Graphic Filename:"));
XtNewString(CATGETS(Dtb_project_catd, 100, 216, "Graphic Filename:"));
NoneItem =
XtNewString(catgets(Dtb_project_catd, 100, 217, "None"));
XtNewString(CATGETS(Dtb_project_catd, 100, 217, "None"));
XFieldStr =
XtNewString(catgets(Dtb_project_catd, 100, 218, "X Field"));
XtNewString(CATGETS(Dtb_project_catd, 100, 218, "X Field"));
YFieldStr =
XtNewString(catgets(Dtb_project_catd, 100, 219, "Y Field"));
XtNewString(CATGETS(Dtb_project_catd, 100, 219, "Y Field"));
WFieldStr =
XtNewString(catgets(Dtb_project_catd, 100, 220, "Width Field"));
XtNewString(CATGETS(Dtb_project_catd, 100, 220, "Width Field"));
HFieldStr =
XtNewString(catgets(Dtb_project_catd, 100, 221, "Height Field"));
XtNewString(CATGETS(Dtb_project_catd, 100, 221, "Height Field"));
OffsetFieldStr =
XtNewString(catgets(Dtb_project_catd, 100, 222, "Offset Field"));
XtNewString(CATGETS(Dtb_project_catd, 100, 222, "Offset Field"));
PercentageFieldStr =
XtNewString(catgets(Dtb_project_catd, 100, 223, "Percentage Field"));
XtNewString(CATGETS(Dtb_project_catd, 100, 223, "Percentage Field"));
menu_strs[0] =
XtNewString(catgets(Dtb_project_catd, 100, 224, "None"));
XtNewString(CATGETS(Dtb_project_catd, 100, 224, "None"));
menu_strs[1] =
XtNewString(catgets(Dtb_project_catd, 100, 225, "Create New Menu..."));
XtNewString(CATGETS(Dtb_project_catd, 100, 225, "Create New Menu..."));
menu_strs[2] =
XtNewString(catgets(Dtb_project_catd, 100, 226, "Menus"));
XtNewString(CATGETS(Dtb_project_catd, 100, 226, "Menus"));
menu_strs[3] =
XtNewString(catgets(Dtb_project_catd, 100, 227, "Edit Current..."));
XtNewString(CATGETS(Dtb_project_catd, 100, 227, "Edit Current..."));
RowColFieldStr =
XtNewString(catgets(Dtb_project_catd, 100, 250, "Rows/Columns Field"));
XtNewString(CATGETS(Dtb_project_catd, 100, 250, "Rows/Columns Field"));
VertSpacingFieldStr =
XtNewString(catgets(Dtb_project_catd, 100, 251, "Vertical Spacing Field"));
XtNewString(CATGETS(Dtb_project_catd, 100, 251, "Vertical Spacing Field"));
HorizSpacingFieldStr =
XtNewString(catgets(Dtb_project_catd, 100, 252, "Horizontal Spacing Field"));
XtNewString(CATGETS(Dtb_project_catd, 100, 252, "Horizontal Spacing Field"));
}

2
cde/programs/dtappbuilder/src/ab/prop_items.c
View File

@@ -1196,7 +1196,7 @@ init_new_item(
new_iobj->label_type = AB_LABEL_STRING;
newlabel = get_unique_default_label(pis->item_list,
catgets(Dtb_project_catd, 100, 268, "Item"));
CATGETS(Dtb_project_catd, 100, 268, "Item"));
obj_set_label(new_iobj, newlabel);
abobj_set_item_name(new_iobj, obj_get_module(current_obj),