From 2d18caf46d9c279fb193dc2a460d53d93b3717b5 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 29 May 2022 14:57:25 -0400 Subject: Fix MacOS build I can't for the life of me figure out how to do this portably with C++ casts, since the native types are very different between platforms (pointer on MacOS, integer on X11). So, just give up and go back to C casts here. --- src/gtk2_in_qt5.cpp | 4 ++-- src/qt5_in_gtk.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/gtk2_in_qt5.cpp b/src/gtk2_in_qt5.cpp index a5c98f1..47c8271 100644 --- a/src/gtk2_in_qt5.cpp +++ b/src/gtk2_in_qt5.cpp @@ -41,6 +41,7 @@ SUIL_DISABLE_GTK_WARNINGS #include SUIL_RESTORE_WARNINGS +#include #include extern "C" { @@ -95,8 +96,7 @@ wrapper_wrap(SuilWrapper* wrapper, SuilInstance* instance) gtk_container_add(GTK_CONTAINER(plug), widget); gtk_widget_show_all(plug); - const WId wid = - static_cast(gtk_plug_get_id(reinterpret_cast(plug))); + const WId wid = (WId)gtk_plug_get_id(GTK_PLUG(plug)); QWindow* window = QWindow::fromWinId(wid); QWidget* container = diff --git a/src/qt5_in_gtk.cpp b/src/qt5_in_gtk.cpp index 6277daa..1c614c7 100644 --- a/src/qt5_in_gtk.cpp +++ b/src/qt5_in_gtk.cpp @@ -125,7 +125,7 @@ suil_qt_wrapper_realize(GtkWidget* w, gpointer) { SuilQtWrapper* const wrap = SUIL_QT_WRAPPER(w); GtkSocket* const s = GTK_SOCKET(w); - const WId id = static_cast(gtk_socket_get_id(s)); + const WId id = (WId)gtk_socket_get_id(s); wrap->qembed->winId(); wrap->qembed->windowHandle()->setParent(QWindow::fromWinId(id)); -- cgit v1.2.1