Title: [266055] trunk
Revision
266055
Author
carlo...@webkit.org
Date
2020-08-24 06:10:57 -0700 (Mon, 24 Aug 2020)

Log Message

Unreviewed. Fix GTK4 build

Source/WebCore:

* SourcesGTK.txt:
* platform/gtk/GtkUtilities.cpp:
(WebCore::monitorWorkArea):
* platform/gtk/GtkUtilities.h:
* platform/gtk/PlatformScreenGtk.cpp:
(WebCore::screenAvailableRect):

Source/WebKit:

* PlatformGTK.cmake:
* UIProcess/API/gtk/WebKitAuthenticationDialog.cpp:
(webkitAuthenticationDialogInitialize):
* UIProcess/API/gtk/WebKitScriptDialogImpl.cpp:
(webkitScriptDialogImplConstructed):
(webkit_script_dialog_impl_class_init):
* UIProcess/API/gtk/WebKitWebViewBase.cpp:
(webkitWebViewBaseEvent):
(webkit_web_view_base_class_init):
* UIProcess/API/gtk/WebKitWebViewDialog.cpp:
(webkitWebViewDialogConstructed):
(webkitWebViewDialogSetChild):
* UIProcess/Inspector/gtk/WebKitInspectorWindow.cpp:
(webkit_inspector_window_init):
* UIProcess/gtk/WebDataListSuggestionsDropdownGtk.cpp:
(WebKit::WebDataListSuggestionsDropdownGtk::show):
* UIProcess/gtk/WebPageProxyGtk.cpp:
(WebKit::WebPageProxy::bindAccessibilityTree):
* UIProcess/gtk/WebPopupMenuProxyGtk.cpp:
(WebKit::WebPopupMenuProxyGtk::showPopupMenu):

Tools:

* MiniBrowser/gtk/BrowserSearchBox.c:
* MiniBrowser/gtk/BrowserWindow.c:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (266054 => 266055)


--- trunk/Source/WebCore/ChangeLog	2020-08-24 12:29:24 UTC (rev 266054)
+++ trunk/Source/WebCore/ChangeLog	2020-08-24 13:10:57 UTC (rev 266055)
@@ -1,3 +1,14 @@
+2020-08-24  Carlos Garcia Campos  <cgar...@igalia.com>
+
+        Unreviewed. Fix GTK4 build
+
+        * SourcesGTK.txt:
+        * platform/gtk/GtkUtilities.cpp:
+        (WebCore::monitorWorkArea):
+        * platform/gtk/GtkUtilities.h:
+        * platform/gtk/PlatformScreenGtk.cpp:
+        (WebCore::screenAvailableRect):
+
 2020-08-24  Rob Buis  <rb...@igalia.com>
 
         Make window.find not default the search string to undefined

Modified: trunk/Source/WebCore/SourcesGTK.txt (266054 => 266055)


--- trunk/Source/WebCore/SourcesGTK.txt	2020-08-24 12:29:24 UTC (rev 266054)
+++ trunk/Source/WebCore/SourcesGTK.txt	2020-08-24 13:10:57 UTC (rev 266055)
@@ -107,7 +107,7 @@
 platform/gtk/DragDataGtk.cpp
 platform/gtk/DragImageGtk.cpp
 platform/gtk/GRefPtrGtk.cpp
-platform/gtk/GtkUtilities.cpp
+platform/gtk/GtkUtilities.cpp @no-unify
 platform/gtk/LocalizedStringsGtk.cpp
 platform/gtk/PasteboardGtk.cpp
 platform/gtk/PlatformKeyboardEventGtk.cpp

Modified: trunk/Source/WebCore/platform/gtk/GtkUtilities.cpp (266054 => 266055)


