From 1478fdf41e3731cafacd22ff6f530fb724c02df3 Mon Sep 17 00:00:00 2001
From: inmarket <andrewh@inmarket.com.au>
Date: Fri, 9 May 2014 21:37:06 +1000
Subject: [PATCH] Re-order GWIN sys_rules to simplify ready for new
 functionality.

---
 src/gwin/sys_rules.h | 53 +++++++++++++++++++++++++-------------------
 1 file changed, 30 insertions(+), 23 deletions(-)

diff --git a/src/gwin/sys_rules.h b/src/gwin/sys_rules.h
index 30dac1bb..f9f00a48 100644
--- a/src/gwin/sys_rules.h
+++ b/src/gwin/sys_rules.h
@@ -17,6 +17,7 @@
 #define _GWIN_RULES_H
 
 #if GFX_USE_GWIN
+	// Sub-system rules
 	#if !GFX_USE_GDISP
 		#error "GWIN: GFX_USE_GDISP must be TRUE when using GWIN"
 	#endif
@@ -25,33 +26,20 @@
 			#warning "GWIN: Drawing can occur outside the defined windows as GDISP_NEED_CLIP is FALSE"
 		#endif
 	#endif
-	#if GWIN_NEED_IMAGE
-		#if !GDISP_NEED_IMAGE
-			#error "GWIN: GDISP_NEED_IMAGE is required when GWIN_NEED_IMAGE is TRUE."
-		#endif
-	#endif
-	#if GWIN_NEED_RADIO
-		#if !GDISP_NEED_CIRCLE
-			#if GFX_DISPLAY_RULE_WARNINGS
-				#warning "GWIN: GDISP_NEED_CIRCLE should be set to TRUE for much nicer radio button widgets."
-			#endif
-		#endif
-	#endif
+
+	// Objects require their super-class
 	#if GWIN_NEED_BUTTON || GWIN_NEED_SLIDER || GWIN_NEED_CHECKBOX || GWIN_NEED_LABEL || GWIN_NEED_RADIO || GWIN_NEED_LIST || \
 		GWIN_NEED_IMAGE || GWIN_NEED_CHECKBOX || GWIN_NEED_PROGRESSBAR 
 		#if !GWIN_NEED_WIDGET
 			#if GFX_DISPLAY_RULE_WARNINGS
-				#warning "GWIN: GWIN_NEED_WIDGET is required when a Widget is used. It has been turned on for you."
+				#warning "GWIN: GWIN_NEED_WIDGET is required when a widget is used. It has been turned on for you."
 			#endif
 			#undef GWIN_NEED_WIDGET
 			#define GWIN_NEED_WIDGET	TRUE
 		#endif
 	#endif
-	#if GWIN_NEED_LIST
-		#if !GDISP_NEED_TEXT
-			#error "GWIN: GDISP_NEED_TEXT is required when GWIN_NEED_LIST is TRUE."
-		#endif
-	#endif
+
+	// Rules for the super-classes
 	#if GWIN_NEED_WIDGET
 		#if !GDISP_NEED_TEXT
 			#error "GWIN: GDISP_NEED_TEXT is required if GWIN_NEED_WIDGET is TRUE."
@@ -86,16 +74,35 @@
 			#define GQUEUE_NEED_ASYNC	TRUE
 		#endif
 	#endif
+
+	// Rules for individual objects
+	#if GWIN_NEED_LIST
+		#if !GDISP_NEED_TEXT
+			#error "GWIN: GDISP_NEED_TEXT is required when GWIN_NEED_LIST is TRUE."
+		#endif
+	#endif
+	#if GWIN_NEED_RADIO
+		#if !GDISP_NEED_CIRCLE
+			#if GFX_DISPLAY_RULE_WARNINGS
+				#warning "GWIN: GDISP_NEED_CIRCLE should be set to TRUE for much nicer radio button widgets."
+			#endif
+		#endif
+	#endif
+	#if GWIN_NEED_IMAGE
+		#if !GDISP_NEED_IMAGE
+			#error "GWIN: GDISP_NEED_IMAGE is required when GWIN_NEED_IMAGE is TRUE."
+		#endif
+	#endif
 	#if GWIN_NEED_CONSOLE
 		#if !GDISP_NEED_TEXT
 			#error "GWIN: GDISP_NEED_TEXT is required if GWIN_NEED_CONSOLE is TRUE."
 		#endif
 	#endif
-	#if GWIN_NEED_GRAPH
-	#endif
-	#if GWIN_PROGRESSBAR_AUTO
-		#if !GFX_USE_GTIMER
-			#error "GWIN: GFX_USE_GTIMER is required if GWIN_PROGRESSBAR_AUTO is TRUE."
+	#if GWIN_NEED_PROGRESSBAR
+		#if GWIN_PROGRESSBAR_AUTO
+			#if !GFX_USE_GTIMER
+				#error "GWIN: GFX_USE_GTIMER is required if GWIN_PROGRESSBAR_AUTO is TRUE."
+			#endif
 		#endif
 	#endif
 #endif