Create a generic GWIN event.

The frame now sends a GEVENT_GWIN_CLOSE event on closing.
Unfortunately some gwin events have had a field renamed in order to generalise the structure.
Demo's updated to match.

7 files changed, 24 insertions, 24 deletions

diff --git a/demos/modules/gwin/button/main.c b/demos/modules/gwin/button/main.c
index 156e929e..15e8e5a7 100644
--- a/demos/modules/gwin/button/main.c
+++ b/demos/modules/gwin/button/main.c
@@ -83,7 +83,7 @@ int main(void) {
 
 		switch(pe->type) {
 			case GEVENT_GWIN_BUTTON:
-				if (((GEventGWinButton*)pe)->button == ghButton1) {
+				if (((GEventGWinButton*)pe)->gwin == ghButton1) {
 					// Our button has been pressed
 					if (++which >= sizeof(orients)/sizeof(orients[0]))
 						which = 0;
diff --git a/demos/modules/gwin/checkbox/main.c b/demos/modules/gwin/checkbox/main.c
index 2a2df2fb..28122bee 100644
--- a/demos/modules/gwin/checkbox/main.c
+++ b/demos/modules/gwin/checkbox/main.c
@@ -77,7 +77,7 @@ int main(void) {
 
 		switch(pe->type) {
 			case GEVENT_GWIN_CHECKBOX:
-				if (((GEventGWinCheckbox*)pe)->checkbox == ghCheckbox1) {
+				if (((GEventGWinCheckbox*)pe)->gwin == ghCheckbox1) {
 					// The state of our checkbox has changed
 					//printf("Checkbox state: %d\r\n", ((GEventGWinCheckbox*)pe)->isChecked);
 				}
diff --git a/demos/modules/gwin/container_nested/main.c b/demos/modules/gwin/container_nested/main.c
index 94285afa..2d90f76b 100644
--- a/demos/modules/gwin/container_nested/main.c
+++ b/demos/modules/gwin/container_nested/main.c
@@ -141,13 +141,13 @@ int main(void) {
 
         switch(pe->type) {
             case GEVENT_GWIN_CHECKBOX:
-                if (((GEventGWinCheckbox*)pe)->checkbox == ghCheckbox1) {
+                if (((GEventGWinCheckbox*)pe)->gwin == ghCheckbox1) {
                     gwinSetVisible(ghContainer2, gwinCheckboxIsChecked(ghCheckbox1));
                 }
-                else if (((GEventGWinCheckbox*)pe)->checkbox == ghCheckbox2) {
+                else if (((GEventGWinCheckbox*)pe)->gwin == ghCheckbox2) {
                     gwinSetVisible(ghContainer3, gwinCheckboxIsChecked(ghCheckbox2));
                 }
-                else if (((GEventGWinCheckbox*)pe)->checkbox == ghCheckbox3) {
+                else if (((GEventGWinCheckbox*)pe)->gwin == ghCheckbox3) {
                     gwinSetVisible(ghContainer1, gwinCheckboxIsChecked(ghCheckbox3));
                 }
                 break;
diff --git a/demos/modules/gwin/frame/main.c b/demos/modules/gwin/frame/main.c
index 3f3d8845..fe956925 100644
--- a/demos/modules/gwin/frame/main.c
+++ b/demos/modules/gwin/frame/main.c
@@ -138,19 +138,19 @@ int main(void) {
 
         switch(pe->type) {
             case GEVENT_GWIN_SLIDER:
-                if (((GEventGWinSlider *)pe)->slider == ghSliderR || \
-                                                        ghSliderG || \
-                                                        ghSliderB ) {
+                if (((GEventGWinSlider *)pe)->gwin == ghSliderR || \
+                                                      ghSliderG || \
+                                                      ghSliderB ) {
                     _updateColor();
                 }
                 break;
 
             case GEVENT_GWIN_BUTTON:
-                if (((GEventGWinButton *)pe)->button == ghButton1) {
+                if (((GEventGWinButton *)pe)->gwin == ghButton1) {
                     gwinSliderSetPosition(ghSliderR, rand() % 256);
-                } else if (((GEventGWinButton *)pe)->button == ghButton2) {
+                } else if (((GEventGWinButton *)pe)->gwin == ghButton2) {
                     gwinSliderSetPosition(ghSliderG, rand() % 256);
-                } else if (((GEventGWinButton *)pe)->button == ghButton3) {
+                } else if (((GEventGWinButton *)pe)->gwin == ghButton3) {
                     gwinSliderSetPosition(ghSliderB, rand() % 256);
                 }
 
diff --git a/demos/modules/gwin/radio/main.c b/demos/modules/gwin/radio/main.c
index 60bf206f..7455c770 100644
--- a/demos/modules/gwin/radio/main.c
+++ b/demos/modules/gwin/radio/main.c
@@ -99,7 +99,7 @@ int main(void) {
 
 		switch(pe->type) {
 			case GEVENT_GWIN_RADIO:
-				//printf("group: %u   radio: %s\n", ((GEventGWinRadio *)pe)->group, gwinGetText(((GEventGWinRadio *)pe)->radio));
+				//printf("group: %u   radio: %s\n", ((GEventGWinRadio *)pe)->group, gwinGetText(((GEventGWinRadio *)pe)->gwin));
 				break;
 
 			default:
diff --git a/demos/modules/gwin/slider/main.c b/demos/modules/gwin/slider/main.c
index 475f68cf..ddcd90df 100644
--- a/demos/modules/gwin/slider/main.c
+++ b/demos/modules/gwin/slider/main.c
@@ -75,7 +75,7 @@ int main(void) {
 
 		switch(pe->type) {
 			case GEVENT_GWIN_SLIDER:
-				//printf("Slider %s = %d\n", gwinGetText(((GEventGWinSlider *)pe)->slider), ((GEventGWinSlider *)pe)->position);
+				//printf("Slider %s = %d\n", gwinGetText(((GEventGWinSlider *)pe)->gwin), ((GEventGWinSlider *)pe)->position);
 				break;
 
 			default:
diff --git a/demos/modules/gwin/widgets/main.c b/demos/modules/gwin/widgets/main.c
index 783ed548..3239ab4c 100644
--- a/demos/modules/gwin/widgets/main.c
+++ b/demos/modules/gwin/widgets/main.c
@@ -459,39 +459,39 @@ int main(void) {
 
 		switch(pe->type) {
 		case GEVENT_GWIN_BUTTON:
-			gwinPrintf(ghConsole, "Button %s\n", gwinGetText(((GEventGWinButton *)pe)->button));
+			gwinPrintf(ghConsole, "Button %s\n", gwinGetText(((GEventGWinButton *)pe)->gwin));
 			break;
 
 		case GEVENT_GWIN_SLIDER:
-			gwinPrintf(ghConsole, "Slider %s=%d\n", gwinGetText(((GEventGWinSlider *)pe)->slider), ((GEventGWinSlider *)pe)->position);
+			gwinPrintf(ghConsole, "Slider %s=%d\n", gwinGetText(((GEventGWinSlider *)pe)->gwin), ((GEventGWinSlider *)pe)->position);
 			break;
 
 		case GEVENT_GWIN_CHECKBOX:
-			gwinPrintf(ghConsole, "Checkbox %s=%s\n", gwinGetText(((GEventGWinCheckbox *)pe)->checkbox), ((GEventGWinCheckbox *)pe)->isChecked ? "Checked" : "UnChecked");
+			gwinPrintf(ghConsole, "Checkbox %s=%s\n", gwinGetText(((GEventGWinCheckbox *)pe)->gwin), ((GEventGWinCheckbox *)pe)->isChecked ? "Checked" : "UnChecked");
 
 			// If it is the Disable All checkbox then do that.
-			if (((GEventGWinCheckbox *)pe)->checkbox == ghCheckDisableAll) {
+			if (((GEventGWinCheckbox *)pe)->gwin == ghCheckDisableAll) {
 				gwinPrintf(ghConsole, "%s All\n", ((GEventGWinCheckbox *)pe)->isChecked ? "Disable" : "Enable");
 				setEnabled(!((GEventGWinCheckbox *)pe)->isChecked);
 			}
 			break;
 
 		case GEVENT_GWIN_LIST:
-			gwinPrintf(ghConsole, "List %s Item %d %s\n", gwinGetText(((GEventGWinList *)pe)->list), ((GEventGWinList *)pe)->item,
-					gwinListItemIsSelected(((GEventGWinList *)pe)->list, ((GEventGWinList *)pe)->item) ? "Selected" : "Unselected");
+			gwinPrintf(ghConsole, "List %s Item %d %s\n", gwinGetText(((GEventGWinList *)pe)->gwin), ((GEventGWinList *)pe)->item,
+					gwinListItemIsSelected(((GEventGWinList *)pe)->gwin, ((GEventGWinList *)pe)->item) ? "Selected" : "Unselected");
 			break;
 
 		case GEVENT_GWIN_RADIO:
-			gwinPrintf(ghConsole, "Radio Group %u=%s\n", ((GEventGWinRadio *)pe)->group, gwinGetText(((GEventGWinRadio *)pe)->radio));
+			gwinPrintf(ghConsole, "Radio Group %u=%s\n", ((GEventGWinRadio *)pe)->group, gwinGetText(((GEventGWinRadio *)pe)->gwin));
 
 			switch(((GEventGWinRadio *)pe)->group) {
 			case GROUP_TABS:
 
 				// Set control visibility depending on the tab selected
-				setTab(((GEventGWinRadio *)pe)->radio);
+				setTab(((GEventGWinRadio *)pe)->gwin);
 
 				// We show the state of some of the GUI elements here
-				if (((GEventGWinRadio *)pe)->radio == ghTabLabels) {
+				if (((GEventGWinRadio *)pe)->gwin == ghTabLabels) {
 					char tmp[20];
 
 					// The sliders
@@ -519,9 +519,9 @@ int main(void) {
 
 					gwinPrintf(ghConsole, "Change Color Scheme\n");
 
-					if (((GEventGWinRadio *)pe)->radio == ghRadioYellow)
+					if (((GEventGWinRadio *)pe)->gwin == ghRadioYellow)
 						pstyle = &YellowWidgetStyle;
-					else if (((GEventGWinRadio *)pe)->radio == ghRadioBlack)
+					else if (((GEventGWinRadio *)pe)->gwin == ghRadioBlack)
 						pstyle = &BlackWidgetStyle;
 					else
 						pstyle = &WhiteWidgetStyle;