--- trunk/Source/WebCore/platform/gtk/GtkUtilities.cpp	2020-08-24 12:29:24 UTC (rev 266054)
+++ trunk/Source/WebCore/platform/gtk/GtkUtilities.cpp	2020-08-24 13:10:57 UTC (rev 266055)
@@ -24,6 +24,10 @@
 #include <gtk/gtk.h>
 #include <wtf/glib/GUniquePtr.h>
 
+#if USE(GTK4) && PLATFORM(X11)
+#include <gdk/x11/gdkx.h>
+#endif
+
 namespace WebCore {
 
 static IntPoint gtkWindowGetOrigin(GtkWidget* window)
@@ -187,4 +191,20 @@
     return static_cast<GdkDragAction>(0);
 }
 
+void monitorWorkArea(GdkMonitor* monitor, GdkRectangle* area)
+{
+#if USE(GTK4)
+#if PLATFORM(X11)
+    if (GDK_IS_X11_MONITOR(monitor)) {
+        gdk_x11_monitor_get_workarea(monitor, area);
+        return;
+    }
+#endif
+
+    gdk_monitor_get_geometry(monitor, area);
+#else
+    gdk_monitor_get_workarea(monitor, area);
+#endif
+}
+
 } // namespace WebCore

Modified: trunk/Source/WebCore/platform/gtk/GtkUtilities.h (266054 => 266055)


--- trunk/Source/WebCore/platform/gtk/GtkUtilities.h	2020-08-24 12:29:24 UTC (rev 266054)
+++ trunk/Source/WebCore/platform/gtk/GtkUtilities.h	2020-08-24 13:10:57 UTC (rev 266055)
@@ -55,4 +55,6 @@
 WEBCORE_EXPORT GdkDragAction dragOperationToGdkDragActions(OptionSet<DragOperation>);
 WEBCORE_EXPORT GdkDragAction dragOperationToSingleGdkDragAction(OptionSet<DragOperation>);
 
+void monitorWorkArea(GdkMonitor*, GdkRectangle*);
+
 } // namespace WebCore

Modified: trunk/Source/WebCore/platform/gtk/PlatformScreenGtk.cpp (266054 => 266055)


--- trunk/Source/WebCore/platform/gtk/PlatformScreenGtk.cpp	2020-08-24 12:29:24 UTC (rev 266054)
+++ trunk/Source/WebCore/platform/gtk/PlatformScreenGtk.cpp	2020-08-24 13:10:57 UTC (rev 266055)
@@ -33,6 +33,7 @@
 
 #include "FloatRect.h"
 #include "FrameView.h"
+#include "GtkUtilities.h"
 #include "HostWindow.h"
 #include "NotImplemented.h"
 #include "Widget.h"
@@ -206,7 +207,7 @@
         return { };
 
     GdkRectangle workArea;
-    gdk_monitor_get_workarea(monitor.get(), &workArea);
+    monitorWorkArea(monitor.get(), &workArea);
 
     return FloatRect(workArea.x, workArea.y, workArea.width, workArea.height);
 }

Modified: trunk/Source/WebKit/ChangeLog (266054 => 266055)


--- trunk/Source/WebKit/ChangeLog	2020-08-24 12:29:24 UTC (rev 266054)
+++ trunk/Source/WebKit/ChangeLog	2020-08-24 13:10:57 UTC (rev 266055)
@@ -1,3 +1,28 @@
+2020-08-24  Carlos Garcia Campos  <cgar...@igalia.com>
+
+        Unreviewed. Fix GTK4 build
+
+        * PlatformGTK.cmake:
+        * UIProcess/API/gtk/WebKitAuthenticationDialog.cpp:
+        (webkitAuthenticationDialogInitialize):
+        * UIProcess/API/gtk/WebKitScriptDialogImpl.cpp:
+        (webkitScriptDialogImplConstructed):
+        (webkit_script_dialog_impl_class_init):
+        * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+        (webkitWebViewBaseEvent):
+        (webkit_web_view_base_class_init):
+        * UIProcess/API/gtk/WebKitWebViewDialog.cpp:
+        (webkitWebViewDialogConstructed):
+        (webkitWebViewDialogSetChild):
+        * UIProcess/Inspector/gtk/WebKitInspectorWindow.cpp:
+        (webkit_inspector_window_init):
+        * UIProcess/gtk/WebDataListSuggestionsDropdownGtk.cpp:
+        (WebKit::WebDataListSuggestionsDropdownGtk::show):
+        * UIProcess/gtk/WebPageProxyGtk.cpp:
+        (WebKit::WebPageProxy::bindAccessibilityTree):
+        * UIProcess/gtk/WebPopupMenuProxyGtk.cpp:
+        (WebKit::WebPopupMenuProxyGtk::showPopupMenu):
+
 2020-08-23  Wenson Hsieh  <wenson_hs...@apple.com>
 
         Programmatic selection of text in a text field causes the highlight overlay to spill out

