aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Bodenmann <joel@unormal.org>2013-10-27 16:39:42 +0100
committerinmarket <andrewh@inmarket.com.au>2013-10-28 09:26:30 +1000
commit7c3b7270fc1b39bf231654b846bcaeccead4413c (patch)
tree354ea77393eff5776e7bd2ea335990ef2893a453
parent579a7806716a08cbcc6829ea26eff3c15519a932 (diff)
downloaduGFX-7c3b7270fc1b39bf231654b846bcaeccead4413c.tar.gz
uGFX-7c3b7270fc1b39bf231654b846bcaeccead4413c.tar.bz2
uGFX-7c3b7270fc1b39bf231654b846bcaeccead4413c.zip
moved include headers to correct location
-rw-r--r--include/gwin/gwidget.h11
-rw-r--r--include/gwin/gwin.h8
2 files changed, 11 insertions, 8 deletions
diff --git a/include/gwin/gwidget.h b/include/gwin/gwidget.h
index b760dd41..493485b3 100644
--- a/include/gwin/gwidget.h
+++ b/include/gwin/gwidget.h
@@ -279,15 +279,26 @@ bool_t gwinAttachListener(GListener *pl);
#if GWIN_NEED_BUTTON || defined(__DOXYGEN__)
#include "gwin/button.h"
#endif
+
#if GWIN_NEED_SLIDER || defined(__DOXYGEN__)
#include "gwin/slider.h"
#endif
+
#if GWIN_NEED_CHECKBOX || defined(__DOXYGEN__)
#include "gwin/checkbox.h"
#endif
+
#if GWIN_NEED_RADIO || defined(__DOXYGEN__)
#include "gwin/radio.h"
#endif
+#if GWIN_NEED_LABEL || defined(__DOXYGEN__)
+ #include "gwin/label.h"
+#endif
+
+#if GWIN_NEED_LIST || defined(__DOXYGEN__)
+ #include "gwin/list.h"
+#endif
+
#endif /* _GWIDGET_H */
/** @} */
diff --git a/include/gwin/gwin.h b/include/gwin/gwin.h
index 37a14fa1..fa5ba613 100644
--- a/include/gwin/gwin.h
+++ b/include/gwin/gwin.h
@@ -823,14 +823,6 @@ extern "C" {
#include "gwin/image.h"
#endif
- #if GWIN_NEED_LABEL || defined(__DOXYGEN__)
- #include "gwin/label.h"
- #endif
-
- #if GWIN_NEED_LIST || defined(__DOXYGEN__)
- #include "gwin/list.h"
- #endif
-
#endif /* GFX_USE_GWIN */
#endif /* _GWIN_H */