external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-02-15 04:32:24 +00:00
Code Issues Releases Wiki Activity

dtinfo: rename the CATGETS macro to MCATGETS

Browse source
This commit is contained in:
Lev Kujawski 2021-01-30 20:00:02 -07:00 committed by Jon Trulson
parent fc1d29be81
commit 3379999106
45 changed files with 545 additions and 545 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cde/programs/dtinfo/dtinfo/src/Agents/AddLibraryAgentMotif.C
View file

@ -104,11 +104,11 @@ AddLibraryAgent::create_ui (Widget parent) {
mtfstring = msg_catalog_mgr().catgets(Set_AgentLabel, 162); mtfstring = msg_catalog_mgr().catgets(Set_AgentLabel, 162);
XtVaSetValues(canc, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(canc, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 223, "Clear"); mtfstring = MCATGETS(Set_AgentLabel, 223, "Clear");
XtVaSetValues(f_clr, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(f_clr, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 270, "..."); mtfstring = MCATGETS(Set_AgentLabel, 270, "...");
XtVaSetValues(pick, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(pick, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 48, "Help"); mtfstring = MCATGETS(Set_AgentLabel, 48, "Help");
XtVaSetValues(help, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(help, XmNlabelString, (XmString)mtfstring, NULL);
@ -211,9 +211,9 @@ AddLibraryAgent::pick_dir () {
int n; int n;
XmString title_str = XmStringCreateLocalized( XmString title_str = XmStringCreateLocalized(
CATGETS(Set_AddLibraryAgent, 10, "Dtinfo: Infolib Selection")); MCATGETS(Set_AddLibraryAgent, 10, "Dtinfo: Infolib Selection"));
XmString no_libs_str = XmStringCreateLocalized( XmString no_libs_str = XmStringCreateLocalized(
CATGETS(Set_AddLibraryAgent, 11, "No Infolibs Present")); MCATGETS(Set_AddLibraryAgent, 11, "No Infolibs Present"));
XmString patt_str = XmStringCreateLocalized( (char*)"*.dti" ); XmString patt_str = XmStringCreateLocalized( (char*)"*.dti" );
XmString infolibs_str = XmStringCreateLocalized( (char*)"Infolibs" ); XmString infolibs_str = XmStringCreateLocalized( (char*)"Infolibs" );

18
cde/programs/dtinfo/dtinfo/src/Agents/BookmarkEditMotif.C
View file

@ -218,7 +218,7 @@ BookmarkEdit::create_ui()
new WTopLevelShell (window_system().toplevel(), WPopup, "bookmark_edit"); new WTopLevelShell (window_system().toplevel(), WPopup, "bookmark_edit");
window_system().register_shell (f_shell); window_system().register_shell (f_shell);
string = CATGETS(Set_BookmarkEdit, 1, "Dtinfo: Bookmark Editor"); string = MCATGETS(Set_BookmarkEdit, 1, "Dtinfo: Bookmark Editor");
XtVaSetValues(*f_shell, XmNtitle, string, NULL); XtVaSetValues(*f_shell, XmNtitle, string, NULL);
WXmForm form (*f_shell, "form"); WXmForm form (*f_shell, "form");
@ -226,28 +226,28 @@ BookmarkEdit::create_ui()
f_name_text = new WXmTextField (form, "name_text", WAutoManage); f_name_text = new WXmTextField (form, "name_text", WAutoManage);
WXmLabelGadget notes (form, "notes", WAutoManage); WXmLabelGadget notes (form, "notes", WAutoManage);
mtfstring = CATGETS(Set_AgentLabel, 163, "Name"); mtfstring = MCATGETS(Set_AgentLabel, 163, "Name");
XtVaSetValues(name, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(name, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 164, "Notes"); mtfstring = MCATGETS(Set_AgentLabel, 164, "Notes");
XtVaSetValues(notes, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(notes, XmNlabelString, (XmString)mtfstring, NULL);
// NOTE: Don't add spaces after "," because of stupid CPP. // NOTE: Don't add spaces after "," because of stupid CPP.
f_ok = WXmPushButtonGadget (form, "ok", WAutoManage); f_ok = WXmPushButtonGadget (form, "ok", WAutoManage);
ON_ACTIVATE (f_ok, ok); ON_ACTIVATE (f_ok, ok);
mtfstring = CATGETS(Set_AgentLabel, 161, "OK"); mtfstring = MCATGETS(Set_AgentLabel, 161, "OK");
XtVaSetValues(f_ok, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(f_ok, XmNlabelString, (XmString)mtfstring, NULL);
BUTTON (form,view); BUTTON (form,view);
BUTTON (form,cancel); BUTTON (form,cancel);
mtfstring = CATGETS(Set_AgentLabel, 165, "Display"); mtfstring = MCATGETS(Set_AgentLabel, 165, "Display");
XtVaSetValues(view, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(view, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 162, "Cancel"); mtfstring = MCATGETS(Set_AgentLabel, 162, "Cancel");
XtVaSetValues(cancel, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(cancel, XmNlabelString, (XmString)mtfstring, NULL);
WXmPushButtonGadget help (form, "help", WAutoManage); WXmPushButtonGadget help (form, "help", WAutoManage);
mtfstring = CATGETS(Set_AgentLabel, 48, "Help"); mtfstring = MCATGETS(Set_AgentLabel, 48, "Help");
XtVaSetValues(help, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(help, XmNlabelString, (XmString)mtfstring, NULL);
help_agent().add_activate_help (help, (char*)"bookmark_edit_help"); help_agent().add_activate_help (help, (char*)"bookmark_edit_help");
f_wm_delete_callback = f_wm_delete_callback =
@ -301,7 +301,7 @@ BookmarkEdit::ok()
mcatch_any() mcatch_any()
{ {
message_mgr().error_dialog( message_mgr().error_dialog(
CATGETS(Set_BookmarkEdit, 1, "Dtinfo: Bookmark Editor")); MCATGETS(Set_BookmarkEdit, 1, "Dtinfo: Bookmark Editor"));
} }
end_try; end_try;
} }
@ -334,7 +334,7 @@ BookmarkEdit::cancel()
if (f_modified) if (f_modified)
confirmed = message_mgr().question_dialog( confirmed = message_mgr().question_dialog(
(char*)UAS_String(CATGETS(Set_Messages, 2, (char*)UAS_String(MCATGETS(Set_Messages, 2,
"Abandon changes?"))); "Abandon changes?")));
if (confirmed) if (confirmed)

110
cde/programs/dtinfo/dtinfo/src/Agents/GraphicAgentMotif.C
View file

@ -238,7 +238,7 @@ GraphicAgent::create_ui()
f_shell = WTopLevelShell (window_system().toplevel(), WPopup, "graphic"); f_shell = WTopLevelShell (window_system().toplevel(), WPopup, "graphic");
window_system().register_shell (&f_shell); window_system().register_shell (&f_shell);
string = CATGETS(Set_GraphicAgent, 1, "Dtinfo: Detached Graphic"); string = MCATGETS(Set_GraphicAgent, 1, "Dtinfo: Detached Graphic");
XtVaSetValues((Widget)f_shell, XmNtitle, string, NULL); XtVaSetValues((Widget)f_shell, XmNtitle, string, NULL);
// just use "delete_response" instead // just use "delete_response" instead
@ -264,27 +264,27 @@ GraphicAgent::create_ui()
DECLM (WXmPushButton, close, file_menu, "close" ); DECLM (WXmPushButton, close, file_menu, "close" );
XtVaSetValues(file, XmNlabelString, XtVaSetValues(file, XmNlabelString,
(XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 1, "File")), (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 1, "File")),
XmNmnemonic, XmNmnemonic,
*CATGETS(Set_AgentLabel, 2, ""), *MCATGETS(Set_AgentLabel, 2, ""),
NULL); NULL);
XtVaSetValues(attach, XmNlabelString, XtVaSetValues(attach, XmNlabelString,
(XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 167, "Attach")), (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 167, "Attach")),
XmNmnemonic, XmNmnemonic,
*CATGETS(Set_AgentLabel, 21, ""), *MCATGETS(Set_AgentLabel, 21, ""),
NULL); NULL);
XtVaSetValues(visit, XmNlabelString, XtVaSetValues(visit, XmNlabelString,
(XmString)XmStringLocalized(CATGETS(Set_AgentLabel,168,"Display Section")), (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel,168,"Display Section")),
XmNmnemonic, XmNmnemonic,
*CATGETS(Set_AgentLabel, 119, ""), *MCATGETS(Set_AgentLabel, 119, ""),
NULL); NULL);
XtVaSetValues(close, XmNlabelString, XtVaSetValues(close, XmNlabelString,
(XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 12, "Close")), (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 12, "Close")),
XmNmnemonic, XmNmnemonic,
*CATGETS(Set_AgentLabel, 13, ""), *MCATGETS(Set_AgentLabel, 13, ""),
NULL); NULL);
DECLM (WXmCascadeButton, pan, menu_bar, "panner" ); DECLM (WXmCascadeButton, pan, menu_bar, "panner" );
@ -296,39 +296,39 @@ GraphicAgent::create_ui()
DECLM (WXmToggleButton, low_right, panner_menu, "low_right" ); DECLM (WXmToggleButton, low_right, panner_menu, "low_right" );
XtVaSetValues(pan, XmNlabelString, XtVaSetValues(pan, XmNlabelString,
(XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 166, "Panner")), (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 166, "Panner")),
XmNmnemonic, XmNmnemonic,
*CATGETS(Set_AgentLabel, 9, ""), *MCATGETS(Set_AgentLabel, 9, ""),
NULL); NULL);
XtVaSetValues(none, XmNlabelString, XtVaSetValues(none, XmNlabelString,
(XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 178, "None")), (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 178, "None")),
XmNmnemonic, XmNmnemonic,
*CATGETS(Set_AgentLabel, 7, ""), *MCATGETS(Set_AgentLabel, 7, ""),
NULL); NULL);
XtVaSetValues(up_left, XmNlabelString, XtVaSetValues(up_left, XmNlabelString,
(XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 179, "Upper Left")), (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 179, "Upper Left")),
XmNmnemonic, XmNmnemonic,
*CATGETS(Set_AgentLabel, 254, ""), *MCATGETS(Set_AgentLabel, 254, ""),
NULL); NULL);
XtVaSetValues(up_right, XmNlabelString, XtVaSetValues(up_right, XmNlabelString,
(XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 180, "Upper Right")), (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 180, "Upper Right")),
XmNmnemonic, XmNmnemonic,
*CATGETS(Set_AgentLabel, 252, ""), *MCATGETS(Set_AgentLabel, 252, ""),
NULL); NULL);
XtVaSetValues(low_left, XmNlabelString, XtVaSetValues(low_left, XmNlabelString,
(XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 181, "Lower Left")), (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 181, "Lower Left")),
XmNmnemonic, XmNmnemonic,
*CATGETS(Set_AgentLabel, 113, ""), *MCATGETS(Set_AgentLabel, 113, ""),
NULL); NULL);
XtVaSetValues(low_right, XmNlabelString, XtVaSetValues(low_right, XmNlabelString,
(XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 182, "Lower Right")), (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 182, "Lower Right")),
XmNmnemonic, XmNmnemonic,
*CATGETS(Set_AgentLabel, 259, ""), *MCATGETS(Set_AgentLabel, 259, ""),
NULL); NULL);
// NOTE: some code in this module depends upon the exact ordering of items // NOTE: some code in this module depends upon the exact ordering of items
@ -339,22 +339,22 @@ GraphicAgent::create_ui()
DECLM (WXmPushButton, fit_win_to_gr, view_menu, "fit_graphic" ); DECLM (WXmPushButton, fit_win_to_gr, view_menu, "fit_graphic" );
XtVaSetValues(view, XmNlabelString, XtVaSetValues(view, XmNlabelString,
(XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 4, "View")), (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 4, "View")),
XmNmnemonic, XmNmnemonic,
*CATGETS(Set_AgentLabel, 5, ""), *MCATGETS(Set_AgentLabel, 5, ""),
NULL); NULL);
XtVaSetValues(fit_gr_to_win, XmNlabelString, XtVaSetValues(fit_gr_to_win, XmNlabelString,
(XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 169, "Fit to Window")), (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 169, "Fit to Window")),
XmNmnemonic, XmNmnemonic,
*CATGETS(Set_AgentLabel, 35, ""), *MCATGETS(Set_AgentLabel, 35, ""),
NULL); NULL);
XtVaSetValues(fit_win_to_gr, XmNlabelString, XtVaSetValues(fit_win_to_gr, XmNlabelString,
(XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 170, "Fit to Graphic")), (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 170, "Fit to Graphic")),
XmNmnemonic, XmNmnemonic,
*CATGETS(Set_AgentLabel, 37, ""), *MCATGETS(Set_AgentLabel, 37, ""),
NULL); NULL);
DECLM (WXmSeparator, separator, view_menu, "separator" ); DECLM (WXmSeparator, separator, view_menu, "separator" );
@ -366,23 +366,23 @@ GraphicAgent::create_ui()
DECLM (WXmToggleButton, z_200, view_menu, "z_200" ); DECLM (WXmToggleButton, z_200, view_menu, "z_200" );
DECLM (WXmToggleButton, z_custom, view_menu, "z_custom" ); DECLM (WXmToggleButton, z_custom, view_menu, "z_custom" );
mtfstring = CATGETS(Set_AgentLabel, 171, "25 %"); mtfstring = MCATGETS(Set_AgentLabel, 171, "25 %");
XtVaSetValues(z_25, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(z_25, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 172, "50 %"); mtfstring = MCATGETS(Set_AgentLabel, 172, "50 %");
XtVaSetValues(z_50, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(z_50, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 173, "100 %"); mtfstring = MCATGETS(Set_AgentLabel, 173, "100 %");
XtVaSetValues(z_100, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(z_100, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 174, "125 %"); mtfstring = MCATGETS(Set_AgentLabel, 174, "125 %");
XtVaSetValues(z_125, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(z_125, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 175, "150 %"); mtfstring = MCATGETS(Set_AgentLabel, 175, "150 %");
XtVaSetValues(z_150, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(z_150, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 176, "200 %"); mtfstring = MCATGETS(Set_AgentLabel, 176, "200 %");
XtVaSetValues(z_200, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(z_200, XmNlabelString, (XmString)mtfstring, NULL);
XtVaSetValues(z_custom, XmNlabelString, XtVaSetValues(z_custom, XmNlabelString,
(XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 177, "Custom...")), (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 177, "Custom...")),
XmNmnemonic, XmNmnemonic,
*CATGETS(Set_AgentLabel, 13, ""), *MCATGETS(Set_AgentLabel, 13, ""),
NULL); NULL);
z_100.Set(1); z_100.Set(1);
@ -397,21 +397,21 @@ GraphicAgent::create_ui()
DECLM (WXmPushButton, on_help, help_menu, "on_help" ); DECLM (WXmPushButton, on_help, help_menu, "on_help" );
XtVaSetValues(help, XmNlabelString, XtVaSetValues(help, XmNlabelString,
(XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 48, "Help")), (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 48, "Help")),
XmNmnemonic, XmNmnemonic,
*CATGETS(Set_AgentLabel, 39, ""), *MCATGETS(Set_AgentLabel, 39, ""),
NULL); NULL);
XtVaSetValues(on_window, XmNlabelString, XtVaSetValues(on_window, XmNlabelString,
(XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 147, "On Window")), (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 147, "On Window")),
XmNmnemonic, XmNmnemonic,
*CATGETS(Set_AgentLabel, 35, ""), *MCATGETS(Set_AgentLabel, 35, ""),
NULL); NULL);
XtVaSetValues(on_help, XmNlabelString, XtVaSetValues(on_help, XmNlabelString,
(XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 153, "On Help")), (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 153, "On Help")),
XmNmnemonic, XmNmnemonic,
*CATGETS(Set_AgentLabel, 39, ""), *MCATGETS(Set_AgentLabel, 39, ""),
NULL); NULL);
DECLM (WXmLabel, message_area, form, "message"); DECLM (WXmLabel, message_area, form, "message");
@ -440,12 +440,12 @@ GraphicAgent::create_ui()
PixmapGraphic &pgraphic = *(f_graphic->pixmap_graphic()); PixmapGraphic &pgraphic = *(f_graphic->pixmap_graphic());
Graphic *graphic = f_graphic ; Graphic *graphic = f_graphic ;
UAS_String buffer = CATGETS(Set_GraphicAgent, 8, "Dtinfo: "); UAS_String buffer = MCATGETS(Set_GraphicAgent, 8, "Dtinfo: ");
UAS_String titleStr(graphic->title()); UAS_String titleStr(graphic->title());
const char *title = titleStr ; const char *title = titleStr ;
if (title == NULL || *title == '\0') // empty string if (title == NULL || *title == '\0') // empty string
title = (char *)CATGETS(Set_GraphicAgent, 2, "Detached Graphic"); title = (char *)MCATGETS(Set_GraphicAgent, 2, "Detached Graphic");
buffer = buffer + title; buffer = buffer + title;
f_shell.Title((char*)buffer); f_shell.Title((char*)buffer);
@ -493,9 +493,9 @@ GraphicAgent::create_ui()
if(scalable) if(scalable)
{ {
if (f_graphic->content_type() == "application/CGM") if (f_graphic->content_type() == "application/CGM")
mtfstring = CATGETS(Set_GraphicAgent, 4, "Vector illustration (scalable)"); mtfstring = MCATGETS(Set_GraphicAgent, 4, "Vector illustration (scalable)");
else else
mtfstring = CATGETS(Set_GraphicAgent, 9, "Raster illustration (scalable)"); mtfstring = MCATGETS(Set_GraphicAgent, 9, "Raster illustration (scalable)");
} }
else else
{ {
@ -503,7 +503,7 @@ GraphicAgent::create_ui()
for (unsigned int i = 0 ; i < view_menu.NumChildren(); i++) for (unsigned int i = 0 ; i < view_menu.NumChildren(); i++)
WRect(view_menu.Children()[i]).SetSensitive(False); WRect(view_menu.Children()[i]).SetSensitive(False);
#endif #endif
mtfstring = CATGETS(Set_GraphicAgent, 3, mtfstring = MCATGETS(Set_GraphicAgent, 3,
"Raster illustration (non-scalable)"); "Raster illustration (non-scalable)");
} }
@ -514,11 +514,11 @@ GraphicAgent::create_ui()
for (int i = 0 ; i < view_menu.NumChildren(); i++) for (int i = 0 ; i < view_menu.NumChildren(); i++)
WRect(view_menu.Children()[i]).SetSensitive(False); WRect(view_menu.Children()[i]).SetSensitive(False);
#endif #endif
mtfstring = CATGETS(Set_GraphicAgent, 3, mtfstring = MCATGETS(Set_GraphicAgent, 3,
"Raster illustration (non-scalable)"); "Raster illustration (non-scalable)");
} }
else { else {
mtfstring = CATGETS(Set_GraphicAgent, 4, mtfstring = MCATGETS(Set_GraphicAgent, 4,
"Vector illustration (scalable)"); "Vector illustration (scalable)");
} }
#endif #endif
@ -859,9 +859,9 @@ GraphicAgent::zoom_callback(WCallback *wcb)
} }
f_setcustom = 1 ; f_setcustom = 1 ;
UAS_String msg = CATGETS(Set_GraphicAgent, 6, UAS_String msg = MCATGETS(Set_GraphicAgent, 6,
"Enter the new scaling percentage:"); "Enter the new scaling percentage:");
UAS_String title = CATGETS(Set_GraphicAgent, 7, "Dtinfo: Set Scale"); UAS_String title = MCATGETS(Set_GraphicAgent, 7, "Dtinfo: Set Scale");
scale = message_mgr(). scale = message_mgr().
get_integer((char*)msg, (char*)title, f_current_scale, get_integer((char*)msg, (char*)title, f_current_scale,
(Widget)f_shell); (Widget)f_shell);
@ -901,7 +901,7 @@ GraphicAgent::set_zoom(unsigned int scale)
Wait_Cursor bob; Wait_Cursor bob;
XmStringLocalized mtfstring = CATGETS(Set_GraphicAgent, 5, XmStringLocalized mtfstring = MCATGETS(Set_GraphicAgent, 5,
"Scaling illustration, please wait..."); "Scaling illustration, please wait...");
XtVaSetValues((Widget)f_message_area, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues((Widget)f_message_area, XmNlabelString, (XmString)mtfstring, NULL);
@ -920,9 +920,9 @@ GraphicAgent::set_zoom(unsigned int scale)
refresh(graphic()); refresh(graphic());
if (f_graphic->content_type() == "application/CGM") if (f_graphic->content_type() == "application/CGM")
mtfstring = CATGETS(Set_GraphicAgent, 4, "Vector illustration (scalable)"); mtfstring = MCATGETS(Set_GraphicAgent, 4, "Vector illustration (scalable)");
else else
mtfstring = CATGETS(Set_GraphicAgent, 9, "Raster illustration (scalable)"); mtfstring = MCATGETS(Set_GraphicAgent, 9, "Raster illustration (scalable)");
XtVaSetValues((Widget)f_message_area, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues((Widget)f_message_area, XmNlabelString, (XmString)mtfstring, NULL);
@ -940,9 +940,9 @@ GraphicAgent::refresh(const UAS_Pointer<Graphic> &)
// update message area // update message area
XmStringLocalized mtfstring; XmStringLocalized mtfstring;
if (f_graphic->content_type() == "application/CGM") if (f_graphic->content_type() == "application/CGM")
mtfstring = CATGETS(Set_GraphicAgent, 4, "Vector illustration (scalable)"); mtfstring = MCATGETS(Set_GraphicAgent, 4, "Vector illustration (scalable)");
else else
mtfstring = CATGETS(Set_GraphicAgent, 9, "Raster illustration (scalable)"); mtfstring = MCATGETS(Set_GraphicAgent, 9, "Raster illustration (scalable)");
XtVaSetValues((Widget)f_message_area, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues((Widget)f_message_area, XmNlabelString, (XmString)mtfstring, NULL);
} }

4
cde/programs/dtinfo/dtinfo/src/Agents/HelpAgent.C
View file

@ -181,7 +181,7 @@ HelpAgent::display_help (Widget w)
if(locator_id == NULL) if(locator_id == NULL)
{ {
message_mgr().error_dialog ((char*)UAS_String( message_mgr().error_dialog ((char*)UAS_String(
CATGETS(Set_Messages, 3, "No help available"))); MCATGETS(Set_Messages, 3, "No help available")));
return; return;
} }
@ -232,7 +232,7 @@ HelpAgent::display_help (const String locatoridResourceString)
else else
{ {
message_mgr().error_dialog (UAS_String( message_mgr().error_dialog (UAS_String(
CATGETS(Set_Messages, 3, "No help available"))); MCATGETS(Set_Messages, 3, "No help available")));
} }
} }
} }

4
cde/programs/dtinfo/dtinfo/src/Agents/IcccmAgent.C
View file

@ -240,7 +240,7 @@ IcccmAgent::targetCB(Widget w, XtPointer ia, Atom *selection,
length, format); length, format);
if (atom == None) // failed to resolve the best atom if (atom == None) // failed to resolve the best atom
message_mgr().info_dialog ((char*) message_mgr().info_dialog ((char*)
UAS_String(CATGETS(Set_Messages, 4, UAS_String(MCATGETS(Set_Messages, 4,
"There is no text selected.\n" "There is no text selected.\n"
"Select some text, then try again."))); "Select some text, then try again.")));
} }
@ -255,7 +255,7 @@ IcccmAgent::valueCB(Widget w, XtPointer ia, Atom *selection,
if (atom == None) // failed to resolve the best atom if (atom == None) // failed to resolve the best atom
message_mgr().info_dialog ((char*) message_mgr().info_dialog ((char*)
UAS_String(CATGETS(Set_Messages, 4, UAS_String(MCATGETS(Set_Messages, 4,
"There is no text selected.\n" "There is no text selected.\n"
"Select some text, then try again."))); "Select some text, then try again.")));
} }

160
cde/programs/dtinfo/dtinfo/src/Agents/LibraryAgentMotif.C
View file

