diff options
| author | Thorsten Behrens <tbehrens@suse.com> | 2011-12-06 18:08:18 +0100 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@suse.com> | 2011-12-06 18:08:18 +0100 |
| commit | 1a81ca45ea9192013b4e5bdb2eb769a75b56dea5 (patch) | |
| tree | bd3bc1ad42bf37f8b1b7f12a1afbcde4dc7b4740 /vcl/unx/gtk | |
| parent | a25a01361e891b1570e3e4e338d88f66889f3142 (diff) | |
Revert "GdkPrinter seems optional on Gtk3, too"
This reverts commit 88a4a8d997921309a7886ed0d1dc383ee3c2f767.
Sorry, seemed to be an intermittent local problem.
Diffstat (limited to 'vcl/unx/gtk')
| -rw-r--r-- | vcl/unx/gtk/app/gtkinst.cxx | 4 | ||||
| -rw-r--r-- | vcl/unx/gtk/inc/gtkprintwrapper.hxx | 4 |
2 files changed, 4 insertions, 4 deletions
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(); |