[Xfce4-commits] r30000 - in xfc/trunk: . examples/ui/printing libXFCui/xfc/gtk

Bo Lorentsen bl at xfce.org
Wed Jun 10 23:55:45 CEST 2009


Author: bl
Date: 2009-06-10 21:55:45 +0000 (Wed, 10 Jun 2009)
New Revision: 30000

Modified:
   xfc/trunk/configure.ac
   xfc/trunk/examples/ui/printing/Makefile
   xfc/trunk/examples/ui/printing/printing.cc
   xfc/trunk/libXFCui/xfc/gtk/printoperation.cc
   xfc/trunk/libXFCui/xfc/gtk/printoperation.hh
   xfc/trunk/libXFCui/xfc/gtk/printoperationpreview.cc
   xfc/trunk/libXFCui/xfc/gtk/printoperationpreview.hh
   xfc/trunk/libXFCui/xfc/gtk/printoperationpreviewsignals.cc
   xfc/trunk/libXFCui/xfc/gtk/printoperationpreviewsignals.hh
   xfc/trunk/xfc-config.h.in
Log:
printing example works now, but more work is needed

Modified: xfc/trunk/configure.ac
===================================================================
--- xfc/trunk/configure.ac	2009-06-09 20:33:53 UTC (rev 29999)
+++ xfc/trunk/configure.ac	2009-06-10 21:55:45 UTC (rev 30000)
@@ -250,6 +250,8 @@
 AM_PROG_LIBTOOL
 AM_SANITY_CHECK
 
+#CXXFLAGS="-g"
+
 AC_PATH_PROGS([PERL_PATH], [perl perl5], [perl])
 AC_SUBST([PERL_PATH])
 

Modified: xfc/trunk/examples/ui/printing/Makefile
===================================================================
--- xfc/trunk/examples/ui/printing/Makefile	2009-06-09 20:33:53 UTC (rev 29999)
+++ xfc/trunk/examples/ui/printing/Makefile	2009-06-10 21:55:45 UTC (rev 30000)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # examples/ui/printing/Makefile.  Generated from Makefile.in by configure.
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -30,8 +30,8 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_triplet = i686-pc-linux-gnu
-host_triplet = i686-pc-linux-gnu
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/examples/Makefile.fragment \
 	$(top_srcdir)/examples/ui/Makefile.fragment
@@ -81,7 +81,7 @@
 AUTOCONF = ${SHELL} /home/bl/svn/XFC/missing --run autoconf
 AUTOHEADER = ${SHELL} /home/bl/svn/XFC/missing --run autoheader
 AUTOMAKE = ${SHELL} /home/bl/svn/XFC/missing --run automake-1.10
-AWK = gawk
+AWK = mawk
 CC = gcc
 CCDEPMODE = depmode=gcc3
 CFLAGS = -g -O2
@@ -95,18 +95,17 @@
 DEFS = -DHAVE_CONFIG_H
 DEMOS_SUBDIR = demos
 DEPDIR = .deps
-DOCS_SUBDIR = 
-DOXYGEN_PATH = 
+DOCS_SUBDIR = docs
+DOXYGEN_PATH = /usr/bin/doxygen
 DSYMUTIL = 
-ECHO = echo
+DUMPBIN = 
 ECHO_C = 
 ECHO_N = -n
 ECHO_T = 
 EGREP = /bin/grep -E
 EXAMPLES_SUBDIR = examples
 EXEEXT = 
-F77 = 
-FFLAGS = 
+FGREP = /bin/grep -F
 GLADE_EXAMPLESDIR = glade
 GLADE_SUBDIR = libXFCglade
 GREP = /bin/grep
@@ -115,6 +114,7 @@
 INSTALL_PROGRAM = ${INSTALL}
 INSTALL_SCRIPT = ${INSTALL}
 INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+LD = /usr/bin/ld -m elf_x86_64
 LDFLAGS = 
 LIBOBJS = 
 LIBS = \
@@ -122,12 +122,17 @@
  $(top_builddir)/libXFCui/xfc/libXFCui-$(XFC_API_VERSION).la
 
 LIBTOOL = $(SHELL) $(top_builddir)/libtool
