# HG changeset patch
# User Jordan Miner <jminer7@gmail.com>
# Date 1265490772 21600
# Node ID 651082a9b3643f503f28e4b01b25d53a0ab35a42
# Parent  c9a4850926d96ce89720dd1dbc8093a26ce73051
Add Event.setUp() and use in place of mainHandler and dispatcher.

diff -r c9a4850926d9 -r 651082a9b364 dynamin/core/event.d
--- a/dynamin/core/event.d	Sat Feb 06 15:11:57 2010 -0600
+++ b/dynamin/core/event.d	Sat Feb 06 15:12:52 2010 -0600
@@ -71,9 +71,13 @@
 
 	Handler[] handlers;
 	///
-	Handler mainHandler;
+	private Handler mainHandler;
 	///
-	Dispatcher dispatcher;
+	private Dispatcher dispatcher;
+	void setUp(Handler mainHandler, Dispatcher dispatcher = null) {
+		this.mainHandler = mainHandler;
+		this.dispatcher = dispatcher;
+	}
 	void defaultDispatch(ArgsType e) {
 		callHandlers(e);
 		callMainHandler(e);
diff -r c9a4850926d9 -r 651082a9b364 dynamin/gui/button.d
--- a/dynamin/gui/button.d	Sat Feb 06 15:11:57 2010 -0600
+++ b/dynamin/gui/button.d	Sat Feb 06 15:12:52 2010 -0600
@@ -174,7 +174,7 @@
 
 	///
 	this() {
-		clicked.mainHandler = &whenClicked;
+		clicked.setUp(&whenClicked);
 		_focusable = true;
 	}
 	///
diff -r c9a4850926d9 -r 651082a9b364 dynamin/gui/check_box.d
--- a/dynamin/gui/check_box.d	Sat Feb 06 15:11:57 2010 -0600
+++ b/dynamin/gui/check_box.d	Sat Feb 06 15:12:52 2010 -0600
@@ -63,7 +63,7 @@
 	/// This event occurs after .
 	Event!(whenCheckedChanged) checkedChanged;
 	this() {
-		checkedChanged.mainHandler = &whenCheckedChanged;
+		checkedChanged.setUp(&whenCheckedChanged);
 		_focusable = true;
 	}
 	this(string text) {
diff -r c9a4850926d9 -r 651082a9b364 dynamin/gui/container.d
--- a/dynamin/gui/container.d	Sat Feb 06 15:11:57 2010 -0600
+++ b/dynamin/gui/container.d	Sat Feb 06 15:12:52 2010 -0600
@@ -163,12 +163,11 @@
 	Event!(whenDescendantRemoved) descendantRemoved;
 
 	this() {
-		minSizeChanged.mainHandler = &whenMinSizeChanged;
-		maxSizeChanged.mainHandler = &whenMaxSizeChanged;
-		descendantAdded.mainHandler = &whenDescendantAdded;
-		descendantAdded.dispatcher = &dispatchDescendantAdded;
-		descendantRemoved.mainHandler = &whenDescendantRemoved;
-		descendantRemoved.dispatcher = &dispatchDescendantRemoved;
+		minSizeChanged   .setUp(&whenMinSizeChanged);
+		maxSizeChanged   .setUp(&whenMaxSizeChanged);
+		descendantAdded  .setUp(&whenDescendantAdded, &dispatchDescendantAdded);
+		descendantRemoved.setUp(&whenDescendantRemoved,
+		                        &dispatchDescendantRemoved);
 
 		_children = new ControlList(&whenChildAdded, &whenChildRemoved);
 
diff -r c9a4850926d9 -r 651082a9b364 dynamin/gui/control.d
--- a/dynamin/gui/control.d	Sat Feb 06 15:11:57 2010 -0600
+++ b/dynamin/gui/control.d	Sat Feb 06 15:12:52 2010 -0600
@@ -239,31 +239,21 @@
 	Event!(whenFocusLost) focusLost;
 
 	this() {
-		moved.mainHandler = &whenMoved;
-		resized.mainHandler = &whenResized;
-		mouseEntered.mainHandler = &whenMouseEntered;
-		mouseEntered.dispatcher = &dispatchMouseEntered;
-		mouseLeft.mainHandler = &whenMouseLeft;
-		mouseDown.mainHandler = &whenMouseDown;
-		mouseDown.dispatcher = &dispatchMouseDown;
-		mouseUp.mainHandler = &whenMouseUp;
-		mouseUp.dispatcher = &dispatchMouseUp;
-		mouseMoved.mainHandler = &whenMouseMoved;
-		mouseMoved.dispatcher = &dispatchMouseMoved;
-		mouseDragged.mainHandler = &whenMouseDragged;
-		mouseDragged.dispatcher = &dispatchMouseDragged;
-		mouseTurned.mainHandler = &whenMouseTurned;
-		mouseTurned.dispatcher = &dispatchMouseTurned;
-		keyDown.mainHandler = &whenKeyDown;
-		keyDown.dispatcher = &dispatchKeyDown;
-		keyTyped.mainHandler = &whenKeyTyped;
-		keyTyped.dispatcher = &dispatchKeyTyped;
-		keyUp.mainHandler = &whenKeyUp;
-		keyUp.dispatcher = &dispatchKeyUp;
-		painting.mainHandler = &whenPainting;
-		painting.dispatcher = &dispatchPainting;
-		focusGained.mainHandler = &whenFocusGained;
-		focusLost.mainHandler = &whenFocusLost;
+		moved       .setUp(&whenMoved);
+		resized     .setUp(&whenResized);
+		mouseEntered.setUp(&whenMouseEntered, &dispatchMouseEntered);
+		mouseLeft   .setUp(&whenMouseLeft);
+		mouseDown   .setUp(&whenMouseDown,    &dispatchMouseDown);
+		mouseUp     .setUp(&whenMouseUp,      &dispatchMouseUp);
+		mouseMoved  .setUp(&whenMouseMoved,   &dispatchMouseMoved);
+		mouseDragged.setUp(&whenMouseDragged, &dispatchMouseDragged);
+		mouseTurned .setUp(&whenMouseTurned,  &dispatchMouseTurned);
+		keyDown     .setUp(&whenKeyDown,      &dispatchKeyDown);
+		keyTyped    .setUp(&whenKeyTyped,     &dispatchKeyTyped);
+		keyUp       .setUp(&whenKeyUp,        &dispatchKeyUp);
+		painting    .setUp(&whenPainting,     &dispatchPainting);
+		focusGained .setUp(&whenFocusGained);
+		focusLost   .setUp(&whenFocusLost);
 
 		_location = Point(0, 0);
 		_size = Size(100, 100);
diff -r c9a4850926d9 -r 651082a9b364 dynamin/gui/list_box.d
--- a/dynamin/gui/list_box.d	Sat Feb 06 15:11:57 2010 -0600
+++ b/dynamin/gui/list_box.d	Sat Feb 06 15:12:52 2010 -0600
@@ -90,7 +90,7 @@
 
 	///
 	this() {
-		selectionChanged.mainHandler = &whenSelectionChanged;
+		selectionChanged.setUp(&whenSelectionChanged);
 		_items = new List!(string, true)(&whenListItemsChanged, &whenListItemsChanged);
 
 		super();
diff -r c9a4850926d9 -r 651082a9b364 dynamin/gui/notebook.d
--- a/dynamin/gui/notebook.d	Sat Feb 06 15:11:57 2010 -0600
+++ b/dynamin/gui/notebook.d	Sat Feb 06 15:12:52 2010 -0600
@@ -114,7 +114,7 @@
 	Event!(whenSelectionChanged) selectionChanged;
 
 	this() {
-		selectionChanged.mainHandler = &whenSelectionChanged;
+		selectionChanged.setUp(&whenSelectionChanged);
 
 		_tabPages = new List!(TabPage, true)(&whenTabPagesChanged, &whenTabPagesChanged);
 		_focusable = true;
diff -r c9a4850926d9 -r 651082a9b364 dynamin/gui/scroll_bar.d
--- a/dynamin/gui/scroll_bar.d	Sat Feb 06 15:11:57 2010 -0600
+++ b/dynamin/gui/scroll_bar.d	Sat Feb 06 15:12:52 2010 -0600
@@ -69,7 +69,7 @@
 	// stores the location of the thumb as a percentage of the track
 	real _thumbPos;
 	this() {
-		valueChanged.mainHandler = &whenValueChanged;
+		valueChanged.setUp(&whenValueChanged);
 
 		_track1 = new ScrollBarTrack;
 		_track2 = new ScrollBarTrack;
diff -r c9a4850926d9 -r 651082a9b364 dynamin/gui/text_box.d
--- a/dynamin/gui/text_box.d	Sat Feb 06 15:11:57 2010 -0600
+++ b/dynamin/gui/text_box.d	Sat Feb 06 15:12:52 2010 -0600
@@ -113,7 +113,7 @@
 	Event!(whenSelectionChanged) selectionChanged;
 
 	this() {
-		selectionChanged.mainHandler = &whenSelectionChanged;
+		selectionChanged.setUp(&whenSelectionChanged);
 
 		super();
 		_focusable = true;
diff -r c9a4850926d9 -r 651082a9b364 dynamin/gui/window.d
--- a/dynamin/gui/window.d	Sat Feb 06 15:11:57 2010 -0600
+++ b/dynamin/gui/window.d	Sat Feb 06 15:12:52 2010 -0600
@@ -270,9 +270,9 @@
 	 *
 	 */
 	this() {
-		visibleChanged.mainHandler = &whenVisibleChanged;
-		activated.mainHandler = &whenActivated;
-		deactivated.mainHandler = &whenDeactivated;
+		visibleChanged.setUp(&whenVisibleChanged);
+		activated     .setUp(&whenActivated);
+		deactivated   .setUp(&whenDeactivated);
 
 		content = new Panel;