linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2499
committer: poy <poy@xxxxxxxxxx>
branch nick: trunk
timestamp: Sun 2011-04-17 23:28:54 +0200
message:
  click notifications tweaks
modified:
  dwt/include/dwt/widgets/Button.h
  dwt/include/dwt/widgets/ComboBox.h
  dwt/include/dwt/widgets/DateTime.h
  dwt/include/dwt/widgets/Label.h


--
lp:dcplusplus
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk

Your team Dcplusplus-team is subscribed to branch lp:dcplusplus.
To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription

=== modified file 'dwt/include/dwt/widgets/Button.h'
--- dwt/include/dwt/widgets/Button.h	2011-04-16 15:22:56 +0000
+++ dwt/include/dwt/widgets/Button.h	2011-04-17 21:28:54 +0000
@@ -46,7 +46,7 @@
 /** Common stuff for all buttons */
 class Button :
 	public CommonControl,
-	public AspectClickable<Button>,
+	private AspectClickable<Button>,
 	public AspectColor<Button>,
 	public AspectColorCtlImpl<Button>,
 	public AspectText< Button >
@@ -86,6 +86,9 @@
 
 	virtual Point getPreferredSize();
 
+	using AspectClickable<ThisType>::onClicked;
+	using AspectClickable<ThisType>::onDblClicked;
+
 protected:
 	typedef Button ButtonType;
 

=== modified file 'dwt/include/dwt/widgets/ComboBox.h'
--- dwt/include/dwt/widgets/ComboBox.h	2011-04-16 15:22:56 +0000
+++ dwt/include/dwt/widgets/ComboBox.h	2011-04-17 21:28:54 +0000
@@ -58,7 +58,7 @@
 class ComboBox :
 	public CommonControl,
 	// Aspects
-	public AspectClickable< ComboBox >,
+	private AspectClickable< ComboBox >,
 	public AspectCollection<ComboBox, int>,
 	public AspectColor< ComboBox >,
 	public AspectColorCtlImpl<ComboBox>,
@@ -128,6 +128,9 @@
 
 	void setDropDownHeight(size_t h);
 
+	using AspectClickable<ThisType>::onClicked;
+	using AspectClickable<ThisType>::onDblClicked;
+
 protected:
 	ComboBox(Widget* parent);
 

=== modified file 'dwt/include/dwt/widgets/DateTime.h'
--- dwt/include/dwt/widgets/DateTime.h	2011-04-16 15:22:56 +0000
+++ dwt/include/dwt/widgets/DateTime.h	2011-04-17 21:28:54 +0000
@@ -54,7 +54,7 @@
 class DateTime :
 	public CommonControl,
 	// Aspects
-	public AspectClickable< DateTime >
+	private AspectClickable< DateTime >
 {
 	typedef CommonControl BaseType;
 	friend class WidgetCreator< DateTime >;
@@ -192,6 +192,8 @@
 	  */
 	void create( const Seed & cs = Seed() );
 
+	using AspectClickable<ThisType>::onClicked;
+
 protected:
 	/// Constructor Taking pointer to parent
 	explicit DateTime( dwt::Widget * parent );

=== modified file 'dwt/include/dwt/widgets/Label.h'
--- dwt/include/dwt/widgets/Label.h	2011-04-16 15:22:56 +0000
+++ dwt/include/dwt/widgets/Label.h	2011-04-17 21:28:54 +0000
@@ -58,7 +58,7 @@
 class Label :
 	public CommonControl,
 	// Aspects
-	public AspectClickable< Label >,
+	private AspectClickable< Label >,
 	public AspectColor< Label >,
 	public AspectColorCtlImpl<Label>,
 	public AspectText< Label >
@@ -102,6 +102,9 @@
 
 	virtual Point getPreferredSize();
 
+	using AspectClickable<ThisType>::onClicked;
+	using AspectClickable<ThisType>::onDblClicked;
+
 protected:
 	// Constructor Taking pointer to parent
 	explicit Label( dwt::Widget * parent );
@@ -116,11 +119,11 @@
 	static const TCHAR windowClass[];
 
 	// AspectClickable
-	static Message getLeftClickMessage();
+	static Message getClickMessage();
 	static Message getDblClickMessage();
 };
 
-inline Message Label::getLeftClickMessage() {
+inline Message Label::getClickMessage() {
 	return Message(WM_COMMAND, MAKEWPARAM(0, STN_CLICKED));
 }