+LIPO = 
 LN_S = ln -s
 LTLIBOBJS = 
 MAKEINFO = ${SHELL} /home/bl/svn/XFC/missing --run makeinfo
 MKDIR_P = /bin/mkdir -p
+NM = /usr/bin/nm -B
 NMEDIT = 
+OBJDUMP = objdump
 OBJEXT = o
+OTOOL = 
+OTOOL64 = 
 PACKAGE = xfc
 PACKAGE_BUGREPORT = xfc-dev at xfce.org
 PACKAGE_NAME = xfc
@@ -138,50 +143,50 @@
 PERL_PATH = /usr/bin/perl
 PKG_CONFIG = /usr/bin/pkg-config
 RANLIB = ranlib
-REFERENCE_SUBDIR = 
+REFERENCE_SUBDIR = reference
 SED = /bin/sed
 SET_MAKE = 
 SHELL = /bin/sh
-SOURCEVIEW_EXAMPLEDIR = sourceview
-SOURCEVIEW_SUBDIR = libXFCsourceview
+SOURCEVIEW_EXAMPLEDIR = 
+SOURCEVIEW_SUBDIR = 
 STRIP = strip
 VERSION = 4.3.2
 XFCEDIR = xfce4
-XFCE_PANEL_CFLAGS = -D_REENTRANT -I/usr/include/xfce4/ -I/usr/include/xfce4 -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/cairo -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12 -I/usr/include/pixman-1 -I/usr/include/atk-1.0  
-XFCE_PANEL_LIBS = -lxfce4panel -lxfcegui4 -lgtk-x11-2.0 -lxfce4util -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0  
+XFCE_PANEL_CFLAGS = -D_REENTRANT -I/usr/include/xfce4/ -I/usr/include/xfce4 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12 -I/usr/include/atk-1.0  
+XFCE_PANEL_LIBS = -lxfce4panel -lxfcegui4 -lgtk-x11-2.0 -lxfce4util -lgdk-x11-2.0 -latk-1.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lgio-2.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lglib-2.0  
 XFC_API_VERSION = 4.3
 XFC_ATK_CFLAGS = -I/usr/include/atk-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
-XFC_ATK_LIBS = -latk-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0  
+XFC_ATK_LIBS = -latk-1.0 -lgobject-2.0 -lglib-2.0  
 XFC_CAIRO_CFLAGS = -DXFC_CAIRO=1
 XFC_CAIRO_LIBS = -lcairo  
 XFC_CORE_CFLAGS = -I/usr/include/sigc++-2.0 -I/usr/lib/sigc++-2.0/include   -pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
 XFC_CORE_LIBRARY_NAME = xfccore
-XFC_CORE_LIBS = -lsigc-2.0   -Wl,--export-dynamic -pthread -lgobject-2.0 -lgmodule-2.0 -ldl -lgthread-2.0 -lrt -lglib-2.0  
-XFC_GLADE_CFLAGS = -D_REENTRANT -I/usr/include/libglade-2.0 -I/usr/include/gtk-2.0 -I/usr/include/libxml2 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12 -I/usr/include/pixman-1  
+XFC_CORE_LIBS = -lsigc-2.0   -Wl,--export-dynamic -pthread -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0  
+XFC_GLADE_CFLAGS = -D_REENTRANT -I/usr/include/libglade-2.0 -I/usr/include/gtk-2.0 -I/usr/include/libxml2 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
 XFC_GLADE_LIBRARY_NAME = xfcglade
-XFC_GLADE_LIBS = -lglade-2.0 -lgtk-x11-2.0 -lxml2 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0  
+XFC_GLADE_LIBS = -lglade-2.0 -lgtk-x11-2.0 -lxml2 -lgdk-x11-2.0 -latk-1.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lgio-2.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lglib-2.0  
 XFC_GLIB_CFLAGS = -pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
