[goocanvas] updated simple demo code
- From: Damon Chaplin <damon src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [goocanvas] updated simple demo code
- Date: Thu, 31 Aug 2017 07:30:35 +0000 (UTC)
commit 43ac8e7f0f0851bbba1d2eaf35e2f7f78f71a532
Author: Damon Chaplin <Damon A Chaplin gmail com>
Date: Thu Aug 31 08:08:35 2017 +0100
updated simple demo code
ChangeLog | 7 ++++++-
docs/simple-canvas.xml | 7 +++----
src/goocanvas.c | 4 ++--
3 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 6dc9da4..9a8d576 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-2017-08-29 Damon Chaplin <damon localhost lan>
+2017-08-29 Damon Chaplin <damon gnome org>
+
+ * src/goocanvas.c:
+ * docs/simple-canvas.xml: updated simple demo code.
+
+2017-08-29 Damon Chaplin <damon gnome org>
* src/goocanvas.c (goo_canvas_get_bounds): Call goo_canvas_update()
if needed when automatic bounds is on. #785326
diff --git a/docs/simple-canvas.xml b/docs/simple-canvas.xml
index 6551901..085b3d6 100644
--- a/docs/simple-canvas.xml
+++ b/docs/simple-canvas.xml
@@ -42,14 +42,13 @@
GooCanvasItem *root, *rect_item, *text_item;
/* Initialize GTK+. */
- gtk_set_locale ();
gtk_init (&argc, &argv);
/* Create the window and widgets. */
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_window_set_default_size (GTK_WINDOW (window), 640, 600);
gtk_widget_show (window);
- g_signal_connect (window, "delete_event", (GtkSignalFunc) on_delete_event,
+ g_signal_connect (window, "delete_event", G_CALLBACK (on_delete_event),
NULL);
scrolled_win = gtk_scrolled_window_new (NULL, NULL);
@@ -76,14 +75,14 @@
NULL);
text_item = goo_canvas_text_new (root, "Hello World", 300, 300, -1,
- GTK_ANCHOR_CENTER,
+ GOO_CANVAS_ANCHOR_CENTER,
"font", "Sans 24",
NULL);
goo_canvas_item_rotate (text_item, 45, 300, 300);
/* Connect a signal handler for the rectangle item. */
g_signal_connect (rect_item, "button_press_event",
- (GtkSignalFunc) on_rect_button_press, NULL);
+ G_CALLBACK (on_rect_button_press), NULL);
/* Pass control to the GTK+ main event loop. */
gtk_main ();
diff --git a/src/goocanvas.c b/src/goocanvas.c
index d9a41a3..77d20e6 100644
--- a/src/goocanvas.c
+++ b/src/goocanvas.c
@@ -35,7 +35,7 @@
* window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
* gtk_window_set_default_size (GTK_WINDOW (window), 640, 600);
* gtk_widget_show (window);
- * g_signal_connect (window, "delete_event", (GtkSignalFunc) on_delete_event,
+ * g_signal_connect (window, "delete_event", G_CALLBACK (on_delete_event),
* NULL);
*
* scrolled_win = gtk_scrolled_window_new (NULL, NULL);
@@ -69,7 +69,7 @@
*
* /* Connect a signal handler for the rectangle item. */
* g_signal_connect (rect_item, "button_press_event",
- * (GtkSignalFunc) on_rect_button_press, NULL);
+ * G_CALLBACK (on_rect_button_press), NULL);
*
* /* Pass control to the GTK+ main event loop. */
* gtk_main ();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]