diff options
Diffstat (limited to 'lwlib')
| -rw-r--r-- | lwlib/ChangeLog | 4 | ||||
| -rw-r--r-- | lwlib/lwlib-Xaw.c | 14 | ||||
| -rw-r--r-- | lwlib/lwlib-Xaw.h | 2 | ||||
| -rw-r--r-- | lwlib/lwlib-Xlw.c | 8 | ||||
| -rw-r--r-- | lwlib/lwlib-Xm.c | 116 | ||||
| -rw-r--r-- | lwlib/lwlib-Xm.h | 2 | ||||
| -rw-r--r-- | lwlib/lwlib-utils.c | 8 | ||||
| -rw-r--r-- | lwlib/lwlib.c | 50 | ||||
| -rw-r--r-- | lwlib/lwlib.h | 6 | ||||
| -rw-r--r-- | lwlib/xlwmenu.c | 2 |
10 files changed, 106 insertions, 106 deletions
diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog index d5e6dadbeb4..52da2ebc2de 100644 --- a/lwlib/ChangeLog +++ b/lwlib/ChangeLog @@ -872,13 +872,13 @@ * xlwmenu.c: Add #include <X11/ObjectP.h> for X11R4. -1994-09-18 Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr> +1994-09-18 Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr> * lwlib-Xm.c (make_dialog): When there is more than two pushbuttons, set XmPACK_TIGHT and XmHORIZONTAL to the rowcolumn. Also add a margin of 10 pixels. -1994-09-16 Paul Reilly <pmr@geech.gnu.ai.mit.edu> +1994-09-16 Paul Reilly <pmr@geech.gnu.ai.mit.edu> * lwlib-Xm.c (make_main): New function to support toolkit independent creation of the main Emacs widget. diff --git a/lwlib/lwlib-Xaw.c b/lwlib/lwlib-Xaw.c index 058899a9277..3ffc0d62f2b 100644 --- a/lwlib/lwlib-Xaw.c +++ b/lwlib/lwlib-Xaw.c @@ -3,13 +3,13 @@ This file is part of the Lucid Widget Library. -The Lucid Widget Library is free software; you can redistribute it and/or +The Lucid Widget Library is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 1, or (at your option) any later version. The Lucid Widget Library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of +but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. @@ -356,7 +356,7 @@ make_dialog (name, parent, pop_up_p, shell_title, icon_name, text_input_slot, ra I want the separator to take up the slack between the buttons on the right and the buttons on the left (that is I want the buttons after the separator to be packed against the right edge of the - window) but I can't seem to make it do it. + window) but I can't seem to make it do it. */ ac = 0; XtSetArg (av [ac], XtNfromHoriz, button); ac++; @@ -440,7 +440,7 @@ xaw_create_dialog (instance) shell_name = "Question"; break; } - + total_buttons = name [1] - '0'; if (name [3] == 'T' || name [3] == 't') @@ -450,9 +450,9 @@ xaw_create_dialog (instance) } else if (name [3]) right_buttons = name [4] - '0'; - + left_buttons = total_buttons - right_buttons; - + widget = make_dialog (name, parent, pop_up_p, shell_name, icon_name, text_input_slot, radio_box, list, left_buttons, right_buttons); @@ -619,7 +619,7 @@ xaw_create_scrollbar (instance) Widget scrollbar; XtVaGetValues (instance->parent, XtNwidth, &width, NULL); - + XtSetArg (av[ac], XtNshowGrip, 0); ac++; XtSetArg (av[ac], XtNresizeToPreferred, 1); ac++; XtSetArg (av[ac], XtNallowResize, True); ac++; diff --git a/lwlib/lwlib-Xaw.h b/lwlib/lwlib-Xaw.h index 88f9114a237..6c9d7335752 100644 --- a/lwlib/lwlib-Xaw.h +++ b/lwlib/lwlib-Xaw.h @@ -5,7 +5,7 @@ extern widget_creation_entry xaw_creation_table []; -Widget +Widget xaw_create_dialog __P ((widget_instance*)); Boolean diff --git a/lwlib/lwlib-Xlw.c b/lwlib/lwlib-Xlw.c index fc59c5652b1..cc1e8f7890f 100644 --- a/lwlib/lwlib-Xlw.c +++ b/lwlib/lwlib-Xlw.c @@ -3,13 +3,13 @@ This file is part of the Lucid Widget Library. -The Lucid Widget Library is free software; you can redistribute it and/or +The Lucid Widget Library is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 1, or (at your option) any later version. The Lucid Widget Library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of +but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. @@ -162,7 +162,7 @@ xlw_create_popup_menu (instance) Widget popup_shell = XtCreatePopupShell (instance->info->name, overrideShellWidgetClass, instance->parent, NULL, 0); - + Widget widget; Arg al[2]; int ac = 0; @@ -182,7 +182,7 @@ xlw_create_popup_menu (instance) return popup_shell; } -widget_creation_entry +widget_creation_entry xlw_creation_table [] = { {"menubar", xlw_create_menubar}, diff --git a/lwlib/lwlib-Xm.c b/lwlib/lwlib-Xm.c index f61b72534df..b22c59a7a1c 100644 --- a/lwlib/lwlib-Xm.c +++ b/lwlib/lwlib-Xm.c @@ -3,13 +3,13 @@ This file is part of the Lucid Widget Library. -The Lucid Widget Library is free software; you can redistribute it and/or +The Lucid Widget Library is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 1, or (at your option) any later version. The Lucid Widget Library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of +but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. @@ -72,7 +72,7 @@ enum do_call_type { pre_activate, selection, no_selection, post_activate }; /* Structures to keep destroyed instances */ -typedef struct _destroyed_instance +typedef struct _destroyed_instance { char* name; char* type; @@ -188,7 +188,7 @@ make_destroyed_instance (name, type, widget, parent, pop_up_p) instance->next = NULL; return instance; } - + static void free_destroyed_instance (instance) destroyed_instance* instance; @@ -210,7 +210,7 @@ Boolean lw_motif_widget_p (widget) Widget widget; { - return + return XtClass (widget) == xmDialogShellWidgetClass || XmIsPrimitive (widget) || XmIsManager (widget) || XmIsGadget (widget); } @@ -222,7 +222,7 @@ resource_motif_string (widget, name) { XtResource resource; XmString result = 0; - + resource.resource_name = name; resource.resource_class = XmCXmString; resource.resource_type = XmRXmString; @@ -254,7 +254,7 @@ destroy_all_children (widget, first_child_to_destroy) XtUnmanageChildren (children + first_child_to_destroy, number - first_child_to_destroy); - /* Unmanage all children and destroy them. They will only be + /* Unmanage all children and destroy them. They will only be really destroyed when we get out of DispatchEvent. */ for (i = first_child_to_destroy; i < number; i++) { @@ -265,7 +265,7 @@ destroy_all_children (widget, first_child_to_destroy) XtCompositeChildren. So get it out of the cascade button and free it. If this child is not a cascade button, then submenu should remain unchanged. */ - XtSetArg (al[0], XmNsubMenuId, &submenu); + XtSetArg (al[0], XmNsubMenuId, &submenu); XtGetValues (children[i], al, 1); if (submenu) { @@ -329,7 +329,7 @@ xm_arm_callback (w, client_data, call_data) the value to update. Menus: - + Emacs fills VAL->name with the text to display in the menu, and sets VAL->value to null. Function make_menu_in_widget creates widgets with VAL->name as resource name. This works because the @@ -371,10 +371,10 @@ xm_update_label (instance, widget, val) XmStringCreateLtoR (val->value, XmSTRING_DEFAULT_CHARSET); XtSetArg (al [ac], XmNlabelString, built_string); ac++; } - + XtSetArg (al [ac], XmNlabelType, XmSTRING); ac++; } - + if (val->key) { key_string = XmStringCreateLtoR (val->key, XmSTRING_DEFAULT_CHARSET); @@ -566,7 +566,7 @@ make_menu_in_widget (instance, widget, val, keep_first_children) XtSetArg (al[ac], XmNsensitive, cur->enabled); ac++; XtSetArg (al[ac], XmNalignment, XmALIGNMENT_BEGINNING); ac++; XtSetArg (al[ac], XmNuserData, cur->call_data); ac++; - + if (instance->pop_up_p && !cur->contents && !cur->call_data && !lw_separator_p (cur->name, &separator, 1)) { @@ -605,9 +605,9 @@ make_menu_in_widget (instance, widget, val, keep_first_children) XtAddCallback (button, XmNarmCallback, xm_arm_callback, cur); XtAddCallback (button, XmNdisarmCallback, xm_arm_callback, cur); } - + xm_update_label (instance, button, cur); - + /* Add a callback that is called when the button is selected. Toggle buttons don't support XmNactivateCallback, we use XmNvalueChangedCallback in @@ -684,7 +684,7 @@ update_one_menu_entry (instance, widget, val, deep_p) menu = NULL; XtSetArg (al [ac], XmNsubMenuId, &menu); ac++; XtGetValues (widget, al, ac); - + contents = val->contents; if (!menu) @@ -715,8 +715,8 @@ update_one_menu_entry (instance, widget, val, deep_p) else { Widget button; - - /* The current menuitem is a XmPushButtonGadget, it + + /* The current menuitem is a XmPushButtonGadget, it needs to be replaced by a CascadeButtonGadget */ XtDestroyWidget (widget_list[i]); menu = XmCreatePulldownMenu (parent, val->name, NULL, 0); @@ -732,7 +732,7 @@ update_one_menu_entry (instance, widget, val, deep_p) #endif button = XmCreateCascadeButton (parent, val->name, al, ac); xm_update_label (instance, button, val); - + XtAddCallback (button, XmNcascadingCallback, xm_pull_down_callback, (XtPointer)instance); XtManageChild (button); @@ -779,7 +779,7 @@ xm_update_menu (instance, widget, val, deep_p) { if (children) { - for (i = 0, cur = val->contents; + for (i = 0, cur = val->contents; (i < num_children && cur); /* how else to ditch unwanted children ?? - mgd */ i++, cur = cur->next) @@ -867,18 +867,18 @@ xm_update_one_widget (instance, widget, val, deep_p) Boolean deep_p; { WidgetClass class; - + /* Mark as not edited */ val->edited = False; /* Common to all widget types */ XtSetSensitive (widget, val->enabled); XtVaSetValues (widget, XmNuserData, val->call_data, NULL); - + /* Common to all label like widgets */ if (XtIsSubclass (widget, xmLabelWidgetClass)) xm_update_label (instance, widget, val); - + class = XtClass (widget); /* Class specific things */ if (class == xmPushButtonWidgetClass || @@ -900,10 +900,10 @@ xm_update_one_widget (instance, widget, val, deep_p) Boolean radiobox = 0; int ac = 0; Arg al [1]; - + XtSetArg (al [ac], XmNradioBehavior, &radiobox); ac++; XtGetValues (widget, al, ac); - + if (radiobox) xm_update_radiobox (instance, widget, val); else @@ -940,7 +940,7 @@ xm_update_one_value (instance, widget, val) val->call_data = old_wv->call_data; break; } - + if (class == xmToggleButtonWidgetClass || class == xmToggleButtonGadgetClass) { XtVaGetValues (widget, XmNset, &val->selected, NULL); @@ -965,10 +965,10 @@ xm_update_one_value (instance, widget, val) Boolean radiobox = 0; int ac = 0; Arg al [1]; - + XtSetArg (al [ac], XmNradioBehavior, &radiobox); ac++; XtGetValues (widget, al, ac); - + if (radiobox) { CompositeWidget radio = (CompositeWidget)widget; @@ -977,7 +977,7 @@ xm_update_one_value (instance, widget, val) { int set = False; Widget toggle = radio->composite.children [i]; - + XtVaGetValues (toggle, XmNset, &set, NULL); if (set) { @@ -1020,7 +1020,7 @@ xm_update_one_value (instance, widget, val) /* This function is for activating a button from a program. It's wrong because we pass a NULL argument in the call_data which is not Motif compatible. This is used from the XmNdefaultAction callback of the List widgets to - have a double-click put down a dialog box like the button would do. + have a double-click put down a dialog box like the button would do. I could not find a way to do that with accelerators. */ static void @@ -1064,7 +1064,7 @@ make_dialog (name, parent, pop_up_p, shell_title, icon_name, text_input_slot, Arg al[64]; /* Arg List */ int ac; /* Arg Count */ int i; - + if (pop_up_p) { ac = 0; @@ -1089,9 +1089,9 @@ make_dialog (name, parent, pop_up_p, shell_title, icon_name, text_input_slot, n_children = left_buttons + right_buttons + 1; ac = 0; - XtSetArg(al[ac], XmNpacking, n_children == 3? + XtSetArg(al[ac], XmNpacking, n_children == 3? XmPACK_COLUMN: XmPACK_TIGHT); ac++; - XtSetArg(al[ac], XmNorientation, n_children == 3? + XtSetArg(al[ac], XmNorientation, n_children == 3? XmVERTICAL: XmHORIZONTAL); ac++; XtSetArg(al[ac], XmNnumColumns, left_buttons + right_buttons + 1); ac++; XtSetArg(al[ac], XmNmarginWidth, 0); ac++; @@ -1108,7 +1108,7 @@ make_dialog (name, parent, pop_up_p, shell_title, icon_name, text_input_slot, XtSetArg(al[ac], XmNrightAttachment, XmATTACH_FORM); ac++; XtSetArg(al[ac], XmNrightOffset, 13); ac++; row = XmCreateRowColumn (form, "row", al, ac); - + n_children = 0; for (i = 0; i < left_buttons; i++) { @@ -1140,7 +1140,7 @@ make_dialog (name, parent, pop_up_p, shell_title, icon_name, text_input_slot, XtSetArg (al[ac], XmNmappedWhenManaged, FALSE); ac++; children [n_children] = XmCreateLabel (row, "separator_button", al, ac); n_children++; - + for (i = 0; i < right_buttons; i++) { char button_name [16]; @@ -1152,9 +1152,9 @@ make_dialog (name, parent, pop_up_p, shell_title, icon_name, text_input_slot, if (! button) button = children [n_children]; n_children++; } - + XtManageChildren (children, n_children); - + ac = 0; XtSetArg(al[ac], XmNtopAttachment, XmATTACH_NONE); ac++; XtSetArg(al[ac], XmNbottomAttachment, XmATTACH_WIDGET); ac++; @@ -1250,7 +1250,7 @@ make_dialog (name, parent, pop_up_p, shell_title, icon_name, text_input_slot, list activate the default button */ XtAddCallback (value, XmNdefaultActionCallback, activate_button, button); } - + ac = 0; XtSetArg(al[ac], XmNalignment, XmALIGNMENT_BEGINNING); ac++; XtSetArg(al[ac], XmNtopAttachment, XmATTACH_FORM); ac++; @@ -1265,7 +1265,7 @@ make_dialog (name, parent, pop_up_p, shell_title, icon_name, text_input_slot, XtSetArg(al[ac], XmNrightAttachment, XmATTACH_FORM); ac++; XtSetArg(al[ac], XmNrightOffset, 13); ac++; message = XmCreateLabel (form, "message", al, ac); - + if (list) XtManageChild (value); @@ -1280,7 +1280,7 @@ make_dialog (name, parent, pop_up_p, shell_title, icon_name, text_input_slot, children [i] = icon; i++; children [i] = icon_separator; i++; XtManageChildren (children, i); - + if (text_input_slot || list) { XtInstallAccelerators (value, button); @@ -1291,7 +1291,7 @@ make_dialog (name, parent, pop_up_p, shell_title, icon_name, text_input_slot, XtInstallAccelerators (form, button); XtSetKeyboardFocus (result, button); } - + return result; } @@ -1364,7 +1364,7 @@ recenter_widget (widget) x = (((Position)parent_width) - ((Position)child_width)) / 2; y = (((Position)parent_height) - ((Position)child_height)) / 2; - + XtTranslateCoords (parent, x, y, &x, &y); if (x + child_width > screen_width) @@ -1404,7 +1404,7 @@ recycle_instance (instance) focus = XtNameToWidget (widget, "*button1"); if (focus) XtSetKeyboardFocus (widget, focus); - + /* shrink the separator label back to their original size */ separator = XtNameToWidget (widget, "*separator_button"); if (separator) @@ -1472,7 +1472,7 @@ xm_create_dialog (instance) shell_name = "Question"; break; } - + total_buttons = name [1] - '0'; if (name [3] == 'T' || name [3] == 't') @@ -1482,9 +1482,9 @@ xm_create_dialog (instance) } else if (name [3]) right_buttons = name [4] - '0'; - + left_buttons = total_buttons - right_buttons; - + widget = make_dialog (name, parent, pop_up_p, shell_name, icon_name, text_input_slot, radio_box, list, left_buttons, right_buttons); @@ -1655,7 +1655,7 @@ make_project_display_dialog (widget_instance* instance) #endif /* ENERGIZE */ widget_creation_entry -xm_creation_table [] = +xm_creation_table [] = { {"menubar", make_menubar}, {"popup", make_popup_menu}, @@ -1744,7 +1744,7 @@ xm_popup_menu (widget, event) /* This is so totally ridiculous: there's NO WAY to tell Motif that *any* button can select a menu item. Only one button can have that honor. */ - + char *trans = 0; if (event->xbutton.state & Button5Mask) trans = "<Btn5Down>"; else if (event->xbutton.state & Button4Mask) trans = "<Btn4Down>"; @@ -1754,10 +1754,10 @@ xm_popup_menu (widget, event) if (trans) XtVaSetValues (widget, XmNmenuPost, trans, NULL); } #endif - + XmMenuPosition (widget, (XButtonPressedEvent *) event); } - + XtManageChild (widget); } @@ -1795,12 +1795,12 @@ xm_pop_instance (instance, up) if (up) XtManageChild (widget); else - XtUnmanageChild (widget); + XtUnmanageChild (widget); } } -/* motif callback */ +/* motif callback */ static void do_call (widget, closure, type) @@ -1829,36 +1829,36 @@ do_call (widget, closure, type) user_data = NULL; XtSetArg (al [ac], XmNuserData, &user_data); ac++; XtGetValues (widget, al, ac); - + switch (type) { case pre_activate: if (instance->info->pre_activate_cb) instance->info->pre_activate_cb (widget, id, user_data); break; - + case selection: if (instance->info->selection_cb) instance->info->selection_cb (widget, id, user_data); break; - + case no_selection: if (instance->info->selection_cb) instance->info->selection_cb (widget, id, (XtPointer) -1); break; - + case post_activate: if (instance->info->post_activate_cb) instance->info->post_activate_cb (widget, id, user_data); break; - + default: abort (); } } /* Like lw_internal_update_other_instances except that it does not do - anything if its shell parent is not managed. This is to protect + anything if its shell parent is not managed. This is to protect lw_internal_update_other_instances to dereference freed memory if the widget was ``destroyed'' by caching it in the all_destroyed_instances list */ @@ -1924,7 +1924,7 @@ xm_pull_down_callback (widget, closure, call_data) /* XmNpopdownCallback for MenuShell widgets. WIDGET is the MenuShell, - CLOSURE is a pointer to the widget_instance of the shell, + CLOSURE is a pointer to the widget_instance of the shell, Note that this callback is called for each cascade button in a menu, whether or not its submenu is visible. */ diff --git a/lwlib/lwlib-Xm.h b/lwlib/lwlib-Xm.h index 9d4af609660..79f03139f63 100644 --- a/lwlib/lwlib-Xm.h +++ b/lwlib/lwlib-Xm.h @@ -5,7 +5,7 @@ extern widget_creation_entry xm_creation_table []; -Widget +Widget xm_create_dialog __P ((widget_instance* instance)); Boolean diff --git a/lwlib/lwlib-utils.c b/lwlib/lwlib-utils.c index 5cc39bcca7e..3abff32579a 100644 --- a/lwlib/lwlib-utils.c +++ b/lwlib/lwlib-utils.c @@ -3,13 +3,13 @@ This file is part of the Lucid Widget Library. -The Lucid Widget Library is free software; you can redistribute it and/or +The Lucid Widget Library is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 1, or (at your option) any later version. The Lucid Widget Library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of +but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. @@ -60,7 +60,7 @@ XtNoClearRefreshWidget (widget) } -/* +/* * Apply a function to all the subwidgets of a given widget recursively. */ void @@ -177,7 +177,7 @@ XtSafelyDestroyWidget (widget) } else XtDestroyWidget (widget); - + #else abort (); #endif diff --git a/lwlib/lwlib.c b/lwlib/lwlib.c index 5f68a365935..624c7589084 100644 --- a/lwlib/lwlib.c +++ b/lwlib/lwlib.c @@ -3,13 +3,13 @@ This file is part of the Lucid Widget Library. -The Lucid Widget Library is free software; you can redistribute it and/or +The Lucid Widget Library is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. The Lucid Widget Library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of +but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. @@ -101,7 +101,7 @@ static void destroy_one_instance P_ ((widget_instance *)); static void lw_pop_all_widgets P_ ((LWLIB_ID, Boolean)); static Boolean get_one_value P_ ((widget_instance *, widget_value *)); static void show_one_widget_busy P_ ((Widget, Boolean)); - + void lwlib_memset (address, value, length) char *address; @@ -190,7 +190,7 @@ malloc_widget_value () } /* this is analogous to free(). It frees only what was allocated - by malloc_widget_value(), and no substructures. + by malloc_widget_value(), and no substructures. */ void free_widget_value (wv) @@ -251,7 +251,7 @@ copy_widget_value_tree (val, change) change_type change; { widget_value* copy; - + if (!val) return NULL; if (val == (widget_value *) 1) @@ -523,7 +523,7 @@ merge_widget_value (val1, val2, level, change_p) free_widget_value_tree (val1); return NULL; } - + change = NO_CHANGE; if (safe_strcmp (val1->name, val2->name)) @@ -591,7 +591,7 @@ merge_widget_value (val1, val2, level, change_p) merged_contents = merge_widget_value (val1->contents, val2->contents, level - 1, change_p); - + if (val1->contents && !merged_contents) { /* This used to say INVISIBLE_CHANGE, @@ -614,7 +614,7 @@ merge_widget_value (val1, val2, level, change_p) #endif #endif } - + val1->contents = merged_contents; } @@ -640,7 +640,7 @@ merge_widget_value (val1, val2, level, change_p) val1->this_one_change = this_one_change; val1->change = change; - + if (change > NO_CHANGE && val1->toolkit_data) { *change_p = 1; @@ -672,7 +672,7 @@ name_to_widget (instance, name) char* real_name = (char *) xmalloc (length); real_name [0] = '*'; strcpy (real_name + 1, name); - + widget = XtNameToWidget (instance->widget, real_name); free (real_name); @@ -691,7 +691,7 @@ set_one_value (instance, val, deep_p) #endif { Widget widget = name_to_widget (instance, val->name); - + if (widget) { #if defined (USE_LUCID) @@ -842,11 +842,11 @@ static Boolean dialog_spec_p (name) char* name; { - /* return True if name matches [EILPQeilpq][1-9][Bb] or + /* return True if name matches [EILPQeilpq][1-9][Bb] or [EILPQeilpq][1-9][Bb][Rr][1-9] */ if (!name) return False; - + switch (name [0]) { case 'E': case 'I': case 'L': case 'P': case 'Q': @@ -866,7 +866,7 @@ dialog_spec_p (name) } else return False; - + default: return False; } @@ -908,7 +908,7 @@ instantiate_widget_instance (instance) #endif } } - + if (!function) { printf ("No creation function for widget type %s\n", @@ -924,7 +924,7 @@ instantiate_widget_instance (instance) /* XtRealizeWidget (instance->widget);*/ } -void +void lw_register_widget (type, name, id, val, pre_activate_cb, selection_cb, post_activate_cb, highlight_cb) char* type; @@ -952,7 +952,7 @@ lw_get_widget (id, parent, pop_up_p) #endif { widget_instance* instance; - + instance = find_instance (id, parent, pop_up_p); return instance ? instance->widget : NULL; } @@ -969,7 +969,7 @@ lw_make_widget (id, parent, pop_up_p) { widget_instance* instance; widget_info* info; - + instance = find_instance (id, parent, pop_up_p); if (!instance) { @@ -1009,7 +1009,7 @@ lw_create_widget (type, name, id, val, parent, pop_up_p, pre_activate_cb, post_activate_cb, highlight_cb); return lw_make_widget (id, parent, pop_up_p); } - + /* destroying the widgets */ static void @@ -1046,7 +1046,7 @@ destroy_one_instance (instance) #if defined (USE_XAW) if (lw_xaw_widget_p (instance->widget)) xaw_destroy_instance (instance); - else + else #endif /* do not remove the empty statement */ ; @@ -1060,7 +1060,7 @@ lw_destroy_widget (w) Widget w; { widget_instance* instance = get_widget_instance (w, True); - + if (instance) { widget_info *info = instance->info; @@ -1233,7 +1233,7 @@ get_one_value (instance, val) widget_value* val; { Widget widget = name_to_widget (instance, val->name); - + if (widget) { #if defined (USE_LUCID) @@ -1310,7 +1310,7 @@ lw_get_widget_value_for_widget (instance, w) /* To forbid recursive calls */ static Boolean lwlib_updating; -/* This function can be used as a an XtCallback for the widgets that get +/* This function can be used as a an XtCallback for the widgets that get modified to update other instances of the widgets. Closure should be the widget_instance. */ void @@ -1390,7 +1390,7 @@ show_one_widget_busy (w, flag) Widget widget_to_invert = XtNameToWidget (w, "*sheet"); if (!widget_to_invert) widget_to_invert = w; - + XtVaGetValues (widget_to_invert, XtNforeground, &foreground, XtNbackground, &background, @@ -1438,7 +1438,7 @@ lw_refigure_widget (w, doit) Boolean doit; #endif { -#if defined (USE_XAW) +#if defined (USE_XAW) XawPanedSetRefigureMode (w, doit); #endif #if defined (USE_MOTIF) diff --git a/lwlib/lwlib.h b/lwlib/lwlib.h index bf2a9c67bdf..08aecd3e57b 100644 --- a/lwlib/lwlib.h +++ b/lwlib/lwlib.h @@ -5,12 +5,12 @@ /* ** Widget values depend on the Widget type: -** +** ** widget: (name value key enabled data contents/selected) ** ** label: ("name" "string" NULL NULL NULL NULL) ** button: ("name" "string" "key" T/F data <default-button-p>) -** button w/menu: +** button w/menu: ** ("name" "string" "key" T/F data (label|button|button w/menu...)) ** menubar: ("name" NULL NULL T/F data (button w/menu)) ** selectable thing: @@ -67,7 +67,7 @@ typedef struct _widget_value char* name; /* value (meaning depend on widget type) */ char* value; - /* keyboard equivalent. no implications for XtTranslations */ + /* keyboard equivalent. no implications for XtTranslations */ char* key; /* Help string or nil if none. GC finds this string through the frame's menu_bar_vector diff --git a/lwlib/xlwmenu.c b/lwlib/xlwmenu.c index fc3abef503b..e7c783596f9 100644 --- a/lwlib/xlwmenu.c +++ b/lwlib/xlwmenu.c @@ -1243,7 +1243,7 @@ xlwmenu_window_p (w, window) { XlwMenuWidget mw = (XlwMenuWidget) w; int i; - + for (i = 0; i < mw->menu.windows_length; ++i) if (window == mw->menu.windows[i].window) break; |