-XFC_GLIB_LIBS = -Wl,--export-dynamic -pthread -lgobject-2.0 -lgmodule-2.0 -ldl -lgthread-2.0 -lrt -lglib-2.0  
-XFC_GTK_CFLAGS = -D_REENTRANT -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12 -I/usr/include/pixman-1  
-XFC_GTK_LIBS = -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0  
+XFC_GLIB_LIBS = -Wl,--export-dynamic -pthread -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0  
+XFC_GTK_CFLAGS = -D_REENTRANT -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+XFC_GTK_LIBS = -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lgio-2.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lglib-2.0  
 XFC_LIBRARY_NAME = xfc
 XFC_LIBRARY_VERSION = 1:0:0
 XFC_MAJOR_VERSION = 4
 XFC_MICRO_VERSION = 2
 XFC_MINOR_VERSION = 3
 XFC_PANGO_CFLAGS = -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
-XFC_PANGO_LIBS = -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0  
+XFC_PANGO_LIBS = -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -lglib-2.0  
 XFC_RELEASE = 4.3
 XFC_SIGC_CFLAGS = -I/usr/include/sigc++-2.0 -I/usr/lib/sigc++-2.0/include  
 XFC_SIGC_LIBS = -lsigc-2.0  
-XFC_SOURCEVIEW_CFLAGS = -D_REENTRANT -I/usr/include/gtksourceview-1.0 -I/usr/include/gtk-2.0 -I/usr/include/libxml2 -I/usr/include/libgnomeprint-2.2 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12 -I/usr/include/pixman-1 -I/usr/include/libart-2.0  
+XFC_SOURCEVIEW_CFLAGS = 
 XFC_SOURCEVIEW_LIBRARY_NAME = xfcsourceview
-XFC_SOURCEVIEW_LIBS = -lgtksourceview-1.0 -lgtk-x11-2.0 -lgnomeprint-2-2 -lz -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lcairo -lart_lgpl_2 -lxml2 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0  
-XFC_UI_CFLAGS = -I/usr/include/sigc++-2.0 -I/usr/lib/sigc++-2.0/include   -pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/atk-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -DXFC_CAIRO=1 -D_REENTRANT -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12 -I/usr/include/pixman-1   -D_REENTRANT -I/usr/include/gtk-unix-print-2.0 -I/usr/include/gtk-2.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/lib/gtk-2.0/include -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12 -I/usr/include/pixman-1  
+XFC_SOURCEVIEW_LIBS = 
+XFC_UI_CFLAGS = -I/usr/include/sigc++-2.0 -I/usr/lib/sigc++-2.0/include   -pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/atk-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -DXFC_CAIRO=1 -D_REENTRANT -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -D_REENTRANT -I/usr/include/gtk-unix-print-2.0 -I/usr/include/gtk-2.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/lib/gtk-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
 XFC_UI_LIBRARY_NAME = xfcui
-XFC_UI_LIBS = -lsigc-2.0   -Wl,--export-dynamic -pthread -lgobject-2.0 -lgmodule-2.0 -ldl -lgthread-2.0 -lrt -lglib-2.0   -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0   -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0   -DXFC_CAIRO=1 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0  
-XFC_UNIXPRINT_CFLAGS = -D_REENTRANT -I/usr/include/gtk-unix-print-2.0 -I/usr/include/gtk-2.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/lib/gtk-2.0/include -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12 -I/usr/include/pixman-1  
-XFC_UNIXPRINT_LIBS = -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0  
+XFC_UI_LIBS = -lsigc-2.0   -Wl,--export-dynamic -pthread -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0   -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lgio-2.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lglib-2.0   -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -lglib-2.0   -DXFC_CAIRO=1 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lgio-2.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lglib-2.0  
+XFC_UNIXPRINT_CFLAGS = -D_REENTRANT -I/usr/include/gtk-unix-print-2.0 -I/usr/include/gtk-2.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/lib/gtk-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+XFC_UNIXPRINT_LIBS = -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lgio-2.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lglib-2.0  
 XFC_VERSION = 4.3.2
 abs_builddir = /home/bl/svn/XFC/examples/ui/printing
 abs_srcdir = /home/bl/svn/XFC/examples/ui/printing
