Merge branch 'NateEag-master-patch-12920' into 'master'

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

diff --git a/libs/uilib/uilib.h b/libs/uilib/uilib.h
index d795b75834659eff96b1e79d1514837f152b3d32..abefc9e57490dfcdf9266404a95afa5815032d7d 100644 (file)
--- a/libs/uilib/uilib.h
+++ b/libs/uilib/uilib.h
@@ -1,6 +1,7 @@
 #ifndef INCLUDED_UILIB_H
 #define INCLUDED_UILIB_H
 
+#include <cstdint>
 #include <string>
 #include <glib-object.h>
 
@@ -103,6 +104,11 @@ namespace ui {
         NEVER
     };
 
+       enum class Packing {
+               START,
+               END
+       };
+
     namespace details {
 
         enum class Convert {
@@ -376,6 +382,7 @@ namespace ui {
     ,
          void pack_start(ui::Widget child, bool expand, bool fill, unsigned int padding);
          void pack_end(ui::Widget child, bool expand, bool fill, unsigned int padding);
+         void set_child_packing(ui::Widget child, bool expand, bool fill, unsigned int padding, ui::Packing packing);
     );
 
     WRAP(VBox, Box, _GtkVBox, (),
@@ -585,7 +592,7 @@ namespace ui {
     alert_response alert(
             Window parent,
             std::string text,
-            std::string title = "NetRadiant",
+            std::string title = RADIANT_NAME,
             alert_type type = alert_type::OK,
             alert_icon icon = alert_icon::Default
     );