Wrap more GTK

[xonotic/netradiant.git] / libs / uilib / uilib.cpp

diff --git a/libs/uilib/uilib.cpp b/libs/uilib/uilib.cpp
index e4fb3d321351e25f3c429ed19c6e19c427f4eed9..1b19229146ead12332f04c0f374cac2fa1434528 100644 (file)
--- a/libs/uilib/uilib.cpp
+++ b/libs/uilib/uilib.cpp
@@ -39,7 +39,7 @@ namespace ui {
     Widget root{ui::null};
 
 #define IMPL(T, F) template<> _IMPL(T, F)
-#define _IMPL(T, F) struct verify<T *> { using self = T; static self test(self it) { return self(F(it)); } }
+#define _IMPL(T, F) struct verify<T *> { using self = T; static self test(self it) { return self::from(F(it)); } }
 
     template<class T>
     struct verify;
@@ -196,7 +196,7 @@ namespace ui {
             delete data;
         };
         auto func = [](_GtkWidget *widget, GdkEventKey *event, user_data *args) -> bool {
-            return args->f(Widget(widget), event, args->extra);
+            return args->f(Widget::from(widget), event, args->extra);
         };
         auto clos = g_cclosure_new(G_CALLBACK(+func), pass, reinterpret_cast<GClosureNotify>(+dtor));
         return g_signal_connect_closure(G_OBJECT(this), "key-press-event", clos, false);
@@ -448,6 +448,16 @@ namespace ui {
 
     // Custom
 
+#if GTK_TARGET == 3
+
+    IMPL(GLArea, (void *));
+
+#elif GTK_TARGET == 2
+
+    IMPL(GLArea, GTK_DRAWING_AREA);
+
+#endif
+
     guint IGLArea::on_render(GCallback pFunction, void *data)
     {
 #if GTK_TARGET == 3