Menu
▾
▴
[Dcplusplus-commit] SF.net SVN: dcplusplus: [1071] dcplusplus/trunk
|
From: <arn...@us...> - 2008-03-29 06:11:16
|
Revision: 1071
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1071&view=rev
Author: arnetheduck
Date: 2008-03-28 23:11:15 -0700 (Fri, 28 Mar 2008)
Log Message:
-----------
Move AspectControl to widgets
Modified Paths:
--------------
dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectButton.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetComboBox.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetDateTimePicker.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/WidgetToolbar.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetTreeView.h
Added Paths:
-----------
dcplusplus/trunk/smartwin/include/smartwin/widgets/Control.h
Removed Paths:
-------------
dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectControl.h
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-03-26 17:48:01.759999990 +0100
committer: Jacek Sieka <arn...@gm...>
properties:
branch-nick: dcplusplus
+ timestamp: 2008-03-26 18:04:38.267999887 +0100
committer: Jacek Sieka <arn...@gm...>
properties:
branch-nick: dcplusplus
Name: bzr:file-ids
-
+ smartwin/include/smartwin/widgets/Control.h 844@f586c4b0-9d0d-0410-bc51-f1fe239209fc:dcplusplus%2Ftrunk:smartwin%2Finclude%2Fsmartwin%2Faspects%2FAspectControl.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
1040 arn...@gm...-20080325211747-nwwy1eb33r071sca
1041 arn...@gm...-20080326084110-qbselrjckku275xi
1042 zouzou123gen-20080326123631-35642mgbk2i4ty32
1043 zouzou123gen-20080326124345-f4xwn2d3ty8ubd6r
1044 arn...@gm...-20080326162031-il0nyms30w0mky43
1045 arn...@gm...-20080326164801-8dru8mjc06xgzjpv
+ 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
1041 arn...@gm...-20080326084110-qbselrjckku275xi
1042 zouzou123gen-20080326123631-35642mgbk2i4ty32
1043 zouzou123gen-20080326124345-f4xwn2d3ty8ubd6r
1044 arn...@gm...-20080326162031-il0nyms30w0mky43
1045 arn...@gm...-20080326164801-8dru8mjc06xgzjpv
1046 arn...@gm...-20080326170438-uzl2rx8fqnohak7g
Modified: dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectButton.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectButton.h 2008-03-29 06:10:14 UTC (rev 1070)
+++ dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectButton.h 2008-03-29 06:11:15 UTC (rev 1071)
@@ -3,12 +3,12 @@
#include "AspectColor.h"
#include "AspectClickable.h"
-#include "AspectControl.h"
#include "AspectDblClickable.h"
#include "AspectFocus.h"
#include "AspectFont.h"
#include "AspectPainting.h"
#include "AspectText.h"
+#include "../widgets/Control.h"
namespace SmartWin {
/** Common stuff for all buttons */
@@ -17,7 +17,7 @@
public AspectClickable<WidgetType>,
public AspectColor<WidgetType>,
public AspectColorCtlImpl<WidgetType>,
- public AspectControl,
+ public Control,
public AspectDblClickable<WidgetType>,
public AspectFocus< WidgetType >,
public AspectFont< WidgetType >,
@@ -54,7 +54,7 @@
template<typename WidgetType>
Message AspectButton<WidgetType>::getDblClickMessage() {
- return Message( WM_COMMAND, MAKEWPARAM(static_cast<WidgetType*>(this)->getControlId(), BN_CLICKED) );
+ return Message( WM_COMMAND, MAKEWPARAM(static_cast<WidgetType*>(this)->getControlId(), BN_DBLCLK) );
}
template<typename WidgetType>
Deleted: dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectControl.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectControl.h 2008-03-29 06:10:14 UTC (rev 1070)
+++ dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectControl.h 2008-03-29 06:11:15 UTC (rev 1071)
@@ -1,59 +0,0 @@
-#ifndef ASPECTCONTROL_H_
-#define ASPECTCONTROL_H_
-
-#include "../Policies.h"
-#include "../xCeption.h"
-
-#include "AspectBorder.h"
-#include "AspectContextMenu.h"
-#include "AspectEnabled.h"
-#include "AspectHelp.h"
-#include "AspectKeyboard.h"
-#include "AspectMouse.h"
-#include "AspectRaw.h"
-#include "AspectSizable.h"
-#include "AspectVisible.h"
-
-namespace SmartWin {
-
-/** This class is for all windows common controls */
-
-class AspectControl :
- public MessageMapPolicy< Policies::Subclassed >,
-
- public AspectBorder<AspectControl>,
- public AspectContextMenu<AspectControl>,
- public AspectEnabled<AspectControl>,
- public AspectHelp<AspectControl>,
- public AspectKeyboard<AspectControl>,
- public AspectMouse<AspectControl>,
- public AspectRaw<AspectControl>,
- public AspectSizable<AspectControl>,
- public AspectVisible<AspectControl>
-{
-public:
- unsigned int getControlId();
-
- virtual HWND create(const Seed& cs);
-protected:
- typedef AspectControl ControlType;
-
- AspectControl(Widget* parent);
-};
-
-inline AspectControl::AspectControl(Widget* parent) : PolicyType(parent) {
- xAssert( parent, _T( "Common Controls must have a parent" ) );
-}
-
-inline HWND AspectControl::create(const Seed& cs) {
- xAssert((cs.style & WS_CHILD) == WS_CHILD, _T("Common controls must have WS_CHILD style"));
- return PolicyType::create(cs);
-}
-
-inline unsigned int AspectControl::getControlId() {
- return static_cast<unsigned int>(::GetWindowLongPtr(handle(), GWLP_ID));
-}
-
-}
-
-#endif /*ASPECTCONTROL_H_*/
Copied: dcplusplus/trunk/smartwin/include/smartwin/widgets/Control.h (from rev 1070, dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectControl.h)
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/Control.h (rev 0)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/Control.h 2008-03-29 06:11:15 UTC (rev 1071)
@@ -0,0 +1,59 @@
+#ifndef CONTROL_H_
+#define CONTROL_H_
+
+#include "../Policies.h"
+#include "../xCeption.h"
+
+#include "../aspects/AspectBorder.h"
+#include "../aspects/AspectContextMenu.h"
+#include "../aspects/AspectEnabled.h"
+#include "../aspects/AspectHelp.h"
+#include "../aspects/AspectKeyboard.h"
+#include "../aspects/AspectMouse.h"
+#include "../aspects/AspectRaw.h"
+#include "../aspects/AspectSizable.h"
+#include "../aspects/AspectVisible.h"
+
+namespace SmartWin {
+
+/** Base class is for windows common controls */
+
+class Control :
+ public MessageMapPolicy< Policies::Subclassed >,
+
+ public AspectBorder<Control>,
+ public AspectContextMenu<Control>,
+ public AspectEnabled<Control>,
+ public AspectHelp<Control>,
+ public AspectKeyboard<Control>,
+ public AspectMouse<Control>,
+ public AspectRaw<Control>,
+ public AspectSizable<Control>,
+ public AspectVisible<Control>
+{
+public:
+ unsigned int getControlId();
+
+ virtual HWND create(const Seed& cs);
+protected:
+ typedef Control ControlType;
+
+ Control(Widget* parent);
+};
+
+inline Control::Control(Widget* parent) : PolicyType(parent) {
+ xAssert( parent, _T( "Common Controls must have a parent" ) );
+}
+
+inline HWND Control::create(const Seed& cs) {
+ xAssert((cs.style & WS_CHILD) == WS_CHILD, _T("Common controls must have WS_CHILD style"));
+ return PolicyType::create(cs);
+}
+
+inline unsigned int Control::getControlId() {
+ return static_cast<unsigned int>(::GetWindowLongPtr(handle(), GWLP_ID));
+}
+
+}
+
+#endif /*CONTROL_H_*/
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetComboBox.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetComboBox.h 2008-03-29 06:10:14 UTC (rev 1070)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetComboBox.h 2008-03-29 06:11:15 UTC (rev 1071)
@@ -32,13 +32,13 @@
#include "../aspects/AspectColor.h"
#include "../aspects/AspectClickable.h"
#include "../aspects/AspectCollection.h"
-#include "../aspects/AspectControl.h"
#include "../aspects/AspectDblClickable.h"
#include "../aspects/AspectFocus.h"
#include "../aspects/AspectFont.h"
#include "../aspects/AspectPainting.h"
#include "../aspects/AspectSelection.h"
#include "../aspects/AspectText.h"
+#include "Control.h"
namespace SmartWin
{
@@ -62,7 +62,7 @@
public AspectCollection<WidgetComboBox, int>,
public AspectColor< WidgetComboBox >,
public AspectColorCtlImpl<WidgetComboBox>,
- public AspectControl,
+ public Control,
public AspectDblClickable< WidgetComboBox >,
public AspectFocus< WidgetComboBox >,
public AspectFont< WidgetComboBox >,
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetDateTimePicker.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetDateTimePicker.h 2008-03-29 06:10:14 UTC (rev 1070)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetDateTimePicker.h 2008-03-29 06:11:15 UTC (rev 1071)
@@ -30,10 +30,10 @@
#include "../Widget.h"
#include "../aspects/AspectClickable.h"
-#include "../aspects/AspectControl.h"
#include "../aspects/AspectFocus.h"
#include "../aspects/AspectFont.h"
#include "../aspects/AspectPainting.h"
+#include "Control.h"
namespace SmartWin
{
@@ -54,9 +54,9 @@
* declare a point in time within 1800 - 2100
*/
class WidgetDateTimePicker :
+ public Control,
// Aspects
public AspectClickable< WidgetDateTimePicker >,
- public AspectControl,
public AspectFocus< WidgetDateTimePicker >,
public AspectFont< WidgetDateTimePicker >,
public AspectPainting< WidgetDateTimePicker >
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetListView.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetListView.h 2008-03-29 06:10:14 UTC (rev 1070)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetListView.h 2008-03-29 06:11:15 UTC (rev 1071)
@@ -35,13 +35,13 @@
#include "../aspects/AspectClickable.h"
#include "../aspects/AspectCollection.h"
#include "../aspects/AspectColor.h"
-#include "../aspects/AspectControl.h"
#include "../aspects/AspectData.h"
#include "../aspects/AspectDblClickable.h"
#include "../aspects/AspectFocus.h"
#include "../aspects/AspectFont.h"
#include "../aspects/AspectScrollable.h"
#include "../aspects/AspectSelection.h"
+#include "Control.h"
#include "WidgetListViewEditBox.h"
#include <vector>
@@ -68,11 +68,11 @@
* to "map" an LPARAM value to a physical rownumber and vice versa.
*/
class WidgetListView :
+ public Control,
// Aspect classes
public AspectClickable< WidgetListView >,
public AspectCollection<WidgetListView, int>,
public AspectColor<WidgetListView>,
- public AspectControl,
public AspectData<WidgetListView, int>,
public AspectDblClickable< WidgetListView >,
public AspectFocus< WidgetListView >,
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetProgressBar.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetProgressBar.h 2008-03-29 06:10:14 UTC (rev 1070)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetProgressBar.h 2008-03-29 06:11:15 UTC (rev 1071)
@@ -29,8 +29,8 @@
#define WidgetProgressBar_h
#include "../Widget.h"
-#include "../aspects/AspectControl.h"
#include "../aspects/AspectPainting.h"
+#include "Control.h"
namespace SmartWin
{
@@ -51,8 +51,8 @@
* jobs, often used when downloading from internet or installing applications etc.
*/
class WidgetProgressBar :
+ public Control,
// Aspects
- public AspectControl,
public AspectPainting< WidgetProgressBar >
{
friend class WidgetCreator< WidgetProgressBar >;
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetSlider.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetSlider.h 2008-03-29 06:10:14 UTC (rev 1070)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetSlider.h 2008-03-29 06:11:15 UTC (rev 1071)
@@ -29,10 +29,10 @@
#define WidgetSlider_h
#include "../Widget.h"
-#include "../aspects/AspectControl.h"
#include "../aspects/AspectFocus.h"
#include "../aspects/AspectPainting.h"
#include "../aspects/AspectScrollable.h"
+#include "Control.h"
namespace SmartWin
{
@@ -56,8 +56,8 @@
* the WidgetSpinner control, but have another visual appearance.
*/
class WidgetSlider :
+ public Control,
// Aspects
- public AspectControl,
public AspectFocus< WidgetSlider >,
public AspectPainting< WidgetSlider >,
public AspectScrollable< WidgetSlider >
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetSpinner.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetSpinner.h 2008-03-29 06:10:14 UTC (rev 1070)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetSpinner.h 2008-03-29 06:11:15 UTC (rev 1071)
@@ -29,10 +29,10 @@
#define WidgetSpinner_h
#include "../Widget.h"
-#include "../aspects/AspectControl.h"
#include "../aspects/AspectFocus.h"
#include "../aspects/AspectPainting.h"
#include "../aspects/AspectScrollable.h"
+#include "Control.h"
namespace SmartWin
{
@@ -54,8 +54,8 @@
* other for softer.
*/
class WidgetSpinner :
+ public Control,
// Aspects
- public AspectControl,
public AspectFocus< WidgetSpinner >,
public AspectPainting< WidgetSpinner >,
public AspectScrollable< WidgetSpinner >
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetStatic.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetStatic.h 2008-03-29 06:10:14 UTC (rev 1070)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetStatic.h 2008-03-29 06:11:15 UTC (rev 1071)
@@ -31,13 +31,13 @@
#include "../Widget.h"
#include "../aspects/AspectColor.h"
#include "../aspects/AspectClickable.h"
-#include "../aspects/AspectControl.h"
#include "../aspects/AspectDblClickable.h"
#include "../aspects/AspectFocus.h"
#include "../aspects/AspectFont.h"
#include "../aspects/AspectPainting.h"
#include "../aspects/AspectText.h"
#include "../resources/Bitmap.h"
+#include "Control.h"
namespace SmartWin
{
@@ -60,11 +60,11 @@
* It can load a bitmap.
*/
class WidgetStatic :
+ public Control,
// Aspects
public AspectClickable< WidgetStatic >,
public AspectColor< WidgetStatic >,
public AspectColorCtlImpl<WidgetStatic>,
- public AspectControl,
public AspectDblClickable< WidgetStatic >,
public AspectFocus< WidgetStatic >,
public AspectFont< WidgetStatic >,
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetStatusBar.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetStatusBar.h 2008-03-29 06:10:14 UTC (rev 1070)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetStatusBar.h 2008-03-29 06:11:15 UTC (rev 1071)
@@ -30,11 +30,11 @@
#include "../Widget.h"
#include "../aspects/AspectClickable.h"
-#include "../aspects/AspectControl.h"
#include "../aspects/AspectDblClickable.h"
#include "../aspects/AspectFont.h"
#include "../aspects/AspectPainting.h"
#include "../aspects/AspectText.h"
+#include "Control.h"
namespace SmartWin
{
@@ -104,10 +104,10 @@
template< class TypeOfStatusBar = NoSection >
class WidgetStatusBar :
public TypeOfStatusBar,
+ public Control,
// Aspects
public AspectClickable< WidgetStatusBar< TypeOfStatusBar > >,
- public AspectControl,
public AspectDblClickable< WidgetStatusBar< TypeOfStatusBar > >,
public AspectFont< WidgetStatusBar< TypeOfStatusBar > >,
public AspectPainting< WidgetStatusBar< TypeOfStatusBar > >
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetTabSheet.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetTabSheet.h 2008-03-29 06:10:14 UTC (rev 1070)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetTabSheet.h 2008-03-29 06:11:15 UTC (rev 1071)
@@ -32,12 +32,12 @@
#include "../resources/ImageList.h"
#include "../Rectangle.h"
#include "../aspects/AspectCollection.h"
-#include "../aspects/AspectControl.h"
#include "../aspects/AspectFocus.h"
#include "../aspects/AspectFont.h"
#include "../aspects/AspectPainting.h"
#include "../aspects/AspectSelection.h"
#include "../aspects/AspectText.h"
+#include "Control.h"
namespace SmartWin
{
@@ -63,9 +63,9 @@
* has.
*/
class WidgetTabSheet :
+ public Control,
// Aspects
public AspectCollection<WidgetTabSheet, int>,
- public AspectControl,
public AspectFocus< WidgetTabSheet >,
public AspectFont< WidgetTabSheet >,
public AspectPainting< WidgetTabSheet >,
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetTextBox.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetTextBox.h 2008-03-29 06:10:14 UTC (rev 1070)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetTextBox.h 2008-03-29 06:11:15 UTC (rev 1071)
@@ -30,12 +30,12 @@
#include "../Widget.h"
#include "../aspects/AspectColor.h"
-#include "../aspects/AspectControl.h"
#include "../aspects/AspectFocus.h"
#include "../aspects/AspectFont.h"
#include "../aspects/AspectScrollable.h"
#include "../aspects/AspectText.h"
#include "../aspects/AspectUpdate.h"
+#include "Control.h"
namespace SmartWin
{
@@ -64,10 +64,10 @@
* < ul > < li >WidgetRichTextBox< /li > < /ul >
*/
class WidgetTextBoxBase :
+ public Control,
// Aspect classes
public AspectColor< WidgetTextBoxBase >,
public AspectColorCtlImpl<WidgetTextBoxBase>,
- public AspectControl,
public AspectFocus< WidgetTextBoxBase >,
public AspectFont< WidgetTextBoxBase >,
public AspectScrollable< WidgetTextBoxBase >,
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetToolbar.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetToolbar.h 2008-03-29 06:10:14 UTC (rev 1070)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetToolbar.h 2008-03-29 06:11:15 UTC (rev 1071)
@@ -33,10 +33,10 @@
#include "../Widget.h"
#include "../Rectangle.h"
#include "../Dispatchers.h"
-#include "../aspects/AspectControl.h"
#include "../aspects/AspectFocus.h"
#include "../aspects/AspectFont.h"
#include "../resources/ImageList.h"
+#include "Control.h"
namespace SmartWin
{
@@ -57,8 +57,8 @@
* to view the log of URL's you have been to etc...
*/
class WidgetToolbar :
+ public Control,
// Aspects
- public AspectControl,
public AspectFocus< WidgetToolbar >,
public AspectFont< WidgetToolbar >
{
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetTreeView.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetTreeView.h 2008-03-29 06:10:14 UTC (rev 1070)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetTreeView.h 2008-03-29 06:11:15 UTC (rev 1071)
@@ -34,12 +34,12 @@
#include "../aspects/AspectClickable.h"
#include "../aspects/AspectCollection.h"
#include "../aspects/AspectColor.h"
-#include "../aspects/AspectControl.h"
#include "../aspects/AspectData.h"
#include "../aspects/AspectDblClickable.h"
#include "../aspects/AspectFocus.h"
#include "../aspects/AspectFont.h"
#include "../aspects/AspectSelection.h"
+#include "Control.h"
namespace SmartWin
{
@@ -61,11 +61,11 @@
*/
class WidgetTreeView :
+ public Control,
// Aspects
public AspectClickable< WidgetTreeView >,
public AspectCollection<WidgetTreeView, HTREEITEM>,
public AspectColor<WidgetTreeView>,
- public AspectControl,
public AspectData<WidgetTreeView, HTREEITEM>,
public AspectDblClickable< WidgetTreeView >,
public AspectFocus< WidgetTreeView >,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
