Thu Apr 9 18:36:31 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkmisc.c gdk/gdkwindow gtk/gtkentry.c gtk/testgtk.c:
Picky --enable-ansi cleanups.
* gtk/gtkstatusbar.c (gtk_statusbar_pop): Pop top message
off _belonging_to_this_context_. (gtk-d4bjorn-980409-0)
From "Damon Chaplin" <DAChaplin@email.msn.com>
* gtk/gtktable.c (gtk_table_size_request_pass3): Small fix to size
requisition code.
* gtk/gtknotebook.c: Make sure not to do things to page->tab_label
if it doesn't exist.
16 files changed:
+Thu Apr 9 18:36:31 1998 Owen Taylor <owt1@cornell.edu>
+
+ * gtk/gtkmisc.c gdk/gdkwindow gtk/gtkentry.c gtk/testgtk.c:
+ Picky --enable-ansi cleanups.
+
+ * gtk/gtkstatusbar.c (gtk_statusbar_pop): Pop top message
+ off _belonging_to_this_context_. (gtk-d4bjorn-980409-0)
+
+ From "Damon Chaplin" <DAChaplin@email.msn.com>
+
+ * gtk/gtktable.c (gtk_table_size_request_pass3): Small fix to size
+ requisition code.
+
+ * gtk/gtknotebook.c: Make sure not to do things to page->tab_label
+ if it doesn't exist.
+
Thu Apr 9 14:24:35 1998 Owen Taylor <owt1@cornell.edu>
(Found by Mattias.Gronlund" <Mattias.Gronlund@sa.erisoft.se>)
Thu Apr 9 14:24:35 1998 Owen Taylor <owt1@cornell.edu>
(Found by Mattias.Gronlund" <Mattias.Gronlund@sa.erisoft.se>)
+Thu Apr 9 18:36:31 1998 Owen Taylor <owt1@cornell.edu>
+
+ * gtk/gtkmisc.c gdk/gdkwindow gtk/gtkentry.c gtk/testgtk.c:
+ Picky --enable-ansi cleanups.
+
+ * gtk/gtkstatusbar.c (gtk_statusbar_pop): Pop top message
+ off _belonging_to_this_context_. (gtk-d4bjorn-980409-0)
+
+ From "Damon Chaplin" <DAChaplin@email.msn.com>
+
+ * gtk/gtktable.c (gtk_table_size_request_pass3): Small fix to size
+ requisition code.
+
+ * gtk/gtknotebook.c: Make sure not to do things to page->tab_label
+ if it doesn't exist.
+
Thu Apr 9 14:24:35 1998 Owen Taylor <owt1@cornell.edu>
(Found by Mattias.Gronlund" <Mattias.Gronlund@sa.erisoft.se>)
Thu Apr 9 14:24:35 1998 Owen Taylor <owt1@cornell.edu>
(Found by Mattias.Gronlund" <Mattias.Gronlund@sa.erisoft.se>)
+Thu Apr 9 18:36:31 1998 Owen Taylor <owt1@cornell.edu>
+
+ * gtk/gtkmisc.c gdk/gdkwindow gtk/gtkentry.c gtk/testgtk.c:
+ Picky --enable-ansi cleanups.
+
+ * gtk/gtkstatusbar.c (gtk_statusbar_pop): Pop top message
+ off _belonging_to_this_context_. (gtk-d4bjorn-980409-0)
+
+ From "Damon Chaplin" <DAChaplin@email.msn.com>
+
+ * gtk/gtktable.c (gtk_table_size_request_pass3): Small fix to size
+ requisition code.
+
+ * gtk/gtknotebook.c: Make sure not to do things to page->tab_label
+ if it doesn't exist.
+
Thu Apr 9 14:24:35 1998 Owen Taylor <owt1@cornell.edu>
(Found by Mattias.Gronlund" <Mattias.Gronlund@sa.erisoft.se>)
Thu Apr 9 14:24:35 1998 Owen Taylor <owt1@cornell.edu>
(Found by Mattias.Gronlund" <Mattias.Gronlund@sa.erisoft.se>)
+Thu Apr 9 18:36:31 1998 Owen Taylor <owt1@cornell.edu>
+
+ * gtk/gtkmisc.c gdk/gdkwindow gtk/gtkentry.c gtk/testgtk.c:
+ Picky --enable-ansi cleanups.
+
+ * gtk/gtkstatusbar.c (gtk_statusbar_pop): Pop top message
+ off _belonging_to_this_context_. (gtk-d4bjorn-980409-0)
+
+ From "Damon Chaplin" <DAChaplin@email.msn.com>
+
+ * gtk/gtktable.c (gtk_table_size_request_pass3): Small fix to size
+ requisition code.
+
+ * gtk/gtknotebook.c: Make sure not to do things to page->tab_label
+ if it doesn't exist.
+
Thu Apr 9 14:24:35 1998 Owen Taylor <owt1@cornell.edu>
(Found by Mattias.Gronlund" <Mattias.Gronlund@sa.erisoft.se>)
Thu Apr 9 14:24:35 1998 Owen Taylor <owt1@cornell.edu>
(Found by Mattias.Gronlund" <Mattias.Gronlund@sa.erisoft.se>)
+Thu Apr 9 18:36:31 1998 Owen Taylor <owt1@cornell.edu>
+
+ * gtk/gtkmisc.c gdk/gdkwindow gtk/gtkentry.c gtk/testgtk.c:
+ Picky --enable-ansi cleanups.
+
+ * gtk/gtkstatusbar.c (gtk_statusbar_pop): Pop top message
+ off _belonging_to_this_context_. (gtk-d4bjorn-980409-0)
+
+ From "Damon Chaplin" <DAChaplin@email.msn.com>
+
+ * gtk/gtktable.c (gtk_table_size_request_pass3): Small fix to size
+ requisition code.
+
+ * gtk/gtknotebook.c: Make sure not to do things to page->tab_label
+ if it doesn't exist.
+
Thu Apr 9 14:24:35 1998 Owen Taylor <owt1@cornell.edu>
(Found by Mattias.Gronlund" <Mattias.Gronlund@sa.erisoft.se>)
Thu Apr 9 14:24:35 1998 Owen Taylor <owt1@cornell.edu>
(Found by Mattias.Gronlund" <Mattias.Gronlund@sa.erisoft.se>)
+Thu Apr 9 18:36:31 1998 Owen Taylor <owt1@cornell.edu>
+
+ * gtk/gtkmisc.c gdk/gdkwindow gtk/gtkentry.c gtk/testgtk.c:
+ Picky --enable-ansi cleanups.
+
+ * gtk/gtkstatusbar.c (gtk_statusbar_pop): Pop top message
+ off _belonging_to_this_context_. (gtk-d4bjorn-980409-0)
+
+ From "Damon Chaplin" <DAChaplin@email.msn.com>
+
+ * gtk/gtktable.c (gtk_table_size_request_pass3): Small fix to size
+ requisition code.
+
+ * gtk/gtknotebook.c: Make sure not to do things to page->tab_label
+ if it doesn't exist.
+
Thu Apr 9 14:24:35 1998 Owen Taylor <owt1@cornell.edu>
(Found by Mattias.Gronlund" <Mattias.Gronlund@sa.erisoft.se>)
Thu Apr 9 14:24:35 1998 Owen Taylor <owt1@cornell.edu>
(Found by Mattias.Gronlund" <Mattias.Gronlund@sa.erisoft.se>)
+Thu Apr 9 18:36:31 1998 Owen Taylor <owt1@cornell.edu>
+
+ * gtk/gtkmisc.c gdk/gdkwindow gtk/gtkentry.c gtk/testgtk.c:
+ Picky --enable-ansi cleanups.
+
+ * gtk/gtkstatusbar.c (gtk_statusbar_pop): Pop top message
+ off _belonging_to_this_context_. (gtk-d4bjorn-980409-0)
+
+ From "Damon Chaplin" <DAChaplin@email.msn.com>
+
+ * gtk/gtktable.c (gtk_table_size_request_pass3): Small fix to size
+ requisition code.
+
+ * gtk/gtknotebook.c: Make sure not to do things to page->tab_label
+ if it doesn't exist.
+
Thu Apr 9 14:24:35 1998 Owen Taylor <owt1@cornell.edu>
(Found by Mattias.Gronlund" <Mattias.Gronlund@sa.erisoft.se>)
Thu Apr 9 14:24:35 1998 Owen Taylor <owt1@cornell.edu>
(Found by Mattias.Gronlund" <Mattias.Gronlund@sa.erisoft.se>)
Display *disp;
Window *list=NULL;
Window child=0,parent_win=0,root_win=0;
Display *disp;
Window *list=NULL;
Window child=0,parent_win=0,root_win=0;
window=(GdkWindow*)&gdk_root_parent;
private=(GdkWindowPrivate*)window;
disp=private->xdisplay;
window=(GdkWindow*)&gdk_root_parent;
private=(GdkWindowPrivate*)window;
disp=private->xdisplay;
Display *disp;
Window *list=NULL;
Window child=0,parent_win=0,root_win=0;
Display *disp;
Window *list=NULL;
Window child=0,parent_win=0,root_win=0;
window=(GdkWindow*)&gdk_root_parent;
private=(GdkWindowPrivate*)window;
disp=private->xdisplay;
window=(GdkWindow*)&gdk_root_parent;
private=(GdkWindowPrivate*)window;
disp=private->xdisplay;
{
case STRING:
selection_data->data[selection_data->length] = 0;
{
case STRING:
selection_data->data[selection_data->length] = 0;
- gtk_editable_insert_text (editable, selection_data->data,
+ gtk_editable_insert_text (editable, (gchar *)selection_data->data,
strlen ((gchar *)selection_data->data),
&tmp_pos);
editable->current_pos = tmp_pos;
strlen ((gchar *)selection_data->data),
&tmp_pos);
editable->current_pos = tmp_pos;
ARG_XALIGN,
ARG_YALIGN,
ARG_XPAD,
ARG_XALIGN,
ARG_YALIGN,
ARG_XPAD,
};
static void gtk_misc_class_init (GtkMiscClass *klass);
};
static void gtk_misc_class_init (GtkMiscClass *klass);
page = children->data;
children = children->next;
if (page->default_tab)
page = children->data;
children = children->next;
if (page->default_tab)
- gtk_widget_destroy (page->tab_label);
+ {
+ gtk_widget_destroy (page->tab_label);
+ page->tab_label = NULL;
+ }
else
gtk_widget_hide (page->tab_label);
}
else
gtk_widget_hide (page->tab_label);
}
page = children->data;
if (GTK_WIDGET_VISIBLE (page->child) &&
page = children->data;
if (GTK_WIDGET_VISIBLE (page->child) &&
- GTK_WIDGET_MAPPED (page->tab_label) &&
+ page->tab_label && GTK_WIDGET_MAPPED (page->tab_label) &&
(event->x >= page->allocation.x) &&
(event->y >= page->allocation.y) &&
(event->x <= (page->allocation.x + page->allocation.width)) &&
(event->x >= page->allocation.x) &&
(event->y >= page->allocation.y) &&
(event->x <= (page->allocation.x + page->allocation.width)) &&
page = children->data;
children = children->next;
page = children->data;
children = children->next;
- if (GTK_WIDGET_MAPPED (page->tab_label))
+ if (page->tab_label && GTK_WIDGET_MAPPED (page->tab_label))
gtk_widget_unmap (page->tab_label);
}
gtk_widget_unmap (page->tab_label);
}
page = children->data;
children = children->next;
page = children->data;
children = children->next;
- if (GTK_WIDGET_MAPPED (page->tab_label))
+ if (page->tab_label && GTK_WIDGET_MAPPED (page->tab_label))
gtk_widget_unmap (page->tab_label);
}
}
gtk_widget_unmap (page->tab_label);
}
}
}
if (GTK_WIDGET_REALIZED (notebook) &&
}
if (GTK_WIDGET_REALIZED (notebook) &&
- !GTK_WIDGET_MAPPED (page->tab_label))
+ page->tab_label && !GTK_WIDGET_MAPPED (page->tab_label))
gtk_widget_map (page->tab_label);
}
}
gtk_widget_map (page->tab_label);
}
}
- gtk_widget_size_allocate (page->tab_label, &child_allocation);
+ if (page->tab_label)
+ gtk_widget_size_allocate (page->tab_label, &child_allocation);
if (statusbar->messages)
{
GSList *list;
if (statusbar->messages)
{
GSList *list;
- GtkStatusbarClass *class;
- list = statusbar->messages;
- msg = list->data;
- class = GTK_STATUSBAR_CLASS (GTK_OBJECT (statusbar)->klass);
-
- statusbar->messages = g_slist_remove_link (statusbar->messages, list);
- g_free (msg->text);
- g_mem_chunk_free (class->messages_mem_chunk, msg);
- g_slist_free_1 (list);
+ for (list = statusbar->messages; list; list = list->next)
+ {
+ msg = list->data;
+
+ if (msg->context_id == context_id)
+ {
+ GtkStatusbarClass *class;
+
+ class = GTK_STATUSBAR_CLASS (GTK_OBJECT (statusbar)->klass);
+
+ statusbar->messages = g_slist_remove_link (statusbar->messages,
+ list);
+ g_free (msg->text);
+ g_mem_chunk_free (class->messages_mem_chunk, msg);
+ g_slist_free_1 (list);
+ break;
+ }
+ }
}
msg = statusbar->messages ? statusbar->messages->data : NULL;
}
msg = statusbar->messages ? statusbar->messages->data : NULL;
* its requisition, then divide up the needed space evenly
* amongst the columns it spans.
*/
* its requisition, then divide up the needed space evenly
* amongst the columns it spans.
*/
- if (width < child->widget->requisition.width)
+ if (width < child->widget->requisition.width + child->xpadding * 2)
- width = child->widget->requisition.width - width;
+ width = child->widget->requisition.width + child->xpadding * 2 - width;
for (col = child->left_attach; col < child->right_attach; col++)
{
for (col = child->left_attach; col < child->right_attach; col++)
{
* its requisition, then divide up the needed space evenly
* amongst the columns it spans.
*/
* its requisition, then divide up the needed space evenly
* amongst the columns it spans.
*/
- if (height < child->widget->requisition.height)
+ if (height < child->widget->requisition.height + child->ypadding * 2)
- height = child->widget->requisition.height - height;
+ height = child->widget->requisition.height + child->ypadding * 2 - height;
for (row = child->top_attach; row < child->bottom_attach; row++)
{
for (row = child->top_attach; row < child->bottom_attach; row++)
{
child = gtk_label_new ("Test");
gtk_widget_ref (child);
child = gtk_label_new ("Test");
gtk_widget_ref (child);
- gtk_object_sink (child);
+ gtk_object_sink (GTK_OBJECT (child));
if (add_remove)
gtk_container_add (GTK_CONTAINER (clist), child);
if (add_remove)
gtk_container_add (GTK_CONTAINER (clist), child);
child = gtk_label_new ("Test");
gtk_widget_ref (child);
child = gtk_label_new ("Test");
gtk_widget_ref (child);
- gtk_object_sink (child);
+ gtk_object_sink (GTK_OBJECT (child));
if (add_remove)
gtk_container_add (GTK_CONTAINER (clist), child);
if (add_remove)
gtk_container_add (GTK_CONTAINER (clist), child);