Modified: trunk/Source/WebKit/PlatformGTK.cmake (266054 => 266055)


--- trunk/Source/WebKit/PlatformGTK.cmake	2020-08-24 12:29:24 UTC (rev 266054)
+++ trunk/Source/WebKit/PlatformGTK.cmake	2020-08-24 13:10:57 UTC (rev 266055)
@@ -436,6 +436,7 @@
 )
 
 list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES
+    ${ATK_INCLUDE_DIRS}
     ${ENCHANT_INCLUDE_DIRS}
     ${GIO_UNIX_INCLUDE_DIRS}
     ${GLIB_INCLUDE_DIRS}

Modified: trunk/Source/WebKit/UIProcess/API/gtk/WebKitAuthenticationDialog.cpp (266054 => 266055)


--- trunk/Source/WebKit/UIProcess/API/gtk/WebKitAuthenticationDialog.cpp	2020-08-24 12:29:24 UTC (rev 266054)
+++ trunk/Source/WebKit/UIProcess/API/gtk/WebKitAuthenticationDialog.cpp	2020-08-24 13:10:57 UTC (rev 266055)
@@ -98,12 +98,12 @@
     GtkWidget* vBox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 20);
 
     GtkWidget* box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
-    gtk_widget_add_css_class(box, GTK_STYLE_CLASS_TITLEBAR);
+    gtk_widget_add_css_class(box, "titlebar");
     gtk_widget_set_size_request(box, -1, 16);
     GtkWidget* title = gtk_label_new(_("Authentication Required"));
     gtk_widget_set_margin_top(title, 6);
     gtk_widget_set_margin_bottom(title, 6);
-    gtk_widget_add_css_class(title, GTK_STYLE_CLASS_TITLE);
+    gtk_widget_add_css_class(title, "title");
 #if USE(GTK4)
     gtk_widget_set_hexpand(title, TRUE);
     gtk_widget_set_halign(title, GTK_ALIGN_CENTER);
@@ -193,7 +193,7 @@
     GtkWidget* loginLabel = gtk_label_new_with_mnemonic(_("_Username"));
     gtk_label_set_mnemonic_widget(GTK_LABEL(loginLabel), priv->loginEntry);
     gtk_widget_set_halign(loginLabel, GTK_ALIGN_END);
-    gtk_widget_add_css_class(loginLabel, GTK_STYLE_CLASS_DIM_LABEL);
+    gtk_widget_add_css_class(loginLabel, "dim-label");
     gtk_widget_show(loginLabel);
 
     priv->passwordEntry = gtk_entry_new();
@@ -205,7 +205,7 @@
     GtkWidget* passwordLabel = gtk_label_new_with_mnemonic(_("_Password"));
     gtk_label_set_mnemonic_widget(GTK_LABEL(passwordLabel), priv->passwordEntry);
     gtk_widget_set_halign(passwordLabel, GTK_ALIGN_END);
-    gtk_widget_add_css_class(passwordLabel, GTK_STYLE_CLASS_DIM_LABEL);
+    gtk_widget_add_css_class(passwordLabel, "dim-label");
     gtk_widget_show(passwordLabel);
 
     GtkWidget* grid = gtk_grid_new();

