gtk4: wrap gtk_css_provider_load_from_data for arg difference in gtk versions

Change-Id: Iabbf7f6a746efae2ec4abecfb27b4b097ce822ed
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115447
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

6 files changed, 23 insertions, 45 deletions

diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx
index e3cace3c6389..daa072b4a445 100644
--- a/vcl/inc/unx/gtk/gtkdata.hxx
+++ b/vcl/inc/unx/gtk/gtkdata.hxx
@@ -57,6 +57,17 @@ inline void main_loop_run(GMainLoop* pLoop)
 #endif
 }
 
+inline void css_provider_load_from_data(GtkCssProvider *css_provider,
+                                        const gchar *data,
+                                        gssize length)
+{
+#if GTK_CHECK_VERSION(4, 0, 0)
+    gtk_css_provider_load_from_data(css_provider, data, length);
+#else
+    gtk_css_provider_load_from_data(css_provider, data, length, nullptr);
+#endif
+}
+
 class GtkSalTimer final : public SalTimer
 {
     struct SalGtkTimeoutSource *m_pTimeout;
diff --git a/vcl/unx/gtk3/gtkdata.cxx b/vcl/unx/gtk3/gtkdata.cxx
index 153fc61d068f..639eedb62c87 100644
--- a/vcl/unx/gtk3/gtkdata.cxx
+++ b/vcl/unx/gtk3/gtkdata.cxx
@@ -441,12 +441,7 @@ static GtkStyleProvider* CreateSmallButtonProvider()
       "min-height: 18px;"
       "min-width: 18px;"
       "}";
-#if GTK_CHECK_VERSION(4, 0, 0)
-    gtk_css_provider_load_from_data(pSmallButtonProvider, data, -1);
-#else
-    gtk_css_provider_load_from_data(pSmallButtonProvider, data, -1, nullptr);
-#endif
-
+    css_provider_load_from_data(pSmallButtonProvider, data, -1);
     return GTK_STYLE_PROVIDER(pSmallButtonProvider);
 }
 
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index df35fe0e1a8e..19ad0f0313da 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -2646,11 +2646,7 @@ private:
         m_pBgCssProvider = gtk_css_provider_new();
         OUString aBuffer = "* { background-color: #" + sColor + "; }";
         OString aResult = OUStringToOString(aBuffer, RTL_TEXTENCODING_UTF8);
-#if !GTK_CHECK_VERSION(4, 0, 0)
-        gtk_css_provider_load_from_data(m_pBgCssProvider, aResult.getStr(), aResult.getLength(), nullptr);
-#else
-        gtk_css_provider_load_from_data(m_pBgCssProvider, aResult.getStr(), aResult.getLength());
-#endif
+        css_provider_load_from_data(m_pBgCssProvider, aResult.getStr(), aResult.getLength());
         gtk_style_context_add_provider(pWidgetContext, GTK_STYLE_PROVIDER(m_pBgCssProvider),
                                        GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
     }
@@ -6657,11 +6653,7 @@ public:
                            "scrollbar contents button { color: #000000; } "
                            "scrollbar contents button:disabled { color: #7f7f7f; }";
         OString aResult = OUStringToOString(aBuffer, RTL_TEXTENCODING_UTF8);
