# HG changeset patch # User Jordan Miner # Date 1248676535 18000 # Node ID ee9a564d281424b3f0b2f446f07076ddf3338a29 # Parent e4d290aaa7ed35be3206e1d465833bdc27245dfc Allow more use of Containers versus Panels. diff -r e4d290aaa7ed -r ee9a564d2814 dynamin/gui/container.d --- a/dynamin/gui/container.d Sat Jul 25 22:50:45 2009 -0500 +++ b/dynamin/gui/container.d Mon Jul 27 01:35:35 2009 -0500 @@ -237,7 +237,7 @@ //ControlRemoved(EventArgs e); // TODO: add event } - protected int opApply(int delegate(inout Control item) dg) { + int opApply(int delegate(inout Control item) dg) { for(uint i = 0; i < _children.count; ++i) { auto tmp = _children[i]; if(int result = dg(tmp)) @@ -245,7 +245,7 @@ } return 0; } - protected int opApply(int delegate(inout uint index, inout Control item) dg) { + int opApply(int delegate(inout uint index, inout Control item) dg) { for(uint i = 0; i < _children.count; ++i) { auto tmp = _children[i]; if(int result = dg(i, tmp)) diff -r e4d290aaa7ed -r ee9a564d2814 dynamin/gui/radio_button.d --- a/dynamin/gui/radio_button.d Sat Jul 25 22:50:45 2009 -0500 +++ b/dynamin/gui/radio_button.d Mon Jul 27 01:35:35 2009 -0500 @@ -45,7 +45,7 @@ if(!topLevel) return null; RadioButton[] radios; - void collectFromPanel(Panel container) { + void collectFromPanel(Container container) { foreach(control; container) { if(auto r = cast(RadioButton)control) { if(r.group != group) @@ -54,7 +54,7 @@ radios[$-1] = r; if(r.checked) checkedIndex = radios.length-1; - } else if(auto c = cast(Panel)control) + } else if(auto c = cast(Container)control) collectFromPanel(c); } } diff -r e4d290aaa7ed -r ee9a564d2814 dynamin/gui/window.d --- a/dynamin/gui/window.d Sat Jul 25 22:50:45 2009 -0500 +++ b/dynamin/gui/window.d Mon Jul 27 01:35:35 2009 -0500 @@ -154,7 +154,7 @@ Window _owner; WindowBorderStyle _borderStyle; bool _resizable = true; - Panel _content; + Container _content; Control _focusedControl; package Control focusedControl() { return _focusedControl; } package void focusedControl(Control c) { @@ -180,7 +180,7 @@ this.text = text; } - void content(Panel panel) { + void content(Container panel) { if(panel is null) throw new IllegalArgumentException("content must not be null"); // TODO: remove handlers @@ -224,7 +224,7 @@ _content.size = _size-_borderSize; ignoreResize = false; } - Panel content() { + Container content() { return _content; }