From b3931b73a4bd632dd6edd72f2ab573dd418eadf1 Mon Sep 17 00:00:00 2001 From: NishiOwO Date: Wed, 8 Oct 2025 11:21:12 +0000 Subject: [PATCH] fix msvc warning git-svn-id: http://svn2.nishi.boats/svn/milsko/trunk@219 b9cfdab3-6d41-4d17-bbe4-086880011989 --- NTMakefile | 54 +++++++++++++++++++++--------------------- src/widget/scrollbar.c | 2 +- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/NTMakefile b/NTMakefile index 5188e81..8e7d948 100644 --- a/NTMakefile +++ b/NTMakefile @@ -1,27 +1,27 @@ -# $Id$ -CC = cl -LD = link - -OBJS = src\boldfont.obj src\core.obj src\default.obj src\draw.obj src\error.obj src\font.obj src\lowlevel.obj src\widget\button.obj src\widget\checkbox.obj src\widget\frame.obj src\widget\image.obj src\widget\label.obj src\widget\menu.obj src\widget\opengl.obj src\widget\scrollbar.obj src\widget\submenu.obj src\widget\window.obj src\external\ds.obj src\external\image.obj src\cursor\cross.obj src\cursor\default.obj src\backend\gdi.obj -OOOBJS = oosrc\base.obj oosrc\widget\button.obj oosrc\widget\checkbox.obj oosrc\widget\frame.obj oosrc\widget\image.obj oosrc\widget\label.obj oosrc\widget\menu.obj oosrc\widget\opengl.obj oosrc\widget\scrollbar.obj oosrc\widget\submenu.obj oosrc\widget\window.obj -CFLAGS = /nologo /DSTBI_NO_SIMD /D_MILSKO /DUSE_GDI /DUSE_STB_IMAGE /Iinclude -CXXFLAGS = /nologo /Iinclude -LDFLAGS = /nologo /DLL /LIBPATH:src /LIBPATH:oosrc - -all: src\Mw.dll oosrc\MwOO.dll - -.SUFFIXES: .cc .c .obj - -.c.obj: - $(CC) $(CFLAGS) /TC /c /Fo$@ $< - -.cc.obj: - $(CC) $(CXXFLAGS) /TP /c /Fo$@ $< - -src\Mw.dll: $(OBJS) - $(LD) $(LDFLAGS) /OUT:src\Mw.dll $(OBJS) gdi32.lib user32.lib -oosrc\MwOO.dll: $(OOOBJS) - $(LD) $(LDFLAGS) /OUT:oosrc\MwOO.dll $(OOOBJS) Mw.lib - -clean: - del /q $(OBJS) $(OOOBJS) src\Mw.dll src\Mw.lib src\Mw.exp oosrc\MwOO.dll oosrc\MwOO.lib oosrc\MwOO.exp +# $Id$ +CC = cl +LD = link + +OBJS = src\boldfont.obj src\core.obj src\default.obj src\draw.obj src\error.obj src\font.obj src\lowlevel.obj src\widget\button.obj src\widget\checkbox.obj src\widget\frame.obj src\widget\image.obj src\widget\label.obj src\widget\menu.obj src\widget\opengl.obj src\widget\scrollbar.obj src\widget\submenu.obj src\widget\window.obj src\external\ds.obj src\external\image.obj src\cursor\cross.obj src\cursor\default.obj src\backend\gdi.obj +OOOBJS = oosrc\base.obj oosrc\widget\button.obj oosrc\widget\checkbox.obj oosrc\widget\frame.obj oosrc\widget\image.obj oosrc\widget\label.obj oosrc\widget\menu.obj oosrc\widget\opengl.obj oosrc\widget\scrollbar.obj oosrc\widget\submenu.obj oosrc\widget\window.obj +CFLAGS = /nologo /DSTBI_NO_SIMD /D_MILSKO /DUSE_GDI /DUSE_STB_IMAGE /Iinclude +CXXFLAGS = /nologo /Iinclude +LDFLAGS = /nologo /DLL /LIBPATH:src /LIBPATH:oosrc + +all: src\Mw.dll oosrc\MwOO.dll + +.SUFFIXES: .cc .c .obj + +.c.obj: + $(CC) $(CFLAGS) /TC /c /Fo$@ $< + +.cc.obj: + $(CC) $(CXXFLAGS) /TP /c /Fo$@ $< + +src\Mw.dll: $(OBJS) + $(LD) $(LDFLAGS) /OUT:src\Mw.dll $(OBJS) gdi32.lib user32.lib +oosrc\MwOO.dll: $(OOOBJS) + $(LD) $(LDFLAGS) /OUT:oosrc\MwOO.dll $(OOOBJS) Mw.lib + +clean: + del /q $(OBJS) $(OOOBJS) src\Mw.dll src\Mw.lib src\Mw.exp oosrc\MwOO.dll oosrc\MwOO.lib oosrc\MwOO.exp diff --git a/src/widget/scrollbar.c b/src/widget/scrollbar.c index 224e787..f89f00b 100644 --- a/src/widget/scrollbar.c +++ b/src/widget/scrollbar.c @@ -150,7 +150,7 @@ static void mouse_move(MwWidget handle) { len = l / len; if(len < 0) len = 0; if(len > 1) len = 1; - MwSetInteger(handle, MwNvalue, (max - min) * len - min); + MwSetInteger(handle, MwNvalue, (int)((max - min) * len - min)); MwForceRender(handle); }