From 01416857b58f514f872b79b533b0518f73e5e3bb Mon Sep 17 00:00:00 2001 From: NishiOwO Date: Mon, 1 Dec 2025 18:16:17 +0000 Subject: [PATCH 1/4] why did i make that macro anyways git-svn-id: http://svn2.nishi.boats/svn/milsko/trunk@832 b9cfdab3-6d41-4d17-bbe4-086880011989 --- include/Mw/StringDefs.h | 34 +++++++++++++++++----------------- milsko.xml | 1 + src/dialog/filechooser.c | 2 +- 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/include/Mw/StringDefs.h b/include/Mw/StringDefs.h index f928e09..3f668c2 100644 --- a/include/Mw/StringDefs.h +++ b/include/Mw/StringDefs.h @@ -45,22 +45,22 @@ #define MwNfont "Vfont" #define MwNboldFont "VboldFont" -#define MwNactivateHandler "Cactivate" /* NULL/int* (MwListBox)/void* (MwTreeView) */ -#define MwNresizeHandler "Cresize" /* NULL */ -#define MwNtickHandler "Ctick" /* NULL */ -#define MwNmenuHandler "Cmenu" /* MwMenu */ -#define MwNmouseDownHandler "CmouseDown" /* MwLLMouse* */ -#define MwNmouseUpHandler "CmouseUp" /* same as MwNmouseDownHandler */ -#define MwNmouseMoveHandler "CmouseMove" /* MwPoint* */ -#define MwNchangedHandler "Cchanged" /* NULL/int* (MwComboBox) */ -#define MwNkeyHandler "Ckey" /* int* (MwLLKeyEnum or character code) */ -#define MwNkeyReleaseHandler "CkeyRelease" /* same as MwNkeyHandler */ -#define MwNcloseHandler "Cclose" /* NULL */ -#define MwNfocusInHandler "CfocusIn" /* NULL */ -#define MwNfocusOutHandler "CfocusOut" /* NULL */ -#define MwNfileChosenHandler "CfileChosen" /* char* */ -#define MwNdirectoryChosenHandler MwNfileChosenHandler -#define MwNcolorChosenHandler "CcolorChosen" /* MwRGB* */ -#define MwNdrawHandler "Cdraw" /* NULL */ +#define MwNactivateHandler "Cactivate" /* NULL/int* (MwListBox)/void* (MwTreeView) */ +#define MwNresizeHandler "Cresize" /* NULL */ +#define MwNtickHandler "Ctick" /* NULL */ +#define MwNmenuHandler "Cmenu" /* MwMenu */ +#define MwNmouseDownHandler "CmouseDown" /* MwLLMouse* */ +#define MwNmouseUpHandler "CmouseUp" /* same as MwNmouseDownHandler */ +#define MwNmouseMoveHandler "CmouseMove" /* MwPoint* */ +#define MwNchangedHandler "Cchanged" /* NULL/int* (MwComboBox) */ +#define MwNkeyHandler "Ckey" /* int* (MwLLKeyEnum or character code) */ +#define MwNkeyReleaseHandler "CkeyRelease" /* same as MwNkeyHandler */ +#define MwNcloseHandler "Cclose" /* NULL */ +#define MwNfocusInHandler "CfocusIn" /* NULL */ +#define MwNfocusOutHandler "CfocusOut" /* NULL */ +#define MwNfileChosenHandler "CfileChosen" /* char* */ +#define MwNdirectoryChosenHandler "CdirectoryChosen" /* char* */ +#define MwNcolorChosenHandler "CcolorChosen" /* MwRGB* */ +#define MwNdrawHandler "Cdraw" /* NULL */ #endif diff --git a/milsko.xml b/milsko.xml index 13b0dda..244d6db 100644 --- a/milsko.xml +++ b/milsko.xml @@ -100,6 +100,7 @@ + diff --git a/src/dialog/filechooser.c b/src/dialog/filechooser.c index 88a7513..2403038 100644 --- a/src/dialog/filechooser.c +++ b/src/dialog/filechooser.c @@ -98,7 +98,7 @@ static void files_activate(MwWidget handle, void* user, void* call) { char* p; p = MwDirectoryJoin(fc->path, fc->sorted_entries[MwGetInteger(fc->files, MwNvalue) - 1]->name); - MwDispatchUserHandler(handle->parent, MwNfileChosenHandler, p); + MwDispatchUserHandler(handle->parent, fc->dir_only ? MwNdirectoryChosenHandler : MwNfileChosenHandler, p); free(p); okay(fc->okay, NULL, NULL); From 09325acb6c26660fa4827360c94957dc7729986c Mon Sep 17 00:00:00 2001 From: NishiOwO Date: Mon, 1 Dec 2025 18:30:11 +0000 Subject: [PATCH 2/4] forgot git-svn-id: http://svn2.nishi.boats/svn/milsko/trunk@833 b9cfdab3-6d41-4d17-bbe4-086880011989 --- src/dialog/filechooser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dialog/filechooser.c b/src/dialog/filechooser.c index 2403038..990c94f 100644 --- a/src/dialog/filechooser.c +++ b/src/dialog/filechooser.c @@ -130,7 +130,7 @@ static void okay_activate(MwWidget handle, void* user, void* call) { MwWidget msgbox = MwMessageBox(handle->parent, "File is not permitted here!", "Error", MwMB_ICONERROR | MwMB_BUTTONOK); MwAddUserHandler(MwMessageBoxGetChild(msgbox, MwMB_BUTTONOK), MwNactivateHandler, msgbox_okay, NULL); } else { - MwDispatchUserHandler(handle->parent, MwNfileChosenHandler, p); + MwDispatchUserHandler(handle->parent, fc->dir_only ? MwNdirectoryChosenHandler : MwNfileChosenHandler, p); okay(fc->okay, NULL, NULL); } From 30bdc7445acfd4f52aef5bafc29678eaa6e851d9 Mon Sep 17 00:00:00 2001 From: NishiOwO Date: Tue, 2 Dec 2025 10:39:02 +0900 Subject: [PATCH 3/4] no more warning --- src/backend/gdi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/backend/gdi.c b/src/backend/gdi.c index f466dfd..5d25ce4 100644 --- a/src/backend/gdi.c +++ b/src/backend/gdi.c @@ -501,7 +501,6 @@ static void MwLLDrawPixmapImpl(MwLL handle, MwRect* rect, MwLLPixmap pixmap) { static void MwLLSetIconImpl(MwLL handle, MwLLPixmap pixmap) { ICONINFO ii; - HICON ico; memset(&ii, 0, sizeof(ii)); ii.fIcon = TRUE; @@ -729,6 +728,9 @@ static void MwLLGetCursorCoordImpl(MwLL handle, MwPoint* point) { static void MwLLGetScreenSizeImpl(MwLL handle, MwRect* rect) { RECT rc; + + (void)handle; + GetClientRect(GetDesktopWindow(), &rc); rect->x = rect->y = 0; From 6c22ab8cd6cdab5f6759ab92ea4549c3bb9326e4 Mon Sep 17 00:00:00 2001 From: NishiOwO Date: Tue, 2 Dec 2025 10:55:20 +0900 Subject: [PATCH 4/4] test --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 7b0e56d..0aaa2c0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ *.o *.so +*.dll examples/* examples/*.exe examples/*/*