aboutsummaryrefslogtreecommitdiffstats
path: root/demos
diff options
context:
space:
mode:
authorinmarket <andrewh@inmarket.com.au>2014-05-11 13:10:50 +1000
committerinmarket <andrewh@inmarket.com.au>2014-05-11 13:10:50 +1000
commit95a3570c88cc6e64131a4bbac48e1e39c7e3ea7a (patch)
tree24ec6c4871d0f778e4b3e0b4a20b2ed125843d60 /demos
parentbdbe78a8daed85e6d794deb1f840c1ec3c3b02f1 (diff)
downloaduGFX-95a3570c88cc6e64131a4bbac48e1e39c7e3ea7a.tar.gz
uGFX-95a3570c88cc6e64131a4bbac48e1e39c7e3ea7a.tar.bz2
uGFX-95a3570c88cc6e64131a4bbac48e1e39c7e3ea7a.zip
Remove NULLs except in comments as some compilers/OS's give strange definitions.
Diffstat (limited to 'demos')
-rw-r--r--demos/modules/gwin/imagebox/main.c2
-rw-r--r--demos/modules/gwin/label/main.c4
-rw-r--r--demos/modules/gwin/list/main.c4
-rw-r--r--demos/modules/gwin/progressbar/main.c2
4 files changed, 6 insertions, 6 deletions
diff --git a/demos/modules/gwin/imagebox/main.c b/demos/modules/gwin/imagebox/main.c
index c15f5fb3..d8ebbe73 100644
--- a/demos/modules/gwin/imagebox/main.c
+++ b/demos/modules/gwin/imagebox/main.c
@@ -41,7 +41,7 @@ static void createWidgets(void) {
// create the first image widget
wi.g.x = 10; wi.g.y = 10; wi.g.width = 200; wi.g.height = 100;
- ghImage1 = gwinImageCreate(NULL, &wi.g);
+ ghImage1 = gwinImageCreate(0, &wi.g);
gwinImageOpenFile(ghImage1, "ugfx_logo_banner.bmp");
}
diff --git a/demos/modules/gwin/label/main.c b/demos/modules/gwin/label/main.c
index 175c0d6e..918f2787 100644
--- a/demos/modules/gwin/label/main.c
+++ b/demos/modules/gwin/label/main.c
@@ -44,13 +44,13 @@ static void createWidgets(void) {
// Create the IP label
wi.g.width = 200; wi.g.height = 20; wi.g.x = 10, wi.g.y = 80;
wi.text = "192.168.1.42";
- ghLabel1 = gwinLabelCreate(NULL, &wi);
+ ghLabel1 = gwinLabelCreate(0, &wi);
gwinLabelSetAttribute(ghLabel1, 100, "Current IP:");
// Create the DHCP label
wi.g.width = 200; wi.g.height = 20; wi.g.x = 10, wi.g.y = 100;
wi.text = "Off";
- ghLabel2 = gwinLabelCreate(NULL, &wi);
+ ghLabel2 = gwinLabelCreate(0, &wi);
gwinLabelSetAttribute(ghLabel2, 100, "DHCP:");
}
diff --git a/demos/modules/gwin/list/main.c b/demos/modules/gwin/list/main.c
index 6d469626..ed5b6905 100644
--- a/demos/modules/gwin/list/main.c
+++ b/demos/modules/gwin/list/main.c
@@ -43,12 +43,12 @@ static void createWidgets(void) {
// Create the label for the first list
wi.g.width = 150; wi.g.height = 20; wi.g.x = 10, wi.g.y = 80;
wi.text = "List 1: Default";
- ghLabel1 = gwinLabelCreate(NULL, &wi);
+ ghLabel1 = gwinLabelCreate(0, &wi);
// Create the label for the second list
wi.g.width = 150; wi.g.height = 20; wi.g.x = 165, wi.g.y = 80;
wi.text = "List 2: Smooth scrolling";
- ghLabel1 = gwinLabelCreate(NULL, &wi);
+ ghLabel1 = gwinLabelCreate(0, &wi);
// The first list widget
wi.g.width = 150;
diff --git a/demos/modules/gwin/progressbar/main.c b/demos/modules/gwin/progressbar/main.c
index 6fb53c2e..8e9e8352 100644
--- a/demos/modules/gwin/progressbar/main.c
+++ b/demos/modules/gwin/progressbar/main.c
@@ -9,7 +9,7 @@ static void _createWidget(void) {
wi.g.show = TRUE;
wi.g.y = 10; wi.g.x = 10; wi.g.width = 200; wi.g.height = 20; wi.text = "Progress 1";
- ghProgressbar = gwinProgressbarCreate(NULL, &wi);
+ ghProgressbar = gwinProgressbarCreate(0, &wi);
}
int main(void) {