AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

gtk/Makefile.am add a single-include header for the unix print stuff.

Browse Source 
2008-05-29  Michael Natterer  <mitch@imendio.org>

	* gtk/Makefile.am
	* gtk/gtkunixprint.h: add a single-include header for the unix
	print stuff.

	* gtk/gtkpagesetupunixdialog.h
	* gtk/gtkprinter.h
	* gtk/gtkprintjob.h
	* gtk/gtkprintunixdialog.h: add single-include guards that #error
	out if GTK_DISABLE_SINGLE_INCLUDES is defined and any of these
	files is included individually.

	* gtk/gtkprintbackend.h
	* gtk/gtkprinter-private.h
	* modules/printbackends/cups/gtkprintbackendcups.c
	* modules/printbackends/cups/gtkprintercups.h
	* modules/printbackends/lpr/gtkprintbackendlpr.c
	* tests/buildertest.c
	* tests/defaultvaluetest.c
	* docs/tools/widgets.c: include <gtk/gtkunixprint.h> instead of
	individual files.


svn path=/trunk/; revision=20230
This commit is contained in:
Michael Natterer 2008-05-29 09:34:53 +00:00 committed by Michael Natterer
parent 7c45a441d1
commit c8e67f3cc6
15 changed files with 80 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ChangeLog
View File

@ -1,3 +1,26 @@
2008-05-29 Michael Natterer <mitch@imendio.org>
* gtk/Makefile.am
* gtk/gtkunixprint.h: add a single-include header for the unix
print stuff.
* gtk/gtkpagesetupunixdialog.h
* gtk/gtkprinter.h
* gtk/gtkprintjob.h
* gtk/gtkprintunixdialog.h: add single-include guards that #error
out if GTK_DISABLE_SINGLE_INCLUDES is defined and any of these
files is included individually.
* gtk/gtkprintbackend.h
* gtk/gtkprinter-private.h
* modules/printbackends/cups/gtkprintbackendcups.c
* modules/printbackends/cups/gtkprintercups.h
* modules/printbackends/lpr/gtkprintbackendlpr.c
* tests/buildertest.c
* tests/defaultvaluetest.c
* docs/tools/widgets.c: include <gtk/gtkunixprint.h> instead of
individual files.
2008-05-28 Michael Natterer <mitch@imendio.com>
* gtk/gtk*.h: whitespace cleanup: remove trailing whitespace and

3
docs/tools/widgets.c
View File

@ -1,5 +1,4 @@
#include <gtk/gtkprintunixdialog.h>
#include <gtk/gtkpagesetupunixdialog.h>
#include <gtk/gtkunixprint.h>
#include <gdk/gdkkeysyms.h>
#include <X11/Xatom.h>
#include <gdkx.h>

3
gtk/Makefile.am
View File

@ -337,7 +337,8 @@ gtk_unix_print_public_h_sources = \
gtkpagesetupunixdialog.h \
gtkprintunixdialog.h \
gtkprinter.h \
gtkprintjob.h
gtkprintjob.h \
gtkunixprint.h
endif
# Installed header files without compatibility guarantees

4
gtk/gtkpagesetupunixdialog.h
View File

@ -17,6 +17,10 @@
* Boston, MA 02111-1307, USA.
*/
#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_UNIX_PRINT_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtkunixprint.h> can be included directly."
#endif
#ifndef __GTK_PAGE_SETUP_UNIX_DIALOG_H__
#define __GTK_PAGE_SETUP_UNIX_DIALOG_H__

8
gtk/gtkprintbackend.h
View File

