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

dtinfo subtree dtinfo

Browse source
This commit is contained in:
Ulrich Wilkens 2012-10-14 17:03:44 +02:00 • committed by Jon Trulson
parent 8275485b4a
commit 51b8929ebd
194 changed files with 1266 additions and 937 deletions
Download patch file Download diff file Expand all files Collapse all files

7
cde/programs/dtinfo/dtinfo/Imakefile
View file

@ -5,6 +5,13 @@ XCOMM $TOG: Imakefile /main/9 1998/08/10 15:54:01 mgreess $
SUBDIRS=wwl src install
XCOMM redefine TopLevelProject to build DtInfo with standard CDE config dir
#undef TopLevelProject
#define TopLevelProject DtInfo
IMAKE_DEFINES = -DTopLevelProject=TopLevelProject \
-DProjectTmplFile='<DtInfo.tmpl>' \
-DProjectRulesFile='<DtInfo.rules>'
MakeSubdirs($(SUBDIRS))
DependSubdirs(wwl src)

7
cde/programs/dtinfo/dtinfo/install/Imakefile
View file

@ -5,5 +5,12 @@ XCOMM $TOG: Imakefile /main/8 1998/08/10 15:53:37 mgreess $
SUBDIRS = lib
XCOMM redefine TopLevelProject to build DtInfo with standard CDE config dir
#undef TopLevelProject
#define TopLevelProject DtInfo
IMAKE_DEFINES = -DTopLevelProject=TopLevelProject \
-DProjectTmplFile='<DtInfo.tmpl>' \
-DProjectRulesFile='<DtInfo.rules>'
MakeSubdirs($(SUBDIRS))
DependSubdirs($(SUBDIRS))

5
cde/programs/dtinfo/dtinfo/install/lib/fonts/Imakefile
View file

@ -1,5 +1,10 @@
XCOMM $XConsortium: Imakefile /main/6 1996/09/13 17:26:30 drk $
#ifdef X11ProjectRoot
FONTC = $(XPROJECTROOT)/bin/bdftopcf
MKFONTDIR = $(XPROJECTROOT)/bin/mkfontdir
#endif
OBJS = FontObj(dtinfo)
LinkSourceFile(dtinfo.bdf,$(CDESRC)/fontaliases/bdf)

1
cde/programs/dtinfo/dtinfo/src/Agents/AddLibraryAgent.msg
View file

@ -38,4 +38,3 @@ $ (This string will be shown in a directory listing where there
$ are no Infolibs found in the directory.)
11 "No Infolibs Present"

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

