Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-05-28 11:25:22 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed even more warnings in Fl_x.cxx & utf8Wrap.c

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9394 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Fabien Costantini
2012-04-24 02:44:21 +00:00
parent 5e0ecd4dab
commit 36c52ce810
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Fl_x.cxx
+5 -5
View File
@@ -1289,7 +1289,7 @@ int fl_handle(const XEvent& thisevent)
fl_key_vector[keycode/8] |= (1 << (keycode%8)); fl_key_vector[keycode/8] |= (1 << (keycode%8));
static char *buffer = NULL; static char *buffer = NULL;
static int buffer_len = 0; static int buffer_len = 0;
int len; int len=0;
KeySym keysym; KeySym keysym;
if (buffer_len == 0) { if (buffer_len == 0) {
buffer_len = 4096; buffer_len = 4096;
@@ -1297,7 +1297,7 @@ int fl_handle(const XEvent& thisevent)
} }
if (xevent.type == KeyPress) { if (xevent.type == KeyPress) {
event = FL_KEYDOWN; event = FL_KEYDOWN;
int len = 0; len = 0;
if (fl_xim_ic) { if (fl_xim_ic) {
Status status; Status status;
@@ -1489,9 +1489,9 @@ int fl_handle(const XEvent& thisevent)
if (Fl::e_keysym == 0xfe20) Fl::e_keysym = FL_Tab; if (Fl::e_keysym == 0xfe20) Fl::e_keysym = FL_Tab;
set_event_xy(); set_event_xy();
Fl::e_is_click = 0; Fl::e_is_click = 0; }
break;} break;
case ButtonPress: case ButtonPress:
Fl::e_keysym = FL_Button + xevent.xbutton.button; Fl::e_keysym = FL_Button + xevent.xbutton.button;
set_event_xy(); set_event_xy();
src/xutf8/utf8Wrap.c
+2 -2
View File
@@ -665,7 +665,7 @@ XUtf8_measure_extents(
if (last_fnum != fnum || no_spc) { if (last_fnum != fnum || no_spc) {
XSetFont(display, gc, fonts[last_fnum]->fid); 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! */ /* recover the dimensions - should verify that res == 0 first! */
wd += sizes.width; /* accumulate the width */ wd += sizes.width; /* accumulate the width */
hs = sizes.ascent + sizes.descent; /* total height */ hs = sizes.ascent + sizes.descent; /* total height */
@@ -688,7 +688,7 @@ XUtf8_measure_extents(
} }
XSetFont(display, gc, fonts[fnum]->fid); 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! */ /* recover the dimensions - should verify that res == 0 first! */
wd += sizes.width; /* accumulate the width */ wd += sizes.width; /* accumulate the width */
hs = sizes.ascent + sizes.descent; /* total height */ hs = sizes.ascent + sizes.descent; /* total height */