diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-08-13 10:37:50 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-09-30 16:53:32 +0200 |
| commit | 1ae450504cf57457f9702684b1517fda1dd3c481 (patch) | |
| tree | 2b1fc3870594dcc01217e3e406322ab084e258ef /cui | |
| parent | 25ca657f8d0f1febaf0d5984bc862f3072ad197b (diff) | |
drop gtk2 support
Change-Id: Ie838cabfecfef7e3225c1555536d5c9cf3b43f15
Reviewed-on: https://gerrit.libreoffice.org/77405
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/Library_cui.mk | 1 | ||||
| -rw-r--r-- | cui/source/options/optgdlg.cxx | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk index 8a2bf42d79c1..54e3733daef1 100644 --- a/cui/Library_cui.mk +++ b/cui/Library_cui.mk @@ -20,7 +20,6 @@ $(eval $(call gb_Library_set_include,cui,\ $(eval $(call gb_Library_set_precompiled_header,cui,cui/inc/pch/precompiled_cui)) $(eval $(call gb_Library_add_defs,cui,\ - $(if $(filter TRUE,$(ENABLE_GTK)),-DENABLE_GTK) \ -DCUI_DLLIMPLEMENTATION \ )) diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index bcf1d7a73fab..c0b840302864 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -18,6 +18,7 @@ */ #include <config_features.h> +#include <config_vclplug.h> #include <svl/zforlist.hxx> #include <svl/currencytable.hxx> #include <svtools/langhelp.hxx> @@ -257,7 +258,7 @@ OfaMiscTabPage::OfaMiscTabPage(weld::Container* pPage, weld::DialogController* p m_xFileDlgCB->set_sensitive(false); } -#if ! ENABLE_GTK +#if !ENABLE_GTK3 m_xPrintDlgFrame->hide(); #else if (!SvtMiscOptions().IsExperimentalMode()) @@ -269,7 +270,7 @@ OfaMiscTabPage::OfaMiscTabPage(weld::Container* pPage, weld::DialogController* p m_xQuickLaunchCB->show(); //Only available in Win or if building the gtk systray -#if !defined(_WIN32) && ! ENABLE_GTK +#if !defined(_WIN32) m_xQuickStarterFrame->hide(); #endif |