@@ -189,29 +194,29 @@
 abs_top_srcdir = /home/bl/svn/XFC
 ac_ct_CC = gcc
 ac_ct_CXX = g++
-ac_ct_F77 = 
+ac_ct_DUMPBIN = 
 am__include = include
 am__leading_dot = .
 am__quote = 
 am__tar = ${AMTAR} chof - "$$tardir"
 am__untar = ${AMTAR} xf -
 bindir = ${exec_prefix}/bin
-build = i686-pc-linux-gnu
+build = x86_64-unknown-linux-gnu
 build_alias = 
-build_cpu = i686
+build_cpu = x86_64
 build_os = linux-gnu
-build_vendor = pc
+build_vendor = unknown
 builddir = .
 datadir = ${datarootdir}
 datarootdir = ${prefix}/share
 docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
 dvidir = ${docdir}
 exec_prefix = ${prefix}
-host = i686-pc-linux-gnu
+host = x86_64-unknown-linux-gnu
 host_alias = 
-host_cpu = i686
+host_cpu = x86_64
 host_os = linux-gnu
-host_vendor = pc
+host_vendor = unknown
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
@@ -220,6 +225,7 @@
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
 localstatedir = ${prefix}/var
+lt_ECHO = echo
 mandir = ${datarootdir}/man
 mkdir_p = /bin/mkdir -p
 oldincludedir = /usr/include
@@ -232,10 +238,11 @@
 srcdir = .
 sysconfdir = ${prefix}/etc
 target_alias = 
+top_build_prefix = ../../../
 top_builddir = ../../..
 top_srcdir = ../../..
 xfc_docdir = ${datarootdir}/doc/xfc-4.3
-AM_CXXFLAGS = -g -O2 -Wall -ansi --pedantic-errors -I/usr/include/sigc++-2.0 -I/usr/lib/sigc++-2.0/include   -pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/atk-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -DXFC_CAIRO=1 -D_REENTRANT -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12 -I/usr/include/pixman-1   -D_REENTRANT -I/usr/include/gtk-unix-print-2.0 -I/usr/include/gtk-2.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/lib/gtk-2.0/include -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12 -I/usr/include/pixman-1  
+AM_CXXFLAGS = -g -O2 -Wall -ansi --pedantic-errors -I/usr/include/sigc++-2.0 -I/usr/lib/sigc++-2.0/include   -pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/atk-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -DXFC_CAIRO=1 -D_REENTRANT -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -D_REENTRANT -I/usr/include/gtk-unix-print-2.0 -I/usr/include/gtk-2.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/lib/gtk-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
 INCLUDES = \
  -I$(top_builddir)/libXFCcore \
  -I$(top_builddir)/libXFCui
@@ -250,8 +257,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -326,7 +333,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS

Modified: xfc/trunk/examples/ui/printing/printing.cc
===================================================================
--- xfc/trunk/examples/ui/printing/printing.cc	2009-06-09 20:33:53 UTC (rev 29999)
+++ xfc/trunk/examples/ui/printing/printing.cc	2009-06-10 21:55:45 UTC (rev 30000)
@@ -20,18 +20,24 @@
     bool on_paginate(Gtk::PrintContext &ctx);
     void on_draw_page(Gtk::PrintContext &ctx, int page_nr);
     void on_done(Gtk::PrintOperationResult result);
+    bool on_preview (Gtk::PrintOperationPreview &preview, Gtk::PrintContext &context, Gtk::Window &parent);
+    
+    // From the preview class
+    void on_ready( Gtk::PrintContext &ctx );
+    void on_got_page_size( Gtk::PrintContext &ctx, Gtk::PageSetup &setup );
 };
 
 PagePrinting::PagePrinting() : Gtk::PrintOperationSignals( this )
 {
-    set_job_name( "XFC test print" );
-    set_unit( Gtk::UNIT_MM );
-    set_n_pages( 1 );  // only one page to print
 }
 
 void PagePrinting::on_begin_print(Gtk::PrintContext &ctx)
 {
     clog << "begin print" << endl;
+    
+    set_unit( Gtk::UNIT_MM );
+    set_n_pages( 1 );  // only one page to print
+    set_job_name( "XFC test print" );
 }
 
 bool PagePrinting::on_paginate(Gtk::PrintContext &ctx)
