diff options
| author | Rafael Garcia-Suarez <rgarciasuarez@mandriva.org> | 2005-05-06 06:30:51 +0000 |
|---|---|---|
| committer | Rafael Garcia-Suarez <rgarciasuarez@mandriva.org> | 2005-05-06 06:30:51 +0000 |
| commit | f46306945c95adc9a6232ce86f908f2a51a771dd (patch) | |
| tree | 7cfaba83c1935bc6624472e44d94f38ced09039c /mdk-stage1/newt | |
| parent | ab69c718222a8ad2f0fd91d26c6ca8dde5e5e797 (diff) | |
| download | drakx-backup-do-not-use-f46306945c95adc9a6232ce86f908f2a51a771dd.tar drakx-backup-do-not-use-f46306945c95adc9a6232ce86f908f2a51a771dd.tar.gz drakx-backup-do-not-use-f46306945c95adc9a6232ce86f908f2a51a771dd.tar.bz2 drakx-backup-do-not-use-f46306945c95adc9a6232ce86f908f2a51a771dd.tar.xz drakx-backup-do-not-use-f46306945c95adc9a6232ce86f908f2a51a771dd.zip | |
Stage 1 compilation fixes for gcc 4.0 :
* more casts signed<->unsigned types
* make choose_iso_in_directory()'s return type "void"
* change order of .h files in network.c so strndup is included correctly
* newt: initialize some variables properly
* compile pcmcia and ppp with -Wno-deprecated-declarations, since they use
deprecated types such as u_int32_t
Diffstat (limited to 'mdk-stage1/newt')
| -rw-r--r-- | mdk-stage1/newt/button.c | 2 | ||||
| -rw-r--r-- | mdk-stage1/newt/checkbox.c | 2 | ||||
| -rw-r--r-- | mdk-stage1/newt/entry.c | 2 | ||||
| -rw-r--r-- | mdk-stage1/newt/newt.c | 4 |
4 files changed, 8 insertions, 2 deletions
diff --git a/mdk-stage1/newt/button.c b/mdk-stage1/newt/button.c index 1ff360dc5..d7da58175 100644 --- a/mdk-stage1/newt/button.c +++ b/mdk-stage1/newt/button.c @@ -136,6 +136,8 @@ static struct eventResult buttonEvent(newtComponent co, struct event ev) { struct eventResult er; struct button * bu = co->data; + er.result = ER_IGNORED; + er.u.focus = NULL; if (ev.when == EV_NORMAL) { switch (ev.event) { diff --git a/mdk-stage1/newt/checkbox.c b/mdk-stage1/newt/checkbox.c index eee514c98..643609d34 100644 --- a/mdk-stage1/newt/checkbox.c +++ b/mdk-stage1/newt/checkbox.c @@ -193,6 +193,8 @@ struct eventResult cbEvent(newtComponent co, struct event ev) { struct checkbox * cb = co->data; struct eventResult er; const char * cur; + er.result = ER_IGNORED; + er.u.focus = NULL; if (ev.when == EV_NORMAL) { switch (ev.event) { diff --git a/mdk-stage1/newt/entry.c b/mdk-stage1/newt/entry.c index 1b33f1c6f..0ee449cf9 100644 --- a/mdk-stage1/newt/entry.c +++ b/mdk-stage1/newt/entry.c @@ -197,6 +197,8 @@ static struct eventResult entryEvent(newtComponent co, struct entry * en = co->data; struct eventResult er; int ch; + er.result = ER_IGNORED; + er.u.focus = NULL; if (ev.when == EV_NORMAL) { switch (ev.event) { diff --git a/mdk-stage1/newt/newt.c b/mdk-stage1/newt/newt.c index d6cb3cd96..a41b7900b 100644 --- a/mdk-stage1/newt/newt.c +++ b/mdk-stage1/newt/newt.c @@ -397,7 +397,7 @@ int newtOpenWindow(int left, int top, int width, int height, n = 0; for (j = 0; j < height + 3; j++, row++) { SLsmg_gotorc(row, col); - SLsmg_read_raw(currentWindow->buffer + n, + SLsmg_read_raw((SLsmg_Char_Type *)currentWindow->buffer + n, currentWindow->width + 3); n += currentWindow->width + 3; } @@ -462,7 +462,7 @@ void newtPopWindow(void) { col = currentWindow->left - 1; for (j = 0; j < currentWindow->height + 3; j++, row++) { SLsmg_gotorc(row, col); - SLsmg_write_raw(currentWindow->buffer + n, + SLsmg_write_raw((SLsmg_Char_Type *)currentWindow->buffer + n, currentWindow->width + 3); n += currentWindow->width + 3; } |