Mercurial > projects > dynamin

changeset 35:ee9a564d2814

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Allow more use of Containers versus Panels.
author Jordan Miner <jminer7@gmail.com>
date Mon, 27 Jul 2009 01:35:35 -0500
parents e4d290aaa7ed
children e0e8d450067c
files dynamin/gui/container.d dynamin/gui/radio_button.d dynamin/gui/window.d
diffstat 3 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- 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))
--- 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);
 			}
 		}
--- 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;
 	}