@@ -53,7 +59,7 @@
     clog << "page size is " << width << " x " << height << " mm" << endl;
 
     ctx.set_source_rgb(0, 0, 0);
-    ctx.set_line_width(0);
+    ctx.set_line_width(0.5);
 
     ctx.move_to((width / 2) - 20, height / 2);
     ctx.line_to((width / 2) + 20, height / 2);
@@ -62,6 +68,8 @@
     ctx.line_to(width / 2, (height / 2) + 20);
 
     ctx.stroke();
+
+    clog << "drawn the page" << endl;
 }
 
 void PagePrinting::on_done(Gtk::PrintOperationResult result)
@@ -69,6 +77,23 @@
     clog << "done (" << result << ")" << endl;
 }
 
+void PagePrinting::on_ready( Gtk::PrintContext &context )
+{
+    clog << "ready" << endl;
+}
+
+void PagePrinting::on_got_page_size( Gtk::PrintContext &ctx, Gtk::PageSetup &setup )
+{
+    clog << "got_page_size" << endl;
+}
+
+bool PagePrinting::on_preview (Gtk::PrintOperationPreview &preview, Gtk::PrintContext &context, Gtk::Window &parent)
+{
+    clog << "on_preview" << endl;
+
+    return Gtk::PrintOperationSignals::on_preview(preview, context, parent );
+} 
+
 int main( int argc, char *argv[] )
 {
     using namespace Main;
@@ -79,6 +104,9 @@
     PagePrinting prn;
 
     clog << "Make test page ..." << endl;
-    
-    return prn.run( Gtk::ACTION_PREVIEW );
+
+    Gtk::PrintOperationResult res = prn.run( Gtk::ACTION_PRINT_DIALOG );
+
+    if( res == Gtk::ERROR )
+        cerr << "Error while printing" << endl;
 }

Modified: xfc/trunk/libXFCui/xfc/gtk/printoperation.cc
===================================================================
--- xfc/trunk/libXFCui/xfc/gtk/printoperation.cc	2009-06-09 20:33:53 UTC (rev 29999)
+++ xfc/trunk/libXFCui/xfc/gtk/printoperation.cc	2009-06-10 21:55:45 UTC (rev 30000)
@@ -2,6 +2,8 @@
 #include "printoperationsignals.hh"
 #include "private/printoperationpreviewiface.hh"
 #include "private/printoperationclass.hh"
+
+#include <iostream>
 /*
  * Gtk::PrintOperationClass
  */
@@ -11,10 +13,10 @@
 
         // PrintOperation
 
-        PrintOperation::PrintOperation() : G::Object((GObject*)PrintOperationClass::create()) {}
+        PrintOperation::PrintOperation() : PrintOperationPreview((GObject*)PrintOperationClass::create()) {}
 
         PrintOperation::PrintOperation( GtkPrintOperation *op, bool owns_reference )
-            : G::Object( (GObject*)op, owns_reference ) {}
+            : PrintOperationPreview( (GObject*)op, owns_reference ) {}
         
         PrintOperation::~PrintOperation() {}
 
@@ -231,7 +233,6 @@
         gboolean PrintOperationClass::paginate_proxy(GtkPrintOperation *operation, GtkPrintContext *context )
         {
             PrintOperationSignals *signals = dynamic_cast<PrintOperationSignals*>(G::ObjectSignals::pointer((GObject*)operation));
-            
             if (signals) {         
                 return signals->on_paginate(*G::Object::wrap<PrintContext>( context ));
             } else {
@@ -260,7 +261,7 @@
                 if (g_class && g_class->preview)
                     return g_class->preview( operation, preview, context, parent );
             }
-            return false;
+            return false; // XXX, it this the propper default ?
         }
         
         void PrintOperationClass::request_page_setup_proxy(GtkPrintOperation *operation, GtkPrintContext *context,

Modified: xfc/trunk/libXFCui/xfc/gtk/printoperation.hh
===================================================================
--- xfc/trunk/libXFCui/xfc/gtk/printoperation.hh	2009-06-09 20:33:53 UTC (rev 29999)
+++ xfc/trunk/libXFCui/xfc/gtk/printoperation.hh	2009-06-10 21:55:45 UTC (rev 30000)
@@ -51,7 +51,7 @@
             FINISHED_ABORTED = GTK_PRINT_STATUS_FINISHED_ABORTED
         };
 
