diff options
| author | Owen Taylor <otaylor@redhat.com> | 2004-12-22 03:14:27 (GMT) |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2004-12-22 03:14:27 (GMT) |
| commit | 1e247284337090fd8f65e4c191652647d95a36ac (patch) | |
| tree | cb0c3ba868be954c7e794a0acde03ecbbf435c92 /shell | |
| parent | ff8d0330fc705c931a40d07e28eb4060f1dd92f9 (diff) | |
Hook things up a bit, it works! (sort of)
Tue Dec 21 21:58:56 2004 Owen Taylor <otaylor@redhat.com>
* pdf/xpdf/pdf-document.cc shell/ev-view.c: Hook things up
a bit, it works! (sort of)
* pdf/xpdf/Makefile.am pdf/xpdf/pdf-document.cc:
Move to .cc since we need to use C++ in the implementation.
* shell/dummy.cc: Add a CC file to force evince
to be linked as a C++ program.x
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/Makefile.am | 1 | ||||
| -rw-r--r-- | shell/dummy.cc | 7 | ||||
| -rw-r--r-- | shell/ev-view.c | 20 |
3 files changed, 24 insertions, 4 deletions
diff --git a/shell/Makefile.am b/shell/Makefile.am index e764e3a..48aa917 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -13,6 +13,7 @@ INCLUDES= \ bin_PROGRAMS=evince evince_SOURCES= \ + dummy.cc \ eggfindbar.c \ eggfindbar.h \ ev-application.c \ diff --git a/shell/dummy.cc b/shell/dummy.cc new file mode 100644 index 0000000..645049d --- /dev/null +++ b/shell/dummy.cc @@ -0,0 +1,7 @@ +/* This file is just here to fake automake into linking evince as a C++ app + */ + +void evince_cpp_stub_dummy (void) +{ +} + diff --git a/shell/ev-view.c b/shell/ev-view.c index 70b50e0..9fbc81a 100644 --- a/shell/ev-view.c +++ b/shell/ev-view.c @@ -223,8 +223,9 @@ ev_view_realize (GtkWidget *widget) gdk_window_set_user_data (view->bin_window, widget); gdk_window_show (view->bin_window); - attributes.event_mask = GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_MOTION_MASK | GDK_EXPOSURE_MASK; - + if (view->document) + ev_document_set_target (view->document, view->bin_window); + update_window_backgrounds (view); } @@ -233,10 +234,13 @@ ev_view_unrealize (GtkWidget *widget) { EvView *view = EV_VIEW (widget); + if (view->document) + ev_document_set_target (view->document, NULL); + gdk_window_set_user_data (view->bin_window, NULL); gdk_window_destroy (view->bin_window); view->bin_window = NULL; - + GTK_WIDGET_CLASS (ev_view_parent_class)->unrealize (widget); } @@ -258,7 +262,12 @@ static void expose_bin_window (GtkWidget *widget, GdkEventExpose *event) { - /* EvView *view = EV_VIEW (widget); */ + EvView *view = EV_VIEW (widget); + + if (view->document) + ev_document_render (view->document, + event->area.x, event->area.y, + event->area.width, event->area.height); } static gboolean @@ -417,6 +426,9 @@ ev_view_set_document (EvView *view, if (view->document) g_object_ref (view->document); + if (GTK_WIDGET_REALIZED (view)) + ev_document_set_target (view->document, view->bin_window); + gtk_widget_queue_resize (GTK_WIDGET (view)); } } |