Commit 7ef3956a authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

(instantiate_widget_instance): Renamed from

instanciate_widget_instance (spelling correction).
All callers changed.

(merge_widget_value): Treat disappearance of entire contents
as a STRUCTURAL_CHANGE.
parent 1982da71
...@@ -74,7 +74,7 @@ char *lwlib_toolkit_type = "lucid"; ...@@ -74,7 +74,7 @@ char *lwlib_toolkit_type = "lucid";
#endif #endif
/* Forward declarations */ /* Forward declarations */
static void static void
instanciate_widget_instance (/* widget_instance* instance */); instantiate_widget_instance (/* widget_instance* instance */);
lwlib_memset (address, value, length) lwlib_memset (address, value, length)
char *address; char *address;
...@@ -161,7 +161,7 @@ malloc_widget_value () ...@@ -161,7 +161,7 @@ malloc_widget_value ()
return wv; return wv;
} }
/* this is analagous to free(). It frees only what was allocated /* 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 void
...@@ -310,7 +310,7 @@ allocate_widget_instance (info, parent, pop_up_p) ...@@ -310,7 +310,7 @@ allocate_widget_instance (info, parent, pop_up_p)
instance->next = info->instances; instance->next = info->instances;
info->instances = instance; info->instances = instance;
instanciate_widget_instance (instance); instantiate_widget_instance (instance);
XtAddCallback (instance->widget, XtNdestroyCallback, XtAddCallback (instance->widget, XtNdestroyCallback,
mark_widget_destroyed, (XtPointer)instance); mark_widget_destroyed, (XtPointer)instance);
...@@ -510,9 +510,14 @@ merge_widget_value (val1, val2, level) ...@@ -510,9 +510,14 @@ merge_widget_value (val1, val2, level)
if (val1->contents && !merged_contents) if (val1->contents && !merged_contents)
{ {
EXPLAIN (val1->name, change, INVISIBLE_CHANGE, "(contents gone)", /* This used to say INVISIBLE_CHANGE,
but it is visible and vitally important when
the contents of the menu bar itself are entirely deleted.
But maybe it doesn't matter. This fails to fix the bug. */
EXPLAIN (val1->name, change, STRUCTURAL_CHANGE, "(contents gone)",
0, 0); 0, 0);
change = max (change, INVISIBLE_CHANGE); change = max (change, STRUCTURAL_CHANGE);
} }
else if (merged_contents && merged_contents->change != NO_CHANGE) else if (merged_contents && merged_contents->change != NO_CHANGE)
{ {
...@@ -759,7 +764,7 @@ dialog_spec_p (name) ...@@ -759,7 +764,7 @@ dialog_spec_p (name)
} }
static void static void
instanciate_widget_instance (instance) instantiate_widget_instance (instance)
widget_instance* instance; widget_instance* instance;
{ {
widget_creation_function function = NULL; widget_creation_function function = NULL;
......
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