Merge branch 'master' of github.com:adamdruppe/arsd

This commit is contained in:
Adam D. Ruppe 2018-11-24 16:05:59 -05:00
commit d3c7f3fddc
4 changed files with 3 additions and 3 deletions

BIN
glu32.lib

Binary file not shown.

View File

@ -3995,7 +3995,7 @@ class ToolBar : Widget {
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));
SendMessageW(hwnd, TB_BUTTONSTRUCTSIZE, cast(WPARAM)TBBUTTON.sizeof, 0);
SendMessageW(hwnd, TB_ADDBUTTONSW, cast(WPARAM) buttons.length, cast(LPARAM)buttons.ptr);
SendMessageW(hwnd, TB_ADDBUTTONSW, cast(WPARAM) buttons.length, cast(LPARAM)buttons.ptr);
SIZE size;
import core.sys.windows.commctrl;

Binary file not shown.

View File

@ -4389,13 +4389,13 @@ string makeUtf8StringFromWindowsString(wchar* str) {
int findIndexOfZero(in wchar[] str) {
foreach(idx, wchar ch; str)
if(ch == 0)
return idx;
return cast(int) idx;
return cast(int) str.length;
}
int findIndexOfZero(in char[] str) {
foreach(idx, char ch; str)
if(ch == 0)
return idx;
return cast(int) idx;
return cast(int) str.length;
}