anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-26 06:15:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove some compiler warnings

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6569 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2003-03-24 17:46:49 +00:00
parent 0e113d6a71
commit 93543287ce
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/frontends/xforms/ChangeLog
View File

@ -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

6
src/frontends/xforms/xforms_resize.C
View File

@ -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;