configure.ac | 2 +- vcl/inc/unx/gtk/gtkframe.hxx | 2 -- vcl/unx/gtk3/gtk3gtkframe.cxx | 7 +------ vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx | 18 +++++------------- 4 files changed, 7 insertions(+), 22 deletions(-)
New commits: commit 2e8fa58ebb5105a824f398a3384a8b0ea2229f9e Author: Caolán McNamara <caol...@redhat.com> Date: Fri Dec 1 14:25:12 2017 +0000 require at least gtk3 3.14.0 to build gtk3 bits Change-Id: Ide498b03f21e2c3b8fb47c565079af26ead1d762 Reviewed-on: https://gerrit.libreoffice.org/45712 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> diff --git a/configure.ac b/configure.ac index 75a9d92c999f..3b1a2040e955 100644 --- a/configure.ac +++ b/configure.ac @@ -9724,7 +9724,7 @@ if test "x$enable_gtk3" = "xyes"; then AC_MSG_ERROR([System cairo required for gtk3 support, do not combine --enable-gtk3 with --without-system-cairo]) fi : ${with_system_cairo:=yes} - PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= 3.12 gtk+-unix-print-3.0 gmodule-no-export-2.0 glib-2.0 >= 2.38 cairo, ENABLE_GTK3="TRUE", ENABLE_GTK3="") + PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= 3.14 gtk+-unix-print-3.0 gmodule-no-export-2.0 glib-2.0 >= 2.38 cairo, ENABLE_GTK3="TRUE", ENABLE_GTK3="") if test "x$ENABLE_GTK3" = "xTRUE"; then R="gtk3" dnl Avoid installed by unpackaged files for now. diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx index 236cf29c29de..fecdbb1a382d 100644 --- a/vcl/inc/unx/gtk/gtkframe.hxx +++ b/vcl/inc/unx/gtk/gtkframe.hxx @@ -265,10 +265,8 @@ class GtkSalFrame : public SalFrame static void signalDragDataGet(GtkWidget* widget, GdkDragContext* context, GtkSelectionData *data, guint info, guint time, gpointer frame); -#if GTK_CHECK_VERSION(3,14,0) static void gestureSwipe(GtkGestureSwipe* gesture, gdouble velocity_x, gdouble velocity_y, gpointer frame); static void gestureLongPress(GtkGestureLongPress* gesture, gpointer frame); -#endif #else static gboolean signalExpose( GtkWidget*, GdkEventExpose*, gpointer ); void askForXEmbedFocus( sal_Int32 nTimecode ); diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx index 93accd23da41..e8a077c8fb0d 100644 --- a/vcl/unx/gtk3/gtk3gtkframe.cxx +++ b/vcl/unx/gtk3/gtk3gtkframe.cxx @@ -1038,7 +1038,7 @@ void GtkSalFrame::InitCommon() g_signal_connect( G_OBJECT(m_pFixedContainer), "draw", G_CALLBACK(signalDraw), this ); g_signal_connect( G_OBJECT(m_pFixedContainer), "realize", G_CALLBACK(signalRealize), this ); g_signal_connect( G_OBJECT(m_pFixedContainer), "size-allocate", G_CALLBACK(sizeAllocated), this ); -#if GTK_CHECK_VERSION(3,14,0) + GtkGesture *pSwipe = gtk_gesture_swipe_new(pEventWidget); g_signal_connect(pSwipe, "swipe", G_CALLBACK(gestureSwipe), this); gtk_event_controller_set_propagation_phase(GTK_EVENT_CONTROLLER (pSwipe), GTK_PHASE_TARGET); @@ -1049,8 +1049,6 @@ void GtkSalFrame::InitCommon() gtk_event_controller_set_propagation_phase(GTK_EVENT_CONTROLLER (pLongPress), GTK_PHASE_TARGET); g_object_weak_ref(G_OBJECT(pEventWidget), reinterpret_cast<GWeakNotify>(g_object_unref), pLongPress); -#endif - g_signal_connect( G_OBJECT(m_pWindow), "focus-in-event", G_CALLBACK(signalFocus), this ); g_signal_connect( G_OBJECT(m_pWindow), "focus-out-event", G_CALLBACK(signalFocus), this ); g_signal_connect( G_OBJECT(m_pWindow), "map-event", G_CALLBACK(signalMap), this ); @@ -2768,7 +2766,6 @@ gboolean GtkSalFrame::signalScroll(GtkWidget*, GdkEvent* pInEvent, gpointer fram return true; } -#if GTK_CHECK_VERSION(3,14,0) void GtkSalFrame::gestureSwipe(GtkGestureSwipe* gesture, gdouble velocity_x, gdouble velocity_y, gpointer frame) { gdouble x, y; @@ -2808,8 +2805,6 @@ void GtkSalFrame::gestureLongPress(GtkGestureLongPress* gesture, gpointer frame) } } -#endif - gboolean GtkSalFrame::signalMotion( GtkWidget*, GdkEventMotion* pEvent, gpointer frame ) { UpdateLastInputEventTime(pEvent->time); diff --git a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx index 6a9b4b8a0154..38b724be27d8 100644 --- a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx @@ -2113,14 +2113,6 @@ GtkStyleContext* GtkSalGraphics::createStyleContext(gtk_widget_path_iter_set_obj namespace { - GtkStateFlags CHECKED() - { -#if GTK_CHECK_VERSION(3,14,0) - return GTK_STATE_FLAG_CHECKED; -#endif - return GTK_STATE_FLAG_ACTIVE; - } - GtkStateFlags ACTIVE_TAB() { #if GTK_CHECK_VERSION(3,20,0) @@ -2237,7 +2229,7 @@ bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, co nType = ControlType::Checkbox; if (nState & ControlState::PRESSED) { - flags = (GtkStateFlags)(flags | CHECKED()); + flags = (GtkStateFlags)(flags | GTK_STATE_FLAG_CHECKED); } break; case ControlPart::MenuItemRadioMark: @@ -2252,7 +2244,7 @@ bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, co nType = ControlType::Radiobutton; if (nState & ControlState::PRESSED) { - flags = (GtkStateFlags)(flags | CHECKED()); + flags = (GtkStateFlags)(flags | GTK_STATE_FLAG_CHECKED); } break; case ControlPart::Separator: @@ -2300,13 +2292,13 @@ bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, co break; case ControlType::Radiobutton: flags = (GtkStateFlags)(flags | - ( (rValue.getTristateVal() == ButtonValue::On) ? CHECKED() : GTK_STATE_FLAG_NORMAL)); + ( (rValue.getTristateVal() == ButtonValue::On) ? GTK_STATE_FLAG_CHECKED : GTK_STATE_FLAG_NORMAL)); context = mpRadioButtonRadioStyle; renderType = nPart == ControlPart::Focus ? RenderType::Focus : RenderType::Radio; break; case ControlType::Checkbox: flags = (GtkStateFlags)(flags | - ( (rValue.getTristateVal() == ButtonValue::On) ? CHECKED() : + ( (rValue.getTristateVal() == ButtonValue::On) ? GTK_STATE_FLAG_CHECKED : (rValue.getTristateVal() == ButtonValue::Mixed) ? GTK_STATE_FLAG_INCONSISTENT : GTK_STATE_FLAG_NORMAL)); context = mpCheckButtonCheckStyle; @@ -2380,7 +2372,7 @@ bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, co context = mpTreeHeaderButtonStyle; ButtonValue aButtonValue = rValue.getTristateVal(); if (aButtonValue == ButtonValue::On) - flags = (GtkStateFlags) (flags | CHECKED()); + flags = (GtkStateFlags) (flags | GTK_STATE_FLAG_CHECKED); renderType = RenderType::Expander; break; }
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits