summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog8
-rw-r--r--ChangeLog.pre-2-08
-rw-r--r--ChangeLog.pre-2-108
-rw-r--r--ChangeLog.pre-2-28
-rw-r--r--ChangeLog.pre-2-48
-rw-r--r--ChangeLog.pre-2-68
-rw-r--r--ChangeLog.pre-2-88
-rw-r--r--gtk/gtkitem.c3
-rw-r--r--gtk/gtklist.c2
-rw-r--r--gtk/gtktree.c2
-rw-r--r--gtk/testgtk.c34
-rw-r--r--tests/testgtk.c34
12 files changed, 116 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog
index 1ffaaa2740..a64a370f43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Thu Mar 12 08:55:34 1998 Tim Janik <timj@gimp.org>
+
+ * gtkitem.c:
+ * gtktree.c:
+ * gtklist.c: fetch the inintial value of attributes.event_mask from
+ gtk_widget_get_events (widget) (pointed out by Damon Chaplin
+ <DAChaplin@email.msn.com>).
+
Thu Mar 12 07:43:33 1998 Tim Janik <timj@gimp.org>
* gdk/gdk.h:
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 1ffaaa2740..a64a370f43 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,11 @@
+Thu Mar 12 08:55:34 1998 Tim Janik <timj@gimp.org>
+
+ * gtkitem.c:
+ * gtktree.c:
+ * gtklist.c: fetch the inintial value of attributes.event_mask from
+ gtk_widget_get_events (widget) (pointed out by Damon Chaplin
+ <DAChaplin@email.msn.com>).
+
Thu Mar 12 07:43:33 1998 Tim Janik <timj@gimp.org>
* gdk/gdk.h:
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 1ffaaa2740..a64a370f43 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+Thu Mar 12 08:55:34 1998 Tim Janik <timj@gimp.org>
+
+ * gtkitem.c:
+ * gtktree.c:
+ * gtklist.c: fetch the inintial value of attributes.event_mask from
+ gtk_widget_get_events (widget) (pointed out by Damon Chaplin
+ <DAChaplin@email.msn.com>).
+
Thu Mar 12 07:43:33 1998 Tim Janik <timj@gimp.org>
* gdk/gdk.h:
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 1ffaaa2740..a64a370f43 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+Thu Mar 12 08:55:34 1998 Tim Janik <timj@gimp.org>
+
+ * gtkitem.c:
+ * gtktree.c:
+ * gtklist.c: fetch the inintial value of attributes.event_mask from
+ gtk_widget_get_events (widget) (pointed out by Damon Chaplin
+ <DAChaplin@email.msn.com>).
+
Thu Mar 12 07:43:33 1998 Tim Janik <timj@gimp.org>
* gdk/gdk.h:
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 1ffaaa2740..a64a370f43 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+Thu Mar 12 08:55:34 1998 Tim Janik <timj@gimp.org>
+
+ * gtkitem.c:
+ * gtktree.c:
+ * gtklist.c: fetch the inintial value of attributes.event_mask from
+ gtk_widget_get_events (widget) (pointed out by Damon Chaplin
+ <DAChaplin@email.msn.com>).
+
Thu Mar 12 07:43:33 1998 Tim Janik <timj@gimp.org>
* gdk/gdk.h:
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 1ffaaa2740..a64a370f43 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+Thu Mar 12 08:55:34 1998 Tim Janik <timj@gimp.org>
+
+ * gtkitem.c:
+ * gtktree.c:
+ * gtklist.c: fetch the inintial value of attributes.event_mask from
+ gtk_widget_get_events (widget) (pointed out by Damon Chaplin
+ <DAChaplin@email.msn.com>).
+
Thu Mar 12 07:43:33 1998 Tim Janik <timj@gimp.org>
* gdk/gdk.h:
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 1ffaaa2740..a64a370f43 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+Thu Mar 12 08:55:34 1998 Tim Janik <timj@gimp.org>
+
+ * gtkitem.c:
+ * gtktree.c:
+ * gtklist.c: fetch the inintial value of attributes.event_mask from
+ gtk_widget_get_events (widget) (pointed out by Damon Chaplin
+ <DAChaplin@email.msn.com>).
+
Thu Mar 12 07:43:33 1998 Tim Janik <timj@gimp.org>
* gdk/gdk.h:
diff --git a/gtk/gtkitem.c b/gtk/gtkitem.c
index 6705f37219..69726b0ae4 100644
--- a/gtk/gtkitem.c
+++ b/gtk/gtkitem.c
@@ -177,7 +177,8 @@ gtk_item_realize (GtkWidget *widget)
attributes.wclass = GDK_INPUT_OUTPUT;
attributes.visual = gtk_widget_get_visual (widget);
attributes.colormap = gtk_widget_get_colormap (widget);
- attributes.event_mask = (GDK_EXPOSURE_MASK |
+ attributes.event_mask = (gtk_widget_get_events (widget) |
+ GDK_EXPOSURE_MASK |
GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK |
GDK_ENTER_NOTIFY_MASK |
diff --git a/gtk/gtklist.c b/gtk/gtklist.c
index 2a44474e6a..063041c60d 100644
--- a/gtk/gtklist.c
+++ b/gtk/gtklist.c
@@ -596,7 +596,7 @@ gtk_list_realize (GtkWidget *widget)
attributes.wclass = GDK_INPUT_OUTPUT;
attributes.visual = gtk_widget_get_visual (widget);
attributes.colormap = gtk_widget_get_colormap (widget);
- attributes.event_mask = GDK_EXPOSURE_MASK;
+ attributes.event_mask = gtk_widget_get_events (widget) | GDK_EXPOSURE_MASK;
attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
diff --git a/gtk/gtktree.c b/gtk/gtktree.c
index acfbfb53dd..b501486ad0 100644
--- a/gtk/gtktree.c
+++ b/gtk/gtktree.c
@@ -644,7 +644,7 @@ gtk_tree_realize (GtkWidget *widget)
attributes.wclass = GDK_INPUT_OUTPUT;
attributes.visual = gtk_widget_get_visual (widget);
attributes.colormap = gtk_widget_get_colormap (widget);
- attributes.event_mask = GDK_EXPOSURE_MASK;
+ attributes.event_mask = gtk_widget_get_events (widget) | GDK_EXPOSURE_MASK;
attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
diff --git a/gtk/testgtk.c b/gtk/testgtk.c
index e020e3b49e..4c675e8d69 100644
--- a/gtk/testgtk.c
+++ b/gtk/testgtk.c
@@ -1494,8 +1494,10 @@ static void
create_handle_box ()
{
static GtkWidget* window = NULL;
+ GtkWidget *handle_box;
GtkWidget *hbox;
GtkWidget *toolbar;
+ GtkWidget *label;
if (!window)
{
@@ -1509,22 +1511,42 @@ create_handle_box ()
GTK_SIGNAL_FUNC(destroy_window), &window);
gtk_container_border_width (GTK_CONTAINER (window), 20);
-
- hbox = gtk_handle_box_new ();
+
+ hbox = gtk_hbox_new (FALSE, 10);
gtk_container_add (GTK_CONTAINER (window), hbox);
- gtk_signal_connect (GTK_OBJECT (hbox),
+ gtk_widget_show (hbox);
+
+ handle_box = gtk_handle_box_new ();
+ gtk_container_add (GTK_CONTAINER (hbox), handle_box);
+ gtk_signal_connect (GTK_OBJECT (handle_box),
"child_attached",
GTK_SIGNAL_FUNC (handle_box_child_signal),
"attached");
- gtk_signal_connect (GTK_OBJECT (hbox),
+ gtk_signal_connect (GTK_OBJECT (handle_box),
"child_detached",
GTK_SIGNAL_FUNC (handle_box_child_signal),
"detached");
- gtk_widget_show (hbox);
+ gtk_widget_show (handle_box);
toolbar = make_toolbar (window);
- gtk_container_add (GTK_CONTAINER (hbox), toolbar);
+ gtk_container_add (GTK_CONTAINER (handle_box), toolbar);
gtk_widget_show (toolbar);
+
+ handle_box = gtk_handle_box_new ();
+ gtk_container_add (GTK_CONTAINER (hbox), handle_box);
+ gtk_signal_connect (GTK_OBJECT (handle_box),
+ "child_attached",
+ GTK_SIGNAL_FUNC (handle_box_child_signal),
+ "attached");
+ gtk_signal_connect (GTK_OBJECT (handle_box),
+ "child_detached",
+ GTK_SIGNAL_FUNC (handle_box_child_signal),
+ "detached");
+ gtk_widget_show (handle_box);
+
+ label = gtk_label_new ("Fooo!");
+ gtk_container_add (GTK_CONTAINER (handle_box), label);
+ gtk_widget_show (label);
}
if (!GTK_WIDGET_VISIBLE (window))
diff --git a/tests/testgtk.c b/tests/testgtk.c
index e020e3b49e..4c675e8d69 100644
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -1494,8 +1494,10 @@ static void
create_handle_box ()
{
static GtkWidget* window = NULL;
+ GtkWidget *handle_box;
GtkWidget *hbox;
GtkWidget *toolbar;
+ GtkWidget *label;
if (!window)
{
@@ -1509,22 +1511,42 @@ create_handle_box ()
GTK_SIGNAL_FUNC(destroy_window), &window);
gtk_container_border_width (GTK_CONTAINER (window), 20);
-
- hbox = gtk_handle_box_new ();
+
+ hbox = gtk_hbox_new (FALSE, 10);
gtk_container_add (GTK_CONTAINER (window), hbox);
- gtk_signal_connect (GTK_OBJECT (hbox),
+ gtk_widget_show (hbox);
+
+ handle_box = gtk_handle_box_new ();
+ gtk_container_add (GTK_CONTAINER (hbox), handle_box);
+ gtk_signal_connect (GTK_OBJECT (handle_box),
"child_attached",
GTK_SIGNAL_FUNC (handle_box_child_signal),
"attached");
- gtk_signal_connect (GTK_OBJECT (hbox),
+ gtk_signal_connect (GTK_OBJECT (handle_box),
"child_detached",
GTK_SIGNAL_FUNC (handle_box_child_signal),
"detached");
- gtk_widget_show (hbox);
+ gtk_widget_show (handle_box);
toolbar = make_toolbar (window);
- gtk_container_add (GTK_CONTAINER (hbox), toolbar);
+ gtk_container_add (GTK_CONTAINER (handle_box), toolbar);
gtk_widget_show (toolbar);
+
+ handle_box = gtk_handle_box_new ();
+ gtk_container_add (GTK_CONTAINER (hbox), handle_box);
+ gtk_signal_connect (GTK_OBJECT (handle_box),
+ "child_attached",
+ GTK_SIGNAL_FUNC (handle_box_child_signal),
+ "attached");
+ gtk_signal_connect (GTK_OBJECT (handle_box),
+ "child_detached",
+ GTK_SIGNAL_FUNC (handle_box_child_signal),
+ "detached");
+ gtk_widget_show (handle_box);
+
+ label = gtk_label_new ("Fooo!");
+ gtk_container_add (GTK_CONTAINER (handle_box), label);
+ gtk_widget_show (label);
}
if (!GTK_WIDGET_VISIBLE (window))
View Lorry Controller Status