summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorCarlos Garcia Campos <carlosgc@gnome.org>2012-05-19 12:09:45 +0200
committerCarlos Garcia Campos <carlosgc@gnome.org>2012-05-19 12:13:02 +0200
commita24e326425e198eeb70c4d9205bb7a0a3a9db297 (patch)
tree61937e6e9c7c8912bf01a75184e9b063942fa757 /test
parent87093d1250807f660042295747a012032f84c034 (diff)
gtk-tests: Port to GTK+ 3.0
Diffstat (limited to 'test')
-rw-r--r--test/gtk-test.cc48
1 files changed, 28 insertions, 20 deletions
diff --git a/test/gtk-test.cc b/test/gtk-test.cc
index dd339fbe..a5759d7f 100644
--- a/test/gtk-test.cc
+++ b/test/gtk-test.cc
@@ -156,16 +156,14 @@ void GDKSplashOutputDev::redraw(int srcX, int srcY,
}
static gboolean
-drawing_area_expose (GtkWidget *drawing_area,
- GdkEventExpose *event,
- View *view)
+drawing_area_draw (GtkWidget *drawing_area,
+ cairo_t *cr,
+ View *view)
{
- cairo_t *cr;
GdkRectangle document;
+ GdkRectangle clip;
GdkRectangle draw;
- gdk_window_clear (drawing_area->window);
-
document.x = 0;
document.y = 0;
if (cairo_output) {
@@ -176,8 +174,10 @@ drawing_area_expose (GtkWidget *drawing_area,
document.height = view->out->getBitmapHeight();
}
- cr = gdk_cairo_create (drawing_area->window);
- if (!gdk_rectangle_intersect (&document, &event->area, &draw))
+ if (!gdk_cairo_get_clip_rectangle (cr, &clip))
+ return FALSE;
+
+ if (!gdk_rectangle_intersect (&document, &clip, &draw))
return FALSE;
if (cairo_output) {
@@ -190,8 +190,6 @@ drawing_area_expose (GtkWidget *drawing_area,
draw.width, draw.height);
}
- cairo_destroy (cr);
-
return TRUE;
}
@@ -281,6 +279,7 @@ view_new (PopplerDocument *doc)
GtkWidget *sw;
GtkWidget *vbox, *hbox;
guint n_pages;
+ PopplerPage *page;
view = g_slice_new0 (View);
@@ -291,7 +290,16 @@ view_new (PopplerDocument *doc)
G_CALLBACK (destroy_window_callback),
view);
- vbox = gtk_vbox_new (FALSE, 5);
+ page = poppler_document_get_page (doc, 0);
+ if (page) {
+ double width, height;
+
+ poppler_page_get_size (page, &width, &height);
+ gtk_window_set_default_size (GTK_WINDOW (window), (gint)width, (gint)height);
+ g_object_unref (page);
+ }
+
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
view->drawing_area = gtk_drawing_area_new ();
sw = gtk_scrolled_window_new (NULL, NULL);
@@ -305,7 +313,7 @@ view_new (PopplerDocument *doc)
gtk_box_pack_end (GTK_BOX (vbox), sw, TRUE, TRUE, 0);
gtk_widget_show (sw);
- hbox = gtk_hbox_new (FALSE, 5);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
n_pages = poppler_document_get_n_pages (doc);
view->spin_button = gtk_spin_button_new_with_range (0, n_pages - 1, 1);
@@ -333,8 +341,8 @@ view_new (PopplerDocument *doc)
}
g_signal_connect (view->drawing_area,
- "expose_event",
- G_CALLBACK (drawing_area_expose),
+ "draw",
+ G_CALLBACK (drawing_area_draw),
view);
return view;
@@ -366,27 +374,27 @@ main (int argc, char *argv [])
for (int i = 0; file_arguments[i]; i++) {
View *view;
GFile *file;
- gchar *uri;
PopplerDocument *doc;
GError *error = NULL;
file = g_file_new_for_commandline_arg (file_arguments[i]);
- uri = g_file_get_uri (file);
- g_object_unref (file);
-
- doc = poppler_document_new_from_file (uri, NULL, &error);
+ doc = poppler_document_new_from_gfile (file, NULL, NULL, &error);
if (!doc) {
+ gchar *uri;
+
+ uri = g_file_get_uri (file);
g_printerr ("Error opening document %s: %s\n", uri, error->message);
g_error_free (error);
g_free (uri);
+ g_object_unref (file);
continue;
}
+ g_object_unref (file);
view = view_new (doc);
view_list = g_list_prepend (view_list, view);
view_set_page (view, CLAMP (page, 0, poppler_document_get_n_pages (doc) - 1));
- g_free (uri);
}
gtk_main ();