diff --git a/cde/programs/dtinfo/dtinfo/src/Agents/AddLibraryAgentMotif.C b/cde/programs/dtinfo/dtinfo/src/Agents/AddLibraryAgentMotif.C index 30b1f0f62..55ef14579 100644 --- a/cde/programs/dtinfo/dtinfo/src/Agents/AddLibraryAgentMotif.C +++ b/cde/programs/dtinfo/dtinfo/src/Agents/AddLibraryAgentMotif.C @@ -104,11 +104,11 @@ AddLibraryAgent::create_ui (Widget parent) { mtfstring = msg_catalog_mgr().catgets(Set_AgentLabel, 162); 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); - mtfstring = CATGETS(Set_AgentLabel, 270, "..."); + mtfstring = MCATGETS(Set_AgentLabel, 270, "..."); XtVaSetValues(pick, XmNlabelString, (XmString)mtfstring, NULL); - mtfstring = CATGETS(Set_AgentLabel, 48, "Help"); + mtfstring = MCATGETS(Set_AgentLabel, 48, "Help"); XtVaSetValues(help, XmNlabelString, (XmString)mtfstring, NULL); @@ -211,9 +211,9 @@ AddLibraryAgent::pick_dir () { int n; XmString title_str = XmStringCreateLocalized( - CATGETS(Set_AddLibraryAgent, 10, "Dtinfo: Infolib Selection")); + MCATGETS(Set_AddLibraryAgent, 10, "Dtinfo: Infolib Selection")); 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 infolibs_str = XmStringCreateLocalized( (char*)"Infolibs" ); diff --git a/cde/programs/dtinfo/dtinfo/src/Agents/BookmarkEditMotif.C b/cde/programs/dtinfo/dtinfo/src/Agents/BookmarkEditMotif.C index 3528a4c28..e2928cf57 100644 --- a/cde/programs/dtinfo/dtinfo/src/Agents/BookmarkEditMotif.C +++ b/cde/programs/dtinfo/dtinfo/src/Agents/BookmarkEditMotif.C @@ -218,7 +218,7 @@ BookmarkEdit::create_ui() new WTopLevelShell (window_system().toplevel(), WPopup, "bookmark_edit"); 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); WXmForm form (*f_shell, "form"); @@ -226,28 +226,28 @@ BookmarkEdit::create_ui() f_name_text = new WXmTextField (form, "name_text", WAutoManage); WXmLabelGadget notes (form, "notes", WAutoManage); - mtfstring = CATGETS(Set_AgentLabel, 163, "Name"); + mtfstring = MCATGETS(Set_AgentLabel, 163, "Name"); XtVaSetValues(name, XmNlabelString, (XmString)mtfstring, NULL); - mtfstring = CATGETS(Set_AgentLabel, 164, "Notes"); + mtfstring = MCATGETS(Set_AgentLabel, 164, "Notes"); XtVaSetValues(notes, XmNlabelString, (XmString)mtfstring, NULL); // NOTE: Don't add spaces after "," because of stupid CPP. f_ok = WXmPushButtonGadget (form, "ok", WAutoManage); ON_ACTIVATE (f_ok, ok); - mtfstring = CATGETS(Set_AgentLabel, 161, "OK"); + mtfstring = MCATGETS(Set_AgentLabel, 161, "OK"); XtVaSetValues(f_ok, XmNlabelString, (XmString)mtfstring, NULL); BUTTON (form,view); BUTTON (form,cancel); - mtfstring = CATGETS(Set_AgentLabel, 165, "Display"); + mtfstring = MCATGETS(Set_AgentLabel, 165, "Display"); XtVaSetValues(view, XmNlabelString, (XmString)mtfstring, NULL); - mtfstring = CATGETS(Set_AgentLabel, 162, "Cancel"); + mtfstring = MCATGETS(Set_AgentLabel, 162, "Cancel"); XtVaSetValues(cancel, XmNlabelString, (XmString)mtfstring, NULL); WXmPushButtonGadget help (form, "help", WAutoManage); - mtfstring = CATGETS(Set_AgentLabel, 48, "Help"); + mtfstring = MCATGETS(Set_AgentLabel, 48, "Help"); XtVaSetValues(help, XmNlabelString, (XmString)mtfstring, NULL); help_agent().add_activate_help (help, (char*)"bookmark_edit_help"); f_wm_delete_callback = @@ -301,7 +301,7 @@ BookmarkEdit::ok() mcatch_any() { message_mgr().error_dialog( - CATGETS(Set_BookmarkEdit, 1, "Dtinfo: Bookmark Editor")); + MCATGETS(Set_BookmarkEdit, 1, "Dtinfo: Bookmark Editor")); } end_try; } @@ -334,7 +334,7 @@ BookmarkEdit::cancel() if (f_modified) confirmed = message_mgr().question_dialog( - (char*)UAS_String(CATGETS(Set_Messages, 2, + (char*)UAS_String(MCATGETS(Set_Messages, 2, "Abandon changes?"))); if (confirmed) diff --git a/cde/programs/dtinfo/dtinfo/src/Agents/GraphicAgentMotif.C b/cde/programs/dtinfo/dtinfo/src/Agents/GraphicAgentMotif.C index ae539baea..acc46e11e 100644 --- a/cde/programs/dtinfo/dtinfo/src/Agents/GraphicAgentMotif.C +++ b/cde/programs/dtinfo/dtinfo/src/Agents/GraphicAgentMotif.C @@ -238,7 +238,7 @@ GraphicAgent::create_ui() f_shell = WTopLevelShell (window_system().toplevel(), WPopup, "graphic"); 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); // just use "delete_response" instead @@ -264,27 +264,27 @@ GraphicAgent::create_ui() DECLM (WXmPushButton, close, file_menu, "close" ); XtVaSetValues(file, XmNlabelString, - (XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 1, "File")), + (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 1, "File")), XmNmnemonic, - *CATGETS(Set_AgentLabel, 2, ""), + *MCATGETS(Set_AgentLabel, 2, ""), NULL); XtVaSetValues(attach, XmNlabelString, - (XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 167, "Attach")), + (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 167, "Attach")), XmNmnemonic, - *CATGETS(Set_AgentLabel, 21, ""), + *MCATGETS(Set_AgentLabel, 21, ""), NULL); XtVaSetValues(visit, XmNlabelString, - (XmString)XmStringLocalized(CATGETS(Set_AgentLabel,168,"Display Section")), + (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel,168,"Display Section")), XmNmnemonic, - *CATGETS(Set_AgentLabel, 119, ""), + *MCATGETS(Set_AgentLabel, 119, ""), NULL); XtVaSetValues(close, XmNlabelString, - (XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 12, "Close")), + (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 12, "Close")), XmNmnemonic, - *CATGETS(Set_AgentLabel, 13, ""), + *MCATGETS(Set_AgentLabel, 13, ""), NULL); DECLM (WXmCascadeButton, pan, menu_bar, "panner" ); @@ -296,39 +296,39 @@ GraphicAgent::create_ui() DECLM (WXmToggleButton, low_right, panner_menu, "low_right" ); XtVaSetValues(pan, XmNlabelString, - (XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 166, "Panner")), + (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 166, "Panner")), XmNmnemonic, - *CATGETS(Set_AgentLabel, 9, ""), + *MCATGETS(Set_AgentLabel, 9, ""), NULL); XtVaSetValues(none, XmNlabelString, - (XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 178, "None")), + (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 178, "None")), XmNmnemonic, - *CATGETS(Set_AgentLabel, 7, ""), + *MCATGETS(Set_AgentLabel, 7, ""), NULL); XtVaSetValues(up_left, XmNlabelString, - (XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 179, "Upper Left")), + (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 179, "Upper Left")), XmNmnemonic, - *CATGETS(Set_AgentLabel, 254, ""), + *MCATGETS(Set_AgentLabel, 254, ""), NULL); XtVaSetValues(up_right, XmNlabelString, - (XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 180, "Upper Right")), + (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 180, "Upper Right")), XmNmnemonic, - *CATGETS(Set_AgentLabel, 252, ""), + *MCATGETS(Set_AgentLabel, 252, ""), NULL); XtVaSetValues(low_left, XmNlabelString, - (XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 181, "Lower Left")), + (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 181, "Lower Left")), XmNmnemonic, - *CATGETS(Set_AgentLabel, 113, ""), + *MCATGETS(Set_AgentLabel, 113, ""), NULL); XtVaSetValues(low_right, XmNlabelString, - (XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 182, "Lower Right")), + (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 182, "Lower Right")), XmNmnemonic, - *CATGETS(Set_AgentLabel, 259, ""), + *MCATGETS(Set_AgentLabel, 259, ""), NULL); // 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" ); XtVaSetValues(view, XmNlabelString, - (XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 4, "View")), + (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 4, "View")), XmNmnemonic, - *CATGETS(Set_AgentLabel, 5, ""), + *MCATGETS(Set_AgentLabel, 5, ""), NULL); 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, - *CATGETS(Set_AgentLabel, 35, ""), + *MCATGETS(Set_AgentLabel, 35, ""), NULL); 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, - *CATGETS(Set_AgentLabel, 37, ""), + *MCATGETS(Set_AgentLabel, 37, ""), NULL); DECLM (WXmSeparator, separator, view_menu, "separator" ); @@ -366,23 +366,23 @@ GraphicAgent::create_ui() DECLM (WXmToggleButton, z_200, view_menu, "z_200" ); 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); - mtfstring = CATGETS(Set_AgentLabel, 172, "50 %"); + mtfstring = MCATGETS(Set_AgentLabel, 172, "50 %"); 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); - mtfstring = CATGETS(Set_AgentLabel, 174, "125 %"); + mtfstring = MCATGETS(Set_AgentLabel, 174, "125 %"); 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); - mtfstring = CATGETS(Set_AgentLabel, 176, "200 %"); + mtfstring = MCATGETS(Set_AgentLabel, 176, "200 %"); XtVaSetValues(z_200, XmNlabelString, (XmString)mtfstring, NULL); XtVaSetValues(z_custom, XmNlabelString, - (XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 177, "Custom...")), + (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 177, "Custom...")), XmNmnemonic, - *CATGETS(Set_AgentLabel, 13, ""), + *MCATGETS(Set_AgentLabel, 13, ""), NULL); z_100.Set(1); @@ -397,21 +397,21 @@ GraphicAgent::create_ui() DECLM (WXmPushButton, on_help, help_menu, "on_help" ); XtVaSetValues(help, XmNlabelString, - (XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 48, "Help")), + (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 48, "Help")), XmNmnemonic, - *CATGETS(Set_AgentLabel, 39, ""), + *MCATGETS(Set_AgentLabel, 39, ""), NULL); XtVaSetValues(on_window, XmNlabelString, - (XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 147, "On Window")), + (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 147, "On Window")), XmNmnemonic, - *CATGETS(Set_AgentLabel, 35, ""), + *MCATGETS(Set_AgentLabel, 35, ""), NULL); XtVaSetValues(on_help, XmNlabelString, - (XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 153, "On Help")), + (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 153, "On Help")), XmNmnemonic, - *CATGETS(Set_AgentLabel, 39, ""), + *MCATGETS(Set_AgentLabel, 39, ""), NULL); DECLM (WXmLabel, message_area, form, "message"); @@ -440,12 +440,12 @@ GraphicAgent::create_ui() PixmapGraphic &pgraphic = *(f_graphic->pixmap_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()); const char *title = titleStr ; 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; f_shell.Title((char*)buffer); @@ -493,9 +493,9 @@ GraphicAgent::create_ui() if(scalable) { if (f_graphic->content_type() == "application/CGM") - mtfstring = CATGETS(Set_GraphicAgent, 4, "Vector illustration (scalable)"); + mtfstring = MCATGETS(Set_GraphicAgent, 4, "Vector illustration (scalable)"); else - mtfstring = CATGETS(Set_GraphicAgent, 9, "Raster illustration (scalable)"); + mtfstring = MCATGETS(Set_GraphicAgent, 9, "Raster illustration (scalable)"); } else { @@ -503,7 +503,7 @@ GraphicAgent::create_ui() for (unsigned int i = 0 ; i < view_menu.NumChildren(); i++) WRect(view_menu.Children()[i]).SetSensitive(False); #endif - mtfstring = CATGETS(Set_GraphicAgent, 3, + mtfstring = MCATGETS(Set_GraphicAgent, 3, "Raster illustration (non-scalable)"); } @@ -514,11 +514,11 @@ GraphicAgent::create_ui() for (int i = 0 ; i < view_menu.NumChildren(); i++) WRect(view_menu.Children()[i]).SetSensitive(False); #endif - mtfstring = CATGETS(Set_GraphicAgent, 3, + mtfstring = MCATGETS(Set_GraphicAgent, 3, "Raster illustration (non-scalable)"); } else { - mtfstring = CATGETS(Set_GraphicAgent, 4, + mtfstring = MCATGETS(Set_GraphicAgent, 4, "Vector illustration (scalable)"); } #endif @@ -859,9 +859,9 @@ GraphicAgent::zoom_callback(WCallback *wcb) } f_setcustom = 1 ; - UAS_String msg = CATGETS(Set_GraphicAgent, 6, + UAS_String msg = MCATGETS(Set_GraphicAgent, 6, "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(). get_integer((char*)msg, (char*)title, f_current_scale, (Widget)f_shell); @@ -901,7 +901,7 @@ GraphicAgent::set_zoom(unsigned int scale) Wait_Cursor bob; - XmStringLocalized mtfstring = CATGETS(Set_GraphicAgent, 5, + XmStringLocalized mtfstring = MCATGETS(Set_GraphicAgent, 5, "Scaling illustration, please wait..."); XtVaSetValues((Widget)f_message_area, XmNlabelString, (XmString)mtfstring, NULL); @@ -920,9 +920,9 @@ GraphicAgent::set_zoom(unsigned int scale) refresh(graphic()); if (f_graphic->content_type() == "application/CGM") - mtfstring = CATGETS(Set_GraphicAgent, 4, "Vector illustration (scalable)"); + mtfstring = MCATGETS(Set_GraphicAgent, 4, "Vector illustration (scalable)"); 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); @@ -940,9 +940,9 @@ GraphicAgent::refresh(const UAS_Pointer &) // update message area XmStringLocalized mtfstring; if (f_graphic->content_type() == "application/CGM") - mtfstring = CATGETS(Set_GraphicAgent, 4, "Vector illustration (scalable)"); + mtfstring = MCATGETS(Set_GraphicAgent, 4, "Vector illustration (scalable)"); 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); } diff --git a/cde/programs/dtinfo/dtinfo/src/Agents/HelpAgent.C b/cde/programs/dtinfo/dtinfo/src/Agents/HelpAgent.C index 2e6c1d21a..fcd757018 100644 --- a/cde/programs/dtinfo/dtinfo/src/Agents/HelpAgent.C +++ b/cde/programs/dtinfo/dtinfo/src/Agents/HelpAgent.C @@ -181,7 +181,7 @@ HelpAgent::display_help (Widget w) if(locator_id == NULL) { message_mgr().error_dialog ((char*)UAS_String( - CATGETS(Set_Messages, 3, "No help available"))); + MCATGETS(Set_Messages, 3, "No help available"))); return; } @@ -232,7 +232,7 @@ HelpAgent::display_help (const String locatoridResourceString) else { message_mgr().error_dialog (UAS_String( - CATGETS(Set_Messages, 3, "No help available"))); + MCATGETS(Set_Messages, 3, "No help available"))); } } } diff --git a/cde/programs/dtinfo/dtinfo/src/Agents/IcccmAgent.C b/cde/programs/dtinfo/dtinfo/src/Agents/IcccmAgent.C index 4b7f66211..09e752e9c 100644 --- a/cde/programs/dtinfo/dtinfo/src/Agents/IcccmAgent.C +++ b/cde/programs/dtinfo/dtinfo/src/Agents/IcccmAgent.C @@ -240,7 +240,7 @@ IcccmAgent::targetCB(Widget w, XtPointer ia, Atom *selection, length, format); if (atom == None) // failed to resolve the best atom message_mgr().info_dialog ((char*) - UAS_String(CATGETS(Set_Messages, 4, + UAS_String(MCATGETS(Set_Messages, 4, "There is no text selected.\n" "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 message_mgr().info_dialog ((char*) - UAS_String(CATGETS(Set_Messages, 4, + UAS_String(MCATGETS(Set_Messages, 4, "There is no text selected.\n" "Select some text, then try again."))); } diff --git a/cde/programs/dtinfo/dtinfo/src/Agents/LibraryAgentMotif.C b/cde/programs/dtinfo/dtinfo/src/Agents/LibraryAgentMotif.C index ff805329a..86c4890b5 100644 --- a/cde/programs/dtinfo/dtinfo/src/Agents/LibraryAgentMotif.C +++ b/cde/programs/dtinfo/dtinfo/src/Agents/LibraryAgentMotif.C @@ -226,7 +226,7 @@ exitCB(Widget, XtPointer client_data, XtPointer) if (BookmarkEdit::modified_count() > 0) { 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" "Quit without saving them?")), f_shell)) @@ -237,7 +237,7 @@ exitCB(Widget, XtPointer client_data, XtPointer) //if (XtIsRealized(f_shell)) XMapRaised(XtDisplay(f_shell), XtWindow(f_shell)); 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); // 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); // just use "delete_response" instead @@ -384,9 +384,9 @@ LibraryAgent::create_ui() widget = XtCreateManagedWidget("file", xmCascadeButtonGadgetClass, menu_bar, args, n); XtVaSetValues(widget, XmNlabelString, - (XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 1, "File")), + (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 1, "File")), XmNmnemonic, - *CATGETS(Set_AgentLabel, 2, ""), + *MCATGETS(Set_AgentLabel, 2, ""), NULL); help_agent().add_help_cb(widget); @@ -398,9 +398,9 @@ LibraryAgent::create_ui() XtVaSetValues(f_view, XmNlabelString, - (XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 4, "View")), + (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 4, "View")), XmNmnemonic, - *CATGETS(Set_AgentLabel, 5, ""), + *MCATGETS(Set_AgentLabel, 5, ""), NULL); #ifdef AllowDetach @@ -411,9 +411,9 @@ LibraryAgent::create_ui() // add labelString to f_detach XtVaSetValues(f_detach, XmNlabelString, - (XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 6, "Detach")), + (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 6, "Detach")), XmNmnemonic, - *CATGETS(Set_AgentLabel, 7, ""), + *MCATGETS(Set_AgentLabel, 7, ""), NULL); #endif @@ -427,9 +427,9 @@ LibraryAgent::create_ui() // add labelString to f_print_as XtVaSetValues(f_print_as, XmNlabelString, - (XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 10, "Print...")), + (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 10, "Print...")), XmNmnemonic, - *CATGETS(Set_AgentLabel, 9, "P"), + *MCATGETS(Set_AgentLabel, 9, "P"), NULL); XtCreateManagedWidget("sep2", xmSeparatorGadgetClass, fileM, 0, 0); @@ -442,9 +442,9 @@ LibraryAgent::create_ui() // add labelString to f_close XtVaSetValues(f_close, XmNlabelString, - (XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 12, "Close")), + (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 12, "Close")), XmNmnemonic, - *CATGETS(Set_AgentLabel, 13, ""), + *MCATGETS(Set_AgentLabel, 13, ""), NULL); widget = XtCreateManagedWidget("exit", xmPushButtonGadgetClass, fileM, 0, 0); @@ -452,9 +452,9 @@ LibraryAgent::create_ui() // add labelString to "exit" XtVaSetValues(widget, XmNlabelString, - (XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 14, "Exit")), + (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 14, "Exit")), XmNmnemonic, - *CATGETS(Set_AgentLabel, 15, ""), + *MCATGETS(Set_AgentLabel, 15, ""), NULL); // edit menu @@ -467,9 +467,9 @@ LibraryAgent::create_ui() // add labelString to "edit" XtVaSetValues(widget, XmNlabelString, - (XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 16, "Edit")), + (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 16, "Edit")), XmNmnemonic, - *CATGETS(Set_AgentLabel, 17, ""), + *MCATGETS(Set_AgentLabel, 17, ""), NULL); help_agent().add_help_cb(widget); @@ -479,9 +479,9 @@ LibraryAgent::create_ui() // add labelString to "copy" XtVaSetValues(f_copy, XmNlabelString, - (XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 18, "Copy")), + (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 18, "Copy")), XmNmnemonic, - *CATGETS(Set_AgentLabel, 19, ""), + *MCATGETS(Set_AgentLabel, 19, ""), NULL); widget = XtCreateManagedWidget("add", xmPushButtonWidgetClass, editM, 0, 0); @@ -489,9 +489,9 @@ LibraryAgent::create_ui() // add labelString to "add" XtVaSetValues(widget, XmNlabelString, - (XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 20, "Add...")), + (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 20, "Add...")), XmNmnemonic, - *CATGETS(Set_AgentLabel, 21, ""), + *MCATGETS(Set_AgentLabel, 21, ""), NULL); f_remove = XtCreateManagedWidget("remove", @@ -500,9 +500,9 @@ LibraryAgent::create_ui() // add labelString to "remove" XtVaSetValues(f_remove, XmNlabelString, - (XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 22, "Remove")), + (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 22, "Remove")), XmNmnemonic, - *CATGETS(Set_AgentLabel, 23, ""), + *MCATGETS(Set_AgentLabel, 23, ""), NULL); // options menu @@ -515,9 +515,9 @@ LibraryAgent::create_ui() // add labelString to "options" XtVaSetValues(widget, XmNlabelString, - (XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 24, "Options")), + (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 24, "Options")), XmNmnemonic, - *CATGETS(Set_AgentLabel, 25, ""), + *MCATGETS(Set_AgentLabel, 25, ""), NULL); help_agent().add_help_cb(widget); @@ -527,9 +527,9 @@ LibraryAgent::create_ui() // add labelString to "preferences" XtVaSetValues(widget, XmNlabelString, - (XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 26, "Preferences...")), + (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 26, "Preferences...")), XmNmnemonic, - *CATGETS(Set_AgentLabel, 27, ""), + *MCATGETS(Set_AgentLabel, 27, ""), NULL); XtCreateManagedWidget("sep1", xmSeparatorGadgetClass, optionsM, 0, 0); @@ -542,9 +542,9 @@ LibraryAgent::create_ui() // add labelString to "auto_track" XtVaSetValues(f_auto_track, XmNlabelString, - (XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 28, "Auto Track")), + (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 28, "Auto Track")), XmNmnemonic, - *CATGETS(Set_AgentLabel, 29, ""), + *MCATGETS(Set_AgentLabel, 29, ""), NULL); Widget tool_barT = XtCreateManagedWidget("show_tool_bar", @@ -555,9 +555,9 @@ LibraryAgent::create_ui() // add labelString to "show_tool_bar" XtVaSetValues(tool_barT, XmNlabelString, - (XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 30, "Show ToolBar")), + (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 30, "Show ToolBar")), XmNmnemonic, - *CATGETS(Set_AgentLabel, 31, ""), + *MCATGETS(Set_AgentLabel, 31, ""), NULL); Widget search_areaT = XtCreateManagedWidget("show_search_area", @@ -568,9 +568,9 @@ LibraryAgent::create_ui() // add labelString to "show_search_area" XtVaSetValues(search_areaT, XmNlabelString, - (XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 32, "Show Search Area")), + (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 32, "Show Search Area")), XmNmnemonic, - *CATGETS(Set_AgentLabel, 33, ""), + *MCATGETS(Set_AgentLabel, 33, ""), NULL); // windows menu @@ -583,9 +583,9 @@ LibraryAgent::create_ui() // add labelString to "windows" XtVaSetValues(widget, XmNlabelString, - (XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 34, "Windows")), + (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 34, "Windows")), XmNmnemonic, - *CATGETS(Set_AgentLabel, 35, ""), + *MCATGETS(Set_AgentLabel, 35, ""), NULL); help_agent().add_help_cb(widget); @@ -594,9 +594,9 @@ LibraryAgent::create_ui() XtAddCallback(widget, XmNactivateCallback, mark_listCB, 0); XtVaSetValues(widget, XmNlabelString, - (XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 40, "Marks List")), + (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 40, "Marks List")), XmNmnemonic, - *CATGETS(Set_AgentLabel, 41, ""), + *MCATGETS(Set_AgentLabel, 41, ""), NULL); widget = XtCreateManagedWidget("section_history", xmPushButtonGadgetClass, @@ -604,9 +604,9 @@ LibraryAgent::create_ui() XtAddCallback(widget, XmNactivateCallback, section_historyCB, 0); XtVaSetValues(widget, XmNlabelString, - (XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 38, "Section History")), + (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 38, "Section History")), XmNmnemonic, - *CATGETS(Set_AgentLabel, 39, ""), + *MCATGETS(Set_AgentLabel, 39, ""), NULL); widget = XtCreateManagedWidget("search_history", xmPushButtonGadgetClass, @@ -614,9 +614,9 @@ LibraryAgent::create_ui() XtAddCallback(widget, XmNactivateCallback, search_historyCB, 0); XtVaSetValues(widget, XmNlabelString, - (XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 42, "Search History")), + (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 42, "Search History")), XmNmnemonic, - *CATGETS(Set_AgentLabel, 43, ""), + *MCATGETS(Set_AgentLabel, 43, ""), NULL); widget = XtCreateManagedWidget("query", xmPushButtonGadgetClass, @@ -624,9 +624,9 @@ LibraryAgent::create_ui() XtAddCallback(widget, XmNactivateCallback, query_editorCB, 0); XtVaSetValues(widget, XmNlabelString, - (XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 44, "Query Editor")), + (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 44, "Query Editor")), XmNmnemonic, - *CATGETS(Set_AgentLabel, 45, ""), + *MCATGETS(Set_AgentLabel, 45, ""), NULL); widget = XtCreateManagedWidget("scope", xmPushButtonGadgetClass, @@ -634,9 +634,9 @@ LibraryAgent::create_ui() XtAddCallback(widget, XmNactivateCallback, scope_editorCB, 0); XtVaSetValues(widget, XmNlabelString, - (XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 46, "Scope Editor")), + (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 46, "Scope Editor")), XmNmnemonic, - *CATGETS(Set_AgentLabel, 47, ""), + *MCATGETS(Set_AgentLabel, 47, ""), NULL); Widget helpM = XmCreatePulldownMenu(menu_bar, (char*)"help_menu", 0, 0); @@ -648,9 +648,9 @@ LibraryAgent::create_ui() menu_bar, args, n); XtVaSetValues(widget, XmNlabelString, - (XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 48, "Help")), + (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 48, "Help")), XmNmnemonic, - *CATGETS(Set_AgentLabel, 49, ""), + *MCATGETS(Set_AgentLabel, 49, ""), NULL); help_agent().add_help_cb(widget); n = 0; @@ -663,9 +663,9 @@ LibraryAgent::create_ui() helpM, 0, 0); XtVaSetValues(widget, XmNlabelString, - (XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 50, "On Item...")), + (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 50, "On Item...")), XmNmnemonic, - *CATGETS(Set_AgentLabel, 51, ""), + *MCATGETS(Set_AgentLabel, 51, ""), NULL); #endif @@ -677,9 +677,9 @@ LibraryAgent::create_ui() helpM, 0, 0); XtVaSetValues(on_overview, XmNlabelString, - (XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 257, "Overview")), + (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 257, "Overview")), XmNmnemonic, - *CATGETS(Set_AgentLabel, 258, ""), + *MCATGETS(Set_AgentLabel, 258, ""), NULL); XtCreateManagedWidget("sep", xmSeparatorGadgetClass, @@ -688,26 +688,26 @@ LibraryAgent::create_ui() helpM, 0, 0); XtVaSetValues(on_tasks, XmNlabelString, - (XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 249, "Tasks")), + (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 249, "Tasks")), XmNmnemonic, - *CATGETS(Set_AgentLabel, 250, ""), + *MCATGETS(Set_AgentLabel, 250, ""), NULL); on_reference = XtCreateManagedWidget("on_reference", xmPushButtonGadgetClass, helpM, 0, 0); XtVaSetValues(on_reference, XmNlabelString, - (XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 251, "Reference")), + (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 251, "Reference")), XmNmnemonic, - *CATGETS(Set_AgentLabel, 252, ""), + *MCATGETS(Set_AgentLabel, 252, ""), NULL); on_item = XtCreateManagedWidget("on_item", xmPushButtonGadgetClass, helpM, 0, 0); XtVaSetValues(on_item, XmNlabelString, - (XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 50, "On Item...")), + (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 50, "On Item...")), XmNmnemonic, - *CATGETS(Set_AgentLabel, 51, ""), + *MCATGETS(Set_AgentLabel, 51, ""), NULL); XtCreateManagedWidget("sep", xmSeparatorGadgetClass, helpM, 0, 0); @@ -715,9 +715,9 @@ LibraryAgent::create_ui() helpM, 0, 0); XtVaSetValues(on_help, XmNlabelString, - (XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 253, "Using Help")), + (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 253, "Using Help")), XmNmnemonic, - *CATGETS(Set_AgentLabel, 254, ""), + *MCATGETS(Set_AgentLabel, 254, ""), NULL); XtCreateManagedWidget("sep", xmSeparatorGadgetClass, helpM, 0, 0); @@ -725,9 +725,9 @@ LibraryAgent::create_ui() helpM, 0, 0); XtVaSetValues(on_about, XmNlabelString, - (XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 255, "About Information Manager")), + (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 255, "About Information Manager")), XmNmnemonic, - *CATGETS(Set_AgentLabel, 256, ""), + *MCATGETS(Set_AgentLabel, 256, ""), NULL); // WXmPushButtonGadget tmp_pbg(tmp); @@ -750,7 +750,7 @@ LibraryAgent::create_ui() tool_bar, 0, 0); XtAddCallback(f_view2, XmNactivateCallback, display_nodeCB, this); 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); f_help_text.insert_item(help_text); help_agent().add_help_cb(f_view2); @@ -762,7 +762,7 @@ LibraryAgent::create_ui() f_detach2 = XtCreateManagedWidget("detach", xmPushButtonWidgetClass, tool_bar, 0, 0); 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); f_help_text.insert_item(help_text); #endif @@ -770,7 +770,7 @@ LibraryAgent::create_ui() f_print2 = XtCreateManagedWidget("print", xmPushButtonWidgetClass, tool_bar, 0, 0); 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")); add_quick_help(f_print2, (char*)*help_text); f_help_text.insert_item(help_text); @@ -778,7 +778,7 @@ LibraryAgent::create_ui() widget = XtCreateManagedWidget("add", xmPushButtonWidgetClass, tool_bar, 0, 0); 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")); add_quick_help(widget, (char*)*help_text); f_help_text.insert_item(help_text); @@ -787,7 +787,7 @@ LibraryAgent::create_ui() f_remove2 = XtCreateManagedWidget("remove", xmPushButtonWidgetClass, tool_bar, 0, 0); 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")); add_quick_help(f_remove2, (char*)*help_text); f_help_text.insert_item(help_text); @@ -796,7 +796,7 @@ LibraryAgent::create_ui() widget = XtCreateManagedWidget("query", xmPushButtonWidgetClass, tool_bar, 0, 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")); add_quick_help(widget, (char*)*help_text); f_help_text.insert_item(help_text); @@ -806,7 +806,7 @@ LibraryAgent::create_ui() widget = XtCreateManagedWidget("marks_list", xmPushButtonWidgetClass, tool_bar, 0, 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")); add_quick_help(widget, (char*)*help_text); f_help_text.insert_item(help_text); @@ -862,7 +862,7 @@ LibraryAgent::create_ui() XtSetArg(args[n], XmNbackground, bg); n++; f_status_text = XtCreateManagedWidget("text", xmTextFieldWidgetClass, 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); // Search area @@ -873,9 +873,9 @@ LibraryAgent::create_ui() XtManageChild(widget = XmCreateOptionMenu(search_area, (char*)"scope", args, n)); XtVaSetValues(widget, XmNlabelString, - (XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 59, "Search:")), + (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 59, "Search:")), NULL); - help_text = new UAS_String(CATGETS(Set_AgentQHelp, 60, + help_text = new UAS_String(MCATGETS(Set_AgentQHelp, 60, "Specify search scope")); add_quick_help(widget, (char*)*help_text); f_help_text.insert_item(help_text); @@ -911,9 +911,9 @@ LibraryAgent::create_ui() XtAddCallback(widget, XmNactivateCallback, scope_editorCB, 0); XtVaSetValues(widget, XmNlabelString, - (XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 61, "Scope Editor")), + (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 61, "Scope Editor")), 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")); add_quick_help(widget, (char*)*help_text); f_help_text.insert_item(help_text); @@ -1066,11 +1066,11 @@ LibraryAgent::search_help (Widget, XtPointer client_data, if (help_text == NULL) { UAS_Pointer 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; 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; agent->f_help_text.insert_item(str); } @@ -1169,7 +1169,7 @@ LibraryAgent::add_library(char* newLib, Widget parent) ((newLib != NULL) && ( *newLib == '\0' )) ) { message_mgr().error_dialog( - (char*)UAS_String(CATGETS( Set_AddLibraryAgent, 6, + (char*)UAS_String(MCATGETS( Set_AddLibraryAgent, 6, "No Infolib specified." )), parent); return (sts = BAD_ARG_FORMAT); } @@ -1210,7 +1210,7 @@ LibraryAgent::add_library(char* newLib, Widget parent) else { message_mgr().error_dialog ( - (char*)UAS_String(CATGETS(Set_AddLibraryAgent, 5, + (char*)UAS_String(MCATGETS(Set_AddLibraryAgent, 5, "Infolib specification format error.")), parent); sts = BAD_ARG_FORMAT ; @@ -1219,7 +1219,7 @@ LibraryAgent::add_library(char* newLib, Widget parent) } else { 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.")), parent); } @@ -1231,7 +1231,7 @@ LibraryAgent::add_library(char* newLib, Widget parent) // if returned to reach here, error msg probably given by // MMDB interface: "Invalid MMDB infolib path: <>" 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.")), parent); #endif @@ -1246,7 +1246,7 @@ LibraryAgent::add_library(char* newLib, Widget parent) if( d != (const int)0 ) { message_mgr().error_dialog( - (char*)UAS_String(CATGETS(Set_AddLibraryAgent, 4, + (char*)UAS_String(MCATGETS(Set_AddLibraryAgent, 4, "Infolib creation failed.")), parent) ; } diff --git a/cde/programs/dtinfo/dtinfo/src/Agents/ListViewMotif.C b/cde/programs/dtinfo/dtinfo/src/Agents/ListViewMotif.C index b15f62806..02b12396a 100644 --- a/cde/programs/dtinfo/dtinfo/src/Agents/ListViewMotif.C +++ b/cde/programs/dtinfo/dtinfo/src/Agents/ListViewMotif.C @@ -149,9 +149,9 @@ ListView::create_ui_objects() WXmPushButton help (form, "help", WAutoManage); XtVaSetValues(close, XmNlabelString, - (XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 12, "Close")), NULL); + (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 12, "Close")), NULL); 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 int help_namelen = strlen(f_name) + strlen("_help") + 1; @@ -163,7 +163,7 @@ ListView::create_ui_objects() f_activate = WXmPushButton (form, "activate", WAutoManage); 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); WXmSeparator separator (form, "separator", WAutoManage); // NOTE: Fix WWL to have a scrolled list object! diff --git a/cde/programs/dtinfo/dtinfo/src/Agents/MapAgentMotif.C b/cde/programs/dtinfo/dtinfo/src/Agents/MapAgentMotif.C index ba6287136..223765788 100644 --- a/cde/programs/dtinfo/dtinfo/src/Agents/MapAgentMotif.C +++ b/cde/programs/dtinfo/dtinfo/src/Agents/MapAgentMotif.C @@ -346,7 +346,7 @@ MapAgent::display (UAS_Pointer &doc_ptr, bool popup) if (this_button == NULL) { message_mgr(). - error_dialog (CATGETS(Set_Messages, 7, "File a Bug")); + error_dialog (MCATGETS(Set_Messages, 7, "File a Bug")); return; } else @@ -432,7 +432,7 @@ MapAgent::display (UAS_Pointer &doc_ptr, bool popup) // Manage all the children. MapButton::ManageKids(); - UAS_String buffer = CATGETS(Set_MapAgent, 2, "Dtinfo: "); + UAS_String buffer = MCATGETS(Set_MapAgent, 2, "Dtinfo: "); buffer = buffer + doc_ptr->title(); f_shell->Title ((char*)buffer); @@ -481,7 +481,7 @@ MapAgent::create_ui() window_system().register_shell (f_shell); 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); f_shell->Set(WArgList(XmNwidth, wg.width, XmNheight, wg.height, @@ -496,9 +496,9 @@ MapAgent::create_ui() help_agent().add_activate_help (help, (char*)"map_help"); XtVaSetValues(close, XmNlabelString, - (XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 12, "Close")), NULL); + (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 12, "Close")), NULL); XtVaSetValues(help, XmNlabelString, - (XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 48, "Help")), NULL); + (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 48, "Help")), NULL); WXmPanedWindow pane (rootform, "pane"); WXmForm topform (pane, "topform"); @@ -512,7 +512,7 @@ MapAgent::create_ui() f_lock = new WXmToggleButton (topform, "lock", WAutoManage); XtVaSetValues(*f_lock, XmNlabelString, - (XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 196, "Auto Update")), + (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 196, "Auto Update")), XmNindicatorSize, 15, NULL); bool lock_status = pref_mgr().get_boolean (PrefMgr::MapAutoUpdate); f_lock->Set(lock_status); diff --git a/cde/programs/dtinfo/dtinfo/src/Agents/MarkChooser.C b/cde/programs/dtinfo/dtinfo/src/Agents/MarkChooser.C index 53262b83e..104125a5e 100644 --- a/cde/programs/dtinfo/dtinfo/src/Agents/MarkChooser.C +++ b/cde/programs/dtinfo/dtinfo/src/Agents/MarkChooser.C @@ -135,7 +135,7 @@ MarkChooser::create_ui (Widget parent, XtVaSetValues(f_form, XmNdialogTitle, (XmString)XmStringLocalized((char*)title_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); SET_CALLBACK (f_list,SingleSelection,select); diff --git a/cde/programs/dtinfo/dtinfo/src/Agents/MarkIconMotif.C b/cde/programs/dtinfo/dtinfo/src/Agents/MarkIconMotif.C index 04acfb2cf..3d786c7e4 100644 --- a/cde/programs/dtinfo/dtinfo/src/Agents/MarkIconMotif.C +++ b/cde/programs/dtinfo/dtinfo/src/Agents/MarkIconMotif.C @@ -203,8 +203,8 @@ MarkIcon::double_click(XEvent *event) g_timeout = NULL; } - UAS_String title = CATGETS(Set_MarkChooser, 2, "Dtinfo: Edit Mark"); - UAS_String btitle = CATGETS(Set_AgentLabel, 16, "Edit"); + UAS_String title = MCATGETS(Set_MarkChooser, 2, "Dtinfo: Edit Mark"); + UAS_String btitle = MCATGETS(Set_AgentLabel, 16, "Edit"); MarkChooser chooser (f_chooser_parent, f_mark_list, (char*)title, (char*)btitle); @@ -511,8 +511,8 @@ MarkIcon::activate (WCallback *wcb) delete g_timeout; g_timeout = NULL; - UAS_String title = CATGETS(Set_MarkChooser, 2, "Dtinfo: Edit Mark"); - UAS_String btitle = CATGETS(Set_AgentLabel, 16, "Edit"); + UAS_String title = MCATGETS(Set_MarkChooser, 2, "Dtinfo: Edit Mark"); + UAS_String btitle = MCATGETS(Set_AgentLabel, 16, "Edit"); MarkChooser chooser (f_chooser_parent, f_mark_list, (char*)title, (char*)btitle); @@ -537,8 +537,8 @@ MarkIcon::select_mark_timeout() // WTimeOut will destruct itself, do not delete g_timeout here g_timeout = NULL; - UAS_String title = CATGETS(Set_MarkChooser, 1, "Dtinfo: Select Mark"); - UAS_String btitle = CATGETS(Set_AgentLabel, 161, "Ok"); + UAS_String title = MCATGETS(Set_MarkChooser, 1, "Dtinfo: Select Mark"); + UAS_String btitle = MCATGETS(Set_AgentLabel, 161, "Ok"); MarkChooser chooser (f_chooser_parent, f_mark_list, (char*)title, (char*)btitle); diff --git a/cde/programs/dtinfo/dtinfo/src/Agents/MarkListView.C b/cde/programs/dtinfo/dtinfo/src/Agents/MarkListView.C index acd2a75a6..9b9fc0979 100644 --- a/cde/programs/dtinfo/dtinfo/src/Agents/MarkListView.C +++ b/cde/programs/dtinfo/dtinfo/src/Agents/MarkListView.C @@ -134,7 +134,7 @@ MarkListView::create_ui() f_shell = WTopLevelShell (window_system().toplevel(), WPopup, "mark_list"); 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); DECL (WXmForm, form, f_shell, "form"); @@ -148,15 +148,15 @@ MarkListView::create_ui() f_list = WXmList (list); f_list.Manage(); - mtfstring = CATGETS(Set_AgentLabel, 165, "Display"); + mtfstring = MCATGETS(Set_AgentLabel, 165, "Display"); 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); - mtfstring = CATGETS(Set_AgentLabel, 183, "Delete"); + mtfstring = MCATGETS(Set_AgentLabel, 183, "Delete"); 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); - mtfstring = CATGETS(Set_AgentLabel, 48, "Help"); + mtfstring = MCATGETS(Set_AgentLabel, 48, "Help"); XtVaSetValues(help, XmNlabelString, (XmString)mtfstring, NULL); SET_CALLBACK (f_list,SingleSelection,select); diff --git a/cde/programs/dtinfo/dtinfo/src/Agents/MessageAgentMotif.C b/cde/programs/dtinfo/dtinfo/src/Agents/MessageAgentMotif.C index 58f7b15f0..220ee873e 100644 --- a/cde/programs/dtinfo/dtinfo/src/Agents/MessageAgentMotif.C +++ b/cde/programs/dtinfo/dtinfo/src/Agents/MessageAgentMotif.C @@ -210,9 +210,9 @@ MessageAgent::displayMessage (char *message_text) XmStringLocalized mtfstring; // 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); - mtfstring = CATGETS(Set_AgentLabel, 162, "Cancel"); + mtfstring = MCATGETS(Set_AgentLabel, 162, "Cancel"); XtVaSetValues((Widget)f_dialog->CancelPB(), XmNlabelString, (XmString)mtfstring, NULL); // Unmanage the cancel and help buttons @@ -256,7 +256,7 @@ MessageAgent::displayError (char *message_text, Widget parent) // Set the window title 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); // Set the dialog type @@ -295,7 +295,7 @@ MessageAgent::displayWarning (char *message_text, Widget parent) // Set the window title 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); // Set the dialog type @@ -334,7 +334,7 @@ MessageAgent::displayInformation (char *message_text, Widget parent) // Set the window title 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); // Set the dialog type @@ -378,14 +378,14 @@ MessageAgent::displayProgress (char *message_text, Widget parent) { #if 0 f_dialog->ResizePolicy(XmRESIZE_NONE); #endif - String string = CATGETS(Set_MessageAgent, 4, "Dtinfo: Progress"); + String string = MCATGETS(Set_MessageAgent, 4, "Dtinfo: Progress"); XtVaSetValues((Widget)shell, XmNtitle, string, NULL); f_dialog->DialogType (XmDIALOG_INFORMATION); f_dialog->MessageAlignment (XmALIGNMENT_BEGINNING); // 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(), XmNlabelString, (XmString)label_str, NULL); @@ -450,7 +450,7 @@ MessageAgent::displayQuestion (char *message_text, Widget parent) // Set the window title 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); // Set the dialog type @@ -460,9 +460,9 @@ MessageAgent::displayQuestion (char *message_text, Widget parent) f_dialog->MessageAlignment (XmALIGNMENT_CENTER); // 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); - mtfstring = CATGETS(Set_AgentLabel, 245, "No"); + mtfstring = MCATGETS(Set_AgentLabel, 245, "No"); XtVaSetValues((Widget)f_dialog->CancelPB(), XmNlabelString, (XmString)mtfstring, NULL); // Manage the cancel and help buttons @@ -504,7 +504,7 @@ MessageAgent::displayQuit (char *message_text, Widget parent) // Set the window title 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, XmNminWidth, 200, NULL); @@ -518,9 +518,9 @@ MessageAgent::displayQuit (char *message_text, Widget parent) f_exit_flag = True; // 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); - mtfstring = CATGETS(Set_AgentLabel, 245, "No"); + mtfstring = MCATGETS(Set_AgentLabel, 245, "No"); XtVaSetValues((Widget)f_dialog->CancelPB(), XmNlabelString, (XmString)mtfstring, NULL); // Manage the cancel and help buttons @@ -607,9 +607,9 @@ MessageAgent::get_integer (const char *message, const char* title, XmStringLocalized mtfstring; - mtfstring = CATGETS(Set_AgentLabel, 161, "OK"); + mtfstring = MCATGETS(Set_AgentLabel, 161, "OK"); 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); snprintf (buffer, sizeof(buffer), "%d", default_value); @@ -712,7 +712,7 @@ MessageAgent::get_string (const char *msg, const char* title, if (title == NULL) title = (char*)UAS_String( - CATGETS(Set_MessageAgent, 7, "Dtinfo: File a Bug")); + MCATGETS(Set_MessageAgent, 7, "Dtinfo: File a Bug")); static char buffer[256]; @@ -729,9 +729,9 @@ MessageAgent::get_string (const char *msg, const char* title, XmStringLocalized mtfstring; - mtfstring = CATGETS(Set_AgentLabel, 161, "OK"); + mtfstring = MCATGETS(Set_AgentLabel, 161, "OK"); 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); if (default_value) diff --git a/cde/programs/dtinfo/dtinfo/src/Agents/NodeHistoryAgentMotif.C b/cde/programs/dtinfo/dtinfo/src/Agents/NodeHistoryAgentMotif.C index 1fb8785e5..b3194260e 100644 --- a/cde/programs/dtinfo/dtinfo/src/Agents/NodeHistoryAgentMotif.C +++ b/cde/programs/dtinfo/dtinfo/src/Agents/NodeHistoryAgentMotif.C @@ -128,7 +128,7 @@ NodeHistoryAgent::create_ui() f_shell = WTopLevelShell (window_system().toplevel(), WPopup, "node_hist"); 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); DECL (WXmForm, form, f_shell, "form"); @@ -137,20 +137,20 @@ NodeHistoryAgent::create_ui() DECLM (WXmPushButton, help, form, "help"); DECLM (WXmSeparator, sep, form, "separator"); - mtfstring = CATGETS(Set_AgentLabel, 165, "Display"); + mtfstring = MCATGETS(Set_AgentLabel, 165, "Display"); 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); - mtfstring = CATGETS(Set_AgentLabel, 48, "Help"); + mtfstring = MCATGETS(Set_AgentLabel, 48, "Help"); XtVaSetValues(help, XmNlabelString, (XmString)mtfstring, NULL); // set up column labels (Book, Section) WXmLabel booklabel (form, "book", WAutoManage); WXmLabel sectionlabel (form, "section", WAutoManage); - mtfstring = CATGETS(Set_AgentLabel, 184, "Book"); + mtfstring = MCATGETS(Set_AgentLabel, 184, "Book"); XtVaSetValues(booklabel, XmNlabelString, (XmString)mtfstring, NULL); - mtfstring = CATGETS(Set_AgentLabel, 185, "Section"); + mtfstring = MCATGETS(Set_AgentLabel, 185, "Section"); XtVaSetValues(sectionlabel, XmNlabelString, (XmString)mtfstring, NULL); Widget scrolled_list = XmCreateScrolledList (form, (char*)"list", NULL, 0); diff --git a/cde/programs/dtinfo/dtinfo/src/Agents/NodeListAgentMotif.C b/cde/programs/dtinfo/dtinfo/src/Agents/NodeListAgentMotif.C index a7c909569..5d5eb5bc3 100644 --- a/cde/programs/dtinfo/dtinfo/src/Agents/NodeListAgentMotif.C +++ b/cde/programs/dtinfo/dtinfo/src/Agents/NodeListAgentMotif.C @@ -159,11 +159,11 @@ NodeListAgent::create_base_window (char *name) f_help = WXmPushButton (*f_form, "help", 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); - mtfstring = CATGETS(Set_AgentLabel, 12, "Close"); + mtfstring = MCATGETS(Set_AgentLabel, 12, "Close"); 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); WXmSeparator separator (*f_form, "separator", AM); diff --git a/cde/programs/dtinfo/dtinfo/src/Agents/NodeWindowAgentMotif.C b/cde/programs/dtinfo/dtinfo/src/Agents/NodeWindowAgentMotif.C index 311c21f15..ef277c756 100644 --- a/cde/programs/dtinfo/dtinfo/src/Agents/NodeWindowAgentMotif.C +++ b/cde/programs/dtinfo/dtinfo/src/Agents/NodeWindowAgentMotif.C @@ -410,14 +410,14 @@ NodeWindowAgent::exit_cb() { bool resp; 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); if (! resp) return; } 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); } @@ -511,10 +511,10 @@ NodeWindowAgent::popup_menu(XButtonPressedEvent* event) const char *book_name = (char *) bn; if (book_name != NULL && *book_name != '\0') 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 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); lb.LabelString(WXmString(title)); @@ -885,14 +885,14 @@ exitCB(Widget, XtPointer client_data, XtPointer) { bool resp; 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?"))); if (! resp) return; } 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?"))); #endif } @@ -981,7 +981,7 @@ NodeWindowAgent::create_ui() 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); f_wm_delete_callback = @@ -1019,15 +1019,15 @@ NodeWindowAgent::create_ui() help_agent().add_help_cb(widget); - mtfstring = CATGETS(Set_AgentLabel, 62, "Browser"); - mnemonic = *CATGETS(Set_AgentLabel, 63, ""); + mtfstring = MCATGETS(Set_AgentLabel, 62, "Browser"); + mnemonic = *MCATGETS(Set_AgentLabel, 63, ""); XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); widget = XtCreateManagedWidget("new", xmPushButtonGadgetClass, fileM, 0, 0); XtAddCallback(widget, XmNactivateCallback, cloneCB, this); - mtfstring = CATGETS(Set_AgentLabel, 64, "New Window"); - mnemonic = *CATGETS(Set_AgentLabel, 65, ""); + mtfstring = MCATGETS(Set_AgentLabel, 64, "New Window"); + mnemonic = *MCATGETS(Set_AgentLabel, 65, ""); XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); XtCreateManagedWidget("sep1", xmSeparatorGadgetClass, fileM, 0, 0); @@ -1036,8 +1036,8 @@ NodeWindowAgent::create_ui() fileM, 0, 0); XtAddCallback(f_print_as, XmNactivateCallback, print_asCB, this); - mtfstring = CATGETS(Set_AgentLabel, 72, "Print..."); - mnemonic = *CATGETS(Set_AgentLabel, 71, "P"); + mtfstring = MCATGETS(Set_AgentLabel, 72, "Print..."); + mnemonic = *MCATGETS(Set_AgentLabel, 71, "P"); XtVaSetValues(f_print_as, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); XtCreateManagedWidget("sep2", xmSeparatorGadgetClass, fileM, 0, 0); @@ -1045,8 +1045,8 @@ NodeWindowAgent::create_ui() widget = XtCreateManagedWidget("show", xmPushButtonGadgetClass, fileM, 0, 0); XtAddCallback(widget, XmNactivateCallback, show_locatorCB, this); - mtfstring = CATGETS(Set_AgentLabel, 68, "Show Locator"); - mnemonic = *CATGETS(Set_AgentLabel, 69, ""); + mtfstring = MCATGETS(Set_AgentLabel, 68, "Show Locator"); + mnemonic = *MCATGETS(Set_AgentLabel, 69, ""); XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); XtCreateManagedWidget("sep3", xmSeparatorGadgetClass, fileM, 0, 0); @@ -1057,15 +1057,15 @@ NodeWindowAgent::create_ui() fileM, args, n); XtAddCallback(f_close, XmNactivateCallback, dismissCB, this); - mtfstring = CATGETS(Set_AgentLabel, 74, "Close"); - mnemonic = *CATGETS(Set_AgentLabel, 75, ""); + mtfstring = MCATGETS(Set_AgentLabel, 74, "Close"); + mnemonic = *MCATGETS(Set_AgentLabel, 75, ""); XtVaSetValues(f_close, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); widget = XtCreateManagedWidget("exit", xmPushButtonGadgetClass, fileM, 0, 0); XtAddCallback(widget, XmNactivateCallback, exitCB, this); - mtfstring = CATGETS(Set_AgentLabel, 76, "Exit"); - mnemonic = *CATGETS(Set_AgentLabel, 77, ""); + mtfstring = MCATGETS(Set_AgentLabel, 76, "Exit"); + mnemonic = *MCATGETS(Set_AgentLabel, 77, ""); XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); // search menu @@ -1078,32 +1078,32 @@ NodeWindowAgent::create_ui() menu_bar, args, n); help_agent().add_help_cb(f_search_menu_button); - mtfstring = CATGETS(Set_AgentLabel, 102, "Search"); - mnemonic = *CATGETS(Set_AgentLabel, 103, ""); + mtfstring = MCATGETS(Set_AgentLabel, 102, "Search"); + mnemonic = *MCATGETS(Set_AgentLabel, 103, ""); XtVaSetValues(f_search_menu_button, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); widget = XtCreateManagedWidget("on_selection", xmPushButtonGadgetClass, searchM, 0, 0); XtAddCallback(widget, XmNactivateCallback, search_on_selectionCB, this); - mtfstring = CATGETS(Set_AgentLabel, 78, "On Selection"); - mnemonic = *CATGETS(Set_AgentLabel, 79, ""); + mtfstring = MCATGETS(Set_AgentLabel, 78, "On Selection"); + mnemonic = *MCATGETS(Set_AgentLabel, 79, ""); XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); widget = XtCreateManagedWidget("query_editor", xmPushButtonGadgetClass, searchM, 0, 0); XtAddCallback(widget, XmNactivateCallback, query_editorCB, 0); - mtfstring = CATGETS(Set_AgentLabel, 80, "Query Editor"); - mnemonic = *CATGETS(Set_AgentLabel, 81, ""); + mtfstring = MCATGETS(Set_AgentLabel, 80, "Query Editor"); + mnemonic = *MCATGETS(Set_AgentLabel, 81, ""); XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); widget = XtCreateManagedWidget("scope_editor", xmPushButtonGadgetClass, searchM, 0, 0); XtAddCallback(widget, XmNactivateCallback, scope_editorCB, 0); - mtfstring = CATGETS(Set_AgentLabel, 82, "Scope Editor"); - mnemonic = *CATGETS(Set_AgentLabel, 83, ""); + mtfstring = MCATGETS(Set_AgentLabel, 82, "Scope Editor"); + mnemonic = *MCATGETS(Set_AgentLabel, 83, ""); XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); XtCreateManagedWidget("sep1", xmSeparatorGadgetClass, searchM, 0, 0); @@ -1112,8 +1112,8 @@ NodeWindowAgent::create_ui() searchM, 0, 0); XtAddCallback(widget, XmNactivateCallback, search_historyCB, 0); - mtfstring = CATGETS(Set_AgentLabel, 84, "Search History"); - mnemonic = *CATGETS(Set_AgentLabel, 85, ""); + mtfstring = MCATGETS(Set_AgentLabel, 84, "Search History"); + mnemonic = *MCATGETS(Set_AgentLabel, 85, ""); XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); XtCreateManagedWidget("sep2", xmSeparatorGadgetClass, searchM, 0, 0); @@ -1125,9 +1125,9 @@ NodeWindowAgent::create_ui() XtVaSetValues(f_clear_search_hits, XmNlabelString, - (XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 86, "Clear Search Hits")), + (XmString)XmStringLocalized(MCATGETS(Set_AgentLabel, 86, "Clear Search Hits")), XmNmnemonic, - *CATGETS(Set_AgentLabel, 87, ""), + *MCATGETS(Set_AgentLabel, 87, ""), NULL); XtCreateManagedWidget("sep3", xmSeparatorGadgetClass, searchM, 0, 0); @@ -1136,16 +1136,16 @@ NodeWindowAgent::create_ui() xmPushButtonGadgetClass, searchM, 0, 0); XtAddCallback(f_search_prev, XmNactivateCallback, search_previousCB, this); - mtfstring = CATGETS(Set_AgentLabel, 98, "Previous Search"); - mnemonic = *CATGETS(Set_AgentLabel, 99, ""); + mtfstring = MCATGETS(Set_AgentLabel, 98, "Previous Search"); + mnemonic = *MCATGETS(Set_AgentLabel, 99, ""); XtVaSetValues(f_search_prev, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); f_search_next = XtCreateManagedWidget("search_next", xmPushButtonGadgetClass, searchM, 0, 0); XtAddCallback(f_search_next, XmNactivateCallback, search_nextCB, this); - mtfstring = CATGETS(Set_AgentLabel, 100, "Next Search"); - mnemonic = *CATGETS(Set_AgentLabel, 101, ""); + mtfstring = MCATGETS(Set_AgentLabel, 100, "Next Search"); + mnemonic = *MCATGETS(Set_AgentLabel, 101, ""); XtVaSetValues(f_search_next, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); // go menu @@ -1156,8 +1156,8 @@ NodeWindowAgent::create_ui() menu_bar, args, n); help_agent().add_help_cb(widget); - mtfstring = CATGETS(Set_AgentLabel, 104, "Go"); - mnemonic = *CATGETS(Set_AgentLabel, 105, ""); + mtfstring = MCATGETS(Set_AgentLabel, 104, "Go"); + mnemonic = *MCATGETS(Set_AgentLabel, 105, ""); XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); 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, XmNdisarmCallback, unpreviewCB, this); - mtfstring = CATGETS(Set_AgentLabel, 88, "Back (History)"); - mnemonic = *CATGETS(Set_AgentLabel, 89, ""); + mtfstring = MCATGETS(Set_AgentLabel, 88, "Back (History)"); + mnemonic = *MCATGETS(Set_AgentLabel, 89, ""); XtVaSetValues(f_history_prev, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); 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, XmNdisarmCallback, unpreviewCB, this); - mtfstring = CATGETS(Set_AgentLabel, 90, "Forward (History)"); - mnemonic = *CATGETS(Set_AgentLabel, 91, ""); + mtfstring = MCATGETS(Set_AgentLabel, 90, "Forward (History)"); + mnemonic = *MCATGETS(Set_AgentLabel, 91, ""); XtVaSetValues(f_history_next, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); widget = XtCreateManagedWidget("section_history", xmPushButtonGadgetClass, goM, 0, 0); XtAddCallback(widget, XmNactivateCallback, section_historyCB, 0); - mtfstring = CATGETS(Set_AgentLabel, 92, "History..."); - mnemonic = *CATGETS(Set_AgentLabel, 93, ""); + mtfstring = MCATGETS(Set_AgentLabel, 92, "History..."); + mnemonic = *MCATGETS(Set_AgentLabel, 93, ""); XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); 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, XmNdisarmCallback, unpreviewCB, this); - mtfstring = CATGETS(Set_AgentLabel, 96, "Next Section"); - mnemonic = *CATGETS(Set_AgentLabel, 97, ""); + mtfstring = MCATGETS(Set_AgentLabel, 96, "Next Section"); + mnemonic = *MCATGETS(Set_AgentLabel, 97, ""); XtVaSetValues(f_node_next, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); 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, XmNdisarmCallback, unpreviewCB, this); - mtfstring = CATGETS(Set_AgentLabel, 94, "Previous Section"); - mnemonic = *CATGETS(Set_AgentLabel, 95, ""); + mtfstring = MCATGETS(Set_AgentLabel, 94, "Previous Section"); + mnemonic = *MCATGETS(Set_AgentLabel, 95, ""); XtVaSetValues(f_node_prev, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); XtCreateManagedWidget("sep2", xmSeparatorGadgetClass, goM, 0, 0); @@ -1215,8 +1215,8 @@ NodeWindowAgent::create_ui() widget = XtCreateManagedWidget("open", xmPushButtonGadgetClass, goM, 0, 0); XtAddCallback(widget, XmNactivateCallback, open_urlCB, 0); - mtfstring = CATGETS(Set_AgentLabel, 66, "Open Locator..."); - mnemonic = *CATGETS(Set_AgentLabel, 67, ""); + mtfstring = MCATGETS(Set_AgentLabel, 66, "Open Locator..."); + mnemonic = *MCATGETS(Set_AgentLabel, 67, ""); XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); // marks menu @@ -1228,8 +1228,8 @@ NodeWindowAgent::create_ui() menu_bar, args, n); help_agent().add_help_cb(widget); - mtfstring = CATGETS(Set_AgentLabel, 106, "Marks"); - mnemonic = *CATGETS(Set_AgentLabel, 107, ""); + mtfstring = MCATGETS(Set_AgentLabel, 106, "Marks"); + mnemonic = *MCATGETS(Set_AgentLabel, 107, ""); XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); f_create_bmrk = XtCreateManagedWidget("create_bmrk", @@ -1247,8 +1247,8 @@ NodeWindowAgent::create_ui() if (window_system().dtinfo_font()) bmfont = XmFontListAppendEntry(bmfont, window_system().dtinfo_font()); - mtfstring = CATGETS(Set_AgentLabel, 108, "Create Bookmark"); - mnemonic = *CATGETS(Set_AgentLabel, 109, ""); + mtfstring = MCATGETS(Set_AgentLabel, 108, "Create Bookmark"); + mnemonic = *MCATGETS(Set_AgentLabel, 109, ""); XtVaSetValues(f_create_bmrk, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, XmNfontList, bmfont, NULL); @@ -1258,8 +1258,8 @@ NodeWindowAgent::create_ui() markM, 0, 0); XtAddCallback(f_create_anno, XmNactivateCallback, create_annotationCB, this); - mtfstring = CATGETS(Set_AgentLabel, 110, "Create Note..."); - mnemonic = *CATGETS(Set_AgentLabel, 111, ""); + mtfstring = MCATGETS(Set_AgentLabel, 110, "Create Note..."); + mnemonic = *MCATGETS(Set_AgentLabel, 111, ""); XtVaSetValues(f_create_anno, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, XmNfontList, bmfont, NULL); @@ -1271,8 +1271,8 @@ NodeWindowAgent::create_ui() markM, 0, 0); XtAddCallback(list_marks, XmNactivateCallback, mark_listCB, 0); - mtfstring = CATGETS(Set_AgentLabel, 112, "List Marks"); - mnemonic = *CATGETS(Set_AgentLabel, 113, ""); + mtfstring = MCATGETS(Set_AgentLabel, 112, "List Marks"); + mnemonic = *MCATGETS(Set_AgentLabel, 113, ""); XtVaSetValues(list_marks, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, XmNfontList, bmfont, NULL); @@ -1283,8 +1283,8 @@ NodeWindowAgent::create_ui() xmPushButtonGadgetClass, markM, 0, 0); XtAddCallback(f_edit_mark, XmNactivateCallback, edit_markCB, this); - mtfstring = CATGETS(Set_AgentLabel, 114, "Edit Selection..."); - mnemonic = *CATGETS(Set_AgentLabel, 115, ""); + mtfstring = MCATGETS(Set_AgentLabel, 114, "Edit Selection..."); + mnemonic = *MCATGETS(Set_AgentLabel, 115, ""); XtVaSetValues(f_edit_mark, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, XmNfontList, bmfont, NULL); @@ -1293,8 +1293,8 @@ NodeWindowAgent::create_ui() xmPushButtonGadgetClass, markM, 0, 0); XtAddCallback(f_move_mark, XmNactivateCallback, move_markCB, this); - mtfstring = CATGETS(Set_AgentLabel, 116, "Move Selection"); - mnemonic = *CATGETS(Set_AgentLabel, 117, ""); + mtfstring = MCATGETS(Set_AgentLabel, 116, "Move Selection"); + mnemonic = *MCATGETS(Set_AgentLabel, 117, ""); XtVaSetValues(f_move_mark, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, XmNfontList, bmfont, NULL); @@ -1304,8 +1304,8 @@ NodeWindowAgent::create_ui() markM, 0, 0); XtAddCallback(f_delete_mark, XmNactivateCallback, delete_markCB, this); - mtfstring = CATGETS(Set_AgentLabel, 118, "Delete Selection"); - mnemonic = *CATGETS(Set_AgentLabel, 119, ""); + mtfstring = MCATGETS(Set_AgentLabel, 118, "Delete Selection"); + mnemonic = *MCATGETS(Set_AgentLabel, 119, ""); XtVaSetValues(f_delete_mark, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, XmNfontList, bmfont, NULL); @@ -1385,16 +1385,16 @@ NodeWindowAgent::create_ui() menu_bar, args, n); help_agent().add_help_cb(widget); - mtfstring = CATGETS(Set_AgentLabel, 120, "Options"); - mnemonic = *CATGETS(Set_AgentLabel, 121, ""); + mtfstring = MCATGETS(Set_AgentLabel, 120, "Options"); + mnemonic = *MCATGETS(Set_AgentLabel, 121, ""); XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); widget = XtCreateManagedWidget("preferences", xmPushButtonGadgetClass, optionsM, 0, 0); XtAddCallback(widget, XmNactivateCallback, prefsCB, 0); - mtfstring = CATGETS(Set_AgentLabel, 122, "Preferences..."); - mnemonic = *CATGETS(Set_AgentLabel, 123, ""); + mtfstring = MCATGETS(Set_AgentLabel, 122, "Preferences..."); + mnemonic = *MCATGETS(Set_AgentLabel, 123, ""); XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); XtCreateManagedWidget("sep1", xmSeparatorGadgetClass, optionsM, 0, 0); @@ -1404,8 +1404,8 @@ NodeWindowAgent::create_ui() optionsM, 0, 0); XtAddCallback(f_detach_graphic, XmNactivateCallback, detach_graphicCB, this); - mtfstring = CATGETS(Set_AgentLabel, 124, "Detach Graphic"); - mnemonic = *CATGETS(Set_AgentLabel, 125, ""); + mtfstring = MCATGETS(Set_AgentLabel, 124, "Detach Graphic"); + mnemonic = *MCATGETS(Set_AgentLabel, 125, ""); XtVaSetValues(f_detach_graphic, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); XtCreateManagedWidget("sep2", xmSeparatorGadgetClass, optionsM, 0, 0); @@ -1416,8 +1416,8 @@ NodeWindowAgent::create_ui() XtAddCallback(tool_barT, XmNvalueChangedCallback, tool_bar_toggleCB, tool_bar); - mtfstring = CATGETS(Set_AgentLabel, 126, "Show Tool Bar"); - mnemonic = *CATGETS(Set_AgentLabel, 127, ""); + mtfstring = MCATGETS(Set_AgentLabel, 126, "Show Tool Bar"); + mnemonic = *MCATGETS(Set_AgentLabel, 127, ""); XtVaSetValues(tool_barT, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); Widget search_areaT = XtCreateManagedWidget("show_search_area", @@ -1426,8 +1426,8 @@ NodeWindowAgent::create_ui() XtAddCallback(search_areaT, XmNvalueChangedCallback, search_area_toggleCB, search_area); - mtfstring = CATGETS(Set_AgentLabel, 128, "Show Search Area"); - mnemonic = *CATGETS(Set_AgentLabel, 129, ""); + mtfstring = MCATGETS(Set_AgentLabel, 128, "Show Search Area"); + mnemonic = *MCATGETS(Set_AgentLabel, 129, ""); XtVaSetValues(search_areaT, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); // windows menu @@ -1439,24 +1439,24 @@ NodeWindowAgent::create_ui() menu_bar, args, n); help_agent().add_help_cb(widget); - mtfstring = CATGETS(Set_AgentLabel, 130, "Windows"); - mnemonic = *CATGETS(Set_AgentLabel, 131, ""); + mtfstring = MCATGETS(Set_AgentLabel, 130, "Windows"); + mnemonic = *MCATGETS(Set_AgentLabel, 131, ""); XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); widget = XtCreateManagedWidget("booklist", xmPushButtonGadgetClass, windowsM, 0, 0); XtAddCallback(widget, XmNactivateCallback, show_booklistCB, 0); - mtfstring = CATGETS(Set_AgentLabel, 132, "Book List"); - mnemonic = *CATGETS(Set_AgentLabel, 133, ""); + mtfstring = MCATGETS(Set_AgentLabel, 132, "Book List"); + mnemonic = *MCATGETS(Set_AgentLabel, 133, ""); XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); widget = XtCreateManagedWidget("graphical_map", xmPushButtonGadgetClass, windowsM, 0, 0); XtAddCallback(widget, XmNactivateCallback, show_mapCB, this); - mtfstring = CATGETS(Set_AgentLabel, 134, "Graphical Map"); - mnemonic = *CATGETS(Set_AgentLabel, 135, ""); + mtfstring = MCATGETS(Set_AgentLabel, 134, "Graphical Map"); + mnemonic = *MCATGETS(Set_AgentLabel, 135, ""); XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); @@ -1472,8 +1472,8 @@ NodeWindowAgent::create_ui() XtSetArg(args[n], XmNmenuHelpWidget, widget); n++; XtSetValues(menu_bar, args, n); - mtfstring = CATGETS(Set_AgentLabel, 143, "Help"); - mnemonic = *CATGETS(Set_AgentLabel, 144, ""); + mtfstring = MCATGETS(Set_AgentLabel, 143, "Help"); + mnemonic = *MCATGETS(Set_AgentLabel, 144, ""); XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); #define AM WAutoManage @@ -1496,56 +1496,56 @@ NodeWindowAgent::create_ui() //WXmPushButton on_version (helpM, "on_version" , AM); //ON_ACTIVATE (on_version, display_version); - mtfstring = CATGETS(Set_AgentLabel, 257, "Overview"); - mnemonic = *CATGETS(Set_AgentLabel, 258, ""); + mtfstring = MCATGETS(Set_AgentLabel, 257, "Overview"); + mnemonic = *MCATGETS(Set_AgentLabel, 258, ""); XtVaSetValues((Widget)on_overview, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); - mtfstring = CATGETS(Set_AgentLabel, 249, "Tasks"); - mnemonic = *CATGETS(Set_AgentLabel, 250, ""); + mtfstring = MCATGETS(Set_AgentLabel, 249, "Tasks"); + mnemonic = *MCATGETS(Set_AgentLabel, 250, ""); XtVaSetValues((Widget)on_tasks, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); - mtfstring = CATGETS(Set_AgentLabel, 251, "Reference"); - mnemonic = *CATGETS(Set_AgentLabel, 252, ""); + mtfstring = MCATGETS(Set_AgentLabel, 251, "Reference"); + mnemonic = *MCATGETS(Set_AgentLabel, 252, ""); XtVaSetValues((Widget)on_reference, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); - mtfstring = CATGETS(Set_AgentLabel, 50, "On Item..."); - mnemonic = *CATGETS(Set_AgentLabel, 51, ""); + mtfstring = MCATGETS(Set_AgentLabel, 50, "On Item..."); + mnemonic = *MCATGETS(Set_AgentLabel, 51, ""); XtVaSetValues((Widget)on_item, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); - mtfstring = CATGETS(Set_AgentLabel, 253, "Using Help"); - mnemonic = *CATGETS(Set_AgentLabel, 254, ""); + mtfstring = MCATGETS(Set_AgentLabel, 253, "Using Help"); + mnemonic = *MCATGETS(Set_AgentLabel, 254, ""); XtVaSetValues((Widget)on_help, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); - mtfstring = CATGETS(Set_AgentLabel, 255, "About Information Manager"); - mnemonic = *CATGETS(Set_AgentLabel, 256, ""); + mtfstring = MCATGETS(Set_AgentLabel, 255, "About Information Manager"); + mnemonic = *MCATGETS(Set_AgentLabel, 256, ""); XtVaSetValues((Widget)on_about, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); #ifdef EAM - mtfstring = CATGETS(Set_AgentLabel, 147, "On Window"); - mnemonic = *CATGETS(Set_AgentLabel, 148, ""); + mtfstring = MCATGETS(Set_AgentLabel, 147, "On Window"); + mnemonic = *MCATGETS(Set_AgentLabel, 148, ""); XtVaSetValues((Widget)on_window, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); -// mtfstring = CATGETS(Set_AgentLabel, 149, "On Application"); -// mnemonic = *CATGETS(Set_AgentLabel, 150, ""); +// mtfstring = MCATGETS(Set_AgentLabel, 149, "On Application"); +// mnemonic = *MCATGETS(Set_AgentLabel, 150, ""); // XtVaSetValues((Widget)on_application, XmNlabelString, (XmString)mtfstring, // XmNmnemonic, mnemonic, NULL); -// mtfstring = CATGETS(Set_AgentLabel, 151, "Index"); -// mnemonic = *CATGETS(Set_AgentLabel, 152, ""); +// mtfstring = MCATGETS(Set_AgentLabel, 151, "Index"); +// mnemonic = *MCATGETS(Set_AgentLabel, 152, ""); // XtVaSetValues((Widget)index, XmNlabelString, (XmString)mtfstring, // XmNmnemonic, mnemonic, NULL); - mtfstring = CATGETS(Set_AgentLabel, 155, "On Keys"); - mnemonic = *CATGETS(Set_AgentLabel, 156, ""); + mtfstring = MCATGETS(Set_AgentLabel, 155, "On Keys"); + mnemonic = *MCATGETS(Set_AgentLabel, 156, ""); XtVaSetValues((Widget)on_keys, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); - mtfstring = CATGETS(Set_AgentLabel, 157, "On Version"); - mnemonic = *CATGETS(Set_AgentLabel, 158. ""); + mtfstring = MCATGETS(Set_AgentLabel, 157, "On Version"); + mnemonic = *MCATGETS(Set_AgentLabel, 158. ""); XtVaSetValues((Widget)on_version, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); @@ -1569,7 +1569,7 @@ NodeWindowAgent::create_ui() XtAddCallback(f_history_prev2, XmNdisarmCallback, unpreviewCB, this); 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")); add_quick_help(f_history_prev2, (char*)*textstore); f_textstore.insert_item(textstore); @@ -1582,7 +1582,7 @@ NodeWindowAgent::create_ui() XtAddCallback(f_history_next2, XmNdisarmCallback, unpreviewCB, this); 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")); add_quick_help(f_history_next2, (char*)*textstore); f_textstore.insert_item(textstore); @@ -1599,7 +1599,7 @@ NodeWindowAgent::create_ui() XtAddCallback(f_node_prev2, XmNdisarmCallback, unpreviewCB, this); 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")); add_quick_help(f_node_prev2, (char*)*textstore); f_textstore.insert_item(textstore); @@ -1612,7 +1612,7 @@ NodeWindowAgent::create_ui() XtAddCallback(f_node_next2, XmNdisarmCallback, unpreviewCB, this); 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")); add_quick_help(f_node_next2, (char*)*textstore); f_textstore.insert_item(textstore); @@ -1627,7 +1627,7 @@ NodeWindowAgent::create_ui() XtAddCallback(f_search_prev2, XmNactivateCallback, search_previousCB, this); 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")); add_quick_help(f_search_prev2, (char*)*textstore); f_textstore.insert_item(textstore); @@ -1638,7 +1638,7 @@ NodeWindowAgent::create_ui() XtAddCallback(f_search_next2, XmNactivateCallback, search_nextCB, this); 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")); add_quick_help(f_search_next2, (char*)*textstore); f_textstore.insert_item(textstore); @@ -1654,7 +1654,7 @@ NodeWindowAgent::create_ui() XtAddCallback(f_print2, XmNactivateCallback, printCB, this); 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")); add_quick_help(f_print2, (char*)*textstore); f_textstore.insert_item(textstore); @@ -1664,7 +1664,7 @@ NodeWindowAgent::create_ui() XtAddCallback(widget, XmNactivateCallback, show_booklistCB, 0); 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); f_textstore.insert_item(textstore); @@ -1673,7 +1673,7 @@ NodeWindowAgent::create_ui() XtAddCallback(widget, XmNactivateCallback, show_mapCB, this); 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")); add_quick_help(widget, (char*)*textstore); f_textstore.insert_item(textstore); @@ -1705,13 +1705,13 @@ NodeWindowAgent::create_ui() XtAddCallback(widget, XmNvalueChangedCallback, lock_toggleCB, this); 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, " "to prevent (allow) use for new documents.")); add_quick_help(widget, (char*)*textstore); f_textstore.insert_item(textstore); - mtfstring = CATGETS(Set_AgentLabel, 159, "Retain"); + mtfstring = MCATGETS(Set_AgentLabel, 159, "Retain"); XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, NULL); // Work Window @@ -1745,7 +1745,7 @@ NodeWindowAgent::create_ui() XtSetArg(args[n], XmNbackground, bg); n++; f_status_text = XtCreateManagedWidget("text", xmTextFieldWidgetClass, 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."); 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); XtAddCallback(f_detach_button, XmNactivateCallback, detach_grCB, this); 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); f_attach_button = XmCreatePushButton(f_detach_menu, (char*)"Attach Graphic", NULL, 0); XtAddCallback(f_attach_button, XmNactivateCallback, attach_grCB, this); 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); f_raise_button = XmCreatePushButton(f_detach_menu, (char*)"Raise Graphic", NULL, 0); XtAddCallback(f_raise_button, XmNactivateCallback, raise_grCB, this); 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); 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); XtAddCallback(widget, XmNactivateCallback, go_to_linkCB, this); XtManageChild(widget); - mtfstring = CATGETS(Set_AgentLabel, 168, "Display Link"); + mtfstring = MCATGETS(Set_AgentLabel, 168, "Display Link"); XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, NULL); widget = XmCreatePushButton(f_preview_menu, (char*)"widget", NULL, 0); XtAddCallback(widget, XmNactivateCallback, open_new_nodeCB, this); XtManageChild(widget); - mtfstring = CATGETS(Set_AgentLabel, 64, "New Window"); + mtfstring = MCATGETS(Set_AgentLabel, 64, "New Window"); XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, NULL); // create default popup menu @@ -1853,13 +1853,13 @@ NodeWindowAgent::create_ui() f_node_next3 = XmCreatePushButton(f_default_menu, (char*)"f_node_next3", NULL, 0); XtAddCallback(f_node_next3, XmNactivateCallback, node_nextCB, this); 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); f_node_prev3 = XmCreatePushButton(f_default_menu, (char*)"f_node_prev3", NULL, 0); XtAddCallback(f_node_prev3, XmNactivateCallback, node_previousCB, this); 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); 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); XtAddCallback(widget, XmNactivateCallback, show_locatorCB, this); XtManageChild(widget); - mtfstring = CATGETS(Set_AgentLabel, 68, "Show Locator"); + mtfstring = MCATGETS(Set_AgentLabel, 68, "Show Locator"); XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, NULL); 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); XtAddCallback(widget, XmNactivateCallback, printCB, this); XtManageChild(widget); - mtfstring = CATGETS(Set_AgentLabel, 70, "Print"); + mtfstring = MCATGETS(Set_AgentLabel, 70, "Print"); XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, NULL); @@ -1890,11 +1890,11 @@ NodeWindowAgent::create_ui() if (MB_CUR_MAX > 1) { // 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(); // 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(); #ifdef LB_DEBUG @@ -1998,12 +1998,12 @@ NodeWindowAgent::create_ui() XtManageChild(widget = XmCreateOptionMenu(search_area, (char*)"scope", args, n)); 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")); add_quick_help(widget, (char*)*textstore); f_textstore.insert_item(textstore); - mtfstring = CATGETS(Set_AgentLabel, 59, "Search:"); + mtfstring = MCATGETS(Set_AgentLabel, 59, "Search:"); XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, NULL); // hookup the ScopeMenu object here @@ -2029,10 +2029,10 @@ NodeWindowAgent::create_ui() XtAddCallback(widget, XmNactivateCallback, scope_editorCB, 0); 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); - textstore = new UAS_String(CATGETS(Set_AgentQHelp, 11, + textstore = new UAS_String(MCATGETS(Set_AgentQHelp, 11, "Specify search scope using the Scope Editor")); add_quick_help(widget, (char*)*textstore); f_textstore.insert_item(textstore); @@ -2321,11 +2321,11 @@ NodeWindowAgent::search_help (Widget, XtPointer client_data, if (help_text == NULL) { UAS_Pointer 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; 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; agent->f_textstore.insert_item(str); } @@ -2478,7 +2478,7 @@ NodeWindowAgent::initialize_history() void NodeWindowAgent::display_version() { - UAS_String version = CATGETS(Set_Version, 1, ""); + UAS_String version = MCATGETS(Set_Version, 1, ""); if (*(char*)version) { message_mgr().info_dialog ((char*)version); } @@ -3000,10 +3000,10 @@ NodeWindowAgent::preview (WTimeOut *) const char *book_name = (char *) bn; if (book_name != NULL && *book_name != '\0') 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 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); f_preview_timeout = NULL; f_preview_document = NULL; @@ -3083,7 +3083,7 @@ NodeWindowAgent::make_bookmark (Boolean edit, MarkCanvas* refmark) //Xassert (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.")), (Widget)f_shell); return status; @@ -3257,7 +3257,7 @@ NodeWindowAgent::make_bookmark (Boolean edit, MarkCanvas* refmark) } else if (bad_markinfo.length() > 0) 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" "be used alone to create a bookmark reference. Either\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() { 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.")), (Widget)f_shell); } @@ -3555,7 +3555,7 @@ NodeWindowAgent::delete_mark() mcatch_any() { 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.")), (Widget)f_shell); } @@ -3606,7 +3606,7 @@ NodeWindowAgent::move_markCB(Widget, XtPointer client_data, XtPointer) mcatch_any() { 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.")), (Widget)f_shell); } @@ -3667,10 +3667,10 @@ NodeWindowAgent::detach_graphic() WArgList (XmNdialogType, XmDIALOG_INFORMATION, NULL)); WXmDialogShell shell (info_dialog.Parent()); // 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); 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.HelpPB()); @@ -3732,7 +3732,7 @@ NodeWindowAgent::show_locator() UAS_String locator_str = f_node_ptr->id(); const char *locator = (const char *)locator_str; snprintf (buffer, sizeof(buffer), - CATGETS(Set_NodeWindowAgent, 4, + MCATGETS(Set_NodeWindowAgent, 4, "The locator for this section is %s"), locator); XmTextFieldSetString(f_status_text, buffer); XmTextFieldSetSelection(f_status_text, @@ -4048,7 +4048,7 @@ NodeWindowAgent::do_bookmarks(bool move_to_mark) if (bookmark_errors > 0) { 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.")), (Widget)f_shell); } @@ -4162,7 +4162,7 @@ NodeWindowAgent::initialize_hierarchy() if (++depth > 15) { 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); break; } @@ -4886,7 +4886,7 @@ NodeWindowAgent::show_mark(MarkCanvas *jump_to, bool move_to) else { message_mgr().warning_dialog ( - (char*)UAS_String(CATGETS(Set_Messages, 14, + (char*)UAS_String(MCATGETS(Set_Messages, 14, "The bookmark cannot be displayed.")), (Widget)f_shell); } @@ -5139,7 +5139,7 @@ MarkViewer::receive (ViewMark &message, void* /*client_data*/) mcatch_any() { message_mgr().info_dialog ( - (char*)UAS_String(CATGETS(Set_Messages, 15, + (char*)UAS_String(MCATGETS(Set_Messages, 15, "The bookcase is not accessible."))); } end_try; diff --git a/cde/programs/dtinfo/dtinfo/src/Agents/OutlineListViewMotif.C b/cde/programs/dtinfo/dtinfo/src/Agents/OutlineListViewMotif.C index 38ab18941..9737bcf2d 100644 --- a/cde/programs/dtinfo/dtinfo/src/Agents/OutlineListViewMotif.C +++ b/cde/programs/dtinfo/dtinfo/src/Agents/OutlineListViewMotif.C @@ -1235,7 +1235,7 @@ OutlineListView::activate (WCallback *wcb) } mcatch_any() { - message_mgr().error_dialog( (char*)UAS_String(CATGETS( + message_mgr().error_dialog( (char*)UAS_String(MCATGETS( Set_UrlAgent, 5, "Document not found." )) ) ; } end_try; diff --git a/cde/programs/dtinfo/dtinfo/src/Agents/PrefAgentMotif.C b/cde/programs/dtinfo/dtinfo/src/Agents/PrefAgentMotif.C index 067aa5826..ef75f934e 100644 --- a/cde/programs/dtinfo/dtinfo/src/Agents/PrefAgentMotif.C +++ b/cde/programs/dtinfo/dtinfo/src/Agents/PrefAgentMotif.C @@ -312,7 +312,7 @@ PrefAgent::create_ui() f_shell = WTopLevelShell (window_system().toplevel(), WPopup, "preferences"); window_system().register_shell(&f_shell); - string = CATGETS(Set_PrefAgent, 1, "Dtinfo: Preferences"); + string = MCATGETS(Set_PrefAgent, 1, "Dtinfo: Preferences"); XtVaSetValues((Widget)f_shell, XmNtitle, string, XmNmwmDecorations, decorations, @@ -322,7 +322,7 @@ PrefAgent::create_ui() DECLMC(WXmOptionMenu, options, form, "options"); 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); ASSNM (WXmPushButton, f_ok, form, "ok"); @@ -331,15 +331,15 @@ PrefAgent::create_ui() DECLM (WXmPushButton, cancel, form, "cancel"); DECLM (WXmPushButton, help, form, "help"); - mtfstring = CATGETS(Set_AgentLabel, 161, "OK"); + mtfstring = MCATGETS(Set_AgentLabel, 161, "OK"); 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); - mtfstring = CATGETS(Set_AgentLabel, 202, "Reset"); + mtfstring = MCATGETS(Set_AgentLabel, 202, "Reset"); 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); - mtfstring = CATGETS(Set_AgentLabel, 48, "Help"); + mtfstring = MCATGETS(Set_AgentLabel, 48, "Help"); XtVaSetValues(help, XmNlabelString, (XmString)mtfstring, NULL); SET_CALLBACK (f_ok,Activate,ok); @@ -366,17 +366,17 @@ PrefAgent::create_ui() DECLM (WXmLabel, lock_label, browse_form, "lock_label"); 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); - mtfstring = CATGETS(Set_AgentLabel, 190, "Browser Geometry"); + mtfstring = MCATGETS(Set_AgentLabel, 190, "Browser Geometry"); 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); - mtfstring = CATGETS(Set_AgentLabel, 192, "Font Scale"); + mtfstring = MCATGETS(Set_AgentLabel, 192, "Font Scale"); 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); - mtfstring = CATGETS(Set_AgentLabel, 194, "File a Bug"); + mtfstring = MCATGETS(Set_AgentLabel, 194, "File a Bug"); XtVaSetValues(f_lock_toggle, XmNlabelString, (XmString)mtfstring, NULL); Dimension height; @@ -425,15 +425,15 @@ PrefAgent::create_ui() DECLM (WXmLabel, update_label, map_form, "update_label"); 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); - mtfstring = CATGETS(Set_AgentLabel, 195, "Map Geometry"); + mtfstring = MCATGETS(Set_AgentLabel, 195, "Map Geometry"); 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); - mtfstring = CATGETS(Set_AgentLabel, 196, "Auto Update"); + mtfstring = MCATGETS(Set_AgentLabel, 196, "Auto Update"); 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); height = f_map_geo.Height(); @@ -451,7 +451,7 @@ PrefAgent::create_ui() // Create history preferences DECLM (WXmPushButton, history, options_menu, "history"); - mtfstring = CATGETS(Set_AgentLabel, 260, "History"); + mtfstring = MCATGETS(Set_AgentLabel, 260, "History"); XtVaSetValues(history, XmNlabelString, (XmString)mtfstring, NULL); 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_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); - mtfstring = CATGETS(Set_AgentLabel, 198, "Search History Size"); + mtfstring = MCATGETS(Set_AgentLabel, 198, "Search History Size"); XtVaSetValues(sh_label, XmNlabelString, (XmString)mtfstring, NULL); height = f_nh_field.Height(); @@ -511,7 +511,7 @@ PrefAgent::create_ui() DECLM (WXmPushButton, search, options_menu, "search"); - mtfstring = CATGETS(Set_AgentLabel, 189, "Searching"); + mtfstring = MCATGETS(Set_AgentLabel, 189, "Searching"); XtVaSetValues(search, XmNlabelString, (XmString)mtfstring, NULL); DECL (WXmForm, search_form, container, "search_prefs"); @@ -523,11 +523,11 @@ PrefAgent::create_ui() DECLM (WXmLabel, adisplay_label, search_form, "adisplay_label"); 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); - 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); - mtfstring = CATGETS(Set_AgentLabel, 194, "File a Bug"); + mtfstring = MCATGETS(Set_AgentLabel, 194, "File a Bug"); XtVaSetValues(f_adisplay_toggle, XmNlabelString, (XmString)mtfstring, NULL); height = f_max_hits_field.Height(); @@ -963,7 +963,7 @@ void PrefAgent::set_update (bool set) { 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); @@ -1022,7 +1022,7 @@ void PrefAgent::set_auto_display (bool set) { 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); @@ -1072,11 +1072,11 @@ PrefAgent::get_geometry (WCallback *wcb) WArgList (XmNdialogType, XmDIALOG_INFORMATION, NULL)); WXmDialogShell shell (info_dialog.Parent()); // 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); // window_system().register_full_modal_shell (&shell); 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.HelpPB()); diff --git a/cde/programs/dtinfo/dtinfo/src/Agents/PrintPanelAgentMotif.C b/cde/programs/dtinfo/dtinfo/src/Agents/PrintPanelAgentMotif.C index 84282d483..a9c8ddfef 100644 --- a/cde/programs/dtinfo/dtinfo/src/Agents/PrintPanelAgentMotif.C +++ b/cde/programs/dtinfo/dtinfo/src/Agents/PrintPanelAgentMotif.C @@ -272,7 +272,7 @@ customizePrintSetupBox(AppPrintData *p) XmNmarginHeight, 2, NULL); - label = XmStringGenerate(CATGETS(Set_AgentLabel, 205, "Number of Sections"), + label = XmStringGenerate(MCATGETS(Set_AgentLabel, 205, "Number of Sections"), NULL, XmCHARSET_TEXT, NULL); XtVaCreateManagedWidget("how_many_title", @@ -289,7 +289,7 @@ customizePrintSetupBox(AppPrintData *p) how_many_frame, NULL); - label = XmStringGenerate(CATGETS(Set_AgentLabel, 206, "Selected:"), + label = XmStringGenerate(MCATGETS(Set_AgentLabel, 206, "Selected:"), NULL, XmCHARSET_TEXT, NULL); selected_label = XtVaCreateManagedWidget("selected_label", @@ -314,7 +314,7 @@ customizePrintSetupBox(AppPrintData *p) XmNtopOffset, 2, NULL); - label = XmStringGenerate(CATGETS(Set_AgentLabel, 207, "To Be Printed:"), + label = XmStringGenerate(MCATGETS(Set_AgentLabel, 207, "To Be Printed:"), NULL, XmCHARSET_TEXT, NULL); XtVaCreateManagedWidget("to_print_label", @@ -357,7 +357,7 @@ customizePrintSetupBox(AppPrintData *p) XmNrightOffset, 5, NULL); - label = XmStringGenerate(CATGETS(Set_AgentLabel, 209, "What to Print"), + label = XmStringGenerate(MCATGETS(Set_AgentLabel, 209, "What to Print"), NULL, XmCHARSET_TEXT, NULL); XtVaCreateManagedWidget("what_title", @@ -373,7 +373,7 @@ customizePrintSetupBox(AppPrintData *p) what_frame, NULL); - label = XmStringGenerate(CATGETS(Set_AgentLabel, 210, "Sections"), + label = XmStringGenerate(MCATGETS(Set_AgentLabel, 210, "Sections"), NULL, XmCHARSET_TEXT, NULL); f_print_nodes = print_nodes = XtVaCreateManagedWidget("print_nodes", @@ -393,7 +393,7 @@ customizePrintSetupBox(AppPrintData *p) XmStringFree(label); XtAddCallback(print_nodes, XmNvalueChangedCallback, ToggleWhatCB, p); - label = XmStringGenerate(CATGETS(Set_AgentLabel, 211, "Hierarchy"), + label = XmStringGenerate(MCATGETS(Set_AgentLabel, 211, "Hierarchy"), NULL, XmCHARSET_TEXT, NULL); 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_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); } @@ -548,7 +548,7 @@ PrintSetupCB(Widget print_dialog, XtPointer client_data, XtPointer call_data) if (XmPrintPopupPDM(p->f_print_shell, print_dialog) != XmPDM_NOTIFY_SUCCESS) { /* 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); RCS_DEBUG("XmPrintPopupPDM failed\n"); } @@ -642,7 +642,7 @@ CreatePrintSetup(Widget parent, AppPrintData* p) // additional dialog resources XmString title = XmStringCreateLocalized( - CATGETS(Set_PrintPanelAgent, 1, "Dtinfo: Print")); + MCATGETS(Set_PrintPanelAgent, 1, "Dtinfo: Print")); XtSetArg(args[n], XmNdialogTitle, title); n++; XtSetArg(args[n], (char*)DtNworkAreaLocation, DtWORK_AREA_BOTTOM); n++; @@ -782,14 +782,14 @@ FinishPrintToFile(Display *display, 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); RCS_DEBUG("Something went wrong with XmPrintToFile...\n"); } else { - msg = CATGETS(Set_PrintPanelAgent, 9, "Print to file completed."); + msg = MCATGETS(Set_PrintPanelAgent, 9, "Print to file completed."); message_mgr().info_dialog(msg); RCS_DEBUG("XmPrintToFile completed OK\n"); @@ -886,7 +886,7 @@ DoPrint(Widget widget, AppPrintData * p) // Post an error dialog - msg = CATGETS(Set_PrintPanelAgent, + msg = MCATGETS(Set_PrintPanelAgent, 11, "Print Job Failed.\n\nThe X Print Server is Temporarily Out of Resources."); message_mgr().error_dialog(msg); diff --git a/cde/programs/dtinfo/dtinfo/src/Agents/SearchHistoryListViewMotif.C b/cde/programs/dtinfo/dtinfo/src/Agents/SearchHistoryListViewMotif.C index 82656aa05..bb05f5d47 100644 --- a/cde/programs/dtinfo/dtinfo/src/Agents/SearchHistoryListViewMotif.C +++ b/cde/programs/dtinfo/dtinfo/src/Agents/SearchHistoryListViewMotif.C @@ -203,9 +203,9 @@ SearchHistoryListView::child_create_ui_pre(WXmForm &form) int number_width = WXmString("0").Width(header_font); - WXmString matchString = CATGETS(Set_AgentLabel, 246, "Matches"); - WXmString scopeString = CATGETS(Set_AgentLabel, 243, "Scope"); - WXmString queryString = CATGETS(Set_AgentLabel, 230, "Query"); + WXmString matchString = MCATGETS(Set_AgentLabel, 246, "Matches"); + WXmString scopeString = MCATGETS(Set_AgentLabel, 243, "Scope"); + WXmString queryString = MCATGETS(Set_AgentLabel, 230, "Query"); int scope_offset = 8 * number_width; @@ -284,5 +284,5 @@ SearchHistoryListView::display() cerr << "done." << endl; #endif XtVaSetValues(*f_shell, XmNtitle, - CATGETS(Set_SearchHistoryList, 1, "Dtinfo: Search History"), NULL); + MCATGETS(Set_SearchHistoryList, 1, "Dtinfo: Search History"), NULL); } diff --git a/cde/programs/dtinfo/dtinfo/src/Agents/SearchResultsAgentMotif.C b/cde/programs/dtinfo/dtinfo/src/Agents/SearchResultsAgentMotif.C index e3cf9ac4f..d7d9ae0d3 100644 --- a/cde/programs/dtinfo/dtinfo/src/Agents/SearchResultsAgentMotif.C +++ b/cde/programs/dtinfo/dtinfo/src/Agents/SearchResultsAgentMotif.C @@ -247,8 +247,8 @@ SearchResultsAgent::compose_header() WXmLabel* header = (WXmLabel*)XtNameToWidget((Widget)*f_list_form, "header"); - WXmString bookString = CATGETS(Set_AgentLabel, 184, "Book"); - WXmString sectString = CATGETS(Set_AgentLabel, 185, "Section"); + WXmString bookString = MCATGETS(Set_AgentLabel, 184, "Book"); + WXmString sectString = MCATGETS(Set_AgentLabel, 185, "Section"); WXmString bookPostfix( window_system().make_space( @@ -313,7 +313,7 @@ SearchResultsAgent::display (ResultID *results) // NOTE: Using bogus internal string below: if (f_scale == 0) message_mgr().warning_dialog ( - (char*)UAS_String(CATGETS(Set_Messages, 69, + (char*)UAS_String(MCATGETS(Set_Messages, 69, "Search results weighting are not available."))); /* -------- Display the number of hits. -------- */ @@ -452,7 +452,7 @@ SearchResultsAgent::create_window() XmStringLocalized mtfstring; 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); 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); 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); - 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); - mtfstring = CATGETS(Set_AgentLabel, 220, "Scope:"); + mtfstring = MCATGETS(Set_AgentLabel, 220, "Scope:"); 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); - mtfstring = CATGETS(Set_AgentLabel, 221, "Query:"); + mtfstring = MCATGETS(Set_AgentLabel, 221, "Query:"); XtVaSetValues(query_label, XmNlabelString, (XmString)mtfstring, NULL); Widget textw = XmCreateScrolledText (*f_pane, (char*)"query_text", NULL, 0); @@ -600,7 +600,7 @@ SearchResultsAgent::view_activate (WCallback *) } else { 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."))); } } @@ -683,6 +683,6 @@ SearchResultsAgent::modify_verify (WCallback *wcb) tvp->doit = False; message_mgr().warning_dialog ( - (char*)UAS_String(CATGETS(Set_Messages, 47, + (char*)UAS_String(MCATGETS(Set_Messages, 47, "This is a display-only field."))); } diff --git a/cde/programs/dtinfo/dtinfo/src/Agents/SearchScopeAgentMotif.C b/cde/programs/dtinfo/dtinfo/src/Agents/SearchScopeAgentMotif.C index 2ebeaf5b0..56152ef47 100644 --- a/cde/programs/dtinfo/dtinfo/src/Agents/SearchScopeAgentMotif.C +++ b/cde/programs/dtinfo/dtinfo/src/Agents/SearchScopeAgentMotif.C @@ -421,7 +421,7 @@ SearchScopeAgent::display() if (env().debug()) { message_mgr().warning_dialog ( - (char*)UAS_String(CATGETS(Set_Messages, 31, + (char*)UAS_String(MCATGETS(Set_Messages, 31, "Ignoring invalid scopes in your profile."))); } search_scope_mgr().show_warning(False); @@ -467,7 +467,7 @@ SearchScopeAgent::create_ui() f_shell = WTopLevelShell (window_system().toplevel(),WPopup,"scope_editor"); 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); DECL (WXmForm, form, f_shell, "form"); @@ -478,9 +478,9 @@ SearchScopeAgent::create_ui() f_scope_option = WXmOptionMenu (form, (char*)"scope_option", WAutoManage, args, n); 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); - mtfstring = CATGETS(Set_AgentLabel, 213, "Unnamed"); + mtfstring = MCATGETS(Set_AgentLabel, 213, "Unnamed"); XtVaSetValues(f_unnamed, XmNlabelString, (XmString)mtfstring, NULL); ASSNM (WXmPushButton, f_new, form, "new"); @@ -496,23 +496,23 @@ SearchScopeAgent::create_ui() DECLM (WXmLabel, bookshelf, form, "books"); DECLM (WXmLabel, components, form, "components"); - mtfstring = CATGETS(Set_AgentLabel, 214, "Books"); + mtfstring = MCATGETS(Set_AgentLabel, 214, "Books"); XtVaSetValues(bookshelf, XmNlabelString, (XmString)mtfstring, NULL); - mtfstring = CATGETS(Set_AgentLabel, 215, "Components"); + mtfstring = MCATGETS(Set_AgentLabel, 215, "Components"); 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); - mtfstring = CATGETS(Set_AgentLabel, 217, "Save"); + mtfstring = MCATGETS(Set_AgentLabel, 217, "Save"); 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); - mtfstring = CATGETS(Set_AgentLabel, 183, "Delete"); + mtfstring = MCATGETS(Set_AgentLabel, 183, "Delete"); 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); - mtfstring = CATGETS(Set_AgentLabel, 12, "Close"); + mtfstring = MCATGETS(Set_AgentLabel, 12, "Close"); XtVaSetValues(close, XmNlabelString, (XmString)mtfstring, NULL); - mtfstring = CATGETS(Set_AgentLabel, 48, "Help"); + mtfstring = MCATGETS(Set_AgentLabel, 48, "Help"); XtVaSetValues(help, XmNlabelString, (XmString)mtfstring, NULL); // WARNING: the widget name, infobases, is used else where--do not alter. @@ -592,7 +592,7 @@ SearchScopeAgent::new_scope() if (f_reset.Sensitive()) { 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?"))); if (dosave) save_scope(); @@ -646,9 +646,9 @@ SearchScopeAgent::scope_name_prompt() *((char *) memcpy(default_name, scope_name, len) + len) = '\0'; message_mgr().set_max_length(default_name_len); 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:")), - (char*)UAS_String(CATGETS(Set_SearchScopeAgent, 3, + (char*)UAS_String(MCATGETS(Set_SearchScopeAgent, 3, "Dtinfo: Save Scope")), default_name); @@ -665,14 +665,14 @@ SearchScopeAgent::scope_name_prompt() if (strpbrk (scope_name, ":,;") != NULL) { 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."))); } // look for empty scope name else if (*scope_name == '\0') { 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."))); } // look for name too long @@ -683,7 +683,7 @@ SearchScopeAgent::scope_name_prompt() // max char length has changed to 20, the message should // be changed to reflect that--or just removed. 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."))); } // look for duplicate scope name @@ -698,7 +698,7 @@ SearchScopeAgent::scope_name_prompt() if (s != 0) { 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."))); } else @@ -1044,7 +1044,7 @@ SearchScopeAgent::close() if (f_reset.Sensitive()) { 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?"))); if (dosave) save_scope(); @@ -1241,14 +1241,14 @@ SearchScopeAgent::generate_component_list() OutlineList *parts = new OutlineList (10); OutlineElement *oe; - ADD (components, CATGETS(Set_Messages, 22, "Everything"), parts, True); - ADD (parts, CATGETS(Set_Messages, 23, "Titles"), 0, False); - ADD (parts, CATGETS(Set_Messages, 24, "Body"), 0, False); - ADD (parts, CATGETS(Set_Messages, 25, "Examples"), 0, False); - ADD (parts, CATGETS(Set_Messages, 26, "Index"), 0, False); - ADD (parts, CATGETS(Set_Messages, 27, "Tables"), 0, False); + ADD (components, MCATGETS(Set_Messages, 22, "Everything"), parts, True); + ADD (parts, MCATGETS(Set_Messages, 23, "Titles"), 0, False); + ADD (parts, MCATGETS(Set_Messages, 24, "Body"), 0, False); + ADD (parts, MCATGETS(Set_Messages, 25, "Examples"), 0, False); + ADD (parts, MCATGETS(Set_Messages, 26, "Index"), 0, False); + ADD (parts, MCATGETS(Set_Messages, 27, "Tables"), 0, False); #ifndef DtinfoClient - ADD (parts, CATGETS(Set_Messages, 28, "Graphics"), 0, False); + ADD (parts, MCATGETS(Set_Messages, 28, "Graphics"), 0, False); #endif return (components); @@ -1493,7 +1493,7 @@ SearchScopeAgent::select_scope (WCallback *wcb) if (f_reset.Sensitive()) { 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?"))); if (dosave) save_scope(); @@ -1545,7 +1545,7 @@ SearchScopeAgent::delete_scope() Xassert (f_current_scope != NULL); 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?"))); if (!doit) return; @@ -1623,7 +1623,7 @@ SearchScopeAgent::add_infolib(UAS_Pointer &lib) // find the scope 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 UAS_PtrListbcases = bookcase_list(); @@ -1712,7 +1712,7 @@ SearchScopeAgent::remove_infolib(UAS_Pointer &lib) // find the scope 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 UAS_PtrListbcases = bookcase_list(); diff --git a/cde/programs/dtinfo/dtinfo/src/Agents/SearchScopeList.C b/cde/programs/dtinfo/dtinfo/src/Agents/SearchScopeList.C index bf9f0d53f..80feda77f 100644 --- a/cde/programs/dtinfo/dtinfo/src/Agents/SearchScopeList.C +++ b/cde/programs/dtinfo/dtinfo/src/Agents/SearchScopeList.C @@ -293,7 +293,7 @@ SearchScopeList::restore() // Create the scope for the Current Section // 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); s->set_read_only(); @@ -302,7 +302,7 @@ SearchScopeList::restore() // bcases = f_search_scope_agent->bookcase_list(); 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); s->set_read_only(); bcases.clear(); @@ -325,7 +325,7 @@ SearchScopeList::restore() // yet been realized. Just set the flag so dialog can be // shown later. // message_mgr().warning_dialog ( - // (char*)UAS_String(CATGETS(Set_Messages, 31, + // (char*)UAS_String(MCATGETS(Set_Messages, 31, // "Ignoring invalid scopes in your profile."))); } diff --git a/cde/programs/dtinfo/dtinfo/src/Agents/UrlAgentMotif.C b/cde/programs/dtinfo/dtinfo/src/Agents/UrlAgentMotif.C index dcfb27fea..95d89c116 100644 --- a/cde/programs/dtinfo/dtinfo/src/Agents/UrlAgentMotif.C +++ b/cde/programs/dtinfo/dtinfo/src/Agents/UrlAgentMotif.C @@ -121,7 +121,7 @@ UrlAgent::document( char *locator, ((locator != NULL) && ( *locator == '\0' )) ) { // 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, "No locator value provided." )) ) ; return (sts = BAD_ARG_FORMAT); @@ -155,7 +155,7 @@ UrlAgent::document( char *locator, } else { - message_mgr().error_dialog( (char*)UAS_String(CATGETS( + message_mgr().error_dialog( (char*)UAS_String(MCATGETS( Set_UrlAgent, ERR_LOCATOR_FORMAT, "Locator specification format error." )) ) ; sts = BAD_ARG_FORMAT ; @@ -176,7 +176,7 @@ UrlAgent::document( char *locator, } mcatch_any() { - message_mgr().error_dialog( (char*)UAS_String(CATGETS( + message_mgr().error_dialog( (char*)UAS_String(MCATGETS( Set_UrlAgent, ERR_LOCATOR_RESOLUTION, "Locator resolution failed." )) ) ; @@ -251,7 +251,7 @@ UrlAgent::print_document(char *locator) // checked here to avoid less specific error return, later 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, "No locator value provided." )) ) ; } @@ -287,7 +287,7 @@ UrlAgent::print_document(char *locator) else { 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, "Locator specification format error." )) ) ; } @@ -342,7 +342,7 @@ UrlAgent::print_document(char *locator) { 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, "Locator resolution failed." )) ) ; } @@ -374,7 +374,7 @@ UrlAgent::create_ui () { XmStringLocalized mtfstring; String string; - string = CATGETS(Set_UrlAgent, 1, "Dtinfo: Open Locator"); + string = MCATGETS(Set_UrlAgent, 1, "Dtinfo: Open Locator"); XtVaSetValues((Widget)fShell, XmNtitle, string, XmNmwmDecorations, decorations, @@ -390,17 +390,17 @@ UrlAgent::create_ui () { ASSNM (WXmTextField, fTextField, f_form, "text_field"); 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); - mtfstring = CATGETS(Set_AgentLabel, 161, "OK"); + mtfstring = MCATGETS(Set_AgentLabel, 161, "OK"); XtVaSetValues(fOk, XmNlabelString, (XmString)mtfstring, NULL); - mtfstring = CATGETS(Set_AgentLabel, 201, "Apply"); + mtfstring = MCATGETS(Set_AgentLabel, 201, "Apply"); XtVaSetValues(fApply, XmNlabelString, (XmString)mtfstring, NULL); - mtfstring = CATGETS(Set_AgentLabel, 223, "Clear"); + mtfstring = MCATGETS(Set_AgentLabel, 223, "Clear"); XtVaSetValues(fClear, XmNlabelString, (XmString)mtfstring, NULL); - mtfstring = CATGETS(Set_AgentLabel, 12, "Close"); + mtfstring = MCATGETS(Set_AgentLabel, 12, "Close"); XtVaSetValues(close, XmNlabelString, (XmString)mtfstring, NULL); - mtfstring = CATGETS(Set_AgentLabel, 48, "Help"); + mtfstring = MCATGETS(Set_AgentLabel, 48, "Help"); XtVaSetValues(help, XmNlabelString, (XmString)mtfstring, NULL); // @@ -477,13 +477,13 @@ UrlAgent::displayDocument () { // d->retrieve (); // } else { // message_mgr().error_dialog ((char*) -// UAS_String(CATGETS(Set_Messages, 70, +// UAS_String(MCATGETS(Set_Messages, 70, // "Invalid access method in url."))); // } // } // mcatch_any() { // message_mgr().error_dialog ((char*) -// UAS_String(CATGETS(Set_Messages, 71, +// UAS_String(MCATGETS(Set_Messages, 71, // "Document creation failed."))); // } // end_try; diff --git a/cde/programs/dtinfo/dtinfo/src/Managers/CatMgr.hh b/cde/programs/dtinfo/dtinfo/src/Managers/CatMgr.hh index b506fd921..908d27ef7 100644 --- a/cde/programs/dtinfo/dtinfo/src/Managers/CatMgr.hh +++ b/cde/programs/dtinfo/dtinfo/src/Managers/CatMgr.hh @@ -63,6 +63,6 @@ inline CatMgr& msg_catalog_mgr() return CatMgr::msg_catalog_mgr(); }; -#define CATGETS msg_catalog_mgr().catgets +#define MCATGETS msg_catalog_mgr().catgets #endif diff --git a/cde/programs/dtinfo/dtinfo/src/Managers/EnvMgr.C b/cde/programs/dtinfo/dtinfo/src/Managers/EnvMgr.C index d25d4116a..e2f9e9aac 100644 --- a/cde/programs/dtinfo/dtinfo/src/Managers/EnvMgr.C +++ b/cde/programs/dtinfo/dtinfo/src/Managers/EnvMgr.C @@ -204,7 +204,7 @@ EnvMgr::init(int argc_i, char** argv_i) { // invalid infolib--display error message message_mgr().error_dialog ( - (char*)UAS_String(CATGETS(Set_AddLibraryAgent, 7, + (char*)UAS_String(MCATGETS(Set_AddLibraryAgent, 7, "No infolibs found or specified."))); return -1; } @@ -349,7 +349,7 @@ EnvMgr::parse_cmdline( int argc_i, { // invalid infolib--display error message, but not fatal message_mgr().error_dialog ( - (char*)UAS_String(CATGETS(Set_AddLibraryAgent, 5, + (char*)UAS_String(MCATGETS(Set_AddLibraryAgent, 5, "Infolib specification format error."))); } } @@ -418,7 +418,7 @@ EnvMgr::parse_cmdline( int argc_i, } else { - cerr << CATGETS(Set_EnvMgr, 2, "Invalid argument") << endl; + cerr << MCATGETS(Set_EnvMgr, 2, "Invalid argument") << endl; return -1; } } @@ -428,7 +428,7 @@ EnvMgr::parse_cmdline( int argc_i, // make sure that if print option was specified that some sections // to print were also specified. 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; usage(); exit(1); @@ -440,7 +440,7 @@ EnvMgr::parse_cmdline( int argc_i, void EnvMgr::usage() { - cerr << CATGETS(Set_EnvMgr, 4, "Usage: dtinfo") << endl; + cerr << MCATGETS(Set_EnvMgr, 4, "Usage: dtinfo") << endl; cerr << " [-help]" << endl; cerr << " [-l infolib1] [-l infolib2] [...]" << endl; cerr << " [-sect section[-section][,section[-section]]]" << endl; @@ -452,7 +452,7 @@ EnvMgr::usage() cerr << " [-paperSize]" << endl; cerr << " [-printer x_print_server]]]" << endl; cerr << endl; - cerr << CATGETS(Set_EnvMgr, 5, + cerr << MCATGETS(Set_EnvMgr, 5, "This application understands all standard X Toolkit command-line options.") << endl; } diff --git a/cde/programs/dtinfo/dtinfo/src/Managers/MarkMgr.C b/cde/programs/dtinfo/dtinfo/src/Managers/MarkMgr.C index fd5cc77ff..6d4040ebd 100644 --- a/cde/programs/dtinfo/dtinfo/src/Managers/MarkMgr.C +++ b/cde/programs/dtinfo/dtinfo/src/Managers/MarkMgr.C @@ -194,7 +194,7 @@ MarkMgr::open_base (const char *filename) if (base == NULL) { 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; } @@ -219,14 +219,14 @@ MarkMgr::create_mark (UAS_Pointer &doc_ptr, const Anchor &anchor, if (f_num_bases == 0) { 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."))); return (NULL); } if (!f_can_create) { 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); } @@ -264,7 +264,7 @@ MarkMgr::create_mark (UAS_Pointer &doc_ptr, const Anchor &anchor, assert( n >= 0 ); } else { - trimmed_name = strdup(CATGETS(Set_AgentLabel, 213, "Unnamed")); + trimmed_name = strdup(MCATGETS(Set_AgentLabel, 213, "Unnamed")); } #else char *new_name = strdup (name); @@ -310,14 +310,14 @@ MarkMgr::move_mark (UAS_Pointer &doc_ptr, const Anchor &anchor, if (f_num_bases == 0) { 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."))); return (NULL); } if (!f_can_create) { 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); } diff --git a/cde/programs/dtinfo/dtinfo/src/Managers/MessageMgr.C b/cde/programs/dtinfo/dtinfo/src/Managers/MessageMgr.C index 140bb1bdd..6c754357d 100644 --- a/cde/programs/dtinfo/dtinfo/src/Managers/MessageMgr.C +++ b/cde/programs/dtinfo/dtinfo/src/Managers/MessageMgr.C @@ -86,7 +86,7 @@ DisplayDocumentError::receive (UAS_ErrorMsg &message, void *client_data) const char *text = message.fErrorMsg; 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); } @@ -111,7 +111,7 @@ ReportSearchMsg::receive (UAS_SearchMsg &message, void *client_data) } else { 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 XmStringLocalized mtfstring; - mtfstring = CATGETS(Set_AgentLabel, 244, "Yes"); + mtfstring = MCATGETS(Set_AgentLabel, 244, "Yes"); XtVaSetValues(XmMessageBoxGetChild(dialog, XmDIALOG_OK_BUTTON), XmNlabelString, (XmString)mtfstring, NULL); - mtfstring = CATGETS(Set_AgentLabel, 245, "No"); + mtfstring = MCATGETS(Set_AgentLabel, 245, "No"); XtVaSetValues(XmMessageBoxGetChild(dialog, XmDIALOG_CANCEL_BUTTON), XmNlabelString, (XmString)mtfstring, NULL); // Set the window title Widget shell = XtParent(dialog); - String string = CATGETS(Set_MessageAgent, 5, "Dtinfo: Confirm Quit"); + String string = MCATGETS(Set_MessageAgent, 5, "Dtinfo: Confirm Quit"); XtVaSetValues(shell, XmNminWidth, 200, XmNtitle, (XmString)string, @@ -347,7 +347,7 @@ MessageMgr::error_dialog (char *message_text, Widget parent) // Set the window title 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); show_it(dialog); @@ -382,7 +382,7 @@ MessageMgr::warning_dialog (char *message_text, Widget parent) // Set the window title 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); show_it(dialog); @@ -413,7 +413,7 @@ MessageMgr::info_dialog (char *message_text, Widget parent) // Set the window title 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); show_it(dialog); @@ -482,11 +482,11 @@ MessageMgr::question_dialog (char *message_text, Widget parent) // Set labels on buttons XmStringLocalized mtfstring; - mtfstring = CATGETS(Set_AgentLabel, 244, "Yes"); + mtfstring = MCATGETS(Set_AgentLabel, 244, "Yes"); XtVaSetValues(XmMessageBoxGetChild(dialog, XmDIALOG_OK_BUTTON), XmNlabelString, (XmString)mtfstring, NULL); - mtfstring = CATGETS(Set_AgentLabel, 245, "No"); + mtfstring = MCATGETS(Set_AgentLabel, 245, "No"); XtVaSetValues(XmMessageBoxGetChild(dialog, XmDIALOG_CANCEL_BUTTON), XmNlabelString, (XmString)mtfstring, NULL); @@ -496,7 +496,7 @@ MessageMgr::question_dialog (char *message_text, Widget parent) // Set the window title 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); show_it(dialog); @@ -574,7 +574,7 @@ void MessageMgr::demo_failure(demoException &, Widget parent) { error_dialog( - (char*)UAS_String(CATGETS(Set_Messages, 38, "File a Bug")), + (char*)UAS_String(MCATGETS(Set_Messages, 38, "File a Bug")), parent); ::exit(0); } diff --git a/cde/programs/dtinfo/dtinfo/src/Managers/NodeMgr.C b/cde/programs/dtinfo/dtinfo/src/Managers/NodeMgr.C index 03bd8526e..857fb743b 100644 --- a/cde/programs/dtinfo/dtinfo/src/Managers/NodeMgr.C +++ b/cde/programs/dtinfo/dtinfo/src/Managers/NodeMgr.C @@ -348,7 +348,7 @@ NodeMgr::load(UAS_Pointer &node_ptr) mcatch_noarg (StyleSheetSyntaxError&) { 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 ; #endif diff --git a/cde/programs/dtinfo/dtinfo/src/Managers/PrintMgr.C b/cde/programs/dtinfo/dtinfo/src/Managers/PrintMgr.C index 4bc633e17..7c774363a 100644 --- a/cde/programs/dtinfo/dtinfo/src/Managers/PrintMgr.C +++ b/cde/programs/dtinfo/dtinfo/src/Managers/PrintMgr.C @@ -212,7 +212,7 @@ PrintMgr::load(UAS_Pointer &node_ptr) mcatch_noarg (StyleSheetSyntaxError&) { 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.") )); } diff --git a/cde/programs/dtinfo/dtinfo/src/Managers/SearchMgr.C b/cde/programs/dtinfo/dtinfo/src/Managers/SearchMgr.C index 45cc1888b..0df2c782c 100644 --- a/cde/programs/dtinfo/dtinfo/src/Managers/SearchMgr.C +++ b/cde/programs/dtinfo/dtinfo/src/Managers/SearchMgr.C @@ -311,11 +311,11 @@ SearchMgr::display_message (SearchMessageType msg, int) switch( msg ){ case NO_HITS: 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; case BAD_QUERY: 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; } } diff --git a/cde/programs/dtinfo/dtinfo/src/Managers/ServiceMgrX.C b/cde/programs/dtinfo/dtinfo/src/Managers/ServiceMgrX.C index c183673c1..f0b6507f5 100644 --- a/cde/programs/dtinfo/dtinfo/src/Managers/ServiceMgrX.C +++ b/cde/programs/dtinfo/dtinfo/src/Managers/ServiceMgrX.C @@ -454,7 +454,7 @@ olias_send_event (Widget, OliasEvent *event) else { 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_LOCATOR_NOT_FOUND); until help lib fixed } diff --git a/cde/programs/dtinfo/dtinfo/src/Managers/TtIpcMgr.C b/cde/programs/dtinfo/dtinfo/src/Managers/TtIpcMgr.C index 3ce3ea1a5..54a1bfbf9 100644 --- a/cde/programs/dtinfo/dtinfo/src/Managers/TtIpcMgr.C +++ b/cde/programs/dtinfo/dtinfo/src/Managers/TtIpcMgr.C @@ -140,7 +140,7 @@ LogToolTalkMessage ( 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); errmsglen = strlen(errfmt) + strlen(statmsg) + 2; errmsg = XtMalloc(errmsglen); @@ -280,7 +280,7 @@ TtIpcMgr::ipc_init_wp0( XtPointer /* theIpcObj */ ) { DtMsgLogMessage("dtinfo", DtMsgLogError, "%s: %s", "tt_ptype_declare", - (char *) CATGETS( + (char *) MCATGETS( Set_TtIpcMgr, 9, "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( !(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, "Infolib specification format error." )) ) ; return (sts = BAD_ARG_FORMAT); diff --git a/cde/programs/dtinfo/dtinfo/src/Other/WindowSystemMotif.C b/cde/programs/dtinfo/dtinfo/src/Other/WindowSystemMotif.C index 92fc8cff4..a1b7715a4 100644 --- a/cde/programs/dtinfo/dtinfo/src/Other/WindowSystemMotif.C +++ b/cde/programs/dtinfo/dtinfo/src/Other/WindowSystemMotif.C @@ -576,7 +576,7 @@ WindowSystem::init() if (f_display == (Display*)NULL) { fprintf(stderr, "%s", - CATGETS(Set_WindowSystem, 3, "Unable to open display.\n")); + MCATGETS(Set_WindowSystem, 3, "Unable to open display.\n")); exit(1); } @@ -1028,14 +1028,14 @@ WindowSystem::core_dump_handler (int signal_number) { WXmMessageDialog byebye (window_system().toplevel(), (char*)"core_dump"); XtVaSetValues((Widget)byebye, XmNmessageString, - (XmString)XmStringLocalized(CATGETS(Set_WindowSystem, 2, + (XmString)XmStringLocalized(MCATGETS(Set_WindowSystem, 2, "Bombing...")), NULL); WShell shell (XtParent ((Widget) byebye)); window_system().register_shell (&shell); window_system().set_cursor (window_system().f_bomb_cursor); XtVaSetValues((Widget)shell, XmNtitle, - CATGETS(Set_WindowSystem, 1, "Dtinfo: Fatal Error"), NULL); + MCATGETS(Set_WindowSystem, 1, "Dtinfo: Fatal Error"), NULL); byebye.OkPB().Unmanage(); byebye.CancelPB().Unmanage(); @@ -1597,7 +1597,7 @@ WindowSystem::interrupt_handler (int /* signal_number */) if (!(window_system().videoShell()->silent)) { message_mgr().quit_dialog ( - (char*)UAS_String(CATGETS(Set_Messages, 6, "Quit Dtinfo?"))); + (char*)UAS_String(MCATGETS(Set_Messages, 6, "Quit Dtinfo?"))); } else { exit(1); diff --git a/cde/programs/dtinfo/dtinfo/src/Query/QueryEditor.C b/cde/programs/dtinfo/dtinfo/src/Query/QueryEditor.C index c19f9d5f5..1686f6825 100644 --- a/cde/programs/dtinfo/dtinfo/src/Query/QueryEditor.C +++ b/cde/programs/dtinfo/dtinfo/src/Query/QueryEditor.C @@ -278,7 +278,7 @@ QueryEditor::create_ui() f_shell = WTopLevelShell(window_system().toplevel(), WPopup, "query_editor"); 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); // Main form and menu bar. @@ -291,7 +291,7 @@ QueryEditor::create_ui() XtSetArg(args[n], XmNsubMenuId, (Widget) scope_menu); 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); // 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_redo_btn = WXmPushButton (edit_menu, "redo", AM); - mtfstring = CATGETS(Set_AgentLabel, 16, "Edit"); - mnemonic = *CATGETS(Set_AgentLabel, 17, "E"); + mtfstring = MCATGETS(Set_AgentLabel, 16, "Edit"); + mnemonic = *MCATGETS(Set_AgentLabel, 17, "E"); XtVaSetValues(edit_cascade, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL); - mtfstring = CATGETS(Set_AgentLabel, 224, "Cut"); + mtfstring = MCATGETS(Set_AgentLabel, 224, "Cut"); 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); - mtfstring = CATGETS(Set_AgentLabel, 225, "Paste"); + mtfstring = MCATGETS(Set_AgentLabel, 225, "Paste"); 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); - mtfstring = CATGETS(Set_AgentLabel, 227, "Ungroup"); + mtfstring = MCATGETS(Set_AgentLabel, 227, "Ungroup"); 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); - mtfstring = CATGETS(Set_AgentLabel, 229, "Redo"); + mtfstring = MCATGETS(Set_AgentLabel, 229, "Redo"); XtVaSetValues(f_redo_btn, XmNlabelString, (XmString)mtfstring, NULL); // Button area at the bottom @@ -339,17 +339,17 @@ QueryEditor::create_ui() WXmPushButton help (form, "help", AM); WXmSeparator separator (form, "separator", AM); - mtfstring = CATGETS(Set_AgentLabel, 92, "History"); + mtfstring = MCATGETS(Set_AgentLabel, 92, "History"); 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); - mtfstring = CATGETS(Set_AgentLabel, 231, "Clear All"); + mtfstring = MCATGETS(Set_AgentLabel, 231, "Clear All"); 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); - mtfstring = CATGETS(Set_AgentLabel, 12, "Close"); + mtfstring = MCATGETS(Set_AgentLabel, 12, "Close"); XtVaSetValues(cancel, XmNlabelString, (XmString)mtfstring, NULL); - mtfstring = CATGETS(Set_AgentLabel, 48, "Help"); + mtfstring = MCATGETS(Set_AgentLabel, 48, "Help"); XtVaSetValues(help, XmNlabelString, (XmString)mtfstring, NULL); help_agent().add_activate_help (help, (char*)"query_editor_help"); @@ -359,7 +359,7 @@ QueryEditor::create_ui() WXmForm qform (pane, "qform" ); WXmLabel qlabel (qform, "qlabel", AM); - mtfstring = CATGETS(Set_AgentLabel, 230, "Query"); + mtfstring = MCATGETS(Set_AgentLabel, 230, "Query"); XtVaSetValues(qlabel, XmNlabelString, (XmString)mtfstring, NULL); f_query_text = WXmScrolledText (qform, (char*)"qtext", AM); @@ -545,7 +545,7 @@ QueryEditor::modify_verify (WCallback *wcb) // tvp->doit = False; // message_mgr().warning_dialog ( -// (char*)UAS_String(CATGETS(Set_Messages, 47, +// (char*)UAS_String(MCATGETS(Set_Messages, 47, // "This is a display-only field."))); } diff --git a/cde/programs/dtinfo/dtinfo/src/Query/QueryTermView.C b/cde/programs/dtinfo/dtinfo/src/Query/QueryTermView.C index 97d6aa8ab..d8b8652b6 100644 --- a/cde/programs/dtinfo/dtinfo/src/Query/QueryTermView.C +++ b/cde/programs/dtinfo/dtinfo/src/Query/QueryTermView.C @@ -179,9 +179,9 @@ QueryTermView::create_ui() DECLM (WXmPushButtonGadget, contains, prefix_menu, "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); - mtfstring = CATGETS(Set_AgentLabel, 233, "Doesn\'t Contain"); + mtfstring = MCATGETS(Set_AgentLabel, 233, "Doesn\'t Contain"); XtVaSetValues(not_contains, XmNlabelString, (XmString)mtfstring, NULL); unsigned int caps = f_query_term->avail_caps(); @@ -191,9 +191,9 @@ QueryTermView::create_ui() ASSNM (WXmPushButtonGadget, starts, prefix_menu, "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); - 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); } DECLC (WXmPulldownMenu, connect_menu, f_form, "connect_menu" ); @@ -208,7 +208,7 @@ QueryTermView::create_ui() if (caps & (0x01 << UAS_OQLParser::OQL_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); } DECLM (WXmPushButtonGadget, andgad, connect_menu, "and" ); @@ -217,13 +217,13 @@ QueryTermView::create_ui() if (caps & (0x01 << UAS_OQLParser::OQL_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); } if (caps & (0x01 << UAS_OQLParser::OQL_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); } ASSNM (WXmArrowButton, f_pw_button,f_form, "pw_button" ); @@ -231,9 +231,9 @@ QueryTermView::create_ui() WXmTextField (f_form, "term_text", WAutoManage); // 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); - mtfstring = CATGETS(Set_AgentLabel, 238, "And"); + mtfstring = MCATGETS(Set_AgentLabel, 238, "And"); XtVaSetValues(andgad, XmNlabelString, (XmString)mtfstring, NULL); // Callbacks! @@ -597,11 +597,11 @@ QueryTermView::create_fields() ASSNM (WXmTextField, f_weight_field, f_pws_form, "weight_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); - mtfstring = CATGETS(Set_AgentLabel, 242, "Proximity"); + mtfstring = MCATGETS(Set_AgentLabel, 242, "Proximity"); 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); SET_CALLBACK (f_proximity_field,ValueChanged,proximity_changed); diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/Base/UAS_Factory.C b/cde/programs/dtinfo/dtinfo/src/UAS/Base/UAS_Factory.C index a13716bbe..40d8a7b93 100644 --- a/cde/programs/dtinfo/dtinfo/src/UAS/Base/UAS_Factory.C +++ b/cde/programs/dtinfo/dtinfo/src/UAS/Base/UAS_Factory.C @@ -111,13 +111,13 @@ UAS_Factory::create (const UAS_String &locator) { locator.split (':', access, rest); if (access == "") { throw (UAS_Exception((char*)UAS_String( - CATGETS(Set_UAS_Base, 1, + MCATGETS(Set_UAS_Base, 1, "No access part provided in locator (URL).")))); } UAS_Factory *theFactory = UAS_Factory::lookup(access); if (theFactory == 0) { 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"), (char*)access); diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/Base/UAS_OQLParser.C b/cde/programs/dtinfo/dtinfo/src/UAS/Base/UAS_OQLParser.C index 505a8d471..1317f751a 100644 --- a/cde/programs/dtinfo/dtinfo/src/UAS/Base/UAS_OQLParser.C +++ b/cde/programs/dtinfo/dtinfo/src/UAS/Base/UAS_OQLParser.C @@ -145,7 +145,7 @@ UAS_OQLParser::parse(const char *oql) // clean up the stack seql = f_stack.pop(); throw(CASTUASEXCEPT UAS_Exception( - (char*)UAS_String(CATGETS(Set_Messages, 41, + (char*)UAS_String(MCATGETS(Set_Messages, 41, "Invalid characters in search string.")))); } else if (f_stack.entries() != 1){ // NOTE: bad query - error message to user required diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/Base/UAS_ObjList.C b/cde/programs/dtinfo/dtinfo/src/UAS/Base/UAS_ObjList.C index 3de279cac..3912f923f 100644 --- a/cde/programs/dtinfo/dtinfo/src/UAS/Base/UAS_ObjList.C +++ b/cde/programs/dtinfo/dtinfo/src/UAS/Base/UAS_ObjList.C @@ -77,7 +77,7 @@ T & UAS_ObjList::item (int i) const { if (i < 0 || i >= fNumItems) 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]; } diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/Base/UAS_PtrList.C b/cde/programs/dtinfo/dtinfo/src/UAS/Base/UAS_PtrList.C index 3b2a67534..e77ff34fc 100644 --- a/cde/programs/dtinfo/dtinfo/src/UAS/Base/UAS_PtrList.C +++ b/cde/programs/dtinfo/dtinfo/src/UAS/Base/UAS_PtrList.C @@ -78,7 +78,7 @@ T * UAS_PtrList::item (int i) const { if (i < 0 || i >= fNumItems) 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]; } diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_Parser.C b/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_Parser.C index 37ffa0e24..264460d84 100644 --- a/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_Parser.C +++ b/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_Parser.C @@ -125,9 +125,9 @@ DtSR_Parser::se_construct(OQL_Token token, #ifdef IGNORE_UNSUPPORTED return arg1; #else - UAS_String str = CATGETS(Set_DtSR_Parser, 1, + UAS_String str = MCATGETS(Set_DtSR_Parser, 1, "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); UAS_String uas_msg = msg; throw(UAS_Search_Feature_Unavailable(uas_msg)); @@ -166,9 +166,9 @@ DtSR_Parser::se_construct(OQL_Token token, } return newstr; #else - UAS_String str = CATGETS(Set_DtSR_Parser, 1, + UAS_String str = MCATGETS(Set_DtSR_Parser, 1, "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); UAS_String uas_msg = msg; @@ -187,9 +187,9 @@ DtSR_Parser::se_construct(OQL_Token token, newstr = newstr + arg1 + " & " + arg2 + " )"; return newstr; #else - UAS_String str = CATGETS(Set_DtSR_Parser, 1, + UAS_String str = MCATGETS(Set_DtSR_Parser, 1, "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); UAS_String uas_msg = msg; throw(UAS_Search_Feature_Unavailable(uas_msg)); @@ -228,9 +228,9 @@ DtSR_Parser::se_construct(OQL_Token token, newstr = newstr + arg1 + " & " + arg2 + " )"; return newstr; #else - UAS_String str = CATGETS(Set_DtSR_Parser, 1, + UAS_String str = MCATGETS(Set_DtSR_Parser, 1, "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); UAS_String uas_msg = msg; throw(UAS_Search_Feature_Unavailable(uas_msg)); diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_SearchEngine.C b/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_SearchEngine.C index d911e8001..77d065e3a 100644 --- a/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_SearchEngine.C +++ b/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_SearchEngine.C @@ -616,7 +616,7 @@ DtSR_SearchEngine::search(UAS_String oql, UAS_SearchScope& scope, if (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.")); DtSearchFreeMessages(); diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_SearchResultsEntry.C b/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_SearchResultsEntry.C index 2ea6fbf41..92e83a2ea 100644 --- a/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_SearchResultsEntry.C +++ b/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_SearchResultsEntry.C @@ -281,7 +281,7 @@ DtSR_SearchResultsEntry::create_matches() { #ifdef JOE_HATES_THIS 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 throw(CASTEXCEPT Exception()); #endif diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/MMDB/MMDB.C b/cde/programs/dtinfo/dtinfo/src/UAS/MMDB/MMDB.C index 5f471f340..ed1ac4d96 100644 --- a/cde/programs/dtinfo/dtinfo/src/UAS/MMDB/MMDB.C +++ b/cde/programs/dtinfo/dtinfo/src/UAS/MMDB/MMDB.C @@ -75,7 +75,7 @@ MMDB::database() UAS_ErrorMsg msg; UAS_Buffer buf(256); 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)); for (int i = 1; i <= bad_count; i++) { diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/MMDB/MMDB_Factory.C b/cde/programs/dtinfo/dtinfo/src/UAS/MMDB/MMDB_Factory.C index cac20e111..6f6743304 100644 --- a/cde/programs/dtinfo/dtinfo/src/UAS/MMDB/MMDB_Factory.C +++ b/cde/programs/dtinfo/dtinfo/src/UAS/MMDB/MMDB_Factory.C @@ -70,7 +70,7 @@ MMDB_Factory::createMMDB (const UAS_String &infoLibPath) { if (!olias_db().validInfoLibPath(infoLibPath)) { UAS_ErrorMsg badPath; 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"), (char *) infoLibPath); badPath.fErrorMsg = buf; @@ -83,7 +83,7 @@ MMDB_Factory::createMMDB (const UAS_String &infoLibPath) { } mcatch_any() { #if 0 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"), (char *) infoLibPath); UAS_ErrorMsg theError; @@ -351,7 +351,7 @@ MMDB_Factory::genInfolibName () { static int counter = 0; char buf[BUFSIZ]; (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); } diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/MMDB/MMDB_Library.C b/cde/programs/dtinfo/dtinfo/src/UAS/MMDB/MMDB_Library.C index b39ce147f..9ac7edbd2 100644 --- a/cde/programs/dtinfo/dtinfo/src/UAS/MMDB/MMDB_Library.C +++ b/cde/programs/dtinfo/dtinfo/src/UAS/MMDB/MMDB_Library.C @@ -62,7 +62,7 @@ MMDB_Library::title (UAS_TitleType) { UAS_String rval = il->get_info_lib_name(); if (rval == "") { - rval = CATGETS(Set_UAS_MMDB, 5, "File a Bug"); + rval = MCATGETS(Set_UAS_MMDB, 5, "File a Bug"); rval = rval + mmdb().infoLibPath(); } return rval; @@ -128,7 +128,7 @@ MMDB_Library::name () { { char scratch[128]; 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); } }