diff options
| author | Pietro Gagliardi <[email protected]> | 2015-04-08 20:01:33 -0400 |
|---|---|---|
| committer | Pietro Gagliardi <[email protected]> | 2015-04-08 20:01:33 -0400 |
| commit | 7d349d6a2843c6e0825403448ac28683e688f338 (patch) | |
| tree | 20998202a05e4b74d4e5ff4534fba6d69f3e043d | |
| parent | 317217de5a75eca736a8f7c4adcc17250975bd37 (diff) | |
More TODO resolution.
| -rw-r--r-- | new/button_windows.c | 7 | ||||
| -rw-r--r-- | new/newcontrol_windows.c | 2 | ||||
| -rw-r--r-- | new/ui_windows.h | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/new/button_windows.c b/new/button_windows.c index a257e15..9d3ae65 100644 --- a/new/button_windows.c +++ b/new/button_windows.c @@ -72,6 +72,8 @@ uiControl *uiNewButton(const char *text) p.dwExStyle = 0; p.lpClassName = L"button"; + wtext = toUTF16(text); + p.lpWindowName = wtext; p.dwStyle = BS_PUSHBUTTON | WS_TABSTOP; p.hInstance = hInstance; p.onWM_COMMAND = onWM_COMMAND; @@ -81,12 +83,9 @@ uiControl *uiNewButton(const char *text) p.preferredSize = preferredSize; p.data = b; b->c = uiWindowsNewControl(&p); + uiFree(wtext); hwnd = (HWND) uiControlHandle(b->c); - wtext = toUTF16(text); - if (SetWindowTextW(hwnd, wtext) == 0) - logLastError("error setting button text in uiNewButton()"); - uiFree(wtext); SendMessageW(hwnd, WM_SETFONT, (WPARAM) hMessageFont, (LPARAM) TRUE); b->onClicked = defaultOnClicked; diff --git a/new/newcontrol_windows.c b/new/newcontrol_windows.c index 1293f5a..ce7bad4 100644 --- a/new/newcontrol_windows.c +++ b/new/newcontrol_windows.c @@ -90,7 +90,7 @@ uiControl *uiWindowsNewControl(uiWindowsNewControlParams *p) c = uiNew(uiSingleHWNDControl); c->hwnd = CreateWindowExW(p->dwExStyle, - p->lpClassName, L"", + p->lpClassName, p->lpWindowName, p->dwStyle | WS_CHILD | WS_VISIBLE, 0, 0, 100, 100, diff --git a/new/ui_windows.h b/new/ui_windows.h index c86e6a9..3a4ebd9 100644 --- a/new/ui_windows.h +++ b/new/ui_windows.h @@ -13,7 +13,7 @@ struct uiWindowsNewControlParams { // These match the CreateWindowExW() function. DWORD dwExStyle; LPCWSTR lpClassName; -//TODO? LPCWSTR lpWindowName; + LPCWSTR lpWindowName; DWORD dwStyle; // WS_CHILD and WS_VISIBLE are automatically applied. HINSTANCE hInstance; |