Commit c5df7017 authored by claes's avatar claes

Co added to XHelp classname to avoid collision with xtt's xhelp

parent 872b8949
......@@ -184,7 +184,7 @@ static void watt_activate_exit( Widget w, WAtt *watt, XmAnyCallbackStruct *data)
static void watt_activate_help( Widget w, WAtt *watt, XmAnyCallbackStruct *data)
{
XHelp::dhelp( "object editor", 0, navh_eHelpFile_Base, 0, true);
CoXHelp::dhelp( "object editor", 0, navh_eHelpFile_Base, 0, true);
}
static void watt_create_msg_label( Widget w, WAtt *watt, XmAnyCallbackStruct *data)
......
......@@ -233,7 +233,7 @@ static void wda_activate_prevattr( Widget w, Wda *wda, XmAnyCallbackStruct *data
static void wda_activate_help( Widget w, Wda *wda, XmAnyCallbackStruct *data)
{
XHelp::dhelp( "spreadsheet editor", 0, navh_eHelpFile_Base, 0, true);
CoXHelp::dhelp( "spreadsheet editor", 0, navh_eHelpFile_Base, 0, true);
}
static void wda_create_msg_label( Widget w, Wda *wda, XmAnyCallbackStruct *data)
......
......@@ -416,23 +416,23 @@ static int wnav_help_func( void *client_data,
{
if ( ODD( dcli_get_qualifier( "/HELPFILE", file_str)))
{
sts = XHelp::dhelp_index( navh_eHelpFile_Other, file_str);
sts = CoXHelp::dhelp_index( navh_eHelpFile_Other, file_str);
if ( EVEN(sts))
wnav->message('E', "Unable to find file");
}
else
{
if ( ODD( dcli_get_qualifier( "/BASE", file_str)))
sts = XHelp::dhelp_index( navh_eHelpFile_Base, NULL);
sts = CoXHelp::dhelp_index( navh_eHelpFile_Base, NULL);
else
sts = XHelp::dhelp_index( navh_eHelpFile_Project, NULL);
sts = CoXHelp::dhelp_index( navh_eHelpFile_Project, NULL);
}
return sts;
}
if ( EVEN( dcli_get_qualifier( "dcli_arg1", arg_str)))
{
sts = XHelp::dhelp( "help command", "", navh_eHelpFile_Base, NULL, strict);
sts = CoXHelp::dhelp( "help command", "", navh_eHelpFile_Base, NULL, strict);
return sts;
}
strict = ODD( dcli_get_qualifier( "/STRICT", NULL));
......@@ -465,25 +465,25 @@ static int wnav_help_func( void *client_data,
}
}
if ( ODD( dcli_get_qualifier( "/HELPFILE", file_str))) {
sts = XHelp::dhelp( key, bookmark_str, navh_eHelpFile_Other, file_str, strict);
sts = CoXHelp::dhelp( key, bookmark_str, navh_eHelpFile_Other, file_str, strict);
if ( EVEN(sts))
wnav->message('E', "No help on this subject");
}
else if ( ODD( dcli_get_qualifier( "/BASE", file_str))) {
sts = XHelp::dhelp( key, bookmark_str, navh_eHelpFile_Base, NULL, strict);
sts = CoXHelp::dhelp( key, bookmark_str, navh_eHelpFile_Base, NULL, strict);
if ( EVEN(sts))
wnav->message('E', "No help on this subject");
}
else if ( ODD( dcli_get_qualifier( "/PROJECT", file_str))) {
sts = XHelp::dhelp( key, bookmark_str, navh_eHelpFile_Project, NULL, strict);
sts = CoXHelp::dhelp( key, bookmark_str, navh_eHelpFile_Project, NULL, strict);
if ( EVEN(sts))
wnav->message('E', "No help on this subject");
}
else {
sts = XHelp::dhelp( key, bookmark_str, navh_eHelpFile_Base, NULL, strict);
sts = CoXHelp::dhelp( key, bookmark_str, navh_eHelpFile_Base, NULL, strict);
if ( EVEN(sts))
{
sts = XHelp::dhelp( key, bookmark_str, navh_eHelpFile_Project, NULL, strict);
sts = CoXHelp::dhelp( key, bookmark_str, navh_eHelpFile_Project, NULL, strict);
if ( EVEN(sts))
wnav->message('E', "No help on this subject");
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment