GNOME.org
 

[goocanvas] Fixed a lot of warnings.

commit 0fa3135f9a383ac09a44637f6dbb2c9d53166140
Author: Damon Chaplin <damon gnome org>
Date:   Fri Nov 1 16:45:11 2013 +0000

    Fixed a lot of warnings.

 ChangeLog                       |    4 ++++
 demo/demo-animation.c           |    4 ++--
 demo/demo-arrowhead.c           |    4 ++--
 demo/demo-clipping.c            |    2 +-
 demo/demo-events.c              |    2 +-
 demo/demo-features.c            |    2 +-
 demo/demo-fifteen.c             |    8 ++++----
 demo/demo-focus.c               |    2 +-
 demo/demo-grabs.c               |   31 +++++++++++++++----------------
 demo/demo-large-items.c         |    4 ++--
 demo/demo-paths.c               |    6 +++---
 demo/demo-scalability.c         |    4 ++--
 demo/demo-table.c               |    2 +-
 demo/demo.c                     |   20 ++++++++++----------
 demo/generic-position-demo.c    |    2 +-
 demo/mv-demo-animation.c        |    4 ++--
 demo/mv-demo-arrowhead.c        |    4 ++--
 demo/mv-demo-clipping.c         |    2 +-
 demo/mv-demo-events.c           |    2 +-
 demo/mv-demo-features.c         |    2 +-
 demo/mv-demo-fifteen.c          |    8 ++++----
 demo/mv-demo-focus.c            |    2 +-
 demo/mv-demo-grabs.c            |   31 ++++++++++++++++++-------------
 demo/mv-demo-paths.c            |    6 +++---
 demo/mv-demo-scalability.c      |    4 ++--
 demo/mv-demo-table.c            |    2 +-
 demo/mv-demo.c                  |   30 +++++++++++++++---------------
 demo/mv-generic-position-demo.c |    2 +-
 demo/mv-table-demo.c            |    2 +-
 demo/table-demo.c               |    2 +-
 demo/units-demo.c               |    4 ++--
 demo/widgets-demo.c             |    8 ++++----
 32 files changed, 110 insertions(+), 102 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 2a46153..1ce4852 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2013-11-01  Damon Chaplin  <damon gnome org>
 
