Delay the call to gtk_tooltips_layout_text() until later.

Thu Sep 16 21:32:01 1999  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtktooltips.c (gtk_tooltips_set_tip): Delay
	the call to gtk_tooltips_layout_text() until later.

	* gtk/gtktooltips.c (gtk_tooltips_draw_tips):
	Call gtk_widget_ensure_style() before using the style.

8 files changed, 61 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index a3e8d32da..4253b934c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Thu Sep 16 21:32:01 1999  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtktooltips.c (gtk_tooltips_set_tip): Delay
+	the call to gtk_tooltips_layout_text() until later.
+
+	* gtk/gtktooltips.c (gtk_tooltips_draw_tips):
+	Call gtk_widget_ensure_style() before using the style.
+
 Wed Sep 15 02:52:19 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkwidget.c (gtk_widget_event): Added workaround
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index a3e8d32da..4253b934c 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,11 @@
+Thu Sep 16 21:32:01 1999  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtktooltips.c (gtk_tooltips_set_tip): Delay
+	the call to gtk_tooltips_layout_text() until later.
+
+	* gtk/gtktooltips.c (gtk_tooltips_draw_tips):
+	Call gtk_widget_ensure_style() before using the style.
+
 Wed Sep 15 02:52:19 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkwidget.c (gtk_widget_event): Added workaround
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index a3e8d32da..4253b934c 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+Thu Sep 16 21:32:01 1999  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtktooltips.c (gtk_tooltips_set_tip): Delay
+	the call to gtk_tooltips_layout_text() until later.
+
+	* gtk/gtktooltips.c (gtk_tooltips_draw_tips):
+	Call gtk_widget_ensure_style() before using the style.
+
 Wed Sep 15 02:52:19 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkwidget.c (gtk_widget_event): Added workaround
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index a3e8d32da..4253b934c 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+Thu Sep 16 21:32:01 1999  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtktooltips.c (gtk_tooltips_set_tip): Delay
+	the call to gtk_tooltips_layout_text() until later.
+
+	* gtk/gtktooltips.c (gtk_tooltips_draw_tips):
+	Call gtk_widget_ensure_style() before using the style.
+
 Wed Sep 15 02:52:19 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkwidget.c (gtk_widget_event): Added workaround
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index a3e8d32da..4253b934c 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+Thu Sep 16 21:32:01 1999  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtktooltips.c (gtk_tooltips_set_tip): Delay
+	the call to gtk_tooltips_layout_text() until later.
+
+	* gtk/gtktooltips.c (gtk_tooltips_draw_tips):
+	Call gtk_widget_ensure_style() before using the style.
+
 Wed Sep 15 02:52:19 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkwidget.c (gtk_widget_event): Added workaround
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index a3e8d32da..4253b934c 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+Thu Sep 16 21:32:01 1999  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtktooltips.c (gtk_tooltips_set_tip): Delay
+	the call to gtk_tooltips_layout_text() until later.
+
+	* gtk/gtktooltips.c (gtk_tooltips_draw_tips):
+	Call gtk_widget_ensure_style() before using the style.
+
 Wed Sep 15 02:52:19 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkwidget.c (gtk_widget_event): Added workaround
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index a3e8d32da..4253b934c 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+Thu Sep 16 21:32:01 1999  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtktooltips.c (gtk_tooltips_set_tip): Delay
+	the call to gtk_tooltips_layout_text() until later.
+
+	* gtk/gtktooltips.c (gtk_tooltips_draw_tips):
+	Call gtk_widget_ensure_style() before using the style.
+
 Wed Sep 15 02:52:19 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkwidget.c (gtk_widget_event): Added workaround
diff --git a/gtk/gtktooltips.c b/gtk/gtktooltips.c
index 52b5cee55..d5e5a6a68 100644
--- a/gtk/gtktooltips.c
+++ b/gtk/gtktooltips.c
@@ -365,7 +365,9 @@ gtk_tooltips_set_tip (GtkTooltips *tooltips,
       tooltipsdata->tip_text = g_strdup (tip_text);
       tooltipsdata->tip_private = g_strdup (tip_private);
 
-      gtk_tooltips_layout_text (tooltips, tooltipsdata);
+      /* Flag data as unitialized */
+      tooltipsdata->font = NULL;
+
       tooltips->tips_data_list = g_list_append (tooltips->tips_data_list,
                                              tooltipsdata);
       gtk_signal_connect_after(GTK_OBJECT (widget), "event",
@@ -459,6 +461,7 @@ gtk_tooltips_draw_tips (GtkTooltips * tooltips)
   else if (GTK_WIDGET_VISIBLE (tooltips->tip_window))
     gtk_widget_hide (tooltips->tip_window);
 
+  gtk_widget_ensure_style (tooltips->tip_window);
   style = tooltips->tip_window->style;
   
   widget = tooltips->active_tips_data->widget;
@@ -467,6 +470,7 @@ gtk_tooltips_draw_tips (GtkTooltips * tooltips)
   scr_h = gdk_screen_height ();
 
   data = tooltips->active_tips_data;
+
   if (data->font != style->font)
     gtk_tooltips_layout_text (tooltips, data);