Modified: trunk/Source/WebKit/UIProcess/API/gtk/WebKitScriptDialogImpl.cpp (266054 => 266055)


--- trunk/Source/WebKit/UIProcess/API/gtk/WebKitScriptDialogImpl.cpp	2020-08-24 12:29:24 UTC (rev 266054)
+++ trunk/Source/WebKit/UIProcess/API/gtk/WebKitScriptDialogImpl.cpp	2020-08-24 13:10:57 UTC (rev 266055)
@@ -113,13 +113,13 @@
 #endif
 
     GtkWidget* box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
-    gtk_widget_add_css_class(box, GTK_STYLE_CLASS_TITLEBAR);
+    gtk_widget_add_css_class(box, "titlebar");
     gtk_widget_set_size_request(box, -1, 16);
     priv->title = gtk_label_new(nullptr);
     gtk_label_set_ellipsize(GTK_LABEL(priv->title), PANGO_ELLIPSIZE_END);
     gtk_widget_set_margin_top(priv->title, 6);
     gtk_widget_set_margin_bottom(priv->title, 6);
-    gtk_widget_add_css_class(priv->title, GTK_STYLE_CLASS_TITLE);
+    gtk_widget_add_css_class(priv->title, "title");
 #if USE(GTK4)
     gtk_widget_set_hexpand(priv->title, TRUE);
     gtk_widget_set_halign(priv->title, GTK_ALIGN_CENTER);
@@ -235,7 +235,9 @@
     widgetClass->key_press_event = webkitScriptDialogImplKeyPressEvent;
 #endif
     widgetClass->map = webkitScriptDialogImplMap;
+#if !USE(GTK4)
     gtk_widget_class_set_accessible_role(widgetClass, ATK_ROLE_ALERT);
+#endif
 }
 
 static void webkitScriptDialogImplSetText(WebKitScriptDialogImpl* dialog, const char* text, GtkRequisition* maxSize)

Modified: trunk/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp (266054 => 266055)


--- trunk/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp	2020-08-24 12:29:24 UTC (rev 266054)
+++ trunk/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp	2020-08-24 13:10:57 UTC (rev 266055)
@@ -1735,7 +1735,6 @@
         webkitWebViewBaseGestureController(WEBKIT_WEB_VIEW_BASE(widget)).handleEvent(event);
     return GDK_EVENT_PROPAGATE;
 }
-#endif
 
 static AtkObject* webkitWebViewBaseGetAccessible(GtkWidget* widget)
 {
@@ -1753,6 +1752,7 @@
 
     return priv->accessible.get();
 }
+#endif
 
 #if USE(GTK4)
 static void toplevelWindowIsActiveChanged(GtkWindow* window, GParamSpec*, WebKitWebViewBase* webViewBase)
@@ -2003,8 +2003,8 @@
     widgetClass->query_tooltip = webkitWebViewBaseQueryTooltip;
 #if !USE(GTK4)
     widgetClass->event = webkitWebViewBaseEvent;
+    widgetClass->get_accessible = webkitWebViewBaseGetAccessible;
 #endif
-    widgetClass->get_accessible = webkitWebViewBaseGetAccessible;
 #if USE(GTK4)
     widgetClass->root = webkitWebViewBaseRoot;
     widgetClass->unroot = webkitWebViewBaseUnroot;

Modified: trunk/Source/WebKit/UIProcess/API/gtk/WebKitWebViewDialog.cpp (266054 => 266055)


--- trunk/Source/WebKit/UIProcess/API/gtk/WebKitWebViewDialog.cpp	2020-08-24 12:29:24 UTC (rev 266054)
+++ trunk/Source/WebKit/UIProcess/API/gtk/WebKitWebViewDialog.cpp	2020-08-24 13:10:57 UTC (rev 266055)
@@ -113,8 +113,8 @@
 #if USE(GTK4)
     gtk_widget_add_css_class(GTK_WIDGET(object), "dialog");
     gtk_widget_add_css_class(GTK_WIDGET(object), "message");
