libui updates, paint namespace, font and palette fixes, button sound

1 files changed, 7 insertions, 0 deletions

diff --git a/src/ui/widget.h b/src/ui/widget.h
index 26832c7..54c8d96 100644
--- a/src/ui/widget.h
+++ b/src/ui/widget.h
@@ -15,6 +15,7 @@
 #include "auxiliary/functions.h"
 #include "math/color.h"
 #include "math/vector2f.h"
+#include "ui/font.h"
 #include "ui/palette.h"
 #include "sys/sys.h"
 
@@ -58,6 +59,8 @@ public:
 
 	Palette const *palette() const;
 
+	Font const *font() const;
+
 	bool has_focus() const;
 
 
@@ -84,6 +87,9 @@ public:
 	/// set the widgets palette
 	void set_palette(Palette *palette);
 
+	/// set the widgets font
+ 	void set_font(Font *font);
+
 	/// set the widgets label
 	void set_label(std::string const &label);
 	
@@ -189,6 +195,7 @@ private:
 	Children		 widget_children;
 
 	Palette			*widget_palette;
+	Font			*widget_font;
 	Widget			*widget_parent;
 	
 	Children::iterator find_child(Widget *child);