merge
This commit is contained in:
commit
82626cab22
5 changed files with 26 additions and 20 deletions
|
|
@ -496,7 +496,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;
|
||||
|
|
@ -724,6 +723,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;
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue