From b14e1f7d0f1ef046ab08bc114cec7dac6c89bd2c Mon Sep 17 00:00:00 2001 From: Martin Kretzschmar Date: Thu, 29 May 2003 11:08:28 +0000 Subject: [PATCH] add tests for GPdfControl * xpdf/tests/test-gpdf-control.cc: add tests for GPdfControl * xpdf/tests/Makefile.am, xpdf/tests/.cvsignore: add test-gpdf-control * xpdf/gpdf-control.cc: use BONOBO_CLASS_BOILERPLATE. (gpdf_control_new, gpdf_control_construct): kill, use construct time properties. (gpdf_control_class_init): install constructor, properties persist-stream and persist-file. (gpdf_control_constructor): constructor impl. (gpdf_control_setup_page_control, gpdf_control_setup_zoomable) (gpdf_control_setup_view_widgets): renamed from gc_setup_foo. (gpdf_control_setup_persist): ditto, connect to PersistFile, too. (gpdf_control_set_property): impl. (persist_file_set_pdf_cb): signal callback. (persist_stream_set_pdf_cb): renamed from gc_set_pdf_cb. (gpdf_control_pdf_doc_changed): factored out from gc_set_pdf_cb. (verb_FileProperties_cb): get PDFDoc from priv. * xpdf/gpdf-control.h: kill gpdf_control_new and _construct, * xpdf/bonobo-application-x-pdf.cc (gpdf_factory): also give the control a PersistFile implementation * xpdf/Makefile.am: moved more code into libgpdf.a. * xpdf/GNOME_PDF.server.in.in: state that we implement Bonobo/PersistFile. * shell/gpdf.c (bonobo_stream_for_uri): kill. (gw_control_load_pdf): changed to load through PersistFile. --- pdf/xpdf/Makefile.am | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/pdf/xpdf/Makefile.am b/pdf/xpdf/Makefile.am index f0b2d018..5c2356d6 100644 --- a/pdf/xpdf/Makefile.am +++ b/pdf/xpdf/Makefile.am @@ -34,6 +34,7 @@ libxpdf_a_SOURCES = \ Annot.h \ Array.cc \ Array.h \ + BaseFile.h \ BuiltinFont.cc \ BuiltinFont.h \ BuiltinFontTables.cc \ @@ -76,6 +77,8 @@ libxpdf_a_SOURCES = \ Object.h \ Outline.cc \ Outline.h \ + OutputDev.cc \ + OutputDev.h \ Page.cc \ Page.h \ Parser.cc \ @@ -96,7 +99,6 @@ libxpdf_a_SOURCES = \ XRef.h common_sources = \ - BaseFile.h \ CharTypes.h \ CompactFontTables.h \ DisplayFontTable.h \ @@ -104,8 +106,6 @@ common_sources = \ FTFont.cc \ FTFont.h \ NameToUnicodeTable.h \ - OutputDev.cc \ - OutputDev.h \ SFont.cc \ SFont.h \ T1Font.cc \ @@ -121,6 +121,11 @@ libgpdf_a_SOURCES = \ BonoboStream.h \ GnomeVFSStream.cc \ GnomeVFSStream.h \ + GPOutputDev.cc \ + GPOutputDev.h \ + gpdf-control.cc \ + gpdf-control.h \ + gpdf-g-switch.h \ gpdf-link-canvas-item.cc \ gpdf-link-canvas-item.h \ gpdf-links-canvas-layer.cc \ @@ -128,16 +133,7 @@ libgpdf_a_SOURCES = \ gpdf-persist-file.cc \ gpdf-persist-file.h \ gpdf-persist-stream.cc \ - gpdf-persist-stream.h - -gnome_pdf_viewer_SOURCES = \ - $(common_sources) \ - GPOutputDev.cc \ - GPOutputDev.h \ - bonobo-application-x-pdf.cc \ - gpdf-control.cc \ - gpdf-control.h \ - gpdf-g-switch.h \ + gpdf-persist-stream.h \ gpdf-stock-icons.c \ gpdf-stock-icons.h \ gpdf-util.h \ @@ -145,8 +141,6 @@ gnome_pdf_viewer_SOURCES = \ gpdf-view.h \ gtkgesture.c \ gtkgesture.h \ - nautilus-pdf-property-page.cc \ - nautilus-pdf-property-page.h \ page-control.c \ page-control.h \ pdf-info-dict-util.cc \ @@ -155,6 +149,12 @@ gnome_pdf_viewer_SOURCES = \ pdf-properties-display.h \ $(marshal_sources) +gnome_pdf_viewer_SOURCES = \ + $(common_sources) \ + bonobo-application-x-pdf.cc \ + nautilus-pdf-property-page.cc \ + nautilus-pdf-property-page.h + # Old files # GOutputDev.cc \ -- 2.43.5