@ -22,18 +22,16 @@
#define __GTK_PRINT_BACKEND_H__
/* This is a "semi-private" header; it is meant only for
* alternate GtkPrintDialog backend modules; no stability guarantees
* alternate GtkPrintDialog backend modules; no stability guarantees
* are made at this point
*/
#ifndef GTK_PRINT_BACKEND_ENABLE_UNSUPPORTED
#error "GtkPrintBackend is not supported API for general use"
#endif
#include <cairo.h>
#include <gtk/gtk.h>
#include "gtkprinteroptionset.h"
#include "gtkprintjob.h"
#include <gtk/gtkunixprint.h>
#include <gtk/gtkprinteroptionset.h>
G_BEGIN_DECLS

3
gtk/gtkprinter-private.h
View File

@ -22,9 +22,8 @@
#define __GTK_PRINTER_PRIVATE_H__
#include <gtk/gtk.h>
#include "gtkprinter.h"
#include <gtk/gtkunixprint.h>
#include "gtkprinteroptionset.h"
#include "gtkprintjob.h"
G_BEGIN_DECLS

4
gtk/gtkprinter.h
View File

@ -17,6 +17,10 @@
* Boston, MA 02111-1307, USA.
*/
#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_UNIX_PRINT_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtkunixprint.h> can be included directly."
#endif
#ifndef __GTK_PRINTER_H__
#define __GTK_PRINTER_H__

4
gtk/gtkprintjob.h
View File

@ -17,6 +17,10 @@
* Boston, MA 02111-1307, USA.
*/
#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_UNIX_PRINT_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtkunixprint.h> can be included directly."
#endif
#ifndef __GTK_PRINT_JOB_H__
#define __GTK_PRINT_JOB_H__

4
gtk/gtkprintunixdialog.h
View File

@ -17,6 +17,10 @@
* Boston, MA 02111-1307, USA.
*/
#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_UNIX_PRINT_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtkunixprint.h> can be included directly."
#endif
#ifndef __GTK_PRINT_UNIX_DIALOG_H__
#define __GTK_PRINT_UNIX_DIALOG_H__

31
gtk/gtkunixprint.h Normal file
View File

@ -0,0 +1,31 @@
/* GtkUnixPrint
*
* 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_UNIX_PRINT_H__
#define __GTK_UNIX_PRINT_H__
#define __GTK_UNIX_PRINT_H_INSIDE__
#include <gtk/gtkpagesetupunixdialog.h>
#include <gtk/gtkprinter.h>
#include <gtk/gtkprintjob.h>
#include <gtk/gtkprintunixdialog.h>
#undef __GTK_UNIX_PRINT_H_INSIDE__
#endif /* __GTK_UNIX_PRINT_H__ */

2
modules/printbackends/cups/gtkprintbackendcups.c
View File

@ -41,7 +41,7 @@
#include <gtk/gtk.h>
#include <gtk/gtkprintbackend.h>
#include <gtk/gtkprinter.h>
#include <gtk/gtkunixprint.h>
#include <gtk/gtkprinter-private.h>
#include "gtkprintbackendcups.h"

2
modules/printbackends/cups/gtkprintercups.h
View File

@ -24,7 +24,7 @@
#include <cups/cups.h>
#include <cups/ppd.h>
#include "gtkprinter.h"
#include <gtk/gtkunixprint.h>
G_BEGIN_DECLS

1
modules/printbackends/lpr/gtkprintbackendlpr.c
View File

@ -34,7 +34,6 @@
#include <glib/gi18n-lib.h>
#include <gtk/gtk.h>
#include "gtkprinter.h"
#include "gtkprinter-private.h"
#include "gtkprintbackendlpr.h"

1
tests/buildertest.c
View File

@ -26,7 +26,6 @@
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
#include <gtk/gtkprintjob.h>
/* Copied from gtkiconfactory.c; keep in sync! */
struct _GtkIconSet

2
tests/defaultvaluetest.c
View File

@ -22,7 +22,7 @@
#define GTK_ENABLE_BROKEN
#include <string.h>
#include <gtk/gtk.h>
#include <gtk/gtkprintunixdialog.h>
#include <gtk/gtkunixprint.h>
static void
check_property (const char *output,