From: Martin Kretzschmar <mkretzschmar@src.gnome.org>
Date: Thu, 31 Oct 2002 19:34:00 +0000 (+0000)
Subject: add field for GPdfView (gc_setup_widgets, gc_set_pdf_cb,
X-Git-Tag: XPDF_1_01~16
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=d5f6bff1a13c848afbd74dd2e82c78bbdead54d2;p=evince.git

add field for GPdfView (gc_setup_widgets, gc_set_pdf_cb,

* xpdf/gpdf-control.cc (_GpdfControlPrivate): add field for
GPdfView
(gc_setup_widgets, gc_set_pdf_cb, verb_GoPageLast_cb)
(verb_GoPageFirst_cb, verb_GoPageNext_cb, verb_GoPagePrev_cb): use
GPdfView instead of PdfView

* xpdf/gpdf-view.cc, xpdf/gpdf-view.h: widget for for GPOutputDev
to draw on. Using GnomePrintPreview.

* xpdf/GPOutputDev.cc, xpdf/GPOutputDev.h: new Gnome Print Output
Device class, strokes and fills look (surprisingly) quite okay,
font and text handling is throw-away code

* xpdf/gpdf-util.h (BEGIN_C_DECLS, END_C_DECLS): remove macros,
use those from glib
(GPDF_BOILERPLATE, GPDF_CLASS_BOILERPLATE, GPDF_REGISTER_TYPE):
macros from bonobo-macros.h and gnome-macros.h compatible with
c++ type system rules

* xpdf/OutputDev.h: declare class Object

* xpdf/Gfx.h: include Object.h

* configure.in: check for libgnomeprint(ui)-2.0
---

diff --git a/pdf/xpdf/Gfx.h b/pdf/xpdf/Gfx.h
index b4da531c..bdf56e86 100644
--- a/pdf/xpdf/Gfx.h
+++ b/pdf/xpdf/Gfx.h
@@ -14,6 +14,7 @@
 #endif
 
 #include "gtypes.h"
+#include "Object.h"
 
 class GString;
 class XRef;
diff --git a/pdf/xpdf/Makefile.am b/pdf/xpdf/Makefile.am
index 53669406..27906528 100644
--- a/pdf/xpdf/Makefile.am
+++ b/pdf/xpdf/Makefile.am
@@ -105,12 +105,16 @@ gnome_pdf_viewer_SOURCES =		\
 	BonoboStream.cc			\
 	GOutputDev.cc			\
 	GOutputDev.h			\
+	GPOutputDev.cc			\
+	GPOutputDev.h			\
 	bonobo-application-x-pdf.cc	\
 	gpdf-control.cc			\
 	gpdf-control.h			\
 	gpdf-persist-stream.cc		\
 	gpdf-persist-stream.h		\
 	gpdf-util.h			\
+	gpdf-view.cc			\
+	gpdf-view.h			\
 	gtkgesture.c			\
 	gtkgesture.h			\
 	pdf-view.cc			\
diff --git a/pdf/xpdf/OutputDev.h b/pdf/xpdf/OutputDev.h
index cb825e00..ec99ffa3 100644
--- a/pdf/xpdf/OutputDev.h
+++ b/pdf/xpdf/OutputDev.h
@@ -17,6 +17,7 @@
 #include "CharTypes.h"
 
 class GString;
+class Object;
 class GfxState;
 class GfxColorSpace;
 class GfxImageColorMap;