Merge the gtk-printing branch. For more detailed ChangeLog entries, see

2006-04-21  Alexander Larsson  <alexl@redhat.com>

        Merge the gtk-printing branch.
	For more detailed ChangeLog entries, see the branch.

	* .cvsignore:
	* Makefile.am:
	* configure.in:
	* docs/tools/widgets.c:
	* gtk+-unix-print-2.0.pc.in:
	* gtk/Makefile.am:
	* gtk/gen-paper-names.c:
	* gtk/gtk.h:
	* gtk/gtk.symbols:
	* gtk/gtkenums.h:
	* gtk/gtkiconfactory.c:
	* gtk/gtkmarshalers.list:
	* gtk/gtkpagesetup.[ch]:
	* gtk/gtkpagesetupunixdialog.[ch]:
	* gtk/gtkpapersize.[ch]:
	* gtk/gtkprint-win32.[ch]:
	* gtk/gtkprintbackend.[ch]:
	* gtk/gtkprintcontext.[ch]:
	* gtk/gtkprinter-private.h:
	* gtk/gtkprinter.[ch]:
	* gtk/gtkprinteroption.[ch]:
	* gtk/gtkprinteroptionset.[ch]:
	* gtk/gtkprinteroptionwidget.[ch]:
	* gtk/gtkprintjob.[ch]:
	* gtk/gtkprintoperation-private.h:
	* gtk/gtkprintoperation-unix.c:
	* gtk/gtkprintoperation-win32.c:
	* gtk/gtkprintoperation.[ch]:
	* gtk/gtkprintsettings.[ch]:
	* gtk/gtkprintunixdialog.[ch]:
	* gtk/paper_names.c:
	* gtk/paper_names_offsets.c:
	Platform independent printing API and implementations
	for unix and windows.

	* gtk/gtkstock.h:
	* gtk/stock-icons/24/gtk-orientation-landscape.png:
	* gtk/stock-icons/24/gtk-orientation-portrait.png:
	* gtk/stock-icons/24/gtk-orientation-reverse-landscape.png:
	Add stock icons for page orientation.

	* modules/Makefile.am:
	* modules/printbackends/Makefile.am:
	* modules/printbackends/cups/Makefile.am:
	* modules/printbackends/cups/gtkcupsutils.[ch]:
	* modules/printbackends/cups/gtkprintbackendcups.[ch]:
	* modules/printbackends/cups/gtkprintercups.[ch]:

	Cups printing backend for unix.

	* modules/printbackends/lpr/Makefile.am:
	* modules/printbackends/lpr/gtkprintbackendlpr.[ch]:
	lpr printing backend for unix.

	* modules/printbackends/pdf/Makefile.am:
	* modules/printbackends/pdf/gtkprintbackendpdf.[ch]:
	print-to-pdf printing backend for unix.

	* tests/.cvsignore:
	* tests/Makefile.am:
	* tests/print-editor.c:
	Test application for printing.

	* gdk/gdk.symbols:
	* gdk/win32/gdkevents-win32.c:
	* gdk/win32/gdkwin32.h:
	Add gdk_win32_set_modal_dialog_libgtk_only so that we can pump the
	mainloop while displaying a win32 common dialog.

	* gdk/directfb/Makefile.am:
	Whitespace cleanup.

1 files changed, 64 insertions, 0 deletions

diff --git a/gtk/gtkprinter-private.h b/gtk/gtkprinter-private.h
new file mode 100644
index 0000000000..49663c0da2
--- /dev/null
+++ b/gtk/gtkprinter-private.h
@@ -0,0 +1,64 @@
+/* GTK - The GIMP Toolkit
+ * gtkprintoperation.h: Print Operation
+ * Copyright (C) 2006, Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __GTK_PRINTER_PRIVATE_H__
+#define __GTK_PRINTER_PRIVATE_H__
+
+#include <glib.h>
+#include "gtkprinter.h"
+#include "gtkprintoperation.h"
+#include "gtkprinteroptionset.h"
+#include "gtkpagesetup.h"
+
+G_BEGIN_DECLS
+
+gboolean             _gtk_printer_has_details               (GtkPrinter          *printer);
+void                 _gtk_printer_request_details           (GtkPrinter          *printer);
+GtkPrinterOptionSet *_gtk_printer_get_options               (GtkPrinter          *printer,
+							     GtkPrintSettings *settings,
+							     GtkPageSetup        *page_setup);
+gboolean             _gtk_printer_mark_conflicts            (GtkPrinter          *printer,
+							     GtkPrinterOptionSet *options);
+void                 _gtk_printer_get_settings_from_options (GtkPrinter          *printer,
+							     GtkPrinterOptionSet *options,
+							     GtkPrintSettings    *settings);
+void                 _gtk_printer_prepare_for_print         (GtkPrinter          *printer,
+							     GtkPrintJob         *print_job,
+							     GtkPrintSettings    *settings,
+							     GtkPageSetup        *page_setup);
+cairo_surface_t *    _gtk_printer_create_cairo_surface      (GtkPrinter          *printer,
+							     gdouble              width,
+							     gdouble              height,
+							     gint                 cache_fd);
+GList  *             _gtk_printer_list_papers               (GtkPrinter          *printer);
+void                 _gtk_printer_get_hard_margins          (GtkPrinter          *printer,
+							     double              *top,
+							     double              *bottom,
+							     double              *left,
+							     double              *right);
+GHashTable *         _gtk_printer_get_custom_widgets        (GtkPrinter          *printer);
+
+
+/* GtkPrintJob private methods: */
+void gtk_print_job_set_status (GtkPrintJob   *job,
+			       GtkPrintStatus status);
+
+G_END_DECLS
+#endif /* __GTK_PRINT_OPERATION_PRIVATE_H__ */