Added ComboBox. Also improved callback filtering and made controls auto register themselves.

1 files changed, 9 insertions, 1 deletions

diff --git a/src/w32dlib/control.h b/src/w32dlib/control.h
index 5096abf..3cc01e5 100644
--- a/src/w32dlib/control.h
+++ b/src/w32dlib/control.h
@@ -35,6 +35,9 @@ namespace W32DLib
 
 	/// \brief Constructor
 	///
+	/// When a control is constructed it calls Dialog::AddControl to add
+	/// itself to the dialog.
+	///
 	/// \param parent The Dialog the control belongs to.
 	/// \param resource_id The ID of the control in the resource file.
 	///
@@ -65,12 +68,15 @@ namespace W32DLib
 	/// \brief Add a callback for the control.
 	///
 	/// \param msg The Windows event message to respond to.
+	/// \param notification The top word of the WPARAM will be checked
+	/// against this.  If zero, then ignored.
 	/// \param owner The class (generally a Dialog derived one) in which
 	///  the callback resides.  The class must be derived from
 	///  Window.
 	/// \param callback The callback.
 	///
 	void		AddCallback(UINT msg,
+				    UINT notification,
 				    Window *owner,
 				    W32DLibCallback callback);
 
@@ -87,10 +93,12 @@ namespace W32DLib
 	struct CallbackDetails
 	{
 	    Window		*owner;
+	    UINT		msg;
+	    UINT		notif;
 	    W32DLibCallback	cb;
 	};
 
-    	typedef std::map<UINT,CallbackDetails> CallbackList;
+    	typedef std::vector<CallbackDetails> CallbackList;
 
 	CallbackList	m_cblist;