Merge branch 'master' into epoxy

[movit] / widgets.h

diff --git a/widgets.h b/widgets.h
index 9ae00cf1494f39b550f2f3a03fe6412da967dff7..eb89a743642dfb4e1d03f91a2ff7f8e86005d3df 100644 (file)
--- a/widgets.h
+++ b/widgets.h
@@ -1,9 +1,15 @@
-#ifndef _WIDGETS_H
-#define _WIDGETS_H 1
+#ifndef _MOVIT_WIDGETS_H
+#define _MOVIT_WIDGETS_H 1
+
+// Some simple UI widgets for test use.
+
+namespace movit {
 
 void draw_hsv_wheel(float y, float rad, float theta, float value);
 void draw_saturation_bar(float y, float saturation);
 void make_hsv_wheel_texture();
 void read_colorwheel(float xf, float yf, float *rad, float *theta, float *value);
 
-#endif // !defined(_WIDGETS_H)
+}  // namespace movit
+
+#endif // !defined(_MOVIT_WIDGETS_H)