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>

7 files changed, 3 insertions, 178 deletions

diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx
index f1750b7dc3a6..84e2d19f6c94 100644
--- a/vcl/inc/unx/gtk/gtkdata.hxx
+++ b/vcl/inc/unx/gtk/gtkdata.hxx
@@ -42,44 +42,22 @@ class DocumentFocusListener;
 
 inline GdkWindow * widget_get_window(GtkWidget *widget)
 {
-#if GTK_CHECK_VERSION(3,0,0)
     return gtk_widget_get_window(widget);
-#else
-    return widget->window;
-#endif
 }
 
 inline ::Window widget_get_xid(GtkWidget *widget)
 {
-#if GTK_CHECK_VERSION(3,0,0)
     return GDK_WINDOW_XID(gtk_widget_get_window(widget));
-#else
-    return GDK_WINDOW_XWINDOW(widget->window);
-#endif
 }
 
 inline void widget_set_can_focus(GtkWidget *widget, gboolean can_focus)
 {
-#if GTK_CHECK_VERSION(3,0,0)
     return gtk_widget_set_can_focus(widget, can_focus);
-#else
-    if (can_focus)
-        GTK_WIDGET_SET_FLAGS( widget, GTK_CAN_FOCUS );
-    else
-        GTK_WIDGET_UNSET_FLAGS( widget, GTK_CAN_FOCUS );
-#endif
 }
 
 inline void widget_set_can_default(GtkWidget *widget, gboolean can_default)
 {
-#if GTK_CHECK_VERSION(3,0,0)
     return gtk_widget_set_can_default(widget, can_default);
-#else
-    if (can_default)
-        GTK_WIDGET_SET_FLAGS( widget, GTK_CAN_DEFAULT );
-    else
-        GTK_WIDGET_UNSET_FLAGS( widget, GTK_CAN_DEFAULT );
-#endif
 }
 
 class GtkSalTimer final : public SalTimer
@@ -132,11 +110,7 @@ public:
 
 class GtkSalFrame;
 
-#if GTK_CHECK_VERSION(3,0,0)
 class GtkSalDisplay : public SalGenericDisplay
-#else
-class GtkSalDisplay : public SalDisplay
-#endif
 {
     GtkSalSystem*                   m_pSys;
     GdkDisplay* const               m_pGdkDisplay;
@@ -161,20 +135,11 @@ public:
 
     virtual void deregisterFrame( SalFrame* pFrame ) override;
     GdkCursor *getCursor( PointerStyle ePointerStyle );
-#if GTK_CHECK_VERSION(3,0,0)
     virtual int CaptureMouse( SalFrame* pFrame );
-#else
-    virtual int CaptureMouse( SalFrame* pFrame ) override;
-#endif
 
     SalX11Screen GetDefaultXScreen() { return m_pSys->GetDisplayDefaultXScreen(); }
     Size         GetScreenSize( int nDisplayScreen );
     int          GetXScreenCount() { return m_pSys->GetDisplayXScreenCount(); }
-#if GTK_CHECK_VERSION(3,0,0)
-//    int          GetScreenCount() { return m_pSys->GetDisplayScreenCount(); }
-#else
-    virtual ScreenData *initScreen( SalX11Screen nXScreen ) const override;
-#endif
 
     GdkFilterReturn filterGdkEvent( GdkXEvent* sys_event );
     void startupNotificationCompleted() { m_bStartupCompleted = true; }
@@ -185,12 +150,7 @@ public:
     virtual void TriggerUserEventProcessing() override;
     virtual void TriggerAllUserEventsProcessed() override;
 
-#if !GTK_CHECK_VERSION(3,0,0)
-    virtual bool Dispatch( XEvent *pEvent ) override;
-#endif
-#if GTK_CHECK_VERSION(3,0,0)
     void RefreshMenusUnity();
-#endif
 };
 
 inline GtkSalData* GetGtkSalData()
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index 084339f96d70..f9a41c6c3cf6 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -24,9 +24,7 @@
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
-#if GTK_CHECK_VERSION(3,0,0)
-#  include <gtk/gtkx.h>
-#endif
+#include <gtk/gtkx.h>
 #include <gdk/gdkkeysyms.h>
 
 #include <salframe.hxx>
@@ -54,7 +52,6 @@
 class GtkSalGraphics;
 class GtkSalDisplay;
 
-#if GTK_CHECK_VERSION(3,0,0)
 typedef sal_uIntPtr GdkNativeWindow;
 #define GDK_WINDOW_XWINDOW(o) GDK_WINDOW_XID(o)
 #define gdk_set_sm_client_id(i) gdk_x11_set_sm_client_id(i)
@@ -62,11 +59,6 @@ typedef sal_uIntPtr GdkNativeWindow;
 class GtkDropTarget;
 class GtkDragSource;
 class GtkDnDTransferable;
-#endif
-
-#if !(GLIB_MAJOR_VERSION > 2 || GLIB_MINOR_VERSION >= 26)
-    typedef void GDBusConnection;
-#endif
 
 class GtkSalMenu;
 
@@ -172,10 +164,8 @@ class GtkSalFrame : public SalFrame
 
     SalX11Screen                    m_nXScreen;
     GtkWidget*                      m_pWindow;
-#if GTK_CHECK_VERSION(3,0,0)
     GtkHeaderBar*                   m_pHeaderBar;
     GtkGrid*                        m_pTopLevelGrid;
-#endif
     GtkEventBox*                    m_pEventBox;
     GtkFixed*                       m_pFixedContainer;
     GdkWindow*                      m_pForeignParent;
@@ -208,7 +198,6 @@ class GtkSalFrame : public SalFrame
     Size                            m_aMinSize;
     tools::Rectangle                       m_aRestorePosSize;
 
-#if GTK_CHECK_VERSION(3,0,0)
     OUString                        m_aTooltip;
     tools::Rectangle                m_aHelpArea;
     tools::Rectangle                m_aFloatRect;
@@ -220,10 +209,6 @@ class GtkSalFrame : public SalFrame
     GtkDropTarget*                  m_pDropTarget;
     GtkDragSource*                  m_pDragSource;
     bool                            m_bGeometryIsProvisional;
-#else
-    GdkRegion*                      m_pRegion;
-    bool                            m_bSetFocusOnMap;
-#endif
 
     GtkSalMenu*                     m_pSalMenu;
 
@@ -242,12 +227,7 @@ class GtkSalFrame : public SalFrame
 
     // signals
     static gboolean     signalButton( GtkWidget*, GdkEventButton*, gpointer );
-#if GTK_CHECK_VERSION(3,0,0)
     static void         signalStyleUpdated(GtkWidget*, gpointer);
-#else
-    static void         signalStyleSet(GtkWidget*, GtkStyle* pPrevious, gpointer);
-#endif
-#if GTK_CHECK_VERSION(3,0,0)
     static gboolean     signalDraw( GtkWidget*, cairo_t *cr, gpointer );
     static void         signalRealize(GtkWidget*, gpointer frame);
     static void         sizeAllocated(GtkWidget*, GdkRectangle *pAllocation, gpointer frame);
@@ -270,11 +250,6 @@ class GtkSalFrame : public SalFrame
 
     static void         gestureSwipe(GtkGestureSwipe* gesture, gdouble velocity_x, gdouble velocity_y, gpointer frame);
     static void         gestureLongPress(GtkGestureLongPress* gesture, gdouble x, gdouble y, gpointer frame);
-#else
-    static gboolean     signalExpose( GtkWidget*, GdkEventExpose*, gpointer );
-    void askForXEmbedFocus( sal_Int32 nTimecode );
-    void grabKeyboard(bool bGrab);
-#endif
     static gboolean     signalFocus( GtkWidget*, GdkEventFocus*, gpointer );
     static gboolean     signalMap( GtkWidget*, GdkEvent*, gpointer );
     static gboolean     signalUnmap( GtkWidget*, GdkEvent*, gpointer );
@@ -345,7 +320,6 @@ class GtkSalFrame : public SalFrame
     void SetScreen( unsigned int nNewScreen, SetType eType, tools::Rectangle const *pSize = nullptr );
 
 public:
-#if GTK_CHECK_VERSION(3,0,0)
     cairo_surface_t*                m_pSurface;
     basegfx::B2IVector              m_aFrameSize;
     DamageHandler                   m_aDamageHandler;
@@ -353,7 +327,6 @@ public:
     Idle                            m_aSmoothScrollIdle;
     int                             m_nGrabLevel;
     bool                            m_bSalObjectSetPosSize;
-#endif
     GtkSalFrame( SalFrame* pParent, SalFrameStyleFlags nStyle );
     GtkSalFrame( SystemParentData* pSysData );
 
@@ -374,9 +347,7 @@ public:
     GtkFixed*   getFixedContainer() const { return m_pFixedContainer; }
     GtkEventBox* getEventBox() const { return m_pEventBox; }
     GtkWidget*  getMouseEventWidget() const;
-#if GTK_CHECK_VERSION(3,0,0)
     GtkGrid*    getTopLevelGridWidget() const { return m_pTopLevelGrid; }
