Merge branch 'master' of github.com:buggins/dlangui

This commit is contained in:
Vadim Lopatin 2016-08-17 09:19:15 +03:00
commit a2cfbf8f43
2 changed files with 5 additions and 4 deletions

View File

@ -52,7 +52,7 @@ Currently implemented widgets:
* TextImageButton - button with icon and label * TextImageButton - button with icon and label
* CheckBox - check button with label * CheckBox - check button with label
* RadioButton - radio button with label * RadioButton - radio button with label
* SwitchWidget - switch button * SwitchButton - a toggle switch button
* EditLine - single line edit * EditLine - single line edit
* EditBox - multiline editor * EditBox - multiline editor
* VSpacer - vertical spacer - just an empty widget with layoutHeight == FILL_PARENT, to fill vertical space in layouts * VSpacer - vertical spacer - just an empty widget with layoutHeight == FILL_PARENT, to fill vertical space in layouts

View File

@ -14,6 +14,7 @@ import dlangui.widgets.styles;
import dlangui.widgets.widget; import dlangui.widgets.widget;
import dlangui.platforms.common.platform; import dlangui.platforms.common.platform;
import core.stdc.string;
import std.stdio; import std.stdio;
import std.string; import std.string;
import std.utf; import std.utf;
@ -372,7 +373,7 @@ class X11Window : DWindow {
override void invalidate() { override void invalidate() {
Log.d("Window.invalidate()"); Log.d("Window.invalidate()");
XEvent ev; XEvent ev;
core.stdc.string.memset(&ev, 0, ev.sizeof); memset(&ev, 0, ev.sizeof);
ev.type = Expose; ev.type = Expose;
ev.xexpose.window = _win; ev.xexpose.window = _win;
@ -889,7 +890,7 @@ class X11Window : DWindow {
override protected void scheduleSystemTimer(long intervalMillis) { override protected void scheduleSystemTimer(long intervalMillis) {
if (!timer) { if (!timer) {
timer = new TimerThread(delegate() { timer = new TimerThread(delegate() {
core.stdc.string.memset(&ev, 0, ev.sizeof); memset(&ev, 0, ev.sizeof);
//ev.xclient = XClientMessageEvent.init; //ev.xclient = XClientMessageEvent.init;
ev.xclient.type = ClientMessage; ev.xclient.type = ClientMessage;
ev.xclient.message_type = atom_DLANGUI_TIMER_EVENT; ev.xclient.message_type = atom_DLANGUI_TIMER_EVENT;
@ -928,7 +929,7 @@ class X11Window : DWindow {
override void postEvent(CustomEvent event) { override void postEvent(CustomEvent event) {
super.postEvent(event); super.postEvent(event);
XEvent ev; XEvent ev;
core.stdc.string.memset(&ev, 0, ev.sizeof); memset(&ev, 0, ev.sizeof);
ev.xclient.type = ClientMessage; ev.xclient.type = ClientMessage;
ev.xclient.window = _win; ev.xclient.window = _win;
ev.xclient.display = x11display2; ev.xclient.display = x11display2;