Author: fabien
Date: 2012-04-23 19:44:21 -0700 (Mon, 23 Apr 2012)
New Revision: 9394
Log:
Fixed even more warnings in Fl_x.cxx & utf8Wrap.c
Modified:
branches/branch-1.3/src/Fl_x.cxx
branches/branch-1.3/src/xutf8/utf8Wrap.c
Modified: branches/branch-1.3/src/Fl_x.cxx
===================================================================
--- branches/branch-1.3/src/Fl_x.cxx 2012-04-24 02:28:51 UTC (rev 9393)
+++ branches/branch-1.3/src/Fl_x.cxx 2012-04-24 02:44:21 UTC (rev 9394)
@@ -1289,7 +1289,7 @@
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 @@
}
if (xevent.type == KeyPress) {
event = FL_KEYDOWN;
- int len = 0;
+ len = 0;
if (fl_xim_ic) {
Status status;
@@ -1489,9 +1489,9 @@
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();
Modified: branches/branch-1.3/src/xutf8/utf8Wrap.c
===================================================================
--- branches/branch-1.3/src/xutf8/utf8Wrap.c 2012-04-24 02:28:51 UTC (rev
9393)
+++ branches/branch-1.3/src/xutf8/utf8Wrap.c 2012-04-24 02:44:21 UTC (rev
9394)
@@ -665,7 +665,7 @@
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 @@
}
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 */
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit