interesting
/
andlabs-ui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Decided to disable the initial parent window on Windows. If this causes problems, I can re-enable it later. More TODOs.

This commit is contained in:
Pietro Gagliardi 2015-04-11 12:40:09 -04:00
parent 812b70f6f0
commit a34fe03eef
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
new/init_windows.c
View File

@ -40,6 +40,8 @@ static const char *loadLastError(const char *message)
wmessage = toUTF16(message); wmessage = toUTF16(message);
n = _scwprintf(initErrorFormat, initErrorArgs); n = _scwprintf(initErrorFormat, initErrorArgs);
wstr = (WCHAR *) uiAlloc((n + 1) * sizeof (WCHAR), "WCHAR[]"); wstr = (WCHAR *) uiAlloc((n + 1) * sizeof (WCHAR), "WCHAR[]");
// TODO this requires -lmsvcr100; find out if that runs on XP RTM/SP1
// TODO find replacement
swprintf_s(wstr, n + 1, initErrorFormat, initErrorArgs); swprintf_s(wstr, n + 1, initErrorFormat, initErrorArgs);
str = toUTF8(wstr); str = toUTF8(wstr);
uiFree(wstr); uiFree(wstr);

6
new/initparent_windows.c
View File

@ -2,7 +2,7 @@
#include "uipriv_windows.h" #include "uipriv_windows.h"
// for maximum safety, all controls that don't have a parent are made children of this, the "initial parent" // for maximum safety, all controls that don't have a parent are made children of this, the "initial parent"
// it behaves like other containers due to bugs described in container_windows.c, but is never seen and cannot be interacted with by end users // it behaves like other containers due to bugs described in container_windows.c, but is never seen, is disabled, and cannot be interacted with by end users
// despite being called the initial parent, it is used whenever a control has no parent, even if it loses its parent at some later point during the execution of the program // despite being called the initial parent, it is used whenever a control has no parent, even if it loses its parent at some later point during the execution of the program
#define uiInitialParentClass L"uiInitialParentClass" #define uiInitialParentClass L"uiInitialParentClass"
@ -41,6 +41,8 @@ const char *initInitialParent(HICON hDefaultIcon, HCURSOR hDefaultCursor)
if (initialParent == NULL) if (initialParent == NULL)
return "creating initial parent window"; return "creating initial parent window";
// TODO disable? // just to be safe, disable the initial parent so it can't be interacted with accidentally
// if this causes issues for our controls, we can remove it
EnableWindow(initialParent, FALSE);
return NULL; return NULL;
} }

2
new/main_windows.c
View File

@ -1,7 +1,7 @@
// 6 april 2015 // 6 april 2015
#include "uipriv_windows.h" #include "uipriv_windows.h"
// #qo LDFLAGS: -luser32 -lkernel32 -lgdi32 -luxtheme -lmsimg32 -lcomdlg32 -lole32 -loleaut32 -loleacc -luuid // #qo LDFLAGS: -luser32 -lkernel32 -lgdi32 -luxtheme -lmsimg32 -lcomdlg32 -lole32 -loleaut32 -loleacc -luuid -lmsvcr100
static void uimsgloop_else(MSG *msg) static void uimsgloop_else(MSG *msg)
{ {