diff options
| author | Fabien Costantini <fabien@onepost.net> | 2012-04-24 02:44:21 +0000 |
|---|---|---|
| committer | Fabien Costantini <fabien@onepost.net> | 2012-04-24 02:44:21 +0000 |
| commit | 36c52ce810dc569e8c95acffa65a31ae63d67f83 (patch) | |
| tree | 1d2ae7ee3bdaacc32a5dec7f62828f6e0d0b595f | |
| parent | 5e0ecd4dab44f0d4ca4801f6fe306ae25818b843 (diff) | |
Fixed even more warnings in Fl_x.cxx & utf8Wrap.c
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9394 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | src/Fl_x.cxx | 10 | ||||
| -rw-r--r-- | src/xutf8/utf8Wrap.c | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/Fl_x.cxx b/src/Fl_x.cxx index 330d363ec..355165f18 100644 --- a/src/Fl_x.cxx +++ b/src/Fl_x.cxx @@ -1289,7 +1289,7 @@ int fl_handle(const XEvent& thisevent) fl_key_vector[keycode/8] |= (1 << (keycode%8)); static char *buffer = NULL; static int buffer_len = 0; - int len; + int len=0; KeySym keysym; if (buffer_len == 0) { buffer_len = 4096; @@ -1297,7 +1297,7 @@ int fl_handle(const XEvent& thisevent) } if (xevent.type == KeyPress) { event = FL_KEYDOWN; - int len = 0; + len = 0; if (fl_xim_ic) { Status status; @@ -1489,9 +1489,9 @@ int fl_handle(const XEvent& thisevent) if (Fl::e_keysym == 0xfe20) Fl::e_keysym = FL_Tab; set_event_xy(); - Fl::e_is_click = 0; - break;} - + Fl::e_is_click = 0; } + break; + case ButtonPress: Fl::e_keysym = FL_Button + xevent.xbutton.button; set_event_xy(); diff --git a/src/xutf8/utf8Wrap.c b/src/xutf8/utf8Wrap.c index 6a028e391..c0a6b174c 100644 --- a/src/xutf8/utf8Wrap.c +++ b/src/xutf8/utf8Wrap.c @@ -665,7 +665,7 @@ XUtf8_measure_extents( if (last_fnum != fnum || no_spc) { XSetFont(display, gc, fonts[last_fnum]->fid); - res = XTextExtents16(fonts[last_fnum], buf, i, &dir_ret, &fnt_asc, &fnt_dsc, &sizes); + /* res = */ XTextExtents16(fonts[last_fnum], buf, i, &dir_ret, &fnt_asc, &fnt_dsc, &sizes); /* recover the dimensions - should verify that res == 0 first! */ wd += sizes.width; /* accumulate the width */ hs = sizes.ascent + sizes.descent; /* total height */ @@ -688,7 +688,7 @@ XUtf8_measure_extents( } XSetFont(display, gc, fonts[fnum]->fid); - res = XTextExtents16(fonts[fnum], buf, i, &dir_ret, &fnt_asc, &fnt_dsc, &sizes); + /* res = */ XTextExtents16(fonts[fnum], buf, i, &dir_ret, &fnt_asc, &fnt_dsc, &sizes); /* recover the dimensions - should verify that res == 0 first! */ wd += sizes.width; /* accumulate the width */ hs = sizes.ascent + sizes.descent; /* total height */ |