Move GWIN widget internal flags into the public header so that all the state flags are available for custom draw routines.

8 files changed, 15 insertions, 15 deletions

diff --git a/src/gwin/gwin_button.h b/src/gwin/gwin_button.h
index 0e46330b..f226731f 100644
--- a/src/gwin/gwin_button.h
+++ b/src/gwin/gwin_button.h
@@ -44,7 +44,7 @@ typedef GEventGWin		GEventGWinButton;
  * @note	Used only for writing a custom draw routine.
  * @{
  */
-#define GBUTTON_FLG_PRESSED		(GWIN_FIRST_CONTROL_FLAG<<0)
+#define GBUTTON_FLG_PRESSED		(0x00000001<<0)
 /** @} */
 
 /**
diff --git a/src/gwin/gwin_checkbox.h b/src/gwin/gwin_checkbox.h
index 48807239..5fc8f8a1 100644
--- a/src/gwin/gwin_checkbox.h
+++ b/src/gwin/gwin_checkbox.h
@@ -50,7 +50,7 @@ typedef struct GEventGWinCheckbox {
  * @note	Used only for writing a custom draw routine.
  * @{
  */
-#define GCHECKBOX_FLG_CHECKED		(GWIN_FIRST_CONTROL_FLAG<<0)
+#define GCHECKBOX_FLG_CHECKED		(0x00000001<<0)
 /** @} */
 
 /* A Checkbox window */
diff --git a/src/gwin/gwin_class.h b/src/gwin/gwin_class.h
index f2aa4df0..ea5c260c 100644
--- a/src/gwin/gwin_class.h
+++ b/src/gwin/gwin_class.h
@@ -27,7 +27,7 @@
  * @brief	The predefined flags for a Window
  * @{
  */
-#define GWIN_FIRST_CONTROL_FLAG			0x00000001			/**< 8 bits free for the control to use */
+#define GWIN_FIRST_CONTROL_FLAG			0x00000001			/**< 8 bits free for the control to use. Don't change this value as it is relied upon definitions in widget header files. */
 #define GWIN_LAST_CONTROL_FLAG			0x00000080			/**< 8 bits free for the control to use */
 #define GWIN_FLG_VISIBLE				0x00000100			/**< The window is "visible" */
 #define GWIN_FLG_SYSVISIBLE				0x00000200			/**< The window is visible after parents are tested */
diff --git a/src/gwin/gwin_keyboard.h b/src/gwin/gwin_keyboard.h
index 43f6cf76..2b1e2627 100644
--- a/src/gwin/gwin_keyboard.h
+++ b/src/gwin/gwin_keyboard.h
@@ -44,8 +44,8 @@ typedef GEventGWin		GEventGWinKeyboard;
  * @note	Used only for writing a custom draw routine.
  * @{
  */
-#define GKEYBOARD_FLG_REVERTSET		(GWIN_FIRST_CONTROL_FLAG<<0)
-#define GKEYBOARD_FLG_QUICKUPDATE	(GWIN_FIRST_CONTROL_FLAG<<1)
+#define GKEYBOARD_FLG_REVERTSET		(0x00000001<<0)
+#define GKEYBOARD_FLG_QUICKUPDATE	(0x00000001<<1)
 #define GKEY_BAD_ROWCOL				255
 /** @} */
 
diff --git a/src/gwin/gwin_label.h b/src/gwin/gwin_label.h
index b0e30af5..c54d5da4 100644
--- a/src/gwin/gwin_label.h
+++ b/src/gwin/gwin_label.h
@@ -38,9 +38,9 @@
  * @note	Used only for writing a custom draw routine.
  * @{
  */
-#define GLABEL_FLG_WAUTO		(GWIN_FIRST_CONTROL_FLAG << 0)
-#define GLABEL_FLG_HAUTO		(GWIN_FIRST_CONTROL_FLAG << 1)
-#define GLABEL_FLG_BORDER		(GWIN_FIRST_CONTROL_FLAG << 2)
+#define GLABEL_FLG_WAUTO		(0x00000001 << 0)
+#define GLABEL_FLG_HAUTO		(0x00000001 << 1)
+#define GLABEL_FLG_BORDER		(0x00000001 << 2)
 /** @} */
 
 // An label window
diff --git a/src/gwin/gwin_list.h b/src/gwin/gwin_list.h
index a60ded9d..01ac0b0b 100644
--- a/src/gwin/gwin_list.h
+++ b/src/gwin/gwin_list.h
@@ -81,11 +81,11 @@ typedef enum scroll_t { scrollAlways, scrollAuto, scrollSmooth } scroll_t;
  * @note	Used only for writing a custom draw routine.
  * @{
  */
-#define GLIST_FLG_MULTISELECT		(GWIN_FIRST_CONTROL_FLAG << 0)
-#define GLIST_FLG_HASIMAGES			(GWIN_FIRST_CONTROL_FLAG << 1)
-#define GLIST_FLG_SCROLLALWAYS		(GWIN_FIRST_CONTROL_FLAG << 2)
-#define GLIST_FLG_SCROLLSMOOTH      (GWIN_FIRST_CONTROL_FLAG << 3)
-#define GLIST_FLG_ENABLERENDER      (GWIN_FIRST_CONTROL_FLAG << 4)
+#define GLIST_FLG_MULTISELECT		(0x00000001 << 0)
+#define GLIST_FLG_HASIMAGES			(0x00000001 << 1)
+#define GLIST_FLG_SCROLLALWAYS		(0x00000001 << 2)
+#define GLIST_FLG_SCROLLSMOOTH      (0x00000001 << 3)
+#define GLIST_FLG_ENABLERENDER      (0x00000001 << 4)
 /** @} */
 
 /**
diff --git a/src/gwin/gwin_radio.h b/src/gwin/gwin_radio.h
index e0897725..197be5d5 100644
--- a/src/gwin/gwin_radio.h
+++ b/src/gwin/gwin_radio.h
@@ -50,7 +50,7 @@ typedef struct GEventGWinRadio {
  * @note	Used only for writing a custom draw routine.
  * @{
  */
-#define GRADIO_FLG_PRESSED		(GWIN_FIRST_CONTROL_FLAG<<0)
+#define GRADIO_FLG_PRESSED		(0x00000001<<0)
 /** @} */
 
 /**
diff --git a/src/gwin/gwin_slider.h b/src/gwin/gwin_slider.h
index 358027de..000adb78 100644
--- a/src/gwin/gwin_slider.h
+++ b/src/gwin/gwin_slider.h
@@ -50,7 +50,7 @@ typedef struct GEventGWinSlider {
  * @note	Used only for writing a custom draw routine.
  * @{
  */
-#define GSLIDER_FLG_EXTENDED_EVENTS		(GWIN_FIRST_CONTROL_FLAG<<0)
+#define GSLIDER_FLG_EXTENDED_EVENTS		(0x00000001<<0)
 /** @} */
 
 // A slider window