forks
/
arsd
mirror of https://github.com/adamdruppe/arsd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use w functons because i can

This commit is contained in:
Adam D. Ruppe 2018-10-31 08:01:57 -04:00
parent fc83e264aa
commit b1f0a46ca8
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
minigui.d
View File

@ -224,7 +224,7 @@ abstract class ComboboxBase : Widget {
void addOption(string s) { void addOption(string s) {
options ~= s; options ~= s;
version(win32_widgets) version(win32_widgets)
SendMessageA(hwnd, 323 /*CB_ADDSTRING*/, 0, cast(LPARAM) toStringzInternal(s)); SendMessageW(hwnd, 323 /*CB_ADDSTRING*/, 0, cast(LPARAM) toWstringzInternal(s));
} }
void setSelection(int idx) { void setSelection(int idx) {
@ -533,7 +533,6 @@ else version(custom_widgets)
enum windowBackgroundColor = Color(192, 192, 192); enum windowBackgroundColor = Color(192, 192, 192);
else static assert(false); else static assert(false);
private const(char)* toStringzInternal(string s) { return (s ~ '\0').ptr; }
private const(wchar)* toWstringzInternal(in char[] s) { private const(wchar)* toWstringzInternal(in char[] s) {
wchar[] str; wchar[] str;
str.reserve(s.length + 1); str.reserve(s.length + 1);
@ -3939,7 +3938,7 @@ class ToolBar : Widget {
// FIXME: I_IMAGENONE is if here is no icon // FIXME: I_IMAGENONE is if here is no icon
foreach(action; actions) foreach(action; actions)
buttons ~= TBBUTTON(MAKELONG(cast(ushort)(action.iconId ? (action.iconId - 1) : -2 /* I_IMAGENONE */), 0), action.id, TBSTATE_ENABLED, 0, 0, 0, cast(int) toStringzInternal(action.label)); buttons ~= TBBUTTON(MAKELONG(cast(ushort)(action.iconId ? (action.iconId - 1) : -2 /* I_IMAGENONE */), 0), action.id, TBSTATE_ENABLED, 0, 0, 0, cast(int) toWstringzInternal(action.label));
SendMessageA(hwnd, TB_BUTTONSTRUCTSIZE, cast(WPARAM)TBBUTTON.sizeof, 0); SendMessageA(hwnd, TB_BUTTONSTRUCTSIZE, cast(WPARAM)TBBUTTON.sizeof, 0);
SendMessageA(hwnd, TB_ADDBUTTONSA, cast(WPARAM) buttons.length, cast(LPARAM)buttons.ptr); SendMessageA(hwnd, TB_ADDBUTTONSA, cast(WPARAM) buttons.length, cast(LPARAM)buttons.ptr);
@ -4105,7 +4104,7 @@ class MenuBar : Widget {
this.addChild(item); this.addChild(item);
items ~= item; items ~= item;
version(win32_widgets) { version(win32_widgets) {
AppendMenuA(handle, MF_STRING, item.action is null ? 9000 : item.action.id, toStringzInternal(item.label)); // XXX AppendMenuW(handle, MF_STRING, item.action is null ? 9000 : item.action.id, toWstringzInternal(item.label));
} }
return item; return item;
} }
@ -4119,7 +4118,7 @@ class MenuBar : Widget {
items ~= mbItem; items ~= mbItem;
version(win32_widgets) { version(win32_widgets) {
AppendMenuA(handle, MF_STRING | MF_POPUP, cast(UINT) item.handle, toStringzInternal(item.label)); // XXX AppendMenuW(handle, MF_STRING | MF_POPUP, cast(UINT) item.handle, toWstringzInternal(item.label));
} else version(custom_widgets) { } else version(custom_widgets) {
mbItem.defaultEventHandlers["mousedown"] = (Widget e, Event ev) { mbItem.defaultEventHandlers["mousedown"] = (Widget e, Event ev) {
item.popup(mbItem); item.popup(mbItem);
@ -4594,7 +4593,7 @@ class Menu : Window {
addChild(item); addChild(item);
items ~= item; items ~= item;
version(win32_widgets) { version(win32_widgets) {
AppendMenuA(handle, MF_STRING, item.action is null ? 9000 : item.action.id, toStringzInternal(item.label)); // XXX AppendMenuW(handle, MF_STRING, item.action is null ? 9000 : item.action.id, toWstringzInternal(item.label));
} }
return item; return item;
} }