Menu
▾
▴
[Dcplusplus-commit] SF.net SVN: dcplusplus: [1065] dcplusplus/trunk
|
From: <arn...@us...> - 2008-03-26 14:19:35
|
Revision: 1065
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1065&view=rev
Author: arnetheduck
Date: 2008-03-26 07:19:33 -0700 (Wed, 26 Mar 2008)
Log Message:
-----------
Move AspectBorder to AspectControl
Modified Paths:
--------------
dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectButton.h
dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectControl.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetComboBox.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetListView.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetProgressBar.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetSlider.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetSpinner.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetStatic.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetStatusBar.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetTabSheet.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetTextBox.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetTreeView.h
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-03-25 22:01:37.789999962 +0100
committer: Jacek Sieka <arn...@gm...>
properties:
branch-nick: dcplusplus
+ timestamp: 2008-03-25 22:17:47.410000086 +0100
committer: Jacek Sieka <arn...@gm...>
properties:
branch-nick: dcplusplus
Name: bzr:file-ids
- smartwin/include/smartwin/aspects/AspectColor.h 712@f586c4b0-9d0d-0410-bc51-f1fe239209fc:dcplusplus%2Ftrunk:smartwin%2Finclude%2Fsmartwin%2Faspects%2FAspectBackgroundColor.h
+
Name: bzr:revision-id:v3-trunk1
- 1027 arn...@gm...-20080323183926-schknwnkgeo7ivdn
1028 zouzou123gen-20080323220411-r8usuc3qxwuh7zsn
1029 zouzou123gen-20080323221249-0su72zaj13e706mk
1030 arn...@gm...-20080324140623-muba1dl46m000o8c
1031 zouzou123gen-20080324141933-qbgr93ugpe0297m6
1032 arn...@gm...-20080324153706-siidja05n84i00b1
1033 arn...@gm...-20080324153823-lhn3awurnu77riln
1034 arn...@gm...-20080324165650-zapppziji67yf5a2
1035 zouzou123gen-20080324175936-4mqc2kh0lo5wtdu2
1036 zouzou123gen-20080325004602-6wdsoym95mjuhwd3
1037 arn...@gm...-20080325100659-8fqy6q65itmghlep
1038 zouzou123gen-20080325175216-s297sdiucukfvijh
1039 arn...@gm...-20080325210137-3dfqyoi8ykosy087
+ 1027 arn...@gm...-20080323183926-schknwnkgeo7ivdn
1028 zouzou123gen-20080323220411-r8usuc3qxwuh7zsn
1029 zouzou123gen-20080323221249-0su72zaj13e706mk
1030 arn...@gm...-20080324140623-muba1dl46m000o8c
1031 zouzou123gen-20080324141933-qbgr93ugpe0297m6
1032 arn...@gm...-20080324153706-siidja05n84i00b1
1033 arn...@gm...-20080324153823-lhn3awurnu77riln
1034 arn...@gm...-20080324165650-zapppziji67yf5a2
1035 zouzou123gen-20080324175936-4mqc2kh0lo5wtdu2
1036 zouzou123gen-20080325004602-6wdsoym95mjuhwd3
1037 arn...@gm...-20080325100659-8fqy6q65itmghlep
1038 zouzou123gen-20080325175216-s297sdiucukfvijh
1039 arn...@gm...-20080325210137-3dfqyoi8ykosy087
1040 arn...@gm...-20080325211747-nwwy1eb33r071sca
Modified: dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectButton.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectButton.h 2008-03-26 14:14:56 UTC (rev 1064)
+++ dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectButton.h 2008-03-26 14:19:33 UTC (rev 1065)
@@ -1,7 +1,6 @@
#ifndef ASPECTBUTTON_H_
#define ASPECTBUTTON_H_
-#include "AspectBorder.h"
#include "AspectColor.h"
#include "AspectClickable.h"
#include "AspectControl.h"
@@ -15,7 +14,6 @@
/** Common stuff for all buttons */
template<typename WidgetType>
class AspectButton :
- public AspectBorder< WidgetType >,
public AspectClickable<WidgetType>,
public AspectColor<WidgetType>,
public AspectColorCtlImpl<WidgetType>,
Modified: dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectControl.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectControl.h 2008-03-26 14:14:56 UTC (rev 1064)
+++ dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectControl.h 2008-03-26 14:19:33 UTC (rev 1065)
@@ -4,6 +4,7 @@
#include "../Policies.h"
#include "../xCeption.h"
+#include "AspectBorder.h"
#include "AspectContextMenu.h"
#include "AspectEnabled.h"
#include "AspectHelp.h"
@@ -20,6 +21,7 @@
class AspectControl :
public MessageMapPolicy< Policies::Subclassed >,
+ public AspectBorder<WidgetType>,
public AspectContextMenu<WidgetType>,
public AspectEnabled<WidgetType>,
public AspectHelp<WidgetType>,
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetComboBox.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetComboBox.h 2008-03-26 14:14:56 UTC (rev 1064)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetComboBox.h 2008-03-26 14:19:33 UTC (rev 1065)
@@ -29,7 +29,6 @@
#define WidgetComboBox_h
#include "../Widget.h"
-#include "../aspects/AspectBorder.h"
#include "../aspects/AspectColor.h"
#include "../aspects/AspectClickable.h"
#include "../aspects/AspectControl.h"
@@ -58,7 +57,6 @@
*/
class WidgetComboBox :
// Aspects
- public AspectBorder< WidgetComboBox >,
public AspectClickable< WidgetComboBox >,
public AspectColor< WidgetComboBox >,
public AspectColorCtlImpl<WidgetComboBox>,
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetListView.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetListView.h 2008-03-26 14:14:56 UTC (rev 1064)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetListView.h 2008-03-26 14:19:33 UTC (rev 1065)
@@ -32,7 +32,6 @@
#include "../Point.h"
#include "../Rectangle.h"
#include "../resources/ImageList.h"
-#include "../aspects/AspectBorder.h"
#include "../aspects/AspectClickable.h"
#include "../aspects/AspectCollection.h"
#include "../aspects/AspectColor.h"
@@ -70,7 +69,6 @@
*/
class WidgetListView :
// Aspect classes
- public AspectBorder< WidgetListView >,
public AspectClickable< WidgetListView >,
public AspectCollection<WidgetListView, int>,
public AspectColor<WidgetListView>,
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetProgressBar.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetProgressBar.h 2008-03-26 14:14:56 UTC (rev 1064)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetProgressBar.h 2008-03-26 14:19:33 UTC (rev 1065)
@@ -29,10 +29,8 @@
#define WidgetProgressBar_h
#include "../Widget.h"
-#include "../aspects/AspectBorder.h"
#include "../aspects/AspectControl.h"
#include "../aspects/AspectPainting.h"
-#include "../aspects/AspectScrollable.h"
namespace SmartWin
{
@@ -54,7 +52,6 @@
*/
class WidgetProgressBar :
// Aspects
- public AspectBorder< WidgetProgressBar >,
public AspectControl<WidgetProgressBar>,
public AspectPainting< WidgetProgressBar >
{
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetSlider.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetSlider.h 2008-03-26 14:14:56 UTC (rev 1064)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetSlider.h 2008-03-26 14:19:33 UTC (rev 1065)
@@ -29,7 +29,6 @@
#define WidgetSlider_h
#include "../Widget.h"
-#include "../aspects/AspectBorder.h"
#include "../aspects/AspectControl.h"
#include "../aspects/AspectFocus.h"
#include "../aspects/AspectPainting.h"
@@ -58,7 +57,6 @@
*/
class WidgetSlider :
// Aspects
- public AspectBorder< WidgetSlider >,
public AspectControl<WidgetSlider>,
public AspectFocus< WidgetSlider >,
public AspectPainting< WidgetSlider >,
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetSpinner.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetSpinner.h 2008-03-26 14:14:56 UTC (rev 1064)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetSpinner.h 2008-03-26 14:19:33 UTC (rev 1065)
@@ -29,7 +29,6 @@
#define WidgetSpinner_h
#include "../Widget.h"
-#include "../aspects/AspectBorder.h"
#include "../aspects/AspectControl.h"
#include "../aspects/AspectFocus.h"
#include "../aspects/AspectPainting.h"
@@ -56,7 +55,6 @@
*/
class WidgetSpinner :
// Aspects
- public AspectBorder< WidgetSpinner >,
public AspectControl<WidgetSpinner>,
public AspectFocus< WidgetSpinner >,
public AspectPainting< WidgetSpinner >,
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetStatic.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetStatic.h 2008-03-26 14:14:56 UTC (rev 1064)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetStatic.h 2008-03-26 14:19:33 UTC (rev 1065)
@@ -29,7 +29,6 @@
#define WidgetStatic_h
#include "../Widget.h"
-#include "../aspects/AspectBorder.h"
#include "../aspects/AspectColor.h"
#include "../aspects/AspectClickable.h"
#include "../aspects/AspectControl.h"
@@ -62,7 +61,6 @@
*/
class WidgetStatic :
// Aspects
- public AspectBorder< WidgetStatic >,
public AspectClickable< WidgetStatic >,
public AspectColor< WidgetStatic >,
public AspectColorCtlImpl<WidgetStatic>,
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetStatusBar.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetStatusBar.h 2008-03-26 14:14:56 UTC (rev 1064)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetStatusBar.h 2008-03-26 14:19:33 UTC (rev 1065)
@@ -29,7 +29,6 @@
#define WidgetStatusBar_h
#include "../Widget.h"
-#include "../aspects/AspectBorder.h"
#include "../aspects/AspectClickable.h"
#include "../aspects/AspectControl.h"
#include "../aspects/AspectDblClickable.h"
@@ -107,7 +106,6 @@
public TypeOfStatusBar,
// Aspects
- public AspectBorder< WidgetStatusBar< TypeOfStatusBar > >,
public AspectClickable< WidgetStatusBar< TypeOfStatusBar > >,
public AspectControl<WidgetStatusBar< TypeOfStatusBar > >,
public AspectDblClickable< WidgetStatusBar< TypeOfStatusBar > >,
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetTabSheet.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetTabSheet.h 2008-03-26 14:14:56 UTC (rev 1064)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetTabSheet.h 2008-03-26 14:19:33 UTC (rev 1065)
@@ -31,7 +31,6 @@
#include "../Widget.h"
#include "../resources/ImageList.h"
#include "../Rectangle.h"
-#include "../aspects/AspectBorder.h"
#include "../aspects/AspectControl.h"
#include "../aspects/AspectFocus.h"
#include "../aspects/AspectFont.h"
@@ -64,7 +63,6 @@
*/
class WidgetTabSheet :
// Aspects
- public AspectBorder< WidgetTabSheet >,
public AspectControl<WidgetTabSheet>,
public AspectFocus< WidgetTabSheet >,
public AspectFont< WidgetTabSheet >,
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetTextBox.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetTextBox.h 2008-03-26 14:14:56 UTC (rev 1064)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetTextBox.h 2008-03-26 14:19:33 UTC (rev 1065)
@@ -29,7 +29,6 @@
#define WidgetTextBox_h
#include "../Widget.h"
-#include "../aspects/AspectBorder.h"
#include "../aspects/AspectColor.h"
#include "../aspects/AspectControl.h"
#include "../aspects/AspectFocus.h"
@@ -66,7 +65,6 @@
*/
class WidgetTextBoxBase :
// Aspect classes
- public AspectBorder< WidgetTextBoxBase >,
public AspectColor< WidgetTextBoxBase >,
public AspectColorCtlImpl<WidgetTextBoxBase>,
public AspectControl< WidgetTextBoxBase >,
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetTreeView.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetTreeView.h 2008-03-26 14:14:56 UTC (rev 1064)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetTreeView.h 2008-03-26 14:19:33 UTC (rev 1065)
@@ -31,7 +31,6 @@
#include "../Widget.h"
#include "../Rectangle.h"
#include "../resources/ImageList.h"
-#include "../aspects/AspectBorder.h"
#include "../aspects/AspectClickable.h"
#include "../aspects/AspectCollection.h"
#include "../aspects/AspectColor.h"
@@ -63,7 +62,6 @@
class WidgetTreeView :
// Aspects
- public AspectBorder< WidgetTreeView >,
public AspectClickable< WidgetTreeView >,
public AspectCollection<WidgetTreeView, HTREEITEM>,
public AspectColor<WidgetTreeView>,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