-#endif
     GdkWindow*  getForeignParent() const { return m_pForeignParent; }
     GdkNativeWindow getForeignParentWindow() const { return m_aForeignParentWindow; }
     GdkWindow*  getForeignTopLevel() const { return m_pForeignTopLevel; }
@@ -385,8 +356,6 @@ public:
     int          GetDisplayScreen() const { return maGeometry.nDisplayScreenNumber; }
     void updateScreenNumber();
 
-#if GTK_CHECK_VERSION(3,0,0)
-    // only for gtk3 ...
     cairo_t* getCairoContext() const;
     void damaged(sal_Int32 nExtentsLeft, sal_Int32 nExtentsTop,
                  sal_Int32 nExtentsRight, sal_Int32 nExtentsBottom) const;
@@ -428,7 +397,6 @@ public:
     void LaunchAsyncScroll(GdkEvent const * pEvent);
     DECL_LINK(AsyncScroll, Timer *, void);
 
-#endif
     virtual ~GtkSalFrame() override;
 
     // SalGraphics or NULL, but two Graphics for all SalFrames
@@ -525,7 +493,6 @@ public:
     // done setting up the clipregion
     virtual void                EndSetClipRegion() override;
 
-#if GTK_CHECK_VERSION(3,0,0)
     virtual void                PositionByToolkit(const tools::Rectangle& rRect, FloatWinPopupFlags nFlags) override;
     virtual void                SetModal(bool bModal) override;
     virtual bool                GetModal() const override;
@@ -535,7 +502,6 @@ public:
     virtual bool                UpdatePopover(void* nId, const OUString& rHelpText, vcl::Window* pParent, const tools::Rectangle& rHelpArea) override;
     virtual bool                HidePopover(void* nId) override;
     virtual weld::Window*       GetFrameWeld() const override;
-#endif
 
     static GtkSalFrame         *getFromWindow( GtkWindow *pWindow );
 
diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx
index c9b7be49f13e..e19d01205e49 100644
--- a/vcl/inc/unx/gtk/gtkgdi.hxx
+++ b/vcl/inc/unx/gtk/gtkgdi.hxx
@@ -29,8 +29,6 @@
 #include <unx/gtk/gtkframe.hxx>
 #include <ControlCacheKey.hxx>
 
-#if GTK_CHECK_VERSION(3,0,0)
-
 #include <headless/svpgdi.hxx>
 #include <textrender.hxx>
 
@@ -394,8 +392,6 @@ protected:
                             ControlState nState, const ImplControlValue& aValue );
 };
 
-#endif // !gtk3
-
 #endif // INCLUDED_VCL_INC_UNX_GTK_GTKGDI_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx
index 65caa384c0ae..78dd9bc6e8b9 100644
--- a/vcl/inc/unx/gtk/gtkinst.hxx
+++ b/vcl/inc/unx/gtk/gtkinst.hxx
@@ -57,7 +57,6 @@ public:
     void ThreadsLeave();
 };
 
-#if GTK_CHECK_VERSION(3,0,0)
 class GtkSalFrame;
 
 struct VclToGtkHelper
@@ -182,20 +181,10 @@ public:
     css::uno::Reference<css::datatransfer::XTransferable> const & GetTransferrable() const { return m_xTrans; }
 };
 
-#endif
-
 class GtkSalTimer;
-#if GTK_CHECK_VERSION(3,0,0)
 class GtkInstance : public SvpSalInstance
