-DGTK_DISABLE_DEPRECATED

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

diff --git a/libs/uilib/uilib.h b/libs/uilib/uilib.h
index 7e943985ac58d2cd839e0318bf9404e3924bf531..96a6ddce257fedfa1d35841127965a9fa7d4237e 100644 (file)
--- a/libs/uilib/uilib.h
+++ b/libs/uilib/uilib.h
@@ -10,12 +10,14 @@ using ui_box = struct _GtkBox;
 using ui_button = struct _GtkButton;
 using ui_checkbutton = struct _GtkCheckButton;
 using ui_combobox = struct _GtkComboBox;
+using ui_comboboxtext = struct _GtkComboBoxText;
 using ui_cellrenderer = struct _GtkCellRenderer;
 using ui_cellrenderertext = struct _GtkCellRendererText;
 using ui_entry = struct _GtkEntry;
 using ui_evkey = struct _GdkEventKey;
 using ui_frame = struct _GtkFrame;
 using ui_hbox = struct _GtkHBox;
+using ui_hscale = struct _GtkHScale;
 using ui_hpaned = struct _GtkHPaned;
 using ui_image = struct _GtkImage;
 using ui_label = struct _GtkLabel;
@@ -27,6 +29,7 @@ using ui_paned = struct _GtkPaned;
 using ui_scrolledwindow = struct _GtkScrolledWindow;
 using ui_spinbutton = struct _GtkSpinButton;
 using ui_table = struct _GtkTable;
+using ui_textview = struct _GtkTextView;
 using ui_treemodel = struct _GtkTreeModel;
 using ui_treepath = struct _GtkTreePath;
 using ui_treeview = struct _GtkTreeView;
@@ -167,7 +170,9 @@ namespace ui {
 
     WRAP(ComboBox, Widget, ui_combobox,);
 
-    ComboBox ComboBoxText();
+    WRAP(ComboBoxText, ComboBox, ui_comboboxtext,
+         ComboBoxText();
+    );
 
     WRAP(Entry, Widget, ui_entry,
          Entry();
@@ -182,6 +187,11 @@ namespace ui {
          HBox(bool homogenous, int spacing);
     );
 
+    WRAP(HScale, Widget, ui_hscale,
+         HScale(Adjustment adjustment);
+         HScale(double min, double max, double step);
+    );
+
     WRAP(Image, Widget, ui_image,
          Image();
     );
@@ -220,6 +230,10 @@ namespace ui {
          Table(std::size_t rows, std::size_t columns, bool homogenous);
     );
 
+    WRAP(TextView, Widget, ui_textview,
+         TextView();
+    );
+
     WRAP(TreeModel, Widget, ui_treemodel,);
 
     WRAP(TreePath, Object, ui_treepath,