-#if !GTK_CHECK_VERSION(4, 0, 0)
-        gtk_css_provider_load_from_data(m_pScrollBarCssProvider, aResult.getStr(), aResult.getLength(), nullptr);
-#else
-        gtk_css_provider_load_from_data(m_pScrollBarCssProvider, aResult.getStr(), aResult.getLength());
-#endif
+        css_provider_load_from_data(m_pScrollBarCssProvider, aResult.getStr(), aResult.getLength());
 
         gtk_style_context_add_provider(pHorzContext, GTK_STYLE_PROVIDER(m_pScrollBarCssProvider),
                                        GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
@@ -7200,11 +7192,7 @@ public:
         GtkStyleContext *pNotebookContext = gtk_widget_get_style_context(GTK_WIDGET(m_pOverFlowNotebook));
         GtkCssProvider *pProvider = gtk_css_provider_new();
         static const gchar data[] = "header.top > tabs > tab:checked { box-shadow: none; padding: 0 0 0 0; margin: 0 0 0 0; border-image: none; border-image-width: 0 0 0 0; background-image: none; background-color: transparent; border-radius: 0 0 0 0; border-width: 0 0 0 0; border-style: none; border-color: transparent; opacity: 0; min-height: 0; min-width: 0; }";
-#if !GTK_CHECK_VERSION(4, 0, 0)
-        gtk_css_provider_load_from_data(pProvider, data, -1, nullptr);
-#else
-        gtk_css_provider_load_from_data(pProvider, data, -1);
-#endif
+        css_provider_load_from_data(pProvider, data, -1);
         gtk_style_context_add_provider(pNotebookContext, GTK_STYLE_PROVIDER(pProvider),
                                        GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
     }
@@ -7649,11 +7637,7 @@ private:
                            "background-size: " + OUString::number(aSize.Width()) + "px " + OUString::number(aSize.Height()) + "px; "
                            "border-radius: 0; border-width: 0; }";
         OString aResult = OUStringToOString(aBuffer, RTL_TEXTENCODING_UTF8);
-#if !GTK_CHECK_VERSION(4, 0, 0)
-        gtk_css_provider_load_from_data(m_pCustomCssProvider, aResult.getStr(), aResult.getLength(), nullptr);
-#else
-        gtk_css_provider_load_from_data(m_pCustomCssProvider, aResult.getStr(), aResult.getLength());
-#endif
+        css_provider_load_from_data(m_pCustomCssProvider, aResult.getStr(), aResult.getLength());
         gtk_style_context_add_provider(pWidgetContext, GTK_STYLE_PROVIDER(m_pCustomCssProvider),
                                        GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
     }
@@ -8498,7 +8482,7 @@ public:
             GtkStyleContext *pPopoverContext = gtk_widget_get_style_context(pPlaceHolder);
             GtkCssProvider *pProvider = gtk_css_provider_new();
             static const gchar data[] = "popover { box-shadow: none; padding: 0 0 0 0; margin: 0 0 0 0; border-image: none; border-image-width: 0 0 0 0; background-image: none; background-color: transparent; border-radius: 0 0 0 0; border-width: 0 0 0 0; border-style: none; border-color: transparent; opacity: 0; min-height: 0; min-width: 0; }";
-            gtk_css_provider_load_from_data(pProvider, data, -1, nullptr);
+            css_provider_load_from_data(pProvider, data, -1);
             gtk_style_context_add_provider(pPopoverContext, GTK_STYLE_PROVIDER(pProvider),
                                            GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
 
@@ -9218,7 +9202,7 @@ private:
                       "margin-right: 0px;"
                       "min-width: 4px;"
                       "}";
-                    gtk_css_provider_load_from_data(m_pMenuButtonProvider, data, -1, nullptr);
+                    css_provider_load_from_data(m_pMenuButtonProvider, data, -1);
                 }
 
                 gtk_style_context_add_provider(pButtonContext,
@@ -14319,7 +14303,7 @@ public:
         m_pFgCssProvider = gtk_css_provider_new();
         OUString aBuffer = "textview text { color: #" + sColor + "; }";
         OString aResult = OUStringToOString(aBuffer, RTL_TEXTENCODING_UTF8);
-        gtk_css_provider_load_from_data(m_pFgCssProvider, aResult.getStr(), aResult.getLength(), nullptr);
+        css_provider_load_from_data(m_pFgCssProvider, aResult.getStr(), aResult.getLength());
         gtk_style_context_add_provider(pWidgetContext, GTK_STYLE_PROVIDER(m_pFgCssProvider),
                                        GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
     }
diff --git a/vcl/unx/gtk3/gtkobject.cxx b/vcl/unx/gtk3/gtkobject.cxx
index 80f981a77624..d44b7bcc0203 100644
--- a/vcl/unx/gtk3/gtkobject.cxx
+++ b/vcl/unx/gtk3/gtkobject.cxx
@@ -323,11 +323,7 @@ GtkSalObjectWidgetClip::GtkSalObjectWidgetClip(GtkSalFrame* pParent, bool bShow)
     OUString sColor = Application::GetSettings().GetStyleSettings().GetDialogColor().AsRGBHexString();
     OUString aBuffer = "* { background-color: #" + sColor + "; }";
     OString aResult = OUStringToOString(aBuffer, RTL_TEXTENCODING_UTF8);
-#if !GTK_CHECK_VERSION(4, 0, 0)
-    gtk_css_provider_load_from_data(pBgCssProvider, aResult.getStr(), aResult.getLength(), nullptr);
-#else
-    gtk_css_provider_load_from_data(pBgCssProvider, aResult.getStr(), aResult.getLength());
-#endif
+    css_provider_load_from_data(pBgCssProvider, aResult.getStr(), aResult.getLength());
     gtk_style_context_add_provider(pWidgetContext, GTK_STYLE_PROVIDER(pBgCssProvider),
                                    GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
 
diff --git a/vcl/unx/gtk3/gtksalmenu.cxx b/vcl/unx/gtk3/gtksalmenu.cxx
index 743db2d363a5..24cc6a300eea 100644
--- a/vcl/unx/gtk3/gtksalmenu.cxx
+++ b/vcl/unx/gtk3/gtksalmenu.cxx
@@ -1084,11 +1084,7 @@ void GtkSalMenu::ApplyPersona()
         mpMenuBarContainerProvider = gtk_css_provider_new();
         OUString aBuffer = "* { background-image: url(\"" + mxPersonaImage->GetURL() + "\"); background-position: top right; }";
         OString aResult = OUStringToOString(aBuffer, RTL_TEXTENCODING_UTF8);
-#if !GTK_CHECK_VERSION(4, 0, 0)
-        gtk_css_provider_load_from_data(mpMenuBarContainerProvider, aResult.getStr(), aResult.getLength(), nullptr);
-#else
-        gtk_css_provider_load_from_data(mpMenuBarContainerProvider, aResult.getStr(), aResult.getLength());
-#endif
+        css_provider_load_from_data(mpMenuBarContainerProvider, aResult.getStr(), aResult.getLength());
         gtk_style_context_add_provider(pMenuBarContainerContext, GTK_STYLE_PROVIDER(mpMenuBarContainerProvider),
                                        GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
 
@@ -1100,11 +1096,7 @@ void GtkSalMenu::ApplyPersona()
           "background-image: none;"
           "background-color: transparent;"
           "}";
-#if !GTK_CHECK_VERSION(4, 0, 0)
-        gtk_css_provider_load_from_data(mpMenuBarProvider, data, -1, nullptr);
-#else
-        gtk_css_provider_load_from_data(mpMenuBarProvider, data, -1);
-#endif
+        css_provider_load_from_data(mpMenuBarProvider, data, -1);
         gtk_style_context_add_provider(pMenuBarContext,
                                        GTK_STYLE_PROVIDER(mpMenuBarProvider),
                                        GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
diff --git a/vcl/unx/gtk3/salnativewidgets-gtk.cxx b/vcl/unx/gtk3/salnativewidgets-gtk.cxx
index 13ba47e142d5..42d72507811e 100644
--- a/vcl/unx/gtk3/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/salnativewidgets-gtk.cxx
@@ -1789,7 +1789,7 @@ bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, co
         const OUString sColorCss = "* { background-color: #" + rBackgroundColor.AsRGBHexString() + "; }";
         const OString aResult = OUStringToOString(sColorCss, RTL_TEXTENCODING_UTF8);
         pBgCssProvider =  gtk_css_provider_new();
-        gtk_css_provider_load_from_data(pBgCssProvider, aResult.getStr(), aResult.getLength(), nullptr);
+        css_provider_load_from_data(pBgCssProvider, aResult.getStr(), aResult.getLength());
         gtk_style_context_add_provider(context, GTK_STYLE_PROVIDER(pBgCssProvider),
                                        GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
     }