Browse Source

Remove NULLs except in comments as some compilers/OS's give strange definitions.

remotes/origin_old/ugfx_release_2.6
inmarket 8 years ago
parent
commit
95a3570c88
  1. 2
      demos/modules/gwin/imagebox/main.c
  2. 4
      demos/modules/gwin/label/main.c
  3. 4
      demos/modules/gwin/list/main.c
  4. 2
      demos/modules/gwin/progressbar/main.c
  5. 2
      tools/file2c/src/file2c.c

2
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");
}

4
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:");
}

4
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;

2
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) {

2
tools/file2c/src/file2c.c

@ -168,7 +168,7 @@ size_t i;
if (opt_inputfile)
opt_arrayname = basenameof(strcpy(tname, opt_inputfile));
if (!opt_arrayname || !opt_arrayname[0]) {
srand(time(NULL));
srand(time(0));
sprintf(tname, "filearray%u", rand());
opt_arrayname = tname;
}

Loading…
Cancel
Save