+       * demo/*.c: fixed a lot of warnings.
+
+2013-11-01  Damon Chaplin  <damon gnome org>
+
        * .gitignore: added gtk-doc.m4
 
 2013-11-01  Damon Chaplin  <damon gnome org>
diff --git a/demo/demo-animation.c b/demo/demo-animation.c
index 440dc1c..433cf6a 100644
--- a/demo/demo-animation.c
+++ b/demo/demo-animation.c
@@ -113,11 +113,11 @@ create_animation_page (void)
 {
   GtkWidget *vbox, *hbox, *w, *scrolled_win, *canvas;
 
-  vbox = gtk_vbox_new (FALSE, 4);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
   gtk_widget_show (vbox);
 
-  hbox = gtk_hbox_new (FALSE, 4);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
diff --git a/demo/demo-arrowhead.c b/demo/demo-arrowhead.c
index f33291c..2a47a0a 100644
--- a/demo/demo-arrowhead.c
+++ b/demo/demo-arrowhead.c
@@ -288,7 +288,7 @@ on_button_press (GooCanvasItem *item,
                           GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_RELEASE_MASK,
                           fleur,
                           event->time);
-  gdk_cursor_unref (fleur);
+  g_object_unref (fleur);
 
   return TRUE;
 }
@@ -411,7 +411,7 @@ create_canvas_arrowhead (void)
        GtkWidget *canvas;
        GooCanvasItem *root, *item;
 
-       vbox = gtk_vbox_new (FALSE, 4);
+       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
        gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
        gtk_widget_show (vbox);
 
diff --git a/demo/demo-clipping.c b/demo/demo-clipping.c
index 805b31c..b3e5968 100644
--- a/demo/demo-clipping.c
+++ b/demo/demo-clipping.c
@@ -137,7 +137,7 @@ create_clipping_page (void)
 {
   GtkWidget *vbox, *scrolled_win, *canvas;
 
-  vbox = gtk_vbox_new (FALSE, 4);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
   gtk_widget_show (vbox);
 
diff --git a/demo/demo-events.c b/demo/demo-events.c
index 40493f3..9a7d68d 100644
--- a/demo/demo-events.c
+++ b/demo/demo-events.c
@@ -129,7 +129,7 @@ create_events_page (void)
 {
   GtkWidget *vbox, *alignment, *frame, *label, *canvas;
 
-  vbox = gtk_vbox_new (FALSE, 4);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
   gtk_widget_show (vbox);
 
diff --git a/demo/demo-features.c b/demo/demo-features.c
index ab38ec4..4a30d47 100644
--- a/demo/demo-features.c
+++ b/demo/demo-features.c
@@ -52,7 +52,7 @@ create_canvas_features (void)
        GooCanvasItem *parent2;
        GooCanvasItem *group;
 
-       vbox = gtk_vbox_new (FALSE, 4);
+       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
        gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
        gtk_widget_show (vbox);
 
diff --git a/demo/demo-fifteen.c b/demo/demo-fifteen.c
index 8ab0f03..52e53c9 100644
--- a/demo/demo-fifteen.c
+++ b/demo/demo-fifteen.c
@@ -107,8 +107,8 @@ piece_button_press (GooCanvasItem *item,
 {
         GooCanvas *canvas;
        GooCanvasItem **board;
-       GooCanvasItem *text;
-       int num, pos, newpos;
+       GooCanvasItem *text G_GNUC_UNUSED;
+       int num G_GNUC_UNUSED, pos, newpos;
        int x, y;
        double dx = 0.0, dy = 0.0;
        int move;
@@ -239,11 +239,11 @@ create_canvas_fifteen (void)
        GtkWidget *canvas;
        GtkWidget *button;
        GooCanvasItem **board;
-       GooCanvasItem *root, *rect, *text;
+       GooCanvasItem *root, *rect G_GNUC_UNUSED, *text;
        int i, x, y;
        char buf[20];
 
-       vbox = gtk_vbox_new (FALSE, 4);
+       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
        gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
        gtk_widget_show (vbox);
 
diff --git a/demo/demo-focus.c b/demo/demo-focus.c
index 2fc6576..a398391 100644
--- a/demo/demo-focus.c
+++ b/demo/demo-focus.c
@@ -138,7 +138,7 @@ create_focus_page (void)
 {
   GtkWidget *vbox, *label, *scrolled_win, *canvas;
 
-  vbox = gtk_vbox_new (FALSE, 4);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
   gtk_widget_show (vbox);
 
diff --git a/demo/demo-grabs.c b/demo/demo-grabs.c
index d645266..a9813fe 100644
--- a/demo/demo-grabs.c
+++ b/demo/demo-grabs.c
@@ -10,6 +10,7 @@ on_widget_draw (GtkWidget *widget,
                  char *item_id)
 {
   GtkAllocation allocation;
+
   g_print ("%s received 'draw' signal\n", item_id);
 
   gtk_widget_get_allocation (widget, &allocation);
@@ -18,12 +19,6 @@ on_widget_draw (GtkWidget *widget,
                   allocation.width, allocation.height);
   cairo_stroke (cr);
 
-#if 0
-  gtk_paint_box (gtk_widget_get_style (widget), cr, GTK_STATE_NORMAL,
-                GTK_SHADOW_IN, widget, NULL, 0, 0,
-                allocation.width, allocation.height);
-#endif
-
   return FALSE;
 }
 
@@ -53,11 +48,13 @@ on_widget_motion_notify (GtkWidget *widget,
                         GdkEventMotion *event,
                         char *item_id)
 {
+  GdkDevice *device = gdk_event_get_device ((GdkEvent*) event);
+
   g_print ("%s received 'motion-notify' signal (window: %p)\n", item_id,
           event->window);
 
-  if (event->is_hint)
-    gdk_window_get_pointer (event->window, NULL, NULL, NULL);
+  if (event->is_hint && device)
+    gdk_window_get_device_position (event->window, device, NULL, NULL, NULL);
 
   return TRUE;
 }
@@ -68,9 +65,11 @@ on_widget_button_press (GtkWidget *widget,
                        GdkEventButton *event,
                        char *item_id)
 {
+  GdkDevice *device = gdk_event_get_device ((GdkEvent*) event);
+
   g_print ("%s received 'button-press' signal\n", item_id);
 
-  if (strstr (item_id, "explicit"))
+  if (device && strstr (item_id, "explicit"))
     {
       GdkGrabStatus status;
       GdkEventMask mask = GDK_BUTTON_PRESS_MASK
@@ -80,8 +79,9 @@ on_widget_button_press (GtkWidget *widget,
        | GDK_ENTER_NOTIFY_MASK
        | GDK_LEAVE_NOTIFY_MASK;
 
-      status = gdk_pointer_grab (gtk_widget_get_window (widget), FALSE, mask, FALSE, NULL,
-                                event->time);
+      status = gdk_device_grab (device, gtk_widget_get_window (widget),
+                               GDK_OWNERSHIP_NONE, FALSE, mask,
+                               NULL, event->time);
       if (status == GDK_GRAB_SUCCESS)
        g_print ("grabbed pointer\n");
       else
@@ -97,14 +97,13 @@ on_widget_button_release (GtkWidget *widget,
                          GdkEventButton *event,
                          char *item_id)
 {
+  GdkDevice *device = gdk_event_get_device ((GdkEvent*) event);
+
   g_print ("%s received 'button-release' signal\n", item_id);
 
-  if (strstr (item_id, "explicit"))
+  if (device && strstr (item_id, "explicit"))
     {
-      GdkDisplay *display;
-
-      display = gtk_widget_get_display (widget);
-      gdk_display_pointer_ungrab (display, event->time);
+      gdk_device_ungrab (device, event->time);
       g_print ("released pointer grab\n");
     }
 
diff --git a/demo/demo-large-items.c b/demo/demo-large-items.c
index f459ebe..5c01d74 100644
--- a/demo/demo-large-items.c
+++ b/demo/demo-large-items.c
@@ -66,7 +66,7 @@ create_large_items_page (void)
   GooCanvasItem *root, *item;
   gchar *text;
 
-  vbox = gtk_vbox_new (FALSE, 4);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
   gtk_widget_show (vbox);
 
@@ -78,7 +78,7 @@ create_large_items_page (void)
   gtk_box_pack_start (GTK_BOX (vbox), w, FALSE, FALSE, 0);
   gtk_widget_show (w);
 
-  hbox = gtk_hbox_new (FALSE, 4);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
diff --git a/demo/demo-paths.c b/demo/demo-paths.c
index aaef3d4..2b23920 100644
--- a/demo/demo-paths.c
+++ b/demo/demo-paths.c
@@ -31,7 +31,7 @@ on_background_button_press (GooCanvasItem *item,
 static void
 setup_canvas (GtkWidget *canvas)
 {
-  GooCanvasItem *root, *path;
+  GooCanvasItem *root, *path G_GNUC_UNUSED;
 
   root = goo_canvas_get_root_item (GOO_CANVAS (canvas));
   g_signal_connect (root, "button_press_event",
@@ -149,11 +149,11 @@ create_paths_page (void)
 {
   GtkWidget *vbox, *hbox, *w, *scrolled_win, *canvas;
 
-  vbox = gtk_vbox_new (FALSE, 4);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
   gtk_widget_show (vbox);
 
-  hbox = gtk_hbox_new (FALSE, 4);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
diff --git a/demo/demo-scalability.c b/demo/demo-scalability.c
index e014e8d..a6bbe71 100644
--- a/demo/demo-scalability.c
+++ b/demo/demo-scalability.c
@@ -20,10 +20,10 @@ create_canvas_scalability (void)
        GtkWidget *scrolled_win, *canvas;
        GtkWidget *table;
        GdkPixbuf *pixbuf;
-       GooCanvasItem *root, *item;
+       GooCanvasItem *root, *item G_GNUC_UNUSED;
        int i, j, width, height;
 
-       vbox = gtk_vbox_new (FALSE, 4);
+       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
        gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
        gtk_widget_show (vbox);
 
diff --git a/demo/demo-table.c b/demo/demo-table.c
index 94bd244..968d874 100644
--- a/demo/demo-table.c
+++ b/demo/demo-table.c
@@ -380,7 +380,7 @@ create_table_page (void)
   GtkWidget *vbox, *scrolled_win, *canvas;
   GooCanvasItem *root, *table;
 
-  vbox = gtk_vbox_new (FALSE, 4);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
   gtk_widget_show (vbox);
 
diff --git a/demo/demo.c b/demo/demo.c
index 1ec2d05..d62bc42 100644
--- a/demo/demo.c
+++ b/demo/demo.c
@@ -41,7 +41,7 @@ static void
 write_pdf_clicked (GtkWidget *button, GooCanvas *canvas)
 {
   cairo_surface_t *surface;
-  GooCanvasBounds bounds;
+  GooCanvasBounds bounds G_GNUC_UNUSED;
   cairo_t *cr;
 
   g_print ("In write_pdf_clicked\n");
@@ -364,7 +364,7 @@ on_button_press (GooCanvasItem *item,
                                   GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | 
GDK_BUTTON_RELEASE_MASK,
                                   fleur,
                                   event->time);
-         gdk_cursor_unref (fleur);
+         g_object_unref (fleur);
          dragging = TRUE;
        }
       break;
@@ -471,7 +471,7 @@ create_canvas_primitives ()
        GtkAdjustment *adj;
        GSList *group = NULL;
 
-       vbox = gtk_vbox_new (FALSE, 4);
+       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
        gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
        gtk_widget_show (vbox);
 
@@ -479,7 +479,7 @@ create_canvas_primitives ()
        gtk_box_pack_start (GTK_BOX (vbox), w, FALSE, FALSE, 0);
        gtk_widget_show (w);
 
-       hbox = gtk_hbox_new (FALSE, 4);
+       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
        gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
        gtk_widget_show (hbox);
 
@@ -542,7 +542,7 @@ create_canvas_primitives ()
        gtk_widget_show (w);
 
 
-       hbox = gtk_hbox_new (FALSE, 4);
+       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
        gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
        gtk_widget_show (hbox);
 
@@ -601,7 +601,7 @@ create_canvas_primitives ()
                          G_CALLBACK (change_bounds_clicked),
                          canvas);
 
-       hbox = gtk_hbox_new (FALSE, 4);
+       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
        gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
        gtk_widget_show (hbox);
 
@@ -780,7 +780,7 @@ setup_heading (GooCanvasItem *root, char *text, int pos)
 static void
 setup_divisions (GooCanvasItem *root)
 {
-  GooCanvasItem *group, *item;
+  GooCanvasItem *group, *item G_GNUC_UNUSED;
 
   group = goo_canvas_group_new (root, NULL);
   goo_canvas_item_translate (group, 2, 2);
@@ -951,7 +951,7 @@ setup_ellipses (GooCanvasItem *root)
 static void
 polish_diamond (GooCanvasItem *root)
 {
-  GooCanvasItem *group, *item;
+  GooCanvasItem *group, *item G_GNUC_UNUSED;
   int i, j;
   double a, x1, y1, x2, y2;
 
@@ -1484,7 +1484,7 @@ test_simple_transforms (GooCanvasItem *root)
 static void
 setup_grids (GooCanvasItem *root)
 {
-  GooCanvasItem *item;
+  GooCanvasItem *item G_GNUC_UNUSED;
 
   item = goo_canvas_grid_new (root, 80, 310, 90, 90, 10, 10, 5, 5,
                              "stroke-color", "yellow",
@@ -1625,7 +1625,7 @@ create_window ()
 int
 main (int argc, char *argv[])
 {
-  GtkWidget *window;
+  GtkWidget *window G_GNUC_UNUSED;
 
   gtk_init (&argc, &argv);
 
diff --git a/demo/generic-position-demo.c b/demo/generic-position-demo.c
index 2fab9bc..55dafb4 100644
--- a/demo/generic-position-demo.c
+++ b/demo/generic-position-demo.c
@@ -184,7 +184,7 @@ main (int argc, char *argv[])
   gtk_widget_show (window);
   g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
 
-  vbox = gtk_vbox_new (FALSE, 4);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
   gtk_widget_show (vbox);
   gtk_container_add (GTK_CONTAINER (window), vbox);
diff --git a/demo/mv-demo-animation.c b/demo/mv-demo-animation.c
index a07cc2e..7b66737 100644
--- a/demo/mv-demo-animation.c
+++ b/demo/mv-demo-animation.c
@@ -112,11 +112,11 @@ create_animation_page (void)
   GtkWidget *vbox, *hbox, *w, *scrolled_win, *canvas;
   GooCanvasItemModel *root;
 
-  vbox = gtk_vbox_new (FALSE, 4);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
   gtk_widget_show (vbox);
 
-  hbox = gtk_hbox_new (FALSE, 4);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
diff --git a/demo/mv-demo-arrowhead.c b/demo/mv-demo-arrowhead.c
index 09d6301..166d73c 100644
--- a/demo/mv-demo-arrowhead.c
+++ b/demo/mv-demo-arrowhead.c
@@ -307,7 +307,7 @@ on_button_press (GooCanvasItem *item,
                           GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_RELEASE_MASK,
                           fleur,
                           event->time);
-  gdk_cursor_unref (fleur);
+  g_object_unref (fleur);
 
   return TRUE;
 }
@@ -426,7 +426,7 @@ create_canvas_arrowhead (void)
        GtkWidget *canvas;
        GooCanvasItemModel *root, *item;
 
-       vbox = gtk_vbox_new (FALSE, 4);
+       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
        gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
        gtk_widget_show (vbox);
 
diff --git a/demo/mv-demo-clipping.c b/demo/mv-demo-clipping.c
index 1c46dc7..0d9cc1f 100644
--- a/demo/mv-demo-clipping.c
+++ b/demo/mv-demo-clipping.c
@@ -151,7 +151,7 @@ create_clipping_page (void)
 {
   GtkWidget *vbox, *scrolled_win, *canvas;
 
-  vbox = gtk_vbox_new (FALSE, 4);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
   gtk_widget_show (vbox);
 
diff --git a/demo/mv-demo-events.c b/demo/mv-demo-events.c
index 13f4387..812f7ad 100644
--- a/demo/mv-demo-events.c
+++ b/demo/mv-demo-events.c
@@ -131,7 +131,7 @@ create_events_page (void)
   GtkWidget *vbox, *alignment, *frame, *label, *canvas;
   GooCanvasItemModel *root;
 
-  vbox = gtk_vbox_new (FALSE, 4);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
   gtk_widget_show (vbox);
 
diff --git a/demo/mv-demo-features.c b/demo/mv-demo-features.c
index dcc4dc6..807c18c 100644
--- a/demo/mv-demo-features.c
+++ b/demo/mv-demo-features.c
@@ -59,7 +59,7 @@ create_canvas_features (void)
        GooCanvasItemModel *parent2;
        GooCanvasItemModel *group;
 
-       vbox = gtk_vbox_new (FALSE, 4);
+       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
        gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
        gtk_widget_show (vbox);
 
diff --git a/demo/mv-demo-fifteen.c b/demo/mv-demo-fifteen.c
index 5ea6f4c..2774e41 100644
--- a/demo/mv-demo-fifteen.c
+++ b/demo/mv-demo-fifteen.c
@@ -109,8 +109,8 @@ piece_button_press (GooCanvasItem *item,
 {
         GooCanvas *canvas;
        GooCanvasItemModel **board;
-       GooCanvasItemModel *model, *text;
-       int num, pos, newpos;
+       GooCanvasItemModel *model, *text G_GNUC_UNUSED;
+       int num G_GNUC_UNUSED, pos, newpos;
        int x, y;
        double dx = 0.0, dy = 0.0;
        int move;
@@ -250,11 +250,11 @@ create_canvas_fifteen (void)
        GtkWidget *canvas;
        GtkWidget *button;
        GooCanvasItemModel **board;
-       GooCanvasItemModel *root, *rect, *text;
+       GooCanvasItemModel *root, *rect G_GNUC_UNUSED, *text;
        int i, x, y;
        char buf[20];
 
-       vbox = gtk_vbox_new (FALSE, 4);
+       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
        gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
        gtk_widget_show (vbox);
 
diff --git a/demo/mv-demo-focus.c b/demo/mv-demo-focus.c
index 5df2fdd..d4235fc 100644
--- a/demo/mv-demo-focus.c
+++ b/demo/mv-demo-focus.c
@@ -153,7 +153,7 @@ create_focus_page (void)
 {
   GtkWidget *vbox, *label, *scrolled_win, *canvas;
 
-  vbox = gtk_vbox_new (FALSE, 4);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
   gtk_widget_show (vbox);
 
diff --git a/demo/mv-demo-grabs.c b/demo/mv-demo-grabs.c
index 6b0be0a..a56f502 100644
--- a/demo/mv-demo-grabs.c
+++ b/demo/mv-demo-grabs.c
@@ -14,9 +14,10 @@ on_widget_draw (GtkWidget *widget,
   g_print ("%s received 'draw' signal\n", item_id);
 
   gtk_widget_get_allocation (widget, &allocation);
-  gtk_paint_box (gtk_widget_get_style (widget), cr, GTK_STATE_NORMAL,
-                GTK_SHADOW_IN, widget, NULL, 0, 0,
-                allocation.width, allocation.height);
+
+  cairo_rectangle (cr, 0, 0,
+                  allocation.width, allocation.height);
+  cairo_stroke (cr);
 
   return FALSE;
 }
@@ -47,11 +48,13 @@ on_widget_motion_notify (GtkWidget *widget,
                         GdkEventMotion *event,
                         char *item_id)
 {
+  GdkDevice *device = gdk_event_get_device ((GdkEvent*) event);
+
   g_print ("%s received 'motion-notify' signal (window: %p)\n", item_id,
           event->window);
 
-  if (event->is_hint)
-    gdk_window_get_pointer (event->window, NULL, NULL, NULL);
+  if (event->is_hint && device)
+    gdk_window_get_device_position (event->window, device, NULL, NULL, NULL);
 
   return TRUE;
 }
@@ -62,9 +65,11 @@ on_widget_button_press (GtkWidget *widget,
                        GdkEventButton *event,
                        char *item_id)
 {
+  GdkDevice *device = gdk_event_get_device ((GdkEvent*) event);
+
   g_print ("%s received 'button-press' signal\n", item_id);
 
-  if (strstr (item_id, "explicit"))
+  if (device && strstr (item_id, "explicit"))
     {
       GdkGrabStatus status;
       GdkEventMask mask = GDK_BUTTON_PRESS_MASK
@@ -74,8 +79,9 @@ on_widget_button_press (GtkWidget *widget,
        | GDK_ENTER_NOTIFY_MASK
        | GDK_LEAVE_NOTIFY_MASK;
 
-      status = gdk_pointer_grab (gtk_widget_get_window (widget), FALSE, mask, FALSE, NULL,
-                                event->time);
+      status = gdk_device_grab (device, gtk_widget_get_window (widget),
+                               GDK_OWNERSHIP_NONE, FALSE, mask,
+                               NULL, event->time);
       if (status == GDK_GRAB_SUCCESS)
        g_print ("grabbed pointer\n");
       else
@@ -91,14 +97,13 @@ on_widget_button_release (GtkWidget *widget,
                          GdkEventButton *event,
                          char *item_id)
 {
+  GdkDevice *device = gdk_event_get_device ((GdkEvent*) event);
+
   g_print ("%s received 'button-release' signal\n", item_id);
 
-  if (strstr (item_id, "explicit"))
+  if (device && strstr (item_id, "explicit"))
     {
-      GdkDisplay *display;
-
-      display = gtk_widget_get_display (widget);
-      gdk_display_pointer_ungrab (display, event->time);
+      gdk_device_ungrab (device, event->time);
       g_print ("released pointer grab\n");
     }
 
diff --git a/demo/mv-demo-paths.c b/demo/mv-demo-paths.c
index 833ff7c..c5747f1 100644
--- a/demo/mv-demo-paths.c
+++ b/demo/mv-demo-paths.c
@@ -9,7 +9,7 @@ static GooCanvasItemModel *path1;
 static GooCanvasItemModel*
 create_canvas_model (void)
 {
-  GooCanvasItemModel *root, *path;
+  GooCanvasItemModel *root, *path G_GNUC_UNUSED;
 
   root = goo_canvas_group_model_new (NULL, NULL);
 
@@ -128,11 +128,11 @@ create_paths_page (void)
   GtkWidget *vbox, *hbox, *w, *scrolled_win, *canvas;
   GooCanvasItemModel *root;
 
-  vbox = gtk_vbox_new (FALSE, 4);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
   gtk_widget_show (vbox);
 
-  hbox = gtk_hbox_new (FALSE, 4);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
diff --git a/demo/mv-demo-scalability.c b/demo/mv-demo-scalability.c
index 6ce85c9..68f2f44 100644
--- a/demo/mv-demo-scalability.c
+++ b/demo/mv-demo-scalability.c
@@ -20,10 +20,10 @@ create_canvas_scalability (void)
        GtkWidget *scrolled_win, *canvas;
        GtkWidget *table;
        GdkPixbuf *pixbuf;
-       GooCanvasItemModel *root, *item;
+       GooCanvasItemModel *root, *item G_GNUC_UNUSED;
        int i, j, width, height;
 
-       vbox = gtk_vbox_new (FALSE, 4);
+       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
        gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
        gtk_widget_show (vbox);
 
diff --git a/demo/mv-demo-table.c b/demo/mv-demo-table.c
index ff9542a..b6e0b4c 100644
--- a/demo/mv-demo-table.c
+++ b/demo/mv-demo-table.c
@@ -383,7 +383,7 @@ create_table_page (void)
   GtkWidget *vbox, *scrolled_win;
   GooCanvasItemModel *root, *table;
 
-  vbox = gtk_vbox_new (FALSE, 4);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
   gtk_widget_show (vbox);
 
diff --git a/demo/mv-demo.c b/demo/mv-demo.c
index 7d385ca..434044c 100644
--- a/demo/mv-demo.c
+++ b/demo/mv-demo.c
@@ -306,7 +306,7 @@ on_button_press (GooCanvasItem *item,
                                   GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | 
GDK_BUTTON_RELEASE_MASK,
                                   fleur,
                                   event->time);
-         gdk_cursor_unref (fleur);
+         g_object_unref (fleur);
          dragging = TRUE;
        }
       break;
@@ -395,7 +395,7 @@ create_canvas_primitives (GooCanvasItemModel *model,
        GtkAdjustment *adj;
        GSList *group = NULL;
 
-       vbox = gtk_vbox_new (FALSE, 4);
+       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
        gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
        gtk_widget_show (vbox);
 
@@ -403,7 +403,7 @@ create_canvas_primitives (GooCanvasItemModel *model,
        gtk_box_pack_start (GTK_BOX (vbox), w, FALSE, FALSE, 0);
        gtk_widget_show (w);
 
-       hbox = gtk_hbox_new (FALSE, 4);
+       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
        gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
        gtk_widget_show (hbox);
 
@@ -495,7 +495,7 @@ create_canvas_primitives (GooCanvasItemModel *model,
                          G_CALLBACK (change_bounds_clicked),
                          canvas);
 
-       hbox = gtk_hbox_new (FALSE, 4);
+       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
        gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
        gtk_widget_show (hbox);
 
@@ -738,7 +738,7 @@ create_stipple (const char *color_name, guchar stipple_data[16])
 static void
 setup_rectangles (GooCanvasItemModel *root)
 {
-  GooCanvasItemModel *item;
+  GooCanvasItemModel *item G_GNUC_UNUSED;
   cairo_pattern_t *pattern;
   static guchar stipple_data[16] = {
     0, 0, 0, 255,   0, 0, 0, 0,   0, 0, 0, 0,     0, 0, 0, 255
@@ -785,7 +785,7 @@ setup_rectangles (GooCanvasItemModel *root)
 static void
 setup_ellipses (GooCanvasItemModel *root)
 {
-  GooCanvasItemModel *ellipse1, *ellipse3;
+  GooCanvasItemModel *ellipse1 G_GNUC_UNUSED, *ellipse3 G_GNUC_UNUSED;
   cairo_pattern_t *pattern;
   static guchar stipple_data[16] = {
     0, 0, 0, 255,   0, 0, 0, 0,
@@ -866,7 +866,7 @@ make_hilbert (GooCanvasItemModel *root)
   char hilbert[] = "urdrrulurulldluuruluurdrurddldrrruluurdrurddldrddlulldrdldrrurd";
   char *c;
   double *pp, *p;
-  GooCanvasItemModel *item;
+  GooCanvasItemModel *item G_GNUC_UNUSED;
   GooCanvasPoints *points;
   cairo_pattern_t *pattern;
   static guchar stipple_data[16] = {
@@ -917,7 +917,7 @@ make_hilbert (GooCanvasItemModel *root)
 static void
 setup_lines (GooCanvasItemModel *root)
 {
-  GooCanvasItemModel *polyline1, *polyline2, *polyline3, *polyline4, *polyline5;
+  GooCanvasItemModel *polyline1 G_GNUC_UNUSED, *polyline2 G_GNUC_UNUSED, *polyline3 G_GNUC_UNUSED, 
*polyline4 G_GNUC_UNUSED, *polyline5 G_GNUC_UNUSED;
 
   polish_diamond (root);
   make_hilbert (root);
@@ -978,7 +978,7 @@ setup_lines (GooCanvasItemModel *root)
 static void
 setup_polygons (GooCanvasItemModel *root)
 {
-  GooCanvasItemModel *polyline1, *polyline2;
+  GooCanvasItemModel *polyline1 G_GNUC_UNUSED, *polyline2 G_GNUC_UNUSED;
   GooCanvasPoints *points;
   cairo_pattern_t *pattern;
   static guchar stipple_data[16] = {
@@ -1044,7 +1044,7 @@ setup_polygons (GooCanvasItemModel *root)
 static GooCanvasItemModel *
 make_anchor (GooCanvasItemModel *root, double x, double y)
 {
-  GooCanvasItemModel *group, *item;
+  GooCanvasItemModel *group, *item G_GNUC_UNUSED;
   cairo_matrix_t transform = { 0.8, 0.2, -0.3, 0.5, x, y };
 
   group = goo_canvas_group_model_new (root, NULL);
@@ -1178,7 +1178,7 @@ plant_flower (GooCanvasItemModel *root,
 {
   cairo_pattern_t *pattern;
   cairo_surface_t *surface;
-  GooCanvasItemModel *image;
+  GooCanvasItemModel *image G_GNUC_UNUSED;
   double w, h;
 
   surface = cairo_image_surface_create_from_png ("flower.png");
@@ -1202,7 +1202,7 @@ static void
 setup_images (GooCanvasItemModel *root)
 {
   GdkPixbuf *im;
-  GooCanvasItemModel *image;
+  GooCanvasItemModel *image G_GNUC_UNUSED;
 
   im = gdk_pixbuf_new_from_file ("toroid.png", NULL);
 
@@ -1230,7 +1230,7 @@ setup_images (GooCanvasItemModel *root)
 static GooCanvasItemModel*
 create_static_model ()
 {
-  GooCanvasItemModel *static_root, *group, *item;
+  GooCanvasItemModel *static_root, *group, *item G_GNUC_UNUSED;
 
   static_root = goo_canvas_group_model_new (NULL, NULL);
 
@@ -1310,7 +1310,7 @@ test_simple_transforms (GooCanvasItemModel *root)
 static void
 setup_grids (GooCanvasItemModel *root)
 {
-  GooCanvasItemModel *item;
+  GooCanvasItemModel *item G_GNUC_UNUSED;
 
   item = goo_canvas_grid_model_new (root, 80, 310, 90, 90, 10, 10, 5, 5,
                                    "stroke-color", "yellow",
@@ -1447,7 +1447,7 @@ int
 main (int argc, char *argv[])
 {
   GooCanvasItemModel *model, *static_model;
-  GtkWidget *window;
+  GtkWidget *window G_GNUC_UNUSED;
 
   gtk_init (&argc, &argv);
 
diff --git a/demo/mv-generic-position-demo.c b/demo/mv-generic-position-demo.c
index 89f83b4..461789e 100644
--- a/demo/mv-generic-position-demo.c
+++ b/demo/mv-generic-position-demo.c
@@ -186,7 +186,7 @@ create_window (GooCanvasItemModel *model)
   gtk_widget_show (window);
   g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
 
-  vbox = gtk_vbox_new (FALSE, 4);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
   gtk_widget_show (vbox);
   gtk_container_add (GTK_CONTAINER (window), vbox);
diff --git a/demo/mv-table-demo.c b/demo/mv-table-demo.c
index 4df61fa..c4da473 100644
--- a/demo/mv-table-demo.c
+++ b/demo/mv-table-demo.c
@@ -229,7 +229,7 @@ main (int argc, char *argv[])
   g_signal_connect (window, "delete_event", G_CALLBACK (on_delete_event),
                    NULL);
 
-  vbox = gtk_vbox_new (FALSE, 4);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
   gtk_widget_show (vbox);
   gtk_container_add (GTK_CONTAINER (window), vbox);
diff --git a/demo/table-demo.c b/demo/table-demo.c
index 803fc43..535b5db 100644
--- a/demo/table-demo.c
+++ b/demo/table-demo.c
@@ -224,7 +224,7 @@ main (int argc, char *argv[])
   g_signal_connect (window, "delete_event", G_CALLBACK (on_delete_event),
                    NULL);
 
-  vbox = gtk_vbox_new (FALSE, 4);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
   gtk_widget_show (vbox);
   gtk_container_add (GTK_CONTAINER (window), vbox);
diff --git a/demo/units-demo.c b/demo/units-demo.c
index ce78fa5..fb2f8d0 100644
--- a/demo/units-demo.c
+++ b/demo/units-demo.c
@@ -100,11 +100,11 @@ create_canvas (GtkUnit         units,
   GtkWidget *vbox, *hbox, *w, *scrolled_win, *canvas;
   GtkAdjustment *adj;
 
-  vbox = gtk_vbox_new (FALSE, 4);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
   gtk_widget_show (vbox);
 
-  hbox = gtk_hbox_new (FALSE, 4);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
diff --git a/demo/widgets-demo.c b/demo/widgets-demo.c
index 91e45d0..1c2fb0a 100644
--- a/demo/widgets-demo.c
+++ b/demo/widgets-demo.c
@@ -281,12 +281,12 @@ main (int argc, char *argv[])
   g_signal_connect (window, "delete_event", G_CALLBACK (on_delete_event),
                    NULL);
 
-  vbox = gtk_vbox_new (FALSE, 4);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
   gtk_widget_show (vbox);
   gtk_container_add (GTK_CONTAINER (window), vbox);
 
-  hbox = gtk_hbox_new (FALSE, 4);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
@@ -315,7 +315,7 @@ main (int argc, char *argv[])
   gtk_widget_show (w);
   g_signal_connect (w, "clicked", G_CALLBACK (change_widget_clicked), NULL);
 
-  hbox = gtk_hbox_new (FALSE, 4);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
@@ -394,7 +394,7 @@ main (int argc, char *argv[])
 
   /* Create a vbox item with several child entry widgets to check focus
      traversal.*/
-  vbox = gtk_vbox_new (FALSE, 4);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
 
   entry = gtk_entry_new ();
   gtk_widget_show (entry);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]