-    gtk_widget_add_css_class(GTK_WIDGET(object), GTK_STYLE_CLASS_CSD);
-    gtk_widget_remove_css_class(GTK_WIDGET(object), GTK_STYLE_CLASS_BACKGROUND);
+    gtk_widget_add_css_class(GTK_WIDGET(object), "csd");
+    gtk_widget_remove_css_class(GTK_WIDGET(object), "background");
 
     WebKitWebViewDialogPrivate* priv = WEBKIT_WEB_VIEW_DIALOG(object)->priv;
     priv->cssProvider = adoptGRef(gtk_css_provider_new());
@@ -154,7 +154,7 @@
     g_clear_pointer(&priv->child, gtk_widget_unparent);
     if (child) {
         gtk_widget_set_parent(child, GTK_WIDGET(dialog));
-        gtk_widget_add_css_class(child, GTK_STYLE_CLASS_BACKGROUND);
+        gtk_widget_add_css_class(child, "background");
         gtk_style_context_add_provider(gtk_widget_get_style_context(child), GTK_STYLE_PROVIDER(priv->cssProvider.get()), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
         priv->child = child;
     }

Modified: trunk/Source/WebKit/UIProcess/Inspector/gtk/WebKitInspectorWindow.cpp (266054 => 266055)


--- trunk/Source/WebKit/UIProcess/Inspector/gtk/WebKitInspectorWindow.cpp	2020-08-24 12:29:24 UTC (rev 266054)
+++ trunk/Source/WebKit/UIProcess/Inspector/gtk/WebKitInspectorWindow.cpp	2020-08-24 13:10:57 UTC (rev 266055)
@@ -64,7 +64,7 @@
     gtk_widget_set_halign(titleLabel, GTK_ALIGN_CENTER);
     gtk_label_set_single_line_mode(GTK_LABEL(titleLabel), TRUE);
     gtk_label_set_ellipsize(GTK_LABEL(titleLabel), PANGO_ELLIPSIZE_END);
-    gtk_widget_add_css_class(titleLabel, GTK_STYLE_CLASS_TITLE);
+    gtk_widget_add_css_class(titleLabel, "title");
     gtk_widget_set_parent(titleLabel, box);
 
     window->subtitleLabel = gtk_label_new(nullptr);
@@ -71,7 +71,7 @@
     gtk_widget_set_halign(window->subtitleLabel, GTK_ALIGN_CENTER);
     gtk_label_set_single_line_mode(GTK_LABEL(window->subtitleLabel), TRUE);
     gtk_label_set_ellipsize(GTK_LABEL(window->subtitleLabel), PANGO_ELLIPSIZE_END);
-    gtk_widget_add_css_class(window->subtitleLabel, GTK_STYLE_CLASS_SUBTITLE);
+    gtk_widget_add_css_class(window->subtitleLabel, "subtitle");
     gtk_widget_set_parent(window->subtitleLabel, box);
     gtk_widget_hide(window->subtitleLabel);
 

Modified: trunk/Source/WebKit/UIProcess/gtk/WebDataListSuggestionsDropdownGtk.cpp (266054 => 266055)


--- trunk/Source/WebKit/UIProcess/gtk/WebDataListSuggestionsDropdownGtk.cpp	2020-08-24 12:29:24 UTC (rev 266054)
+++ trunk/Source/WebKit/UIProcess/gtk/WebDataListSuggestionsDropdownGtk.cpp	2020-08-24 13:10:57 UTC (rev 266055)
@@ -165,7 +165,7 @@
     auto* monitor = gdk_display_get_monitor_at_window(display, gtk_widget_get_window(m_webView));
 #endif
     GdkRectangle area;
-    gdk_monitor_get_workarea(monitor, &area);
+    monitorWorkArea(monitor, &area);
     int width = std::min(information.elementRect.width(), area.width);
     size_t itemCount = std::min<size_t>(information.suggestions.size(), (area.height / 3) / itemHeight);
 

Modified: trunk/Source/WebKit/UIProcess/gtk/WebPageProxyGtk.cpp (266054 => 266055)


--- trunk/Source/WebKit/UIProcess/gtk/WebPageProxyGtk.cpp	2020-08-24 12:29:24 UTC (rev 266054)
+++ trunk/Source/WebKit/UIProcess/gtk/WebPageProxyGtk.cpp	2020-08-24 13:10:57 UTC (rev 266055)
@@ -59,9 +59,11 @@
 
 void WebPageProxy::bindAccessibilityTree(const String& plugID)
 {
+#if !USE(GTK4)
     auto* accessible = gtk_widget_get_accessible(viewWidget());
     atk_socket_embed(ATK_SOCKET(accessible), const_cast<char*>(plugID.utf8().data()));
     atk_object_notify_state_change(accessible, ATK_STATE_TRANSIENT, FALSE);
+#endif
 }
 
 void WebPageProxy::saveRecentSearches(const String&, const Vector<WebCore::RecentSearch>&)

Modified: trunk/Source/WebKit/UIProcess/gtk/WebPopupMenuProxyGtk.cpp (266054 => 266055)


--- trunk/Source/WebKit/UIProcess/gtk/WebPopupMenuProxyGtk.cpp	2020-08-24 12:29:24 UTC (rev 266054)
+++ trunk/Source/WebKit/UIProcess/gtk/WebPopupMenuProxyGtk.cpp	2020-08-24 13:10:57 UTC (rev 266055)
@@ -320,7 +320,7 @@
     auto* monitor = gdk_display_get_monitor_at_window(display, gtk_widget_get_window(m_webView));
 #endif
     GdkRectangle area;
-    gdk_monitor_get_workarea(monitor, &area);
+    monitorWorkArea(monitor, &area);
     int width = std::min(rect.width(), area.width);
     size_t itemCount = std::min<size_t>(items.size(), (area.height / 3) / itemHeight);
 

Modified: trunk/Tools/ChangeLog (266054 => 266055)


--- trunk/Tools/ChangeLog	2020-08-24 12:29:24 UTC (rev 266054)
+++ trunk/Tools/ChangeLog	2020-08-24 13:10:57 UTC (rev 266055)
@@ -1,3 +1,10 @@
+2020-08-24  Carlos Garcia Campos  <cgar...@igalia.com>
+
+        Unreviewed. Fix GTK4 build
+
+        * MiniBrowser/gtk/BrowserSearchBox.c:
+        * MiniBrowser/gtk/BrowserWindow.c:
+
 2020-08-23  Wenson Hsieh  <wenson_hs...@apple.com>
 
         Programmatic selection of text in a text field causes the highlight overlay to spill out

Modified: trunk/Tools/MiniBrowser/gtk/BrowserSearchBox.c (266054 => 266055)


--- trunk/Tools/MiniBrowser/gtk/BrowserSearchBox.c	2020-08-24 12:29:24 UTC (rev 266054)
+++ trunk/Tools/MiniBrowser/gtk/BrowserSearchBox.c	2020-08-24 13:10:57 UTC (rev 266055)
@@ -187,8 +187,8 @@
 
     gtk_orientable_set_orientation(GTK_ORIENTABLE(searchBox), GTK_ORIENTATION_HORIZONTAL);
 #if GTK_CHECK_VERSION(3, 98, 5)
-    gtk_widget_add_css_class(GTK_WIDGET(searchBox), GTK_STYLE_CLASS_LINKED);
-    gtk_widget_add_css_class(GTK_WIDGET(searchBox), GTK_STYLE_CLASS_RAISED);
+    gtk_widget_add_css_class(GTK_WIDGET(searchBox), "linked");
+    gtk_widget_add_css_class(GTK_WIDGET(searchBox), "raised");
 #else
     GtkStyleContext *styleContext = gtk_widget_get_style_context(GTK_WIDGET(searchBox));
     gtk_style_context_add_class(styleContext, GTK_STYLE_CLASS_LINKED);

Modified: trunk/Tools/MiniBrowser/gtk/BrowserWindow.c (266054 => 266055)


--- trunk/Tools/MiniBrowser/gtk/BrowserWindow.c	2020-08-24 12:29:24 UTC (rev 266054)
+++ trunk/Tools/MiniBrowser/gtk/BrowserWindow.c	2020-08-24 13:10:57 UTC (rev 266055)
@@ -989,7 +989,7 @@
 
     GtkWidget *groupBox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
 #if GTK_CHECK_VERSION(3, 98, 5)
-    gtk_widget_add_css_class(groupBox, GTK_STYLE_CLASS_LINKED);
+    gtk_widget_add_css_class(groupBox, "linked");
 #else
     gtk_style_context_add_class(gtk_widget_get_style_context(groupBox), GTK_STYLE_CLASS_LINKED);
 #endif
@@ -1006,7 +1006,7 @@
 
     groupBox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
 #if GTK_CHECK_VERSION(3, 98, 5)
-    gtk_widget_add_css_class(groupBox, GTK_STYLE_CLASS_LINKED);
+    gtk_widget_add_css_class(groupBox, "linked");
 #else
     gtk_style_context_add_class(gtk_widget_get_style_context(groupBox), GTK_STYLE_CLASS_LINKED);
 #endif
@@ -1022,7 +1022,7 @@
 
     groupBox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
 #if GTK_CHECK_VERSION(3, 98, 5)
-    gtk_widget_add_css_class(groupBox, GTK_STYLE_CLASS_LINKED);
+    gtk_widget_add_css_class(groupBox, "linked");
 #else
     gtk_style_context_add_class(gtk_widget_get_style_context(groupBox), GTK_STYLE_CLASS_LINKED);
 #endif
@@ -1037,7 +1037,7 @@
 
     groupBox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
 #if GTK_CHECK_VERSION(3, 98, 5)
-    gtk_widget_add_css_class(groupBox, GTK_STYLE_CLASS_LINKED);
+    gtk_widget_add_css_class(groupBox, "linked");
 #else
     gtk_style_context_add_class(gtk_widget_get_style_context(groupBox), GTK_STYLE_CLASS_LINKED);
 #endif
@@ -1053,7 +1053,7 @@
 
     groupBox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
 #if GTK_CHECK_VERSION(3, 98, 5)
-    gtk_widget_add_css_class(groupBox, GTK_STYLE_CLASS_LINKED);
+    gtk_widget_add_css_class(groupBox, "linked");
 #else
     gtk_style_context_add_class(gtk_widget_get_style_context(groupBox), GTK_STYLE_CLASS_LINKED);
 #endif
@@ -1068,7 +1068,7 @@
 
     groupBox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
 #if GTK_CHECK_VERSION(3, 98, 5)
-    gtk_widget_add_css_class(groupBox, GTK_STYLE_CLASS_LINKED);
+    gtk_widget_add_css_class(groupBox, "linked");
 #else
     gtk_style_context_add_class(gtk_widget_get_style_context(groupBox), GTK_STYLE_CLASS_LINKED);
 #endif
@@ -1239,7 +1239,7 @@
 
     GtkWidget *navigationBox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
 #if GTK_CHECK_VERSION(3, 98, 5)
-    gtk_widget_add_css_class(navigationBox, GTK_STYLE_CLASS_LINKED);
+    gtk_widget_add_css_class(navigationBox, "linked");
 #else
     gtk_style_context_add_class(gtk_widget_get_style_context(navigationBox), GTK_STYLE_CLASS_LINKED);
 #endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to