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 b4da531cf47a068df0ed35313dad9c7d20fed6fe..bdf56e8610503eff0c999e1a348298a29940873e 100644 (file)
--- 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 536694064c3c2af400bdac41ce812ab3a6b7880e..279065282645f901369ee00bdabd9c7f1923fe9d 100644 (file)
--- 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 cb825e0076e74073bcc318cc54b6136160b4bea9..ec99ffa301d6fb01381114c35fcae1b49219ef65 100644 (file)
--- 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;