-#else
-class GtkInstance : public X11SalInstance
-#endif
 {
-#if GTK_CHECK_VERSION(3,0,0)
     typedef SvpSalInstance Superclass_t;
-#else
-    typedef X11SalInstance Superclass_t;
-#endif
 public:
             GtkInstance( std::unique_ptr<SalYieldMutex> pMutex );
     virtual ~GtkInstance() override;
@@ -233,7 +222,6 @@ public:
     virtual css::uno::Reference< css::ui::dialogs::XFolderPicker2 >
         createFolderPicker( const css::uno::Reference< css::uno::XComponentContext >& ) override;
 
-#if GTK_CHECK_VERSION(3,0,0)
     virtual css::uno::Reference< css::uno::XInterface > CreateClipboard( const css::uno::Sequence< css::uno::Any >& i_rArguments ) override;
     virtual css::uno::Reference< css::uno::XInterface > CreateDragSource() override;
     virtual css::uno::Reference< css::uno::XInterface > CreateDropTarget() override;
@@ -241,7 +229,6 @@ public:
     virtual weld::Builder* CreateBuilder(weld::Widget* pParent, const OUString& rUIRoot, const OUString& rUIFile) override;
     virtual weld::MessageDialog* CreateMessageDialog(weld::Widget* pParent, VclMessageType eMessageType, VclButtonsType eButtonType, const OUString &rPrimaryMessage) override;
     virtual weld::Window* GetFrameWeld(const css::uno::Reference<css::awt::XWindow>& rWindow) override;
-#endif
 
     virtual const cairo_font_options_t* GetCairoFontOptions() override;
             const cairo_font_options_t* GetLastSeenCairoFontOptions() const;
@@ -251,15 +238,11 @@ public:
 
     std::shared_ptr<vcl::unx::GtkPrintWrapper> const & getPrintWrapper() const;
 
-#if GTK_CHECK_VERSION(3,0,0)
     void* CreateGStreamerSink(const SystemChildWindow*) override;
-#endif
 
 private:
     GtkSalTimer *m_pTimer;
-#if GTK_CHECK_VERSION(3,0,0)
     std::unordered_map< GdkAtom, css::uno::Reference<css::uno::XInterface> > m_aClipboards;
-#endif
     bool                        IsTimerExpired();
     bool                        bNeedsInit;
     cairo_font_options_t*       m_pLastCairoFontOptions;
diff --git a/vcl/inc/unx/gtk/gtkobject.hxx b/vcl/inc/unx/gtk/gtkobject.hxx
index 4523e9998abd..f54d7af3f04c 100644
--- a/vcl/inc/unx/gtk/gtkobject.hxx
+++ b/vcl/inc/unx/gtk/gtkobject.hxx
@@ -29,12 +29,8 @@ class GtkSalObject : public SalObject
 {
     SystemEnvData     m_aSystemData;
     GtkWidget*          m_pSocket;
-#if GTK_CHECK_VERSION(3,0,0)
     GtkSalFrame*        m_pParent;
     cairo_region_t*     m_pRegion;
-#else
-    GdkRegion*          m_pRegion;
-#endif
 
     // signals
     static gboolean     signalButton( GtkWidget*, GdkEventButton*, gpointer );
diff --git a/vcl/inc/unx/gtk/gtkprintwrapper.hxx b/vcl/inc/unx/gtk/gtkprintwrapper.hxx
index 4862c8cc2fbc..589c800d77d1 100644
--- a/vcl/inc/unx/gtk/gtkprintwrapper.hxx
+++ b/vcl/inc/unx/gtk/gtkprintwrapper.hxx
@@ -12,14 +12,11 @@
 
 #include <gtk/gtk.h>
 
-#if defined ENABLE_GTK_PRINT || GTK_CHECK_VERSION(3,0,0)
 #include <gtk/gtkunixprint.h>
 
 #include <osl/module.hxx>
 #include <sal/types.h>
 
-#endif
-
 namespace vcl
 {
 namespace unx
@@ -30,7 +27,6 @@ class GtkPrintWrapper
 private:
     GtkPrintWrapper(const GtkPrintWrapper&) = delete;
     GtkPrintWrapper& operator=(const GtkPrintWrapper&) = delete;
-#if defined ENABLE_GTK_PRINT || GTK_CHECK_VERSION(3,0,0)
 public:
     GtkPrintWrapper();
     ~GtkPrintWrapper();
@@ -63,59 +59,6 @@ public:
     // print selection support, since 2.17.4
     void print_unix_dialog_set_support_selection(GtkPrintUnixDialog* dialog, gboolean support_selection) const;
     void print_unix_dialog_set_has_selection(GtkPrintUnixDialog* dialog, gboolean has_selection) const;
-
-#if !GTK_CHECK_VERSION(3,0,0)
-private:
-    void impl_load();
-
-private:
-    typedef GtkPageSetup* (* page_setup_new_t)();
-    typedef GtkPrintJob* (* print_job_new_t)(const gchar*, GtkPrinter*, GtkPrintSettings*, GtkPageSetup*);
-    typedef void (* print_job_send_t)(GtkPrintJob*, GtkPrintJobCompleteFunc, gpointer, GDestroyNotify);
-    typedef gboolean (* print_job_set_source_file_t)(GtkPrintJob*, const gchar*, GError**);
-    typedef const gchar* (* print_settings_get_t)(GtkPrintSettings*, const gchar*);
-    typedef gboolean (* print_settings_get_collate_t)(GtkPrintSettings*);
-    typedef void (* print_settings_set_collate_t)(GtkPrintSettings*, gboolean);
-    typedef gint (* print_settings_get_n_copies_t)(GtkPrintSettings*);
-    typedef void (* print_settings_set_n_copies_t)(GtkPrintSettings*, gint);
-    typedef GtkPageRange* (* print_settings_get_page_ranges_t)(GtkPrintSettings*, gint*);
-    typedef void (* print_settings_set_print_pages_t)(GtkPrintSettings*, GtkPrintPages);
-    typedef GtkWidget* (* print_unix_dialog_new_t)(const gchar*, GtkWindow*);
-    typedef void (* print_unix_dialog_add_custom_tab_t)(GtkPrintUnixDialog*, GtkWidget*, GtkWidget*);
-    typedef GtkPrinter* (* print_unix_dialog_get_selected_printer_t)(GtkPrintUnixDialog*);
-    typedef void (* print_unix_dialog_set_manual_capabilities_t)(GtkPrintUnixDialog*, GtkPrintCapabilities);
-    typedef GtkPrintSettings* (* print_unix_dialog_get_settings_t)(GtkPrintUnixDialog*);
-    typedef void (* print_unix_dialog_set_settings_t)(GtkPrintUnixDialog*, GtkPrintSettings*);
-    typedef void (* print_unix_dialog_set_support_selection_t)(GtkPrintUnixDialog*, gboolean);
-    typedef void (* print_unix_dialog_set_has_selection_t)(GtkPrintUnixDialog*, gboolean);
-
-private:
-    osl::Module m_aModule;
-
-    // general printing support, since 2.10.0
-    page_setup_new_t m_page_setup_new;
-    print_job_new_t m_print_job_new;
-    print_job_send_t m_print_job_send;
-    print_job_set_source_file_t m_print_job_set_source_file;
-    print_settings_get_t m_print_settings_get;
-    print_settings_get_collate_t m_print_settings_get_collate;
-    print_settings_set_collate_t m_print_settings_set_collate;
-    print_settings_get_n_copies_t m_print_settings_get_n_copies;
-    print_settings_set_n_copies_t m_print_settings_set_n_copies;
-    print_settings_get_page_ranges_t m_print_settings_get_page_ranges;
-    print_settings_set_print_pages_t m_print_settings_set_print_pages;
-    print_unix_dialog_new_t m_print_unix_dialog_new;
-    print_unix_dialog_add_custom_tab_t m_print_unix_dialog_add_custom_tab;
-    print_unix_dialog_get_selected_printer_t m_print_unix_dialog_get_selected_printer;
-    print_unix_dialog_set_manual_capabilities_t m_print_unix_dialog_set_manual_capabilities;
-    print_unix_dialog_get_settings_t m_print_unix_dialog_get_settings;
-    print_unix_dialog_set_settings_t m_print_unix_dialog_set_settings;
-
-    // print selection support, since 2.17.4
-    print_unix_dialog_set_support_selection_t m_print_unix_dialog_set_support_selection;
-    print_unix_dialog_set_has_selection_t m_print_unix_dialog_set_has_selection;
-#endif
-#endif
 };
 
 }
diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx
index 2d812cad3962..ddef9ef42310 100644
--- a/vcl/inc/unx/gtk/gtksalmenu.hxx
+++ b/vcl/inc/unx/gtk/gtksalmenu.hxx
@@ -23,27 +23,8 @@
 #include <unotools/tempfile.hxx>
 #include <vcl/idle.hxx>
 
-#if GTK_CHECK_VERSION(3,0,0)
-#  define ENABLE_GMENU_INTEGRATION
-#  include <unx/gtk/glomenu.h>
-#  include <unx/gtk/gloactiongroup.h>
-#elif ENABLE_DBUS && ENABLE_GIO && \
-    (GLIB_MAJOR_VERSION > 2 || GLIB_MINOR_VERSION >= 36)
-#  define ENABLE_GMENU_INTEGRATION
-#  include <unx/gtk/glomenu.h>
-#  include <unx/gtk/gloactiongroup.h>
-#else
-#  if !(GLIB_MAJOR_VERSION > 2 || GLIB_MINOR_VERSION >= 32)
-     typedef void GMenuModel;
-#  endif
-#  if !(GLIB_MAJOR_VERSION > 2 || GLIB_MINOR_VERSION >= 28)
-     typedef void GActionGroup;
-#  endif
-#endif
-
-#if !GTK_CHECK_VERSION(3,0,0)
-typedef void GtkCssProvider;
-#endif
+#include <unx/gtk/glomenu.h>
+#include <unx/gtk/gloactiongroup.h>
 
 class MenuItemList;
 class GtkSalMenuItem;