Purge gtk_container_add

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

diff --git a/libs/uilib/uilib.h b/libs/uilib/uilib.h
index f5b6e180ca0ddede81d787c58dae6a11eda67c1d..4dbdd7910ae1493c1200337ece777513810834c5 100644 (file)
--- a/libs/uilib/uilib.h
+++ b/libs/uilib/uilib.h
@@ -21,6 +21,7 @@ struct _GtkContainer;
 struct _GtkDialog;
 struct _GtkEditable;
 struct _GtkEntry;
+struct _GtkEntryCompletion;
 struct _GtkFrame;
 struct _GtkHBox;
 struct _GtkHPaned;
@@ -140,6 +141,8 @@ namespace ui {
         };
     }
 
+    extern struct Null {} null;
+
     class Object :
             public details::Convertible<Object, _GtkObject *, details::Convert::Explicit>,
             public details::Convertible<Object, _GTypeInstance *, details::Convert::Explicit> {
@@ -160,16 +163,17 @@ namespace ui {
 
 #define WRAP(name, super, T, interfaces, ctors, methods) \
     class name; \
-    class I##name { \
+    class I##name : public details::Convertible<name, T *, details::Convert::Implicit> { \
     public: \
         using self = name *; \
         methods \
     }; \
-    class name : public super, public details::Convertible<name, T *, details::Convert::Implicit>, public I##name, public details::Mixin<name, void interfaces>::type { \
+    class name : public super, public I##name, public details::Mixin<name, void interfaces>::type { \
     public: \
         using self = name *; \
         using native = T *; \
         explicit name(native h) : super(reinterpret_cast<super::native>(h)) {} \
+        explicit name(Null n) : name((native) nullptr) {} \
         ctors \
     }; \
     inline bool operator<(name self, name other) { return self._handle < other._handle; } \
@@ -177,6 +181,8 @@ namespace ui {
 
     // https://developer.gnome.org/gtk2/stable/ch01.html
 
+    // GInterface
+
     WRAP(CellEditable, Object, _GtkCellEditable, (),
     ,
     );
@@ -187,6 +193,12 @@ namespace ui {
          void editable(bool value);
     );
 
+    WRAP(TreeModel, Object, _GtkTreeModel, (),
+    ,
+    );
+
+    // GObject
+
     WRAP(Widget, Object, _GtkWidget, (),
          Widget();
     ,
@@ -210,6 +222,7 @@ namespace ui {
 
     WRAP(Container, Widget, _GtkContainer, (),
     ,
+         void add(Widget widget);
     );
 
     WRAP(Bin, Container, _GtkBin, (),
@@ -466,15 +479,17 @@ namespace ui {
     ,
     );
 
-    WRAP(ListStore, Object, _GtkListStore, (),
+    WRAP(EntryCompletion, Object, _GtkEntryCompletion, (),
     ,
-         void clear();
     );
 
-    WRAP(TreeModel, Widget, _GtkTreeModel, (),
+    WRAP(ListStore, Object, _GtkListStore, (ITreeModel),
     ,
+         void clear();
     );
 
+    // GBoxed
+
     WRAP(TreePath, Object, _GtkTreePath, (),
          TreePath();
          TreePath(const char *path);