pyrite-dev/milsko
pyrite-dev/milsko
12
1
Fork 3
Code Issues 5 Pull requests Projects Releases 7 Packages Wiki Activity Actions

merge

Browse source
This commit is contained in:
IoIxD 2025-12-01 19:18:43 -07:00
commit 82626cab22
5 changed files with 26 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -1,5 +1,8 @@
*.o *.o
*.so *.so
*.dll
examples/*
examples/*.exe
examples/*/* examples/*/*
!examples/*/*.c !examples/*/*.c
!examples/*/*.spv !examples/*/*.spv

34
include/Mw/StringDefs.h
View file

@ -45,22 +45,22 @@
#define MwNfont "Vfont" #define MwNfont "Vfont"
#define MwNboldFont "VboldFont" #define MwNboldFont "VboldFont"
#define MwNactivateHandler "Cactivate" /* NULL/int* (MwListBox)/void* (MwTreeView) */ #define MwNactivateHandler "Cactivate" /* NULL/int* (MwListBox)/void* (MwTreeView) */
#define MwNresizeHandler "Cresize" /* NULL */ #define MwNresizeHandler "Cresize" /* NULL */
#define MwNtickHandler "Ctick" /* NULL */ #define MwNtickHandler "Ctick" /* NULL */
#define MwNmenuHandler "Cmenu" /* MwMenu */ #define MwNmenuHandler "Cmenu" /* MwMenu */
#define MwNmouseDownHandler "CmouseDown" /* MwLLMouse* */ #define MwNmouseDownHandler "CmouseDown" /* MwLLMouse* */
#define MwNmouseUpHandler "CmouseUp" /* same as MwNmouseDownHandler */ #define MwNmouseUpHandler "CmouseUp" /* same as MwNmouseDownHandler */
#define MwNmouseMoveHandler "CmouseMove" /* MwPoint* */ #define MwNmouseMoveHandler "CmouseMove" /* MwPoint* */
#define MwNchangedHandler "Cchanged" /* NULL/int* (MwComboBox) */ #define MwNchangedHandler "Cchanged" /* NULL/int* (MwComboBox) */
#define MwNkeyHandler "Ckey" /* int* (MwLLKeyEnum or character code) */ #define MwNkeyHandler "Ckey" /* int* (MwLLKeyEnum or character code) */
#define MwNkeyReleaseHandler "CkeyRelease" /* same as MwNkeyHandler */ #define MwNkeyReleaseHandler "CkeyRelease" /* same as MwNkeyHandler */
#define MwNcloseHandler "Cclose" /* NULL */ #define MwNcloseHandler "Cclose" /* NULL */
#define MwNfocusInHandler "CfocusIn" /* NULL */ #define MwNfocusInHandler "CfocusIn" /* NULL */
#define MwNfocusOutHandler "CfocusOut" /* NULL */ #define MwNfocusOutHandler "CfocusOut" /* NULL */
#define MwNfileChosenHandler "CfileChosen" /* char* */ #define MwNfileChosenHandler "CfileChosen" /* char* */
#define MwNdirectoryChosenHandler MwNfileChosenHandler #define MwNdirectoryChosenHandler "CdirectoryChosen" /* char* */
#define MwNcolorChosenHandler "CcolorChosen" /* MwRGB* */ #define MwNcolorChosenHandler "CcolorChosen" /* MwRGB* */
#define MwNdrawHandler "Cdraw" /* NULL */ #define MwNdrawHandler "Cdraw" /* NULL */
#endif #endif

1
milsko.xml
View file

@ -100,6 +100,7 @@
<handler name="focusIn" /> <handler name="focusIn" />
<handler name="focusOut" /> <handler name="focusOut" />
<handler name="fileChosen" /> <handler name="fileChosen" />
<handler name="directoryChosen" />
<handler name="colorChosen" /> <handler name="colorChosen" />
<handler name="draw" /> <handler name="draw" />
</properties> </properties>

4
src/backend/gdi.c
View file

@ -496,7 +496,6 @@ static void MwLLDrawPixmapImpl(MwLL handle, MwRect* rect, MwLLPixmap pixmap) {
static void MwLLSetIconImpl(MwLL handle, MwLLPixmap pixmap) { static void MwLLSetIconImpl(MwLL handle, MwLLPixmap pixmap) {
ICONINFO ii; ICONINFO ii;
HICON ico;
memset(&ii, 0, sizeof(ii)); memset(&ii, 0, sizeof(ii));
ii.fIcon = TRUE; ii.fIcon = TRUE;
@ -724,6 +723,9 @@ static void MwLLGetCursorCoordImpl(MwLL handle, MwPoint* point) {
static void MwLLGetScreenSizeImpl(MwLL handle, MwRect* rect) { static void MwLLGetScreenSizeImpl(MwLL handle, MwRect* rect) {
RECT rc; RECT rc;
(void)handle;
GetClientRect(GetDesktopWindow(), &rc); GetClientRect(GetDesktopWindow(), &rc);
rect->x = rect->y = 0; rect->x = rect->y = 0;

4
src/dialog/filechooser.c
View file

@ -98,7 +98,7 @@ static void files_activate(MwWidget handle, void* user, void* call) {
char* p; char* p;
p = MwDirectoryJoin(fc->path, fc->sorted_entries[MwGetInteger(fc->files, MwNvalue) - 1]->name); 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); free(p);
okay(fc->okay, NULL, NULL); okay(fc->okay, NULL, NULL);
@ -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); MwWidget msgbox = MwMessageBox(handle->parent, "File is not permitted here!", "Error", MwMB_ICONERROR | MwMB_BUTTONOK);
MwAddUserHandler(MwMessageBoxGetChild(msgbox, MwMB_BUTTONOK), MwNactivateHandler, msgbox_okay, NULL); MwAddUserHandler(MwMessageBoxGetChild(msgbox, MwMB_BUTTONOK), MwNactivateHandler, msgbox_okay, NULL);
} else { } else {
MwDispatchUserHandler(handle->parent, MwNfileChosenHandler, p); MwDispatchUserHandler(handle->parent, fc->dir_only ? MwNdirectoryChosenHandler : MwNfileChosenHandler, p);
okay(fc->okay, NULL, NULL); okay(fc->okay, NULL, NULL);
} }