-        class PrintOperation : public G::Object, public PrintOperationPreview {
+        class PrintOperation : public PrintOperationPreview {
             friend class G::Object;
 
             PrintOperation(const PrintOperation &);

Modified: xfc/trunk/libXFCui/xfc/gtk/printoperationpreview.cc
===================================================================
--- xfc/trunk/libXFCui/xfc/gtk/printoperationpreview.cc	2009-06-09 20:33:53 UTC (rev 29999)
+++ xfc/trunk/libXFCui/xfc/gtk/printoperationpreview.cc	2009-06-10 21:55:45 UTC (rev 30000)
@@ -11,7 +11,7 @@
 
         // PrintOperationPreview
 
-        PrintOperationPreview::PrintOperationPreview() {}
+        PrintOperationPreview::PrintOperationPreview( GObject *inst, bool has_reference ) : G::Object( inst, has_reference ) {}
 
         PrintOperationPreview::~PrintOperationPreview() {}
     
@@ -49,7 +49,7 @@
                 (G::ObjectSignals::pointer((GObject*)preview));
             
             if (signals) {
-                signals->ready(*G::Object::wrap<PrintContext>(ctx));
+                signals->on_ready(*G::Object::wrap<PrintContext>(ctx));
             } else {
                 GtkPrintOperationPreviewIface *g_iface = get_parent_iface(preview);
                 if (g_iface && g_iface->ready)
@@ -64,7 +64,7 @@
                 (G::ObjectSignals::pointer((GObject*)preview));
             
             if(signals) {
-                signals->got_page_size( *G::Object::wrap<PrintContext>(ctx), 
+                signals->on_got_page_size( *G::Object::wrap<PrintContext>(ctx), 
                                         *G::Object::wrap<PageSetup>(setup) );
             } else {
                 GtkPrintOperationPreviewIface *g_iface = get_parent_iface(preview);

Modified: xfc/trunk/libXFCui/xfc/gtk/printoperationpreview.hh
===================================================================
--- xfc/trunk/libXFCui/xfc/gtk/printoperationpreview.hh	2009-06-09 20:33:53 UTC (rev 29999)
+++ xfc/trunk/libXFCui/xfc/gtk/printoperationpreview.hh	2009-06-10 21:55:45 UTC (rev 30000)
@@ -14,15 +14,17 @@
     
     namespace Gtk {
     
-        // The preview interface
-        class PrintOperationPreview : public virtual G::TypeInterface {
-            friend class G::Object;
-            
+        /**
+            The print operation preview interface, that really just is an interface
+            but in C++ is mostly looks like a base class, and in XFC it will init at
+            an object and not an interface.
+        */
+        class PrintOperationPreview : public G::Object {
         protected:
             /// @name Constructors
             /// @{
 
-            PrintOperationPreview();
+            PrintOperationPreview( GObject *obj, bool owns_reference = false );
             
             virtual ~PrintOperationPreview();
             
@@ -31,12 +33,12 @@
             /// @{
             
             typedef G::Signal<void, void> ReadySignalType;
-            typedef G::SignalProxy<TypeInterface, ReadySignalType> ReadySignalProxy;
+            typedef G::SignalProxy<G::TypeInterface, ReadySignalType> ReadySignalProxy;
             static const ReadySignalType ready_signal;
             ///< Report when ready
             
             typedef G::Signal<void, void> GotPageSizeSignalType;
-            typedef G::SignalProxy<TypeInterface, GotPageSizeSignalType> GotPageSizeSignalProxy;
+            typedef G::SignalProxy<G::TypeInterface, GotPageSizeSignalType> GotPageSizeSignalProxy;
             static const GotPageSizeSignalType got_page_size_signal;
             ///< report when it got the page size
             

Modified: xfc/trunk/libXFCui/xfc/gtk/printoperationpreviewsignals.cc
===================================================================
--- xfc/trunk/libXFCui/xfc/gtk/printoperationpreviewsignals.cc	2009-06-09 20:33:53 UTC (rev 29999)
+++ xfc/trunk/libXFCui/xfc/gtk/printoperationpreviewsignals.cc	2009-06-10 21:55:45 UTC (rev 30000)
@@ -5,20 +5,20 @@
 using namespace Gtk;
 
 // Make sure we only use this signal on the prober class
-PrintOperationPreviewSignals::PrintOperationPreviewSignals(PrintOperationPreview *op)
+PrintOperationPreviewSignals::PrintOperationPreviewSignals(PrintOperationPreview *op) : G::ObjectSignals( op )
 {
 }
 
 PrintOperationPreviewSignals::~PrintOperationPreviewSignals() {}
 
-void PrintOperationPreviewSignals::ready(PrintContext &ctx)
+void PrintOperationPreviewSignals::on_ready(PrintContext &ctx)
 {
     GtkPrintOperationPreviewIface *g_iface = PrintOperationPreviewIface::get_parent_iface(instance_);
     if (g_iface && g_iface->ready)
         g_iface->ready((GtkPrintOperationPreview*)instance_, (GtkPrintContext*)ctx);
 }
 
-void PrintOperationPreviewSignals::got_page_size(PrintContext &ctx, PageSetup &setup)
+void PrintOperationPreviewSignals::on_got_page_size(PrintContext &ctx, PageSetup &setup)
 {
     GtkPrintOperationPreviewIface *g_iface = PrintOperationPreviewIface::get_parent_iface(instance_);
     if (g_iface && g_iface->got_page_size)

Modified: xfc/trunk/libXFCui/xfc/gtk/printoperationpreviewsignals.hh
===================================================================
--- xfc/trunk/libXFCui/xfc/gtk/printoperationpreviewsignals.hh	2009-06-09 20:33:53 UTC (rev 29999)
+++ xfc/trunk/libXFCui/xfc/gtk/printoperationpreviewsignals.hh	2009-06-10 21:55:45 UTC (rev 30000)
@@ -7,6 +7,10 @@
 #include <xfc/gtk/printcontext.hh>
 #endif
 
+#ifndef XFC_G_OBJECT_SIGNALS_HH
+#include <xfc/glib/objectsignals.hh>
+#endif
+
 #ifndef XFC_GTK_PRINT_OPERATION_PREVIEW_HH
 #include <xfc/gtk/printoperationpreview.hh>
 #endif
@@ -15,16 +19,16 @@
     
     namespace Gtk {
     
-        class PrintOperationPreviewSignals : public virtual G::TypeInterface
+        class PrintOperationPreviewSignals : public G::ObjectSignals
         {
         protected:
             PrintOperationPreviewSignals( PrintOperationPreview *op );
             
             virtual ~PrintOperationPreviewSignals() = 0;
         public:
-            virtual void ready( PrintContext &ctx );
+            virtual void on_ready( PrintContext &ctx );
             
-            virtual void got_page_size( PrintContext &ctx, PageSetup &setup );
+            virtual void on_got_page_size( PrintContext &ctx, PageSetup &setup );
         }; 
         
     }

Modified: xfc/trunk/xfc-config.h.in
===================================================================
--- xfc/trunk/xfc-config.h.in	2009-06-09 20:33:53 UTC (rev 29999)
+++ xfc/trunk/xfc-config.h.in	2009-06-10 21:55:45 UTC (rev 30000)
@@ -45,6 +45,10 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#undef LT_OBJDIR
+
 /* Define to the address where bug reports for this package should be sent. */
 #undef PACKAGE_BUGREPORT
 




More information about the Xfce4-commits mailing list