aboutsummaryrefslogtreecommitdiffstats
path: root/demos
diff options
context:
space:
mode:
authorinmarket <andrewh@inmarket.com.au>2014-09-26 16:30:53 +1000
committerinmarket <andrewh@inmarket.com.au>2014-09-26 16:30:53 +1000
commite7bc175ca0fb1b1d2bd6a80d36696efa6dc0d171 (patch)
treec140dc3c6e9c3030334e17fef8a2b8af1ba5f07b /demos
parent72d04f891b5dd09ec4abdc8073a285b5d513946d (diff)
downloaduGFX-e7bc175ca0fb1b1d2bd6a80d36696efa6dc0d171.tar.gz
uGFX-e7bc175ca0fb1b1d2bd6a80d36696efa6dc0d171.tar.bz2
uGFX-e7bc175ca0fb1b1d2bd6a80d36696efa6dc0d171.zip
Demos updated to remove now deprecated function gwinAttachMouse
Diffstat (limited to 'demos')
-rw-r--r--demos/modules/gwin/button/main.c5
-rw-r--r--demos/modules/gwin/checkbox/main.c7
-rw-r--r--demos/modules/gwin/container/main.c5
-rw-r--r--demos/modules/gwin/container_nested/main.c11
-rw-r--r--demos/modules/gwin/frame/main.c7
-rw-r--r--demos/modules/gwin/label/main.c3
-rw-r--r--demos/modules/gwin/list/main.c3
-rw-r--r--demos/modules/gwin/radio/main.c3
-rw-r--r--demos/modules/gwin/slider/main.c3
-rw-r--r--demos/modules/gwin/widgets/main.c5
10 files changed, 10 insertions, 42 deletions
diff --git a/demos/modules/gwin/button/main.c b/demos/modules/gwin/button/main.c
index 15e8e5a7..1d8aa2e6 100644
--- a/demos/modules/gwin/button/main.c
+++ b/demos/modules/gwin/button/main.c
@@ -39,7 +39,7 @@ static void createWidgets(void) {
gwinWidgetClearInit(&wi);
wi.g.show = TRUE;
- // Apply the button parameters
+ // Apply the button parameters
wi.g.width = 100;
wi.g.height = 30;
wi.g.y = 10;
@@ -67,9 +67,6 @@ int main(void) {
gwinSetDefaultStyle(&WhiteWidgetStyle, FALSE);
gdispClear(White);
- // Attach the mouse input
- gwinAttachMouse(0);
-
// create the widget
createWidgets();
diff --git a/demos/modules/gwin/checkbox/main.c b/demos/modules/gwin/checkbox/main.c
index 28122bee..22963e40 100644
--- a/demos/modules/gwin/checkbox/main.c
+++ b/demos/modules/gwin/checkbox/main.c
@@ -39,14 +39,14 @@ static void createWidgets(void) {
gwinWidgetClearInit(&wi);
wi.g.show = TRUE;
- // Apply the checkbox parameters
+ // Apply the checkbox parameters
wi.g.width = 100; // includes text
wi.g.height = 20;
wi.g.y = 10;
wi.g.x = 10;
wi.text = "Checkbox";
- // Create the actual checkbox
+ // Create the actual checkbox
ghCheckbox1 = gwinCheckboxCreate(0, &wi);
}
@@ -61,9 +61,6 @@ int main(void) {
gwinSetDefaultStyle(&WhiteWidgetStyle, FALSE);
gdispClear(White);
- // Attach the mouse input
- gwinAttachMouse(0);
-
// create the widget
createWidgets();
diff --git a/demos/modules/gwin/container/main.c b/demos/modules/gwin/container/main.c
index 4e73b0c4..75e3f78b 100644
--- a/demos/modules/gwin/container/main.c
+++ b/demos/modules/gwin/container/main.c
@@ -19,7 +19,7 @@ static void createWidgets(void) {
ghContainer = gwinContainerCreate(0, &wi, GWIN_CONTAINER_BORDER);
wi.g.show = TRUE;
- // Apply the button parameters
+ // Apply the button parameters
wi.g.width = 120;
wi.g.height = 30;
wi.g.y = 10;
@@ -37,9 +37,6 @@ int main(void) {
// Initialize the display
gfxInit();
- // Attach the mouse input
- gwinAttachMouse(0);
-
// Set the widget defaults
gwinSetDefaultFont(gdispOpenFont("*"));
gwinSetDefaultStyle(&WhiteWidgetStyle, FALSE);
diff --git a/demos/modules/gwin/container_nested/main.c b/demos/modules/gwin/container_nested/main.c
index 2d90f76b..5cd5e793 100644
--- a/demos/modules/gwin/container_nested/main.c
+++ b/demos/modules/gwin/container_nested/main.c
@@ -40,7 +40,7 @@ static void createWidgets(void) {
wi.text = "Container 3";
ghContainer3 = gwinContainerCreate(0, &wi, GWIN_CONTAINER_BORDER);
- // Button 1
+ // Button 1
wi.g.width = 80;
wi.g.height = 20;
wi.g.y = 10;
@@ -49,7 +49,7 @@ static void createWidgets(void) {
wi.g.parent = ghContainer2;
ghButton1 = gwinButtonCreate(0, &wi);
- // Button 2
+ // Button 2
wi.g.width = 80;
wi.g.height = 20;
wi.g.y = 40;
@@ -58,7 +58,7 @@ static void createWidgets(void) {
wi.g.parent = ghContainer2;
ghButton2 = gwinButtonCreate(0, &wi);
- // Button 3
+ // Button 3
wi.g.width = 80;
wi.g.height = 20;
wi.g.y = 10;
@@ -67,7 +67,7 @@ static void createWidgets(void) {
wi.g.parent = ghContainer3;
ghButton3 = gwinButtonCreate(0, &wi);
- // Button 4
+ // Button 4
wi.g.width = 80;
wi.g.height = 20;
wi.g.y = 40;
@@ -115,9 +115,6 @@ int main(void) {
// Initialize the display
gfxInit();
- // Attach the mouse input
- gwinAttachMouse(0);
-
// Set the widget defaults
gwinSetDefaultFont(gdispOpenFont("*"));
gwinSetDefaultStyle(&WhiteWidgetStyle, FALSE);
diff --git a/demos/modules/gwin/frame/main.c b/demos/modules/gwin/frame/main.c
index fe956925..a97525ab 100644
--- a/demos/modules/gwin/frame/main.c
+++ b/demos/modules/gwin/frame/main.c
@@ -33,7 +33,7 @@ static void _createWidgets(void) {
wi.text = "Surprise!";
gwinLabelCreate(0, &wi);
- // Apply the frame parameters
+ // Apply the frame parameters
wi.g.width = 300;
wi.g.height = 200;
wi.g.y = 10;
@@ -107,7 +107,7 @@ static void _createWidgets(void) {
wi.g.x = 10;
wi.g.y = 90;
ghWindow1 = gwinWindowCreate(0, &wi.g);
-
+
_updateColor();
}
@@ -117,9 +117,6 @@ int main(void) {
// Initialize the display
gfxInit();
- // Attach the mouse input
- gwinAttachMouse(0);
-
// Set the widget defaults
gwinSetDefaultFont(gdispOpenFont("*"));
gwinSetDefaultStyle(&WhiteWidgetStyle, FALSE);
diff --git a/demos/modules/gwin/label/main.c b/demos/modules/gwin/label/main.c
index aab9cd76..425436ea 100644
--- a/demos/modules/gwin/label/main.c
+++ b/demos/modules/gwin/label/main.c
@@ -63,9 +63,6 @@ int main(void) {
gwinSetDefaultStyle(&WhiteWidgetStyle, FALSE);
gdispClear(White);
- // Attach the mouse input
- gwinAttachMouse(0);
-
// create the widget
createWidgets();
diff --git a/demos/modules/gwin/list/main.c b/demos/modules/gwin/list/main.c
index ed5b6905..0102f276 100644
--- a/demos/modules/gwin/list/main.c
+++ b/demos/modules/gwin/list/main.c
@@ -79,9 +79,6 @@ int main(void) {
gwinSetDefaultStyle(&WhiteWidgetStyle, FALSE);
gdispClear(White);
- // Attach the mouse input
- gwinAttachMouse(0);
-
// create the widget
createWidgets();
diff --git a/demos/modules/gwin/radio/main.c b/demos/modules/gwin/radio/main.c
index 7455c770..59b86983 100644
--- a/demos/modules/gwin/radio/main.c
+++ b/demos/modules/gwin/radio/main.c
@@ -83,9 +83,6 @@ int main(void) {
gwinSetDefaultStyle(&WhiteWidgetStyle, FALSE);
gdispClear(White);
- // Attach the mouse input
- gwinAttachMouse(0);
-
// create the widget
createWidgets();
diff --git a/demos/modules/gwin/slider/main.c b/demos/modules/gwin/slider/main.c
index ddcd90df..bf0aacfc 100644
--- a/demos/modules/gwin/slider/main.c
+++ b/demos/modules/gwin/slider/main.c
@@ -59,9 +59,6 @@ int main(void) {
gwinSetDefaultStyle(&WhiteWidgetStyle, FALSE);
gdispClear(White);
- // Attach the mouse input
- gwinAttachMouse(0);
-
// create the widget
createWidgets();
diff --git a/demos/modules/gwin/widgets/main.c b/demos/modules/gwin/widgets/main.c
index 3239ab4c..d2f6882b 100644
--- a/demos/modules/gwin/widgets/main.c
+++ b/demos/modules/gwin/widgets/main.c
@@ -418,11 +418,6 @@ int main(void) {
// Initialize the display
gfxInit();
- // Connect the mouse
- #if GINPUT_NEED_MOUSE
- gwinAttachMouse(0);
- #endif
-
// Set the widget defaults
font = gdispOpenFont("*"); // Get the first defined font.
gwinSetDefaultFont(font);