Kaydet (Commit) 75e828ca authored tarafından Caolán McNamara's avatar Caolán McNamara

require at least gtk3 3.20.0 to build and run gtk3 bits

Change-Id: I2caf8c32d47ce195a3b714e50256d8425a5a117e
Reviewed-on: https://gerrit.libreoffice.org/45735Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst effe6b3d
...@@ -131,9 +131,7 @@ public: ...@@ -131,9 +131,7 @@ public:
virtual void GetResolution(sal_Int32& rDPIX, sal_Int32& rDPIY) override; virtual void GetResolution(sal_Int32& rDPIX, sal_Int32& rDPIY) override;
GtkStyleContext* createStyleContext(gtk_widget_path_iter_set_object_nameFunc set_object_name, GtkControlPart ePart); GtkStyleContext* createStyleContext(GtkControlPart ePart);
GtkStyleContext* createNewContext(GtkControlPart ePart, gtk_widget_path_iter_set_object_nameFunc set_object_name);
GtkStyleContext* createOldContext(GtkControlPart ePart);
GtkStyleContext* makeContext(GtkWidgetPath *pPath, GtkStyleContext *pParent); GtkStyleContext* makeContext(GtkWidgetPath *pPath, GtkStyleContext *pParent);
private: private:
GtkWidget *mpWindow; GtkWidget *mpWindow;
......
...@@ -82,7 +82,7 @@ extern "C" ...@@ -82,7 +82,7 @@ extern "C"
XInitThreads(); XInitThreads();
#if GTK_CHECK_VERSION(3,0,0) #if GTK_CHECK_VERSION(3,0,0)
if (gtk_minor_version < 18) if (gtk_minor_version < 20)
{ {
g_warning("require a newer gtk than 3.%d for theme expectations", gtk_minor_version); g_warning("require a newer gtk than 3.%d for theme expectations", gtk_minor_version);
return nullptr; return nullptr;
......
...@@ -630,12 +630,7 @@ void GtkSalMenu::ShowCloseButton(bool bShow) ...@@ -630,12 +630,7 @@ void GtkSalMenu::ShowCloseButton(bool bShow)
"min-width: 18px;" "min-width: 18px;"
"min-height: 18px;" "min-height: 18px;"
"}"; "}";
const gchar olddata[] = "* { " gtk_css_provider_load_from_data(pProvider, data, -1, nullptr);
"padding: 0;"
"margin-left: 8px;"
"margin-right: 8px;"
"}";
gtk_css_provider_load_from_data(pProvider, gtk_check_version(3, 20, 0) == nullptr ? data : olddata, -1, nullptr);
gtk_style_context_add_provider(pButtonContext, gtk_style_context_add_provider(pButtonContext,
GTK_STYLE_PROVIDER(pProvider), GTK_STYLE_PROVIDER(pProvider),
GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
......
...@@ -2081,9 +2081,6 @@ void GtkSalFrame::grabPointer( bool bGrab, bool bOwnerEvents ) ...@@ -2081,9 +2081,6 @@ void GtkSalFrame::grabPointer( bool bGrab, bool bOwnerEvents )
if (!m_pWindow) if (!m_pWindow)
return; return;
#if GTK_CHECK_VERSION(3, 20, 0)
if (gtk_check_version(3, 20, 0) == nullptr)
{
GdkSeat* pSeat = gdk_display_get_default_seat(getGdkDisplay()); GdkSeat* pSeat = gdk_display_get_default_seat(getGdkDisplay());
if (bGrab) if (bGrab)
{ {
...@@ -2094,24 +2091,6 @@ void GtkSalFrame::grabPointer( bool bGrab, bool bOwnerEvents ) ...@@ -2094,24 +2091,6 @@ void GtkSalFrame::grabPointer( bool bGrab, bool bOwnerEvents )
{ {
gdk_seat_ungrab(pSeat); gdk_seat_ungrab(pSeat);
} }
return;
}
#endif
//else older gtk3
const int nMask = (GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK);
GdkDeviceManager* pDeviceManager = gdk_display_get_device_manager(getGdkDisplay());
GdkDevice* pPointer = gdk_device_manager_get_client_pointer(pDeviceManager);
if (bGrab)
{
gdk_device_grab(pPointer, widget_get_window(getMouseEventWidget()), GDK_OWNERSHIP_NONE,
bOwnerEvents, (GdkEventMask) nMask, m_pCurrentCursor, gtk_get_current_event_time());
}
else
{
gdk_device_ungrab(pPointer, gtk_get_current_event_time());
}
} }
void GtkSalFrame::CaptureMouse( bool bCapture ) void GtkSalFrame::CaptureMouse( bool bCapture )
......
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment