summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog9
-rw-r--r--ChangeLog.pre-2-109
-rw-r--r--ChangeLog.pre-2-29
-rw-r--r--ChangeLog.pre-2-49
-rw-r--r--ChangeLog.pre-2-69
-rw-r--r--ChangeLog.pre-2-89
-rw-r--r--gtk/gtkctree.c2
-rw-r--r--gtk/gtkplug.c32
8 files changed, 82 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 2516156ebb..aa12f36918 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Mon May 20 11:47:59 2002 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkplug.c: Undo an accidental revert of
+ fixes of May 16. (Caught by Padraig O'Briain)
+
+ * gtk/gtkctree.c (cell_size_request): Fix bug where
+ size request for text cells was being overwritten.
+ (#82264, Graham Swallow.)
+
2002-05-18 Matthias Clasen <maclas@gmx.de>
* configure.in: Check for endianness. Sorry about REBUILD_PNGS...
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2516156ebb..aa12f36918 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+Mon May 20 11:47:59 2002 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkplug.c: Undo an accidental revert of
+ fixes of May 16. (Caught by Padraig O'Briain)
+
+ * gtk/gtkctree.c (cell_size_request): Fix bug where
+ size request for text cells was being overwritten.
+ (#82264, Graham Swallow.)
+
2002-05-18 Matthias Clasen <maclas@gmx.de>
* configure.in: Check for endianness. Sorry about REBUILD_PNGS...
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 2516156ebb..aa12f36918 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,12 @@
+Mon May 20 11:47:59 2002 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkplug.c: Undo an accidental revert of
+ fixes of May 16. (Caught by Padraig O'Briain)
+
+ * gtk/gtkctree.c (cell_size_request): Fix bug where
+ size request for text cells was being overwritten.
+ (#82264, Graham Swallow.)
+
2002-05-18 Matthias Clasen <maclas@gmx.de>
* configure.in: Check for endianness. Sorry about REBUILD_PNGS...
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 2516156ebb..aa12f36918 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,12 @@
+Mon May 20 11:47:59 2002 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkplug.c: Undo an accidental revert of
+ fixes of May 16. (Caught by Padraig O'Briain)
+
+ * gtk/gtkctree.c (cell_size_request): Fix bug where
+ size request for text cells was being overwritten.
+ (#82264, Graham Swallow.)
+
2002-05-18 Matthias Clasen <maclas@gmx.de>
* configure.in: Check for endianness. Sorry about REBUILD_PNGS...
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 2516156ebb..aa12f36918 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,12 @@
+Mon May 20 11:47:59 2002 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkplug.c: Undo an accidental revert of
+ fixes of May 16. (Caught by Padraig O'Briain)
+
+ * gtk/gtkctree.c (cell_size_request): Fix bug where
+ size request for text cells was being overwritten.
+ (#82264, Graham Swallow.)
+
2002-05-18 Matthias Clasen <maclas@gmx.de>
* configure.in: Check for endianness. Sorry about REBUILD_PNGS...
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 2516156ebb..aa12f36918 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+Mon May 20 11:47:59 2002 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkplug.c: Undo an accidental revert of
+ fixes of May 16. (Caught by Padraig O'Briain)
+
+ * gtk/gtkctree.c (cell_size_request): Fix bug where
+ size request for text cells was being overwritten.
+ (#82264, Graham Swallow.)
+
2002-05-18 Matthias Clasen <maclas@gmx.de>
* configure.in: Check for endianness. Sorry about REBUILD_PNGS...
diff --git a/gtk/gtkctree.c b/gtk/gtkctree.c
index ef034c662b..787dce207c 100644
--- a/gtk/gtkctree.c
+++ b/gtk/gtkctree.c
@@ -2905,8 +2905,6 @@ cell_size_request (GtkCList *clist,
requisition->height = MAX (requisition->height, height);
break;
default:
- requisition->width = 0;
- requisition->height = 0;
break;
}
diff --git a/gtk/gtkplug.c b/gtk/gtkplug.c
index 5d076a4acb..c74c7c4714 100644
--- a/gtk/gtkplug.c
+++ b/gtk/gtkplug.c
@@ -48,6 +48,8 @@ static void gtk_plug_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
static gboolean gtk_plug_key_press_event (GtkWidget *widget,
GdkEventKey *event);
+static gboolean gtk_plug_focus_event (GtkWidget *widget,
+ GdkEventFocus *event);
static void gtk_plug_set_focus (GtkWindow *window,
GtkWidget *focus);
static gboolean gtk_plug_focus (GtkWidget *widget,
@@ -123,6 +125,8 @@ gtk_plug_class_init (GtkPlugClass *class)
widget_class->realize = gtk_plug_realize;
widget_class->unrealize = gtk_plug_unrealize;
widget_class->key_press_event = gtk_plug_key_press_event;
+ widget_class->focus_in_event = gtk_plug_focus_event;
+ widget_class->focus_out_event = gtk_plug_focus_event;
widget_class->show = gtk_plug_show;
widget_class->hide = gtk_plug_hide;
@@ -655,6 +659,17 @@ gtk_plug_key_press_event (GtkWidget *widget,
return FALSE;
}
+static gboolean
+gtk_plug_focus_event (GtkWidget *widget,
+ GdkEventFocus *event)
+{
+ /* We eat focus-in events and focus-out events, since they
+ * can be generated by something like a keyboard grab on
+ * a child of the plug.
+ */
+ return FALSE;
+}
+
static void
gtk_plug_set_focus (GtkWindow *window,
GtkWidget *focus)
@@ -1000,15 +1015,24 @@ handle_xembed_message (GtkPlug *plug,
case XEMBED_FOCUS_OUT:
{
+ GtkWidget *widget = GTK_WIDGET (plug);
GdkEvent event;
event.focus_change.type = GDK_FOCUS_CHANGE;
- event.focus_change.window = GTK_WIDGET (plug)->window;
+ event.focus_change.window = widget->window;
event.focus_change.send_event = TRUE;
- event.focus_change.in = (message == XEMBED_FOCUS_IN);
-
- gtk_widget_event (GTK_WIDGET (plug), &event);
+ if (message == XEMBED_FOCUS_IN)
+ {
+ event.focus_change.in = TRUE;
+ GTK_WIDGET_CLASS (parent_class)->focus_in_event (widget, (GdkEventFocus *)&event);
+ }
+ else
+ {
+ event.focus_change.in = FALSE;
+ GTK_WIDGET_CLASS (parent_class)->focus_out_event (widget, (GdkEventFocus *)&event);
+ }
+
break;
}
View Lorry Controller Status