@ -46,7 +46,8 @@
#define C_AddLibraryAgent
#define C_HelpAgent
#define L_Agents
#include <stream.h>
#include <sstream>
using namespace std;
#include "Other/XmStringLocalized.hh"
#include "Managers/CatMgr.hh"
@ -118,7 +119,7 @@ AddLibraryAgent::create_ui (Widget parent) {
ON_ACTIVATE (f_ok, ok);
ON_ACTIVATE (f_clr, clear);
ON_ACTIVATE (canc, cancel);
help_agent().add_activate_help (help, "add_infolib_help");
help_agent().add_activate_help (help, (char*)"add_infolib_help");
f_shell.Realize ();
// XtVaSetValues(f_form, XmNinitialFocus, (Widget)f_text, NULL);
@ -134,7 +135,7 @@ void
AddLibraryAgent::clear () {
// autoUnmanage must be set to False for this button to work properly
XmTextFieldSetString( f_text, "" );
XmTextFieldSetString( f_text, (char*)"" );
}
void
@ -212,8 +213,8 @@ AddLibraryAgent::pick_dir () {
CATGETS(Set_AddLibraryAgent, 10, "Dtinfo: Infolib Selection"));
XmString no_libs_str = XmStringCreateLocalized(
CATGETS(Set_AddLibraryAgent, 11, "No Infolibs Present"));
XmString patt_str = XmStringCreateLocalized( "*.dti" );
XmString infolibs_str = XmStringCreateLocalized( "Infolibs" );
XmString patt_str = XmStringCreateLocalized( (char*)"*.dti" );
XmString infolibs_str = XmStringCreateLocalized( (char*)"Infolibs" );
// default initial directory on first entry
char *buf = new char[256];
@ -244,7 +245,7 @@ AddLibraryAgent::pick_dir () {
XtSetArg(args[n], XmNpathMode, XmPATH_MODE_RELATIVE); n++;
f_file_sel = XmCreateFileSelectionDialog(
f_shell, "pick_dir_file", args, n );
f_shell, (char*)"pick_dir_file", args, n );
XmStringFree(basedir_str);
XmStringFree(initdir_str);

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

@ -87,7 +87,8 @@
#include <WWL/WXmPushButtonGadget.h>
#include <WWL/WXmSeparatorGadget.h>
#include <iostream.h>
#include <iostream>
using namespace std;
int BookmarkEdit::g_modified_count = 0;
@ -250,14 +251,14 @@ BookmarkEdit::create_ui()
WXmPushButtonGadget help (form, "help", WAutoManage);
mtfstring = CATGETS(Set_AgentLabel, 48, "Help");
XtVaSetValues(help, XmNlabelString, (XmString)mtfstring, NULL);
help_agent().add_activate_help (help, "bookmark_edit_help");
help_agent().add_activate_help (help, (char*)"bookmark_edit_help");
f_wm_delete_callback =
new WCallback (*f_shell, window_system().WM_DELETE_WINDOW(),
this, (WWL_FUN) &BookmarkEdit::cancel);
WXmSeparatorGadget separator (form, "separator", WAutoManage);
Widget notes_text = XmCreateScrolledText (form, "notes_text", NULL, 0);
Widget notes_text = XmCreateScrolledText (form, (char*)"notes_text", NULL, 0);
f_notes_text = new WXmText (notes_text);
f_notes_text->Manage();
@ -295,11 +296,11 @@ BookmarkEdit::ok()
f_mark_ptr->set_name (f_name_text->Value());
f_mark_ptr->set_notes (f_notes_text->Value());
// Save the mark to disk.
try
mtry
{
f_mark_ptr->save();
}
catch_any()
mcatch_any()
{
message_mgr().error_dialog(
CATGETS(Set_BookmarkEdit, 1, "Dtinfo: Bookmark Editor"));

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

@ -80,7 +80,8 @@
#include "Other/XmStringLocalized.hh"
#include <Prelude.h>
#include <iostream.h>
#include <iostream>
using namespace std;
#include <string.h>
#include <stdio.h>
@ -142,7 +143,7 @@ GraphicAgent::~GraphicAgent()
pixmap); // a scaled pixmap...give it back
}
if(f_shell != NULL)
if(f_shell != 0)
f_shell.Destroy();
}
@ -153,7 +154,7 @@ GraphicAgent::~GraphicAgent()
void
GraphicAgent::popup()
{
if (f_shell == NULL)
if (f_shell == 0)
create_ui();
f_shell.Popup();
@ -167,7 +168,7 @@ GraphicAgent::popup()
void
GraphicAgent::display()
{
if (f_shell == NULL)
if (f_shell == 0)
create_ui();
// assume all graphics are scalable for now.
@ -240,7 +241,7 @@ GraphicAgent::create_ui()
f_shell.SetDestroyCallback (this, (WWL_FUN) &GraphicAgent::ui_destroyed);
DECL (WXmForm, form, f_shell, "form" );
DECLM (WXmMenuBar, menu_bar, form, "menu_bar" );
DECLMC(WXmMenuBar, menu_bar, form, "menu_bar" );
#ifdef hpux
//
// rtp: hard-wire the menu bar's background, since
@ -252,7 +253,7 @@ GraphicAgent::create_ui()
#endif
DECLM (WXmCascadeButton, file, menu_bar, "file" );
DECLM (WXmPulldownMenu, file_menu, menu_bar, "file_menu" );
DECLMC(WXmPulldownMenu, file_menu, menu_bar, "file_menu" );
DECLM (WXmPushButton, attach, file_menu, "attach" );
DECLM (WXmPushButton, visit, file_menu, "visit" );
DECLM (WXmPushButton, close, file_menu, "close" );
@ -282,7 +283,7 @@ GraphicAgent::create_ui()
NULL);
DECLM (WXmCascadeButton, pan, menu_bar, "panner" );
DECLM (WXmPulldownMenu, panner_menu, menu_bar, "panner_menu" );
DECLMC(WXmPulldownMenu, panner_menu, menu_bar, "panner_menu" );
DECLM (WXmToggleButton, none, panner_menu, "none" );
DECLM (WXmToggleButton, up_left, panner_menu, "up_left" );
DECLM (WXmToggleButton, up_right, panner_menu, "up_right" );
@ -328,7 +329,7 @@ GraphicAgent::create_ui()
// NOTE: some code in this module depends upon the exact ordering of items
// view menu will only be sensitive for scalable graphics
DECL (WXmCascadeButton, view, menu_bar, "view" );
DECLM (WXmPulldownMenu, view_menu, menu_bar, "view_menu" );
DECLMC(WXmPulldownMenu, view_menu, menu_bar, "view_menu" );
DECLM (WXmPushButton, fit_gr_to_win, view_menu, "fit_window" );
DECLM (WXmPushButton, fit_win_to_gr, view_menu, "fit_graphic" );
@ -386,7 +387,7 @@ GraphicAgent::create_ui()
f_view_menu = (WXmPulldownMenu*)(Widget)view_menu ;
DECLM (WXmCascadeButton, help, menu_bar, "help" );
DECLM (WXmPulldownMenu, help_menu, menu_bar, "help_menu" );
DECLMC(WXmPulldownMenu, help_menu, menu_bar, "help_menu" );
DECLM (WXmPushButton, on_window, help_menu, "on_window" );
DECLM (WXmPushButton, on_help, help_menu, "on_help" );
@ -480,8 +481,8 @@ GraphicAgent::create_ui()
SET_CALLBACK_D (z_200,ValueChanged,zoom_callback,200);
SET_CALLBACK_D (z_custom,ValueChanged,zoom_callback,0);
help_agent().add_activate_help (on_window, "graphic_on_window");
help_agent().add_activate_help (on_help, "graphic_on_help");
help_agent().add_activate_help (on_window, (char*)"graphic_on_window");
help_agent().add_activate_help (on_help, (char*)"graphic_on_help");
view.Manage();
@ -815,7 +816,7 @@ GraphicAgent::set_panner(WCallback *wcb)
WXmToggleButton button(wcb->GetWidget());
if (button.Set())
{
unsigned int state = (unsigned int)wcb->ClientData();
size_t state = (size_t)wcb->ClientData();
adjust_panner(state);
}
}
@ -835,7 +836,7 @@ GraphicAgent::zoom_callback(WCallback *wcb)
if (button.Set())
{
int scale = (unsigned int) wcb->ClientData();
size_t scale = (size_t) wcb->ClientData();
if (scale > 0)
{
set_zoom (scale);

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

@ -81,7 +81,8 @@
#include <Dt/Help.h>
#include <Dt/HelpDialog.h>
#include <stdio.h>
#include <iostream.h>
#include <iostream>
using namespace std;
#define CLASS HelpAgent
#include "create_macros.hh"
@ -164,7 +165,7 @@ HelpAgent::create_ui()
n = 0;
XtSetArg(args[n], XmNtitle, "Dtinfo Help"); n++;
f_helper = DtCreateHelpDialog(app_shell,
"helpdialog",
(char*)"helpdialog",
args, n);
}
@ -399,13 +400,13 @@ HelpAgent::get_locator_id(const Widget w)
{
XtResource res;
//res.resource_name = (resourceName ? (String)resourceName : "helpcard");
res.resource_name = "helpcard";
res.resource_name = (char*)"helpcard";
res.resource_class = XtCString;
res.resource_type = XtRString;
res.resource_size = sizeof(String);
res.resource_offset = 0;
res.default_type = XtRString;
res.default_addr = NULL_LOCATORID;
res.default_addr = (void*)NULL_LOCATORID;
char *wname = XtName(w); // Just for gdb
String string;

9
cde/programs/dtinfo/dtinfo/src/Agents/Imakefile
View file

@ -1,11 +1,14 @@
XCOMM $XConsortium: Imakefile /main/8 1996/08/21 15:41:09 drk $
DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
CXXEXTRA_DEFINES = -DEXPAND_TEMPLATES
MAKEFILEDEPS=Classlist.mk
LIBNAME=Agents
NormalCplusplusObjectRule()
#ifdef DoLicenseManagement
INCLUDES=$(BROWSER_INCLUDES) $(MMDB_INCLUDES) $(LICENSE_L_INCLUDES)
EXTRA_DEFINES=-DLICENSE_MANAGEMENT
@ -23,8 +26,12 @@ make_msgs($(LIBNAME), $(MSGS))
#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
SimpleLibraryT($(LIBNAME), $(OBJS), $(LIBDIR))
#elif defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture) || \
defined(LinuxArchitecture)
SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
#else
SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
XCOMM RealLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
#endif
#if defined(HPArchitecture)||defined(UXPArchitecture)

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

@ -51,8 +51,9 @@
#include <sys/stat.h>
#include <stream.h>
#include <iostream.h>
#include <sstream>
#include <iostream>
using namespace std;
#define C_xList
#define L_Support
@ -85,6 +86,7 @@
#define C_MessageMgr
#define C_PrefMgr
#define C_EnvMgr
#define C_GraphicsMgr
#define L_Managers
@ -361,7 +363,7 @@ LibraryAgent::create_ui()
n = 0;
XtSetArg(args[n], XmNscrolledWindowChildType, XmMENU_BAR); n++;
Widget menu_bar = XmCreateMenuBar(mainw, "menu_bar", args, n);
Widget menu_bar = XmCreateMenuBar(mainw, (char*)"menu_bar", args, n);
n = 0;
XtSetArg(args[n], XmNorientation, XmHORIZONTAL); n++;
@ -375,7 +377,7 @@ LibraryAgent::create_ui()
mainw, args, n);
// Menus
Widget fileM = XmCreatePulldownMenu(menu_bar, "file_menu", 0, 0);
Widget fileM = XmCreatePulldownMenu(menu_bar, (char*)"file_menu", 0, 0);
n = 0;
XtSetArg(args[n], XmNsubMenuId, fileM); n++;
@ -456,7 +458,7 @@ LibraryAgent::create_ui()
NULL);
// edit menu
Widget editM = XmCreatePulldownMenu(menu_bar, "edit_menu", 0, 0);
Widget editM = XmCreatePulldownMenu(menu_bar, (char*)"edit_menu", 0, 0);
n = 0;
XtSetArg(args[n], XmNsubMenuId, editM); n++;
@ -504,7 +506,7 @@ LibraryAgent::create_ui()
NULL);
// options menu
Widget optionsM = XmCreatePulldownMenu(menu_bar, "options_menu", 0, 0);
Widget optionsM = XmCreatePulldownMenu(menu_bar, (char*)"options_menu", 0, 0);
n = 0;
XtSetArg(args[n], XmNsubMenuId, optionsM); n++;
@ -572,7 +574,7 @@ LibraryAgent::create_ui()
NULL);
// windows menu
Widget windowsM = XmCreatePulldownMenu(menu_bar, "windows_menu", 0, 0);
Widget windowsM = XmCreatePulldownMenu(menu_bar, (char*)"windows_menu", 0, 0);
n = 0;
XtSetArg(args[n], XmNsubMenuId, windowsM); n++;
@ -637,7 +639,7 @@ LibraryAgent::create_ui()
*CATGETS(Set_AgentLabel, 47, ""),
NULL);
Widget helpM = XmCreatePulldownMenu(menu_bar, "help_menu", 0, 0);
Widget helpM = XmCreatePulldownMenu(menu_bar, (char*)"help_menu", 0, 0);
// create help menu
n = 0;
@ -731,17 +733,17 @@ LibraryAgent::create_ui()
// WXmPushButtonGadget tmp_pbg(tmp);
// help_agent().add_activate_help (tmp_pbg, "doc_list_help");
WXmPushButtonGadget on_overview_pbg(on_overview);
help_agent().add_activate_help (on_overview, "on_overview");
help_agent().add_activate_help (on_overview, (char*)"on_overview");
WXmPushButtonGadget on_tasks_pbg(on_tasks);
help_agent().add_activate_help (on_tasks, "on_tasks");
help_agent().add_activate_help (on_tasks, (char*)"on_tasks");
WXmPushButtonGadget on_reference_pbg(on_reference);
help_agent().add_activate_help (on_reference, "on_reference");
help_agent().add_activate_help (on_reference, (char*)"on_reference");
WXmPushButtonGadget on_item_pbg(on_item);
help_agent().add_context_help (on_item);
WXmPushButtonGadget on_help_pbg(on_help);
help_agent().add_activate_help (on_help, "on_help");
help_agent().add_activate_help (on_help, (char*)"on_help");
WXmPushButtonGadget on_about_pbg(on_about);
help_agent().add_activate_help (on_about, "on_about");
help_agent().add_activate_help (on_about, (char*)"on_about");
// Tools
f_view2 = XtCreateManagedWidget("view", xmPushButtonWidgetClass,
@ -864,11 +866,11 @@ LibraryAgent::create_ui()
XtVaSetValues(f_status_text, XmNvalue, string, NULL);
// Search area
widget = XmCreatePulldownMenu(search_area, "scope_menu", 0, 0);
widget = XmCreatePulldownMenu(search_area, (char*)"scope_menu", 0, 0);
n = 0;
XtSetArg(args[n], XmNsubMenuId, widget); n++;
XtManageChild(widget = XmCreateOptionMenu(search_area, "scope", args, n));
XtManageChild(widget = XmCreateOptionMenu(search_area, (char*)"scope", args, n));
XtVaSetValues(widget,
XmNlabelString,
(XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 59, "Search:")),
@ -1013,7 +1015,7 @@ LibraryAgent::quick_helpEH (Widget w, XtPointer client_data,
if (event->type == EnterNotify || event->type == FocusIn)
XmTextFieldSetString(agent->f_status_text, (char*)client_data);
else if (event->type == LeaveNotify || event->type != FocusOut)
XmTextFieldSetString(agent->f_status_text, "");
XmTextFieldSetString(agent->f_status_text, (char*)"");
}
@ -1052,7 +1054,7 @@ LibraryAgent::search_help (Widget, XtPointer client_data,
if (event->type == LeaveNotify || event->type == FocusOut)
{
XmTextFieldSetString(agent->f_status_text, "");
XmTextFieldSetString(agent->f_status_text, (char*)"");
return;
}
@ -1170,7 +1172,7 @@ LibraryAgent::add_library(char* newLib, Widget parent)
}
UAS_Pointer<UAS_Common> d = NULL ;
try {
mtry {
// (precise locator format parsing to be done in the UAS layer)
if( strchr( newLib, ':' ) && strchr( newLib, '/' ) ) {
@ -1232,7 +1234,7 @@ LibraryAgent::add_library(char* newLib, Widget parent)
#endif
sts = NOT_FOUND ;
}
} catch_any () {
} mcatch_any () {
// one case that will reach here, but get no MMDB interface error
// is if a (close to) fully qualified locator format is entered,
// but with keyword error.
@ -1545,6 +1547,7 @@ LibraryAgent::track_to (UAS_Pointer<UAS_Common> &node_ptr)
OutlineList &rootList = *(f_doc_tree_view->list());
bool in_subtree = FALSE;
UAS_Pointer<UAS_Common> doc_root = node_ptr;
int inum;
// Trace up to the root.
free_tracking_hierarchy();
@ -1554,6 +1557,7 @@ LibraryAgent::track_to (UAS_Pointer<UAS_Common> &node_ptr)
for (int i = 0; i < rootList.length(); i ++) {
if (doc_root == ((TOC_Element *) rootList[i])->toc()) {
in_subtree = TRUE;
inum = i;
break;
}
}
@ -1563,7 +1567,8 @@ LibraryAgent::track_to (UAS_Pointer<UAS_Common> &node_ptr)
if (in_subtree)
{
ON_DEBUG (printf ("Found node <%s> in my doc list subtree <%s>\n",
node_ptr->title(), my_root->title()));
(char*)node_ptr->title(),
(char*)((TOC_Element *) rootList[inum])->toc()->title()));
// Track to the element, scrolling if necessary.
track (TRUE);
}
@ -1619,7 +1624,8 @@ LibraryAgent::track (bool scroll)
// If the entry is expanded, it MUST have children.
Xassert (oe->has_children());
OutlineList &kids = *(oe->children());
for (int i = 0; i < kids.length(); i++)
int i;
for (i = 0; i < kids.length(); i++)
{
// Keep track of how many expanded items we skip over.
list_location++;
@ -1742,7 +1748,8 @@ void
LibraryAgent::library_removed (UAS_Pointer<UAS_Common> lib)
{
OutlineList &rootList = *(f_doc_tree_view->list());
for (int i = rootList.length() - 1; i >= 0; i --) {
int i;
for (i = rootList.length() - 1; i >= 0; i --) {
TOC_Element *te = (TOC_Element *) rootList[i];
if (te->toc()->get_library() == lib) {
if (f_tracking_hierarchy && f_tracking_hierarchy->f_toc == lib) {
@ -1974,13 +1981,13 @@ LibraryAgent::transferCB(Widget w, XtPointer client_data, XtPointer call_data)
url = url + file;
UAS_Pointer<UAS_Common> pIL;
try {
mtry {
pIL = UAS_Common::create ((char*)url);
if (! (pIL == (UAS_Pointer<UAS_Common>)NULL)) {
pIL->retrieve();
}
}
catch_any() {
mcatch_any() {
pIL = NULL;
}
end_try;
@ -2009,7 +2016,7 @@ LibraryAgent::copy_to_clipbd()
//Window window = XtWindowOfObject((Widget)f_shell);
Window window = XtWindowOfObject(f_shell);
long item_id = 0;
clip_label = XmStringCreateLocalized("Data");
clip_label = XmStringCreateLocalized((char*)"Data");
Wait_Cursor bob;
UAS_String nl("\n");
@ -2040,7 +2047,7 @@ LibraryAgent::copy_to_clipbd()
window_system().display(),
window,
item_id,
"STRING",
(char*)"STRING",
(char*)buf, (long)strlen((char*)buf) + 1,
private_id, NULL);
} while(status == ClipboardLocked);

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

@ -166,7 +166,7 @@ ListView::create_ui_objects()
// WXmLabelGadget label (form, "label", WAutoManage);
WXmSeparator separator (form, "separator", WAutoManage);
// NOTE: Fix WWL to have a scrolled list object!
Widget scrolled_list = XmCreateScrolledList (form, "list", NULL, 0);
Widget scrolled_list = XmCreateScrolledList (form, (char*)"list", NULL, 0);
f_list = new WXmList (scrolled_list);
f_list->Manage();
@ -256,7 +256,7 @@ ListView::select (WCallback *wcb)
void
ListView::activate (WCallback *)
{
notify (ENTRY_ACTIVATE, (void *) f_selected_item);
notify (ENTRY_ACTIVATE, (void *)(size_t) f_selected_item);
}

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

@ -120,8 +120,8 @@ MapButton::MapButton (WComposite &parent,
f_doc_ptr (doc_ptr),
f_expanded (FALSE)
{
ON_DEBUG (printf ("MapButton::MapButton (%s)\n", f_doc_ptr->title()));
static expandable_tree =
ON_DEBUG (printf ("MapButton::MapButton (%s)\n", (char*)f_doc_ptr->title()));
static bool expandable_tree =
window_system().get_boolean_default ("ExpandableMap");
UAS_List<UAS_Common> kids (f_doc_ptr->children());
UAS_String t = f_doc_ptr->title();
@ -483,7 +483,7 @@ MapAgent::create_ui()
WXmForm bottomform (rootform, "bottomform");
WXmPushButton close (bottomform, "close", WAutoManage);
WXmPushButton help (bottomform, "help", WAutoManage);
help_agent().add_activate_help (help, "map_help");
help_agent().add_activate_help (help, (char*)"map_help");
XtVaSetValues(close, XmNlabelString,
(XmString)XmStringLocalized(CATGETS(Set_AgentLabel, 12, "Close")), NULL);

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

@ -127,7 +127,7 @@ MarkChooser::create_ui (Widget parent,
#endif
DECLM (WXmSeparator, sep, f_form, "separator");
Widget list = XmCreateScrolledList (f_form, "list", NULL, 0);
Widget list = XmCreateScrolledList (f_form, (char*)"list", NULL, 0);
f_list = WXmList (list);
f_list.Manage();

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

@ -76,7 +76,8 @@
#include <WWL/WXmLabelGadget.h>
#include <WWL/WXmPushButton.h>
#include <iostream.h>
#include <iostream>
using namespace std;
#define CLASS MarkIcon
#include "create_macros.hh"
@ -94,7 +95,7 @@ MarkIcon::MarkIcon (Widget parent,
Widget chooser_parent,
MarkCanvas *mark,
int ypos, int scrollbar_offset)
: f_icon_char (NULL),
: f_icon_char (0),
f_selected (FALSE),
f_y_position (ypos),
f_chooser_parent (chooser_parent)
@ -148,8 +149,8 @@ MarkIcon::register_actions()
static XtActionsRec actions_list[] =
{
{"double_click", &MarkIcon::static_double_click},
{"single_click", &MarkIcon::static_single_click},
{(char*)"double_click", &MarkIcon::static_double_click},
{(char*)"single_click", &MarkIcon::static_single_click},
};
XtAppAddActions (window_system().app_context(), actions_list, XtNumber (actions_list));
@ -323,7 +324,7 @@ MarkIcon::deselect (MarkCanvas *)
void
MarkIcon::update_icon (MarkCanvas *)
{
Pixmap button_pixmap = NULL;
Pixmap button_pixmap = 0;
int multi = mark_count() > 1;
int anno = False;
@ -342,18 +343,18 @@ MarkIcon::update_icon (MarkCanvas *)
if (anno) {
if (multi)
button_pixmap = XmGetPixmap(window_system().screen(), "anno_double",
button_pixmap = XmGetPixmap(window_system().screen(),(char*)"anno_double",
Foreground(), Background());
else
button_pixmap = XmGetPixmap(window_system().screen(), "anno_single",
button_pixmap = XmGetPixmap(window_system().screen(),(char*)"anno_single",
Foreground(), Background());
}
else {
if (multi)
button_pixmap = XmGetPixmap(window_system().screen(), "mark_double",
button_pixmap = XmGetPixmap(window_system().screen(),(char*)"mark_double",
Foreground(), Background());
else
button_pixmap = XmGetPixmap(window_system().screen(), "mark_single",
button_pixmap = XmGetPixmap(window_system().screen(),(char*)"mark_single",
Foreground(), Background());
}
@ -593,18 +594,18 @@ MarkIcon::swap_colors()
if (anno) {
if (multi)
button_pixmap = XmGetPixmap(window_system().screen(), "anno_double",
button_pixmap = XmGetPixmap(window_system().screen(),(char*)"anno_double",
foreground, background);
else
button_pixmap = XmGetPixmap(window_system().screen(), "anno_single",
button_pixmap = XmGetPixmap(window_system().screen(),(char*)"anno_single",
foreground, background);
}
else {
if (multi)
button_pixmap = XmGetPixmap(window_system().screen(), "mark_double",
button_pixmap = XmGetPixmap(window_system().screen(),(char*)"mark_double",
foreground, background);
else
button_pixmap = XmGetPixmap(window_system().screen(), "mark_single",
button_pixmap = XmGetPixmap(window_system().screen(),(char*)"mark_single",
foreground, background);
}

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

@ -93,7 +93,7 @@ MarkListView::MarkListView()
MarkListView::~MarkListView()
{
if (f_shell != NULL)
if (f_shell != 0)
f_shell.Destroy();
free_mark_list();
}
@ -107,7 +107,7 @@ void
MarkListView::display()
{
Wait_Cursor bob;
if (f_shell == NULL)
if (f_shell == 0)
create_ui();
if (!f_popped_up)
@ -143,7 +143,7 @@ MarkListView::create_ui()
DECLM (WXmPushButton, close, form, "close");
DECLM (WXmPushButton, help, form, "help");
DECLM (WXmSeparator, sep, form, "separator");
Widget list = XmCreateScrolledList (form, "list", NULL, 0);
Widget list = XmCreateScrolledList (form, (char*)"list", NULL, 0);
f_list = WXmList (list);
f_list.Manage();
@ -165,7 +165,7 @@ MarkListView::create_ui()
ON_ACTIVATE (f_edit,edit);
ON_ACTIVATE (f_delete,remove);
ON_ACTIVATE (close,close);
help_agent().add_activate_help (help, "mark_list_help");
help_agent().add_activate_help (help, (char*)"mark_list_help");
SET_CALLBACK (f_shell,Popdown,popdown);
@ -279,7 +279,7 @@ MarkListView::view()
{
Wait_Cursor bob_dobbs;
try
mtry
{
Xassert (f_selected_item > 0);
@ -295,7 +295,7 @@ MarkListView::view()
// Now `m' points to the selected Mark.
m.item()->view();
}
catch(demoException &, demo)
mcatch(demoException &, demo)
{
message_mgr().demo_failure(demo);
}
@ -392,7 +392,7 @@ MarkListView::receive (MarkDeleted &msg, void* /*client_data*/)
i++, m++;
}
Xassert (m != NULL);
Xassert (m != 0);
//
// XXXSWM: Need to check if this is the selected item.
@ -429,7 +429,7 @@ MarkListView::receive (MarkChanged &msg, void* /*client_data*/)
i++, m++;
}
Xassert (m != NULL);
Xassert (m != 0);
// Change the title of the entry, once it is found.
WXmString title (msg.f_mark_ptr->name());

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

@ -69,7 +69,8 @@
#include <WWL/WXmPushButton.h>
#include <WWL/WXmTextField.h>
#include <X11/X.h>
#include <stream.h>
#include <sstream>
using namespace std;
#define CLASS MessageAgent
#include "create_macros.hh"
@ -91,7 +92,7 @@ MessageAgent::create_ui(Widget parent)
{
f_popped_up = False;
f_dialog = (WXmMessageDialog *)(Widget)
WXmMessageDialog(parent, "MessageDialog");
WXmMessageDialog(parent, (char*)"MessageDialog");
f_text = (WXmTextField *)
XtCreateWidget ("text", xmTextFieldWidgetClass, *f_dialog, NULL, 0);
@ -586,7 +587,7 @@ MessageAgent::get_integer (const char *message, const char* title,
// Set the dialog title.
WXmDialogShell shell (XtParent(*f_dialog));
shell.Title (title? (char*)title : "File a Bug");
shell.Title (title? (char*)title : (char *)"File a Bug");
// Set the dialog buttons.
f_dialog->CancelPB().Manage();

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

@ -49,7 +49,8 @@
*
*/
#include <stream.h>
#include <sstream>
using namespace std;
#include "UAS.hh"
@ -89,7 +90,7 @@
NodeHistoryAgent::~NodeHistoryAgent()
{
if (f_shell != NULL)
if (f_shell != 0)
f_shell.Destroy();
}
@ -101,7 +102,7 @@ NodeHistoryAgent::~NodeHistoryAgent()
void
NodeHistoryAgent::display()
{
if (f_shell == NULL)
if (f_shell == 0)
create_ui();
refresh_list();
@ -152,7 +153,7 @@ NodeHistoryAgent::create_ui()
mtfstring = CATGETS(Set_AgentLabel, 185, "Section");
XtVaSetValues(sectionlabel, XmNlabelString, (XmString)mtfstring, NULL);
Widget scrolled_list = XmCreateScrolledList (form, "list", NULL, 0);
Widget scrolled_list = XmCreateScrolledList (form, (char*)"list", NULL, 0);
f_list = WXmList (scrolled_list);
f_list.Manage();
@ -174,7 +175,7 @@ NodeHistoryAgent::create_ui()
SET_CALLBACK (f_list,DefaultAction,view);
ON_ACTIVATE (f_display,view);
ON_ACTIVATE (close,close);
help_agent().add_activate_help (help, "node_hist_help");
help_agent().add_activate_help (help, (char*)"node_hist_help");
global_history_mgr().UAS_Sender<HistoryAdd>::request (this);
global_history_mgr().UAS_Sender<HistoryDelete>::request (this);
@ -211,7 +212,7 @@ NodeHistoryAgent::create_ui()
void
NodeHistoryAgent::refresh_list()
{
Xassert (f_list != NULL);
Xassert (f_list != 0);
xList<UAS_Pointer<UAS_Common> > &hist_list = global_history_mgr().history_list();
XmStringTable table = new XmString [hist_list.length()];
@ -330,7 +331,7 @@ NodeHistoryAgent::compose_entry(UAS_String book, UAS_String section)
if (bookString.Width(f_list.FontList()) >= SECTION_OFFSET)
{
char* dots = "...";
char* dots = (char*)"...";
char* ungenerated = (char*)(bookString + WXmString(dots));

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

@ -132,24 +132,24 @@ NodeListAgent::create_base_window (char *name)
//Widget Class Var Name Parent Widget Name
//------------------ --------------- ---------------- ----------------
f_form = new WXmForm (*f_shell, "form");
f_menu_bar = new WXmMenuBar (*f_form, "menu_bar" /* , WAutoManage */);
f_menu_bar = new WXmMenuBar (*f_form, (char*)"menu_bar" /* , WAutoManage */);
WXmCascadeButton file_cascade (*f_menu_bar, "file", AM);
WXmPulldownMenu file_menu (*f_menu_bar, "file_menu" );
WXmPulldownMenu file_menu (*f_menu_bar, (char*)"file_menu" );
WXmPushButton close (file_menu, "close", AM);
WXmCascadeButton edit_cascade (*f_menu_bar, "edit", AM);
WXmPulldownMenu edit_menu (*f_menu_bar, "edit_menu" );
WXmPulldownMenu edit_menu (*f_menu_bar, (char*)"edit_menu" );
WXmPushButton undo (edit_menu, "undo", AM);
/*
WXmCascadeButton view_cascade (*f_menu_bar, "view", AM);
WXmPulldownMenu view_menu (*f_menu_bar, "view_menu" );
WXmPulldownMenu view_menu (*f_menu_bar, (char*)"view_menu" );
WXmCascadeButton sort_cascade (view_menu, "sort", AM);
WXmPulldownMenu sort_menu (*f_menu_bar, "sort_menu" );
WXmPulldownMenu sort_menu (*f_menu_bar, (char*)"sort_menu" );
WXmPushButton ooo (sort_menu, "ooo", AM);
*/
WXmCascadeButton help_cascade (*f_menu_bar, "help", AM);
WXmPulldownMenu help_menu (*f_menu_bar, "help_menu" );
WXmPulldownMenu help_menu (*f_menu_bar, (char*)"help_menu" );
WXmPushButton context (help_menu, "context", AM);
WXmPushButton window (help_menu, "window", AM);
@ -173,7 +173,7 @@ NodeListAgent::create_base_window (char *name)
f_list_form = (WXmForm*)(Widget)WXmForm(*f_pane, "listform", AM);
Widget scrolled_list = XmCreateScrolledList (*f_list_form, "list", NULL, 0);
Widget scrolled_list = XmCreateScrolledList (*f_list_form, (char*)"list", NULL, 0);
f_list = (WXmList*)scrolled_list ;
f_list->Manage();

31
cde/programs/dtinfo/dtinfo/src/Agents/NodePrintAgent.C
View file

@ -50,7 +50,8 @@
*
*/
#include <stream.h>
#include <sstream>
using namespace std;
#define C_FString
#define C_List
@ -198,13 +199,13 @@ static char another_g_top_locator[4096] ;
*/
static XtActionsRec DrawnBActions[] =
{
{"DeSelectAll" , _DtHelpDeSelectAll },
{"SelectAll" , _DtHelpSelectAll },
{"ActivateLink" , _DtHelpActivateLink },
{"CopyToClipboard", _DtHelpCopyAction },
{"PageUpOrDown" , _DtHelpPageUpOrDown },
{"PageLeftOrRight", _DtHelpPageLeftOrRight},
{"NextLink" , _DtHelpNextLink }
{(char*)"DeSelectAll" , _DtHelpDeSelectAll },
{(char*)"SelectAll" , _DtHelpSelectAll },
{(char*)"ActivateLink" , _DtHelpActivateLink },
{(char*)"CopyToClipboard", _DtHelpCopyAction },
{(char*)"PageUpOrDown" , _DtHelpPageUpOrDown },
{(char*)"PageLeftOrRight", _DtHelpPageLeftOrRight},
{(char*)"NextLink" , _DtHelpNextLink }
};
//------- Functions --------------------------------------------
@ -224,7 +225,7 @@ _DtHelpCreatePrintArea(Widget parent,
string_resolution =
XpGetOneAttribute(XtDisplay(parent), l_AppPrintData->f_print_data->print_context,
XPDocAttr, "default-printer-resolution");
XPDocAttr, (char*)"default-printer-resolution");
resolution = atoi(string_resolution);
XFree(string_resolution);
@ -331,7 +332,7 @@ NodePrintAgent::create_ui(Widget parent)
// Setup up an outer form to hold the different page elements
n = 0;
f_form = XmCreateForm(parent, "outer_page", NULL, n);
f_form = XmCreateForm(parent, (char*)"outer_page", NULL, n);
// make sure the DtHelpDialog's actions are declared in order to satisfy
// the need of the DisplayArea
@ -346,17 +347,17 @@ NodePrintAgent::create_ui(Widget parent)
XtSetArg(args[n], XmNleftAttachment, XmATTACH_FORM); n++;
XtSetArg(args[n], XmNrightAttachment, XmATTACH_FORM); n++;
XtSetArg(args[n], XmNbottomAttachment, XmATTACH_FORM); n++; // bottom
footer_form = XmCreateForm(f_form, "footer", args, n);
footer_form = XmCreateForm(f_form, (char*)"footer", args, n);
// Create a left attached label for the book name
label = XmStringCreate("", XmFONTLIST_DEFAULT_TAG);
label = XmStringCreate((char*)"", XmFONTLIST_DEFAULT_TAG);
n = 0;
XtSetArg(args[n], XmNalignment, XmALIGNMENT_BEGINNING); n++;
XtSetArg(args[n], XmNlabelString, label); n++;
XtSetArg(args[n], XmNleftAttachment, XmATTACH_FORM); n++;
XtSetArg(args[n], XmNtopAttachment, XmATTACH_FORM); n++;
footer_book_name = XmCreateLabel(footer_form, "bookname", args, n);
footer_book_name = XmCreateLabel(footer_form, (char*)"bookname", args, n);
XmStringFree(label);
XtManageChild(footer_book_name);
@ -370,13 +371,13 @@ NodePrintAgent::create_ui(Widget parent)
XtSetArg(args[n], XmNlabelString, label); n++;
XtSetArg(args[n], XmNtopAttachment, XmATTACH_FORM); n++;
XtSetArg(args[n], XmNrightAttachment, XmATTACH_FORM); n++;
footer_page_no = XmCreateLabel(footer_form, "page_no", args, n);
footer_page_no = XmCreateLabel(footer_form, (char*)"page_no", args, n);
XmStringFree(label);
XtManageChild(footer_page_no);
XtManageChild(footer_form);
f_help_dsp_area = _DtHelpCreatePrintArea(f_form, "DisplayArea", width, height);
f_help_dsp_area = _DtHelpCreatePrintArea(f_form, (char*)"DisplayArea", width, height);
gHelpDisplayArea = f_help_dsp_area ;
// Setup Display Area attachments

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

@ -56,8 +56,9 @@
*
*/
#include <stream.h>
#include <iostream.h>
#include <sstream>
#include <iostream>
using namespace std;
#define C_FString
#define C_List
@ -142,6 +143,8 @@
#include "OnlineRender/SegClientData.hh"
#include "utility/mmdb_exception.h"
#include <Xm/MainW.h>
#include <Xm/RowColumn.h>
#include <Xm/PushBG.h>
@ -958,7 +961,7 @@ NodeWindowAgent::create_ui()
n = 0;
XtSetArg(args[n], XmNscrolledWindowChildType, XmMENU_BAR); n++;
Widget menu_bar = XmCreateMenuBar(mainw, "menu_bar", args, n);
Widget menu_bar = XmCreateMenuBar(mainw, (char*)"menu_bar", args, n);
n = 0;
XtSetArg(args[n], XmNorientation, XmHORIZONTAL); n++;
@ -972,7 +975,7 @@ NodeWindowAgent::create_ui()
mainw, args, n);
// Menus
Widget fileM = XmCreatePulldownMenu(menu_bar, "file_menu", 0, 0);
Widget fileM = XmCreatePulldownMenu(menu_bar, (char*)"file_menu", 0, 0);
n = 0;
XtSetArg(args[n], XmNsubMenuId, fileM); n++;
@ -1031,7 +1034,7 @@ NodeWindowAgent::create_ui()
XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL);
// search menu
Widget searchM = XmCreatePulldownMenu(menu_bar, "search_menu", 0, 0);
Widget searchM = XmCreatePulldownMenu(menu_bar, (char*)"search_menu", 0, 0);
n = 0;
XtSetArg(args[n], XmNsubMenuId, searchM); n++;
@ -1111,7 +1114,7 @@ NodeWindowAgent::create_ui()
XtVaSetValues(f_search_next, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL);
// go menu
Widget goM = XmCreatePulldownMenu(menu_bar, "go_menu", 0, 0);
Widget goM = XmCreatePulldownMenu(menu_bar, (char*)"go_menu", 0, 0);
n = 0;
XtSetArg(args[n], XmNsubMenuId, goM); n++;
widget = XtCreateManagedWidget("go", xmCascadeButtonGadgetClass,
@ -1182,7 +1185,7 @@ NodeWindowAgent::create_ui()
XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL);
// marks menu
Widget markM = XmCreatePulldownMenu(menu_bar, "marks_menu", 0, 0);
Widget markM = XmCreatePulldownMenu(menu_bar, (char*)"marks_menu", 0, 0);
n = 0;
XtSetArg(args[n], XmNsubMenuId, markM); n++;
@ -1286,7 +1289,7 @@ NodeWindowAgent::create_ui()
XtGetValues(f_create_bmrk, args, n);
n = 0;
XtSetArg(args[n], XmNlabelString,
XmStringConcat(XmStringCreate(icon, OLIAS_FONT),
XmStringConcat(XmStringCreate(icon, (char*)OLIAS_FONT),
string)); n++;
XtSetValues(f_create_bmrk, args, n);
@ -1296,7 +1299,7 @@ NodeWindowAgent::create_ui()
XtGetValues(f_create_anno, args, n);
n = 0;
XtSetArg(args[n], XmNlabelString,
XmStringConcat(XmStringCreate(icon, OLIAS_FONT),
XmStringConcat(XmStringCreate(icon, (char*)OLIAS_FONT),
string)); n++;
XtSetValues(f_create_anno, args, n);
@ -1306,7 +1309,7 @@ NodeWindowAgent::create_ui()
XtGetValues(f_move_mark, args, n);
n = 0;
XtSetArg(args[n], XmNlabelString,
XmStringConcat(XmStringCreate(icon, OLIAS_FONT),
XmStringConcat(XmStringCreate(icon, (char*)OLIAS_FONT),
string)); n++;
XtSetValues(f_move_mark, args, n);
@ -1315,7 +1318,7 @@ NodeWindowAgent::create_ui()
XtGetValues(list_marks, args, n);
n = 0;
XtSetArg(args[n], XmNlabelString,
XmStringConcat(XmStringCreate(icon, OLIAS_FONT),
XmStringConcat(XmStringCreate(icon, (char*)OLIAS_FONT),
string)); n++;
XtSetValues(list_marks, args, n);
@ -1324,7 +1327,7 @@ NodeWindowAgent::create_ui()
XtGetValues(f_edit_mark, args, n);
n = 0;
XtSetArg(args[n], XmNlabelString,
XmStringConcat(XmStringCreate(icon, OLIAS_FONT),
XmStringConcat(XmStringCreate(icon, (char*)OLIAS_FONT),
string)); n++;
XtSetValues(f_edit_mark, args, n);
@ -1333,13 +1336,13 @@ NodeWindowAgent::create_ui()
XtGetValues(f_delete_mark, args, n);
n = 0;
XtSetArg(args[n], XmNlabelString,
XmStringConcat(XmStringCreate(icon, OLIAS_FONT),
XmStringConcat(XmStringCreate(icon, (char*)OLIAS_FONT),
string)); n++;
XtSetValues(f_delete_mark, args, n);
}
// options menu
Widget optionsM = XmCreatePulldownMenu(menu_bar, "options_menu", 0, 0);
Widget optionsM = XmCreatePulldownMenu(menu_bar, (char*)"options_menu", 0, 0);
n = 0;
XtSetArg(args[n], XmNsubMenuId, optionsM); n++;
@ -1393,7 +1396,7 @@ NodeWindowAgent::create_ui()
XtVaSetValues(search_areaT, XmNlabelString, (XmString)mtfstring, XmNmnemonic, mnemonic, NULL);
// windows menu
Widget windowsM = XmCreatePulldownMenu(menu_bar, "windows_menu", 0, 0);
Widget windowsM = XmCreatePulldownMenu(menu_bar, (char*)"windows_menu", 0, 0);
n = 0;
XtSetArg(args[n], XmNsubMenuId, windowsM); n++;
@ -1423,7 +1426,7 @@ NodeWindowAgent::create_ui()
// help menu
Widget helpM = XmCreatePulldownMenu(menu_bar, "help_menu", 0, 0);
Widget helpM = XmCreatePulldownMenu(menu_bar, (char*)"help_menu", 0, 0);
n = 0;
XtSetArg(args[n], XmNsubMenuId, helpM); n++;
widget = XtCreateManagedWidget("help", xmCascadeButtonGadgetClass,
@ -1513,13 +1516,13 @@ NodeWindowAgent::create_ui()
#endif
help_agent().add_activate_help ((Widget)on_overview, "on_overview");
help_agent().add_activate_help ((Widget)on_tasks, "on_tasks");
help_agent().add_activate_help ((Widget)on_reference, "on_reference");
help_agent().add_activate_help ((Widget)on_reference, "on_reference");
help_agent().add_activate_help ((Widget)on_overview, (char*)"on_overview");
help_agent().add_activate_help ((Widget)on_tasks, (char*)"on_tasks");
help_agent().add_activate_help ((Widget)on_reference, (char*)"on_reference");
help_agent().add_activate_help ((Widget)on_reference, (char*)"on_reference");
help_agent().add_context_help ((Widget)on_item);
help_agent().add_activate_help ((Widget)on_help, "on_help");
help_agent().add_activate_help ((Widget)on_about, "on_about");
help_agent().add_activate_help ((Widget)on_help, (char*)"on_help");
help_agent().add_activate_help ((Widget)on_about, (char*)"on_about");
// Tools
@ -1682,11 +1685,11 @@ NodeWindowAgent::create_ui()
f_form = XtCreateWidget("form", xmFormWidgetClass, mainw, args, n);
f_title_menu = (WXmPulldownMenu*)(Widget)WXmPulldownMenu((WComposite&)f_form, "title_menu");
f_title_menu = (WXmPulldownMenu*)(Widget)WXmPulldownMenu((WComposite&)f_form, (char*)"title_menu");
n = 0;
XtSetArg(args[n], XmNsubMenuId, (Widget) f_title_menu); n++;
f_title_option = (WXmOptionMenu*)(Widget)
WXmOptionMenu ((WComposite&)f_form, "title", AM, args, n);
WXmOptionMenu ((WComposite&)f_form, (char*)"title", AM, args, n);
help_agent().add_help_cb ((Widget)*f_title_option);
f_tab_area = (WXmRowColumn*)(Widget) WXmRowColumn (f_form, "tab_area");
@ -1715,7 +1718,7 @@ NodeWindowAgent::create_ui()
#ifdef MONITOR
WXmCascadeButton windows_cascade (menu_bar, "windows" , AM);
WXmPulldownMenu windows_menu (menu_bar, "windows_menu" );
WXmPulldownMenu windows_menu (menu_bar, (char*)"windows_menu" );
WXmPushButton(windows_menu, "monitor", AM).
SetActivateCallback(this, (WWL_FUN)&NodeWindowAgent::monitor, (void*)1);
@ -1725,9 +1728,9 @@ NodeWindowAgent::create_ui()
#endif
#endif
#ifdef DEBUG
#ifdef NODEBUG
WXmCascadeButton debug_cascade (menu_bar, "debug" );
WXmPulldownMenu debug_menu (menu_bar, "debug_menu" );
WXmPulldownMenu debug_menu (menu_bar, (char*)"debug_menu" );
WXmToggleButton command_processor (debug_menu, "command_processor", AM);
WXmPushButton document_id (debug_menu, "document_id", AM);
#endif
@ -1742,7 +1745,7 @@ NodeWindowAgent::create_ui()
f_help_dsp_area = (DtHelpDispAreaStruct*)
_DtHelpCreateDisplayArea(WXmForm(*f_frame, "inform", WAutoManage),//parent
"display_area", // name
(char*)"display_area", // name
_DtHelpSTATIC, // vert flag
_DtHelpAS_NEEDED, // horz flag
FALSE, // traversal flag
@ -1763,20 +1766,20 @@ NodeWindowAgent::create_ui()
// create detach graphic popup menu
f_detach_menu = XmCreatePopupMenu(
f_help_dsp_area->dispWid, "detach_graphic", NULL, 0);
f_detach_button = XmCreatePushButton(f_detach_menu, "Detach Graphic", NULL, 0);
f_help_dsp_area->dispWid, (char*)"detach_graphic", NULL, 0);
f_detach_button = XmCreatePushButton(f_detach_menu, (char*)"Detach Graphic", NULL, 0);
XtAddCallback(f_detach_button, XmNactivateCallback, detach_grCB, this);
XtManageChild(f_detach_button);
mtfstring = CATGETS(Set_AgentLabel, 124, "Detach Graphic");
XtVaSetValues(f_detach_button, XmNlabelString, (XmString)mtfstring, NULL);
f_attach_button = XmCreatePushButton(f_detach_menu, "Attach Graphic", NULL, 0);
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");
XtVaSetValues(f_attach_button, XmNlabelString, (XmString)mtfstring, NULL);
f_raise_button = XmCreatePushButton(f_detach_menu, "Raise Graphic", NULL, 0);
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");
@ -1787,22 +1790,22 @@ NodeWindowAgent::create_ui()
// create link preview popup menu
f_preview_menu = XmCreatePopupMenu(
f_help_dsp_area->dispWid, "preview_menu", NULL, 0);
f_help_dsp_area->dispWid, (char*)"preview_menu", NULL, 0);
f_preview_label = XmCreateLabel(f_preview_menu, "pre_label", NULL, 0);
f_preview_label = XmCreateLabel(f_preview_menu, (char*)"pre_label", NULL, 0);
XtManageChild(f_preview_label);
widget = XmCreateSeparator(f_preview_menu, "sep", NULL, 0);
widget = XmCreateSeparator(f_preview_menu, (char*)"sep", NULL, 0);
XtVaSetValues(widget, XmNseparatorType, XmDOUBLE_LINE, NULL);
XtManageChild(widget);
widget = XmCreatePushButton(f_preview_menu, "widget", NULL, 0);
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");
XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, NULL);
widget = XmCreatePushButton(f_preview_menu, "widget", NULL, 0);
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");
@ -1810,33 +1813,33 @@ NodeWindowAgent::create_ui()
// create default popup menu
f_default_menu = XmCreatePopupMenu(
f_help_dsp_area->dispWid, "default_menu", NULL, 0);
f_help_dsp_area->dispWid, (char*)"default_menu",NULL, 0);
f_node_next3 = XmCreatePushButton(f_default_menu, "f_node_next3", NULL, 0);
f_node_next3 = XmCreatePushButton(f_default_menu, (char*)"f_node_next3", NULL, 0);
XtAddCallback(f_node_next3, XmNactivateCallback, node_nextCB, this);
XtManageChild(f_node_next3);
mtfstring = CATGETS(Set_AgentLabel, 96, "Next Section");
XtVaSetValues(f_node_next3, XmNlabelString, (XmString)mtfstring, NULL);
f_node_prev3 = XmCreatePushButton(f_default_menu, "f_node_prev3", NULL, 0);
f_node_prev3 = XmCreatePushButton(f_default_menu, (char*)"f_node_prev3", NULL, 0);
XtAddCallback(f_node_prev3, XmNactivateCallback, node_previousCB, this);
XtManageChild(f_node_prev3);
mtfstring = CATGETS(Set_AgentLabel, 94, "Previous Section");
XtVaSetValues(f_node_prev3, XmNlabelString, (XmString)mtfstring, NULL);
widget = XmCreateSeparator(f_default_menu, "sep", NULL, 0);
widget = XmCreateSeparator(f_default_menu, (char*)"sep", NULL, 0);
XtManageChild(widget);
widget = XmCreatePushButton(f_default_menu, "widget", NULL, 0);
widget = XmCreatePushButton(f_default_menu, (char*)"widget", NULL, 0);
XtAddCallback(widget, XmNactivateCallback, show_locatorCB, this);
XtManageChild(widget);
mtfstring = CATGETS(Set_AgentLabel, 68, "Show Locator");
XtVaSetValues(widget, XmNlabelString, (XmString)mtfstring, NULL);
widget = XmCreateSeparator(f_default_menu, "sep", NULL, 0);
widget = XmCreateSeparator(f_default_menu, (char*)"sep", NULL, 0);
XtManageChild(widget);
widget = XmCreatePushButton(f_default_menu, "widget", NULL, 0);
widget = XmCreatePushButton(f_default_menu, (char*)"widget", NULL, 0);
XtAddCallback(widget, XmNactivateCallback, printCB, this);
XtManageChild(widget);
mtfstring = CATGETS(Set_AgentLabel, 70, "Print");
@ -1953,11 +1956,11 @@ NodeWindowAgent::create_ui()
// Search area
widget = XmCreatePulldownMenu(search_area, "scope_menu", 0, 0);
widget = XmCreatePulldownMenu(search_area, (char*)"scope_menu", 0, 0);
n = 0;
XtSetArg(args[n], XmNsubMenuId, widget); n++;
XtManageChild(widget = XmCreateOptionMenu(search_area, "scope", args, n));
XtManageChild(widget = XmCreateOptionMenu(search_area, (char*)"scope", args, n));
help_agent().add_help_cb (widget);
textstore = new UAS_String(CATGETS(Set_AgentQHelp, 60,
@ -2004,7 +2007,7 @@ NodeWindowAgent::create_ui()
XtSetArg(args[n], XmNrightWidget, widget); n++;
XtSetValues(*f_search_text, args, n);
#ifdef DEBUG
#ifdef NODEBUG
/* -------- Debugging setup. Should be a function. -------- */
bool debugging = window_system().get_boolean_app_resource("debug");
@ -2271,7 +2274,7 @@ NodeWindowAgent::search_help (Widget, XtPointer client_data,
// clear quick help
if (event->type == LeaveNotify || event->type == FocusOut)
{
XmTextFieldSetString(agent->f_status_text, "");
XmTextFieldSetString(agent->f_status_text, (char*)"");
return;
}
@ -2997,7 +3000,7 @@ NodeWindowAgent::unpreview()
else
{
// If the timeout has already happened, just clear the preview area.
XmTextFieldSetString(f_status_text, "");
XmTextFieldSetString(f_status_text, (char*)"");
}
}
@ -3079,7 +3082,7 @@ NodeWindowAgent::make_bookmark (Boolean edit, MarkCanvas* refmark)
#endif
_DtCvSegPts **segs = NULL ;
try
mtry
{
int ret_x, ret_y ;
// find the selection segment and offset
@ -3125,7 +3128,8 @@ NodeWindowAgent::make_bookmark (Boolean edit, MarkCanvas* refmark)
unsigned int length = 0;
unsigned int offset = 0;
for (int i = 0; segs[i]; i++)
int i;
for (i = 0; segs[i]; i++)
{
_DtCvSegPts* segpts = segs[i];
@ -3227,7 +3231,7 @@ NodeWindowAgent::make_bookmark (Boolean edit, MarkCanvas* refmark)
else
throw(CASTEXCEPT Exception());
}
catch_any()
mcatch_any()
{
if (! refmark)
message_mgr().error_dialog ((char*)UAS_String(CATGETS(Set_Messages, 10,
@ -3506,14 +3510,14 @@ void
NodeWindowAgent::delete_mark()
{
Xassert (MarkCanvas::selected_mark() != NULL);
try
mtry
{
MarkCanvas::selected_mark()->mark_ptr()->remove();
XtSetSensitive(f_create_bmrk, False);
XtSetSensitive(f_create_anno, False);
}
catch_any()
mcatch_any()
{
message_mgr().error_dialog (
(char*)UAS_String(CATGETS(Set_Messages, 11,
@ -3556,7 +3560,7 @@ NodeWindowAgent::move_markCB(Widget, XtPointer client_data, XtPointer)
UAS_Pointer<Mark> mark_ptr = MarkTml::selected_mark()->mark_ptr();
Wait_Cursor bob;
// Create a new mark based on the old one at the new location.
try
mtry
{
f_viewport_agent->mark_creator (this); // 94/10/27 yuji bug fix for TC-530
UAS_Pointer<UAS_Common> d;
@ -3564,7 +3568,7 @@ NodeWindowAgent::move_markCB(Widget, XtPointer client_data, XtPointer)
AnchorCanvas (f_viewport_agent->selection_range()),
mark_ptr);
}
catch_any()
mcatch_any()
{
message_mgr().error_dialog (
(char*)UAS_String(CATGETS(Set_Messages, 12,
@ -3624,7 +3628,7 @@ NodeWindowAgent::detach_graphic()
// Display an instructional dialog.
WXmMessageDialog
info_dialog ((Widget)f_shell, "detach_msg",
info_dialog ((Widget)f_shell, (char*)"detach_msg",
WArgList (XmNdialogType, XmDIALOG_INFORMATION, NULL));
WXmDialogShell shell (info_dialog.Parent());
// set window title
@ -3829,7 +3833,7 @@ NodeWindowAgent::display (UAS_Pointer<UAS_Common> &node_ptr)
int sameNode = f_node_view_info && f_node_view_info->node_ptr() == node_ptr;
if (sameNode && !g_style_sheet_update && !f_history_display) {
extern char g_top_locator[];
// extern char g_top_locator[];
#ifdef JBM
// need to change this to pass in the locator to SetTopic so the
// Canvas knows where to scroll to when it displays
@ -3988,12 +3992,12 @@ NodeWindowAgent::do_bookmarks(bool move_to_mark)
#endif
while (i)
{
try {
mtry {
MarkCanvas *mc = add_mark (i.item());
if (g_view_mark() == i.item())
jump_to = mc ;
}
catch_any()
mcatch_any()
{
#ifdef BOOKMARK_DEBUG
cerr << "error adding bookmark " << i.item()->name() << endl;
@ -4293,7 +4297,7 @@ NodeWindowAgent::quick_helpEH (Widget w, XtPointer client_data,
if (event->type == EnterNotify || event->type == FocusIn)
XmTextFieldSetString(agent->f_status_text, (char*)client_data);
else if (event->type == LeaveNotify || event->type != FocusOut)
XmTextFieldSetString(agent->f_status_text, "");
XmTextFieldSetString(agent->f_status_text, (char*)"");
}
@ -4368,7 +4372,7 @@ NodeWindowAgent::re_display()
bool lock_flag = f_locked ;
f_locked = False ; // have to force it to happen regardless of lock
try
mtry
{
node_mgr().set_preferred_window(this); // make re-display happen in this window
@ -4377,7 +4381,7 @@ NodeWindowAgent::re_display()
f_locked = lock_flag ;
}
catch_any()
mcatch_any()
{
delete anchor ;
g_history_anchor = save_anchor ;
@ -4558,7 +4562,8 @@ NodeWindowAgent::create_canvas_mark(_DtCvHandle canvas,
UAS_List<UAS_String> marks_loc_list;
marks_loc_list = marks_loc.splitFields(',');
for (int i = 0; i < marks_loc_list.length(); i++)
int i;
for (i = 0; i < marks_loc_list.length(); i++)
{
UAS_String& mark_loc = *marks_loc_list[i];
unsigned int vcc, offset, length;
@ -5073,7 +5078,7 @@ MarkViewer::receive (ViewMark &message, void* /*client_data*/)
// Slight hack... Set a global that tells the ViewportAgent to
// select and jump to the specified mark when the corresponding
// node is displayed (see "jump_to" below). 15:17 02-Dec-93 DJB
try
mtry
{
g_view_mark() = message.f_mark_ptr;
@ -5083,14 +5088,14 @@ MarkViewer::receive (ViewMark &message, void* /*client_data*/)
section->retrieve();
}
catch_noarg(demoException &)
mcatch_noarg(demoException &)
{
// this is a hack. what should happen, is that the catch_any below this
// should only be catching a specific (or set of) exception so that others
// can pass through - 14:32 06/ 1/94 - jbm
rethrow ;
}
catch_any()
mcatch_any()
{
message_mgr().info_dialog (
(char*)UAS_String(CATGETS(Set_Messages, 15,

3
cde/programs/dtinfo/dtinfo/src/Agents/NodeWindowAgentMotif.hh
View file

@ -62,6 +62,9 @@ class MarkCreated;
class MarkDeleted;
class MarkCanvas ;
class MarkIcon ;
// class DetachGraphic;
// class ReAttachGraphic;
// class DisplayGraphic;
class GraphicsHandler ;
// self is used by some MACROS somewhere, but the X include files use

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

@ -72,7 +72,8 @@
#include <WWL/WComposite.h>
#include <WWL/WXmScrollBar.h>
#include <iostream.h>
#include <iostream>
using namespace std;
#include <unistd.h>
#include <sys/param.h>
@ -110,7 +111,7 @@ OutlineListView::OutlineListView (const WComposite &parent, const char *name,
f_tracking_element (NULL),
f_library_agent (NULL)
{
static serial_number = 1;
static int serial_number = 1;
// Assign a unique serial number to this outline list.
f_serial_number = serial_number++;
@ -186,7 +187,7 @@ icon_width(Widget w)
else
string[0] = OLIAS_PLACEHOLDER_ICON;
string[1] = '\0';
XmString thing = XmStringCreate (string, OLIAS_FONT);
XmString thing = XmStringCreate (string, (char*)OLIAS_FONT);
Dimension rval = XmStringWidth(defaultList, thing);
XmStringFree (thing);
@ -385,7 +386,7 @@ OutlineListView::create_xm_string (OutlineElement *oe, int base_level,
else
s[oe->level() - base_level + 1 + track] = '\0';
next = XmStringCreate (s, OLIAS_FONT);
next = XmStringCreate (s, (char*)OLIAS_FONT);
#ifdef NotDefined
// Concat the parts
@ -798,8 +799,8 @@ OutlineListView::register_actions()
static XtActionsRec actions_list[] =
{
{"OutlineListBeginSelect", OutlineListView::_select_start},
{"OutlineListEndSelect", OutlineListView::_select_end},
{(char*)"OutlineListBeginSelect", OutlineListView::_select_start},
{(char*)"OutlineListEndSelect", OutlineListView::_select_end},
};
@ -1184,7 +1185,7 @@ OutlineListView::activate (WCallback *wcb)
if ((oe->type() == TOC_Element::TOC_ElementClass) && !expanded)
{
try {
mtry {
UAS_ObjectType type = ((TOC_Element *) oe)->toc()->type();
switch (type)
{
@ -1223,7 +1224,7 @@ OutlineListView::activate (WCallback *wcb)
break;
}
}
catch_any()
mcatch_any()
{
message_mgr().error_dialog( (char*)UAS_String(CATGETS(
Set_UrlAgent, 5, "Document not found." )) ) ;

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

@ -284,7 +284,7 @@ void
PrefAgent::display()
{
Wait_Cursor bob;
if (f_shell == NULL)
if (f_shell == 0)
create_ui();
// Always reset on new popup.
@ -321,8 +321,8 @@ PrefAgent::create_ui()
NULL);
DECL (WXmForm, form, f_shell, "form");
DECLM (WXmOptionMenu, options, form, "options");
DECL (WXmPulldownMenu, options_menu, form, "options_menu");
DECLMC(WXmOptionMenu, options, form, "options");
DECLC (WXmPulldownMenu, options_menu, form, "options_menu");
mtfstring = CATGETS(Set_AgentLabel, 186, "Preferences for");
XtVaSetValues(options, XmNlabelString, (XmString)mtfstring, NULL);
@ -348,7 +348,7 @@ PrefAgent::create_ui()
SET_CALLBACK (f_apply,Activate,apply);
SET_CALLBACK (f_reset,Activate,reset);
SET_CALLBACK (cancel,Activate,cancel);
help_agent().add_activate_help (help, "preferences_help");
help_agent().add_activate_help (help, (char*)"preferences_help");
DECLM (WXmFrame, frame, form, "frame");
DECL (WXmForm, container, frame, "container");
@ -1064,13 +1064,13 @@ PrefAgent::get_geometry (WCallback *wcb)
WXmTextField text_field ((Widget)wcb->ClientData());
char *shell_name;
if (text_field == f_map_geo)
shell_name = "map";
shell_name = (char*)"map";
else if (text_field == f_browse_geo)
shell_name = "nodeview";
shell_name = (char*)"nodeview";
// Display an instructional dialog.
WXmMessageDialog
info_dialog ((Widget)f_shell, "geometry_msg",
info_dialog ((Widget)f_shell, (char*)"geometry_msg",
WArgList (XmNdialogType, XmDIALOG_INFORMATION, NULL));
WXmDialogShell shell (info_dialog.Parent());
// set window title

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

@ -97,7 +97,8 @@
#include <WWL/WXmFrame.h>
#include <WWL/WXmPushButton.h>
#include <WWL/WXmSeparator.h>
#include <stream.h>
#include <sstream>
using namespace std;
#define CLASS PrintPanelAgent
@ -476,7 +477,7 @@ CreatePrintShell(Widget widget, AppPrintData* p)
p->f_print_shell = XmPrintSetup(widget,
XpGetScreenOfContext(p->f_print_data->print_display,
p->f_print_data->print_context),
"PrintShell", NULL, 0);
(char*)"PrintShell", NULL, 0);
// set the global variable to this value so that the create_ui function in
@ -598,17 +599,17 @@ CreatePrintSetup(Widget parent, AppPrintData* p)
// resources common to silent and noisy printing cases
XtSetArg(args[n], DtNcopies, window_system().videoShell()->copies); n++;
XtSetArg(args[n], (char*)DtNcopies, window_system().videoShell()->copies); n++;
// set print to file if file name given
if ((char *)window_system().videoShell()->file_name != NULL) {
XtSetArg(args[n], DtNfileName, (char *)window_system().videoShell()->file_name); n++;
XtSetArg(args[n], DtNprintDestination, DtPRINT_TO_FILE); n++;
XtSetArg(args[n], (char*)DtNfileName, (char *)window_system().videoShell()->file_name); n++;
XtSetArg(args[n], (char*)DtNprintDestination, DtPRINT_TO_FILE); n++;
}
// printer name
if ((char *)window_system().videoShell()->printer != NULL) {
XtSetArg(args[n], DtNprinterName, (char *)window_system().videoShell()->printer); n++;
XtSetArg(args[n], (char*)DtNprinterName, (char *)window_system().videoShell()->printer); n++;
}
// if silent printing we won't need a dialog
@ -620,11 +621,11 @@ CreatePrintSetup(Widget parent, AppPrintData* p)
if (XtIsApplicationShell(parent)) {
p->f_print_dialog =
DtCreatePrintSetupBox(parent, "PrintSetup", args, n);
DtCreatePrintSetupBox(parent, (char*)"PrintSetup", args, n);
}
else {
p->f_print_dialog =
DtCreatePrintSetupBox(XtParent(parent), "PrintSetup", args, n);
DtCreatePrintSetupBox(XtParent(parent), (char*)"PrintSetup", args, n);
}
}
@ -638,18 +639,18 @@ CreatePrintSetup(Widget parent, AppPrintData* p)
CATGETS(Set_PrintPanelAgent, 1, "Dtinfo: Print"));
XtSetArg(args[n], XmNdialogTitle, title); n++;
XtSetArg(args[n], DtNworkAreaLocation, DtWORK_AREA_BOTTOM); n++;
XtSetArg(args[n], (char*)DtNworkAreaLocation, DtWORK_AREA_BOTTOM); n++;
// if parent widget is an application shell, use it, otherwise use
// the grandparent
if (XtIsApplicationShell(parent)) {
p->f_print_dialog =
DtCreatePrintSetupDialog(parent, "PrintSetup", args, n);
DtCreatePrintSetupDialog(parent, (char*)"PrintSetup", args, n);
}
else {
p->f_print_dialog =
DtCreatePrintSetupDialog(XtParent(parent), "PrintSetup", args, n);
DtCreatePrintSetupDialog(XtParent(parent), (char*)"PrintSetup", args, n);
}
// XmStringFree(title);
}
@ -672,7 +673,7 @@ CreatePrintSetup(Widget parent, AppPrintData* p)
// add context help for dialog
help_agent().add_activate_help(p->f_print_dialog, "print_panel_help");
help_agent().add_activate_help(p->f_print_dialog, (char*)"print_panel_help");
}
// update message area

14
cde/programs/dtinfo/dtinfo/src/Agents/ScopeMenu.C
View file

@ -128,7 +128,7 @@ ScopeMenu::fill_menu()
ON_DEBUG(cerr << "Scope Popup" << endl);
int first = TRUE;
for (; s != NULL; s++)
for (; s != 0; s++)
{
// in case we are not using Current Section
@ -136,7 +136,7 @@ ScopeMenu::fill_menu()
f_current_scope = s.item();
ON_DEBUG(cerr << "\t" << f_current_scope->name() << endl);
ON_DEBUG(f_current_scope->dump_items());
// ON_DEBUG(f_current_scope->dump_items());
// Add a separator when they change from read only to changable.
if (old_read_only != s.item()->read_only())
@ -227,7 +227,7 @@ ScopeMenu::receive (ScopeCreated &msg, void *client_data)
else
{
// Scan the current menu to find the correct insertion position.
for (; s != NULL; s++, position++)
for (; s != 0; s++, position++)
{
scope = s.item();
if (need_sep != scope->read_only())
@ -284,7 +284,8 @@ ScopeMenu::receive (ScopeDeleted &msg, void *client_data)
XtSetArg(args[n], XmNchildren, &kids); n++;
XtGetValues(f_pull_menu, args, n);
for (int i = 0; i < num_kids; i++)
int i;
for (i = 0; i < num_kids; i++)
{
if (XmIsSeparator (kids[i]))
{
@ -345,7 +346,8 @@ ScopeMenu::receive (ScopeRenamed &msg, void *client_data)
XtSetArg(args[n], XmNchildren, &kids); n++;
XtGetValues(f_pull_menu, args, n);
for (int i = 0; i < num_kids; i++)
int i;
for (i = 0; i < num_kids; i++)
{
if (XmIsPushButtonGadget (kids[i]) &&
msg.f_search_scope ==
@ -363,7 +365,7 @@ ScopeMenu::receive (ScopeRenamed &msg, void *client_data)
List_Iterator<UAS_SearchScope *> s (scope_list);
// find the new position in the list
for (; s != NULL; s++)
for (; s != 0; s++)
{
if (s.item() == msg.f_search_scope)
continue;

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

@ -47,7 +47,8 @@
*
*/
#include "iostream.h"
#include "iostream"
using namespace std;
#include "UAS.hh"
@ -112,7 +113,7 @@ SearchHistoryListView::display_value(FolioObject *object)
if ((allowance = scope_field_width - scopeString.Width(fontlist)) < 0)
{
char* dots = "...";
char* dots = (char*)"...";
// need to free ungenerated at the end
char* ungenerated = (char*)(scopeString + WXmString(dots));
@ -210,7 +211,7 @@ SearchHistoryListView::child_create_ui_pre(WXmForm &form)
if (matchString.Width(header_font) >= scope_offset)
{
char* dots = "...";
char* dots = (char*)"...";
char* ungenerated = (char*)(matchString + WXmString(dots));

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

@ -74,7 +74,8 @@
#include "Managers/WString.hh"
#include <Prelude.h>
#include <iostream.h>
#include <iostream>
using namespace std;
#include "Registration.hh"
@ -137,7 +138,7 @@ SearchResultsAgent::form_result_string (UAS_Pointer<UAS_SearchResultsEntry> re)
relevancy[0] += (char) ((re->relevance() * 8 ) / f_scale);
WXmString rel (relevancy, OLIAS_FONT);
WXmString rel (relevancy, (char*)OLIAS_FONT);
WXmString book;
WXmString name;
@ -171,7 +172,7 @@ SearchResultsAgent::form_result_string (UAS_Pointer<UAS_SearchResultsEntry> re)
}
else {
char* dots = "...";
char* dots = (char*)"...";
WXmString temp_xmstring = book + WXmString(dots);
char *temp_str = (char*)temp_xmstring;
@ -379,7 +380,8 @@ SearchResultsAgent::fill_list(UAS_List<UAS_SearchResultsEntry>& rlist)
XmString *t = string_table;
int string_count = 0 ;
for (int i = 0; i < rlist.length(); i ++) {
int i;
for (i = 0; i < rlist.length(); i ++) {
string_count++ ;
*t++ = form_result_string (rlist[i]);
}
@ -445,7 +447,7 @@ SearchResultsAgent::fill_list(UAS_List<UAS_SearchResultsEntry>& rlist)
void
SearchResultsAgent::create_window()
{
create_base_window ("results");
create_base_window ((char*)"results");
XmStringLocalized mtfstring;
String string;
@ -453,7 +455,7 @@ SearchResultsAgent::create_window()
string = CATGETS(Set_SearchResultsAgent, 1, "Dtinfo: Search Results");
XtVaSetValues((Widget)*f_shell, XmNtitle, string, NULL);
help_agent().add_activate_help(f_help, "results_help");
help_agent().add_activate_help(f_help, (char*)"results_help");
#define AM WAutoManage
// NOTE: need form to contain things in the same row 'cause of resizing
@ -486,7 +488,7 @@ SearchResultsAgent::create_window()
mtfstring = CATGETS(Set_AgentLabel, 221, "Query:");
XtVaSetValues(query_label, XmNlabelString, (XmString)mtfstring, NULL);
Widget textw = XmCreateScrolledText (*f_pane, "query_text", NULL, 0);
Widget textw = XmCreateScrolledText (*f_pane, (char*)"query_text", NULL, 0);
f_query_text = new WXmText (textw);
f_query_text->Manage();
// WXmPushButton editq (*f_panel, "edit_query", AM);
@ -527,7 +529,7 @@ SearchResultsAgent::create_window()
header.FontList(header_font);
}
int offset = WXmString(relevancy, OLIAS_FONT).Width(f_list->FontList());
int offset = WXmString(relevancy,(char*)OLIAS_FONT).Width(f_list->FontList());
header.LeftOffset(offset);
WXmPrimitive prim(XtParent(*f_list));

2
cde/programs/dtinfo/dtinfo/src/Agents/SearchResultsAgentMotif.hh
View file

@ -93,6 +93,6 @@ protected: // variables
inline
SearchResultsAgent::SearchResultsAgent()
: f_work_proc_id (NULL), f_popped_up(FALSE)
: f_work_proc_id (0), f_popped_up(FALSE)
{
}

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

@ -105,7 +105,8 @@
#endif
#include <string.h>
#include <iostream.h>
#include <iostream>
using namespace std;
#include <stdio.h>
#define CLASS SearchScopeAgent
@ -419,7 +420,7 @@ void
SearchScopeAgent::display()
{
Wait_Cursor bob;
if (f_shell == NULL)
if (f_shell == 0)
{
create_ui();
}
@ -459,7 +460,7 @@ SearchScopeAgent::fill_option_menu()
WComposite menu (f_scope_option.SubMenuId());
ON_DEBUG (printf ("There are %d user scopes:\n", f_scope_list.length()));
for (; i != NULL; i++)
for (; i != 0; i++)
{
if (i.item()->read_only())
continue;
@ -490,11 +491,11 @@ SearchScopeAgent::create_ui()
XtVaSetValues((Widget)f_shell, XmNtitle, string, NULL);
DECL (WXmForm, form, f_shell, "form");
DECL (WXmPulldownMenu, scope_menu, form, "scope_menu");
DECLC (WXmPulldownMenu, scope_menu, form, "scope_menu");
Arg args[1];
int n = 0;
XtSetArg(args[n], XmNsubMenuId, (Widget) scope_menu); n++;
f_scope_option = WXmOptionMenu (form, "scope_option", WAutoManage, args, n);
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");
@ -546,7 +547,7 @@ SearchScopeAgent::create_ui()
ON_ACTIVATE (f_delete,delete_scope);
ON_ACTIVATE (f_reset,reset);
ON_ACTIVATE (close,close);
help_agent().add_activate_help (help, "scope_editor_help");
help_agent().add_activate_help (help, (char*)"scope_editor_help");
form.ShadowThickness (0);
form.Manage();
@ -711,10 +712,10 @@ SearchScopeAgent::scope_name_prompt()
// Check for name in use.
List_Iterator<UAS_SearchScope *> s (f_scope_list);
if (strcasecmp (scope_name, "unnamed") != 0)
for (; s != NULL; s++)
for (; s != 0; s++)
if (strcmp (scope_name, s.item()->name()) == 0)
break;
if (s != NULL)
if (s != 0)
{
message_mgr().error_dialog (
(char*)UAS_String(CATGETS(Set_Messages, 21,
@ -797,7 +798,7 @@ SearchScopeAgent::create_scope (const char *name,
{
// this flag should be defined elsewhere-this could
// become a command-line option
if (f_shell == NULL)
if (f_shell == 0)
{
create_ui();
}
@ -962,7 +963,7 @@ SearchScopeAgent::rename_scope()
int position = 1, old_position = -1;
List_Iterator<UAS_SearchScope *> s (f_scope_list);
for (; s != NULL; s++)
for (; s != 0; s++)
{
if (s.item()->read_only())
continue;
@ -989,7 +990,7 @@ SearchScopeAgent::rename_scope()
f_scope_list.remove_handle(f_current_scope);
f_scope_list.remove (f_current_scope);
ON_DEBUG (printf ("ScopeAgent: Inserting before <%s>\n",
s != NULL ? s.item()->name() : "LAST"));
s != 0 ? s.item()->name() : "LAST"));
// add handle and scope back in appropriate location
f_scope_list.add_handle(data_handle, position-1);
f_scope_list.insert_before (s, f_current_scope);
@ -1106,7 +1107,7 @@ SearchScopeAgent::save_unnamed_scope (const char *name)
// Scan the current menu to find the correct insertion position.
List_Iterator<UAS_SearchScope *> s (f_scope_list);
for (; s != NULL; s++, position++)
for (; s != 0; s++, position++)
{
if (s.item()->read_only())
continue;
@ -1606,7 +1607,8 @@ SearchScopeAgent::add_infolib(UAS_Pointer<UAS_Common> &lib)
// See if infolib is already in list--if it's there,
// don't add it again.
for (int i = 0; i < ol->length(); i++)
int i;
for (i = 0; i < ol->length(); i++)
{
oe = ((OutlineElement *) (*ol)[i]);
if (((TOC_Element *)oe)->toc() == lib)
@ -1685,7 +1687,8 @@ SearchScopeAgent::remove_infolib(UAS_Pointer<UAS_Common> &lib)
BitHandle handle = f_infolib_list->data_handle();
f_infolib_list->clear();
for (int i = 0; i < ol->length(); i ++)
int i;
for (i = 0; i < ol->length(); i ++)
((OutlineElement *) (*ol)[i])->set_expanded (handle);
f_infolib_list->set_list (ol, handle);
@ -1815,7 +1818,7 @@ SearchScopeAgent::rebuild_scope_list()
// Delete all named scopes so list can be rebuilt.
List_Iterator<UAS_SearchScope *> si (f_scope_list);
for (; si != NULL; si++)
for (; si != 0; si++)
{
scope = si.item();
@ -1933,7 +1936,7 @@ SearchScopeAgent::update_option_menu(UAS_String &scope_name)
UAS_List<UAS_Common>
SearchScopeAgent::list()
{
if (f_shell == NULL)
if (f_shell == 0)
{
create_ui();
}

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

@ -82,7 +82,8 @@
#endif
#include <string.h>
#include <iostream.h>
#include <iostream>
using namespace std;
#include "Other/XmStringLocalized.hh"
#include "Managers/CatMgr.hh"
@ -149,7 +150,7 @@ SearchScopeList::save()
Buffer buffer, temp_buffer;
// for each search scope do
for (; i != NULL; i++)
for (; i != 0; i++)
{
scope = i.item();
if (scope->deleted() || scope->read_only())
@ -224,7 +225,7 @@ SearchScopeList::save()
// Now dump the name of each of the scopes.
buffer.reset();
const char *name;
for (i.reset(); i != NULL; i++)
for (i.reset(); i != 0; i++)
{
if (i.item()->read_only())
continue;
@ -532,13 +533,14 @@ SearchScopeList::remove_handle(UAS_SearchScope *scope)
{
// first, find index into search scope list
List_Iterator<UAS_SearchScope *> s (this);
for (int i = 0; s != NULL && s.item() != scope; s++, i++);
int i;
for (i = 0; s != 0 && s.item() != scope; s++, i++);
// if can't find scope in list then something is hosed
if (s == NULL)
return;
// next, find the bit handle located at this index in handle list
List_Iterator<BitHandle> h (f_handle_list);
for (int j = 0; j < i && h != NULL; j++, h++);
for (int j = 0; j < i && h != 0; j++, h++);
// if this happens then something is hosed
if (h == NULL)
return;
@ -554,7 +556,8 @@ SearchScopeList::lookup_handle(UAS_SearchScope *scope)
// first, find index into search scope list
List_Iterator<UAS_SearchScope *> s (this);
for (int i = 0; s != NULL && s.item() != scope; s++, i++);
int i;
for (i = 0; s != 0 && s.item() != scope; s++, i++);
// if can't find scope in list then something is hosed
if (s == NULL)
return 0;
@ -562,7 +565,7 @@ SearchScopeList::lookup_handle(UAS_SearchScope *scope)
// next, find the bit handle located at this index in handle list
List_Iterator<BitHandle> h (f_handle_list);
for (int j = 0; j < i && h != NULL; j++, h++);
for (int j = 0; j < i && h != 0; j++, h++);
// if this happens then something is hosed
if (h == NULL)
return 0;

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

@ -86,7 +86,7 @@ UrlAgent::~UrlAgent () {
void
UrlAgent::display (NodeWindowAgent *prefWindow) {
if (fShell == NULL)
if (fShell == 0)
create_ui ();
//f_form.Manage();
XmProcessTraversal( (Widget)fTextField, XmTRAVERSE_CURRENT );
@ -126,7 +126,7 @@ UrlAgent::document( char *locator,
}
UAS_Pointer<UAS_Common> d = NULL ;
try
mtry
{
// perform basic syntax tests, but rely on the
// precise format parsing to be done in the UAS layer
@ -171,7 +171,7 @@ UrlAgent::document( char *locator,
d->retrieve();
}
}
catch_any()
mcatch_any()
{
message_mgr().error_dialog( (char*)UAS_String(CATGETS(
Set_UrlAgent, ERR_LOCATOR_RESOLUTION,
@ -253,7 +253,7 @@ UrlAgent::print_document(char *locator)
}
UAS_Pointer<UAS_Common> d = NULL ;
try
mtry
{
// perform basic syntax tests, but rely on the
// precise format parsing to be done in the UAS layer
@ -332,7 +332,7 @@ UrlAgent::print_document(char *locator)
}
}
}
catch_any()
mcatch_any()
{
if ((!window_system().videoShell()->silent)) {
@ -407,7 +407,7 @@ UrlAgent::create_ui () {
ON_ACTIVATE (fApply,displayDocument);
ON_ACTIVATE (close,close);
ON_ACTIVATE (fClear,clear);
help_agent().add_activate_help (help, "open_url_help");
help_agent().add_activate_help (help, (char*)"open_url_help");
//
// A few clean up things...
@ -475,7 +475,7 @@ UrlAgent::displayDocument () {
// "Invalid access method in url.")));
// }
// }
// catch_any() {
// mcatch_any() {
// message_mgr().error_dialog ((char*)
// UAS_String(CATGETS(Set_Messages, 71,
// "Document creation failed.")));
@ -508,6 +508,6 @@ UrlAgent::modifyVerify (WCallback *wcb) {
void
UrlAgent::clear () {
XmTextFieldSetString (fTextField, "");
XmTextFieldSetString (fTextField, (char*)"");
valueChanged ();
}

2
cde/programs/dtinfo/dtinfo/src/Agents/create_macros.hh
View file

@ -3,7 +3,9 @@
#define _create_macros_hh
#define DECL(TYPE,VAR,PARENT,NAME) TYPE VAR (PARENT, NAME)
#define DECLC(TYPE,VAR,PARENT,NAME) TYPE VAR (PARENT, (char*)NAME)
#define DECLM(TYPE,VAR,PARENT,NAME) TYPE VAR (PARENT, NAME, WAutoManage)
#define DECLMC(TYPE,VAR,PARENT,NAME) TYPE VAR (PARENT, (char*)NAME, WAutoManage)
#define ASSN(TYPE,VAR,PARENT,NAME) VAR = TYPE (PARENT, NAME)
#define ASSNM(TYPE,VAR,PARENT,NAME) VAR = TYPE (PARENT, NAME, WAutoManage)

4
cde/programs/dtinfo/dtinfo/src/Basic/Atomizer.hh
View file

@ -37,9 +37,9 @@ public: // functions
// them and they can be eliminated.
#ifndef __osf__
int value() { return ((int) f_value); }
size_t value() { return ((size_t) f_value); }
operator int ()
{ return ((int) f_value); }
{ return ((size_t) f_value); }
#endif
operator const char * ()

9
cde/programs/dtinfo/dtinfo/src/Basic/BitField.C
View file

@ -146,7 +146,8 @@ BitField::get_handle()
// find first free bit
// first find first free word
for (int word = 0 ; word < f_num_words ; word++ )
int word;
for (word = 0 ; word < f_num_words ; word++ )
if ( word_has_zero_bit(f_bits_in_use[word]) )
break;
@ -179,7 +180,8 @@ BitField::get_handle()
// now find first free byte in word
for (int byte = 0 ; byte < bytes_per_word ; byte++ )
int byte;
for (byte = 0 ; byte < bytes_per_word ; byte++ )
if (byte_has_zero_bit(get_byte(byte, f_bits_in_use[word])))
break;
@ -187,7 +189,8 @@ BitField::get_handle()
(f_bits_in_use[word] >> (byte * bits_per_byte)) & 0xFF ;
// now check byte for zero bit
for (int bit = 0 ; bit < bits_per_byte ; bit++ )
int bit;
for (bit = 0 ; bit < bits_per_byte ; bit++ )
if ((the_byte & mask[bit]) == 0)
break ;

2
cde/programs/dtinfo/dtinfo/src/Basic/BitField.hh
View file

@ -57,7 +57,7 @@ public:
#ifdef DEBUG
bool is_used(BitHandle);
ostream &BitField::dump(ostream &);
ostream &dump(ostream &);
#endif
private:

4
cde/programs/dtinfo/dtinfo/src/Basic/Buffer.hh
View file

@ -54,8 +54,8 @@ public:
void write (const int integer);
#ifndef __osf__
void write (const unsigned int integer)
{ write ((int) ((void *) integer)); }
void write (const size_t integer)
{ write ((size_t) ((void *) integer)); }
#else
void write (const unsigned int integer)
{ write ((int) integer); }

2
cde/programs/dtinfo/dtinfo/src/Basic/FString.C
View file

@ -56,7 +56,7 @@
extern "C"
{
extern int strlen(const char *);
extern size_t strlen(const char *);
extern char *strcpy(char *, const char *);
}

2
cde/programs/dtinfo/dtinfo/src/Basic/FolioObject.hh
View file

@ -38,7 +38,7 @@ typedef void (FolioObject::* notify_handler_t)
static ClassType C##Class
#define INIT_CLASS(C) \
ClassType C::type() const { return (C##Class); } \
ClassType C::C##Class = (ClassType) &C::C##Class
ClassType C::C##Class = (size_t) &C::C##Class
#else
#define DEF_CLASS(C) \
virtual ClassType type() const; \

9
cde/programs/dtinfo/dtinfo/src/Basic/Imakefile
View file

@ -1,11 +1,14 @@
XCOMM $XConsortium: Imakefile /main/6 1996/08/21 15:41:35 drk $
DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
CXXEXTRA_DEFINES = -DEXPAND_TEMPLATES
MAKEFILEDEPS=Classlist.mk
LIBNAME=Basic
NormalCplusplusObjectRule()
#if defined(UseWideChars) && defined(SunArchitecture) && (OSMajorVersion == 4)
INCLUDES=$(BROWSER_INCLUDES) $(MMDB_INCLUDES) -I/VOB/olias/library/Xwchar/src -I/VOB/olias/library/binstall/include
#else
@ -24,8 +27,12 @@ SpecialCPlusPlusObjectRule(NodeDisplayDataTml.o NodeViewInfo.o,,$(LICENSE_L_INCL
#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
SimpleLibraryT($(LIBNAME), $(OBJS), $(LIBDIR))
#elif defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture) || \
defined(LinuxArchitecture)
SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
#else
SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
XCOMM RealLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
#endif
DependTarget()

4
cde/programs/dtinfo/dtinfo/src/Basic/List.C
View file

@ -147,7 +147,7 @@ List::append (FolioObject &element)
abort();
f_list_element[f_length] = &element;
f_length++;
notify (APPENDED, (void *) (f_length - 1));
notify (APPENDED, (void *)(size_t) (f_length - 1));
}
@ -200,7 +200,7 @@ List::insert (unsigned int location, FolioObject *element)
// Insert the new element in the list.
f_list_element[location] = element;
f_length++;
notify (INSERTED, (void *) location);
notify (INSERTED, (void *)(size_t) location);
}

8
cde/programs/dtinfo/dtinfo/src/Basic/Long_Lived.hh
View file

@ -39,12 +39,12 @@ private:
// Macros to easily create access functions.
#define LONG_LIVED_HH(CLASS,FUNC) \
friend CLASS &FUNC(); \
#define LONG_LIVED_HH(CLASS,FUNC) friend CLASS &FUNC(); \
static CLASS * CONCAT(g_,FUNC)
#define LONG_LIVED_CC(CLASS,FUNC) \
CLASS * CLASS::CONCAT(g_,FUNC); \
#define LONG_LIVED_HH2(CLASS,FUNC) CLASS &FUNC();
#define LONG_LIVED_CC(CLASS,FUNC) CLASS * CLASS::CONCAT(g_,FUNC); \
CLASS &FUNC() { \
if (CLASS::CONCAT(g_,FUNC) == NULL) \
CLASS::CONCAT(g_,FUNC) = new CLASS(); \

11
cde/programs/dtinfo/dtinfo/src/Basic/NodeViewInfo.C
View file

@ -117,7 +117,7 @@ cleanup(_DtCvSegment *segment)
break;
case _DtCvSTRING:
if (segment->handle.string.string)
delete (segment->handle.string.string);
delete (char*)(segment->handle.string.string);
if (segment->client_use) {
delete (SegClientData*)segment->client_use;
segment->client_use = NULL;
@ -188,7 +188,8 @@ NodeViewInfo::~NodeViewInfo()
while (gli)
{
#ifdef DEBUG
printf( "delete UAS_Pointer<Graphic> gli.item() = %p\n", gli.item() );
printf( "delete UAS_Pointer<Graphic> gli.item() = %p\n",
(void*)gli.item() );
#endif
f_pixmap_list.remove(gli) ;
}
@ -204,14 +205,14 @@ NodeViewInfo::add_graphic(UAS_Pointer<Graphic> &pg)
f_pixmap_list.append(pg);
#ifdef DEBUG
printf( "NodeViewInfo: add UAS_Pointer<Graphic> %p\n", pg );
printf( "NodeViewInfo: add UAS_Pointer<Graphic> %p\n", (void*)pg );
if (f_pixmap_list != NULL)
{
List_Iterator<UAS_Pointer<Graphic> > gli (f_pixmap_list) ;
printf( "graphics list is now: " );
while (gli)
{
printf( " %p ", gli.item() );
printf( " %p ", (void*)gli.item() );
gli++;
}
printf( "\n" );
@ -530,7 +531,7 @@ highlight_search_hit(_DtCvSegment* seg, unsigned int vcc, unsigned int len)
if (sibling->handle.string.string)
free (sibling->handle.string.string);
if (sibling->client_use) {
delete sibling->client_use;
delete (SegClientData*)sibling->client_use;
sibling->client_use = NULL;
}

3
cde/programs/dtinfo/dtinfo/src/Basic/TOC_Element.C
View file

@ -53,7 +53,8 @@
#include "Prelude.h"
#include <iostream.h>
#include <iostream>
using namespace std;
INIT_CLASS (TOC_Element);

9
cde/programs/dtinfo/dtinfo/src/Graphics/Imakefile
View file

@ -1,11 +1,14 @@
XCOMM $XConsortium: Imakefile /main/5 1996/08/21 15:41:55 drk $
DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
CXXEXTRA_DEFINES = -DEXPAND_TEMPLATES
MAKEFILEDEPS=Classlist.mk
LIBNAME=Graphics
NormalCplusplusObjectRule()
INCLUDES=$(BROWSER_INCLUDES) $(MMDB_INCLUDES)
#ifdef DoLicenseManagement
@ -21,8 +24,12 @@ make_libfiles($(LIBNAME), $(CLASSES))
#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
SimpleLibraryT($(LIBNAME), $(OBJS), $(LIBDIR))
#elif defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture) || \
defined(LinuxArchitecture)
SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
#else
SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
XCOMM RealLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
#endif
DependTarget()

4
cde/programs/dtinfo/dtinfo/src/Graphics/PixmapGraphic.C
View file

@ -80,11 +80,11 @@ PixmapGraphic::PixmapGraphic(Pixmap pixmap, Dimension width, Dimension height,
f_width (width),
f_height (height),
f_flag (flag),
f_colormap(NULL),
f_colormap(0),
f_num_colors(0),
f_colors(NULL),
f_tiff_context(NULL),
f_agent(NULL)
f_agent(0)
{
}

1
cde/programs/dtinfo/dtinfo/src/Graphics/PixmapGraphic.hh
View file

@ -20,6 +20,7 @@
*/
#include "UAS.hh"
// #include "Managers/GraphicsMgr.hh"
class GraphicsMgr;
class GraphicAgent ;

23
cde/programs/dtinfo/dtinfo/src/Imakefile
View file

@ -1,11 +1,14 @@
XCOMM $TOG: Imakefile /main/48 1998/08/10 15:52:48 mgreess $
DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
CXXEXTRA_DEFINES = -DEXPAND_TEMPLATES
PROGRAM_NAME=dtinfo
MAKEFILEDEPS=Classlist.mk
NormalCplusplusObjectRule()
#if defined(RsArchitecture) || defined(AIXArchitecture)
LOCAL_LDFLAGS=-blibpath:/usr/dt/lib:/X11/lib:/usr/lib/threads:/usr/lib:/lib
#endif
@ -22,6 +25,13 @@ SUBDIRS=Widgets $(CLASSLIBS) Messages cgm
#define IHaveSubdirs
#define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)' 'CXXDEBUGFLAGS=$(CXXDEBUGFLAGS)'
XCOMM redefine TopLevelProject to build DtInfo with standard CDE config dir
#undef TopLevelProject
#define TopLevelProject DtInfo
IMAKE_DEFINES = -DTopLevelProject=TopLevelProject \
-DProjectTmplFile='<DtInfo.tmpl>' \
-DProjectRulesFile='<DtInfo.rules>'
DependSubdirs($(SUBDIRS))
#if defined(SVR4) && defined(i386)
@ -32,6 +42,8 @@ SYS_LIBRARIES=-lm -liconv /usr/lib/libpthreads.a -blibpath:/usr/dt/lib:/X11/lib:
SYS_LIBRARIES=-lm -lfs
#elif defined(HPArchitecture)
SYS_LIBRARIES=$(DYNAMIC) -lm
#elif defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || defined(OpenBSDArchitecture)
SYS_LIBRARIES=-lm -L$(XPROJECTROOT)/lib
#else
SYS_LIBRARIES=-lm
#endif
@ -299,7 +311,7 @@ all:: Prelude.h dfiles messages Dtinfo
includes:: Prelude.h dfiles messages
#if defined(HPArchitecture) ||defined (AIXArchitecture) || defined(UXPArchitecture) || (defined(SunArchitecture) && CplusplusCompilerMajorVersion < 4) || defined(AlphaArchitecture) || defined(USLArchitecture)
#if defined(HPArchitecture) ||defined (AIXArchitecture) || defined(UXPArchitecture) || (defined(SunArchitecture) && CplusplusCompilerMajorVersion < 4) || defined(AlphaArchitecture) || defined(USLArchitecture) || defined(FreeBSDArchitecture)
# ifndef Dont_Use_Templates_Repository
# define Dont_Use_Templates_Repository
UAS_INCLUDES=-I./UAS/Base
@ -324,6 +336,9 @@ SpecialCPlusPlusObjectRule(Templates.o,,-ptf $(SUBDIR_TEMPL_INCLUDES))
SpecialCPlusPlusExpandRule(Templates..c,,-ptf -DMakeOperatorNewPublic)
#elif defined(DoLicenseManagement)
SpecialCPlusPlusObjectRule(Templates.o,,-ptf $(LICENSE_L_INCLUDES))
#elif defined(LinuxArchitecture) || defined(FreeBSDArchitecture)
SpecialCPlusPlusObjectRule(Templates.o,,$(SUBDIR_TEMPL_INCLUDES))
SpecialCPlusPlusExpandRule(Templates..c,,-DMakeOperatorNewPublic)
#else
SpecialCPlusPlusObjectRule(Templates.o,,-ptf $(SUBDIR_TEMPL_INCLUDES))
SpecialCPlusPlusExpandRule(Templates..c,,-ptf -DMakeOperatorNewPublic)
@ -460,4 +475,8 @@ InstallNonExecFile(Olias.hlp,$(INSTALL_HELP_DIR)/C)
#endif
InstallNonExecFile($(PROGRAM_NAME).cat,$(INSTALL_MSG_CAT_DIR)/C)
XCOMM Variables to switch on debug mode temporarily
XCOMM CDEBUGFLAGS = -g -DDEBUG
XCOMM CXXDEBUGFLAGS = -g -DDEBUG
DependTarget()

7
cde/programs/dtinfo/dtinfo/src/Managers/CatMgr.C
View file

@ -30,7 +30,8 @@
#include <locale.h>
#include <stdlib.h>
#include <iostream.h>
#include <iostream>
using namespace std;
#include <Dt/Dt.h>
#include <Dt/EnvControlP.h>
@ -66,9 +67,9 @@ CatMgr::CatMgr() : f_msg(NULL), f_default(NULL)
else {
#ifdef DEBUG
cerr << "(WARNING) catopen failed." << '\n' << flush;
static char* cat_not_found = "default message not found.";
static char* cat_not_found = (char*)"default message not found.";
#else
static char* cat_not_found = "";
static char* cat_not_found = (char*)"";
#endif
f_default = new char[strlen(cat_not_found) + 1];
strcpy(f_default, cat_not_found);

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

@ -11,10 +11,6 @@
#define CATALOG_PREFIX "dtinfo"
#ifndef NULL
#define NULL (char*)0
#endif
class CatMgr
{
public:
@ -23,7 +19,7 @@ class CatMgr
~CatMgr();
static CatMgr& msg_catalog_mgr() { return *f_msg_catalog_mgr; }
char* catgets(int set, int msg, const char* def = NULL);
char* catgets(int set, int msg, const char* def = (char*)0);
static int is_open(nl_catd catd)
{ return ((catd != (nl_catd)-1) ? 1 : 0); }

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

@ -14,3 +14,5 @@ private:
LONG_LIVED_HH(ClientEventMgr, client_event_manager);
};
LONG_LIVED_HH2(ClientEventMgr, client_event_manager);

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

@ -15,6 +15,8 @@ private:
LONG_LIVED_HH(DatabaseMgr,database_mgr);
};
LONG_LIVED_HH2(DatabaseMgr,database_mgr);
inline olias_server *
olias_db()
{

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

@ -42,7 +42,8 @@
*/
#include <string.h>
#include <iostream.h>
#include <iostream>
using namespace std;
#include <sys/stat.h>
#include <lib/DtSvc/DtUtil2/LocaleXlate.h>
@ -69,6 +70,7 @@
#ifdef UseSessionMgmt
#define C_SessionMgr
#endif
#define C_GraphicsMgr
#define L_Managers
#include "Managers/CatMgr.hh"
@ -144,7 +146,7 @@ EnvMgr::EnvMgr() : f_argv(NULL),
if(!check_user_path())
{
create_user_path();
help_agent().display_help ("doc_list_help");
help_agent().display_help ((char*)"doc_list_help");
}
UAS_Collection::request(
@ -216,7 +218,7 @@ EnvMgr::init(int argc_i, char** argv_i)
{
// link up indirect paths to mmdb code... ;-)
static char buffer[256];
sprintf (buffer, "MMDB_PATH=%s", f_infolibsStr );
sprintf (buffer, "MMDB_PATH=%s", (char *)f_infolibsStr );
putenv (buffer);
char *where = getenv ("DTINFO_MARKSPECPATH");
@ -935,7 +937,7 @@ EnvMgr::mkdirs(char *pathname)
{
c = strrchr(buffer, '/');
if (c != NULL)
*c = NULL;
*c = 0;
(void)mkdirs(buffer);
if (c != NULL)
*c = '/';

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

@ -113,3 +113,5 @@ private: // data
private:
LONG_LIVED_HH( EnvMgr, env );
};
LONG_LIVED_HH2( EnvMgr, env ) ;

5
cde/programs/dtinfo/dtinfo/src/Managers/GlobalHistoryMgr.C
View file

@ -46,7 +46,8 @@
* Campbell, CA 95008
*
*/
#include <stream.h>
#include <sstream>
using namespace std;
#include "UAS.hh"
#define C_GlobalHistoryMgr
@ -163,7 +164,7 @@ GlobalHistoryMgr::add (UAS_Pointer<UAS_Common> &node_ptr)
for (i = 0; hl; hl++, i++)
{
ON_DEBUG (printf ("%2d: Checking <%s>\n", i, hl.item()->title()));
ON_DEBUG (printf ("%2d: Checking <%s>\n", i, (char*)hl.item()->title()));
if (hl.item() == node_ptr)
break;
}

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

@ -57,6 +57,8 @@ private:
LONG_LIVED_HH (GlobalHistoryMgr,global_history_mgr);
};
LONG_LIVED_HH2 (GlobalHistoryMgr,global_history_mgr);
struct HistoryDelete : public Destructable
{

92
cde/programs/dtinfo/dtinfo/src/Managers/GraphicsMgr.C
View file

@ -70,7 +70,8 @@
#include "Prelude.h"
#include <iostream.h>
#include <iostream>
using namespace std;
extern "C"
{
#include "../cgm/spec.h"
@ -111,7 +112,7 @@ GraphicsMgr::get_graphic (UAS_Pointer<Graphic> &gr)
if (window_system().printing()) {
string_resolution = XpGetOneAttribute(window_system().printDisplay(),
l_AppPrintData->f_print_data->print_context,
XPDocAttr, "default-printer-resolution") ;
XPDocAttr, (char*)"default-printer-resolution") ;
resolution = atoi(string_resolution);
XFree(string_resolution);
}
@ -162,7 +163,7 @@ GraphicsMgr::get_graphic (const UAS_String &imdata,
if(!initialized)
{
_DtGrRegisterConverter("CGM", processCGM, NULL, NULL, NULL);
_DtGrRegisterConverter((char*)"CGM", processCGM, NULL, NULL, NULL);
initialized = 1;
}
@ -172,7 +173,7 @@ GraphicsMgr::get_graphic (const UAS_String &imdata,
// if content_type is a NULL string, image type is unknown
if (content_type == "")
{
image_type = "unknown";
image_type = (char*)"unknown";
}
else
{
@ -254,17 +255,17 @@ GraphicsMgr::get_graphic (const UAS_String &imdata,
if (!strcasecmp (image_type, "XBM")) {
// match up infolib name for XBM to DtGr library
image_type = "BM";
image_type = (char*)"BM";
}
if (!strcasecmp (image_type, "XPM")) {
// match up infolib name for XPM to DtGr library
image_type = "PM";
image_type = (char*)"PM";
}
#ifdef XWD_TEST
if (!image_type || !strcasecmp (image_type, "unknown"))
image_type = "XWD" ;
image_type = (char*)"XWD" ;
#endif
// Context struct is required for TIFF data type only
@ -577,80 +578,3 @@ GraphicsMgr::init_gr(UAS_Pointer<Graphic> &gr)
//ga->set_graphic(gr);
}
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
//
// Graphic implementation
//
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
Graphic::Graphic (UAS_Pointer<UAS_Common> &doc, const UAS_String &locator):
fPixmap (0),
fDetachedPixmap (0),
fDetached (0),
fObj (doc->create_embedded_object (locator)) {
}
Graphic::~Graphic () {
//graphics_mgr().uncache(this);
//graphics_mgr().remove_detached(this);
#ifdef DEBUG
printf( "for Graphic %p, delete PixmapGraphic %p\n", this, fPixmap );
#endif
delete fPixmap;
delete fDetachedPixmap;
}
// If this one is called instead of the null arg version, the resulting
// PixmapGraphic instance is not tracked nor recorded by this instance
PixmapGraphic *
Graphic::pixmap_graphic (UAS_String& imdata,
unsigned int imlen,
UAS_String& imtype, unsigned short scale) {
PixmapGraphic *the_pixmap;
//UAS_Pointer<Graphic> tmp(this);
//if (fPixmap)
// delete fPixmap;
the_pixmap = graphics_mgr().get_graphic (imdata, imlen, imtype, scale);
return the_pixmap;
}
PixmapGraphic *
Graphic::pixmap_graphic () {
UAS_Pointer<Graphic> tmp(this);
// fPixmap records the PixmapGraphic & pixmap once created (and only
// if created via this method) for this instance of Graphic
if (!fPixmap)
fPixmap = graphics_mgr().get_graphic (tmp);
return fPixmap;
}
PixmapGraphic *
Graphic::detached_graphic () {
if (!fDetachedPixmap)
fDetachedPixmap = graphics_mgr().detached_graphic();
return fDetachedPixmap;
}
UAS_String Graphic::title()
{
return fObj->title();
}
UAS_String Graphic::content_type()
{
return fObj->content_type();
}
UAS_String Graphic::locator()
{
return fObj->locator() ;
}
UAS_String Graphic::id()
{
return fObj->id() ;
}

69
cde/programs/dtinfo/dtinfo/src/Managers/GraphicsMgr.hh
View file

@ -26,6 +26,9 @@
class PixmapGraphic;
class DetachGraphic;
class ReAttachGraphic;
class GraphicAgent;
class DisplayGraphic;
#if defined(SVR4) || defined(hpux)
@ -78,6 +81,8 @@ private:
LONG_LIVED_HH(GraphicsMgr,graphics_mgr);
};
LONG_LIVED_HH2(GraphicsMgr,graphics_mgr);
//
// Now (as of CDE development), instead of using the Graphic class
// (which was changed to UAS_EmbeddedObject), we use this Graphic
@ -89,8 +94,23 @@ private:
class Graphic: public UAS_Base {
public:
Graphic (UAS_Pointer<UAS_Common> &, const UAS_String &);
~Graphic ();
Graphic (UAS_Pointer<UAS_Common> &doc, const UAS_String &locator):
fPixmap (0),
fDetachedPixmap (0),
fDetached (0),
fObj (doc->create_embedded_object (locator)) {
}
~Graphic () {
//graphics_mgr().uncache(this);
//graphics_mgr().remove_detached(this);
#ifdef DEBUG
printf("for Graphic %p, delete PixmapGraphic %p\n", this, fPixmap );
#endif
delete fPixmap;
delete fDetachedPixmap;
}
public:
unsigned int is_detached () const { return fDetached; }
@ -98,9 +118,35 @@ class Graphic: public UAS_Base {
PixmapGraphic *graphic () {
return is_detached () ? detached_graphic() : pixmap_graphic();
}
PixmapGraphic *pixmap_graphic ();
PixmapGraphic *pixmap_graphic (UAS_String&, unsigned int, UAS_String&, unsigned short);
PixmapGraphic *detached_graphic();
PixmapGraphic *pixmap_graphic () {
UAS_Pointer<Graphic> tmp(this);
// fPixmap records the PixmapGraphic & pixmap once created (and only
// if created via this method) for this instance of Graphic
if (!fPixmap)
fPixmap = graphics_mgr().get_graphic (tmp);
return fPixmap;
}
// If this one is called instead of the null arg version, the resulting
// PixmapGraphic instance is not tracked nor recorded by this instance
PixmapGraphic *pixmap_graphic (UAS_String& imdata,
unsigned int imlen,
UAS_String& imtype, unsigned short scale) {
PixmapGraphic *the_pixmap;
//UAS_Pointer<Graphic> tmp(this);
//if (fPixmap)
// delete fPixmap;
the_pixmap = graphics_mgr().get_graphic(imdata,imlen,imtype,scale);
return the_pixmap;
}
PixmapGraphic *detached_graphic () {
if (!fDetachedPixmap)
fDetachedPixmap = graphics_mgr().detached_graphic();
return fDetachedPixmap;
}
//
// Pass-throughs for UAS_EmbeddedObject (and all of its
@ -116,10 +162,15 @@ class Graphic: public UAS_Base {
}
void cancel_retrieval () { fObj->cancel_retrieval (); }
void flush () { fObj->flush(); }
UAS_String locator ();
UAS_String content_type();
UAS_String title ();
UAS_String id ();
UAS_String locator() { return fObj->locator(); }
UAS_String content_type() { return fObj->content_type(); }
UAS_String title() { return fObj->title(); }
UAS_String id() { return fObj->id(); }
UAS_ObjectType type () { return fObj->type (); }
unsigned int llx () { return fObj->llx(); }

9
cde/programs/dtinfo/dtinfo/src/Managers/Imakefile
View file

@ -1,7 +1,8 @@
XCOMM $XConsortium: Imakefile /main/9 1996/08/21 15:42:26 drk $
XCOMM NodeMgr.o and PrintMgr.o need STYLE_SHEET_INCLUDES.
DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(STYLE_SHEET_INCLUDES)
DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES) $(STYLE_SHEET_INCLUDES)
CXXEXTRA_DEFINES = -DEXPAND_TEMPLATES
DEFINES=-DCDE_NEXT $(BYTE_ORDER_DEFINES)
@ -20,6 +21,8 @@ MAKEFILEDEPS=Classlist.mk
LIBNAME=Managers
NormalCplusplusObjectRule()
INCLUDES=$(BROWSER_INCLUDES) $(COMMON_CLASS_INCLUDES)
#include "Classlist.mk"
@ -43,8 +46,12 @@ make_msgs($(LIBNAME), $(MSGS))
#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
SimpleLibraryT($(LIBNAME), $(OBJS), $(LIBDIR))
#elif defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture) || \
defined(LinuxArchitecture)
SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
#else
SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
XCOMM RealLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
#endif
DependTarget()

3
cde/programs/dtinfo/dtinfo/src/Managers/InputMgrX.C
View file

@ -46,7 +46,8 @@
#define L_Other
# include <Prelude.h>
# include <stream.h>
# include <sstream>
using namespace std;
InputMgrX::InputMgrX () {

14
cde/programs/dtinfo/dtinfo/src/Managers/LibraryMgr.C
View file

@ -40,7 +40,9 @@
* 1315 Dell Avenue, Campbell, CA 95008
*
*/
#include <stream.h>
#include <sstream>
#include <iostream>
using namespace std;
#define C_LibraryMgr
#define C_NodeMgr
@ -57,7 +59,8 @@
#define L_Support
#include "Prelude.h"
#include <iostream.h>
#include "utility/mmdb_exception.h"
LONG_LIVED_CC(LibraryMgr,library_mgr);
@ -170,7 +173,8 @@ LibraryMgr::display (UAS_Pointer<UAS_Common> &toc)
// First, check to see if the object to display is already
// in our list.
//
for (int i = 0; i < fObjList.length(); i ++)
int i;
for (i = 0; i < fObjList.length(); i ++)
{
if (fObjList[i] == toc)
{
@ -419,7 +423,7 @@ LibraryMgr::init(UAS_List<UAS_String> &infolibpaths)
UAS_List<UAS_String> locList = UAS_Common::rootLocators ();
for (i = 0; i < locList.length(); i ++) {
try
mtry
{
UAS_Pointer<UAS_Common> d =
UAS_Common::create (*(UAS_String*)locList[i]);
@ -435,7 +439,7 @@ LibraryMgr::init(UAS_List<UAS_String> &infolibpaths)
else
message_mgr().error_dialog(window_system().get_message ("NoDocument"));
}
catch(demoException &, demo)
mcatch(demoException &, demo)
{
message_mgr().demo_failure(demo);
}

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

@ -66,3 +66,5 @@ private: // variables
private:
LONG_LIVED_HH(LibraryMgr,library_mgr);
};
LONG_LIVED_HH2(LibraryMgr,library_mgr);

3
cde/programs/dtinfo/dtinfo/src/Managers/LocalHistoryMgr.C
View file

@ -120,7 +120,8 @@ LocalHistoryMgr::truncate()
void
LocalHistoryMgr::append (UAS_Pointer<UAS_Common> &doc_ptr)
{
ON_DEBUG (printf ("&&&&& APPENDING <%s> to history\n", doc_ptr->title()));
ON_DEBUG (printf ("&&&&& APPENDING <%s> to history\n",
(char*)doc_ptr->title()));
LocalHistoryEntry *entry = new LocalHistoryEntry (doc_ptr);
truncate();
entry->f_previous = f_current;

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

@ -43,3 +43,5 @@ protected: // variables
private:
LONG_LIVED_HH(MapMgr,map_mgr);
};
LONG_LIVED_HH2(MapMgr,map_mgr);

1
cde/programs/dtinfo/dtinfo/src/Managers/MarkListMgr.hh
View file

@ -44,3 +44,4 @@ private:
LONG_LIVED_HH(MarkListMgr,mark_list_mgr);
};
LONG_LIVED_HH2(MarkListMgr,mark_list_mgr);

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

@ -51,7 +51,8 @@
*/
#include <sys/param.h>
#include <stream.h>
#include <sstream>
using namespace std;
#include "UAS.hh"
@ -239,7 +240,7 @@ MarkMgr::create_mark (UAS_Pointer<UAS_Common> &doc_ptr, const Anchor &anchor,
List_Iterator<MarkBase *> b (f_base_list);
assert (b != NULL);
assert (b != 0);
// Trim leading and trailing space and check for an empty name.
#ifdef UseWideChars
@ -328,7 +329,7 @@ MarkMgr::move_mark (UAS_Pointer<UAS_Common> &doc_ptr, const Anchor &anchor,
List_Iterator<MarkBase *> b (f_base_list);
assert (b != NULL);
assert (b != 0);
MarkMoved move_message;
move_message.f_new_mark_ptr = b.item()->

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

@ -72,3 +72,5 @@ private:
LONG_LIVED_HH (MarkMgr,mark_mgr);
};
LONG_LIVED_HH2 (MarkMgr,mark_mgr);

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

@ -60,7 +60,8 @@
#include "Other/XmStringLocalized.hh"
#include <stdio.h>
#include <iostream.h>
#include <iostream>
using namespace std;
LONG_LIVED_CC (MessageMgr,message_mgr);
@ -257,7 +258,7 @@ MessageMgr::create_dialog (unsigned char dialog_type,
parent = window_system().toplevel();
}
dialog = XmCreateMessageDialog(parent, "dialog", NULL, 0);
dialog = XmCreateMessageDialog(parent, (char*)"dialog", NULL, 0);
WXmString wxms = message_text;
XtVaSetValues(dialog,
@ -470,7 +471,7 @@ MessageMgr::question_dialog (char *message_text, Widget parent)
{
if(parent == NULL)
parent = (Widget)window_system().toplevel();
Widget dialog = XmCreateInformationDialog(parent, "dialog", NULL, 0);
Widget dialog = XmCreateInformationDialog(parent, (char*)"dialog", NULL, 0);
XtUnmanageChild(XmMessageBoxGetChild(dialog, XmDIALOG_HELP_BUTTON));
WXmString wxms = message_text;
XtVaSetValues(dialog,
@ -559,7 +560,7 @@ File \"%s,\" line %d.",
f_booklist_message.displayError (buffer, window_system().toplevel());
else
f_nodeview_message.displayError (buffer, parent);
quit_dialog ("We strongly suggest you quit now, Ok?", parent);
quit_dialog ((char*)"We strongly suggest you quit now, Ok?", parent);
}
// /////////////////////////////////////////////////////////////////////////

4
cde/programs/dtinfo/dtinfo/src/Managers/MessageMgr.hh
View file

@ -89,12 +89,14 @@ private:
LONG_LIVED_HH(MessageMgr,message_mgr);
};
LONG_LIVED_HH2(MessageMgr,message_mgr);
#ifdef __STDC__
#define Xassert(STMT) \
if (!(STMT)) { \
message_mgr().assert_failed (#STMT, __FILE__, __LINE__); \
message_mgr().assert_failed ((char*)#STMT, (char*)__FILE__, __LINE__); \
return; \
};
#else

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

@ -66,6 +66,7 @@
#define C_NodeWindowMgr
#define C_StyleSheetMgr
#define C_LibraryMgr
#define C_GraphicsMgr
#define L_Managers
#define C_xList
@ -90,7 +91,7 @@
#include "../OnlineRender/CanvasRenderer.hh"
#endif
#include <strstream.h>
#include <sstream>
class NodeWindowAgent;
class NodeHandle;
@ -110,7 +111,7 @@ void
DisplayNode::receive (UAS_DocumentRetrievedMsg &message, void *client_data)
{
ON_DEBUG (cerr <<"Got Node display message!" << endl);
int cd = (int)client_data;
size_t cd = (size_t)client_data;
// 0 == display request
@ -340,11 +341,11 @@ NodeMgr::load(UAS_Pointer<UAS_Common> &node_ptr)
styleparse();
}
#else
try
mtry
{
style_sheet_mgr().initOnlineStyleSheet(node_ptr);
}
catch_noarg (StyleSheetSyntaxError)
mcatch_noarg (StyleSheetSyntaxError)
{
message_mgr().error_dialog(
(char*)UAS_String(CATGETS(Set_Messages, 39, "File a Bug")));
@ -361,9 +362,9 @@ NodeMgr::load(UAS_Pointer<UAS_Common> &node_ptr)
}
#endif
istrstream input((char *) node_ptr->data());
istringstream input((char *) node_ptr->data());
try
mtry
{
#ifdef FONT_SCALE_DEBUG
cerr << "PrefMgr::FontScale: " <<
@ -376,7 +377,7 @@ NodeMgr::load(UAS_Pointer<UAS_Common> &node_ptr)
DocParser docparser(resolver);
docparser.parse(input);
}
catch_any()
mcatch_any()
{
ON_DEBUG(cerr << "NodeMgr::load...exception thrown" << endl);
delete gNodeViewInfo ;

1
cde/programs/dtinfo/dtinfo/src/Managers/NodeMgr.hh
View file

@ -81,4 +81,5 @@ private: // variables
LONG_LIVED_HH(NodeMgr,node_mgr);
};
LONG_LIVED_HH2(NodeMgr,node_mgr);

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

@ -122,13 +122,13 @@ PrefMgr::display()
void
PrefMgr::sync()
{
try
mtry
{
UserPreference::flush_preferences();
}
catch_any()
mcatch_any()
{
message_mgr().error_dialog ("Unable to save preferences.");
message_mgr().error_dialog ((char*)"Unable to save preferences.");
}
end_try;
}

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

@ -87,6 +87,8 @@ private:
LONG_LIVED_HH(PrefMgr,pref_mgr);
};
LONG_LIVED_HH2(PrefMgr,pref_mgr);
inline
PrefMgr::PrefMgr()
: f_pref_agent (NULL), f_last_symbol (NULL), f_last_preference (NULL)

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

@ -66,6 +66,7 @@
#define C_NodeWindowMgr
#define C_StyleSheetMgr
#define C_LibraryMgr
#define C_GraphicsMgr
#define L_Managers
#include "Prelude.h"
@ -105,7 +106,7 @@ PrintNode::receive (UAS_DocumentRetrievedMsg &message, void *client_data)
{
RCS_DEBUG("PrintNode::receive called.");
int cd = (int)client_data;
size_t cd = (size_t)client_data;
// 1 == print request
if (cd == 1) {
@ -206,11 +207,11 @@ PrintMgr::load(UAS_Pointer<UAS_Common> &node_ptr)
extern void stylerestart(FILE *);
extern NodeViewInfo *gNodeViewInfo;
try
mtry
{
style_sheet_mgr().initPrintStyleSheet(node_ptr);
}
catch_noarg (StyleSheetSyntaxError)
mcatch_noarg (StyleSheetSyntaxError)
{
message_mgr().error_dialog(
(char*)UAS_String(CATGETS(Set_Messages, 39,
@ -219,9 +220,9 @@ PrintMgr::load(UAS_Pointer<UAS_Common> &node_ptr)
}
end_try ;
istrstream input((char *) node_ptr->data());
istringstream input((char *) node_ptr->data());
try
mtry
{
window_system().setPrinting(True);
// assign node_ptr to global variable that TmlRenderer can pick up
@ -232,7 +233,7 @@ PrintMgr::load(UAS_Pointer<UAS_Common> &node_ptr)
docparser.parse(input);
window_system().setPrinting(False);
}
catch_any()
mcatch_any()
{
ON_DEBUG(cerr << "PrintMgr::load...exception thrown" << endl);
delete gNodeViewInfo ;

1
cde/programs/dtinfo/dtinfo/src/Managers/PrintMgr.hh
View file

@ -80,4 +80,5 @@ private:
LONG_LIVED_HH(PrintMgr,print_mgr);
};
LONG_LIVED_HH2(PrintMgr,print_mgr);

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

@ -44,7 +44,8 @@
*
*/
#include <stream.h>
#include <sstream>
using namespace std;
#include "Registration.hh"
@ -76,8 +77,6 @@
#include "Managers/CatMgr.hh"
#include <stream.h>
LONG_LIVED_CC(SearchMgr,search_mgr)
// Reconfigure search engine
@ -184,7 +183,7 @@ SearchMgr::history_entry_activate (FolioObject *, u_int,
void *notify_data, void *)
{
Wait_Cursor bob;
u_int which_item = (int) notify_data;
size_t which_item = (size_t) notify_data;
ResultID *rid = (ResultID *) f_search_history_list[which_item];
@ -206,7 +205,8 @@ SearchMgr::search_history_list_view()
if (f_search_history_list_view == NULL)
{
f_search_history_list_view =
new SearchHistoryListView (&f_search_history_list, "search_history");
new SearchHistoryListView (&f_search_history_list,
(char*)"search_history");
f_search_history_list_view->AddDependent
((notify_handler_t) &SearchMgr::history_entry_activate,
ListView::ENTRY_ACTIVATE);
@ -253,16 +253,16 @@ SearchMgr::parse_and_search (char *query, UAS_SearchScope *scope) {
if (f_search_section.length()) {
scope->search_zones().section ((char*)f_search_section);
}
try
mtry
{
tmp_results = search_engine().search (query, *scope);
}
catch (UAS_Exception&, e)
mcatch (UAS_Exception&, e)
{
message_mgr().error_dialog ((char*)e->message());
message_mgr().error_dialog ((char*)e.message());
return;
}
catch_any ()
mcatch_any ()
{
}

3
cde/programs/dtinfo/dtinfo/src/Managers/SearchMgr.hh
View file

@ -57,7 +57,7 @@ public: // functions
}
UAS_Pointer<UAS_List<UAS_TextRun> > current_hits ();
friend SearchMgr &search_mgr();
// friend SearchMgr &search_mgr();
private:
friend class SeReconfigure;
@ -81,5 +81,6 @@ private:
LONG_LIVED_HH(SearchMgr,search_mgr);
};
LONG_LIVED_HH2(SearchMgr,search_mgr);

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

@ -41,3 +41,5 @@ protected: // functions
protected: //variables
LONG_LIVED_HH(SearchResultsMgr,search_results_mgr);
};
LONG_LIVED_HH2(SearchResultsMgr,search_results_mgr);

3
cde/programs/dtinfo/dtinfo/src/Managers/SearchScopeMgr.C
View file

@ -67,7 +67,8 @@
#include "Prelude.h"
#include <iostream.h>
#include <iostream>
using namespace std;
LONG_LIVED_CC(SearchScopeMgr,search_scope_mgr);

1
cde/programs/dtinfo/dtinfo/src/Managers/SearchScopeMgr.hh
View file

@ -54,4 +54,5 @@ private:
LONG_LIVED_HH(SearchScopeMgr,search_scope_mgr);
};
LONG_LIVED_HH2(SearchScopeMgr,search_scope_mgr);

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

@ -133,13 +133,13 @@ ServiceMgr::create_atoms()
{
enum { XA_OLIAS_WINDOW_ID_ATOM, XA_OLIAS_EVENT_ATOM,
XA_OLIAS_REPLY_ATOM, NUM_ATOMS };
static char *atom_names[] = { OLIAS_WINDOW_ID_ATOM, OLIAS_EVENT_ATOM,
OLIAS_REPLY_ATOM };
static const char *atom_names[] = { OLIAS_WINDOW_ID_ATOM,
OLIAS_EVENT_ATOM, OLIAS_REPLY_ATOM };
Atom atoms[XtNumber(atom_names)];
XInternAtoms (window_system().display(), atom_names,
XtNumber(atom_names), False, atoms);
XInternAtoms (window_system().display(), (char**)atom_names,
XtNumber((char**)atom_names), False, atoms);
_XA_OLIAS_WINDOW_ID = atoms[XA_OLIAS_WINDOW_ID_ATOM];
_XA_OLIAS_EVENT = atoms[XA_OLIAS_EVENT_ATOM];
@ -265,7 +265,7 @@ ServiceMgr::process_olias_event (Window client,
locator = (char *) stream;
UAS_Pointer<UAS_Common> d;
try
mtry
{
if (strchr (locator, ':'))
{
@ -285,11 +285,11 @@ ServiceMgr::process_olias_event (Window client,
delete [] buffer;
}
}
catch (demoException&, demo)
mcatch (demoException&, demo)
{
message_mgr().demo_failure(demo);
}
catch_any()
mcatch_any()
{
d = NULL;
}
@ -408,7 +408,7 @@ olias_send_event (Widget, OliasEvent *event)
case OLIAS_DISPLAY_EVENT:
locator = ((OliasDisplayEvent *) event)->locator;
ON_DEBUG (printf (">>> external-api display <%s>\n", locator));
try
mtry
{
if (strchr (locator, ':'))
{
@ -433,11 +433,11 @@ olias_send_event (Widget, OliasEvent *event)
}
}
}
catch (demoException&, demo)
mcatch (demoException&, demo)
{
message_mgr().demo_failure(demo);
}
catch_any()
mcatch_any()
{
d = NULL;
}

1
cde/programs/dtinfo/dtinfo/src/Managers/ServiceMgrX.hh
View file

@ -54,5 +54,6 @@ private:
LONG_LIVED_HH(ServiceMgr,service_manager);
};
LONG_LIVED_HH2(ServiceMgr,service_manager);

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

@ -47,6 +47,8 @@ class SessionMgr : public Long_Lived
char *prior_session ; // prior session state file name, if any
} ;
LONG_LIVED_HH2( SessionMgr, session ) ;
// class SessionMgrX : public SessionMgr
// {

23
cde/programs/dtinfo/dtinfo/src/Managers/StyleSheetMgr.C
View file

@ -47,7 +47,8 @@
*
*/
#include <stream.h>
#include <sstream>
using namespace std;
// NOTE: this is just for the Xassert
#define C_MessageMgr
@ -101,14 +102,14 @@ StyleSheetMgr::font_preference_modified()
// scale is only updated when a new node is displayed. This is
// managed by having NodeMgr create a CanvasRenderer and passing in
// the current font scale value
try
mtry
{
g_style_sheet_update = TRUE;
// load new style sheet
node_mgr().re_display_all();
g_style_sheet_update = FALSE;
}
catch_any()
mcatch_any()
{
Xassert(0 == "StyleSheetMgr::font_preference_modified()");
g_style_sheet_update = FALSE ;
@ -146,7 +147,7 @@ StyleSheetMgr::initOnlineStyleSheet (UAS_Pointer<UAS_Common> &doc) {
fLastSS = onlineSS;
fCurrent = new StyleSheet;
UAS_String sstextStr = fLastSS->data();
istrstream input ((char *) sstextStr);
istringstream input ((char *) sstextStr);
g_stylein = &input;
#ifdef DUMP_STYLESHEETS
{
@ -159,17 +160,17 @@ StyleSheetMgr::initOnlineStyleSheet (UAS_Pointer<UAS_Common> &doc) {
stylerestart (0);
fStyleSheetRead = 1;
try {
mtry {
styleparse ();
}
catch_noarg (StyleSheetSyntaxError) {
mcatch_noarg (StyleSheetSyntaxError) {
fLastSS = 0;
delete fCurrent;
{ // Don't remove these curlies. For destructors before rethrow
fCurrent = new StyleSheet;
const char *def =
"* { wrap: \"word\", break: \"line\", margin: { left: 20, right: 20} }";
istrstream definput(def);
istringstream definput(def);
input.unsetf (ios::skipws);
g_stylein = &definput;
stylerestart(0);
@ -204,7 +205,7 @@ StyleSheetMgr::initPrintStyleSheet (UAS_Pointer<UAS_Common> &doc) {
fLastSS = printSS;
fCurrent = new StyleSheet;
UAS_String sstextStr = fLastSS->data();
istrstream input ((char *) sstextStr);
istringstream input ((char *) sstextStr);
g_stylein = &input;
#ifdef DUMP_STYLESHEETS
{
@ -217,17 +218,17 @@ StyleSheetMgr::initPrintStyleSheet (UAS_Pointer<UAS_Common> &doc) {
stylerestart (0);
fStyleSheetRead = 1;
try {
mtry {
styleparse ();
}
catch_noarg (StyleSheetSyntaxError) {
mcatch_noarg (StyleSheetSyntaxError) {
fLastSS = 0;
delete fCurrent;
{ // Don't remove these curlies. For destructors before rethrow
fCurrent = new StyleSheet;
const char *def =
"* { wrap: \"word\", break: \"line\", margin: { left: 20, right: 20} }";
istrstream definput(def);
istringstream definput(def);
input.unsetf (ios::skipws);
g_stylein = &definput;
stylerestart(0);

1
cde/programs/dtinfo/dtinfo/src/Managers/StyleSheetMgr.hh
View file

@ -49,4 +49,5 @@ private:
LONG_LIVED_HH(StyleSheetMgr,style_sheet_mgr);
};
LONG_LIVED_HH2(StyleSheetMgr,style_sheet_mgr);

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

@ -142,7 +142,7 @@ LogToolTalkMessage (
statmsg = tt_status_message(status);
errmsg = XtMalloc(strlen(errfmt) + strlen(statmsg) + 2);
if (! strlen(errfmt))
errfmt = "%s";
errfmt = (char*)"%s";
sprintf(errmsg, errfmt, statmsg);
DtMsgLogMessage ("Dtinfo", msg_type, errfmt, errmsg);
@ -182,7 +182,7 @@ TtIpcMgr::TtIpcMgr()
{
errmsg = LogToolTalkMessage (DtMsgLogError,
ERR_TT_DISPLAY_AS_SESSION,
DFLTXT_DISPLAY_AS_SESSION,
(char*)DFLTXT_DISPLAY_AS_SESSION,
tt_state);
message_mgr().error_dialog( (char*)UAS_String(errmsg) ) ;
XtFree (errmsg);
@ -222,7 +222,7 @@ TtIpcMgr::TtIpcMgr()
errmsg = LogToolTalkMessage (DtMsgLogError,
ERR_TT_PTYPE_DECLARE,
DFLTXT_PTYPE_DECLARE,
(char*)DFLTXT_PTYPE_DECLARE,
tt_state);
message_mgr().error_dialog( (char*)UAS_String(errmsg) );
XtFree(errmsg);
@ -232,7 +232,7 @@ TtIpcMgr::TtIpcMgr()
{
errmsg = LogToolTalkMessage (DtMsgLogError,
ERR_TT_OPEN,
DFLTXT_OPEN,
(char*)DFLTXT_OPEN,
tt_state);
message_mgr().error_dialog( (char*)UAS_String(errmsg) );
XtFree(errmsg);
@ -242,7 +242,7 @@ TtIpcMgr::TtIpcMgr()
{
errmsg = LogToolTalkMessage (DtMsgLogError,
ERR_TT_DEFAULT_AS_SESSION,
DFLTXT_DEFAULT_AS_SESSION,
(char*)DFLTXT_DEFAULT_AS_SESSION,
tt_state);
message_mgr().error_dialog( (char*)UAS_String(errmsg) );
XtFree(errmsg);
@ -827,7 +827,7 @@ locale_of_desktop()
#ifdef DEBUG
if (!WM_LOCALE_NAME)
printf( "Atom WM_LOCALE_NAME not interned\n" );
#endif DEBUG
#endif
if (!WM_LOCALE_NAME) return (char *)NULL;
@ -838,7 +838,7 @@ locale_of_desktop()
#ifdef DEBUG
if (!_DT_SM_WINDOW_INFO)
printf( "Atom _DT_SM_WINDOW_INFO not interned\n" );
#endif DEBUG
#endif
if (!_DT_SM_WINDOW_INFO) return (char *)NULL;
@ -856,8 +856,8 @@ locale_of_desktop()
printf(
"null value from Atom _DT_SM_WINDOW_INFO for SM window ID\n" );
else
printf( "dtsession window is %x\n", *sm_prop_window );
#endif DEBUG
printf( "dtsession window is %lx\n", *sm_prop_window );
#endif
if (!sm_prop_window) return (char *)NULL;
@ -872,7 +872,7 @@ locale_of_desktop()
#ifdef DEBUG
printf( "desktop's locale is %s\n", dt_locale ) ;
#endif DEBUG
#endif
if (!dt_locale) return (char *)NULL;
else return dt_locale;

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

@ -83,5 +83,5 @@ class TtIpcMgr : public Long_Lived
Tt_status tt_state ;
} ;
LONG_LIVED_HH2( TtIpcMgr, tt_manager ) ;

1
cde/programs/dtinfo/dtinfo/src/Managers/TtIpcMgr.msg
View file

@ -1,5 +1,4 @@
$ $XConsortium: TtIpcMgr.msg /main/4 1996/08/14 14:30:36 rcs $
$ $XConsortium: TtIpcMgr.msg /main/4 1996/08/14 14:30:36 rcs $
$
$ (c) Copyright 1996 Digital Equipment Corporation.
$ (c) Copyright 1996 Hewlett-Packard Company.

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

@ -17,3 +17,5 @@ class UrlMgr: public Long_Lived {
LONG_LIVED_HH(UrlMgr,url_mgr);
};
LONG_LIVED_HH2(UrlMgr,url_mgr);

1
cde/programs/dtinfo/dtinfo/src/Managers/WorkspaceMgr.hh
View file

@ -61,5 +61,6 @@ class WorkspaceMgr : public Long_Lived
// servicing of request (dynamic)
} ;
LONG_LIVED_HH2( WorkspaceMgr, workspace ) ;

9
cde/programs/dtinfo/dtinfo/src/Marks/Imakefile
View file

@ -1,6 +1,9 @@
XCOMM $XConsortium: Imakefile /main/6 1996/08/21 15:42:50 drk $
DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
CXXEXTRA_DEFINES = -DEXPAND_TEMPLATES
NormalCplusplusObjectRule()
MAKEFILEDEPS=Classlist.mk
@ -18,8 +21,12 @@ make_libfiles($(LIBNAME), $(CLASSES))
#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
SimpleLibraryT($(LIBNAME), $(OBJS), $(LIBDIR))
#elif defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture) || \
defined(LinuxArchitecture)
SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
#else
SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
XCOMM RealLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
#endif
DependTarget()

4
cde/programs/dtinfo/dtinfo/src/Marks/Mark.C
View file

@ -74,7 +74,7 @@ Mark::~Mark()
{
ON_DEBUG (printf ("Mark::~Mark() @ 0x%p\n", this));
if (f_reference_count != 0)
message_mgr().error_dialog ("Attempt to delete mark with references!");
message_mgr().error_dialog((char*)"Attempt to delete mark with references!");
}
@ -95,7 +95,7 @@ Mark::save()
{
if (f_deleted)
{
message_mgr().error_dialog ("Cannot save changes to deleted mark.");
message_mgr().error_dialog((char*)"Cannot save changes to deleted mark.");
}
else
{

19
cde/programs/dtinfo/dtinfo/src/Marks/MarkBase_mmdb.C
View file

@ -47,7 +47,8 @@
*
*/
#include <stream.h>
#include <sstream>
using namespace std;
#define C_xList
@ -98,11 +99,11 @@ MarkBase_mmdb::open (const char *filename, bool read_only)
mark_base *base;
user_base::rw_flag_t mode = read_only ? user_base::READ : user_base::WRITE;
try
mtry
{
base = new mark_base (filename, "mark_base", "", mode);
}
catch_any()
mcatch_any()
{
return (NULL);
}
@ -128,7 +129,7 @@ MarkBase_mmdb::create (const char *filename, bool read_only)
mark_base *base;
user_base::rw_flag_t mode = read_only ? user_base::READ : user_base::WRITE;
try
mtry
{
if (!read_only)
{
@ -152,7 +153,7 @@ MarkBase_mmdb::create (const char *filename, bool read_only)
}
}
}
catch_any()
mcatch_any()
{
return (NULL);
}
@ -261,12 +262,12 @@ MarkBase_mmdb::get_marks (UAS_Pointer<UAS_Common> &doc_ptr,
// Assure that the oid_t has not been deleted. qfc 7-6-93
if (id.eq (oid_t (c_code_t(0), 0)) == false)
{
try
mtry
{
Mark_mmdb *m = find_mark (id, doc_ptr);
list.append (m);
}
catch_any()
mcatch_any()
{
// ignore failure for now! DJB
}
@ -291,12 +292,12 @@ MarkBase_mmdb::get_all_marks (xList<UAS_Pointer<Mark> > &list)
for (i = f_mark_base->first(); i != 0; f_mark_base->next(i))
{
oid_t id = f_mark_base->get_mark_oid (i);
try
mtry
{
m = find_mark (id, null_doc);
list.append (m);
}
catch_any()
mcatch_any()
{
// ignore any errors for now -- DJB
}

4
cde/programs/dtinfo/dtinfo/src/Marks/Mark_mmdb.C
View file

@ -227,12 +227,12 @@ Mark_mmdb::restore()
int sz;
char *str;
try
mtry
{
sz = f_user_mark->mark_value()->size();
str = f_user_mark->mark_value()->get();
}
catch_any()
mcatch_any()
{
delete this;
rethrow;

10
cde/programs/dtinfo/dtinfo/src/OliasSearch/Imakefile
View file

@ -1,6 +1,12 @@
XCOMM $XConsortium: Imakefile /main/4 1996/08/21 15:42:57 drk $
CXXEXTRA_DEFINES = -DEXPAND_TEMPLATES
MAKEFILEDEPS=Classlist.mk
LIBNAME=OliasSearch
NormalCplusplusObjectRule()
INCLUDES=$(BROWSER_INCLUDES)
#include "Classlist.mk"
@ -11,8 +17,12 @@ make_libfiles($(LIBNAME), $(CLASSES))
#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
SimpleLibraryT($(LIBNAME), $(OBJS), $(LIBDIR))
#elif defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture) || \
defined(LinuxArchitecture)
SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
#else
SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
XCOMM RealLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
#endif
DependTarget()

18
cde/programs/dtinfo/dtinfo/src/OnlineRender/CanvasRenderer.C
View file

@ -1029,7 +1029,7 @@ CanvasRenderer::handle_olias_attributes(ElementFeatures &features,
pGS->pix = graphic->pixmap();
pGS->width = graphic->width() ;
pGS->height = graphic->height();
pGS->mask = NULL ;
pGS->mask = 0 ;
pGS->pixels = NULL ;
pGS->num_pixels = 0 ;
@ -1565,7 +1565,7 @@ CanvasRenderer::really_insert_string (_DtCvSegment *container,
cerr << " indx: " << ret_indx << " " << font << endl;
#endif
}
strseg->handle.string.font = (_DtCvPointer) ret_indx ;
strseg->handle.string.font = (_DtCvPointer)(size_t) ret_indx ;
// copy data into new memory to hand over to the canvas
char *string = new char[size + 1];
@ -2159,7 +2159,8 @@ TGDefn::find_format(const char *name, int* index)
CC_TPtrSlistIterator<ColFormat> cf_cursor (f_colformats);
for (int nth = 0; ++cf_cursor; nth++)
int nth;
for (nth = 0; ++cf_cursor; nth++)
{
if (cf_cursor.key()->name() == NULL)
continue;
@ -2329,10 +2330,10 @@ TGDefn::build()
#endif
ColDefn* colcell;
try {
mtry {
colcell = columns.at(kept);
}
catch_any() {
mcatch_any() {
abort(); // consider it as fatal
}
end_try;
@ -2392,10 +2393,10 @@ TGDefn::build()
fprintf(stderr, "[vc,kept,count]=[%d,%d,%d]\n", vc, kept, count);
#endif
ColDefn* colcell;
try {
mtry {
colcell = columns.at(kept);
}
catch_any() {
mcatch_any() {
abort();
}
end_try;
@ -2448,7 +2449,8 @@ TGDefn::build()
}
// temp for now deal with blank spots in the table
for (unsigned r = 0 ; r < num_rows ; r++)
unsigned r;
for (r = 0 ; r < num_rows ; r++)
for (unsigned c = 0; c < num_columns ; c++)
{
if (grid[r][c] == NULL)

1
cde/programs/dtinfo/dtinfo/src/OnlineRender/CanvasRenderer.msg
View file

@ -4,4 +4,5 @@ $set Set_CanvasRenderer
$
$ messages specific to CanvasRenderer (dtinfo I/F to DtCanvas/DtHelp)
$
1 "Dtinfo: Canvas Renderer"

17
cde/programs/dtinfo/dtinfo/src/OnlineRender/FeatureSupport.C
View file

@ -52,7 +52,8 @@
#include "FeatureValue.h"
#include "StyleSheetExceptions.h"
#include <utility/funcs.h>
#include <stream.h>
#include <sstream>
using namespace std;
#include <Dt/CanvasP.h>
#include "CanvasRenderer.hh"
@ -607,7 +608,7 @@ CanvasRenderer::_dofont(const FeatureSet &fs, Symbol** symbols)
// if we still can't find one go with whatever.
else {
xlfd = "-*-*-*-*-*-*-*-*-*-*-*-*-*";
xlfd = (char*)"-*-*-*-*-*-*-*-*-*-*-*-*-*";
}
#ifdef FONT_DEBUG
fprintf(stderr, "resulting in \"%s\".\n", xlfd);
@ -811,7 +812,7 @@ CanvasRenderer::domargin(ElementFeatures &return_features,
int top = 0;
int bottom= 0;
try
mtry
{
//const Feature *f = marginset->lookup(symbols[FIRST]);
const Feature *l = marginset->lookup(symbols[LEFT]);
@ -833,7 +834,7 @@ CanvasRenderer::domargin(ElementFeatures &return_features,
bottom_margin = bottom;
}
catch_noarg (StyleSheetException &)
mcatch_noarg (StyleSheetException &)
{
#ifdef DEBUG
cerr << "MarginFPtml: style sheet exception" << endl;
@ -1573,7 +1574,7 @@ CanvasRenderer::docolformat(ElementFeatures &return_features,
ColFormat *colf = new ColFormat ;
try
mtry
{
const Feature *widthF = set->lookup (symbols[WIDTH]) ;
if (widthF)
@ -1616,7 +1617,7 @@ CanvasRenderer::docolformat(ElementFeatures &return_features,
colf->justify (justify);
}
}
catch_any()
mcatch_any()
{
abort();
}
@ -1738,11 +1739,11 @@ CanvasRenderer::dorow (ElementFeatures &return_features,
const FeatureSet* features;
try
mtry
{
features = *local.lookup(symbols[ROW])->value();
}
catch_any()
mcatch_any()
{
features = NULL;
}

4
cde/programs/dtinfo/dtinfo/src/OnlineRender/FontCache.C
View file

@ -40,7 +40,8 @@
#include "FontCache.hh"
#if defined DEBUG || defined SMALL_DEBUG || defined FONT_DEBUG
#include <iostream.h>
#include <iostream>
using namespace std;
#endif
#define C_List
@ -132,6 +133,7 @@ FontEntry::hash() const
f_charset.hash() + f_ptsize ;
}
bool
FontEntry::operator==(const FontEntry &fe) const
{
return

2
cde/programs/dtinfo/dtinfo/src/OnlineRender/FontCache.hh
View file

@ -49,7 +49,7 @@ public:
FontEntry(const FontEntry &);
~FontEntry();
operator ==(const FontEntry &) const;
bool operator ==(const FontEntry &) const;
unsigned hash() const;

17
cde/programs/dtinfo/dtinfo/src/OnlineRender/Imakefile
View file

@ -1,9 +1,12 @@
XCOMM $XConsortium: Imakefile /main/8 1996/08/21 15:43:09 drk $
DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
CXXEXTRA_DEFINES = -DEXPAND_TEMPLATES
LIBNAME=OnlineRender
NormalCplusplusObjectRule()
INCLUDES=$(BROWSER_INCLUDES) $(MMDB_INCLUDES) $(STYLE_SHEET_INCLUDES) \
$(COMMON_CLASS_INCLUDES)
DEFINES=-DCDE_NEXT
@ -30,7 +33,9 @@ dfiles:
#ifdef UXPArchitecture
SpecialCPlusPlusObjectRule(ORTemplates.o,, +Tall_tmpls -DEXPAND_TEMPLATES)
SpecialCPlusPlusExpandRule(ORTemplates..c,ORTemplates.C,+Tall_tmpls -DEXPAND_TEMPLATES)
#else
#elif defined(LinuxArchitecture) || defined(FreeBSDArchitecture)
SpecialCPlusPlusObjectRule(ORTemplates.o,,-DEXPAND_TEMPLATES)
SpecialCPlusPlusExpandRule(ORTemplates..c,ORTemplates.C,-DEXPAND_TEMPLATES)
#endif
#if defined(UseWideChars) && defined(SunArchitecture) && (OSMajorVersion == 4)
WC_FLAGS=-I/VOB/olias/library/Xwchar/src
@ -45,9 +50,13 @@ SpecialCPlusPlusObjectRule($(WC_OBJS),,$(WC_FLAGS))
RealLibrary($(LIBNAME),$(OBJS),$(LIBDIR))
#else
#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
SimpleLibraryT($(LIBNAME),$(OBJS),$(LIBDIR))
SimpleLibraryT($(LIBNAME), $(OBJS), $(LIBDIR))
#elif defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture) || \
defined(LinuxArchitecture)
SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
#else
SimpleLibrary($(LIBNAME),$(OBJS),$(LIBDIR))
SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
XCOMM RealLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
#endif
#endif

Some files were not shown because too many files have changed in this diff Show more