Title: [261280] trunk/Tools
- Revision
- 261280
- Author
- [email protected]
- Date
- 2020-05-07 05:41:57 -0700 (Thu, 07 May 2020)
Log Message
Unreviewed. Fix GTK4 build with current GTK
GtkWindow and GtkOverlay aren't a GtkContainer anymore.
* MiniBrowser/gtk/BrowserTab.c:
(browserTabConstructed):
* MiniBrowser/gtk/BrowserWindow.c:
(browser_window_init):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (261279 => 261280)
--- trunk/Tools/ChangeLog 2020-05-07 11:16:30 UTC (rev 261279)
+++ trunk/Tools/ChangeLog 2020-05-07 12:41:57 UTC (rev 261280)
@@ -1,3 +1,14 @@
+2020-05-07 Carlos Garcia Campos <[email protected]>
+
+ Unreviewed. Fix GTK4 build with current GTK
+
+ GtkWindow and GtkOverlay aren't a GtkContainer anymore.
+
+ * MiniBrowser/gtk/BrowserTab.c:
+ (browserTabConstructed):
+ * MiniBrowser/gtk/BrowserWindow.c:
+ (browser_window_init):
+
2020-05-07 Philippe Normand <[email protected]>
[Flatpak SDK] Import build definitions
Modified: trunk/Tools/MiniBrowser/gtk/BrowserTab.c (261279 => 261280)
--- trunk/Tools/MiniBrowser/gtk/BrowserTab.c 2020-05-07 11:16:30 UTC (rev 261279)
+++ trunk/Tools/MiniBrowser/gtk/BrowserTab.c 2020-05-07 12:41:57 UTC (rev 261280)
@@ -434,8 +434,12 @@
gtk_overlay_add_overlay(GTK_OVERLAY(overlay), tab->pointerLockMessageLabel);
gtk_widget_set_vexpand(GTK_WIDGET(tab->webView), TRUE);
+#if !GTK_CHECK_VERSION(3, 98, 0)
gtk_container_add(GTK_CONTAINER(overlay), GTK_WIDGET(tab->webView));
gtk_widget_show(GTK_WIDGET(tab->webView));
+#else
+ gtk_overlay_set_child(GTK_OVERLAY(overlay), GTK_WIDGET(tab->webView));
+#endif
#if !GTK_CHECK_VERSION(3, 98, 0)
tab->titleBox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
Modified: trunk/Tools/MiniBrowser/gtk/BrowserWindow.c (261279 => 261280)
--- trunk/Tools/MiniBrowser/gtk/BrowserWindow.c 2020-05-07 11:16:30 UTC (rev 261279)
+++ trunk/Tools/MiniBrowser/gtk/BrowserWindow.c 2020-05-07 12:41:57 UTC (rev 261280)
@@ -1117,12 +1117,12 @@
#if !GTK_CHECK_VERSION(3, 98, 0)
gtk_box_pack_start(GTK_BOX(window->mainBox), window->notebook, TRUE, TRUE, 0);
gtk_widget_show(window->notebook);
+ gtk_container_add(GTK_CONTAINER(window), vbox);
+ gtk_widget_show(vbox);
#else
gtk_container_add(GTK_CONTAINER(window->mainBox), window->notebook);
+ gtk_window_set_child(GTK_WINDOW(window), vbox);
#endif
-
- gtk_container_add(GTK_CONTAINER(window), vbox);
- gtk_widget_show(vbox);
}
static void browserWindowConstructed(GObject *gObject)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
