diff options
| author | Thorsten Behrens <tbehrens@suse.com> | 2011-12-06 18:08:18 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2011-12-07 17:19:47 +0100 |
| commit | 0c9a7312716497e2d7384528fe08c486c565bbd7 (patch) | |
| tree | aae09d460bf4874c2269bac19cd8005b1acebaf1 /vcl | |
| parent | 435098c0ef7ed9cb52acc56d18cbca10c8f0638a (diff) | |
Revert "GdkPrinter seems optional on Gtk3, too"
This reverts commit 88a4a8d997921309a7886ed0d1dc383ee3c2f767.
Sorry, seemed to be an intermittent local problem.
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/Library_vclplug_gtk3.mk | 10 | ||||
| -rw-r--r-- | vcl/unx/gtk/app/gtkinst.cxx | 4 | ||||
| -rw-r--r-- | vcl/unx/gtk/inc/gtkprintwrapper.hxx | 4 |
3 files changed, 6 insertions, 12 deletions
diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk index fb76c6969951..ca50535412d3 100644 --- a/vcl/Library_vclplug_gtk3.mk +++ b/vcl/Library_vclplug_gtk3.mk @@ -82,7 +82,6 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_gtk3,\ $(eval $(call gb_Library_use_externals,vclplug_gtk3,\ dbus \ - gtk3 \ )) $(eval $(call gb_Library_add_exception_objects,vclplug_gtk3,\ @@ -107,7 +106,9 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gtk3,\ vcl/unx/gtk3/app/gtk3gtkinst \ vcl/unx/gtk3/app/gtk3gtksys \ vcl/unx/gtk3/app/gtk3fpicker \ + vcl/unx/gtk3/gdi/gtk3gtkprintwrapper \ vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk \ + vcl/unx/gtk3/gdi/gtk3salprn-gtk \ vcl/unx/gtk3/window/gtk3gtkframe \ vcl/unx/gtk3/window/gtk3gtkobject \ vcl/headless/svpbmp \ @@ -119,13 +120,6 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gtk3,\ vcl/headless/svpvd \ )) -ifeq ($(ENABLE_GTK3_PRINT),TRUE) -$(eval $(call gb_Library_add_exception_objects,vclplug_gtk3,\ - vcl/unx/gtk3/gdi/gtk3gtkprintwrapper \ - vcl/unx/gtk3/gdi/gtk3salprn-gtk \ -)) -endif - ifeq ($(OS),LINUX) $(eval $(call gb_Library_add_linked_libs,vclplug_gtk3,\ dl \ diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx index e9c2afa6e12a..b6eacc9b3449 100644 --- a/vcl/unx/gtk/app/gtkinst.cxx +++ b/vcl/unx/gtk/app/gtkinst.cxx @@ -401,7 +401,7 @@ void GtkInstance::AddToRecentDocumentList(const rtl::OUString& rFileUrl, const r SalInfoPrinter* GtkInstance::CreateInfoPrinter( SalPrinterQueueInfo* pQueueInfo, ImplJobSetup* pSetupData ) { -#if defined ENABLE_GTK_PRINT || defined ENABLE_GTK3_PRINT +#if defined ENABLE_GTK_PRINT || GTK_CHECK_VERSION(3,0,0) mbPrinterInit = true; // create and initialize SalInfoPrinter PspSalInfoPrinter* pPrinter = new GtkSalInfoPrinter; @@ -414,7 +414,7 @@ SalInfoPrinter* GtkInstance::CreateInfoPrinter( SalPrinterQueueInfo* pQueueInfo, SalPrinter* GtkInstance::CreatePrinter( SalInfoPrinter* pInfoPrinter ) { -#if defined ENABLE_GTK_PRINT || defined ENABLE_GTK3_PRINT +#if defined ENABLE_GTK_PRINT || GTK_CHECK_VERSION(3,0,0) mbPrinterInit = true; fprintf(stderr, "gtk printer\n"); return new GtkSalPrinter( pInfoPrinter ); diff --git a/vcl/unx/gtk/inc/gtkprintwrapper.hxx b/vcl/unx/gtk/inc/gtkprintwrapper.hxx index 6ea8a563d4aa..1df133a99548 100644 --- a/vcl/unx/gtk/inc/gtkprintwrapper.hxx +++ b/vcl/unx/gtk/inc/gtkprintwrapper.hxx @@ -33,7 +33,7 @@ #include <gtk/gtk.h> -#if defined ENABLE_GTK_PRINT || defined ENABLE_GTK3_PRINT +#if defined ENABLE_GTK_PRINT || GTK_CHECK_VERSION(3,0,0) #include <gtk/gtkunixprint.h> #if !GTK_CHECK_VERSION(3,0,0) @@ -49,7 +49,7 @@ namespace unx class GtkPrintWrapper : private boost::noncopyable { -#if defined ENABLE_GTK_PRINT || defined ENABLE_GTK3_PRINT +#if defined ENABLE_GTK_PRINT || GTK_CHECK_VERSION(3,0,0) public: GtkPrintWrapper(); ~GtkPrintWrapper(); |