diff options
| author | Pietro Gagliardi <[email protected]> | 2015-04-07 03:02:07 -0400 |
|---|---|---|
| committer | Pietro Gagliardi <[email protected]> | 2015-04-07 03:02:07 -0400 |
| commit | a3c26ff6522d5f383e011f4a2a2ff702dd855171 (patch) | |
| tree | e0555d59a5225c25d2c380c0b71f108344f256c6 | |
| parent | d14735883d6bd5df71fc88481b19d44113f7c810 (diff) | |
Hooked everything else together (initialParent, ui_windows.h in uipriv_windows.h). Now to fix build issues... (like a missing const in const char * fixed here too).
| -rw-r--r-- | new/init_windows.c | 9 | ||||
| -rw-r--r-- | new/uipriv_windows.h | 1 |
2 files changed, 9 insertions, 1 deletions
diff --git a/new/init_windows.c b/new/init_windows.c index 3e19cfe..5620f76 100644 --- a/new/init_windows.c +++ b/new/init_windows.c @@ -6,12 +6,14 @@ int nCmdShow; HFONT hMessageFont; +HWND initialParent; + struct uiInitError { char *msg; char failbuf[256]; }; -static void loadLastError(uiInitError *err, char *message) +static void loadLastError(uiInitError *err, const char *message) { DWORD le; @@ -79,6 +81,11 @@ uiInitError *uiInit(uiInitOptions *o) return err; } + // give each control a reasonable initial parent + // don't free the initial parent! + // TODO tune this better; it shouldn't be closed, for instance + initialParent = uiWindowHandle(uiNewWindow("", 0, 0)); + uiFree(err); return NULL; } diff --git a/new/uipriv_windows.h b/new/uipriv_windows.h index 86b7734..a17fbfe 100644 --- a/new/uipriv_windows.h +++ b/new/uipriv_windows.h @@ -27,6 +27,7 @@ #include <oleacc.h> #include <stdio.h> #include "uipriv.h" +#include "ui_windows.h" // ui internal window messages enum { |