@ -226,7 +226,7 @@ exitCB(Widget, XtPointer client_data, XtPointer)
if (BookmarkEdit::modified_count() > 0) if (BookmarkEdit::modified_count() > 0)
{ {
if (! message_mgr().question_dialog( if (! message_mgr().question_dialog(
(char*)UAS_String(CATGETS(Set_Messages, 5, (char*)UAS_String(MCATGETS(Set_Messages, 5,
"There are unsaved bookmarks open.\n" "There are unsaved bookmarks open.\n"
"Quit without saving them?")), "Quit without saving them?")),
f_shell)) f_shell))
@ -237,7 +237,7 @@ exitCB(Widget, XtPointer client_data, XtPointer)
//if (XtIsRealized(f_shell)) XMapRaised(XtDisplay(f_shell), XtWindow(f_shell)); //if (XtIsRealized(f_shell)) XMapRaised(XtDisplay(f_shell), XtWindow(f_shell));
message_mgr().quit_dialog( message_mgr().quit_dialog(
(char*)UAS_String(CATGETS(Set_Messages, 6, "Quit Dtinfo?")), f_shell); (char*)UAS_String(MCATGETS(Set_Messages, 6, "Quit Dtinfo?")), f_shell);
} }
// ///////////////////////////////////////////////////////////////// // /////////////////////////////////////////////////////////////////
@ -348,7 +348,7 @@ LibraryAgent::create_ui()
window_system().register_shell ((WTopLevelShell*)f_shell); window_system().register_shell ((WTopLevelShell*)f_shell);
// set title of doc_tree // set title of doc_tree
string = CATGETS(Set_LibraryAgent, 3, "Dtinfo: Book List"); string = MCATGETS(Set_LibraryAgent, 3, "Dtinfo: Book List");
XtVaSetValues(f_shell, XmNtitle, string, NULL); XtVaSetValues(f_shell, XmNtitle, string, NULL);
// just use "delete_response" instead // just use "delete_response" instead
@ -384,9 +384,9 @@ LibraryAgent::create_ui()
widget = XtCreateManagedWidget("file", xmCascadeButtonGadgetClass, menu_bar, args, n); widget = XtCreateManagedWidget("file", xmCascadeButtonGadgetClass, menu_bar, args, n);
XtVaSetValues(widget, XtVaSetValues(widget,
XmNlabelString, XmNlabelString,
(XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 1, "File")), (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 1, "File")),
XmNmnemonic, XmNmnemonic,
*CATGETS(Set_AgentLabel, 2, ""), *MCATGETS(Set_AgentLabel, 2, ""),
NULL); NULL);
help_agent().add_help_cb(widget); help_agent().add_help_cb(widget);
@ -398,9 +398,9 @@ LibraryAgent::create_ui()
XtVaSetValues(f_view, XtVaSetValues(f_view,
XmNlabelString, XmNlabelString,
(XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 4, "View")), (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 4, "View")),
XmNmnemonic, XmNmnemonic,
*CATGETS(Set_AgentLabel, 5, ""), *MCATGETS(Set_AgentLabel, 5, ""),
NULL); NULL);
#ifdef AllowDetach #ifdef AllowDetach
@ -411,9 +411,9 @@ LibraryAgent::create_ui()
// add labelString to f_detach // add labelString to f_detach
XtVaSetValues(f_detach, XtVaSetValues(f_detach,
XmNlabelString, XmNlabelString,
(XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 6, "Detach")), (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 6, "Detach")),
XmNmnemonic, XmNmnemonic,
*CATGETS(Set_AgentLabel, 7, ""), *MCATGETS(Set_AgentLabel, 7, ""),
NULL); NULL);
#endif #endif
@ -427,9 +427,9 @@ LibraryAgent::create_ui()
// add labelString to f_print_as // add labelString to f_print_as
XtVaSetValues(f_print_as, XtVaSetValues(f_print_as,
XmNlabelString, XmNlabelString,
(XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 10, "Print...")), (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 10, "Print...")),
XmNmnemonic, XmNmnemonic,
*CATGETS(Set_AgentLabel, 9, "P"), *MCATGETS(Set_AgentLabel, 9, "P"),
NULL); NULL);
XtCreateManagedWidget("sep2", xmSeparatorGadgetClass, fileM, 0, 0); XtCreateManagedWidget("sep2", xmSeparatorGadgetClass, fileM, 0, 0);
@ -442,9 +442,9 @@ LibraryAgent::create_ui()
// add labelString to f_close // add labelString to f_close
XtVaSetValues(f_close, XtVaSetValues(f_close,
XmNlabelString, XmNlabelString,
(XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 12, "Close")), (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 12, "Close")),
XmNmnemonic, XmNmnemonic,
*CATGETS(Set_AgentLabel, 13, ""), *MCATGETS(Set_AgentLabel, 13, ""),
NULL); NULL);
widget = XtCreateManagedWidget("exit", xmPushButtonGadgetClass, fileM, 0, 0); widget = XtCreateManagedWidget("exit", xmPushButtonGadgetClass, fileM, 0, 0);
@ -452,9 +452,9 @@ LibraryAgent::create_ui()
// add labelString to "exit" // add labelString to "exit"
XtVaSetValues(widget, XtVaSetValues(widget,
XmNlabelString, XmNlabelString,
(XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 14, "Exit")), (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 14, "Exit")),
XmNmnemonic, XmNmnemonic,
*CATGETS(Set_AgentLabel, 15, ""), *MCATGETS(Set_AgentLabel, 15, ""),
NULL); NULL);
// edit menu // edit menu
@ -467,9 +467,9 @@ LibraryAgent::create_ui()
// add labelString to "edit" // add labelString to "edit"
XtVaSetValues(widget, XtVaSetValues(widget,
XmNlabelString, XmNlabelString,
(XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 16, "Edit")), (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 16, "Edit")),
XmNmnemonic, XmNmnemonic,
*CATGETS(Set_AgentLabel, 17, ""), *MCATGETS(Set_AgentLabel, 17, ""),
NULL); NULL);
help_agent().add_help_cb(widget); help_agent().add_help_cb(widget);
@ -479,9 +479,9 @@ LibraryAgent::create_ui()
// add labelString to "copy" // add labelString to "copy"
XtVaSetValues(f_copy, XtVaSetValues(f_copy,
XmNlabelString, XmNlabelString,
(XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 18, "Copy")), (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 18, "Copy")),
XmNmnemonic, XmNmnemonic,
*CATGETS(Set_AgentLabel, 19, ""), *MCATGETS(Set_AgentLabel, 19, ""),
NULL); NULL);
widget = XtCreateManagedWidget("add", xmPushButtonWidgetClass, editM, 0, 0); widget = XtCreateManagedWidget("add", xmPushButtonWidgetClass, editM, 0, 0);
@ -489,9 +489,9 @@ LibraryAgent::create_ui()
// add labelString to "add" // add labelString to "add"
XtVaSetValues(widget, XtVaSetValues(widget,
XmNlabelString, XmNlabelString,
(XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 20, "Add...")), (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 20, "Add...")),
XmNmnemonic, XmNmnemonic,
*CATGETS(Set_AgentLabel, 21, ""), *MCATGETS(Set_AgentLabel, 21, ""),
NULL); NULL);
f_remove = XtCreateManagedWidget("remove", f_remove = XtCreateManagedWidget("remove",
@ -500,9 +500,9 @@ LibraryAgent::create_ui()
// add labelString to "remove" // add labelString to "remove"
XtVaSetValues(f_remove, XtVaSetValues(f_remove,
XmNlabelString, XmNlabelString,
(XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 22, "Remove")), (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 22, "Remove")),
XmNmnemonic, XmNmnemonic,
*CATGETS(Set_AgentLabel, 23, ""), *MCATGETS(Set_AgentLabel, 23, ""),
NULL); NULL);
// options menu // options menu
@ -515,9 +515,9 @@ LibraryAgent::create_ui()
// add labelString to "options" // add labelString to "options"
XtVaSetValues(widget, XtVaSetValues(widget,
XmNlabelString, XmNlabelString,
(XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 24, "Options")), (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 24, "Options")),
XmNmnemonic, XmNmnemonic,
*CATGETS(Set_AgentLabel, 25, ""), *MCATGETS(Set_AgentLabel, 25, ""),
NULL); NULL);
help_agent().add_help_cb(widget); help_agent().add_help_cb(widget);
@ -527,9 +527,9 @@ LibraryAgent::create_ui()
// add labelString to "preferences" // add labelString to "preferences"
XtVaSetValues(widget, XtVaSetValues(widget,
XmNlabelString, XmNlabelString,
(XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 26, "Preferences...")), (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 26, "Preferences...")),
XmNmnemonic, XmNmnemonic,
*CATGETS(Set_AgentLabel, 27, ""), *MCATGETS(Set_AgentLabel, 27, ""),
NULL); NULL);
XtCreateManagedWidget("sep1", xmSeparatorGadgetClass, optionsM, 0, 0); XtCreateManagedWidget("sep1", xmSeparatorGadgetClass, optionsM, 0, 0);
@ -542,9 +542,9 @@ LibraryAgent::create_ui()
// add labelString to "auto_track" // add labelString to "auto_track"
XtVaSetValues(f_auto_track, XtVaSetValues(f_auto_track,
XmNlabelString, XmNlabelString,
(XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 28, "Auto Track")), (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 28, "Auto Track")),
XmNmnemonic, XmNmnemonic,
*CATGETS(Set_AgentLabel, 29, ""), *MCATGETS(Set_AgentLabel, 29, ""),
NULL); NULL);
Widget tool_barT = XtCreateManagedWidget("show_tool_bar", Widget tool_barT = XtCreateManagedWidget("show_tool_bar",
@ -555,9 +555,9 @@ LibraryAgent::create_ui()
// add labelString to "show_tool_bar" // add labelString to "show_tool_bar"
XtVaSetValues(tool_barT, XtVaSetValues(tool_barT,
XmNlabelString, XmNlabelString,
(XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 30, "Show ToolBar")), (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 30, "Show ToolBar")),
XmNmnemonic, XmNmnemonic,
*CATGETS(Set_AgentLabel, 31, ""), *MCATGETS(Set_AgentLabel, 31, ""),
NULL); NULL);
Widget search_areaT = XtCreateManagedWidget("show_search_area", Widget search_areaT = XtCreateManagedWidget("show_search_area",
@ -568,9 +568,9 @@ LibraryAgent::create_ui()
// add labelString to "show_search_area" // add labelString to "show_search_area"
XtVaSetValues(search_areaT, XtVaSetValues(search_areaT,
XmNlabelString, XmNlabelString,
(XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 32, "Show Search Area")), (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 32, "Show Search Area")),
XmNmnemonic, XmNmnemonic,
*CATGETS(Set_AgentLabel, 33, ""), *MCATGETS(Set_AgentLabel, 33, ""),
NULL); NULL);
// windows menu // windows menu
@ -583,9 +583,9 @@ LibraryAgent::create_ui()
// add labelString to "windows" // add labelString to "windows"
XtVaSetValues(widget, XtVaSetValues(widget,
XmNlabelString, XmNlabelString,
(XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 34, "Windows")), (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 34, "Windows")),
XmNmnemonic, XmNmnemonic,
*CATGETS(Set_AgentLabel, 35, ""), *MCATGETS(Set_AgentLabel, 35, ""),
NULL); NULL);
help_agent().add_help_cb(widget); help_agent().add_help_cb(widget);
@ -594,9 +594,9 @@ LibraryAgent::create_ui()
XtAddCallback(widget, XmNactivateCallback, mark_listCB, 0); XtAddCallback(widget, XmNactivateCallback, mark_listCB, 0);
XtVaSetValues(widget, XtVaSetValues(widget,
XmNlabelString, XmNlabelString,
(XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 40, "Marks List")), (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 40, "Marks List")),
XmNmnemonic, XmNmnemonic,
*CATGETS(Set_AgentLabel, 41, ""), *MCATGETS(Set_AgentLabel, 41, ""),
NULL); NULL);
widget = XtCreateManagedWidget("section_history", xmPushButtonGadgetClass, widget = XtCreateManagedWidget("section_history", xmPushButtonGadgetClass,
@ -604,9 +604,9 @@ LibraryAgent::create_ui()
XtAddCallback(widget, XmNactivateCallback, section_historyCB, 0); XtAddCallback(widget, XmNactivateCallback, section_historyCB, 0);
XtVaSetValues(widget, XtVaSetValues(widget,
XmNlabelString, XmNlabelString,
(XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 38, "Section History")), (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 38, "Section History")),
XmNmnemonic, XmNmnemonic,
*CATGETS(Set_AgentLabel, 39, ""), *MCATGETS(Set_AgentLabel, 39, ""),
NULL); NULL);
widget = XtCreateManagedWidget("search_history", xmPushButtonGadgetClass, widget = XtCreateManagedWidget("search_history", xmPushButtonGadgetClass,
@ -614,9 +614,9 @@ LibraryAgent::create_ui()
XtAddCallback(widget, XmNactivateCallback, search_historyCB, 0); XtAddCallback(widget, XmNactivateCallback, search_historyCB, 0);
XtVaSetValues(widget, XtVaSetValues(widget,
XmNlabelString, XmNlabelString,
(XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 42, "Search History")), (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 42, "Search History")),
XmNmnemonic, XmNmnemonic,
*CATGETS(Set_AgentLabel, 43, ""), *MCATGETS(Set_AgentLabel, 43, ""),
NULL); NULL);
widget = XtCreateManagedWidget("query", xmPushButtonGadgetClass, widget = XtCreateManagedWidget("query", xmPushButtonGadgetClass,
@ -624,9 +624,9 @@ LibraryAgent::create_ui()
XtAddCallback(widget, XmNactivateCallback, query_editorCB, 0); XtAddCallback(widget, XmNactivateCallback, query_editorCB, 0);
XtVaSetValues(widget, XtVaSetValues(widget,
XmNlabelString, XmNlabelString,
(XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 44, "Query Editor")), (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 44, "Query Editor")),
XmNmnemonic, XmNmnemonic,
*CATGETS(Set_AgentLabel, 45, ""), *MCATGETS(Set_AgentLabel, 45, ""),
NULL); NULL);
widget = XtCreateManagedWidget("scope", xmPushButtonGadgetClass, widget = XtCreateManagedWidget("scope", xmPushButtonGadgetClass,
@ -634,9 +634,9 @@ LibraryAgent::create_ui()
XtAddCallback(widget, XmNactivateCallback, scope_editorCB, 0); XtAddCallback(widget, XmNactivateCallback, scope_editorCB, 0);
XtVaSetValues(widget, XtVaSetValues(widget,
XmNlabelString, XmNlabelString,
(XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 46, "Scope Editor")), (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 46, "Scope Editor")),
XmNmnemonic, XmNmnemonic,
*CATGETS(Set_AgentLabel, 47, ""), *MCATGETS(Set_AgentLabel, 47, ""),
NULL); NULL);
Widget helpM = XmCreatePulldownMenu(menu_bar, (char*)"help_menu", 0, 0); Widget helpM = XmCreatePulldownMenu(menu_bar, (char*)"help_menu", 0, 0);
@ -648,9 +648,9 @@ LibraryAgent::create_ui()
menu_bar, args, n); menu_bar, args, n);
XtVaSetValues(widget, XtVaSetValues(widget,
XmNlabelString, XmNlabelString,
(XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 48, "Help")), (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 48, "Help")),
XmNmnemonic, XmNmnemonic,
*CATGETS(Set_AgentLabel, 49, ""), *MCATGETS(Set_AgentLabel, 49, ""),
NULL); NULL);
help_agent().add_help_cb(widget); help_agent().add_help_cb(widget);
n = 0; n = 0;
@ -663,9 +663,9 @@ LibraryAgent::create_ui()
helpM, 0, 0); helpM, 0, 0);
XtVaSetValues(widget, XtVaSetValues(widget,
XmNlabelString, XmNlabelString,
(XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 50, "On Item...")), (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 50, "On Item...")),
XmNmnemonic, XmNmnemonic,
*CATGETS(Set_AgentLabel, 51, ""), *MCATGETS(Set_AgentLabel, 51, ""),
NULL); NULL);
#endif #endif
@ -677,9 +677,9 @@ LibraryAgent::create_ui()
helpM, 0, 0); helpM, 0, 0);
XtVaSetValues(on_overview, XtVaSetValues(on_overview,
XmNlabelString, XmNlabelString,
(XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 257, "Overview")), (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 257, "Overview")),
XmNmnemonic, XmNmnemonic,
*CATGETS(Set_AgentLabel, 258, ""), *MCATGETS(Set_AgentLabel, 258, ""),
NULL); NULL);
XtCreateManagedWidget("sep", xmSeparatorGadgetClass, XtCreateManagedWidget("sep", xmSeparatorGadgetClass,
@ -688,26 +688,26 @@ LibraryAgent::create_ui()
helpM, 0, 0); helpM, 0, 0);
XtVaSetValues(on_tasks, XtVaSetValues(on_tasks,
XmNlabelString, XmNlabelString,
(XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 249, "Tasks")), (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 249, "Tasks")),
XmNmnemonic, XmNmnemonic,
*CATGETS(Set_AgentLabel, 250, ""), *MCATGETS(Set_AgentLabel, 250, ""),
NULL); NULL);
on_reference = XtCreateManagedWidget("on_reference", xmPushButtonGadgetClass, on_reference = XtCreateManagedWidget("on_reference", xmPushButtonGadgetClass,
helpM, 0, 0); helpM, 0, 0);
XtVaSetValues(on_reference, XtVaSetValues(on_reference,
XmNlabelString, XmNlabelString,
(XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 251, "Reference")), (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 251, "Reference")),
XmNmnemonic, XmNmnemonic,
*CATGETS(Set_AgentLabel, 252, ""), *MCATGETS(Set_AgentLabel, 252, ""),
NULL); NULL);
on_item = XtCreateManagedWidget("on_item", xmPushButtonGadgetClass, on_item = XtCreateManagedWidget("on_item", xmPushButtonGadgetClass,
helpM, 0, 0); helpM, 0, 0);
XtVaSetValues(on_item, XtVaSetValues(on_item,
XmNlabelString, XmNlabelString,
(XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 50, "On Item...")), (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 50, "On Item...")),
XmNmnemonic, XmNmnemonic,
*CATGETS(Set_AgentLabel, 51, ""), *MCATGETS(Set_AgentLabel, 51, ""),
NULL); NULL);
XtCreateManagedWidget("sep", xmSeparatorGadgetClass, XtCreateManagedWidget("sep", xmSeparatorGadgetClass,
helpM, 0, 0); helpM, 0, 0);
@ -715,9 +715,9 @@ LibraryAgent::create_ui()
helpM, 0, 0); helpM, 0, 0);
XtVaSetValues(on_help, XtVaSetValues(on_help,
XmNlabelString, XmNlabelString,
(XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 253, "Using Help")), (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 253, "Using Help")),
XmNmnemonic, XmNmnemonic,
*CATGETS(Set_AgentLabel, 254, ""), *MCATGETS(Set_AgentLabel, 254, ""),
NULL); NULL);
XtCreateManagedWidget("sep", xmSeparatorGadgetClass, XtCreateManagedWidget("sep", xmSeparatorGadgetClass,
helpM, 0, 0); helpM, 0, 0);
@ -725,9 +725,9 @@ LibraryAgent::create_ui()
helpM, 0, 0); helpM, 0, 0);
XtVaSetValues(on_about, XtVaSetValues(on_about,
XmNlabelString, XmNlabelString,
(XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 255, "About Information Manager")), (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 255, "About Information Manager")),
XmNmnemonic, XmNmnemonic,
*CATGETS(Set_AgentLabel, 256, ""), *MCATGETS(Set_AgentLabel, 256, ""),
NULL); NULL);
// WXmPushButtonGadget tmp_pbg(tmp); // WXmPushButtonGadget tmp_pbg(tmp);
@ -750,7 +750,7 @@ LibraryAgent::create_ui()
tool_bar, 0, 0); tool_bar, 0, 0);
XtAddCallback(f_view2, XmNactivateCallback, display_nodeCB, this); XtAddCallback(f_view2, XmNactivateCallback, display_nodeCB, this);
help_text = new UAS_String( help_text = new UAS_String(
CATGETS(Set_AgentQHelp, 52, "Display selected section")); MCATGETS(Set_AgentQHelp, 52, "Display selected section"));
add_quick_help(f_view2, (char*)*help_text); add_quick_help(f_view2, (char*)*help_text);
f_help_text.insert_item(help_text); f_help_text.insert_item(help_text);
help_agent().add_help_cb(f_view2); help_agent().add_help_cb(f_view2);
@ -762,7 +762,7 @@ LibraryAgent::create_ui()
f_detach2 = XtCreateManagedWidget("detach", xmPushButtonWidgetClass, f_detach2 = XtCreateManagedWidget("detach", xmPushButtonWidgetClass,
tool_bar, 0, 0); tool_bar, 0, 0);
XtAddCallback(f_detach2, XmNactivateCallback, detach_subtreeCB, this); XtAddCallback(f_detach2, XmNactivateCallback, detach_subtreeCB, this);
help_text = new UAS_String(CATGETS(Set_AgentQHelp, 53, "Display selected section in a separate Book List")); help_text = new UAS_String(MCATGETS(Set_AgentQHelp, 53, "Display selected section in a separate Book List"));
add_quick_help(f_detach2, (char*)*help_text); add_quick_help(f_detach2, (char*)*help_text);
f_help_text.insert_item(help_text); f_help_text.insert_item(help_text);
#endif #endif
@ -770,7 +770,7 @@ LibraryAgent::create_ui()
f_print2 = XtCreateManagedWidget("print", xmPushButtonWidgetClass, f_print2 = XtCreateManagedWidget("print", xmPushButtonWidgetClass,
tool_bar, 0, 0); tool_bar, 0, 0);
XtAddCallback(f_print2, XmNactivateCallback, printCB, this); XtAddCallback(f_print2, XmNactivateCallback, printCB, this);
help_text = new UAS_String(CATGETS(Set_AgentQHelp, 54, help_text = new UAS_String(MCATGETS(Set_AgentQHelp, 54,
"Print selected section")); "Print selected section"));
add_quick_help(f_print2, (char*)*help_text); add_quick_help(f_print2, (char*)*help_text);
f_help_text.insert_item(help_text); f_help_text.insert_item(help_text);
@ -778,7 +778,7 @@ LibraryAgent::create_ui()
widget = XtCreateManagedWidget("add", xmPushButtonWidgetClass, tool_bar, 0, 0); widget = XtCreateManagedWidget("add", xmPushButtonWidgetClass, tool_bar, 0, 0);
XtAddCallback(widget, XmNactivateCallback, add_libraryCB, this); XtAddCallback(widget, XmNactivateCallback, add_libraryCB, this);
help_text = new UAS_String(CATGETS(Set_AgentQHelp, 55, help_text = new UAS_String(MCATGETS(Set_AgentQHelp, 55,
"Open an additional information library")); "Open an additional information library"));
add_quick_help(widget, (char*)*help_text); add_quick_help(widget, (char*)*help_text);
f_help_text.insert_item(help_text); f_help_text.insert_item(help_text);
@ -787,7 +787,7 @@ LibraryAgent::create_ui()
f_remove2 = XtCreateManagedWidget("remove", xmPushButtonWidgetClass, f_remove2 = XtCreateManagedWidget("remove", xmPushButtonWidgetClass,
tool_bar, 0, 0); tool_bar, 0, 0);
XtAddCallback(f_remove2, XmNactivateCallback, remove_libraryCB, this); XtAddCallback(f_remove2, XmNactivateCallback, remove_libraryCB, this);
help_text = new UAS_String(CATGETS(Set_AgentQHelp, 56, help_text = new UAS_String(MCATGETS(Set_AgentQHelp, 56,
"Close selected information library")); "Close selected information library"));
add_quick_help(f_remove2, (char*)*help_text); add_quick_help(f_remove2, (char*)*help_text);
f_help_text.insert_item(help_text); f_help_text.insert_item(help_text);
@ -796,7 +796,7 @@ LibraryAgent::create_ui()
widget = XtCreateManagedWidget("query", xmPushButtonWidgetClass, widget = XtCreateManagedWidget("query", xmPushButtonWidgetClass,
tool_bar, 0, 0); tool_bar, 0, 0);
XtAddCallback(widget, XmNactivateCallback, query_editorCB, 0); XtAddCallback(widget, XmNactivateCallback, query_editorCB, 0);
help_text = new UAS_String(CATGETS(Set_AgentQHelp, 57, help_text = new UAS_String(MCATGETS(Set_AgentQHelp, 57,
"Perform a search using the Query Editor")); "Perform a search using the Query Editor"));
add_quick_help(widget, (char*)*help_text); add_quick_help(widget, (char*)*help_text);
f_help_text.insert_item(help_text); f_help_text.insert_item(help_text);
@ -806,7 +806,7 @@ LibraryAgent::create_ui()
widget = XtCreateManagedWidget("marks_list", xmPushButtonWidgetClass, widget = XtCreateManagedWidget("marks_list", xmPushButtonWidgetClass,
tool_bar, 0, 0); tool_bar, 0, 0);
XtAddCallback(widget, XmNactivateCallback, mark_listCB, 0); XtAddCallback(widget, XmNactivateCallback, mark_listCB, 0);
help_text = new UAS_String(CATGETS(Set_AgentQHelp, 58, help_text = new UAS_String(MCATGETS(Set_AgentQHelp, 58,
"Display the bookmarks and notes list")); "Display the bookmarks and notes list"));
add_quick_help(widget, (char*)*help_text); add_quick_help(widget, (char*)*help_text);
f_help_text.insert_item(help_text); f_help_text.insert_item(help_text);
@ -862,7 +862,7 @@ LibraryAgent::create_ui()
XtSetArg(args[n], XmNbackground, bg); n++; XtSetArg(args[n], XmNbackground, bg); n++;
f_status_text = XtCreateManagedWidget("text", xmTextFieldWidgetClass, f_status_text = XtCreateManagedWidget("text", xmTextFieldWidgetClass,
message, args, n); message, args, n);
string = CATGETS(Set_LibraryAgent, 63, "Welcome to Dtinfo!"); string = MCATGETS(Set_LibraryAgent, 63, "Welcome to Dtinfo!");
XtVaSetValues(f_status_text, XmNvalue, string, NULL); XtVaSetValues(f_status_text, XmNvalue, string, NULL);
// Search area // Search area
@ -873,9 +873,9 @@ LibraryAgent::create_ui()
XtManageChild(widget = XmCreateOptionMenu(search_area, (char*)"scope", args, n)); XtManageChild(widget = XmCreateOptionMenu(search_area, (char*)"scope", args, n));
XtVaSetValues(widget, XtVaSetValues(widget,
XmNlabelString, XmNlabelString,
(XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 59, "Search:")), (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 59, "Search:")),
NULL); NULL);
help_text = new UAS_String(CATGETS(Set_AgentQHelp, 60, help_text = new UAS_String(MCATGETS(Set_AgentQHelp, 60,
"Specify search scope")); "Specify search scope"));
add_quick_help(widget, (char*)*help_text); add_quick_help(widget, (char*)*help_text);
f_help_text.insert_item(help_text); f_help_text.insert_item(help_text);
@ -911,9 +911,9 @@ LibraryAgent::create_ui()
XtAddCallback(widget, XmNactivateCallback, scope_editorCB, 0); XtAddCallback(widget, XmNactivateCallback, scope_editorCB, 0);
XtVaSetValues(widget, XtVaSetValues(widget,
XmNlabelString, XmNlabelString,
(XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 61, "Scope Editor")), (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 61, "Scope Editor")),
NULL); NULL);
help_text = new UAS_String(CATGETS(Set_AgentQHelp, 62, help_text = new UAS_String(MCATGETS(Set_AgentQHelp, 62,
"Specify search scope using the Scope Editor")); "Specify search scope using the Scope Editor"));
add_quick_help(widget, (char*)*help_text); add_quick_help(widget, (char*)*help_text);
f_help_text.insert_item(help_text); f_help_text.insert_item(help_text);
@ -1066,11 +1066,11 @@ LibraryAgent::search_help (Widget, XtPointer client_data,
if (help_text == NULL) { if (help_text == NULL) {
UAS_Pointer<UAS_String> str; UAS_Pointer<UAS_String> str;
str = new UAS_String(CATGETS(Set_AgentQHelp, 64, "Search %s")); str = new UAS_String(MCATGETS(Set_AgentQHelp, 64, "Search %s"));
help_text = (char*)*str; help_text = (char*)*str;
agent->f_help_text.insert_item(str); agent->f_help_text.insert_item(str);
str = new UAS_String(CATGETS(Set_LibraryAgent, 65, "Current Section")); str = new UAS_String(MCATGETS(Set_LibraryAgent, 65, "Current Section"));
default_scope = (char*)*str; default_scope = (char*)*str;
agent->f_help_text.insert_item(str); agent->f_help_text.insert_item(str);
} }
@ -1169,7 +1169,7 @@ LibraryAgent::add_library(char* newLib, Widget parent)
((newLib != NULL) && ( *newLib == '\0' )) ) ((newLib != NULL) && ( *newLib == '\0' )) )
{ {
message_mgr().error_dialog( message_mgr().error_dialog(
(char*)UAS_String(CATGETS( Set_AddLibraryAgent, 6, (char*)UAS_String(MCATGETS( Set_AddLibraryAgent, 6,
"No Infolib specified." )), parent); "No Infolib specified." )), parent);
return (sts = BAD_ARG_FORMAT); return (sts = BAD_ARG_FORMAT);
} }
@ -1210,7 +1210,7 @@ LibraryAgent::add_library(char* newLib, Widget parent)
else else
{ {
message_mgr().error_dialog ( message_mgr().error_dialog (
(char*)UAS_String(CATGETS(Set_AddLibraryAgent, 5, (char*)UAS_String(MCATGETS(Set_AddLibraryAgent, 5,
"Infolib specification format error.")), "Infolib specification format error.")),
parent); parent);
sts = BAD_ARG_FORMAT ; sts = BAD_ARG_FORMAT ;
@ -1219,7 +1219,7 @@ LibraryAgent::add_library(char* newLib, Widget parent)
} }
else { else {
message_mgr().error_dialog ( message_mgr().error_dialog (
(char*)UAS_String(CATGETS(Set_AddLibraryAgent, 2, (char*)UAS_String(MCATGETS(Set_AddLibraryAgent, 2,
"Please enter an absolute path to the infolib.")), "Please enter an absolute path to the infolib.")),
parent); parent);
} }
@ -1231,7 +1231,7 @@ LibraryAgent::add_library(char* newLib, Widget parent)
// if returned to reach here, error msg probably given by // if returned to reach here, error msg probably given by
// MMDB interface: "Invalid MMDB infolib path: <>" // MMDB interface: "Invalid MMDB infolib path: <>"
message_mgr().error_dialog ( message_mgr().error_dialog (
(char*)UAS_String(CATGETS(Set_AddLibraryAgent, 3, (char*)UAS_String(MCATGETS(Set_AddLibraryAgent, 3,
"Infolib open failed. Check the path specified.")), "Infolib open failed. Check the path specified.")),
parent); parent);
#endif #endif
@ -1246,7 +1246,7 @@ LibraryAgent::add_library(char* newLib, Widget parent)
if( d != (const int)0 ) if( d != (const int)0 )
{ {
message_mgr().error_dialog( message_mgr().error_dialog(
(char*)UAS_String(CATGETS(Set_AddLibraryAgent, 4, (char*)UAS_String(MCATGETS(Set_AddLibraryAgent, 4,
"Infolib creation failed.")), "Infolib creation failed.")),
parent) ; parent) ;
} }

6
cde/programs/dtinfo/dtinfo/src/Agents/ListViewMotif.C
View file

@ -149,9 +149,9 @@ ListView::create_ui_objects()
WXmPushButton help (form, "help", WAutoManage); WXmPushButton help (form, "help", WAutoManage);
XtVaSetValues(close, XmNlabelString, XtVaSetValues(close, XmNlabelString,
(XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 12, "Close")), NULL); (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 12, "Close")), NULL);
XtVaSetValues(help, XmNlabelString, XtVaSetValues(help, XmNlabelString,
(XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 48, "Help")), NULL); (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 48, "Help")), NULL);
// 7/30/93 rtp - bear with this hack, it's a little bogus // 7/30/93 rtp - bear with this hack, it's a little bogus
int help_namelen = strlen(f_name) + strlen("_help") + 1; int help_namelen = strlen(f_name) + strlen("_help") + 1;
@ -163,7 +163,7 @@ ListView::create_ui_objects()
f_activate = WXmPushButton (form, "activate", WAutoManage); f_activate = WXmPushButton (form, "activate", WAutoManage);
XtVaSetValues(f_activate, XmNlabelString, XtVaSetValues(f_activate, XmNlabelString,
(XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 165, "Display")), NULL); (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 165, "Display")), NULL);
// WXmLabelGadget label (form, "label", WAutoManage); // WXmLabelGadget label (form, "label", WAutoManage);
WXmSeparator separator (form, "separator", WAutoManage); WXmSeparator separator (form, "separator", WAutoManage);
// NOTE: Fix WWL to have a scrolled list object! // NOTE: Fix WWL to have a scrolled list object!

12
cde/programs/dtinfo/dtinfo/src/Agents/MapAgentMotif.C
View file

@ -346,7 +346,7 @@ MapAgent::display (UAS_Pointer<UAS_Common> &doc_ptr, bool popup)
if (this_button == NULL) if (this_button == NULL)
{ {
message_mgr(). message_mgr().
error_dialog (CATGETS(Set_Messages, 7, "File a Bug")); error_dialog (MCATGETS(Set_Messages, 7, "File a Bug"));
return; return;
} }
else else
@ -432,7 +432,7 @@ MapAgent::display (UAS_Pointer<UAS_Common> &doc_ptr, bool popup)
// Manage all the children. // Manage all the children.
MapButton::ManageKids(); MapButton::ManageKids();
UAS_String buffer = CATGETS(Set_MapAgent, 2, "Dtinfo: "); UAS_String buffer = MCATGETS(Set_MapAgent, 2, "Dtinfo: ");
buffer = buffer + doc_ptr->title(); buffer = buffer + doc_ptr->title();
f_shell->Title ((char*)buffer); f_shell->Title ((char*)buffer);
@ -481,7 +481,7 @@ MapAgent::create_ui()
window_system().register_shell (f_shell); window_system().register_shell (f_shell);
XtVaSetValues(*f_shell, XmNtitle, XtVaSetValues(*f_shell, XmNtitle,
CATGETS(Set_MapAgent, 1, "Dtinfo: Local Map"), NULL); MCATGETS(Set_MapAgent, 1, "Dtinfo: Local Map"), NULL);
WindowGeometry wg = pref_mgr().get_geometry (PrefMgr::MapGeometry); WindowGeometry wg = pref_mgr().get_geometry (PrefMgr::MapGeometry);
f_shell->Set(WArgList(XmNwidth, wg.width, f_shell->Set(WArgList(XmNwidth, wg.width,
XmNheight, wg.height, XmNheight, wg.height,
@ -496,9 +496,9 @@ MapAgent::create_ui()
help_agent().add_activate_help (help, (char*)"map_help"); help_agent().add_activate_help (help, (char*)"map_help");
XtVaSetValues(close, XmNlabelString, XtVaSetValues(close, XmNlabelString,
(XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 12, "Close")), NULL); (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 12, "Close")), NULL);
XtVaSetValues(help, XmNlabelString, XtVaSetValues(help, XmNlabelString,
(XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 48, "Help")), NULL); (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 48, "Help")), NULL);
WXmPanedWindow pane (rootform, "pane"); WXmPanedWindow pane (rootform, "pane");
WXmForm topform (pane, "topform"); WXmForm topform (pane, "topform");
@ -512,7 +512,7 @@ MapAgent::create_ui()
f_lock = new WXmToggleButton (topform, "lock", WAutoManage); f_lock = new WXmToggleButton (topform, "lock", WAutoManage);
XtVaSetValues(*f_lock, XmNlabelString, XtVaSetValues(*f_lock, XmNlabelString,
(XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 196, "Auto Update")), (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 196, "Auto Update")),
XmNindicatorSize, 15, NULL); XmNindicatorSize, 15, NULL);
bool lock_status = pref_mgr().get_boolean (PrefMgr::MapAutoUpdate); bool lock_status = pref_mgr().get_boolean (PrefMgr::MapAutoUpdate);
f_lock->Set(lock_status); f_lock->Set(lock_status);

2
cde/programs/dtinfo/dtinfo/src/Agents/MarkChooser.C
View file

@ -135,7 +135,7 @@ MarkChooser::create_ui (Widget parent,
XtVaSetValues(f_form, XmNdialogTitle, (XmString)XmStringLocalized((char*)title_key), NULL); XtVaSetValues(f_form, XmNdialogTitle, (XmString)XmStringLocalized((char*)title_key), NULL);
XtVaSetValues(f_ok, XmNlabelString, (XmString)XmStringLocalized((char*)ok_key), NULL); XtVaSetValues(f_ok, XmNlabelString, (XmString)XmStringLocalized((char*)ok_key), NULL);
mtfstring = CATGETS(Set_AgentLabel, 162, "Cancel"); mtfstring = MCATGETS(Set_AgentLabel, 162, "Cancel");
XtVaSetValues(cancel, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(cancel, XmNlabelString, (XmString)mtfstring, NULL);
SET_CALLBACK (f_list,SingleSelection,select); SET_CALLBACK (f_list,SingleSelection,select);

12
cde/programs/dtinfo/dtinfo/src/Agents/MarkIconMotif.C
View file

@ -203,8 +203,8 @@ MarkIcon::double_click(XEvent *event)
g_timeout = NULL; g_timeout = NULL;
} }
UAS_String title = CATGETS(Set_MarkChooser, 2, "Dtinfo: Edit Mark"); UAS_String title = MCATGETS(Set_MarkChooser, 2, "Dtinfo: Edit Mark");
UAS_String btitle = CATGETS(Set_AgentLabel, 16, "Edit"); UAS_String btitle = MCATGETS(Set_AgentLabel, 16, "Edit");
MarkChooser chooser (f_chooser_parent, f_mark_list, MarkChooser chooser (f_chooser_parent, f_mark_list,
(char*)title, (char*)btitle); (char*)title, (char*)btitle);
@ -511,8 +511,8 @@ MarkIcon::activate (WCallback *wcb)
delete g_timeout; delete g_timeout;
g_timeout = NULL; g_timeout = NULL;
UAS_String title = CATGETS(Set_MarkChooser, 2, "Dtinfo: Edit Mark"); UAS_String title = MCATGETS(Set_MarkChooser, 2, "Dtinfo: Edit Mark");
UAS_String btitle = CATGETS(Set_AgentLabel, 16, "Edit"); UAS_String btitle = MCATGETS(Set_AgentLabel, 16, "Edit");
MarkChooser chooser (f_chooser_parent, f_mark_list, MarkChooser chooser (f_chooser_parent, f_mark_list,
(char*)title, (char*)btitle); (char*)title, (char*)btitle);
@ -537,8 +537,8 @@ MarkIcon::select_mark_timeout()
// WTimeOut will destruct itself, do not delete g_timeout here // WTimeOut will destruct itself, do not delete g_timeout here
g_timeout = NULL; g_timeout = NULL;
UAS_String title = CATGETS(Set_MarkChooser, 1, "Dtinfo: Select Mark"); UAS_String title = MCATGETS(Set_MarkChooser, 1, "Dtinfo: Select Mark");
UAS_String btitle = CATGETS(Set_AgentLabel, 161, "Ok"); UAS_String btitle = MCATGETS(Set_AgentLabel, 161, "Ok");
MarkChooser chooser (f_chooser_parent, f_mark_list, MarkChooser chooser (f_chooser_parent, f_mark_list,
(char*)title, (char*)btitle); (char*)title, (char*)btitle);

12
cde/programs/dtinfo/dtinfo/src/Agents/MarkListView.C
View file

