summaryrefslogtreecommitdiff
path: root/gtk
diff options
context:
space:
mode:
authorTim Janik <timj@gtk.org>2001-02-17 06:04:40 +0000
committerTim Janik <timj@src.gnome.org>2001-02-17 06:04:40 +0000
commitca26902c651c7868c3e9880c0b2864d7ad42554f (patch)
treed4e8a333712e072360e7d29659d15598a752ce37 /gtk
parentb10825d537175d0f0c20deb07422a63f19856a66 (diff)
downloadgdk-pixbuf-ca26902c651c7868c3e9880c0b2864d7ad42554f.tar.gz
default initialize the generated ENTER_NOTIFY event with 0, otherwise not
Sat Feb 17 06:47:27 2001 Tim Janik <timj@gtk.org> * gtk/gtkmenu.c (gtk_menu_motion_notify): default initialize the generated ENTER_NOTIFY event with 0, otherwise not explicitely setup fields contain garbage (e.g. subwindow, breaking gdk_drawable_ref() upon event copy). (gtk_menu_stop_navigating_submenu_cb): same here. * gtk/gtklist.c (gtk_list_vertical_timeout): * gtk/gtklist.c (gtk_list_horizontal_timeout): * gtk/gtkclist.c (vertical_timeout): * gtk/gtkclist.c (horizontal_timeout): change direct assignment default-zero-intialization for unions to memset(,0,), as unions are not fully default-zero-initialized by compilers (GdkEvent x = { 0, }; has to become GdkEvent x; memset (&x, 0, sizeof (x)); ) * gtk/gtktreeview.c (gtk_tree_view_set_rows_drag_source): scratch g_closure_sink() warning. * gtk/gtktreemodel.c (gtk_tree_model_get_valist): * gtk/gtktreestore.c (gtk_tree_store_set_valist): * gtk/gtkliststore.c (gtk_list_store_set_valist): fix G_VALUE_COLLECT() and G_VALUE_LCOPY() calls.
Diffstat (limited to 'gtk')
-rw-r--r--gtk/gtkclist.c8
-rw-r--r--gtk/gtklist.c8
-rw-r--r--gtk/gtkliststore.c2
-rw-r--r--gtk/gtkmenu.c13
-rw-r--r--gtk/gtkobject.c6
-rw-r--r--gtk/gtktreemodel.c2
-rw-r--r--gtk/gtktreestore.c2
-rw-r--r--gtk/gtktreeview.c5
8 files changed, 26 insertions, 20 deletions
diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c
index 69cb38470..0a1771f9a 100644
--- a/gtk/gtkclist.c
+++ b/gtk/gtkclist.c
@@ -7119,7 +7119,9 @@ move_vertical (GtkCList *clist,
static gint
horizontal_timeout (GtkCList *clist)
{
- GdkEventMotion event = { 0 };
+ GdkEventMotion event;
+
+ memset (&event, 0, sizeof (event));
GDK_THREADS_ENTER ();
@@ -7138,7 +7140,9 @@ horizontal_timeout (GtkCList *clist)
static gint
vertical_timeout (GtkCList *clist)
{
- GdkEventMotion event = { 0 };
+ GdkEventMotion event;
+
+ memset (&event, 0, sizeof (event));
GDK_THREADS_ENTER ();
diff --git a/gtk/gtklist.c b/gtk/gtklist.c
index 1cf4cd023..b8d24f3e7 100644
--- a/gtk/gtklist.c
+++ b/gtk/gtklist.c
@@ -2431,7 +2431,9 @@ gtk_list_move_focus_child (GtkList *list,
static gint
gtk_list_horizontal_timeout (GtkWidget *list)
{
- GdkEventMotion event = { 0 };
+ GdkEventMotion event;
+
+ memset (&event, 0, sizeof (event));
GDK_THREADS_ENTER ();
@@ -2450,7 +2452,9 @@ gtk_list_horizontal_timeout (GtkWidget *list)
static gint
gtk_list_vertical_timeout (GtkWidget *list)
{
- GdkEventMotion event = { 0 };
+ GdkEventMotion event;
+
+ memset (&event, 0, sizeof (event));
GDK_THREADS_ENTER ();
diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c
index 3a3eb6ed4..60479293c 100644
--- a/gtk/gtkliststore.c
+++ b/gtk/gtkliststore.c
@@ -651,7 +651,7 @@ gtk_list_store_set_valist (GtkListStore *list_store,
}
g_value_init (&value, list_store->column_headers[column]);
- G_VALUE_COLLECT (&value, var_args, &error);
+ G_VALUE_COLLECT (&value, var_args, 0, &error);
if (error)
{
g_warning ("%s: %s", G_STRLOC, error);
diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index 4a6f53ccc..07918b682 100644
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -1372,7 +1372,6 @@ gtk_menu_expose (GtkWidget *widget,
{
GtkMenuShell *menu_shell;
GtkWidget *child;
- GdkEventExpose child_event;
GList *children;
GtkMenu *menu;
@@ -1385,9 +1384,9 @@ gtk_menu_expose (GtkWidget *widget,
if (GTK_WIDGET_DRAWABLE (widget))
{
- gtk_menu_paint (widget);
+ GdkEventExpose child_event = *event;
- child_event = *event;
+ gtk_menu_paint (widget);
children = menu_shell->children;
while (children)
@@ -1544,7 +1543,8 @@ gtk_menu_motion_notify (GtkWidget *widget,
event->y >= 0 && event->y < height)
{
GdkEvent send_event;
-
+
+ memset (&send_event, 0, sizeof (send_event));
send_event.crossing.type = GDK_ENTER_NOTIFY;
send_event.crossing.window = event->window;
send_event.crossing.time = event->time;
@@ -1790,8 +1790,6 @@ gtk_menu_stop_navigating_submenu (GtkMenu *menu)
static gboolean
gtk_menu_stop_navigating_submenu_cb (gpointer user_data)
{
- GdkEventCrossing send_event;
-
GtkMenu *menu = user_data;
GdkWindow *child_window;
@@ -1803,6 +1801,9 @@ gtk_menu_stop_navigating_submenu_cb (gpointer user_data)
if (child_window)
{
+ GdkEventCrossing send_event;
+
+ memset (&send_event, 0, sizeof (send_event));
send_event.window = child_window;
send_event.type = GDK_ENTER_NOTIFY;
send_event.time = GDK_CURRENT_TIME; /* Bogus */
diff --git a/gtk/gtkobject.c b/gtk/gtkobject.c
index a6678899b..3931af9c2 100644
--- a/gtk/gtkobject.c
+++ b/gtk/gtkobject.c
@@ -179,10 +179,11 @@ gtk_arg_proxy_set_property (GObject *object,
const gchar *trailer)
{
GtkObjectClass *class = g_type_class_peek (pspec->owner_type);
- GtkArg arg = { 0, };
+ GtkArg arg;
g_return_if_fail (class->set_arg != NULL);
+ memset (&arg, 0, sizeof (arg));
arg.type = G_VALUE_TYPE (value);
gtk_arg_set_from_value (&arg, value, FALSE);
arg.name = pspec->name;
@@ -197,10 +198,11 @@ gtk_arg_proxy_get_property (GObject *object,
const gchar *trailer)
{
GtkObjectClass *class = g_type_class_peek (pspec->owner_type);
- GtkArg arg = { 0, };
+ GtkArg arg;
g_return_if_fail (class->get_arg != NULL);
+ memset (&arg, 0, sizeof (arg));
arg.type = G_VALUE_TYPE (value);
arg.name = pspec->name;
class->get_arg (GTK_OBJECT (object), &arg, property_id);
diff --git a/gtk/gtktreemodel.c b/gtk/gtktreemodel.c
index b7f99c66d..cf46b3736 100644
--- a/gtk/gtktreemodel.c
+++ b/gtk/gtktreemodel.c
@@ -1199,7 +1199,7 @@ gtk_tree_model_get_valist (GtkTreeModel *tree_model,
gtk_tree_model_get_value (GTK_TREE_MODEL (tree_model), iter, column, &value);
- G_VALUE_LCOPY (&value, var_args, &error);
+ G_VALUE_LCOPY (&value, var_args, 0, &error);
if (error)
{
g_warning ("%s: %s", G_STRLOC, error);
diff --git a/gtk/gtktreestore.c b/gtk/gtktreestore.c
index 22242b11e..c7a685c61 100644
--- a/gtk/gtktreestore.c
+++ b/gtk/gtktreestore.c
@@ -659,7 +659,7 @@ gtk_tree_store_set_valist (GtkTreeStore *tree_store,
}
g_value_init (&value, tree_store->column_headers[column]);
- G_VALUE_COLLECT (&value, var_args, &error);
+ G_VALUE_COLLECT (&value, var_args, 0, &error);
if (error)
{
g_warning ("%s: %s", G_STRLOC, error);
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 5755f8122..4ad6c0deb 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -5202,11 +5202,6 @@ remove_scroll_timeout (GtkTreeView *tree_view)
}
}
-#ifdef __GNUC__
-#warning "implement g_closure_sink"
-#endif
-#define g_closure_sink(c)
-
void
gtk_tree_view_set_rows_drag_source (GtkTreeView *tree_view,
GdkModifierType start_button_mask,