applied gtk-shige-980311-0.patch.gz, which removes the erronerous

Thu Mar 12 07:43:33 1998  Tim Janik  <timj@gimp.org>

        * gdk/gdk.h:
        * gdk/gdkvisual.c: applied gtk-shige-980311-0.patch.gz, which removes
        the erronerous gdk_query_visuals() function in favour of
        gdk_list_visuals() which does a correct job.

        * gtk/gtkcontainer.h: applied gtk-draco-980311-0.patch.gz which fixes
        a class cast check.

        * gtk/gtkspinbutton.c: applied gtk-hamann_jeske-980312-0.patch.gz about
        '+' sign acceptance.

        * gtk/gtknotebook.c: applied gtk-hamann_jeske-980311-1.patch.gz which
        cares about delayed tab label creation.

8 files changed, 87 insertions, 46 deletions

diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c
index 7fdb571784..64b7cdfe9f 100644
--- a/gtk/gtkclist.c
+++ b/gtk/gtkclist.c
@@ -1398,11 +1398,11 @@ sync_selection (GtkCList * clist,
         switch (mode)
           {
           case SYNC_INSERT:
-            (gint) list->data = (gint) list->data + 1;
+            list->data = ((gchar*) list->data) + 1;
             break;
 
           case SYNC_REMOVE:
-            (gint) list->data = (gint) list->data - 1;
+            list->data = ((gchar*) list->data) - 1;
             break;
 
           default:
diff --git a/gtk/gtkcontainer.h b/gtk/gtkcontainer.h
index 3585d20e4b..711ff0a482 100644
--- a/gtk/gtkcontainer.h
+++ b/gtk/gtkcontainer.h
@@ -30,7 +30,7 @@ extern "C" {
 
 
 #define GTK_CONTAINER(obj)          (GTK_CHECK_CAST ((obj), gtk_container_get_type (), GtkContainer))
-#define GTK_CONTAINER_CLASS(klass)  (GTK_CHECK_CLASS_CAST ((klass), gtk_container_get_type, GtkContainerClass))
+#define GTK_CONTAINER_CLASS(klass)  (GTK_CHECK_CLASS_CAST ((klass), gtk_container_get_type (), GtkContainerClass))
 #define GTK_IS_CONTAINER(obj)       (GTK_CHECK_TYPE ((obj), gtk_container_get_type ()))
 
 #define GTK_TYPE_CONTAINER          (gtk_container_get_type ())
diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index e622069553..981ea87a4f 100644
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -360,8 +360,9 @@ gtk_notebook_insert_page_menu (GtkNotebook *notebook,
 
   if (!tab_label)
     {
-      tab_label = gtk_label_new ("");
       page->default_tab = TRUE;
+      if (notebook->show_tabs)
+	tab_label = gtk_label_new ("");
     }
   page->tab_label = tab_label;
   page->menu_label = menu_label;
@@ -387,8 +388,11 @@ gtk_notebook_insert_page_menu (GtkNotebook *notebook,
     notebook->focus_tab = notebook->children;
 
   gtk_widget_set_parent (child, GTK_WIDGET (notebook));
-  gtk_widget_set_parent (tab_label, GTK_WIDGET (notebook));
-  gtk_widget_show (tab_label);
+  if (tab_label)
+    {
+      gtk_widget_set_parent (tab_label, GTK_WIDGET (notebook));
+      gtk_widget_show (tab_label);
+    }
 
   if (!notebook->cur_page)
     gtk_notebook_switch_page (notebook, page, 0);
@@ -403,13 +407,16 @@ gtk_notebook_insert_page_menu (GtkNotebook *notebook,
 	  !GTK_WIDGET_MAPPED (child) && notebook->cur_page == page)
 	gtk_widget_map (child);
 
-      if (GTK_WIDGET_REALIZED (notebook) &&
-	  !GTK_WIDGET_REALIZED (tab_label))
-	gtk_widget_realize (tab_label);
+      if (tab_label)
+	{
+	  if (GTK_WIDGET_REALIZED (notebook) &&
+	      !GTK_WIDGET_REALIZED (tab_label))
+	    gtk_widget_realize (tab_label);
       
-      if (GTK_WIDGET_MAPPED (notebook) &&
-	  !GTK_WIDGET_MAPPED (tab_label))
-	gtk_widget_map (tab_label);
+	  if (GTK_WIDGET_MAPPED (notebook) &&
+	      !GTK_WIDGET_MAPPED (tab_label))
+	    gtk_widget_map (tab_label);
+	}
     }
 
   if (GTK_WIDGET_VISIBLE (child) && GTK_WIDGET_VISIBLE (notebook))
@@ -511,11 +518,14 @@ gtk_notebook_real_remove (GtkNotebook *notebook,
   page = list->data;
   
   if ((GTK_WIDGET_VISIBLE (page->child) || 
-       GTK_WIDGET_VISIBLE (page->tab_label)) && GTK_WIDGET_VISIBLE (notebook))
+       (page->tab_label && GTK_WIDGET_VISIBLE (page->tab_label))) 
+       && GTK_WIDGET_VISIBLE (notebook))
     need_resize = TRUE;
 
   gtk_widget_unparent (page->child);
-  gtk_widget_unparent (page->tab_label);
+
+  if (page->tab_label)
+    gtk_widget_unparent (page->tab_label);
 
   if (notebook->menu)
     {
@@ -766,7 +776,7 @@ gtk_notebook_set_show_tabs (GtkNotebook *notebook,
   g_return_if_fail (notebook != NULL);
   g_return_if_fail (GTK_IS_NOTEBOOK (notebook));
 
-  if (notebook->show_tabs == show_tabs || !GTK_WIDGET_VISIBLE (notebook))
+  if (notebook->show_tabs == show_tabs)
     return;
 
   notebook->show_tabs = show_tabs;
@@ -780,7 +790,10 @@ gtk_notebook_set_show_tabs (GtkNotebook *notebook,
 	{
 	  page = children->data;
 	  children = children->next;
-	  gtk_widget_hide (page->tab_label);
+	  if (page->default_tab)
+	    gtk_widget_destroy (page->tab_label);
+	  else
+	    gtk_widget_hide (page->tab_label);
 	}
       
       if (notebook->panel)
@@ -788,13 +801,23 @@ gtk_notebook_set_show_tabs (GtkNotebook *notebook,
     }
   else
     {
+      gchar string[32];
+      gint i = 1;
+      
       GTK_WIDGET_SET_FLAGS (notebook, GTK_CAN_FOCUS);
-
+      
       while (children)
 	{
 	  page = children->data;
 	  children = children->next;
+	  if (page->default_tab)
+	    {
+	      sprintf (string, "Page %d", i);
+	      page->tab_label = gtk_label_new (string);
+	      gtk_widget_set_parent (page->tab_label, GTK_WIDGET (notebook));
+	    }
 	  gtk_widget_show (page->tab_label);
+	  i++;
 	}
     }
   gtk_widget_queue_resize (GTK_WIDGET (notebook));
@@ -867,7 +890,8 @@ gtk_notebook_map (GtkWidget *widget)
 	  page = children->data;
 	  children = children->next;
 
-	  if (GTK_WIDGET_VISIBLE (page->child) &&
+	  if (page->tab_label && 
+	      GTK_WIDGET_VISIBLE (page->child) && 
 	      !GTK_WIDGET_MAPPED (page->tab_label))
 	    gtk_widget_map (page->tab_label);
 	}
@@ -882,8 +906,8 @@ gtk_notebook_unmap (GtkWidget *widget)
 
   GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
   gdk_window_hide (widget->window);
-  if (GTK_NOTEBOOK(widget)->panel)
-    gdk_window_hide (GTK_NOTEBOOK(widget)->panel);
+  if (GTK_NOTEBOOK (widget)->panel)
+    gdk_window_hide (GTK_NOTEBOOK (widget)->panel);
 }
 
 static void
@@ -1477,7 +1501,7 @@ gtk_notebook_button_press (GtkWidget      *widget,
 		}
 	    }
 	  else if (event->button == 2)
-	    gtk_notebook_page_select (GTK_NOTEBOOK(widget));
+	    gtk_notebook_page_select (GTK_NOTEBOOK (widget));
 	  else if (event->button == 3)
 	    gtk_notebook_switch_focus_tab (notebook, notebook->children);
 	  gtk_notebook_draw_arrow (notebook, GTK_ARROW_LEFT);
@@ -1497,7 +1521,7 @@ gtk_notebook_button_press (GtkWidget      *widget,
 		}
 	    }      
 	  else if (event->button == 2)
-	    gtk_notebook_page_select (GTK_NOTEBOOK(widget));
+	    gtk_notebook_page_select (GTK_NOTEBOOK (widget));
 	  else if (event->button == 3)
 	    gtk_notebook_switch_focus_tab (notebook, 
 					   g_list_last (notebook->children));
@@ -2606,7 +2630,7 @@ gtk_notebook_focus (GtkContainer     *container,
   g_return_val_if_fail (container != NULL, FALSE);
   g_return_val_if_fail (GTK_IS_NOTEBOOK (container), FALSE);
 
-  notebook = GTK_NOTEBOOK(container);
+  notebook = GTK_NOTEBOOK (container);
 
   if (!GTK_WIDGET_SENSITIVE (container) || !notebook->children)
     return FALSE;
@@ -2816,7 +2840,7 @@ gtk_notebook_key_press (GtkWidget   *widget,
       return TRUE;
     case GDK_Return:
     case GDK_space:
-      gtk_notebook_page_select (GTK_NOTEBOOK(widget));
+      gtk_notebook_page_select (GTK_NOTEBOOK (widget));
       return TRUE;
     default:
       return_val = FALSE;
@@ -2855,7 +2879,7 @@ gtk_notebook_update_labels (GtkNotebook *notebook,
       page = list->data;
       list = list->next;
       sprintf (string, "Page %d", page_num);
-      if (page->default_tab)
+      if (notebook->show_tabs && page->default_tab)
 	gtk_label_set (GTK_LABEL (page->tab_label), string);
       if (notebook->menu && page->default_menu)
 	gtk_label_set (GTK_LABEL (page->menu_label), string);
@@ -2872,7 +2896,7 @@ gtk_notebook_menu_item_create (GtkNotebook     *notebook,
 
   if (page->default_menu)
     {
-      if (GTK_IS_LABEL (page->tab_label))
+      if (page->tab_label && GTK_IS_LABEL (page->tab_label))
 	page->menu_label = gtk_label_new (GTK_LABEL (page->tab_label)->label);
       else
 	page->menu_label = gtk_label_new ("");
diff --git a/gtk/gtkobject.c b/gtk/gtkobject.c
index 4eeeb922a6..52990edfe0 100644
--- a/gtk/gtkobject.c
+++ b/gtk/gtkobject.c
@@ -1060,7 +1060,7 @@ gtk_object_set_data_full (GtkObject        *object,
       if (!id)
 	{
 	  id = gtk_object_data_id_alloc ();
-	  g_hash_table_insert (object_data_ht, (gpointer) key, id);
+	  g_hash_table_insert (object_data_ht, (gpointer) g_strdup (key), id);
 	}
 
       odata = object->object_data;
diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c
index beffd0a9c5..db6149fa1a 100644
--- a/gtk/gtkspinbutton.c
+++ b/gtk/gtkspinbutton.c
@@ -1049,14 +1049,28 @@ gtk_spin_button_insert_text (GtkEditable *editable,
   if (spin->numeric)
     {
       struct lconv *lc;
-      gboolean minus;
+      gboolean sign;
       gint dotpos = -1;
       gint i;
+      gchar pos_sign;
+      gchar neg_sign;
 
       lc = localeconv ();
 
-      minus = (strchr (entry->text, *(lc->negative_sign)) != 0) ;
-      if (minus && !(*position))
+      if (*(lc->negative_sign))
+	neg_sign = *(lc->negative_sign);
+      else 
+	neg_sign = '-';
+
+      if (*(lc->positive_sign))
+	pos_sign = *(lc->positive_sign);
+      else 
+	pos_sign = '+';
+
+      sign = ((strchr (entry->text, neg_sign) != 0) ||
+	      (strchr (entry->text, pos_sign) != 0));
+
+      if (sign && !(*position))
 	return;
 
       dotpos = strchr (entry->text, *(lc->decimal_point)) - entry->text;
@@ -1067,11 +1081,11 @@ gtk_spin_button_insert_text (GtkEditable *editable,
 
       for (i = 0; i < new_text_length; i++)
 	{
-	  if (new_text[i] == *(lc->negative_sign))
+	  if (new_text[i] == neg_sign || new_text[i] == pos_sign)
 	    {
-	      if (minus || (*position) || i)
+	      if (sign || (*position) || i)
 		return;
-	      minus = TRUE;
+	      sign = TRUE;
 	    }
 	  else if (new_text[i] == *(lc->decimal_point))
 	    {
diff --git a/gtk/gtkstatusbar.c b/gtk/gtkstatusbar.c
index 782f5718cd..66af6f4406 100644
--- a/gtk/gtkstatusbar.c
+++ b/gtk/gtkstatusbar.c
@@ -335,6 +335,11 @@ gtk_statusbar_destroy (GtkObject *object)
   g_slist_free (statusbar->messages);
   statusbar->messages = NULL;
 
+  for (list = statusbar->keys; list; list = list->next)
+    g_free (list->data);
+  g_slist_free (statusbar->keys);
+  statusbar->keys = NULL;
+
   GTK_OBJECT_CLASS (parent_class)->destroy (object);
 }
 
@@ -349,10 +354,5 @@ gtk_statusbar_finalize (GtkObject *object)
 
   statusbar = GTK_STATUSBAR (object);
 
-  for (list = statusbar->keys; list; list = list->next)
-    g_free (list->data);
-  g_slist_free (statusbar->messages);
-  statusbar->keys = NULL;
-
   GTK_OBJECT_CLASS (parent_class)->finalize (object);
 }
diff --git a/gtk/gtktree.c b/gtk/gtktree.c
index 28b93dda7a..acfbfb53dd 100644
--- a/gtk/gtktree.c
+++ b/gtk/gtktree.c
@@ -586,10 +586,13 @@ gtk_tree_map (GtkWidget *widget)
 	  !GTK_WIDGET_MAPPED (child))
 	gtk_widget_map (child);
 
-      if ((child = GTK_WIDGET(GTK_TREE_ITEM(child)->subtree)) &&
-	  GTK_WIDGET_VISIBLE (child) &&
-	  !GTK_WIDGET_MAPPED (child))
-	gtk_widget_map (child);
+      if (GTK_TREE_ITEM (child)->subtree)
+	{
+	  child = GTK_WIDGET (GTK_TREE_ITEM (child)->subtree);
+
+	  if (GTK_WIDGET_VISIBLE (child) && !GTK_WIDGET_MAPPED (child))
+	    gtk_widget_map (child);
+	}
     }
 }
 
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index d0d42c148e..0a473d913e 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -1553,9 +1553,9 @@ gtk_widget_draw (GtkWidget    *widget,
 		 GdkRectangle *area)
 {
   GdkRectangle temp_area;
-  
+
   g_return_if_fail (widget != NULL);
-  
+
   if (GTK_WIDGET_DRAWABLE (widget) &&
       !GTK_WIDGET_REDRAW_PENDING (widget))
     {
@@ -1571,12 +1571,12 @@ gtk_widget_draw (GtkWidget    *widget,
 	      temp_area.x = 0;
 	      temp_area.y = 0;
 	    }
-	  
+
 	  temp_area.width = widget->allocation.width;
 	  temp_area.height = widget->allocation.height;
 	  area = &temp_area;
 	}
-      
+
       gtk_signal_emit (GTK_OBJECT (widget), widget_signals[DRAW], area);
     }
 }