mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-25 10:58:52 +00:00
remove some compiler warnings
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6569 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
0e113d6a71
commit
93543287ce
@ -1,3 +1,7 @@
|
||||
2003-03-24 Angus Leeming <leeming@lyx.org>
|
||||
|
||||
* xforms_resize.C (get_scaling_factor): "cure" float -> int warnings.
|
||||
|
||||
2003-03-22 John Levon <levon@movementarian.org>
|
||||
|
||||
* xscreen.C: remove "internal", unused
|
||||
|
@ -50,7 +50,7 @@ double get_scaling_factor(FL_FORM * form)
|
||||
|
||||
if (ob->objclass == FL_BUTTON &&
|
||||
(ob->type == FL_RETURN_BUTTON || ob->type == FL_MENU_BUTTON))
|
||||
sw += FL_min(0.6f * ob->h, 0.6f * ob->w) - 1;
|
||||
sw += (int)FL_min(0.6f * ob->h, 0.6f * ob->w) - 1;
|
||||
|
||||
if (ob->objclass == FL_BUTTON && ob->type == FL_LIGHTBUTTON)
|
||||
sw += FL_LIGHTBUTTON_MINSIZE + 1;
|
||||
@ -58,11 +58,11 @@ double get_scaling_factor(FL_FORM * form)
|
||||
if (sw <= (ob->w - 2 * (bw + xm)) && sh <= (ob->h - 2 * (bw + ym)))
|
||||
continue;
|
||||
|
||||
if ((osize = ob->w - 2 * (bw + xm)) <= 0)
|
||||
if ((osize = ob->w - 2 * (int)(bw + xm)) <= 0)
|
||||
osize = 1;
|
||||
xfactor = (float) sw / (float)osize;
|
||||
|
||||
if ((osize = ob->h - 2 * (bw + ym)) <= 0)
|
||||
if ((osize = ob->h - 2 * (int)(bw + ym)) <= 0)
|
||||
osize = 1;
|
||||
yfactor = (float) sh / osize;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user