Attachment 52572 Details for Bug 37497 – avoid use of deprecated functions

[patch] avoid use of deprecated functions

0001-glib-demo-Do-not-use-deprecated-GTK-functions.patch (text/plain), 8.80 KB, created by David King on 2011-10-20 02:10:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David King

Created: 2011-10-20 02:10:58 UTC

Size: 8.80 KB

patch

obsolete

>From 02fb9e40afc7917d29c7ba6fe93e4e34d84c4560 Mon Sep 17 00:00:00 2001
>From: David King <amigadave@amigadave.com>
>Date: Thu, 20 Oct 2011 10:45:41 +0200
>Subject: [PATCH] glib-demo: Do not use deprecated GTK+ functions
>
>Use GtkComboBoxText rather than the convenience GtkComboBox text API.
>Remove the call to gtk_dialog_set_has_separator, as dialogs now do not
>have separators by default. Use gdk_cairo_set_source_pixbuf rather than
>gdk_draw_pixbuf. Bump the required GTK+ version to 2.24.
>
>Avoids implicit function decleration warnings and fixes bug 37497.
>---
> cmake/modules/FindGTK.cmake |    2 +-
> configure.ac                |    4 ++--
> glib/demo/annots.c          |    6 +++---
> glib/demo/main.c            |    1 -
> glib/demo/print.c           |    8 ++++----
> glib/demo/render.c          |   38 ++++++++++++++++----------------------
> glib/demo/selections.c      |   10 +++++-----
> 7 files changed, 31 insertions(+), 38 deletions(-)
>
>diff --git a/cmake/modules/FindGTK.cmake b/cmake/modules/FindGTK.cmake
>index 4d66bd3..0e9168a 100644
>--- a/cmake/modules/FindGTK.cmake
>+++ b/cmake/modules/FindGTK.cmake
>@@ -15,7 +15,7 @@ include(FindPackageHandleStandardArgs)
> if (NOT WIN32)
>   find_package(PkgConfig REQUIRED)
> 
>-  pkg_check_modules(GTK2 "gtk+-2.0>=2.14" "gdk-pixbuf-2.0" "gthread-2.0" "gio-2.0")
>+  pkg_check_modules(GTK2 "gtk+-2.0>=2.24" "gdk-pixbuf-2.0" "gthread-2.0" "gio-2.0")
> 
>   find_package_handle_standard_args(GTK DEFAULT_MSG GTK2_LIBRARIES GTK2_CFLAGS)
> 
>diff --git a/configure.ac b/configure.ac
>index f64aa49..59226f6 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -521,9 +521,9 @@ AC_ARG_ENABLE(gtk-test,
>               enable_gtk_test=$enableval,
>               enable_gtk_test="try")
> if test x$enable_gtk_test = xyes; then
>-  PKG_CHECK_MODULES(GTK_TEST, gtk+-2.0 >= 2.14 gdk-pixbuf-2.0 gthread-2.0 gio-2.0)
>+  PKG_CHECK_MODULES(GTK_TEST, gtk+-2.0 >= 2.24 gdk-pixbuf-2.0 gthread-2.0 gio-2.0)
> elif test x$enable_gtk_test = xtry; then
>-  PKG_CHECK_MODULES(GTK_TEST, gtk+-2.0 >= 2.14 gdk-pixbuf-2.0 gthread-2.0 gio-2.0,
>+  PKG_CHECK_MODULES(GTK_TEST, gtk+-2.0 >= 2.24 gdk-pixbuf-2.0 gthread-2.0 gio-2.0,
>                     [enable_gtk_test="yes"],
>                     [enable_gtk_test="no"])
> fi
>diff --git a/glib/demo/annots.c b/glib/demo/annots.c
>index 9d99c34..fbbd4e4 100644
>--- a/glib/demo/annots.c
>+++ b/glib/demo/annots.c
>@@ -666,9 +666,9 @@ pgd_annots_add_annot (GtkWidget     *button,
> 
>     vbox = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
> 
>-    type_selector = gtk_combo_box_new_text ();
>-    gtk_combo_box_append_text (GTK_COMBO_BOX (type_selector), "POPPLER_ANNOT_UNKNOWN");
>-    gtk_combo_box_append_text (GTK_COMBO_BOX (type_selector), "POPPLER_ANNOT_TEXT");
>+    type_selector = gtk_combo_box_text_new ();
>+    gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (type_selector), "POPPLER_ANNOT_UNKNOWN");
>+    gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (type_selector), "POPPLER_ANNOT_TEXT");
>     gtk_combo_box_set_active (GTK_COMBO_BOX (type_selector), 1);
>     gtk_box_pack_start (GTK_BOX (vbox), type_selector, TRUE, TRUE, 0);
>     gtk_widget_show (type_selector);
>diff --git a/glib/demo/main.c b/glib/demo/main.c
>index 4b9a536..fc722eb 100644
>--- a/glib/demo/main.c
>+++ b/glib/demo/main.c
>@@ -180,7 +180,6 @@ pgd_demo_get_auth_dialog (GFile *uri_file)
> 	action_area = gtk_dialog_get_action_area (dialog);
> 
> 	/* Set the dialog up with HIG properties */
>-	gtk_dialog_set_has_separator (dialog, FALSE);
> 	gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
> 	gtk_box_set_spacing (GTK_BOX (content_area), 2); /* 2 * 5 + 2 = 12 */
> 	gtk_container_set_border_width (GTK_CONTAINER (action_area), 5);
>diff --git a/glib/demo/print.c b/glib/demo/print.c
>index d1c89a9..a8cdbdd 100644
>--- a/glib/demo/print.c
>+++ b/glib/demo/print.c
>@@ -121,11 +121,11 @@ pgd_print_create_custom_widget (GtkPrintOperation *op,
>         gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
>         gtk_widget_show (label);
> 
>-        combo = gtk_combo_box_new_text ();
>+        combo = gtk_combo_box_text_new ();
>         demo->options_combo = combo;
>-        gtk_combo_box_append_text (GTK_COMBO_BOX (combo), "Document");
>-        gtk_combo_box_append_text (GTK_COMBO_BOX (combo), "Document and markup");
>-        gtk_combo_box_append_text (GTK_COMBO_BOX (combo), "Document and stamps");
>+        gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "Document");
>+        gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "Document and markup");
>+        gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "Document and stamps");
>         gtk_combo_box_set_active (GTK_COMBO_BOX (combo), options);
>         gtk_box_pack_start (GTK_BOX (hbox), combo, FALSE, FALSE, 0);
>         gtk_widget_show (combo);
>diff --git a/glib/demo/render.c b/glib/demo/render.c
>index 1fa4761..b469423 100644
>--- a/glib/demo/render.c
>+++ b/glib/demo/render.c
>@@ -80,6 +80,8 @@ pgd_render_drawing_area_expose (GtkWidget      *area,
> 				GdkEventExpose *event,
> 				PgdRenderDemo  *demo)
> {
>+	cairo_t *cr;
>+
> 	if (demo->mode == PGD_RENDER_CAIRO && !demo->surface)
> 		return FALSE;
> 
>@@ -88,27 +90,19 @@ pgd_render_drawing_area_expose (GtkWidget      *area,
> 
> 	gdk_window_clear (gtk_widget_get_window (area));
> 
>-	if (demo->mode == PGD_RENDER_CAIRO) {
>-		cairo_t *cr;
>+	cr = gdk_cairo_create (gtk_widget_get_window (area));
> 
>-		cr = gdk_cairo_create (gtk_widget_get_window (area));
>+	if (demo->mode == PGD_RENDER_CAIRO) {
> 		cairo_set_source_surface (cr, demo->surface, 0, 0);
>-		cairo_paint (cr);
>-		cairo_destroy (cr);
> 	} else if (demo->mode == PGD_RENDER_PIXBUF) {
>-		gdk_draw_pixbuf (gtk_widget_get_window (area),
>-				 gtk_widget_get_style(area)->fg_gc[GTK_STATE_NORMAL],
>-				 demo->pixbuf,
>-				 0, 0,
>-				 0, 0,
>-				 gdk_pixbuf_get_width (demo->pixbuf),
>-				 gdk_pixbuf_get_height (demo->pixbuf),
>-				 GDK_RGB_DITHER_NORMAL,
>-				 0, 0);
>+		gdk_cairo_set_source_pixbuf (cr, demo->pixbuf, 0, 0);
> 	} else {
> 		g_assert_not_reached ();
> 	}
> 
>+	cairo_paint (cr);
>+	cairo_destroy (cr);
>+
> 	return TRUE;
> }
> 
>@@ -372,11 +366,11 @@ pgd_render_properties_selector_create (PgdRenderDemo *demo)
> 	gtk_box_pack_start (GTK_BOX (rotate_hbox), label, TRUE, TRUE, 0);
> 	gtk_widget_show (label);
> 
>-	rotate_selector = gtk_combo_box_new_text ();
>-	gtk_combo_box_append_text (GTK_COMBO_BOX (rotate_selector), "0");
>-	gtk_combo_box_append_text (GTK_COMBO_BOX (rotate_selector), "90");
>-	gtk_combo_box_append_text (GTK_COMBO_BOX (rotate_selector), "180");
>-	gtk_combo_box_append_text (GTK_COMBO_BOX (rotate_selector), "270");
>+	rotate_selector = gtk_combo_box_text_new ();
>+	gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (rotate_selector), "0");
>+	gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (rotate_selector), "90");
>+	gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (rotate_selector), "180");
>+	gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (rotate_selector), "270");
> 	gtk_combo_box_set_active (GTK_COMBO_BOX (rotate_selector), 0);
> 	g_signal_connect (G_OBJECT (rotate_selector), "changed",
> 			  G_CALLBACK (pgd_render_rotate_selector_changed),
>@@ -393,10 +387,10 @@ pgd_render_properties_selector_create (PgdRenderDemo *demo)
> 	gtk_box_pack_start (GTK_BOX (mode_hbox), label, TRUE, TRUE, 0);
> 	gtk_widget_show (label);
> 
>-	mode_selector = gtk_combo_box_new_text ();
>-	gtk_combo_box_append_text (GTK_COMBO_BOX (mode_selector), "cairo");
>+	mode_selector = gtk_combo_box_text_new ();
>+	gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (mode_selector), "cairo");
> #ifdef POPPLER_WITH_GDK
>-	gtk_combo_box_append_text (GTK_COMBO_BOX (mode_selector), "pixbuf");
>+	gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (mode_selector), "pixbuf");
> #endif
> 	gtk_combo_box_set_active (GTK_COMBO_BOX (mode_selector), 0);
> 	g_signal_connect (G_OBJECT (mode_selector), "changed",
>diff --git a/glib/demo/selections.c b/glib/demo/selections.c
>index 27c053b..109f06e 100644
>--- a/glib/demo/selections.c
>+++ b/glib/demo/selections.c
>@@ -538,11 +538,11 @@ pgd_selections_properties_selector_create (PgdSelectionsDemo *demo)
> 	gtk_box_pack_start (GTK_BOX (rotate_hbox), label, TRUE, TRUE, 0);
> 	gtk_widget_show (label);
> 
>-	rotate_selector = gtk_combo_box_new_text ();
>-	gtk_combo_box_append_text (GTK_COMBO_BOX (rotate_selector), "0");
>-	gtk_combo_box_append_text (GTK_COMBO_BOX (rotate_selector), "90");
>-	gtk_combo_box_append_text (GTK_COMBO_BOX (rotate_selector), "180");
>-	gtk_combo_box_append_text (GTK_COMBO_BOX (rotate_selector), "270");
>+	rotate_selector = gtk_combo_box_text_new ();
>+	gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (rotate_selector), "0");
>+	gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (rotate_selector), "90");
>+	gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (rotate_selector), "180");
>+	gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (rotate_selector), "270");
> 	gtk_combo_box_set_active (GTK_COMBO_BOX (rotate_selector), 0);
> #if 0
> 	g_signal_connect (G_OBJECT (rotate_selector), "changed",
>-- 
>1.7.3.4
>

Actions: View | Splinter Review

Attachments on bug 37497: 52572

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.