@ -134,7 +134,7 @@ MarkListView::create_ui()
f_shell = WTopLevelShell (window_system().toplevel(), WPopup, "mark_list"); f_shell = WTopLevelShell (window_system().toplevel(), WPopup, "mark_list");
window_system().register_shell(&f_shell); window_system().register_shell(&f_shell);
string = CATGETS(Set_MarkList, 1, "Dtinfo: User Marks List"); string = MCATGETS(Set_MarkList, 1, "Dtinfo: User Marks List");
XtVaSetValues((Widget)f_shell, XmNtitle, string, NULL); XtVaSetValues((Widget)f_shell, XmNtitle, string, NULL);
DECL (WXmForm, form, f_shell, "form"); DECL (WXmForm, form, f_shell, "form");
@ -148,15 +148,15 @@ MarkListView::create_ui()
f_list = WXmList (list); f_list = WXmList (list);
f_list.Manage(); f_list.Manage();
mtfstring = CATGETS(Set_AgentLabel, 165, "Display"); mtfstring = MCATGETS(Set_AgentLabel, 165, "Display");
XtVaSetValues(f_view, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(f_view, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 16, "Edit"); mtfstring = MCATGETS(Set_AgentLabel, 16, "Edit");
XtVaSetValues(f_edit, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(f_edit, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 183, "Delete"); mtfstring = MCATGETS(Set_AgentLabel, 183, "Delete");
XtVaSetValues(f_delete, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(f_delete, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 12, "Close"); mtfstring = MCATGETS(Set_AgentLabel, 12, "Close");
XtVaSetValues(close, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(close, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 48, "Help"); mtfstring = MCATGETS(Set_AgentLabel, 48, "Help");
XtVaSetValues(help, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(help, XmNlabelString, (XmString)mtfstring, NULL);
SET_CALLBACK (f_list,SingleSelection,select); SET_CALLBACK (f_list,SingleSelection,select);

36
cde/programs/dtinfo/dtinfo/src/Agents/MessageAgentMotif.C
View file

@ -210,9 +210,9 @@ MessageAgent::displayMessage (char *message_text)
XmStringLocalized mtfstring; XmStringLocalized mtfstring;
// Set labels on buttons // Set labels on buttons
mtfstring = CATGETS(Set_AgentLabel, 161, "OK"); mtfstring = MCATGETS(Set_AgentLabel, 161, "OK");
XtVaSetValues((Widget)f_dialog->OkPB(), XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues((Widget)f_dialog->OkPB(), XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 162, "Cancel"); mtfstring = MCATGETS(Set_AgentLabel, 162, "Cancel");
XtVaSetValues((Widget)f_dialog->CancelPB(), XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues((Widget)f_dialog->CancelPB(), XmNlabelString, (XmString)mtfstring, NULL);
// Unmanage the cancel and help buttons // Unmanage the cancel and help buttons
@ -256,7 +256,7 @@ MessageAgent::displayError (char *message_text, Widget parent)
// Set the window title // Set the window title
WXmDialogShell *shell = (WXmDialogShell *)XtParent(*f_dialog); WXmDialogShell *shell = (WXmDialogShell *)XtParent(*f_dialog);
String string = CATGETS(Set_MessageAgent, 1, "Dtinfo: Error"); String string = MCATGETS(Set_MessageAgent, 1, "Dtinfo: Error");
XtVaSetValues((Widget)shell, XmNtitle, string, NULL); XtVaSetValues((Widget)shell, XmNtitle, string, NULL);
// Set the dialog type // Set the dialog type
@ -295,7 +295,7 @@ MessageAgent::displayWarning (char *message_text, Widget parent)
// Set the window title // Set the window title
WXmDialogShell *shell = (WXmDialogShell *)XtParent(*f_dialog); WXmDialogShell *shell = (WXmDialogShell *)XtParent(*f_dialog);
String string = CATGETS(Set_MessageAgent, 2, "Dtinfo: Warning"); String string = MCATGETS(Set_MessageAgent, 2, "Dtinfo: Warning");
XtVaSetValues((Widget)shell, XmNtitle, string, NULL); XtVaSetValues((Widget)shell, XmNtitle, string, NULL);
// Set the dialog type // Set the dialog type
@ -334,7 +334,7 @@ MessageAgent::displayInformation (char *message_text, Widget parent)
// Set the window title // Set the window title
WXmDialogShell *shell = (WXmDialogShell *)XtParent(*f_dialog); WXmDialogShell *shell = (WXmDialogShell *)XtParent(*f_dialog);
String string = CATGETS(Set_MessageAgent, 3, "Dtinfo: Information"); String string = MCATGETS(Set_MessageAgent, 3, "Dtinfo: Information");
XtVaSetValues((Widget)shell, XmNtitle, string, NULL); XtVaSetValues((Widget)shell, XmNtitle, string, NULL);
// Set the dialog type // Set the dialog type
@ -378,14 +378,14 @@ MessageAgent::displayProgress (char *message_text, Widget parent) {
#if 0 #if 0
f_dialog->ResizePolicy(XmRESIZE_NONE); f_dialog->ResizePolicy(XmRESIZE_NONE);
#endif #endif
String string = CATGETS(Set_MessageAgent, 4, "Dtinfo: Progress"); String string = MCATGETS(Set_MessageAgent, 4, "Dtinfo: Progress");
XtVaSetValues((Widget)shell, XmNtitle, string, NULL); XtVaSetValues((Widget)shell, XmNtitle, string, NULL);
f_dialog->DialogType (XmDIALOG_INFORMATION); f_dialog->DialogType (XmDIALOG_INFORMATION);
f_dialog->MessageAlignment (XmALIGNMENT_BEGINNING); f_dialog->MessageAlignment (XmALIGNMENT_BEGINNING);
// Set labels on buttons // Set labels on buttons
XmStringLocalized label_str = CATGETS(Set_AgentLabel, 162, "Cancel"); XmStringLocalized label_str = MCATGETS(Set_AgentLabel, 162, "Cancel");
XtVaSetValues((Widget)f_dialog->CancelPB(), XtVaSetValues((Widget)f_dialog->CancelPB(),
XmNlabelString, (XmString)label_str, NULL); XmNlabelString, (XmString)label_str, NULL);
@ -450,7 +450,7 @@ MessageAgent::displayQuestion (char *message_text, Widget parent)
// Set the window title // Set the window title
WXmDialogShell *shell = (WXmDialogShell *)XtParent(*f_dialog); WXmDialogShell *shell = (WXmDialogShell *)XtParent(*f_dialog);
String string = CATGETS(Set_MessageAgent, 6, "Dtinfo: Question"); String string = MCATGETS(Set_MessageAgent, 6, "Dtinfo: Question");
XtVaSetValues((Widget)shell, XmNtitle, string, NULL); XtVaSetValues((Widget)shell, XmNtitle, string, NULL);
// Set the dialog type // Set the dialog type
@ -460,9 +460,9 @@ MessageAgent::displayQuestion (char *message_text, Widget parent)
f_dialog->MessageAlignment (XmALIGNMENT_CENTER); f_dialog->MessageAlignment (XmALIGNMENT_CENTER);
// Set labels on buttons // Set labels on buttons
mtfstring = CATGETS(Set_AgentLabel, 244, "Yes"); mtfstring = MCATGETS(Set_AgentLabel, 244, "Yes");
XtVaSetValues((Widget)f_dialog->OkPB(), XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues((Widget)f_dialog->OkPB(), XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 245, "No"); mtfstring = MCATGETS(Set_AgentLabel, 245, "No");
XtVaSetValues((Widget)f_dialog->CancelPB(), XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues((Widget)f_dialog->CancelPB(), XmNlabelString, (XmString)mtfstring, NULL);
// Manage the cancel and help buttons // Manage the cancel and help buttons
@ -504,7 +504,7 @@ MessageAgent::displayQuit (char *message_text, Widget parent)
// Set the window title // Set the window title
WXmDialogShell *shell = (WXmDialogShell *)XtParent(*f_dialog); WXmDialogShell *shell = (WXmDialogShell *)XtParent(*f_dialog);
String string = CATGETS(Set_MessageAgent, 5, "Dtinfo: Confirm Quit"); String string = MCATGETS(Set_MessageAgent, 5, "Dtinfo: Confirm Quit");
XtVaSetValues((Widget)shell, XmNtitle, string, XtVaSetValues((Widget)shell, XmNtitle, string,
XmNminWidth, 200, NULL); XmNminWidth, 200, NULL);
@ -518,9 +518,9 @@ MessageAgent::displayQuit (char *message_text, Widget parent)
f_exit_flag = True; f_exit_flag = True;
// Set labels on buttons // Set labels on buttons
mtfstring = CATGETS(Set_AgentLabel, 244, "Yes"); mtfstring = MCATGETS(Set_AgentLabel, 244, "Yes");
XtVaSetValues((Widget)f_dialog->OkPB(), XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues((Widget)f_dialog->OkPB(), XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 245, "No"); mtfstring = MCATGETS(Set_AgentLabel, 245, "No");
XtVaSetValues((Widget)f_dialog->CancelPB(), XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues((Widget)f_dialog->CancelPB(), XmNlabelString, (XmString)mtfstring, NULL);
// Manage the cancel and help buttons // Manage the cancel and help buttons
@ -607,9 +607,9 @@ MessageAgent::get_integer (const char *message, const char* title,
XmStringLocalized mtfstring; XmStringLocalized mtfstring;
mtfstring = CATGETS(Set_AgentLabel, 161, "OK"); mtfstring = MCATGETS(Set_AgentLabel, 161, "OK");
XtVaSetValues((Widget)f_dialog->OkPB(), XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues((Widget)f_dialog->OkPB(), XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 162, "Cancel"); mtfstring = MCATGETS(Set_AgentLabel, 162, "Cancel");
XtVaSetValues((Widget)f_dialog->CancelPB(), XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues((Widget)f_dialog->CancelPB(), XmNlabelString, (XmString)mtfstring, NULL);
snprintf (buffer, sizeof(buffer), "%d", default_value); snprintf (buffer, sizeof(buffer), "%d", default_value);
@ -712,7 +712,7 @@ MessageAgent::get_string (const char *msg, const char* title,
if (title == NULL) if (title == NULL)
title = (char*)UAS_String( title = (char*)UAS_String(
CATGETS(Set_MessageAgent, 7, "Dtinfo: File a Bug")); MCATGETS(Set_MessageAgent, 7, "Dtinfo: File a Bug"));
static char buffer[256]; static char buffer[256];
@ -729,9 +729,9 @@ MessageAgent::get_string (const char *msg, const char* title,
XmStringLocalized mtfstring; XmStringLocalized mtfstring;
mtfstring = CATGETS(Set_AgentLabel, 161, "OK"); mtfstring = MCATGETS(Set_AgentLabel, 161, "OK");
XtVaSetValues((Widget)f_dialog->OkPB(), XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues((Widget)f_dialog->OkPB(), XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 162, "Cancel"); mtfstring = MCATGETS(Set_AgentLabel, 162, "Cancel");
XtVaSetValues((Widget)f_dialog->CancelPB(), XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues((Widget)f_dialog->CancelPB(), XmNlabelString, (XmString)mtfstring, NULL);
if (default_value) if (default_value)

12
cde/programs/dtinfo/dtinfo/src/Agents/NodeHistoryAgentMotif.C
View file

@ -128,7 +128,7 @@ NodeHistoryAgent::create_ui()
f_shell = WTopLevelShell (window_system().toplevel(), WPopup, "node_hist"); f_shell = WTopLevelShell (window_system().toplevel(), WPopup, "node_hist");
window_system().register_shell (&f_shell); window_system().register_shell (&f_shell);
string = CATGETS(Set_NodeHistoryAgent, 1, "Dtinfo: Section History"); string = MCATGETS(Set_NodeHistoryAgent, 1, "Dtinfo: Section History");
XtVaSetValues((Widget)f_shell, XmNtitle, string, NULL); XtVaSetValues((Widget)f_shell, XmNtitle, string, NULL);
DECL (WXmForm, form, f_shell, "form"); DECL (WXmForm, form, f_shell, "form");
@ -137,20 +137,20 @@ NodeHistoryAgent::create_ui()
DECLM (WXmPushButton, help, form, "help"); DECLM (WXmPushButton, help, form, "help");
DECLM (WXmSeparator, sep, form, "separator"); DECLM (WXmSeparator, sep, form, "separator");
mtfstring = CATGETS(Set_AgentLabel, 165, "Display"); mtfstring = MCATGETS(Set_AgentLabel, 165, "Display");
XtVaSetValues(f_display, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(f_display, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 12, "Close"); mtfstring = MCATGETS(Set_AgentLabel, 12, "Close");
XtVaSetValues(close, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(close, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 48, "Help"); mtfstring = MCATGETS(Set_AgentLabel, 48, "Help");
XtVaSetValues(help, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(help, XmNlabelString, (XmString)mtfstring, NULL);
// set up column labels (Book, Section) // set up column labels (Book, Section)
WXmLabel booklabel (form, "book", WAutoManage); WXmLabel booklabel (form, "book", WAutoManage);
WXmLabel sectionlabel (form, "section", WAutoManage); WXmLabel sectionlabel (form, "section", WAutoManage);
mtfstring = CATGETS(Set_AgentLabel, 184, "Book"); mtfstring = MCATGETS(Set_AgentLabel, 184, "Book");
XtVaSetValues(booklabel, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(booklabel, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 185, "Section"); mtfstring = MCATGETS(Set_AgentLabel, 185, "Section");
XtVaSetValues(sectionlabel, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(sectionlabel, XmNlabelString, (XmString)mtfstring, NULL);
Widget scrolled_list = XmCreateScrolledList (form, (char*)"list", NULL, 0); Widget scrolled_list = XmCreateScrolledList (form, (char*)"list", NULL, 0);

6
cde/programs/dtinfo/dtinfo/src/Agents/NodeListAgentMotif.C
View file

@ -159,11 +159,11 @@ NodeListAgent::create_base_window (char *name)
f_help = WXmPushButton (*f_form, "help", AM); f_help = WXmPushButton (*f_form, "help", AM);
WXmPushButton closeb (*f_form, "close", AM); WXmPushButton closeb (*f_form, "close", AM);
mtfstring = CATGETS(Set_AgentLabel, 165, "Display"); mtfstring = MCATGETS(Set_AgentLabel, 165, "Display");
XtVaSetValues((Widget)f_display, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues((Widget)f_display, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 12, "Close"); mtfstring = MCATGETS(Set_AgentLabel, 12, "Close");
XtVaSetValues((Widget)closeb, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues((Widget)closeb, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 48, "Help"); mtfstring = MCATGETS(Set_AgentLabel, 48, "Help");
XtVaSetValues((Widget)f_help, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues((Widget)f_help, XmNlabelString, (XmString)mtfstring, NULL);
WXmSeparator separator (*f_form, "separator", AM); WXmSeparator separator (*f_form, "separator", AM);

294
cde/programs/dtinfo/dtinfo/src/Agents/NodeWindowAgentMotif.C
View file

@ -410,14 +410,14 @@ NodeWindowAgent::exit_cb()
{ {
bool resp; bool resp;
resp = message_mgr().question_dialog ( resp = message_mgr().question_dialog (
(char*)UAS_String(CATGETS(Set_Messages, 2, (char*)UAS_String(MCATGETS(Set_Messages, 2,
"Do you want to abandon your changes?")), (Widget)f_shell); "Do you want to abandon your changes?")), (Widget)f_shell);
if (! resp) if (! resp)
return; return;
} }
message_mgr().quit_dialog ( message_mgr().quit_dialog (
(char*)UAS_String(CATGETS(Set_Messages, 6, (char*)UAS_String(MCATGETS(Set_Messages, 6,
"Do you really want to quit Dtinfo?")), (Widget)f_shell); "Do you really want to quit Dtinfo?")), (Widget)f_shell);
} }
@ -511,10 +511,10 @@ NodeWindowAgent::popup_menu(XButtonPressedEvent* event)
const char *book_name = (char *) bn; const char *book_name = (char *) bn;
if (book_name != NULL && *book_name != '\0') if (book_name != NULL && *book_name != '\0')
snprintf (preview_buffer, sizeof(preview_buffer), snprintf (preview_buffer, sizeof(preview_buffer),
CATGETS(Set_Messages, 8, "Link to %s: %s"), book_name, title); MCATGETS(Set_Messages, 8, "Link to %s: %s"), book_name, title);
else else
snprintf (preview_buffer, sizeof(preview_buffer), snprintf (preview_buffer, sizeof(preview_buffer),
CATGETS(Set_Messages, 9, "Link to %s"), title); MCATGETS(Set_Messages, 9, "Link to %s"), title);
WXmLabel lb = WXmLabel(f_preview_label); WXmLabel lb = WXmLabel(f_preview_label);
lb.LabelString(WXmString(title)); lb.LabelString(WXmString(title));
@ -885,14 +885,14 @@ exitCB(Widget, XtPointer client_data, XtPointer)
{ {
bool resp; bool resp;
resp = message_mgr().question_dialog ( resp = message_mgr().question_dialog (
(char*)UAS_String(CATGETS(Set_Messages, 2, (char*)UAS_String(MCATGETS(Set_Messages, 2,
"Do you want to abandon your changes?"))); "Do you want to abandon your changes?")));
if (! resp) if (! resp)
return; return;
} }
message_mgr().quit_dialog ( message_mgr().quit_dialog (
(char*)UAS_String(CATGETS(Set_Messages, 6, (char*)UAS_String(MCATGETS(Set_Messages, 6,
"Do you really want to quit Dtinfo?"))); "Do you really want to quit Dtinfo?")));
#endif #endif
} }
@ -981,7 +981,7 @@ NodeWindowAgent::create_ui()
window_system().register_shell (f_shell); window_system().register_shell (f_shell);
string = CATGETS(Set_NodeWindowAgent, 1, "Dtinfo: Browser"); string = MCATGETS(Set_NodeWindowAgent, 1, "Dtinfo: Browser");
XtVaSetValues((Widget)f_shell, XmNtitle, string, NULL); XtVaSetValues((Widget)f_shell, XmNtitle, string, NULL);
f_wm_delete_callback = f_wm_delete_callback =
@ -1019,15 +1019,15 @@ NodeWindowAgent::create_ui()
help_agent().add_help_cb(widget); help_agent().add_help_cb(widget);
mtfstring = CATGETS(Set_AgentLabel, 62, "Browser"); mtfstring = MCATGETS(Set_AgentLabel, 62, "Browser");
mnemonic = *CATGETS(Set_AgentLabel, 63, ""); mnemonic = *MCATGETS(Set_AgentLabel, 63, "");
XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL);
widget = XtCreateManagedWidget("new", xmPushButtonGadgetClass, fileM, 0, 0); widget = XtCreateManagedWidget("new", xmPushButtonGadgetClass, fileM, 0, 0);
XtAddCallback(widget, XmNactivateCallback, cloneCB, this); XtAddCallback(widget, XmNactivateCallback, cloneCB, this);
mtfstring = CATGETS(Set_AgentLabel, 64, "New Window"); mtfstring = MCATGETS(Set_AgentLabel, 64, "New Window");
mnemonic = *CATGETS(Set_AgentLabel, 65, ""); mnemonic = *MCATGETS(Set_AgentLabel, 65, "");
XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL);
XtCreateManagedWidget("sep1", xmSeparatorGadgetClass, fileM, 0, 0); XtCreateManagedWidget("sep1", xmSeparatorGadgetClass, fileM, 0, 0);
@ -1036,8 +1036,8 @@ NodeWindowAgent::create_ui()
fileM, 0, 0); fileM, 0, 0);
XtAddCallback(f_print_as, XmNactivateCallback, print_asCB, this); XtAddCallback(f_print_as, XmNactivateCallback, print_asCB, this);
mtfstring = CATGETS(Set_AgentLabel, 72, "Print..."); mtfstring = MCATGETS(Set_AgentLabel, 72, "Print...");
mnemonic = *CATGETS(Set_AgentLabel, 71, "P"); mnemonic = *MCATGETS(Set_AgentLabel, 71, "P");
XtVaSetValues(f_print_as, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); XtVaSetValues(f_print_as, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL);
XtCreateManagedWidget("sep2", xmSeparatorGadgetClass, fileM, 0, 0); XtCreateManagedWidget("sep2", xmSeparatorGadgetClass, fileM, 0, 0);
@ -1045,8 +1045,8 @@ NodeWindowAgent::create_ui()
widget = XtCreateManagedWidget("show", xmPushButtonGadgetClass, fileM, 0, 0); widget = XtCreateManagedWidget("show", xmPushButtonGadgetClass, fileM, 0, 0);
XtAddCallback(widget, XmNactivateCallback, show_locatorCB, this); XtAddCallback(widget, XmNactivateCallback, show_locatorCB, this);
mtfstring = CATGETS(Set_AgentLabel, 68, "Show Locator"); mtfstring = MCATGETS(Set_AgentLabel, 68, "Show Locator");
mnemonic = *CATGETS(Set_AgentLabel, 69, ""); mnemonic = *MCATGETS(Set_AgentLabel, 69, "");
XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL);
XtCreateManagedWidget("sep3", xmSeparatorGadgetClass, fileM, 0, 0); XtCreateManagedWidget("sep3", xmSeparatorGadgetClass, fileM, 0, 0);
@ -1057,15 +1057,15 @@ NodeWindowAgent::create_ui()
fileM, args, n); fileM, args, n);
XtAddCallback(f_close, XmNactivateCallback, dismissCB, this); XtAddCallback(f_close, XmNactivateCallback, dismissCB, this);
mtfstring = CATGETS(Set_AgentLabel, 74, "Close"); mtfstring = MCATGETS(Set_AgentLabel, 74, "Close");
mnemonic = *CATGETS(Set_AgentLabel, 75, ""); mnemonic = *MCATGETS(Set_AgentLabel, 75, "");
XtVaSetValues(f_close, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); XtVaSetValues(f_close, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL);
widget = XtCreateManagedWidget("exit", xmPushButtonGadgetClass, fileM, 0, 0); widget = XtCreateManagedWidget("exit", xmPushButtonGadgetClass, fileM, 0, 0);
XtAddCallback(widget, XmNactivateCallback, exitCB, this); XtAddCallback(widget, XmNactivateCallback, exitCB, this);
mtfstring = CATGETS(Set_AgentLabel, 76, "Exit"); mtfstring = MCATGETS(Set_AgentLabel, 76, "Exit");
mnemonic = *CATGETS(Set_AgentLabel, 77, ""); mnemonic = *MCATGETS(Set_AgentLabel, 77, "");
XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL);
// search menu // search menu
@ -1078,32 +1078,32 @@ NodeWindowAgent::create_ui()
menu_bar, args, n); menu_bar, args, n);
help_agent().add_help_cb(f_search_menu_button); help_agent().add_help_cb(f_search_menu_button);
mtfstring = CATGETS(Set_AgentLabel, 102, "Search"); mtfstring = MCATGETS(Set_AgentLabel, 102, "Search");
mnemonic = *CATGETS(Set_AgentLabel, 103, ""); mnemonic = *MCATGETS(Set_AgentLabel, 103, "");
XtVaSetValues(f_search_menu_button, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); XtVaSetValues(f_search_menu_button, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL);
widget = XtCreateManagedWidget("on_selection", xmPushButtonGadgetClass, widget = XtCreateManagedWidget("on_selection", xmPushButtonGadgetClass,
searchM, 0, 0); searchM, 0, 0);
XtAddCallback(widget, XmNactivateCallback, search_on_selectionCB, this); XtAddCallback(widget, XmNactivateCallback, search_on_selectionCB, this);
mtfstring = CATGETS(Set_AgentLabel, 78, "On Selection"); mtfstring = MCATGETS(Set_AgentLabel, 78, "On Selection");
mnemonic = *CATGETS(Set_AgentLabel, 79, ""); mnemonic = *MCATGETS(Set_AgentLabel, 79, "");
XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL);
widget = XtCreateManagedWidget("query_editor", xmPushButtonGadgetClass, widget = XtCreateManagedWidget("query_editor", xmPushButtonGadgetClass,
searchM, 0, 0); searchM, 0, 0);
XtAddCallback(widget, XmNactivateCallback, query_editorCB, 0); XtAddCallback(widget, XmNactivateCallback, query_editorCB, 0);
mtfstring = CATGETS(Set_AgentLabel, 80, "Query Editor"); mtfstring = MCATGETS(Set_AgentLabel, 80, "Query Editor");
mnemonic = *CATGETS(Set_AgentLabel, 81, ""); mnemonic = *MCATGETS(Set_AgentLabel, 81, "");
XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL);
widget = XtCreateManagedWidget("scope_editor", xmPushButtonGadgetClass, widget = XtCreateManagedWidget("scope_editor", xmPushButtonGadgetClass,
searchM, 0, 0); searchM, 0, 0);
XtAddCallback(widget, XmNactivateCallback, scope_editorCB, 0); XtAddCallback(widget, XmNactivateCallback, scope_editorCB, 0);
mtfstring = CATGETS(Set_AgentLabel, 82, "Scope Editor"); mtfstring = MCATGETS(Set_AgentLabel, 82, "Scope Editor");
mnemonic = *CATGETS(Set_AgentLabel, 83, ""); mnemonic = *MCATGETS(Set_AgentLabel, 83, "");
XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL);
XtCreateManagedWidget("sep1", xmSeparatorGadgetClass, searchM, 0, 0); XtCreateManagedWidget("sep1", xmSeparatorGadgetClass, searchM, 0, 0);
@ -1112,8 +1112,8 @@ NodeWindowAgent::create_ui()
searchM, 0, 0); searchM, 0, 0);
XtAddCallback(widget, XmNactivateCallback, search_historyCB, 0); XtAddCallback(widget, XmNactivateCallback, search_historyCB, 0);
mtfstring = CATGETS(Set_AgentLabel, 84, "Search History"); mtfstring = MCATGETS(Set_AgentLabel, 84, "Search History");
mnemonic = *CATGETS(Set_AgentLabel, 85, ""); mnemonic = *MCATGETS(Set_AgentLabel, 85, "");
XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL);
XtCreateManagedWidget("sep2", xmSeparatorGadgetClass, searchM, 0, 0); XtCreateManagedWidget("sep2", xmSeparatorGadgetClass, searchM, 0, 0);
@ -1125,9 +1125,9 @@ NodeWindowAgent::create_ui()
XtVaSetValues(f_clear_search_hits, XtVaSetValues(f_clear_search_hits,
XmNlabelString, XmNlabelString,
(XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 86, "Clear Search Hits")), (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 86, "Clear Search Hits")),
XmNmnemonic, XmNmnemonic,
*CATGETS(Set_AgentLabel, 87, ""), *MCATGETS(Set_AgentLabel, 87, ""),
NULL); NULL);
XtCreateManagedWidget("sep3", xmSeparatorGadgetClass, searchM, 0, 0); XtCreateManagedWidget("sep3", xmSeparatorGadgetClass, searchM, 0, 0);
@ -1136,16 +1136,16 @@ NodeWindowAgent::create_ui()
xmPushButtonGadgetClass, searchM, 0, 0); xmPushButtonGadgetClass, searchM, 0, 0);
XtAddCallback(f_search_prev, XmNactivateCallback, search_previousCB, this); XtAddCallback(f_search_prev, XmNactivateCallback, search_previousCB, this);
mtfstring = CATGETS(Set_AgentLabel, 98, "Previous Search"); mtfstring = MCATGETS(Set_AgentLabel, 98, "Previous Search");
mnemonic = *CATGETS(Set_AgentLabel, 99, ""); mnemonic = *MCATGETS(Set_AgentLabel, 99, "");
XtVaSetValues(f_search_prev, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); XtVaSetValues(f_search_prev, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL);
f_search_next = XtCreateManagedWidget("search_next", f_search_next = XtCreateManagedWidget("search_next",
xmPushButtonGadgetClass, searchM, 0, 0); xmPushButtonGadgetClass, searchM, 0, 0);
XtAddCallback(f_search_next, XmNactivateCallback, search_nextCB, this); XtAddCallback(f_search_next, XmNactivateCallback, search_nextCB, this);
mtfstring = CATGETS(Set_AgentLabel, 100, "Next Search"); mtfstring = MCATGETS(Set_AgentLabel, 100, "Next Search");
mnemonic = *CATGETS(Set_AgentLabel, 101, ""); mnemonic = *MCATGETS(Set_AgentLabel, 101, "");
XtVaSetValues(f_search_next, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); XtVaSetValues(f_search_next, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL);
// go menu // go menu
@ -1156,8 +1156,8 @@ NodeWindowAgent::create_ui()
menu_bar, args, n); menu_bar, args, n);
help_agent().add_help_cb(widget); help_agent().add_help_cb(widget);
mtfstring = CATGETS(Set_AgentLabel, 104, "Go"); mtfstring = MCATGETS(Set_AgentLabel, 104, "Go");
mnemonic = *CATGETS(Set_AgentLabel, 105, ""); mnemonic = *MCATGETS(Set_AgentLabel, 105, "");
XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL);
f_history_prev = XtCreateManagedWidget("history_prev", f_history_prev = XtCreateManagedWidget("history_prev",
@ -1166,8 +1166,8 @@ NodeWindowAgent::create_ui()
XtAddCallback(f_history_prev, XmNarmCallback, preview_history_prevCB, this); XtAddCallback(f_history_prev, XmNarmCallback, preview_history_prevCB, this);
XtAddCallback(f_history_prev, XmNdisarmCallback, unpreviewCB, this); XtAddCallback(f_history_prev, XmNdisarmCallback, unpreviewCB, this);
mtfstring = CATGETS(Set_AgentLabel, 88, "Back (History)"); mtfstring = MCATGETS(Set_AgentLabel, 88, "Back (History)");
mnemonic = *CATGETS(Set_AgentLabel, 89, ""); mnemonic = *MCATGETS(Set_AgentLabel, 89, "");
XtVaSetValues(f_history_prev, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); XtVaSetValues(f_history_prev, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL);
f_history_next = XtCreateManagedWidget("history_next", f_history_next = XtCreateManagedWidget("history_next",
@ -1176,16 +1176,16 @@ NodeWindowAgent::create_ui()
XtAddCallback(f_history_next, XmNarmCallback, preview_history_nextCB, this); XtAddCallback(f_history_next, XmNarmCallback, preview_history_nextCB, this);
XtAddCallback(f_history_next, XmNdisarmCallback, unpreviewCB, this); XtAddCallback(f_history_next, XmNdisarmCallback, unpreviewCB, this);
mtfstring = CATGETS(Set_AgentLabel, 90, "Forward (History)"); mtfstring = MCATGETS(Set_AgentLabel, 90, "Forward (History)");
mnemonic = *CATGETS(Set_AgentLabel, 91, ""); mnemonic = *MCATGETS(Set_AgentLabel, 91, "");
XtVaSetValues(f_history_next, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); XtVaSetValues(f_history_next, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL);
widget = XtCreateManagedWidget("section_history", widget = XtCreateManagedWidget("section_history",
xmPushButtonGadgetClass, goM, 0, 0); xmPushButtonGadgetClass, goM, 0, 0);
XtAddCallback(widget, XmNactivateCallback, section_historyCB, 0); XtAddCallback(widget, XmNactivateCallback, section_historyCB, 0);
mtfstring = CATGETS(Set_AgentLabel, 92, "History..."); mtfstring = MCATGETS(Set_AgentLabel, 92, "History...");
mnemonic = *CATGETS(Set_AgentLabel, 93, ""); mnemonic = *MCATGETS(Set_AgentLabel, 93, "");
XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL);
XtCreateManagedWidget("sep1", xmSeparatorGadgetClass, goM, 0, 0); XtCreateManagedWidget("sep1", xmSeparatorGadgetClass, goM, 0, 0);
@ -1196,8 +1196,8 @@ NodeWindowAgent::create_ui()
XtAddCallback(f_node_next, XmNarmCallback, preview_nextCB, this); XtAddCallback(f_node_next, XmNarmCallback, preview_nextCB, this);
XtAddCallback(f_node_next, XmNdisarmCallback, unpreviewCB, this); XtAddCallback(f_node_next, XmNdisarmCallback, unpreviewCB, this);
mtfstring = CATGETS(Set_AgentLabel, 96, "Next Section"); mtfstring = MCATGETS(Set_AgentLabel, 96, "Next Section");
mnemonic = *CATGETS(Set_AgentLabel, 97, ""); mnemonic = *MCATGETS(Set_AgentLabel, 97, "");
XtVaSetValues(f_node_next, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); XtVaSetValues(f_node_next, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL);
f_node_prev = XtCreateManagedWidget("section_prev", f_node_prev = XtCreateManagedWidget("section_prev",
@ -1206,8 +1206,8 @@ NodeWindowAgent::create_ui()
XtAddCallback(f_node_prev, XmNarmCallback, preview_previousCB, this); XtAddCallback(f_node_prev, XmNarmCallback, preview_previousCB, this);
XtAddCallback(f_node_prev, XmNdisarmCallback, unpreviewCB, this); XtAddCallback(f_node_prev, XmNdisarmCallback, unpreviewCB, this);
mtfstring = CATGETS(Set_AgentLabel, 94, "Previous Section"); mtfstring = MCATGETS(Set_AgentLabel, 94, "Previous Section");
mnemonic = *CATGETS(Set_AgentLabel, 95, ""); mnemonic = *MCATGETS(Set_AgentLabel, 95, "");
XtVaSetValues(f_node_prev, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); XtVaSetValues(f_node_prev, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL);
XtCreateManagedWidget("sep2", xmSeparatorGadgetClass, goM, 0, 0); XtCreateManagedWidget("sep2", xmSeparatorGadgetClass, goM, 0, 0);
@ -1215,8 +1215,8 @@ NodeWindowAgent::create_ui()
widget = XtCreateManagedWidget("open", xmPushButtonGadgetClass, goM, 0, 0); widget = XtCreateManagedWidget("open", xmPushButtonGadgetClass, goM, 0, 0);
XtAddCallback(widget, XmNactivateCallback, open_urlCB, 0); XtAddCallback(widget, XmNactivateCallback, open_urlCB, 0);
mtfstring = CATGETS(Set_AgentLabel, 66, "Open Locator..."); mtfstring = MCATGETS(Set_AgentLabel, 66, "Open Locator...");
mnemonic = *CATGETS(Set_AgentLabel, 67, ""); mnemonic = *MCATGETS(Set_AgentLabel, 67, "");
XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL);
// marks menu // marks menu
@ -1228,8 +1228,8 @@ NodeWindowAgent::create_ui()
menu_bar, args, n); menu_bar, args, n);
help_agent().add_help_cb(widget); help_agent().add_help_cb(widget);
mtfstring = CATGETS(Set_AgentLabel, 106, "Marks"); mtfstring = MCATGETS(Set_AgentLabel, 106, "Marks");
mnemonic = *CATGETS(Set_AgentLabel, 107, ""); mnemonic = *MCATGETS(Set_AgentLabel, 107, "");
XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL);
f_create_bmrk = XtCreateManagedWidget("create_bmrk", f_create_bmrk = XtCreateManagedWidget("create_bmrk",
@ -1247,8 +1247,8 @@ NodeWindowAgent::create_ui()
if (window_system().dtinfo_font()) if (window_system().dtinfo_font())
bmfont = XmFontListAppendEntry(bmfont, window_system().dtinfo_font()); bmfont = XmFontListAppendEntry(bmfont, window_system().dtinfo_font());
mtfstring = CATGETS(Set_AgentLabel, 108, "Create Bookmark"); mtfstring = MCATGETS(Set_AgentLabel, 108, "Create Bookmark");
mnemonic = *CATGETS(Set_AgentLabel, 109, ""); mnemonic = *MCATGETS(Set_AgentLabel, 109, "");
XtVaSetValues(f_create_bmrk, XmNlabelString, (XmString)mtfstring, XtVaSetValues(f_create_bmrk, XmNlabelString, (XmString)mtfstring,
XmNmnemonic, mnemonic, XmNmnemonic, mnemonic,
XmNfontList, bmfont, NULL); XmNfontList, bmfont, NULL);
@ -1258,8 +1258,8 @@ NodeWindowAgent::create_ui()
markM, 0, 0); markM, 0, 0);
XtAddCallback(f_create_anno, XmNactivateCallback, create_annotationCB, this); XtAddCallback(f_create_anno, XmNactivateCallback, create_annotationCB, this);
mtfstring = CATGETS(Set_AgentLabel, 110, "Create Note..."); mtfstring = MCATGETS(Set_AgentLabel, 110, "Create Note...");
mnemonic = *CATGETS(Set_AgentLabel, 111, ""); mnemonic = *MCATGETS(Set_AgentLabel, 111, "");
XtVaSetValues(f_create_anno, XmNlabelString, (XmString)mtfstring, XtVaSetValues(f_create_anno, XmNlabelString, (XmString)mtfstring,
XmNmnemonic, mnemonic, XmNmnemonic, mnemonic,
XmNfontList, bmfont, NULL); XmNfontList, bmfont, NULL);
@ -1271,8 +1271,8 @@ NodeWindowAgent::create_ui()
markM, 0, 0); markM, 0, 0);
XtAddCallback(list_marks, XmNactivateCallback, mark_listCB, 0); XtAddCallback(list_marks, XmNactivateCallback, mark_listCB, 0);
mtfstring = CATGETS(Set_AgentLabel, 112, "List Marks"); mtfstring = MCATGETS(Set_AgentLabel, 112, "List Marks");
mnemonic = *CATGETS(Set_AgentLabel, 113, ""); mnemonic = *MCATGETS(Set_AgentLabel, 113, "");
XtVaSetValues(list_marks, XmNlabelString, (XmString)mtfstring, XtVaSetValues(list_marks, XmNlabelString, (XmString)mtfstring,
XmNmnemonic, mnemonic, XmNmnemonic, mnemonic,
XmNfontList, bmfont, NULL); XmNfontList, bmfont, NULL);
@ -1283,8 +1283,8 @@ NodeWindowAgent::create_ui()
xmPushButtonGadgetClass, markM, 0, 0); xmPushButtonGadgetClass, markM, 0, 0);
XtAddCallback(f_edit_mark, XmNactivateCallback, edit_markCB, this); XtAddCallback(f_edit_mark, XmNactivateCallback, edit_markCB, this);
mtfstring = CATGETS(Set_AgentLabel, 114, "Edit Selection..."); mtfstring = MCATGETS(Set_AgentLabel, 114, "Edit Selection...");
mnemonic = *CATGETS(Set_AgentLabel, 115, ""); mnemonic = *MCATGETS(Set_AgentLabel, 115, "");
XtVaSetValues(f_edit_mark, XmNlabelString, (XmString)mtfstring, XtVaSetValues(f_edit_mark, XmNlabelString, (XmString)mtfstring,
XmNmnemonic, mnemonic, XmNmnemonic, mnemonic,
XmNfontList, bmfont, NULL); XmNfontList, bmfont, NULL);
@ -1293,8 +1293,8 @@ NodeWindowAgent::create_ui()
xmPushButtonGadgetClass, markM, 0, 0); xmPushButtonGadgetClass, markM, 0, 0);
XtAddCallback(f_move_mark, XmNactivateCallback, move_markCB, this); XtAddCallback(f_move_mark, XmNactivateCallback, move_markCB, this);
mtfstring = CATGETS(Set_AgentLabel, 116, "Move Selection"); mtfstring = MCATGETS(Set_AgentLabel, 116, "Move Selection");
mnemonic = *CATGETS(Set_AgentLabel, 117, ""); mnemonic = *MCATGETS(Set_AgentLabel, 117, "");
XtVaSetValues(f_move_mark, XmNlabelString, (XmString)mtfstring, XtVaSetValues(f_move_mark, XmNlabelString, (XmString)mtfstring,
XmNmnemonic, mnemonic, XmNmnemonic, mnemonic,
XmNfontList, bmfont, NULL); XmNfontList, bmfont, NULL);
@ -1304,8 +1304,8 @@ NodeWindowAgent::create_ui()
markM, 0, 0); markM, 0, 0);
XtAddCallback(f_delete_mark, XmNactivateCallback, delete_markCB, this); XtAddCallback(f_delete_mark, XmNactivateCallback, delete_markCB, this);
mtfstring = CATGETS(Set_AgentLabel, 118, "Delete Selection"); mtfstring = MCATGETS(Set_AgentLabel, 118, "Delete Selection");
mnemonic = *CATGETS(Set_AgentLabel, 119, ""); mnemonic = *MCATGETS(Set_AgentLabel, 119, "");
XtVaSetValues(f_delete_mark, XmNlabelString, (XmString)mtfstring, XtVaSetValues(f_delete_mark, XmNlabelString, (XmString)mtfstring,
XmNmnemonic, mnemonic, XmNmnemonic, mnemonic,
XmNfontList, bmfont, NULL); XmNfontList, bmfont, NULL);
@ -1385,16 +1385,16 @@ NodeWindowAgent::create_ui()
menu_bar, args, n); menu_bar, args, n);
help_agent().add_help_cb(widget); help_agent().add_help_cb(widget);
mtfstring = CATGETS(Set_AgentLabel, 120, "Options"); mtfstring = MCATGETS(Set_AgentLabel, 120, "Options");
mnemonic = *CATGETS(Set_AgentLabel, 121, ""); mnemonic = *MCATGETS(Set_AgentLabel, 121, "");
XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL);
widget = XtCreateManagedWidget("preferences", xmPushButtonGadgetClass, widget = XtCreateManagedWidget("preferences", xmPushButtonGadgetClass,
optionsM, 0, 0); optionsM, 0, 0);
XtAddCallback(widget, XmNactivateCallback, prefsCB, 0); XtAddCallback(widget, XmNactivateCallback, prefsCB, 0);
mtfstring = CATGETS(Set_AgentLabel, 122, "Preferences..."); mtfstring = MCATGETS(Set_AgentLabel, 122, "Preferences...");
mnemonic = *CATGETS(Set_AgentLabel, 123, ""); mnemonic = *MCATGETS(Set_AgentLabel, 123, "");
XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL);
XtCreateManagedWidget("sep1", xmSeparatorGadgetClass, optionsM, 0, 0); XtCreateManagedWidget("sep1", xmSeparatorGadgetClass, optionsM, 0, 0);
@ -1404,8 +1404,8 @@ NodeWindowAgent::create_ui()
optionsM, 0, 0); optionsM, 0, 0);
XtAddCallback(f_detach_graphic, XmNactivateCallback, detach_graphicCB, this); XtAddCallback(f_detach_graphic, XmNactivateCallback, detach_graphicCB, this);
mtfstring = CATGETS(Set_AgentLabel, 124, "Detach Graphic"); mtfstring = MCATGETS(Set_AgentLabel, 124, "Detach Graphic");
mnemonic = *CATGETS(Set_AgentLabel, 125, ""); mnemonic = *MCATGETS(Set_AgentLabel, 125, "");
XtVaSetValues(f_detach_graphic, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); XtVaSetValues(f_detach_graphic, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL);
XtCreateManagedWidget("sep2", xmSeparatorGadgetClass, optionsM, 0, 0); XtCreateManagedWidget("sep2", xmSeparatorGadgetClass, optionsM, 0, 0);
@ -1416,8 +1416,8 @@ NodeWindowAgent::create_ui()
XtAddCallback(tool_barT, XmNvalueChangedCallback, XtAddCallback(tool_barT, XmNvalueChangedCallback,
tool_bar_toggleCB, tool_bar); tool_bar_toggleCB, tool_bar);
mtfstring = CATGETS(Set_AgentLabel, 126, "Show Tool Bar"); mtfstring = MCATGETS(Set_AgentLabel, 126, "Show Tool Bar");
mnemonic = *CATGETS(Set_AgentLabel, 127, ""); mnemonic = *MCATGETS(Set_AgentLabel, 127, "");
XtVaSetValues(tool_barT, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); XtVaSetValues(tool_barT, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL);
Widget search_areaT = XtCreateManagedWidget("show_search_area", Widget search_areaT = XtCreateManagedWidget("show_search_area",
@ -1426,8 +1426,8 @@ NodeWindowAgent::create_ui()
XtAddCallback(search_areaT, XmNvalueChangedCallback, XtAddCallback(search_areaT, XmNvalueChangedCallback,
search_area_toggleCB, search_area); search_area_toggleCB, search_area);
mtfstring = CATGETS(Set_AgentLabel, 128, "Show Search Area"); mtfstring = MCATGETS(Set_AgentLabel, 128, "Show Search Area");
mnemonic = *CATGETS(Set_AgentLabel, 129, ""); mnemonic = *MCATGETS(Set_AgentLabel, 129, "");
XtVaSetValues(search_areaT, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); XtVaSetValues(search_areaT, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL);
// windows menu // windows menu
@ -1439,24 +1439,24 @@ NodeWindowAgent::create_ui()
menu_bar, args, n); menu_bar, args, n);
help_agent().add_help_cb(widget); help_agent().add_help_cb(widget);
mtfstring = CATGETS(Set_AgentLabel, 130, "Windows"); mtfstring = MCATGETS(Set_AgentLabel, 130, "Windows");
mnemonic = *CATGETS(Set_AgentLabel, 131, ""); mnemonic = *MCATGETS(Set_AgentLabel, 131, "");
XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL);
widget = XtCreateManagedWidget("booklist", xmPushButtonGadgetClass, widget = XtCreateManagedWidget("booklist", xmPushButtonGadgetClass,
windowsM, 0, 0); windowsM, 0, 0);
XtAddCallback(widget, XmNactivateCallback, show_booklistCB, 0); XtAddCallback(widget, XmNactivateCallback, show_booklistCB, 0);
mtfstring = CATGETS(Set_AgentLabel, 132, "Book List"); mtfstring = MCATGETS(Set_AgentLabel, 132, "Book List");
mnemonic = *CATGETS(Set_AgentLabel, 133, ""); mnemonic = *MCATGETS(Set_AgentLabel, 133, "");
XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL);
widget = XtCreateManagedWidget("graphical_map", xmPushButtonGadgetClass, widget = XtCreateManagedWidget("graphical_map", xmPushButtonGadgetClass,
windowsM, 0, 0); windowsM, 0, 0);
XtAddCallback(widget, XmNactivateCallback, show_mapCB, this); XtAddCallback(widget, XmNactivateCallback, show_mapCB, this);
mtfstring = CATGETS(Set_AgentLabel, 134, "Graphical Map"); mtfstring = MCATGETS(Set_AgentLabel, 134, "Graphical Map");
mnemonic = *CATGETS(Set_AgentLabel, 135, ""); mnemonic = *MCATGETS(Set_AgentLabel, 135, "");
XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL);
@ -1472,8 +1472,8 @@ NodeWindowAgent::create_ui()
XtSetArg(args[n], XmNmenuHelpWidget, widget); n++; XtSetArg(args[n], XmNmenuHelpWidget, widget); n++;
XtSetValues(menu_bar, args, n); XtSetValues(menu_bar, args, n);
mtfstring = CATGETS(Set_AgentLabel, 143, "Help"); mtfstring = MCATGETS(Set_AgentLabel, 143, "Help");
mnemonic = *CATGETS(Set_AgentLabel, 144, ""); mnemonic = *MCATGETS(Set_AgentLabel, 144, "");
XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL);
#define AM WAutoManage #define AM WAutoManage
@ -1496,56 +1496,56 @@ NodeWindowAgent::create_ui()
//WXmPushButton on_version (helpM, "on_version" , AM); //WXmPushButton on_version (helpM, "on_version" , AM);
//ON_ACTIVATE (on_version, display_version); //ON_ACTIVATE (on_version, display_version);
mtfstring = CATGETS(Set_AgentLabel, 257, "Overview"); mtfstring = MCATGETS(Set_AgentLabel, 257, "Overview");
mnemonic = *CATGETS(Set_AgentLabel, 258, ""); mnemonic = *MCATGETS(Set_AgentLabel, 258, "");
XtVaSetValues((Widget)on_overview, XmNlabelString, (XmString)mtfstring, XtVaSetValues((Widget)on_overview, XmNlabelString, (XmString)mtfstring,
XmNmnemonic, mnemonic, NULL); XmNmnemonic, mnemonic, NULL);
mtfstring = CATGETS(Set_AgentLabel, 249, "Tasks"); mtfstring = MCATGETS(Set_AgentLabel, 249, "Tasks");
mnemonic = *CATGETS(Set_AgentLabel, 250, ""); mnemonic = *MCATGETS(Set_AgentLabel, 250, "");
XtVaSetValues((Widget)on_tasks, XmNlabelString, (XmString)mtfstring, XtVaSetValues((Widget)on_tasks, XmNlabelString, (XmString)mtfstring,
XmNmnemonic, mnemonic, NULL); XmNmnemonic, mnemonic, NULL);
mtfstring = CATGETS(Set_AgentLabel, 251, "Reference"); mtfstring = MCATGETS(Set_AgentLabel, 251, "Reference");
mnemonic = *CATGETS(Set_AgentLabel, 252, ""); mnemonic = *MCATGETS(Set_AgentLabel, 252, "");
XtVaSetValues((Widget)on_reference, XmNlabelString, (XmString)mtfstring, XtVaSetValues((Widget)on_reference, XmNlabelString, (XmString)mtfstring,
XmNmnemonic, mnemonic, NULL); XmNmnemonic, mnemonic, NULL);
mtfstring = CATGETS(Set_AgentLabel, 50, "On Item..."); mtfstring = MCATGETS(Set_AgentLabel, 50, "On Item...");
mnemonic = *CATGETS(Set_AgentLabel, 51, ""); mnemonic = *MCATGETS(Set_AgentLabel, 51, "");
XtVaSetValues((Widget)on_item, XmNlabelString, (XmString)mtfstring, XtVaSetValues((Widget)on_item, XmNlabelString, (XmString)mtfstring,
XmNmnemonic, mnemonic, NULL); XmNmnemonic, mnemonic, NULL);
mtfstring = CATGETS(Set_AgentLabel, 253, "Using Help"); mtfstring = MCATGETS(Set_AgentLabel, 253, "Using Help");
mnemonic = *CATGETS(Set_AgentLabel, 254, ""); mnemonic = *MCATGETS(Set_AgentLabel, 254, "");
XtVaSetValues((Widget)on_help, XmNlabelString, (XmString)mtfstring, XtVaSetValues((Widget)on_help, XmNlabelString, (XmString)mtfstring,
XmNmnemonic, mnemonic, NULL); XmNmnemonic, mnemonic, NULL);
mtfstring = CATGETS(Set_AgentLabel, 255, "About Information Manager"); mtfstring = MCATGETS(Set_AgentLabel, 255, "About Information Manager");
mnemonic = *CATGETS(Set_AgentLabel, 256, ""); mnemonic = *MCATGETS(Set_AgentLabel, 256, "");
XtVaSetValues((Widget)on_about, XmNlabelString, (XmString)mtfstring, XtVaSetValues((Widget)on_about, XmNlabelString, (XmString)mtfstring,
XmNmnemonic, mnemonic, NULL); XmNmnemonic, mnemonic, NULL);
#ifdef EAM #ifdef EAM
mtfstring = CATGETS(Set_AgentLabel, 147, "On Window"); mtfstring = MCATGETS(Set_AgentLabel, 147, "On Window");
mnemonic = *CATGETS(Set_AgentLabel, 148, ""); mnemonic = *MCATGETS(Set_AgentLabel, 148, "");
XtVaSetValues((Widget)on_window, XmNlabelString, (XmString)mtfstring, XtVaSetValues((Widget)on_window, XmNlabelString, (XmString)mtfstring,
XmNmnemonic, mnemonic, NULL); XmNmnemonic, mnemonic, NULL);
// mtfstring = CATGETS(Set_AgentLabel, 149, "On Application"); // mtfstring = MCATGETS(Set_AgentLabel, 149, "On Application");
// mnemonic = *CATGETS(Set_AgentLabel, 150, ""); // mnemonic = *MCATGETS(Set_AgentLabel, 150, "");
// XtVaSetValues((Widget)on_application, XmNlabelString, (XmString)mtfstring, // XtVaSetValues((Widget)on_application, XmNlabelString, (XmString)mtfstring,
// XmNmnemonic, mnemonic, NULL); // XmNmnemonic, mnemonic, NULL);
// mtfstring = CATGETS(Set_AgentLabel, 151, "Index"); // mtfstring = MCATGETS(Set_AgentLabel, 151, "Index");
// mnemonic = *CATGETS(Set_AgentLabel, 152, ""); // mnemonic = *MCATGETS(Set_AgentLabel, 152, "");
// XtVaSetValues((Widget)index, XmNlabelString, (XmString)mtfstring, // XtVaSetValues((Widget)index, XmNlabelString, (XmString)mtfstring,
// XmNmnemonic, mnemonic, NULL); // XmNmnemonic, mnemonic, NULL);
mtfstring = CATGETS(Set_AgentLabel, 155, "On Keys"); mtfstring = MCATGETS(Set_AgentLabel, 155, "On Keys");
mnemonic = *CATGETS(Set_AgentLabel, 156, ""); mnemonic = *MCATGETS(Set_AgentLabel, 156, "");
XtVaSetValues((Widget)on_keys, XmNlabelString, (XmString)mtfstring, XtVaSetValues((Widget)on_keys, XmNlabelString, (XmString)mtfstring,
XmNmnemonic, mnemonic, NULL); XmNmnemonic, mnemonic, NULL);
mtfstring = CATGETS(Set_AgentLabel, 157, "On Version"); mtfstring = MCATGETS(Set_AgentLabel, 157, "On Version");
mnemonic = *CATGETS(Set_AgentLabel, 158. ""); mnemonic = *MCATGETS(Set_AgentLabel, 158. "");
XtVaSetValues((Widget)on_version, XmNlabelString, (XmString)mtfstring, XtVaSetValues((Widget)on_version, XmNlabelString, (XmString)mtfstring,
XmNmnemonic, mnemonic, NULL); XmNmnemonic, mnemonic, NULL);
@ -1569,7 +1569,7 @@ NodeWindowAgent::create_ui()
XtAddCallback(f_history_prev2, XmNdisarmCallback, unpreviewCB, this); XtAddCallback(f_history_prev2, XmNdisarmCallback, unpreviewCB, this);
help_agent().add_help_cb (f_history_prev2); help_agent().add_help_cb (f_history_prev2);
textstore = new UAS_String(CATGETS(Set_AgentQHelp, 1, textstore = new UAS_String(MCATGETS(Set_AgentQHelp, 1,
"Go to the previous section in history")); "Go to the previous section in history"));
add_quick_help(f_history_prev2, (char*)*textstore); add_quick_help(f_history_prev2, (char*)*textstore);
f_textstore.insert_item(textstore); f_textstore.insert_item(textstore);
@ -1582,7 +1582,7 @@ NodeWindowAgent::create_ui()
XtAddCallback(f_history_next2, XmNdisarmCallback, unpreviewCB, this); XtAddCallback(f_history_next2, XmNdisarmCallback, unpreviewCB, this);
help_agent().add_help_cb (f_history_next2); help_agent().add_help_cb (f_history_next2);
textstore = new UAS_String(CATGETS(Set_AgentQHelp, 2, textstore = new UAS_String(MCATGETS(Set_AgentQHelp, 2,
"Go to the next section in history")); "Go to the next section in history"));
add_quick_help(f_history_next2, (char*)*textstore); add_quick_help(f_history_next2, (char*)*textstore);
f_textstore.insert_item(textstore); f_textstore.insert_item(textstore);
@ -1599,7 +1599,7 @@ NodeWindowAgent::create_ui()
XtAddCallback(f_node_prev2, XmNdisarmCallback, unpreviewCB, this); XtAddCallback(f_node_prev2, XmNdisarmCallback, unpreviewCB, this);
help_agent().add_help_cb (f_node_prev2); help_agent().add_help_cb (f_node_prev2);
textstore = new UAS_String(CATGETS(Set_AgentQHelp, 3, textstore = new UAS_String(MCATGETS(Set_AgentQHelp, 3,
"Go to the previous section in document")); "Go to the previous section in document"));
add_quick_help(f_node_prev2, (char*)*textstore); add_quick_help(f_node_prev2, (char*)*textstore);
f_textstore.insert_item(textstore); f_textstore.insert_item(textstore);
@ -1612,7 +1612,7 @@ NodeWindowAgent::create_ui()
XtAddCallback(f_node_next2, XmNdisarmCallback, unpreviewCB, this); XtAddCallback(f_node_next2, XmNdisarmCallback, unpreviewCB, this);
help_agent().add_help_cb (f_node_next2); help_agent().add_help_cb (f_node_next2);
textstore = new UAS_String(CATGETS(Set_AgentQHelp, 4, textstore = new UAS_String(MCATGETS(Set_AgentQHelp, 4,
"Go to the next section in document")); "Go to the next section in document"));
add_quick_help(f_node_next2, (char*)*textstore); add_quick_help(f_node_next2, (char*)*textstore);
f_textstore.insert_item(textstore); f_textstore.insert_item(textstore);
@ -1627,7 +1627,7 @@ NodeWindowAgent::create_ui()
XtAddCallback(f_search_prev2, XmNactivateCallback, search_previousCB, this); XtAddCallback(f_search_prev2, XmNactivateCallback, search_previousCB, this);
help_agent().add_help_cb (f_search_prev2); help_agent().add_help_cb (f_search_prev2);
textstore = new UAS_String(CATGETS(Set_AgentQHelp, 5, textstore = new UAS_String(MCATGETS(Set_AgentQHelp, 5,
"Go to the previous search match")); "Go to the previous search match"));
add_quick_help(f_search_prev2, (char*)*textstore); add_quick_help(f_search_prev2, (char*)*textstore);
f_textstore.insert_item(textstore); f_textstore.insert_item(textstore);
@ -1638,7 +1638,7 @@ NodeWindowAgent::create_ui()
XtAddCallback(f_search_next2, XmNactivateCallback, search_nextCB, this); XtAddCallback(f_search_next2, XmNactivateCallback, search_nextCB, this);
help_agent().add_help_cb (f_search_next2); help_agent().add_help_cb (f_search_next2);
textstore = new UAS_String(CATGETS(Set_AgentQHelp, 6, textstore = new UAS_String(MCATGETS(Set_AgentQHelp, 6,
"Go to the next search match")); "Go to the next search match"));
add_quick_help(f_search_next2, (char*)*textstore); add_quick_help(f_search_next2, (char*)*textstore);
f_textstore.insert_item(textstore); f_textstore.insert_item(textstore);
@ -1654,7 +1654,7 @@ NodeWindowAgent::create_ui()
XtAddCallback(f_print2, XmNactivateCallback, printCB, this); XtAddCallback(f_print2, XmNactivateCallback, printCB, this);
help_agent().add_help_cb (f_print2); help_agent().add_help_cb (f_print2);
textstore = new UAS_String(CATGETS(Set_AgentQHelp, 7, textstore = new UAS_String(MCATGETS(Set_AgentQHelp, 7,
"Print current section")); "Print current section"));
add_quick_help(f_print2, (char*)*textstore); add_quick_help(f_print2, (char*)*textstore);
f_textstore.insert_item(textstore); f_textstore.insert_item(textstore);
@ -1664,7 +1664,7 @@ NodeWindowAgent::create_ui()
XtAddCallback(widget, XmNactivateCallback, show_booklistCB, 0); XtAddCallback(widget, XmNactivateCallback, show_booklistCB, 0);
help_agent().add_help_cb (widget); help_agent().add_help_cb (widget);
textstore = new UAS_String(CATGETS(Set_AgentQHelp, 8, "Display Book List")); textstore = new UAS_String(MCATGETS(Set_AgentQHelp, 8, "Display Book List"));
add_quick_help(widget, (char*)*textstore); add_quick_help(widget, (char*)*textstore);
f_textstore.insert_item(textstore); f_textstore.insert_item(textstore);
@ -1673,7 +1673,7 @@ NodeWindowAgent::create_ui()
XtAddCallback(widget, XmNactivateCallback, show_mapCB, this); XtAddCallback(widget, XmNactivateCallback, show_mapCB, this);
help_agent().add_help_cb (widget); help_agent().add_help_cb (widget);
textstore = new UAS_String(CATGETS(Set_AgentQHelp, 9, textstore = new UAS_String(MCATGETS(Set_AgentQHelp, 9,
"Display Graphical Map")); "Display Graphical Map"));
add_quick_help(widget, (char*)*textstore); add_quick_help(widget, (char*)*textstore);
f_textstore.insert_item(textstore); f_textstore.insert_item(textstore);
@ -1705,13 +1705,13 @@ NodeWindowAgent::create_ui()
XtAddCallback(widget, XmNvalueChangedCallback, lock_toggleCB, this); XtAddCallback(widget, XmNvalueChangedCallback, lock_toggleCB, this);
help_agent().add_help_cb (widget); help_agent().add_help_cb (widget);
textstore = new UAS_String(CATGETS(Set_AgentQHelp, 10, textstore = new UAS_String(MCATGETS(Set_AgentQHelp, 10,
"Pin (unpin) this window, " "Pin (unpin) this window, "
"to prevent (allow) use for new documents.")); "to prevent (allow) use for new documents."));
add_quick_help(widget, (char*)*textstore); add_quick_help(widget, (char*)*textstore);
f_textstore.insert_item(textstore); f_textstore.insert_item(textstore);
mtfstring = CATGETS(Set_AgentLabel, 159, "Retain"); mtfstring = MCATGETS(Set_AgentLabel, 159, "Retain");
XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, NULL);
// Work Window // Work Window
@ -1745,7 +1745,7 @@ NodeWindowAgent::create_ui()
XtSetArg(args[n], XmNbackground, bg); n++; XtSetArg(args[n], XmNbackground, bg); n++;
f_status_text = XtCreateManagedWidget("text", xmTextFieldWidgetClass, f_status_text = XtCreateManagedWidget("text", xmTextFieldWidgetClass,
message, args, n); message, args, n);
string = CATGETS(Set_NodeWindowAgent, 2, "To preview a link destination, " string = MCATGETS(Set_NodeWindowAgent, 2, "To preview a link destination, "
"click and hold on the link."); "click and hold on the link.");
XtVaSetValues(f_status_text, XmNvalue, string, NULL); XtVaSetValues(f_status_text, XmNvalue, string, NULL);
@ -1805,19 +1805,19 @@ NodeWindowAgent::create_ui()
f_detach_button = XmCreatePushButton(f_detach_menu, (char*)"Detach Graphic", NULL, 0); f_detach_button = XmCreatePushButton(f_detach_menu, (char*)"Detach Graphic", NULL, 0);
XtAddCallback(f_detach_button, XmNactivateCallback, detach_grCB, this); XtAddCallback(f_detach_button, XmNactivateCallback, detach_grCB, this);
XtManageChild(f_detach_button); XtManageChild(f_detach_button);
mtfstring = CATGETS(Set_AgentLabel, 124, "Detach Graphic"); mtfstring = MCATGETS(Set_AgentLabel, 124, "Detach Graphic");
XtVaSetValues(f_detach_button, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(f_detach_button, XmNlabelString, (XmString)mtfstring, NULL);
f_attach_button = XmCreatePushButton(f_detach_menu, (char*)"Attach Graphic", NULL, 0); f_attach_button = XmCreatePushButton(f_detach_menu, (char*)"Attach Graphic", NULL, 0);
XtAddCallback(f_attach_button, XmNactivateCallback, attach_grCB, this); XtAddCallback(f_attach_button, XmNactivateCallback, attach_grCB, this);
XtManageChild(f_attach_button); XtManageChild(f_attach_button);
mtfstring = CATGETS(Set_AgentLabel, 265, "Attach Graphic"); mtfstring = MCATGETS(Set_AgentLabel, 265, "Attach Graphic");
XtVaSetValues(f_attach_button, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(f_attach_button, XmNlabelString, (XmString)mtfstring, NULL);
f_raise_button = XmCreatePushButton(f_detach_menu, (char*)"Raise Graphic", NULL, 0); f_raise_button = XmCreatePushButton(f_detach_menu, (char*)"Raise Graphic", NULL, 0);
XtAddCallback(f_raise_button, XmNactivateCallback, raise_grCB, this); XtAddCallback(f_raise_button, XmNactivateCallback, raise_grCB, this);
XtManageChild(f_raise_button); XtManageChild(f_raise_button);
mtfstring = CATGETS(Set_AgentLabel, 264, "Raise Graphic"); mtfstring = MCATGETS(Set_AgentLabel, 264, "Raise Graphic");
XtVaSetValues(f_raise_button, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(f_raise_button, XmNlabelString, (XmString)mtfstring, NULL);
XtAddEventHandler (f_help_dsp_area->dispWid, ButtonPressMask, False, popup_menuCB, (XtPointer)this); XtAddEventHandler (f_help_dsp_area->dispWid, ButtonPressMask, False, popup_menuCB, (XtPointer)this);
@ -1837,13 +1837,13 @@ NodeWindowAgent::create_ui()
widget = XmCreatePushButton(f_preview_menu, (char*)"widget", NULL, 0); widget = XmCreatePushButton(f_preview_menu, (char*)"widget", NULL, 0);
XtAddCallback(widget, XmNactivateCallback, go_to_linkCB, this); XtAddCallback(widget, XmNactivateCallback, go_to_linkCB, this);
XtManageChild(widget); XtManageChild(widget);
mtfstring = CATGETS(Set_AgentLabel, 168, "Display Link"); mtfstring = MCATGETS(Set_AgentLabel, 168, "Display Link");
XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, NULL);
widget = XmCreatePushButton(f_preview_menu, (char*)"widget", NULL, 0); widget = XmCreatePushButton(f_preview_menu, (char*)"widget", NULL, 0);
XtAddCallback(widget, XmNactivateCallback, open_new_nodeCB, this); XtAddCallback(widget, XmNactivateCallback, open_new_nodeCB, this);
XtManageChild(widget); XtManageChild(widget);
mtfstring = CATGETS(Set_AgentLabel, 64, "New Window"); mtfstring = MCATGETS(Set_AgentLabel, 64, "New Window");
XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, NULL);
// create default popup menu // create default popup menu
@ -1853,13 +1853,13 @@ NodeWindowAgent::create_ui()
f_node_next3 = XmCreatePushButton(f_default_menu, (char*)"f_node_next3", NULL, 0); f_node_next3 = XmCreatePushButton(f_default_menu, (char*)"f_node_next3", NULL, 0);
XtAddCallback(f_node_next3, XmNactivateCallback, node_nextCB, this); XtAddCallback(f_node_next3, XmNactivateCallback, node_nextCB, this);
XtManageChild(f_node_next3); XtManageChild(f_node_next3);
mtfstring = CATGETS(Set_AgentLabel, 96, "Next Section"); mtfstring = MCATGETS(Set_AgentLabel, 96, "Next Section");
XtVaSetValues(f_node_next3, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(f_node_next3, XmNlabelString, (XmString)mtfstring, NULL);
f_node_prev3 = XmCreatePushButton(f_default_menu, (char*)"f_node_prev3", NULL, 0); f_node_prev3 = XmCreatePushButton(f_default_menu, (char*)"f_node_prev3", NULL, 0);
XtAddCallback(f_node_prev3, XmNactivateCallback, node_previousCB, this); XtAddCallback(f_node_prev3, XmNactivateCallback, node_previousCB, this);
XtManageChild(f_node_prev3); XtManageChild(f_node_prev3);
mtfstring = CATGETS(Set_AgentLabel, 94, "Previous Section"); mtfstring = MCATGETS(Set_AgentLabel, 94, "Previous Section");
XtVaSetValues(f_node_prev3, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(f_node_prev3, XmNlabelString, (XmString)mtfstring, NULL);
widget = XmCreateSeparator(f_default_menu, (char*)"sep", NULL, 0); widget = XmCreateSeparator(f_default_menu, (char*)"sep", NULL, 0);
@ -1868,7 +1868,7 @@ NodeWindowAgent::create_ui()
widget = XmCreatePushButton(f_default_menu, (char*)"widget", NULL, 0); widget = XmCreatePushButton(f_default_menu, (char*)"widget", NULL, 0);
XtAddCallback(widget, XmNactivateCallback, show_locatorCB, this); XtAddCallback(widget, XmNactivateCallback, show_locatorCB, this);
XtManageChild(widget); XtManageChild(widget);
mtfstring = CATGETS(Set_AgentLabel, 68, "Show Locator"); mtfstring = MCATGETS(Set_AgentLabel, 68, "Show Locator");
XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, NULL);
widget = XmCreateSeparator(f_default_menu, (char*)"sep", NULL, 0); widget = XmCreateSeparator(f_default_menu, (char*)"sep", NULL, 0);
@ -1877,7 +1877,7 @@ NodeWindowAgent::create_ui()
widget = XmCreatePushButton(f_default_menu, (char*)"widget", NULL, 0); widget = XmCreatePushButton(f_default_menu, (char*)"widget", NULL, 0);
XtAddCallback(widget, XmNactivateCallback, printCB, this); XtAddCallback(widget, XmNactivateCallback, printCB, this);
XtManageChild(widget); XtManageChild(widget);
mtfstring = CATGETS(Set_AgentLabel, 70, "Print"); mtfstring = MCATGETS(Set_AgentLabel, 70, "Print");
XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, NULL);
@ -1890,11 +1890,11 @@ NodeWindowAgent::create_ui()
if (MB_CUR_MAX > 1) { if (MB_CUR_MAX > 1) {
// DtHelpDispAreaStruct cant_begin_chars // DtHelpDispAreaStruct cant_begin_chars
WString cant_begin_chars = CATGETS(Set_NodeWindowAgent, 5, ""); WString cant_begin_chars = MCATGETS(Set_NodeWindowAgent, 5, "");
f_help_dsp_area->cant_begin_chars = cant_begin_chars.get_wstr(); f_help_dsp_area->cant_begin_chars = cant_begin_chars.get_wstr();
// DtHelpDispAreaStruct cant_end_chars // DtHelpDispAreaStruct cant_end_chars
WString cant_end_chars = CATGETS(Set_NodeWindowAgent, 6, ""); WString cant_end_chars = MCATGETS(Set_NodeWindowAgent, 6, "");
f_help_dsp_area->cant_end_chars = cant_end_chars.get_wstr(); f_help_dsp_area->cant_end_chars = cant_end_chars.get_wstr();
#ifdef LB_DEBUG #ifdef LB_DEBUG
@ -1998,12 +1998,12 @@ NodeWindowAgent::create_ui()
XtManageChild(widget = XmCreateOptionMenu(search_area, (char*)"scope", args, n)); XtManageChild(widget = XmCreateOptionMenu(search_area, (char*)"scope", args, n));
help_agent().add_help_cb (widget); help_agent().add_help_cb (widget);
textstore = new UAS_String(CATGETS(Set_AgentQHelp, 60, textstore = new UAS_String(MCATGETS(Set_AgentQHelp, 60,
"Specify search scope")); "Specify search scope"));
add_quick_help(widget, (char*)*textstore); add_quick_help(widget, (char*)*textstore);
f_textstore.insert_item(textstore); f_textstore.insert_item(textstore);
mtfstring = CATGETS(Set_AgentLabel, 59, "Search:"); mtfstring = MCATGETS(Set_AgentLabel, 59, "Search:");
XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, NULL);
// hookup the ScopeMenu object here // hookup the ScopeMenu object here
@ -2029,10 +2029,10 @@ NodeWindowAgent::create_ui()
XtAddCallback(widget, XmNactivateCallback, scope_editorCB, 0); XtAddCallback(widget, XmNactivateCallback, scope_editorCB, 0);
help_agent().add_help_cb (widget); help_agent().add_help_cb (widget);
mtfstring = CATGETS(Set_AgentLabel, 46, "Scope Editor"); mtfstring = MCATGETS(Set_AgentLabel, 46, "Scope Editor");
XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, NULL);
textstore = new UAS_String(CATGETS(Set_AgentQHelp, 11, textstore = new UAS_String(MCATGETS(Set_AgentQHelp, 11,
"Specify search scope using the Scope Editor")); "Specify search scope using the Scope Editor"));
add_quick_help(widget, (char*)*textstore); add_quick_help(widget, (char*)*textstore);
f_textstore.insert_item(textstore); f_textstore.insert_item(textstore);
@ -2321,11 +2321,11 @@ NodeWindowAgent::search_help (Widget, XtPointer client_data,
if (help_text == NULL) { if (help_text == NULL) {
UAS_Pointer<UAS_String> str; UAS_Pointer<UAS_String> str;
str = new UAS_String(CATGETS(Set_AgentQHelp, 64, "Search %s")); str = new UAS_String(MCATGETS(Set_AgentQHelp, 64, "Search %s"));
help_text = (char*)*str; help_text = (char*)*str;
agent->f_textstore.insert_item(str); agent->f_textstore.insert_item(str);
str = new UAS_String(CATGETS(Set_NodeWindowAgent, 3, "Information Library")); str = new UAS_String(MCATGETS(Set_NodeWindowAgent, 3, "Information Library"));
default_scope = (char*)*str; default_scope = (char*)*str;
agent->f_textstore.insert_item(str); agent->f_textstore.insert_item(str);
} }
@ -2478,7 +2478,7 @@ NodeWindowAgent::initialize_history()
void void
NodeWindowAgent::display_version() NodeWindowAgent::display_version()
{ {
UAS_String version = CATGETS(Set_Version, 1, ""); UAS_String version = MCATGETS(Set_Version, 1, "");
if (*(char*)version) { if (*(char*)version) {
message_mgr().info_dialog ((char*)version); message_mgr().info_dialog ((char*)version);
} }
@ -3000,10 +3000,10 @@ NodeWindowAgent::preview (WTimeOut *)
const char *book_name = (char *) bn; const char *book_name = (char *) bn;
if (book_name != NULL && *book_name != '\0') if (book_name != NULL && *book_name != '\0')
snprintf (preview_buffer, sizeof(preview_buffer), snprintf (preview_buffer, sizeof(preview_buffer),
CATGETS(Set_Messages, 8, "Link to %s: %s"), book_name, title); MCATGETS(Set_Messages, 8, "Link to %s: %s"), book_name, title);
else else
snprintf (preview_buffer, sizeof(preview_buffer), snprintf (preview_buffer, sizeof(preview_buffer),
CATGETS(Set_Messages, 9, "Link to %s"), title); MCATGETS(Set_Messages, 9, "Link to %s"), title);
XmTextFieldSetString(f_status_text, preview_buffer); XmTextFieldSetString(f_status_text, preview_buffer);
f_preview_timeout = NULL; f_preview_timeout = NULL;
f_preview_document = NULL; f_preview_document = NULL;
@ -3083,7 +3083,7 @@ NodeWindowAgent::make_bookmark (Boolean edit, MarkCanvas* refmark)
//Xassert (name != NULL); //Xassert (name != NULL);
if (name == NULL) if (name == NULL)
{ {
message_mgr().error_dialog ((char*)UAS_String(CATGETS(Set_Messages, 10, message_mgr().error_dialog ((char*)UAS_String(MCATGETS(Set_Messages, 10,
"Dtinfo is unable to create this bookmark.")), "Dtinfo is unable to create this bookmark.")),
(Widget)f_shell); (Widget)f_shell);
return status; return status;
@ -3257,7 +3257,7 @@ NodeWindowAgent::make_bookmark (Boolean edit, MarkCanvas* refmark)
} }
else if (bad_markinfo.length() > 0) else if (bad_markinfo.length() > 0)
message_mgr().error_dialog ( message_mgr().error_dialog (
(char*)UAS_String(CATGETS(Set_NodeWindowAgent, 7, (char*)UAS_String(MCATGETS(Set_NodeWindowAgent, 7,
"The selected text is dynamically inserted and cannot\n" "The selected text is dynamically inserted and cannot\n"
"be used alone to create a bookmark reference. Either\n" "be used alone to create a bookmark reference. Either\n"
"select other text near the point, or include more of\n" "select other text near the point, or include more of\n"
@ -3269,7 +3269,7 @@ NodeWindowAgent::make_bookmark (Boolean edit, MarkCanvas* refmark)
mcatch_any() mcatch_any()
{ {
if (! refmark) if (! refmark)
message_mgr().error_dialog ((char*)UAS_String(CATGETS(Set_Messages, 10, message_mgr().error_dialog ((char*)UAS_String(MCATGETS(Set_Messages, 10,
"Dtinfo is unable to create this bookmark.")), "Dtinfo is unable to create this bookmark.")),
(Widget)f_shell); (Widget)f_shell);
} }
@ -3555,7 +3555,7 @@ NodeWindowAgent::delete_mark()
mcatch_any() mcatch_any()
{ {
message_mgr().error_dialog ( message_mgr().error_dialog (
(char*)UAS_String(CATGETS(Set_Messages, 11, (char*)UAS_String(MCATGETS(Set_Messages, 11,
"Dtinfo is unable to delete this bookmark.")), "Dtinfo is unable to delete this bookmark.")),
(Widget)f_shell); (Widget)f_shell);
} }
@ -3606,7 +3606,7 @@ NodeWindowAgent::move_markCB(Widget, XtPointer client_data, XtPointer)
mcatch_any() mcatch_any()
{ {
message_mgr().error_dialog ( message_mgr().error_dialog (
(char*)UAS_String(CATGETS(Set_Messages, 12, (char*)UAS_String(MCATGETS(Set_Messages, 12,
"Dtinfo is unable to remove this bookmark.")), "Dtinfo is unable to remove this bookmark.")),
(Widget)f_shell); (Widget)f_shell);
} }
@ -3667,10 +3667,10 @@ NodeWindowAgent::detach_graphic()
WArgList (XmNdialogType, XmDIALOG_INFORMATION, NULL)); WArgList (XmNdialogType, XmDIALOG_INFORMATION, NULL));
WXmDialogShell shell (info_dialog.Parent()); WXmDialogShell shell (info_dialog.Parent());
// set window title // set window title
String string = CATGETS(Set_Messages, 72, "Dtinfo: Detach Graphic"); String string = MCATGETS(Set_Messages, 72, "Dtinfo: Detach Graphic");
XtVaSetValues((Widget)shell, XmNtitle, string, NULL); XtVaSetValues((Widget)shell, XmNtitle, string, NULL);
info_dialog.MessageString ( info_dialog.MessageString (
(char*)UAS_String(CATGETS(Set_Messages, 73, "Click on graphic"))); (char*)UAS_String(MCATGETS(Set_Messages, 73, "Click on graphic")));
XtUnmanageChild (info_dialog.OkPB()); XtUnmanageChild (info_dialog.OkPB());
XtUnmanageChild (info_dialog.HelpPB()); XtUnmanageChild (info_dialog.HelpPB());
@ -3732,7 +3732,7 @@ NodeWindowAgent::show_locator()
UAS_String locator_str = f_node_ptr->id(); UAS_String locator_str = f_node_ptr->id();
const char *locator = (const char *)locator_str; const char *locator = (const char *)locator_str;
snprintf (buffer, sizeof(buffer), snprintf (buffer, sizeof(buffer),
CATGETS(Set_NodeWindowAgent, 4, MCATGETS(Set_NodeWindowAgent, 4,
"The locator for this section is %s"), locator); "The locator for this section is %s"), locator);
XmTextFieldSetString(f_status_text, buffer); XmTextFieldSetString(f_status_text, buffer);
XmTextFieldSetSelection(f_status_text, XmTextFieldSetSelection(f_status_text,
@ -4048,7 +4048,7 @@ NodeWindowAgent::do_bookmarks(bool move_to_mark)
if (bookmark_errors > 0) if (bookmark_errors > 0)
{ {
message_mgr().error_dialog ( message_mgr().error_dialog (
(char*)UAS_String(CATGETS(Set_Messages, 10, (char*)UAS_String(MCATGETS(Set_Messages, 10,
"Dtinfo is unable to create this bookmark.")), "Dtinfo is unable to create this bookmark.")),
(Widget)f_shell); (Widget)f_shell);
} }
@ -4162,7 +4162,7 @@ NodeWindowAgent::initialize_hierarchy()
if (++depth > 15) if (++depth > 15)
{ {
message_mgr().error_dialog( message_mgr().error_dialog(
(char*)UAS_String(CATGETS(Set_Messages, 13, "File a Bug")), (char*)UAS_String(MCATGETS(Set_Messages, 13, "File a Bug")),
(Widget)f_shell); (Widget)f_shell);
break; break;
} }
@ -4886,7 +4886,7 @@ NodeWindowAgent::show_mark(MarkCanvas *jump_to, bool move_to)
else else
{ {
message_mgr().warning_dialog ( message_mgr().warning_dialog (
(char*)UAS_String(CATGETS(Set_Messages, 14, (char*)UAS_String(MCATGETS(Set_Messages, 14,
"The bookmark cannot be displayed.")), "The bookmark cannot be displayed.")),
(Widget)f_shell); (Widget)f_shell);
} }
@ -5139,7 +5139,7 @@ MarkViewer::receive (ViewMark &message, void* /*client_data*/)
mcatch_any() mcatch_any()
{ {
message_mgr().info_dialog ( message_mgr().info_dialog (
(char*)UAS_String(CATGETS(Set_Messages, 15, (char*)UAS_String(MCATGETS(Set_Messages, 15,
"The bookcase is not accessible."))); "The bookcase is not accessible.")));
} }
end_try; end_try;

2
cde/programs/dtinfo/dtinfo/src/Agents/OutlineListViewMotif.C
View file

@ -1235,7 +1235,7 @@ OutlineListView::activate (WCallback *wcb)
} }
mcatch_any() mcatch_any()
{ {
message_mgr().error_dialog( (char*)UAS_String(CATGETS( message_mgr().error_dialog( (char*)UAS_String(MCATGETS(
Set_UrlAgent, 5, "Document not found." )) ) ; Set_UrlAgent, 5, "Document not found." )) ) ;
} }
end_try; end_try;

58
cde/programs/dtinfo/dtinfo/src/Agents/PrefAgentMotif.C
View file

@ -312,7 +312,7 @@ PrefAgent::create_ui()
f_shell = WTopLevelShell (window_system().toplevel(), WPopup, "preferences"); f_shell = WTopLevelShell (window_system().toplevel(), WPopup, "preferences");
window_system().register_shell(&f_shell); window_system().register_shell(&f_shell);
string = CATGETS(Set_PrefAgent, 1, "Dtinfo: Preferences"); string = MCATGETS(Set_PrefAgent, 1, "Dtinfo: Preferences");
XtVaSetValues((Widget)f_shell, XtVaSetValues((Widget)f_shell,
XmNtitle, string, XmNtitle, string,
XmNmwmDecorations, decorations, XmNmwmDecorations, decorations,
@ -322,7 +322,7 @@ PrefAgent::create_ui()
DECLMC(WXmOptionMenu, options, form, "options"); DECLMC(WXmOptionMenu, options, form, "options");
DECLC (WXmPulldownMenu, options_menu, form, "options_menu"); DECLC (WXmPulldownMenu, options_menu, form, "options_menu");
mtfstring = CATGETS(Set_AgentLabel, 186, "Preferences for"); mtfstring = MCATGETS(Set_AgentLabel, 186, "Preferences for");
XtVaSetValues(options, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(options, XmNlabelString, (XmString)mtfstring, NULL);
ASSNM (WXmPushButton, f_ok, form, "ok"); ASSNM (WXmPushButton, f_ok, form, "ok");
@ -331,15 +331,15 @@ PrefAgent::create_ui()
DECLM (WXmPushButton, cancel, form, "cancel"); DECLM (WXmPushButton, cancel, form, "cancel");
DECLM (WXmPushButton, help, form, "help"); DECLM (WXmPushButton, help, form, "help");
mtfstring = CATGETS(Set_AgentLabel, 161, "OK"); mtfstring = MCATGETS(Set_AgentLabel, 161, "OK");
XtVaSetValues(f_ok, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(f_ok, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 201, "Apply"); mtfstring = MCATGETS(Set_AgentLabel, 201, "Apply");
XtVaSetValues(f_apply, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(f_apply, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 202, "Reset"); mtfstring = MCATGETS(Set_AgentLabel, 202, "Reset");
XtVaSetValues(f_reset, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(f_reset, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 162, "Cancel"); mtfstring = MCATGETS(Set_AgentLabel, 162, "Cancel");
XtVaSetValues(cancel, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(cancel, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 48, "Help"); mtfstring = MCATGETS(Set_AgentLabel, 48, "Help");
XtVaSetValues(help, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(help, XmNlabelString, (XmString)mtfstring, NULL);
SET_CALLBACK (f_ok,Activate,ok); SET_CALLBACK (f_ok,Activate,ok);
@ -366,17 +366,17 @@ PrefAgent::create_ui()
DECLM (WXmLabel, lock_label, browse_form, "lock_label"); DECLM (WXmLabel, lock_label, browse_form, "lock_label");
ASSNM (WXmToggleButton, f_lock_toggle, browse_form, "lock_toggle"); ASSNM (WXmToggleButton, f_lock_toggle, browse_form, "lock_toggle");
mtfstring = CATGETS(Set_AgentLabel, 187, "Browsing"); mtfstring = MCATGETS(Set_AgentLabel, 187, "Browsing");
XtVaSetValues(browse, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(browse, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 190, "Browser Geometry"); mtfstring = MCATGETS(Set_AgentLabel, 190, "Browser Geometry");
XtVaSetValues(browse_label, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(browse_label, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 270, "..."); mtfstring = MCATGETS(Set_AgentLabel, 270, "...");
XtVaSetValues(get_browse_geo, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(get_browse_geo, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 192, "Font Scale"); mtfstring = MCATGETS(Set_AgentLabel, 192, "Font Scale");
XtVaSetValues(fs_label, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(fs_label, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 193, "Pin Window"); mtfstring = MCATGETS(Set_AgentLabel, 193, "Pin Window");
XtVaSetValues(lock_label, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(lock_label, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 194, "File a Bug"); mtfstring = MCATGETS(Set_AgentLabel, 194, "File a Bug");
XtVaSetValues(f_lock_toggle, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(f_lock_toggle, XmNlabelString, (XmString)mtfstring, NULL);
Dimension height; Dimension height;
@ -425,15 +425,15 @@ PrefAgent::create_ui()
DECLM (WXmLabel, update_label, map_form, "update_label"); DECLM (WXmLabel, update_label, map_form, "update_label");
ASSNM (WXmToggleButton, f_update_toggle, map_form, "update_toggle"); ASSNM (WXmToggleButton, f_update_toggle, map_form, "update_toggle");
mtfstring = CATGETS(Set_AgentLabel, 188, "Map"); mtfstring = MCATGETS(Set_AgentLabel, 188, "Map");
XtVaSetValues(map, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(map, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 195, "Map Geometry"); mtfstring = MCATGETS(Set_AgentLabel, 195, "Map Geometry");
XtVaSetValues(map_label, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(map_label, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 270, "..."); mtfstring = MCATGETS(Set_AgentLabel, 270, "...");
XtVaSetValues(get_map_geo, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(get_map_geo, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 196, "Auto Update"); mtfstring = MCATGETS(Set_AgentLabel, 196, "Auto Update");
XtVaSetValues(update_label, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(update_label, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 194, "File a Bug"); mtfstring = MCATGETS(Set_AgentLabel, 194, "File a Bug");
XtVaSetValues(f_update_toggle, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(f_update_toggle, XmNlabelString, (XmString)mtfstring, NULL);
height = f_map_geo.Height(); height = f_map_geo.Height();
@ -451,7 +451,7 @@ PrefAgent::create_ui()
// Create history preferences // Create history preferences
DECLM (WXmPushButton, history, options_menu, "history"); DECLM (WXmPushButton, history, options_menu, "history");
mtfstring = CATGETS(Set_AgentLabel, 260, "History"); mtfstring = MCATGETS(Set_AgentLabel, 260, "History");
XtVaSetValues(history, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(history, XmNlabelString, (XmString)mtfstring, NULL);
DECL (WXmForm, hist_form, container, "history_prefs"); DECL (WXmForm, hist_form, container, "history_prefs");
@ -466,9 +466,9 @@ PrefAgent::create_ui()
DECLM (WXmArrowButton, sh_up, sh_form, "sh_up"); DECLM (WXmArrowButton, sh_up, sh_form, "sh_up");
DECLM (WXmArrowButton, sh_down, sh_form, "sh_down"); DECLM (WXmArrowButton, sh_down, sh_form, "sh_down");
mtfstring = CATGETS(Set_AgentLabel, 197, "Section History Size"); mtfstring = MCATGETS(Set_AgentLabel, 197, "Section History Size");
XtVaSetValues(nh_label, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(nh_label, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 198, "Search History Size"); mtfstring = MCATGETS(Set_AgentLabel, 198, "Search History Size");
XtVaSetValues(sh_label, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(sh_label, XmNlabelString, (XmString)mtfstring, NULL);
height = f_nh_field.Height(); height = f_nh_field.Height();
@ -511,7 +511,7 @@ PrefAgent::create_ui()
DECLM (WXmPushButton, search, options_menu, "search"); DECLM (WXmPushButton, search, options_menu, "search");
mtfstring = CATGETS(Set_AgentLabel, 189, "Searching"); mtfstring = MCATGETS(Set_AgentLabel, 189, "Searching");
XtVaSetValues(search, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(search, XmNlabelString, (XmString)mtfstring, NULL);
DECL (WXmForm, search_form, container, "search_prefs"); DECL (WXmForm, search_form, container, "search_prefs");
@ -523,11 +523,11 @@ PrefAgent::create_ui()
DECLM (WXmLabel, adisplay_label, search_form, "adisplay_label"); DECLM (WXmLabel, adisplay_label, search_form, "adisplay_label");
ASSNM (WXmToggleButton, f_adisplay_toggle, search_form, "adisplay_toggle"); ASSNM (WXmToggleButton, f_adisplay_toggle, search_form, "adisplay_toggle");
mtfstring = CATGETS(Set_AgentLabel, 199, "Maximum Search Hits"); mtfstring = MCATGETS(Set_AgentLabel, 199, "Maximum Search Hits");
XtVaSetValues(max_hits_label, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(max_hits_label, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 200, "Auto Display First Hit"); mtfstring = MCATGETS(Set_AgentLabel, 200, "Auto Display First Hit");
XtVaSetValues(adisplay_label, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(adisplay_label, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 194, "File a Bug"); mtfstring = MCATGETS(Set_AgentLabel, 194, "File a Bug");
XtVaSetValues(f_adisplay_toggle, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(f_adisplay_toggle, XmNlabelString, (XmString)mtfstring, NULL);
height = f_max_hits_field.Height(); height = f_max_hits_field.Height();
@ -963,7 +963,7 @@ void
PrefAgent::set_update (bool set) PrefAgent::set_update (bool set)
{ {
XmStringLocalized mtfstring = XmStringLocalized mtfstring =
CATGETS(Set_AgentLabel, set? 203 : 204, set ? "On" : "Off"); MCATGETS(Set_AgentLabel, set? 203 : 204, set ? "On" : "Off");
XtVaSetValues(f_update_toggle, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(f_update_toggle, XmNlabelString, (XmString)mtfstring, NULL);
@ -1022,7 +1022,7 @@ void
PrefAgent::set_auto_display (bool set) PrefAgent::set_auto_display (bool set)
{ {
XmStringLocalized mtfstring = XmStringLocalized mtfstring =
CATGETS(Set_AgentLabel, set? 203 : 204, set ? "On" : "Off"); MCATGETS(Set_AgentLabel, set? 203 : 204, set ? "On" : "Off");
XtVaSetValues(f_adisplay_toggle, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(f_adisplay_toggle, XmNlabelString, (XmString)mtfstring, NULL);
@ -1072,11 +1072,11 @@ PrefAgent::get_geometry (WCallback *wcb)
WArgList (XmNdialogType, XmDIALOG_INFORMATION, NULL)); WArgList (XmNdialogType, XmDIALOG_INFORMATION, NULL));
WXmDialogShell shell (info_dialog.Parent()); WXmDialogShell shell (info_dialog.Parent());
// set window title // set window title
String string = CATGETS(Set_PrefAgent, 2, "Dtinfo: Get Geometry"); String string = MCATGETS(Set_PrefAgent, 2, "Dtinfo: Get Geometry");
XtVaSetValues((Widget)shell, XmNtitle, string, NULL); XtVaSetValues((Widget)shell, XmNtitle, string, NULL);
// window_system().register_full_modal_shell (&shell); // window_system().register_full_modal_shell (&shell);
info_dialog.MessageString ( info_dialog.MessageString (
(char*)UAS_String(CATGETS(Set_Messages, 16, "File a Bug"))); (char*)UAS_String(MCATGETS(Set_Messages, 16, "File a Bug")));
XtUnmanageChild (info_dialog.OkPB()); XtUnmanageChild (info_dialog.OkPB());
XtUnmanageChild (info_dialog.HelpPB()); XtUnmanageChild (info_dialog.HelpPB());

24
cde/programs/dtinfo/dtinfo/src/Agents/PrintPanelAgentMotif.C
View file

@ -272,7 +272,7 @@ customizePrintSetupBox(AppPrintData *p)
XmNmarginHeight, 2, XmNmarginHeight, 2,
NULL); NULL);
label = XmStringGenerate(CATGETS(Set_AgentLabel, 205, "Number of Sections"), label = XmStringGenerate(MCATGETS(Set_AgentLabel, 205, "Number of Sections"),
NULL, XmCHARSET_TEXT, NULL); NULL, XmCHARSET_TEXT, NULL);
XtVaCreateManagedWidget("how_many_title", XtVaCreateManagedWidget("how_many_title",
@ -289,7 +289,7 @@ customizePrintSetupBox(AppPrintData *p)
how_many_frame, how_many_frame,
NULL); NULL);
label = XmStringGenerate(CATGETS(Set_AgentLabel, 206, "Selected:"), label = XmStringGenerate(MCATGETS(Set_AgentLabel, 206, "Selected:"),
NULL, XmCHARSET_TEXT, NULL); NULL, XmCHARSET_TEXT, NULL);
selected_label = XtVaCreateManagedWidget("selected_label", selected_label = XtVaCreateManagedWidget("selected_label",
@ -314,7 +314,7 @@ customizePrintSetupBox(AppPrintData *p)
XmNtopOffset, 2, XmNtopOffset, 2,
NULL); NULL);
label = XmStringGenerate(CATGETS(Set_AgentLabel, 207, "To Be Printed:"), label = XmStringGenerate(MCATGETS(Set_AgentLabel, 207, "To Be Printed:"),
NULL, XmCHARSET_TEXT, NULL); NULL, XmCHARSET_TEXT, NULL);
XtVaCreateManagedWidget("to_print_label", XtVaCreateManagedWidget("to_print_label",
@ -357,7 +357,7 @@ customizePrintSetupBox(AppPrintData *p)
XmNrightOffset, 5, XmNrightOffset, 5,
NULL); NULL);
label = XmStringGenerate(CATGETS(Set_AgentLabel, 209, "What to Print"), label = XmStringGenerate(MCATGETS(Set_AgentLabel, 209, "What to Print"),
NULL, XmCHARSET_TEXT, NULL); NULL, XmCHARSET_TEXT, NULL);
XtVaCreateManagedWidget("what_title", XtVaCreateManagedWidget("what_title",
@ -373,7 +373,7 @@ customizePrintSetupBox(AppPrintData *p)
what_frame, what_frame,
NULL); NULL);
label = XmStringGenerate(CATGETS(Set_AgentLabel, 210, "Sections"), label = XmStringGenerate(MCATGETS(Set_AgentLabel, 210, "Sections"),
NULL, XmCHARSET_TEXT, NULL); NULL, XmCHARSET_TEXT, NULL);
f_print_nodes = print_nodes = XtVaCreateManagedWidget("print_nodes", f_print_nodes = print_nodes = XtVaCreateManagedWidget("print_nodes",
@ -393,7 +393,7 @@ customizePrintSetupBox(AppPrintData *p)
XmStringFree(label); XmStringFree(label);
XtAddCallback(print_nodes, XmNvalueChangedCallback, ToggleWhatCB, p); XtAddCallback(print_nodes, XmNvalueChangedCallback, ToggleWhatCB, p);
label = XmStringGenerate(CATGETS(Set_AgentLabel, 211, "Hierarchy"), label = XmStringGenerate(MCATGETS(Set_AgentLabel, 211, "Hierarchy"),
NULL, XmCHARSET_TEXT, NULL); NULL, XmCHARSET_TEXT, NULL);
f_print_hierarchy = XtVaCreateManagedWidget("print_hierarchy", f_print_hierarchy = XtVaCreateManagedWidget("print_hierarchy",
@ -445,7 +445,7 @@ PdmNotifyCB(Widget pr_shell, XtPointer client_data, XtPointer call_data)
(pr_cbs->reason == XmCR_PDM_START_VXAUTH) || (pr_cbs->reason == XmCR_PDM_START_VXAUTH) ||
(pr_cbs->reason == XmCR_PDM_START_PXAUTH)) (pr_cbs->reason == XmCR_PDM_START_PXAUTH))
{ {
msg = CATGETS(Set_PrintPanelAgent, 12, "Print Dialog Manager error - setup failed."); msg = MCATGETS(Set_PrintPanelAgent, 12, "Print Dialog Manager error - setup failed.");
message_mgr().error_dialog(msg); message_mgr().error_dialog(msg);
} }
@ -548,7 +548,7 @@ PrintSetupCB(Widget print_dialog, XtPointer client_data, XtPointer call_data)
if (XmPrintPopupPDM(p->f_print_shell, print_dialog) if (XmPrintPopupPDM(p->f_print_shell, print_dialog)
!= XmPDM_NOTIFY_SUCCESS) { != XmPDM_NOTIFY_SUCCESS) {
/* post a message error dialog */ /* post a message error dialog */
msg = CATGETS(Set_PrintPanelAgent, 6, "Unable to display the Print Dialog Manager"); msg = MCATGETS(Set_PrintPanelAgent, 6, "Unable to display the Print Dialog Manager");
message_mgr().error_dialog(msg); message_mgr().error_dialog(msg);
RCS_DEBUG("XmPrintPopupPDM failed\n"); RCS_DEBUG("XmPrintPopupPDM failed\n");
} }
@ -642,7 +642,7 @@ CreatePrintSetup(Widget parent, AppPrintData* p)
// additional dialog resources // additional dialog resources
XmString title = XmStringCreateLocalized( XmString title = XmStringCreateLocalized(
CATGETS(Set_PrintPanelAgent, 1, "Dtinfo: Print")); MCATGETS(Set_PrintPanelAgent, 1, "Dtinfo: Print"));
XtSetArg(args[n], XmNdialogTitle, title); n++; XtSetArg(args[n], XmNdialogTitle, title); n++;
XtSetArg(args[n], (char*)DtNworkAreaLocation, DtWORK_AREA_BOTTOM); n++; XtSetArg(args[n], (char*)DtNworkAreaLocation, DtWORK_AREA_BOTTOM); n++;
@ -782,14 +782,14 @@ FinishPrintToFile(Display *display,
if (status != XPGetDocFinished) { if (status != XPGetDocFinished) {
msg = CATGETS(Set_PrintPanelAgent, 8, "Error printing to file"); msg = MCATGETS(Set_PrintPanelAgent, 8, "Error printing to file");
message_mgr().error_dialog(msg); message_mgr().error_dialog(msg);
RCS_DEBUG("Something went wrong with XmPrintToFile...\n"); RCS_DEBUG("Something went wrong with XmPrintToFile...\n");
} }
else { else {
msg = CATGETS(Set_PrintPanelAgent, 9, "Print to file completed."); msg = MCATGETS(Set_PrintPanelAgent, 9, "Print to file completed.");
message_mgr().info_dialog(msg); message_mgr().info_dialog(msg);
RCS_DEBUG("XmPrintToFile completed OK\n"); RCS_DEBUG("XmPrintToFile completed OK\n");
@ -886,7 +886,7 @@ DoPrint(Widget widget, AppPrintData * p)
// Post an error dialog // Post an error dialog
msg = CATGETS(Set_PrintPanelAgent, msg = MCATGETS(Set_PrintPanelAgent,
11, 11,
"Print Job Failed.\n\nThe X Print Server is Temporarily Out of Resources."); "Print Job Failed.\n\nThe X Print Server is Temporarily Out of Resources.");
message_mgr().error_dialog(msg); message_mgr().error_dialog(msg);

8
cde/programs/dtinfo/dtinfo/src/Agents/SearchHistoryListViewMotif.C
View file

@ -203,9 +203,9 @@ SearchHistoryListView::child_create_ui_pre(WXmForm &form)
int number_width = WXmString("0").Width(header_font); int number_width = WXmString("0").Width(header_font);
WXmString matchString = CATGETS(Set_AgentLabel, 246, "Matches"); WXmString matchString = MCATGETS(Set_AgentLabel, 246, "Matches");
WXmString scopeString = CATGETS(Set_AgentLabel, 243, "Scope"); WXmString scopeString = MCATGETS(Set_AgentLabel, 243, "Scope");
WXmString queryString = CATGETS(Set_AgentLabel, 230, "Query"); WXmString queryString = MCATGETS(Set_AgentLabel, 230, "Query");
int scope_offset = 8 * number_width; int scope_offset = 8 * number_width;
@ -284,5 +284,5 @@ SearchHistoryListView::display()
cerr << "done." << endl; cerr << "done." << endl;
#endif #endif
XtVaSetValues(*f_shell, XmNtitle, XtVaSetValues(*f_shell, XmNtitle,
CATGETS(Set_SearchHistoryList, 1, "Dtinfo: Search History"), NULL); MCATGETS(Set_SearchHistoryList, 1, "Dtinfo: Search History"), NULL);
} }

22
cde/programs/dtinfo/dtinfo/src/Agents/SearchResultsAgentMotif.C
View file

@ -247,8 +247,8 @@ SearchResultsAgent::compose_header()
WXmLabel* header = WXmLabel* header =
(WXmLabel*)XtNameToWidget((Widget)*f_list_form, "header"); (WXmLabel*)XtNameToWidget((Widget)*f_list_form, "header");
WXmString bookString = CATGETS(Set_AgentLabel, 184, "Book"); WXmString bookString = MCATGETS(Set_AgentLabel, 184, "Book");
WXmString sectString = CATGETS(Set_AgentLabel, 185, "Section"); WXmString sectString = MCATGETS(Set_AgentLabel, 185, "Section");
WXmString bookPostfix( WXmString bookPostfix(
window_system().make_space( window_system().make_space(
@ -313,7 +313,7 @@ SearchResultsAgent::display (ResultID *results)
// NOTE: Using bogus internal string below: // NOTE: Using bogus internal string below:
if (f_scale == 0) if (f_scale == 0)
message_mgr().warning_dialog ( message_mgr().warning_dialog (
(char*)UAS_String(CATGETS(Set_Messages, 69, (char*)UAS_String(MCATGETS(Set_Messages, 69,
"Search results weighting are not available."))); "Search results weighting are not available.")));
/* -------- Display the number of hits. -------- */ /* -------- Display the number of hits. -------- */
@ -452,7 +452,7 @@ SearchResultsAgent::create_window()
XmStringLocalized mtfstring; XmStringLocalized mtfstring;
String string; String string;
string = CATGETS(Set_SearchResultsAgent, 1, "Dtinfo: Search Results"); string = MCATGETS(Set_SearchResultsAgent, 1, "Dtinfo: Search Results");
XtVaSetValues((Widget)*f_shell, XmNtitle, string, NULL); XtVaSetValues((Widget)*f_shell, XmNtitle, string, NULL);
help_agent().add_activate_help(f_help, (char*)"results_help"); help_agent().add_activate_help(f_help, (char*)"results_help");
@ -477,15 +477,15 @@ SearchResultsAgent::create_window()
f_scope_label = (WXmLabel*)(Widget) WXmLabel (*f_form, "scope_name", AM); f_scope_label = (WXmLabel*)(Widget) WXmLabel (*f_form, "scope_name", AM);
WXmLabel query_label (*f_form, "query_label", AM); WXmLabel query_label (*f_form, "query_label", AM);
mtfstring = CATGETS(Set_AgentLabel, 219, "Retrieved:"); mtfstring = MCATGETS(Set_AgentLabel, 219, "Retrieved:");
XtVaSetValues(retrieved, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(retrieved, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 194, "File a Bug"); mtfstring = MCATGETS(Set_AgentLabel, 194, "File a Bug");
XtVaSetValues((Widget)f_hits_label, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues((Widget)f_hits_label, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 220, "Scope:"); mtfstring = MCATGETS(Set_AgentLabel, 220, "Scope:");
XtVaSetValues(scope, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(scope, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 194, "File a Bug"); mtfstring = MCATGETS(Set_AgentLabel, 194, "File a Bug");
XtVaSetValues((Widget)f_scope_label, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues((Widget)f_scope_label, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 221, "Query:"); mtfstring = MCATGETS(Set_AgentLabel, 221, "Query:");
XtVaSetValues(query_label, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(query_label, XmNlabelString, (XmString)mtfstring, NULL);
Widget textw = XmCreateScrolledText (*f_pane, (char*)"query_text", NULL, 0); Widget textw = XmCreateScrolledText (*f_pane, (char*)"query_text", NULL, 0);
@ -600,7 +600,7 @@ SearchResultsAgent::view_activate (WCallback *)
} }
else { else {
message_mgr().warning_dialog ( message_mgr().warning_dialog (
(char*)UAS_String(CATGETS(Set_Messages, 51, (char*)UAS_String(MCATGETS(Set_Messages, 51,
"The document or section requested is not available."))); "The document or section requested is not available.")));
} }
} }
@ -683,6 +683,6 @@ SearchResultsAgent::modify_verify (WCallback *wcb)
tvp->doit = False; tvp->doit = False;
message_mgr().warning_dialog ( message_mgr().warning_dialog (
(char*)UAS_String(CATGETS(Set_Messages, 47, (char*)UAS_String(MCATGETS(Set_Messages, 47,
"This is a display-only field."))); "This is a display-only field.")));
} }

64
cde/programs/dtinfo/dtinfo/src/Agents/SearchScopeAgentMotif.C
View file

@ -421,7 +421,7 @@ SearchScopeAgent::display()
if (env().debug()) if (env().debug())
{ {
message_mgr().warning_dialog ( message_mgr().warning_dialog (
(char*)UAS_String(CATGETS(Set_Messages, 31, (char*)UAS_String(MCATGETS(Set_Messages, 31,
"Ignoring invalid scopes in your profile."))); "Ignoring invalid scopes in your profile.")));
} }
search_scope_mgr().show_warning(False); search_scope_mgr().show_warning(False);
@ -467,7 +467,7 @@ SearchScopeAgent::create_ui()
f_shell = WTopLevelShell (window_system().toplevel(),WPopup,"scope_editor"); f_shell = WTopLevelShell (window_system().toplevel(),WPopup,"scope_editor");
window_system().register_shell(&f_shell); window_system().register_shell(&f_shell);
string = CATGETS(Set_SearchScopeAgent, 1, "Dtinfo: Search Scope Editor"); string = MCATGETS(Set_SearchScopeAgent, 1, "Dtinfo: Search Scope Editor");
XtVaSetValues((Widget)f_shell, XmNtitle, string, NULL); XtVaSetValues((Widget)f_shell, XmNtitle, string, NULL);
DECL (WXmForm, form, f_shell, "form"); DECL (WXmForm, form, f_shell, "form");
@ -478,9 +478,9 @@ SearchScopeAgent::create_ui()
f_scope_option = WXmOptionMenu (form, (char*)"scope_option", WAutoManage, args, n); f_scope_option = WXmOptionMenu (form, (char*)"scope_option", WAutoManage, args, n);
ASSN (WXmPushButton, f_unnamed, scope_menu, "unnamed"); ASSN (WXmPushButton, f_unnamed, scope_menu, "unnamed");
mtfstring = CATGETS(Set_AgentLabel, 212, "Scope Name"); mtfstring = MCATGETS(Set_AgentLabel, 212, "Scope Name");
XtVaSetValues(f_scope_option, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(f_scope_option, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 213, "Unnamed"); mtfstring = MCATGETS(Set_AgentLabel, 213, "Unnamed");
XtVaSetValues(f_unnamed, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(f_unnamed, XmNlabelString, (XmString)mtfstring, NULL);
ASSNM (WXmPushButton, f_new, form, "new"); ASSNM (WXmPushButton, f_new, form, "new");
@ -496,23 +496,23 @@ SearchScopeAgent::create_ui()
DECLM (WXmLabel, bookshelf, form, "books"); DECLM (WXmLabel, bookshelf, form, "books");
DECLM (WXmLabel, components, form, "components"); DECLM (WXmLabel, components, form, "components");
mtfstring = CATGETS(Set_AgentLabel, 214, "Books"); mtfstring = MCATGETS(Set_AgentLabel, 214, "Books");
XtVaSetValues(bookshelf, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(bookshelf, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 215, "Components"); mtfstring = MCATGETS(Set_AgentLabel, 215, "Components");
XtVaSetValues(components, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(components, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 216, "New"); mtfstring = MCATGETS(Set_AgentLabel, 216, "New");
XtVaSetValues(f_new, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(f_new, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 217, "Save"); mtfstring = MCATGETS(Set_AgentLabel, 217, "Save");
XtVaSetValues(f_save, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(f_save, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 218, "Rename"); mtfstring = MCATGETS(Set_AgentLabel, 218, "Rename");
XtVaSetValues(f_rename, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(f_rename, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 183, "Delete"); mtfstring = MCATGETS(Set_AgentLabel, 183, "Delete");
XtVaSetValues(f_delete, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(f_delete, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 202, "Reset"); mtfstring = MCATGETS(Set_AgentLabel, 202, "Reset");
XtVaSetValues(f_reset, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(f_reset, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 12, "Close"); mtfstring = MCATGETS(Set_AgentLabel, 12, "Close");
XtVaSetValues(close, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(close, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 48, "Help"); mtfstring = MCATGETS(Set_AgentLabel, 48, "Help");
XtVaSetValues(help, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(help, XmNlabelString, (XmString)mtfstring, NULL);
// WARNING: the widget name, infobases, is used else where--do not alter. // WARNING: the widget name, infobases, is used else where--do not alter.
@ -592,7 +592,7 @@ SearchScopeAgent::new_scope()
if (f_reset.Sensitive()) if (f_reset.Sensitive())
{ {
bool dosave = message_mgr().question_dialog ( bool dosave = message_mgr().question_dialog (
(char*)UAS_String(CATGETS(Set_Messages, 17, (char*)UAS_String(MCATGETS(Set_Messages, 17,
"Do you want to save changes to the current scope?"))); "Do you want to save changes to the current scope?")));
if (dosave) if (dosave)
save_scope(); save_scope();
@ -646,9 +646,9 @@ SearchScopeAgent::scope_name_prompt()
*((char *) memcpy(default_name, scope_name, len) + len) = '\0'; *((char *) memcpy(default_name, scope_name, len) + len) = '\0';
message_mgr().set_max_length(default_name_len); message_mgr().set_max_length(default_name_len);
scope_name = message_mgr().get_string( scope_name = message_mgr().get_string(
(char*)UAS_String(CATGETS(Set_SearchScopeAgent, 2, (char*)UAS_String(MCATGETS(Set_SearchScopeAgent, 2,
"Enter the scope name to save as:")), "Enter the scope name to save as:")),
(char*)UAS_String(CATGETS(Set_SearchScopeAgent, 3, (char*)UAS_String(MCATGETS(Set_SearchScopeAgent, 3,
"Dtinfo: Save Scope")), "Dtinfo: Save Scope")),
default_name); default_name);
@ -665,14 +665,14 @@ SearchScopeAgent::scope_name_prompt()
if (strpbrk (scope_name, ":,;") != NULL) if (strpbrk (scope_name, ":,;") != NULL)
{ {
message_mgr().error_dialog ( message_mgr().error_dialog (
(char*)UAS_String(CATGETS(Set_Messages, 18, (char*)UAS_String(MCATGETS(Set_Messages, 18,
"You cannot use a colon, comma or semicolon in a search scope name."))); "You cannot use a colon, comma or semicolon in a search scope name.")));
} }
// look for empty scope name // look for empty scope name
else if (*scope_name == '\0') else if (*scope_name == '\0')
{ {
message_mgr().error_dialog ( message_mgr().error_dialog (
(char*)UAS_String(CATGETS(Set_Messages, 19, (char*)UAS_String(MCATGETS(Set_Messages, 19,
"Please choose a non-empty scope name."))); "Please choose a non-empty scope name.")));
} }
// look for name too long // look for name too long
@ -683,7 +683,7 @@ SearchScopeAgent::scope_name_prompt()
// max char length has changed to 20, the message should // max char length has changed to 20, the message should
// be changed to reflect that--or just removed. // be changed to reflect that--or just removed.
message_mgr().error_dialog ( message_mgr().error_dialog (
(char*)UAS_String(CATGETS(Set_Messages, 20, (char*)UAS_String(MCATGETS(Set_Messages, 20,
"A search scope name may not exceed 30 characters."))); "A search scope name may not exceed 30 characters.")));
} }
// look for duplicate scope name // look for duplicate scope name
@ -698,7 +698,7 @@ SearchScopeAgent::scope_name_prompt()
if (s != 0) if (s != 0)
{ {
message_mgr().error_dialog ( message_mgr().error_dialog (
(char*)UAS_String(CATGETS(Set_Messages, 21, (char*)UAS_String(MCATGETS(Set_Messages, 21,
"The name you entered is already in use."))); "The name you entered is already in use.")));
} }
else else
@ -1044,7 +1044,7 @@ SearchScopeAgent::close()
if (f_reset.Sensitive()) if (f_reset.Sensitive())
{ {
bool dosave = message_mgr().question_dialog ( bool dosave = message_mgr().question_dialog (
(char*)UAS_String(CATGETS(Set_Messages, 17, (char*)UAS_String(MCATGETS(Set_Messages, 17,
"Do you want to save changes to the current scope?"))); "Do you want to save changes to the current scope?")));
if (dosave) if (dosave)
save_scope(); save_scope();
@ -1241,14 +1241,14 @@ SearchScopeAgent::generate_component_list()
OutlineList *parts = new OutlineList (10); OutlineList *parts = new OutlineList (10);
OutlineElement *oe; OutlineElement *oe;
ADD (components, CATGETS(Set_Messages, 22, "Everything"), parts, True); ADD (components, MCATGETS(Set_Messages, 22, "Everything"), parts, True);
ADD (parts, CATGETS(Set_Messages, 23, "Titles"), 0, False); ADD (parts, MCATGETS(Set_Messages, 23, "Titles"), 0, False);
ADD (parts, CATGETS(Set_Messages, 24, "Body"), 0, False); ADD (parts, MCATGETS(Set_Messages, 24, "Body"), 0, False);
ADD (parts, CATGETS(Set_Messages, 25, "Examples"), 0, False); ADD (parts, MCATGETS(Set_Messages, 25, "Examples"), 0, False);
ADD (parts, CATGETS(Set_Messages, 26, "Index"), 0, False); ADD (parts, MCATGETS(Set_Messages, 26, "Index"), 0, False);
ADD (parts, CATGETS(Set_Messages, 27, "Tables"), 0, False); ADD (parts, MCATGETS(Set_Messages, 27, "Tables"), 0, False);
#ifndef DtinfoClient #ifndef DtinfoClient
ADD (parts, CATGETS(Set_Messages, 28, "Graphics"), 0, False); ADD (parts, MCATGETS(Set_Messages, 28, "Graphics"), 0, False);
#endif #endif
return (components); return (components);
@ -1493,7 +1493,7 @@ SearchScopeAgent::select_scope (WCallback *wcb)
if (f_reset.Sensitive()) if (f_reset.Sensitive())
{ {
bool dosave = message_mgr().question_dialog ( bool dosave = message_mgr().question_dialog (
(char*)UAS_String(CATGETS(Set_Messages, 17, (char*)UAS_String(MCATGETS(Set_Messages, 17,
"Do you want to save changes to the current scope?"))); "Do you want to save changes to the current scope?")));
if (dosave) if (dosave)
save_scope(); save_scope();
@ -1545,7 +1545,7 @@ SearchScopeAgent::delete_scope()
Xassert (f_current_scope != NULL); Xassert (f_current_scope != NULL);
bool doit = message_mgr().question_dialog ( bool doit = message_mgr().question_dialog (
(char*)UAS_String(CATGETS(Set_Messages, 29, (char*)UAS_String(MCATGETS(Set_Messages, 29,
"Are you sure you want to delete the scope?"))); "Are you sure you want to delete the scope?")));
if (!doit) if (!doit)
return; return;
@ -1623,7 +1623,7 @@ SearchScopeAgent::add_infolib(UAS_Pointer<UAS_Common> &lib)
// find the scope // find the scope
scope = get_search_scope((char*)UAS_String( scope = get_search_scope((char*)UAS_String(
CATGETS(Set_SearchScopeAgent, 4, "All Libraries"))); MCATGETS(Set_SearchScopeAgent, 4, "All Libraries")));
// get a list of all bookcases // get a list of all bookcases
UAS_PtrList<UAS_BookcaseEntry>bcases = bookcase_list(); UAS_PtrList<UAS_BookcaseEntry>bcases = bookcase_list();
@ -1712,7 +1712,7 @@ SearchScopeAgent::remove_infolib(UAS_Pointer<UAS_Common> &lib)
// find the scope // find the scope
scope = get_search_scope((char*)UAS_String( scope = get_search_scope((char*)UAS_String(
CATGETS(Set_SearchScopeAgent, 4, "All Libraries"))); MCATGETS(Set_SearchScopeAgent, 4, "All Libraries")));
// get a list of all bookcases // get a list of all bookcases
UAS_PtrList<UAS_BookcaseEntry>bcases = bookcase_list(); UAS_PtrList<UAS_BookcaseEntry>bcases = bookcase_list();

6
cde/programs/dtinfo/dtinfo/src/Agents/SearchScopeList.C
View file

@ -293,7 +293,7 @@ SearchScopeList::restore()
// Create the scope for the Current Section // Create the scope for the Current Section
// //
s = f_search_scope_agent->create_scope( s = f_search_scope_agent->create_scope(
(char*)UAS_String(CATGETS(Set_Messages, 30, "Current Section")), (char*)UAS_String(MCATGETS(Set_Messages, 30, "Current Section")),
bcases, f_section, FALSE); bcases, f_section, FALSE);
s->set_read_only(); s->set_read_only();
@ -302,7 +302,7 @@ SearchScopeList::restore()
// //
bcases = f_search_scope_agent->bookcase_list(); bcases = f_search_scope_agent->bookcase_list();
s = f_search_scope_agent->create_scope( s = f_search_scope_agent->create_scope(
(char*)UAS_String(CATGETS(Set_SearchScopeAgent, 4, "All Libraries")), (char*)UAS_String(MCATGETS(Set_SearchScopeAgent, 4, "All Libraries")),
bcases, f_all, FALSE); bcases, f_all, FALSE);
s->set_read_only(); s->set_read_only();
bcases.clear(); bcases.clear();
@ -325,7 +325,7 @@ SearchScopeList::restore()
// yet been realized. Just set the flag so dialog can be // yet been realized. Just set the flag so dialog can be
// shown later. // shown later.
// message_mgr().warning_dialog ( // message_mgr().warning_dialog (
// (char*)UAS_String(CATGETS(Set_Messages, 31, // (char*)UAS_String(MCATGETS(Set_Messages, 31,
// "Ignoring invalid scopes in your profile."))); // "Ignoring invalid scopes in your profile.")));
} }

30
cde/programs/dtinfo/dtinfo/src/Agents/UrlAgentMotif.C
View file

@ -121,7 +121,7 @@ UrlAgent::document( char *locator,
((locator != NULL) && ( *locator == '\0' )) ) ((locator != NULL) && ( *locator == '\0' )) )
{ {
// checked here to avoid less specific error return, later // checked here to avoid less specific error return, later
message_mgr().error_dialog( (char*)UAS_String(CATGETS( message_mgr().error_dialog( (char*)UAS_String(MCATGETS(
Set_UrlAgent, ERR_NO_LOCATOR, Set_UrlAgent, ERR_NO_LOCATOR,
"No locator value provided." )) ) ; "No locator value provided." )) ) ;
return (sts = BAD_ARG_FORMAT); return (sts = BAD_ARG_FORMAT);
@ -155,7 +155,7 @@ UrlAgent::document( char *locator,
} }
else else
{ {
message_mgr().error_dialog( (char*)UAS_String(CATGETS( message_mgr().error_dialog( (char*)UAS_String(MCATGETS(
Set_UrlAgent, ERR_LOCATOR_FORMAT, Set_UrlAgent, ERR_LOCATOR_FORMAT,
"Locator specification format error." )) ) ; "Locator specification format error." )) ) ;
sts = BAD_ARG_FORMAT ; sts = BAD_ARG_FORMAT ;
@ -176,7 +176,7 @@ UrlAgent::document( char *locator,
} }
mcatch_any() mcatch_any()
{ {
message_mgr().error_dialog( (char*)UAS_String(CATGETS( message_mgr().error_dialog( (char*)UAS_String(MCATGETS(
Set_UrlAgent, ERR_LOCATOR_RESOLUTION, Set_UrlAgent, ERR_LOCATOR_RESOLUTION,
"Locator resolution failed." )) ) ; "Locator resolution failed." )) ) ;
@ -251,7 +251,7 @@ UrlAgent::print_document(char *locator)
// checked here to avoid less specific error return, later // checked here to avoid less specific error return, later
if (!(window_system().videoShell()->silent)) { if (!(window_system().videoShell()->silent)) {
message_mgr().error_dialog( (char*)UAS_String(CATGETS( message_mgr().error_dialog( (char*)UAS_String(MCATGETS(
Set_UrlAgent, ERR_NO_LOCATOR, Set_UrlAgent, ERR_NO_LOCATOR,
"No locator value provided." )) ) ; "No locator value provided." )) ) ;
} }
@ -287,7 +287,7 @@ UrlAgent::print_document(char *locator)
else else
{ {
if ((!window_system().videoShell()->silent)) { if ((!window_system().videoShell()->silent)) {
message_mgr().error_dialog( (char*)UAS_String(CATGETS( message_mgr().error_dialog( (char*)UAS_String(MCATGETS(
Set_UrlAgent, ERR_LOCATOR_FORMAT, Set_UrlAgent, ERR_LOCATOR_FORMAT,
"Locator specification format error." )) ) ; "Locator specification format error." )) ) ;
} }
@ -342,7 +342,7 @@ UrlAgent::print_document(char *locator)
{ {
if ((!window_system().videoShell()->silent)) { if ((!window_system().videoShell()->silent)) {
message_mgr().error_dialog( (char*)UAS_String(CATGETS( message_mgr().error_dialog( (char*)UAS_String(MCATGETS(
Set_UrlAgent, ERR_LOCATOR_RESOLUTION, Set_UrlAgent, ERR_LOCATOR_RESOLUTION,
"Locator resolution failed." )) ) ; "Locator resolution failed." )) ) ;
} }
@ -374,7 +374,7 @@ UrlAgent::create_ui () {
XmStringLocalized mtfstring; XmStringLocalized mtfstring;
String string; String string;
string = CATGETS(Set_UrlAgent, 1, "Dtinfo: Open Locator"); string = MCATGETS(Set_UrlAgent, 1, "Dtinfo: Open Locator");
XtVaSetValues((Widget)fShell, XtVaSetValues((Widget)fShell,
XmNtitle, string, XmNtitle, string,
XmNmwmDecorations, decorations, XmNmwmDecorations, decorations,
@ -390,17 +390,17 @@ UrlAgent::create_ui () {
ASSNM (WXmTextField, fTextField, f_form, "text_field"); ASSNM (WXmTextField, fTextField, f_form, "text_field");
DECLM (WXmLabel, label, f_form, "the_label"); DECLM (WXmLabel, label, f_form, "the_label");
mtfstring = CATGETS(Set_AgentLabel, 222, "Enter a Unique Locator:"); mtfstring = MCATGETS(Set_AgentLabel, 222, "Enter a Unique Locator:");
XtVaSetValues(label, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(label, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 161, "OK"); mtfstring = MCATGETS(Set_AgentLabel, 161, "OK");
XtVaSetValues(fOk, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(fOk, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 201, "Apply"); mtfstring = MCATGETS(Set_AgentLabel, 201, "Apply");
XtVaSetValues(fApply, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(fApply, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 223, "Clear"); mtfstring = MCATGETS(Set_AgentLabel, 223, "Clear");
XtVaSetValues(fClear, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(fClear, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 12, "Close"); mtfstring = MCATGETS(Set_AgentLabel, 12, "Close");
XtVaSetValues(close, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(close, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 48, "Help"); mtfstring = MCATGETS(Set_AgentLabel, 48, "Help");
XtVaSetValues(help, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(help, XmNlabelString, (XmString)mtfstring, NULL);
// //
@ -477,13 +477,13 @@ UrlAgent::displayDocument () {
// d->retrieve (); // d->retrieve ();
// } else { // } else {
// message_mgr().error_dialog ((char*) // message_mgr().error_dialog ((char*)
// UAS_String(CATGETS(Set_Messages, 70, // UAS_String(MCATGETS(Set_Messages, 70,
// "Invalid access method in url."))); // "Invalid access method in url.")));
// } // }
// } // }
// mcatch_any() { // mcatch_any() {
// message_mgr().error_dialog ((char*) // message_mgr().error_dialog ((char*)
// UAS_String(CATGETS(Set_Messages, 71, // UAS_String(MCATGETS(Set_Messages, 71,
// "Document creation failed."))); // "Document creation failed.")));
// } // }
// end_try; // end_try;

2
cde/programs/dtinfo/dtinfo/src/Managers/CatMgr.hh
View file

@ -63,6 +63,6 @@ inline CatMgr& msg_catalog_mgr()
return CatMgr::msg_catalog_mgr(); return CatMgr::msg_catalog_mgr();
}; };
#define CATGETS msg_catalog_mgr().catgets #define MCATGETS msg_catalog_mgr().catgets
#endif #endif

12
cde/programs/dtinfo/dtinfo/src/Managers/EnvMgr.C
View file

@ -204,7 +204,7 @@ EnvMgr::init(int argc_i, char** argv_i)
{ {
// invalid infolib--display error message // invalid infolib--display error message
message_mgr().error_dialog ( message_mgr().error_dialog (
(char*)UAS_String(CATGETS(Set_AddLibraryAgent, 7, (char*)UAS_String(MCATGETS(Set_AddLibraryAgent, 7,
"No infolibs found or specified."))); "No infolibs found or specified.")));
return -1; return -1;
} }
@ -349,7 +349,7 @@ EnvMgr::parse_cmdline( int argc_i,
{ {
// invalid infolib--display error message, but not fatal // invalid infolib--display error message, but not fatal
message_mgr().error_dialog ( message_mgr().error_dialog (
(char*)UAS_String(CATGETS(Set_AddLibraryAgent, 5, (char*)UAS_String(MCATGETS(Set_AddLibraryAgent, 5,
"Infolib specification format error."))); "Infolib specification format error.")));
} }
} }
@ -418,7 +418,7 @@ EnvMgr::parse_cmdline( int argc_i,
} }
else else
{ {
cerr << CATGETS(Set_EnvMgr, 2, "Invalid argument") << endl; cerr << MCATGETS(Set_EnvMgr, 2, "Invalid argument") << endl;
return -1; return -1;
} }
} }
@ -428,7 +428,7 @@ EnvMgr::parse_cmdline( int argc_i,
// make sure that if print option was specified that some sections // make sure that if print option was specified that some sections
// to print were also specified. // to print were also specified.
if ( (window_system().videoShell()->print_only) && (f_sectionsArg == (UAS_String)NULL)) { if ( (window_system().videoShell()->print_only) && (f_sectionsArg == (UAS_String)NULL)) {
cerr << CATGETS(Set_EnvMgr, 3, "ERROR: The -sect option must be specified with the -print option.") << endl; cerr << MCATGETS(Set_EnvMgr, 3, "ERROR: The -sect option must be specified with the -print option.") << endl;
cerr << endl; cerr << endl;
usage(); usage();
exit(1); exit(1);
@ -440,7 +440,7 @@ EnvMgr::parse_cmdline( int argc_i,
void void
EnvMgr::usage() EnvMgr::usage()
{ {
cerr << CATGETS(Set_EnvMgr, 4, "Usage: dtinfo") << endl; cerr << MCATGETS(Set_EnvMgr, 4, "Usage: dtinfo") << endl;
cerr << " [-help]" << endl; cerr << " [-help]" << endl;
cerr << " [-l infolib1] [-l infolib2] [...]" << endl; cerr << " [-l infolib1] [-l infolib2] [...]" << endl;
cerr << " [-sect section[-section][,section[-section]]]" << endl; cerr << " [-sect section[-section][,section[-section]]]" << endl;
@ -452,7 +452,7 @@ EnvMgr::usage()
cerr << " [-paperSize]" << endl; cerr << " [-paperSize]" << endl;
cerr << " [-printer x_print_server]]]" << endl; cerr << " [-printer x_print_server]]]" << endl;
cerr << endl; cerr << endl;
cerr << CATGETS(Set_EnvMgr, 5, cerr << MCATGETS(Set_EnvMgr, 5,
"This application understands all standard X Toolkit command-line options.") << endl; "This application understands all standard X Toolkit command-line options.") << endl;
} }

12
cde/programs/dtinfo/dtinfo/src/Managers/MarkMgr.C
View file

@ -194,7 +194,7 @@ MarkMgr::open_base (const char *filename)
if (base == NULL) if (base == NULL)
{ {
message_mgr().error_dialog ((char*)UAS_String( message_mgr().error_dialog ((char*)UAS_String(
CATGETS(Set_Messages, 32, "Your mark base cannot be opened."))); MCATGETS(Set_Messages, 32, "Your mark base cannot be opened.")));
return; return;
} }
@ -219,14 +219,14 @@ MarkMgr::create_mark (UAS_Pointer<UAS_Common> &doc_ptr, const Anchor &anchor,
if (f_num_bases == 0) if (f_num_bases == 0)
{ {
message_mgr().error_dialog ((char*)UAS_String( message_mgr().error_dialog ((char*)UAS_String(
CATGETS(Set_Messages, 33, "Dtinfo mark base was not found.\n" MCATGETS(Set_Messages, 33, "Dtinfo mark base was not found.\n"
"Dtinfo cannot create a bookmark."))); "Dtinfo cannot create a bookmark.")));
return (NULL); return (NULL);
} }
if (!f_can_create) if (!f_can_create)
{ {
message_mgr().error_dialog ((char*)UAS_String( message_mgr().error_dialog ((char*)UAS_String(
CATGETS(Set_Messages, 34, "This mark base provides read-only permissions."))); MCATGETS(Set_Messages, 34, "This mark base provides read-only permissions.")));
return (NULL); return (NULL);
} }
@ -264,7 +264,7 @@ MarkMgr::create_mark (UAS_Pointer<UAS_Common> &doc_ptr, const Anchor &anchor,
assert( n >= 0 ); assert( n >= 0 );
} }
else { else {
trimmed_name = strdup(CATGETS(Set_AgentLabel, 213, "Unnamed")); trimmed_name = strdup(MCATGETS(Set_AgentLabel, 213, "Unnamed"));
} }
#else #else
char *new_name = strdup (name); char *new_name = strdup (name);
@ -310,14 +310,14 @@ MarkMgr::move_mark (UAS_Pointer<UAS_Common> &doc_ptr, const Anchor &anchor,
if (f_num_bases == 0) if (f_num_bases == 0)
{ {
message_mgr().error_dialog ((char*)UAS_String( message_mgr().error_dialog ((char*)UAS_String(
CATGETS(Set_Messages, 33, "Dtinfo mark base was not found.\n" MCATGETS(Set_Messages, 33, "Dtinfo mark base was not found.\n"
"Dtinfo cannot create a bookmark."))); "Dtinfo cannot create a bookmark.")));
return (NULL); return (NULL);
} }
if (!f_can_create) if (!f_can_create)
{ {
message_mgr().error_dialog ((char*)UAS_String( message_mgr().error_dialog ((char*)UAS_String(
CATGETS(Set_Messages, 34, "This mark base provides read-only permissions."))); MCATGETS(Set_Messages, 34, "This mark base provides read-only permissions.")));
return (NULL); return (NULL);
} }

24
cde/programs/dtinfo/dtinfo/src/Managers/MessageMgr.C
View file

@ -86,7 +86,7 @@ DisplayDocumentError::receive (UAS_ErrorMsg &message, void *client_data)
const char *text = message.fErrorMsg; const char *text = message.fErrorMsg;
if (text == NULL) if (text == NULL)
text = (char*)UAS_String(CATGETS(Set_Messages, 35, "File a Bug")); text = (char*)UAS_String(MCATGETS(Set_Messages, 35, "File a Bug"));
message_mgr().error_dialog ((char *) text); message_mgr().error_dialog ((char *) text);
} }
@ -111,7 +111,7 @@ ReportSearchMsg::receive (UAS_SearchMsg &message, void *client_data)
} }
else { else {
message_mgr().error_dialog( message_mgr().error_dialog(
(char*)UAS_String(CATGETS(Set_Messages, 36, "File a Bug"))); (char*)UAS_String(MCATGETS(Set_Messages, 36, "File a Bug")));
} }
} }
@ -294,18 +294,18 @@ MessageMgr::quit_dialog (char *message_text, Widget parent)
// Set labels on buttons // Set labels on buttons
XmStringLocalized mtfstring; XmStringLocalized mtfstring;
mtfstring = CATGETS(Set_AgentLabel, 244, "Yes"); mtfstring = MCATGETS(Set_AgentLabel, 244, "Yes");
XtVaSetValues(XmMessageBoxGetChild(dialog, XmDIALOG_OK_BUTTON), XtVaSetValues(XmMessageBoxGetChild(dialog, XmDIALOG_OK_BUTTON),
XmNlabelString, (XmString)mtfstring, XmNlabelString, (XmString)mtfstring,
NULL); NULL);
mtfstring = CATGETS(Set_AgentLabel, 245, "No"); mtfstring = MCATGETS(Set_AgentLabel, 245, "No");
XtVaSetValues(XmMessageBoxGetChild(dialog, XmDIALOG_CANCEL_BUTTON), XtVaSetValues(XmMessageBoxGetChild(dialog, XmDIALOG_CANCEL_BUTTON),
XmNlabelString, (XmString)mtfstring, XmNlabelString, (XmString)mtfstring,
NULL); NULL);
// Set the window title // Set the window title
Widget shell = XtParent(dialog); Widget shell = XtParent(dialog);
String string = CATGETS(Set_MessageAgent, 5, "Dtinfo: Confirm Quit"); String string = MCATGETS(Set_MessageAgent, 5, "Dtinfo: Confirm Quit");
XtVaSetValues(shell, XtVaSetValues(shell,
XmNminWidth, 200, XmNminWidth, 200,
XmNtitle, (XmString)string, XmNtitle, (XmString)string,
@ -347,7 +347,7 @@ MessageMgr::error_dialog (char *message_text, Widget parent)
// Set the window title // Set the window title
Widget shell = XtParent(dialog); Widget shell = XtParent(dialog);
String string = CATGETS(Set_MessageAgent, 1, "Dtinfo: Error"); String string = MCATGETS(Set_MessageAgent, 1, "Dtinfo: Error");
XtVaSetValues(shell, XmNtitle, string, NULL); XtVaSetValues(shell, XmNtitle, string, NULL);
show_it(dialog); show_it(dialog);
@ -382,7 +382,7 @@ MessageMgr::warning_dialog (char *message_text, Widget parent)
// Set the window title // Set the window title
Widget shell = XtParent(dialog); Widget shell = XtParent(dialog);
String string = CATGETS(Set_MessageAgent, 2, "Dtinfo: Warning"); String string = MCATGETS(Set_MessageAgent, 2, "Dtinfo: Warning");
XtVaSetValues(shell, XmNtitle, string, NULL); XtVaSetValues(shell, XmNtitle, string, NULL);
show_it(dialog); show_it(dialog);
@ -413,7 +413,7 @@ MessageMgr::info_dialog (char *message_text, Widget parent)
// Set the window title // Set the window title
Widget shell = XtParent(dialog); Widget shell = XtParent(dialog);
String string = CATGETS(Set_MessageAgent, 3, "Dtinfo: Information"); String string = MCATGETS(Set_MessageAgent, 3, "Dtinfo: Information");
XtVaSetValues(shell, XmNtitle, string, NULL); XtVaSetValues(shell, XmNtitle, string, NULL);
show_it(dialog); show_it(dialog);
@ -482,11 +482,11 @@ MessageMgr::question_dialog (char *message_text, Widget parent)
// Set labels on buttons // Set labels on buttons
XmStringLocalized mtfstring; XmStringLocalized mtfstring;
mtfstring = CATGETS(Set_AgentLabel, 244, "Yes"); mtfstring = MCATGETS(Set_AgentLabel, 244, "Yes");
XtVaSetValues(XmMessageBoxGetChild(dialog, XmDIALOG_OK_BUTTON), XtVaSetValues(XmMessageBoxGetChild(dialog, XmDIALOG_OK_BUTTON),
XmNlabelString, (XmString)mtfstring, XmNlabelString, (XmString)mtfstring,
NULL); NULL);
mtfstring = CATGETS(Set_AgentLabel, 245, "No"); mtfstring = MCATGETS(Set_AgentLabel, 245, "No");
XtVaSetValues(XmMessageBoxGetChild(dialog, XmDIALOG_CANCEL_BUTTON), XtVaSetValues(XmMessageBoxGetChild(dialog, XmDIALOG_CANCEL_BUTTON),
XmNlabelString, (XmString)mtfstring, XmNlabelString, (XmString)mtfstring,
NULL); NULL);
@ -496,7 +496,7 @@ MessageMgr::question_dialog (char *message_text, Widget parent)
// Set the window title // Set the window title
Widget shell = XtParent(dialog); Widget shell = XtParent(dialog);
String string = CATGETS(Set_MessageAgent, 3, "Dtinfo: Information"); String string = MCATGETS(Set_MessageAgent, 3, "Dtinfo: Information");
XtVaSetValues(shell, XmNtitle, string, NULL); XtVaSetValues(shell, XmNtitle, string, NULL);
show_it(dialog); show_it(dialog);
@ -574,7 +574,7 @@ void
MessageMgr::demo_failure(demoException &, Widget parent) MessageMgr::demo_failure(demoException &, Widget parent)
{ {
error_dialog( error_dialog(
(char*)UAS_String(CATGETS(Set_Messages, 38, "File a Bug")), (char*)UAS_String(MCATGETS(Set_Messages, 38, "File a Bug")),
parent); parent);
::exit(0); ::exit(0);
} }

2
cde/programs/dtinfo/dtinfo/src/Managers/NodeMgr.C
View file

@ -348,7 +348,7 @@ NodeMgr::load(UAS_Pointer<UAS_Common> &node_ptr)
mcatch_noarg (StyleSheetSyntaxError&) mcatch_noarg (StyleSheetSyntaxError&)
{ {
message_mgr().error_dialog( message_mgr().error_dialog(
(char*)UAS_String(CATGETS(Set_Messages, 39, "File a Bug"))); (char*)UAS_String(MCATGETS(Set_Messages, 39, "File a Bug")));
} }
end_try ; end_try ;
#endif #endif

2
cde/programs/dtinfo/dtinfo/src/Managers/PrintMgr.C
View file

@ -212,7 +212,7 @@ PrintMgr::load(UAS_Pointer<UAS_Common> &node_ptr)
mcatch_noarg (StyleSheetSyntaxError&) mcatch_noarg (StyleSheetSyntaxError&)
{ {
message_mgr().error_dialog( message_mgr().error_dialog(
(char*)UAS_String(CATGETS(Set_Messages, 39, (char*)UAS_String(MCATGETS(Set_Messages, 39,
"There is an error in the Style Sheet for this Section.\nDefault features have been applied.") "There is an error in the Style Sheet for this Section.\nDefault features have been applied.")
)); ));
} }

4
cde/programs/dtinfo/dtinfo/src/Managers/SearchMgr.C
View file

@ -311,11 +311,11 @@ SearchMgr::display_message (SearchMessageType msg, int)
switch( msg ){ switch( msg ){
case NO_HITS: case NO_HITS:
message_mgr().info_dialog ( message_mgr().info_dialog (
(char*)UAS_String(CATGETS(Set_Messages, 40, "File a Bug"))); (char*)UAS_String(MCATGETS(Set_Messages, 40, "File a Bug")));
break; break;
case BAD_QUERY: case BAD_QUERY:
message_mgr().warning_dialog ( message_mgr().warning_dialog (
(char*)UAS_String(CATGETS(Set_Messages, 41, "File a Bug"))); (char*)UAS_String(MCATGETS(Set_Messages, 41, "File a Bug")));
break; break;
} }
} }

2
cde/programs/dtinfo/dtinfo/src/Managers/ServiceMgrX.C
View file

@ -454,7 +454,7 @@ olias_send_event (Widget, OliasEvent *event)
else else
{ {
message_mgr().info_dialog ( message_mgr().info_dialog (
(char*)UAS_String(CATGETS(Set_Messages, 46, "File a Bug"))); (char*)UAS_String(MCATGETS(Set_Messages, 46, "File a Bug")));
return (OLIAS_SUCCESS); return (OLIAS_SUCCESS);
// return (OLIAS_LOCATOR_NOT_FOUND); until help lib fixed // return (OLIAS_LOCATOR_NOT_FOUND); until help lib fixed
} }

6
cde/programs/dtinfo/dtinfo/src/Managers/TtIpcMgr.C
View file

@ -140,7 +140,7 @@ LogToolTalkMessage (
if (! tt_is_err(status)) return XtsNewString("");; if (! tt_is_err(status)) return XtsNewString("");;
errfmt = CATGETS(Set_TtIpcMgr, msg_num, dflt_txt); errfmt = MCATGETS(Set_TtIpcMgr, msg_num, dflt_txt);
statmsg = tt_status_message(status); statmsg = tt_status_message(status);
errmsglen = strlen(errfmt) + strlen(statmsg) + 2; errmsglen = strlen(errfmt) + strlen(statmsg) + 2;
errmsg = XtMalloc(errmsglen); errmsg = XtMalloc(errmsglen);
@ -280,7 +280,7 @@ TtIpcMgr::ipc_init_wp0( XtPointer /* theIpcObj */ )
{ {
DtMsgLogMessage("dtinfo", DtMsgLogError, DtMsgLogMessage("dtinfo", DtMsgLogError,
"%s: %s", "tt_ptype_declare", "%s: %s", "tt_ptype_declare",
(char *) CATGETS( (char *) MCATGETS(
Set_TtIpcMgr, 9, Set_TtIpcMgr, 9,
"The process type 'DtInfoPrint' is not the\nname of an installed process type.")); "The process type 'DtInfoPrint' is not the\nname of an installed process type."));
} }
@ -364,7 +364,7 @@ TtIpcMgr::do_infolib( char *lib_path )
// if no file argument specified, get the default // if no file argument specified, get the default
if( !(lib_path = env().infolibDefault()) ) if( !(lib_path = env().infolibDefault()) )
{ {
message_mgr().error_dialog( (char*)UAS_String(CATGETS( message_mgr().error_dialog( (char*)UAS_String(MCATGETS(
Set_AddLibraryAgent, ERR_INFOLIB_SPEC_FORMAT, Set_AddLibraryAgent, ERR_INFOLIB_SPEC_FORMAT,
"Infolib specification format error." )) ) ; "Infolib specification format error." )) ) ;
return (sts = BAD_ARG_FORMAT); return (sts = BAD_ARG_FORMAT);

8
cde/programs/dtinfo/dtinfo/src/Other/WindowSystemMotif.C
View file

@ -576,7 +576,7 @@ WindowSystem::init()
if (f_display == (Display*)NULL) if (f_display == (Display*)NULL)
{ {
fprintf(stderr, "%s", fprintf(stderr, "%s",
CATGETS(Set_WindowSystem, 3, "Unable to open display.\n")); MCATGETS(Set_WindowSystem, 3, "Unable to open display.\n"));
exit(1); exit(1);
} }
@ -1028,14 +1028,14 @@ WindowSystem::core_dump_handler (int signal_number)
{ {
WXmMessageDialog byebye (window_system().toplevel(), (char*)"core_dump"); WXmMessageDialog byebye (window_system().toplevel(), (char*)"core_dump");
XtVaSetValues((Widget)byebye, XmNmessageString, XtVaSetValues((Widget)byebye, XmNmessageString,
(XmString)XmStringLocalized(CATGETS(Set_WindowSystem, 2, (XmString)XmStringLocalized(MCATGETS(Set_WindowSystem, 2,
"Bombing...")), NULL); "Bombing...")), NULL);
WShell shell (XtParent ((Widget) byebye)); WShell shell (XtParent ((Widget) byebye));
window_system().register_shell (&shell); window_system().register_shell (&shell);
window_system().set_cursor (window_system().f_bomb_cursor); window_system().set_cursor (window_system().f_bomb_cursor);
XtVaSetValues((Widget)shell, XmNtitle, XtVaSetValues((Widget)shell, XmNtitle,
CATGETS(Set_WindowSystem, 1, "Dtinfo: Fatal Error"), NULL); MCATGETS(Set_WindowSystem, 1, "Dtinfo: Fatal Error"), NULL);
byebye.OkPB().Unmanage(); byebye.OkPB().Unmanage();
byebye.CancelPB().Unmanage(); byebye.CancelPB().Unmanage();
@ -1597,7 +1597,7 @@ WindowSystem::interrupt_handler (int /* signal_number */)
if (!(window_system().videoShell()->silent)) { if (!(window_system().videoShell()->silent)) {
message_mgr().quit_dialog ( message_mgr().quit_dialog (
(char*)UAS_String(CATGETS(Set_Messages, 6, "Quit Dtinfo?"))); (char*)UAS_String(MCATGETS(Set_Messages, 6, "Quit Dtinfo?")));
} }
else { else {
exit(1); exit(1);

38
cde/programs/dtinfo/dtinfo/src/Query/QueryEditor.C
View file

@ -278,7 +278,7 @@ QueryEditor::create_ui()
f_shell = WTopLevelShell(window_system().toplevel(), WPopup, "query_editor"); f_shell = WTopLevelShell(window_system().toplevel(), WPopup, "query_editor");
window_system().register_shell (&f_shell); window_system().register_shell (&f_shell);
string = CATGETS(Set_QueryEditor, 1, "Dtinfo: Query Editor"); string = MCATGETS(Set_QueryEditor, 1, "Dtinfo: Query Editor");
XtVaSetValues((Widget)f_shell, XmNtitle, string, NULL); XtVaSetValues((Widget)f_shell, XmNtitle, string, NULL);
// Main form and menu bar. // Main form and menu bar.
@ -291,7 +291,7 @@ QueryEditor::create_ui()
XtSetArg(args[n], XmNsubMenuId, (Widget) scope_menu); n++; XtSetArg(args[n], XmNsubMenuId, (Widget) scope_menu); n++;
f_scope_option = WXmOptionMenu (form, (char*)"scope_option", AM, args, n); f_scope_option = WXmOptionMenu (form, (char*)"scope_option", AM, args, n);
mtfstring = CATGETS(Set_AgentLabel, 212, "Scope Name"); mtfstring = MCATGETS(Set_AgentLabel, 212, "Scope Name");
XtVaSetValues(f_scope_option, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(f_scope_option, XmNlabelString, (XmString)mtfstring, NULL);
// Menu definitions. how about using AddPushButton (name, obj, fun)?? // Menu definitions. how about using AddPushButton (name, obj, fun)??
@ -308,23 +308,23 @@ QueryEditor::create_ui()
f_undo_btn = WXmPushButton (edit_menu, "undo", AM); f_undo_btn = WXmPushButton (edit_menu, "undo", AM);
f_redo_btn = WXmPushButton (edit_menu, "redo", AM); f_redo_btn = WXmPushButton (edit_menu, "redo", AM);
mtfstring = CATGETS(Set_AgentLabel, 16, "Edit"); mtfstring = MCATGETS(Set_AgentLabel, 16, "Edit");
mnemonic = *CATGETS(Set_AgentLabel, 17, "E"); mnemonic = *MCATGETS(Set_AgentLabel, 17, "E");
XtVaSetValues(edit_cascade, XmNlabelString, (XmString)mtfstring, XtVaSetValues(edit_cascade, XmNlabelString, (XmString)mtfstring,
XmNmnemonic, mnemonic, NULL); XmNmnemonic, mnemonic, NULL);
mtfstring = CATGETS(Set_AgentLabel, 224, "Cut"); mtfstring = MCATGETS(Set_AgentLabel, 224, "Cut");
XtVaSetValues(f_cut_btn, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(f_cut_btn, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 18, "Copy"); mtfstring = MCATGETS(Set_AgentLabel, 18, "Copy");
XtVaSetValues(f_copy_btn, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(f_copy_btn, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 225, "Paste"); mtfstring = MCATGETS(Set_AgentLabel, 225, "Paste");
XtVaSetValues(f_paste_btn, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(f_paste_btn, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 226, "Group"); mtfstring = MCATGETS(Set_AgentLabel, 226, "Group");
XtVaSetValues(f_group_btn, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(f_group_btn, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 227, "Ungroup"); mtfstring = MCATGETS(Set_AgentLabel, 227, "Ungroup");
XtVaSetValues(f_ungroup_btn, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(f_ungroup_btn, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 228, "Undo"); mtfstring = MCATGETS(Set_AgentLabel, 228, "Undo");
XtVaSetValues(f_undo_btn, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(f_undo_btn, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 229, "Redo"); mtfstring = MCATGETS(Set_AgentLabel, 229, "Redo");
XtVaSetValues(f_redo_btn, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(f_redo_btn, XmNlabelString, (XmString)mtfstring, NULL);
// Button area at the bottom // Button area at the bottom
@ -339,17 +339,17 @@ QueryEditor::create_ui()
WXmPushButton help (form, "help", AM); WXmPushButton help (form, "help", AM);
WXmSeparator separator (form, "separator", AM); WXmSeparator separator (form, "separator", AM);
mtfstring = CATGETS(Set_AgentLabel, 92, "History"); mtfstring = MCATGETS(Set_AgentLabel, 92, "History");
XtVaSetValues(history, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(history, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 102, "Search"); mtfstring = MCATGETS(Set_AgentLabel, 102, "Search");
XtVaSetValues(f_search_btn, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(f_search_btn, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 231, "Clear All"); mtfstring = MCATGETS(Set_AgentLabel, 231, "Clear All");
XtVaSetValues(clear, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(clear, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 46, "Scope Editor"); mtfstring = MCATGETS(Set_AgentLabel, 46, "Scope Editor");
XtVaSetValues(scope, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(scope, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 12, "Close"); mtfstring = MCATGETS(Set_AgentLabel, 12, "Close");
XtVaSetValues(cancel, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(cancel, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 48, "Help"); mtfstring = MCATGETS(Set_AgentLabel, 48, "Help");
XtVaSetValues(help, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(help, XmNlabelString, (XmString)mtfstring, NULL);
help_agent().add_activate_help (help, (char*)"query_editor_help"); help_agent().add_activate_help (help, (char*)"query_editor_help");
@ -359,7 +359,7 @@ QueryEditor::create_ui()
WXmForm qform (pane, "qform" ); WXmForm qform (pane, "qform" );
WXmLabel qlabel (qform, "qlabel", AM); WXmLabel qlabel (qform, "qlabel", AM);
mtfstring = CATGETS(Set_AgentLabel, 230, "Query"); mtfstring = MCATGETS(Set_AgentLabel, 230, "Query");
XtVaSetValues(qlabel, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(qlabel, XmNlabelString, (XmString)mtfstring, NULL);
f_query_text = WXmScrolledText (qform, (char*)"qtext", AM); f_query_text = WXmScrolledText (qform, (char*)"qtext", AM);
@ -545,7 +545,7 @@ QueryEditor::modify_verify (WCallback *wcb)
// tvp->doit = False; // tvp->doit = False;
// message_mgr().warning_dialog ( // message_mgr().warning_dialog (
// (char*)UAS_String(CATGETS(Set_Messages, 47, // (char*)UAS_String(MCATGETS(Set_Messages, 47,
// "This is a display-only field."))); // "This is a display-only field.")));
} }

24
cde/programs/dtinfo/dtinfo/src/Query/QueryTermView.C
View file

@ -179,9 +179,9 @@ QueryTermView::create_ui()
DECLM (WXmPushButtonGadget, contains, prefix_menu, "contains" ); DECLM (WXmPushButtonGadget, contains, prefix_menu, "contains" );
DECLM (WXmPushButtonGadget, not_contains, prefix_menu, "not_contains" ); DECLM (WXmPushButtonGadget, not_contains, prefix_menu, "not_contains" );
mtfstring = CATGETS(Set_AgentLabel, 232, "Contains"); mtfstring = MCATGETS(Set_AgentLabel, 232, "Contains");
XtVaSetValues(contains, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(contains, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 233, "Doesn\'t Contain"); mtfstring = MCATGETS(Set_AgentLabel, 233, "Doesn\'t Contain");
XtVaSetValues(not_contains, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(not_contains, XmNlabelString, (XmString)mtfstring, NULL);
unsigned int caps = f_query_term->avail_caps(); unsigned int caps = f_query_term->avail_caps();
@ -191,9 +191,9 @@ QueryTermView::create_ui()
ASSNM (WXmPushButtonGadget, starts, prefix_menu, "starts_with" ); ASSNM (WXmPushButtonGadget, starts, prefix_menu, "starts_with" );
ASSNM (WXmPushButtonGadget, not_starts, prefix_menu, "not_starts_with" ); ASSNM (WXmPushButtonGadget, not_starts, prefix_menu, "not_starts_with" );
mtfstring = CATGETS(Set_AgentLabel, 234, "Starts With"); mtfstring = MCATGETS(Set_AgentLabel, 234, "Starts With");
XtVaSetValues(starts, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(starts, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 235, "Doesn\'t Start With"); mtfstring = MCATGETS(Set_AgentLabel, 235, "Doesn\'t Start With");
XtVaSetValues(not_starts, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(not_starts, XmNlabelString, (XmString)mtfstring, NULL);
} }
DECLC (WXmPulldownMenu, connect_menu, f_form, "connect_menu" ); DECLC (WXmPulldownMenu, connect_menu, f_form, "connect_menu" );
@ -208,7 +208,7 @@ QueryTermView::create_ui()
if (caps & (0x01 << UAS_OQLParser::OQL_XOR)) { if (caps & (0x01 << UAS_OQLParser::OQL_XOR)) {
ASSNM (WXmPushButtonGadget, xorgad, connect_menu, "xor" ); ASSNM (WXmPushButtonGadget, xorgad, connect_menu, "xor" );
mtfstring = CATGETS(Set_AgentLabel, 237, "Xor"); mtfstring = MCATGETS(Set_AgentLabel, 237, "Xor");
XtVaSetValues(xorgad, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(xorgad, XmNlabelString, (XmString)mtfstring, NULL);
} }
DECLM (WXmPushButtonGadget, andgad, connect_menu, "and" ); DECLM (WXmPushButtonGadget, andgad, connect_menu, "and" );
@ -217,13 +217,13 @@ QueryTermView::create_ui()
if (caps & (0x01 << UAS_OQLParser::OQL_NEAR)) { if (caps & (0x01 << UAS_OQLParser::OQL_NEAR)) {
ASSNM (WXmPushButtonGadget, near, connect_menu, "near" ); ASSNM (WXmPushButtonGadget, near, connect_menu, "near" );
mtfstring = CATGETS(Set_AgentLabel, 239, "Near"); mtfstring = MCATGETS(Set_AgentLabel, 239, "Near");
XtVaSetValues(near, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(near, XmNlabelString, (XmString)mtfstring, NULL);
} }
if (caps & (0x01 << UAS_OQLParser::OQL_BEFORE)) { if (caps & (0x01 << UAS_OQLParser::OQL_BEFORE)) {
ASSNM (WXmPushButtonGadget, before, connect_menu, "before" ); ASSNM (WXmPushButtonGadget, before, connect_menu, "before" );
mtfstring = CATGETS(Set_AgentLabel, 240, "Before"); mtfstring = MCATGETS(Set_AgentLabel, 240, "Before");
XtVaSetValues(before, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(before, XmNlabelString, (XmString)mtfstring, NULL);
} }
ASSNM (WXmArrowButton, f_pw_button,f_form, "pw_button" ); ASSNM (WXmArrowButton, f_pw_button,f_form, "pw_button" );
@ -231,9 +231,9 @@ QueryTermView::create_ui()
WXmTextField (f_form, "term_text", WAutoManage); WXmTextField (f_form, "term_text", WAutoManage);
// ASSNM (WXmTextField, f_term_field, f_form, "term_text"); // ASSNM (WXmTextField, f_term_field, f_form, "term_text");
mtfstring = CATGETS(Set_AgentLabel, 236, "Or"); mtfstring = MCATGETS(Set_AgentLabel, 236, "Or");
XtVaSetValues(orgad, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(orgad, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 238, "And"); mtfstring = MCATGETS(Set_AgentLabel, 238, "And");
XtVaSetValues(andgad, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(andgad, XmNlabelString, (XmString)mtfstring, NULL);
// Callbacks! // Callbacks!
@ -597,11 +597,11 @@ QueryTermView::create_fields()
ASSNM (WXmTextField, f_weight_field, f_pws_form, "weight_field" ); ASSNM (WXmTextField, f_weight_field, f_pws_form, "weight_field" );
ASSN (WXmTextField, f_scope_field, f_pws_form, "scope_field" ); ASSN (WXmTextField, f_scope_field, f_pws_form, "scope_field" );
mtfstring = CATGETS(Set_AgentLabel, 241, "Weight"); mtfstring = MCATGETS(Set_AgentLabel, 241, "Weight");
XtVaSetValues(weight_label, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(weight_label, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 242, "Proximity"); mtfstring = MCATGETS(Set_AgentLabel, 242, "Proximity");
XtVaSetValues(f_proximity_label, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(f_proximity_label, XmNlabelString, (XmString)mtfstring, NULL);
mtfstring = CATGETS(Set_AgentLabel, 243, "Scope"); mtfstring = MCATGETS(Set_AgentLabel, 243, "Scope");
XtVaSetValues(scope_label, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(scope_label, XmNlabelString, (XmString)mtfstring, NULL);
SET_CALLBACK (f_proximity_field,ValueChanged,proximity_changed); SET_CALLBACK (f_proximity_field,ValueChanged,proximity_changed);

4
cde/programs/dtinfo/dtinfo/src/UAS/Base/UAS_Factory.C
View file

@ -111,13 +111,13 @@ UAS_Factory::create (const UAS_String &locator) {
locator.split (':', access, rest); locator.split (':', access, rest);
if (access == "") { if (access == "") {
throw (UAS_Exception((char*)UAS_String( throw (UAS_Exception((char*)UAS_String(
CATGETS(Set_UAS_Base, 1, MCATGETS(Set_UAS_Base, 1,
"No access part provided in locator (URL).")))); "No access part provided in locator (URL)."))));
} }
UAS_Factory *theFactory = UAS_Factory::lookup(access); UAS_Factory *theFactory = UAS_Factory::lookup(access);
if (theFactory == 0) { if (theFactory == 0) {
char buf[BUFSIZ]; char buf[BUFSIZ];
(void) snprintf (buf, sizeof(buf), CATGETS(Set_UAS_Base, 2, (void) snprintf (buf, sizeof(buf), MCATGETS(Set_UAS_Base, 2,
"Don't know how to create %s: objects"), "Don't know how to create %s: objects"),
(char*)access); (char*)access);

2
cde/programs/dtinfo/dtinfo/src/UAS/Base/UAS_OQLParser.C
View file

@ -145,7 +145,7 @@ UAS_OQLParser::parse(const char *oql)
// clean up the stack // clean up the stack
seql = f_stack.pop(); seql = f_stack.pop();
throw(CASTUASEXCEPT UAS_Exception( throw(CASTUASEXCEPT UAS_Exception(
(char*)UAS_String(CATGETS(Set_Messages, 41, (char*)UAS_String(MCATGETS(Set_Messages, 41,
"Invalid characters in search string.")))); "Invalid characters in search string."))));
} else if (f_stack.entries() != 1){ } else if (f_stack.entries() != 1){
// NOTE: bad query - error message to user required // NOTE: bad query - error message to user required

2
cde/programs/dtinfo/dtinfo/src/UAS/Base/UAS_ObjList.C
View file

@ -77,7 +77,7 @@ T &
UAS_ObjList<T>::item (int i) const { UAS_ObjList<T>::item (int i) const {
if (i < 0 || i >= fNumItems) if (i < 0 || i >= fNumItems)
throw (UAS_Exception ( throw (UAS_Exception (
(char*)UAS_String(CATGETS(Set_UAS_Base, 3, "File a Bug")))); (char*)UAS_String(MCATGETS(Set_UAS_Base, 3, "File a Bug"))));
return fItems[i]; return fItems[i];
} }

2
cde/programs/dtinfo/dtinfo/src/UAS/Base/UAS_PtrList.C
View file

@ -78,7 +78,7 @@ T *
UAS_PtrList<T>::item (int i) const { UAS_PtrList<T>::item (int i) const {
if (i < 0 || i >= fNumItems) if (i < 0 || i >= fNumItems)
throw (UAS_Exception ( throw (UAS_Exception (
(char*)UAS_String(CATGETS(Set_UAS_Base, 4, "File a Bug")))); (char*)UAS_String(MCATGETS(Set_UAS_Base, 4, "File a Bug"))));
return fItems[i]; return fItems[i];
} }

16
cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_Parser.C
View file

@ -125,9 +125,9 @@ DtSR_Parser::se_construct(OQL_Token token,
#ifdef IGNORE_UNSUPPORTED #ifdef IGNORE_UNSUPPORTED
return arg1; return arg1;
#else #else
UAS_String str = CATGETS(Set_DtSR_Parser, 1, UAS_String str = MCATGETS(Set_DtSR_Parser, 1,
"The ``%s'' Search feature is not supported."); "The ``%s'' Search feature is not supported.");
UAS_String opstr = CATGETS(Set_DtSR_Parser, 3, "weight"); UAS_String opstr = MCATGETS(Set_DtSR_Parser, 3, "weight");
snprintf(msg, sizeof(msg), (char*)str, (char*)opstr); snprintf(msg, sizeof(msg), (char*)str, (char*)opstr);
UAS_String uas_msg = msg; UAS_String uas_msg = msg;
throw(UAS_Search_Feature_Unavailable(uas_msg)); throw(UAS_Search_Feature_Unavailable(uas_msg));
@ -166,9 +166,9 @@ DtSR_Parser::se_construct(OQL_Token token,
} }
return newstr; return newstr;
#else #else
UAS_String str = CATGETS(Set_DtSR_Parser, 1, UAS_String str = MCATGETS(Set_DtSR_Parser, 1,
"The ``%s'' Search feature is not supported."); "The ``%s'' Search feature is not supported.");
UAS_String opstr = CATGETS(Set_DtSR_Parser, 2, "quoted phrase"); UAS_String opstr = MCATGETS(Set_DtSR_Parser, 2, "quoted phrase");
snprintf(msg, sizeof(msg), (char*)str, (char*)opstr); snprintf(msg, sizeof(msg), (char*)str, (char*)opstr);
UAS_String uas_msg = msg; UAS_String uas_msg = msg;
@ -187,9 +187,9 @@ DtSR_Parser::se_construct(OQL_Token token,
newstr = newstr + arg1 + " & " + arg2 + " )"; newstr = newstr + arg1 + " & " + arg2 + " )";
return newstr; return newstr;
#else #else
UAS_String str = CATGETS(Set_DtSR_Parser, 1, UAS_String str = MCATGETS(Set_DtSR_Parser, 1,
"The ``%s'' Search feature is not supported."); "The ``%s'' Search feature is not supported.");
UAS_String opstr = CATGETS(Set_DtSR_Parser, 4, "proximity"); UAS_String opstr = MCATGETS(Set_DtSR_Parser, 4, "proximity");
snprintf(msg, sizeof(msg), (char*)str, (char*)opstr); snprintf(msg, sizeof(msg), (char*)str, (char*)opstr);
UAS_String uas_msg = msg; UAS_String uas_msg = msg;
throw(UAS_Search_Feature_Unavailable(uas_msg)); throw(UAS_Search_Feature_Unavailable(uas_msg));
@ -228,9 +228,9 @@ DtSR_Parser::se_construct(OQL_Token token,
newstr = newstr + arg1 + " & " + arg2 + " )"; newstr = newstr + arg1 + " & " + arg2 + " )";
return newstr; return newstr;
#else #else
UAS_String str = CATGETS(Set_DtSR_Parser, 1, UAS_String str = MCATGETS(Set_DtSR_Parser, 1,
"The ``%s'' Search feature is not supported."); "The ``%s'' Search feature is not supported.");
UAS_String opstr = CATGETS(Set_DtSR_Parser, 5, "xor"); UAS_String opstr = MCATGETS(Set_DtSR_Parser, 5, "xor");
snprintf(msg, sizeof(msg), (char*)str, (char*)opstr); snprintf(msg, sizeof(msg), (char*)str, (char*)opstr);
UAS_String uas_msg = msg; UAS_String uas_msg = msg;
throw(UAS_Search_Feature_Unavailable(uas_msg)); throw(UAS_Search_Feature_Unavailable(uas_msg));

2
cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_SearchEngine.C
View file

@ -616,7 +616,7 @@ DtSR_SearchEngine::search(UAS_String oql, UAS_SearchScope& scope,
if (DtSr_res) if (DtSr_res)
DtSearchFreeResults(&DtSr_res); DtSearchFreeResults(&DtSr_res);
UAS_String msg(CATGETS(Set_DtSR_SearchEngine, 1, UAS_String msg(MCATGETS(Set_DtSR_SearchEngine, 1,
"DtSearch does not support the query.")); "DtSearch does not support the query."));
DtSearchFreeMessages(); DtSearchFreeMessages();

2
cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_SearchResultsEntry.C
View file

@ -281,7 +281,7 @@ DtSR_SearchResultsEntry::create_matches()
{ {
#ifdef JOE_HATES_THIS #ifdef JOE_HATES_THIS
message_mgr().error_dialog( message_mgr().error_dialog(
(char*)UAS_String(CATGETS(Set_Messages, 39, "File a Bug"))); (char*)UAS_String(MCATGETS(Set_Messages, 39, "File a Bug")));
#else #else
throw(CASTEXCEPT Exception()); throw(CASTEXCEPT Exception());
#endif #endif

2
cde/programs/dtinfo/dtinfo/src/UAS/MMDB/MMDB.C
View file

@ -75,7 +75,7 @@ MMDB::database()
UAS_ErrorMsg msg; UAS_ErrorMsg msg;
UAS_Buffer buf(256); UAS_Buffer buf(256);
const char *x = const char *x =
(char*)UAS_String(CATGETS(Set_UAS_MMDB, 1, "The following bookcases are not valid:")); (char*)UAS_String(MCATGETS(Set_UAS_MMDB, 1, "The following bookcases are not valid:"));
buf.write (x, sizeof(char), strlen(x)); buf.write (x, sizeof(char), strlen(x));
for (int i = 1; i <= bad_count; i++) for (int i = 1; i <= bad_count; i++)
{ {

6
cde/programs/dtinfo/dtinfo/src/UAS/MMDB/MMDB_Factory.C
View file

@ -70,7 +70,7 @@ MMDB_Factory::createMMDB (const UAS_String &infoLibPath) {
if (!olias_db().validInfoLibPath(infoLibPath)) { if (!olias_db().validInfoLibPath(infoLibPath)) {
UAS_ErrorMsg badPath; UAS_ErrorMsg badPath;
char buf[BUFSIZ]; char buf[BUFSIZ];
(void) snprintf (buf, sizeof(buf), CATGETS(Set_UAS_MMDB, 2, (void) snprintf (buf, sizeof(buf), MCATGETS(Set_UAS_MMDB, 2,
"Invalid Infolib path: %s"), "Invalid Infolib path: %s"),
(char *) infoLibPath); (char *) infoLibPath);
badPath.fErrorMsg = buf; badPath.fErrorMsg = buf;
@ -83,7 +83,7 @@ MMDB_Factory::createMMDB (const UAS_String &infoLibPath) {
} mcatch_any() { } mcatch_any() {
#if 0 #if 0
char buf[BUFSIZ]; char buf[BUFSIZ];
(void) snprintf (buf, sizeof(buf), CATGETS(Set_UAS_MMDB, 3, (void) snprintf (buf, sizeof(buf), MCATGETS(Set_UAS_MMDB, 3,
"Ignoring invalid Infolib path: %s"), "Ignoring invalid Infolib path: %s"),
(char *) infoLibPath); (char *) infoLibPath);
UAS_ErrorMsg theError; UAS_ErrorMsg theError;
@ -351,7 +351,7 @@ MMDB_Factory::genInfolibName () {
static int counter = 0; static int counter = 0;
char buf[BUFSIZ]; char buf[BUFSIZ];
(void) snprintf (buf, sizeof(buf), (void) snprintf (buf, sizeof(buf),
CATGETS(Set_UAS_MMDB, 4, "DtMmdb Library %d"), ++counter); MCATGETS(Set_UAS_MMDB, 4, "DtMmdb Library %d"), ++counter);
return UAS_String (buf); return UAS_String (buf);
} }

4
cde/programs/dtinfo/dtinfo/src/UAS/MMDB/MMDB_Library.C
View file

@ -62,7 +62,7 @@ MMDB_Library::title (UAS_TitleType) {
UAS_String rval = il->get_info_lib_name(); UAS_String rval = il->get_info_lib_name();
if (rval == "") if (rval == "")
{ {
rval = CATGETS(Set_UAS_MMDB, 5, "File a Bug"); rval = MCATGETS(Set_UAS_MMDB, 5, "File a Bug");
rval = rval + mmdb().infoLibPath(); rval = rval + mmdb().infoLibPath();
} }
return rval; return rval;
@ -128,7 +128,7 @@ MMDB_Library::name () {
{ {
char scratch[128]; char scratch[128];
snprintf(scratch, sizeof(scratch), snprintf(scratch, sizeof(scratch),
CATGETS(Set_UAS_MMDB, 6, "File a Bug"), (char *)kids[i]->id()); MCATGETS(Set_UAS_MMDB, 6, "File a Bug"), (char *)kids[i]->id());
f_name = UAS_String(scratch); f_name = UAS_String(scratch);
} }
} }