linuxdcpp-team team mailing list archive
-
linuxdcpp-team team
-
Mailing list archive
-
Message #02263
[Branch ~dcplusplus-team/dcplusplus/trunk] Rev 2267: provide AspectPainting to every window
------------------------------------------------------------
revno: 2267
committer: poy <poy@xxxxxxxxxx>
branch nick: trunk
timestamp: Thu 2010-10-28 22:31:03 +0200
message:
provide AspectPainting to every window
modified:
dwt/include/dwt/widgets/Button.h
dwt/include/dwt/widgets/ComboBox.h
dwt/include/dwt/widgets/Control.h
dwt/include/dwt/widgets/DateTime.h
dwt/include/dwt/widgets/FolderDialog.h
dwt/include/dwt/widgets/GroupBox.h
dwt/include/dwt/widgets/Label.h
dwt/include/dwt/widgets/ProgressBar.h
dwt/include/dwt/widgets/Slider.h
dwt/include/dwt/widgets/Spinner.h
dwt/include/dwt/widgets/StatusBar.h
dwt/include/dwt/widgets/TabView.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 2010-02-11 21:44:13 +0000
+++ dwt/include/dwt/widgets/Button.h 2010-10-28 20:31:03 +0000
@@ -39,7 +39,6 @@
#include "../aspects/AspectColor.h"
#include "../aspects/AspectClickable.h"
#include "../aspects/AspectDblClickable.h"
-#include "../aspects/AspectPainting.h"
#include "../aspects/AspectText.h"
#include "Control.h"
@@ -52,7 +51,6 @@
public AspectColor<Button>,
public AspectColorCtlImpl<Button>,
public AspectDblClickable<Button>,
- public AspectPainting< Button >,
public AspectText< Button >
{
typedef CommonControl BaseType;
=== modified file 'dwt/include/dwt/widgets/ComboBox.h'
--- dwt/include/dwt/widgets/ComboBox.h 2010-06-30 14:40:00 +0000
+++ dwt/include/dwt/widgets/ComboBox.h 2010-10-28 20:31:03 +0000
@@ -41,7 +41,6 @@
#include "../aspects/AspectCollection.h"
#include "../aspects/AspectData.h"
#include "../aspects/AspectDblClickable.h"
-#include "../aspects/AspectPainting.h"
#include "../aspects/AspectSelection.h"
#include "../aspects/AspectText.h"
#include "../util/check.h"
@@ -66,7 +65,6 @@
public AspectColorCtlImpl<ComboBox>,
public AspectData<ComboBox, int>,
public AspectDblClickable< ComboBox >,
- public AspectPainting< ComboBox >,
public AspectSelection< ComboBox, int >,
public AspectText< ComboBox >
{
=== modified file 'dwt/include/dwt/widgets/Control.h'
--- dwt/include/dwt/widgets/Control.h 2010-07-10 14:36:48 +0000
+++ dwt/include/dwt/widgets/Control.h 2010-10-28 20:31:03 +0000
@@ -44,6 +44,7 @@
#include "../aspects/AspectHelp.h"
#include "../aspects/AspectKeyboard.h"
#include "../aspects/AspectMouse.h"
+#include "../aspects/AspectPainting.h"
#include "../aspects/AspectRaw.h"
#include "../aspects/AspectSizable.h"
#include "../aspects/AspectTimer.h"
@@ -65,6 +66,7 @@
public AspectHelp<Control>,
public AspectKeyboard<Control>,
public AspectMouse<Control>,
+ public AspectPainting<Control>,
public AspectRaw<Control>,
public AspectSizable<Control>,
public AspectTimer<Control>,
=== modified file 'dwt/include/dwt/widgets/DateTime.h'
--- dwt/include/dwt/widgets/DateTime.h 2010-07-10 14:36:48 +0000
+++ dwt/include/dwt/widgets/DateTime.h 2010-10-28 20:31:03 +0000
@@ -37,7 +37,6 @@
#define DWT_DateTime_h
#include "../aspects/AspectClickable.h"
-#include "../aspects/AspectPainting.h"
#include "../util/check.h"
#include "Control.h"
@@ -55,8 +54,7 @@
class DateTime :
public CommonControl,
// Aspects
- public AspectClickable< DateTime >,
- public AspectPainting< DateTime >
+ public AspectClickable< DateTime >
{
typedef CommonControl BaseType;
friend class WidgetCreator< DateTime >;
=== modified file 'dwt/include/dwt/widgets/FolderDialog.h'
--- dwt/include/dwt/widgets/FolderDialog.h 2010-02-11 21:44:13 +0000
+++ dwt/include/dwt/widgets/FolderDialog.h 2010-10-28 20:31:03 +0000
@@ -38,7 +38,7 @@
#include "../Widget.h"
#include "../tstring.h"
-#include <shlobj.h>
+#include <shlobj>
namespace dwt {
=== modified file 'dwt/include/dwt/widgets/GroupBox.h'
--- dwt/include/dwt/widgets/GroupBox.h 2010-02-11 21:44:13 +0000
+++ dwt/include/dwt/widgets/GroupBox.h 2010-10-28 20:31:03 +0000
@@ -48,7 +48,6 @@
#include "../aspects/AspectClickable.h"
#include "../aspects/AspectChild.h"
#include "../aspects/AspectDblClickable.h"
-#include "../aspects/AspectPainting.h"
#include "../aspects/AspectText.h"
#include "Control.h"
@@ -60,7 +59,6 @@
public AspectColor<GroupBox>,
public AspectColorCtlImpl<GroupBox>,
public AspectChild<GroupBox>,
- public AspectPainting< GroupBox >,
public AspectText< GroupBox >
{
typedef CommonControl BaseType;
=== modified file 'dwt/include/dwt/widgets/Label.h'
--- dwt/include/dwt/widgets/Label.h 2010-02-11 21:44:13 +0000
+++ dwt/include/dwt/widgets/Label.h 2010-10-28 20:31:03 +0000
@@ -39,7 +39,6 @@
#include "../aspects/AspectColor.h"
#include "../aspects/AspectClickable.h"
#include "../aspects/AspectDblClickable.h"
-#include "../aspects/AspectPainting.h"
#include "../aspects/AspectText.h"
#include "Control.h"
@@ -64,7 +63,6 @@
public AspectColor< Label >,
public AspectColorCtlImpl<Label>,
public AspectDblClickable< Label >,
- public AspectPainting< Label >,
public AspectText< Label >
{
typedef CommonControl BaseType;
=== modified file 'dwt/include/dwt/widgets/ProgressBar.h'
--- dwt/include/dwt/widgets/ProgressBar.h 2010-02-11 21:44:13 +0000
+++ dwt/include/dwt/widgets/ProgressBar.h 2010-10-28 20:31:03 +0000
@@ -36,7 +36,6 @@
#ifndef DWT_ProgressBar_h
#define DWT_ProgressBar_h
-#include "../aspects/AspectPainting.h"
#include "Control.h"
namespace dwt {
@@ -50,9 +49,7 @@
* jobs, often used when downloading from internet or installing applications etc.
*/
class ProgressBar :
- public CommonControl,
- // Aspects
- public AspectPainting< ProgressBar >
+ public CommonControl
{
typedef CommonControl BaseType;
=== modified file 'dwt/include/dwt/widgets/Slider.h'
--- dwt/include/dwt/widgets/Slider.h 2010-02-11 21:44:13 +0000
+++ dwt/include/dwt/widgets/Slider.h 2010-10-28 20:31:03 +0000
@@ -36,7 +36,6 @@
#ifndef DWT_Slider_h
#define DWT_Slider_h
-#include "../aspects/AspectPainting.h"
#include "../aspects/AspectScrollable.h"
#include "Control.h"
@@ -56,7 +55,6 @@
class Slider :
public CommonControl,
// Aspects
- public AspectPainting< Slider >,
public AspectScrollable< Slider >
{
typedef CommonControl BaseType;
=== modified file 'dwt/include/dwt/widgets/Spinner.h'
--- dwt/include/dwt/widgets/Spinner.h 2010-02-11 21:44:13 +0000
+++ dwt/include/dwt/widgets/Spinner.h 2010-10-28 20:31:03 +0000
@@ -36,7 +36,6 @@
#ifndef DWT_Spinner_h
#define DWT_Spinner_h
-#include "../aspects/AspectPainting.h"
#include "../aspects/AspectScrollable.h"
#include "Control.h"
#include "../Dispatchers.h"
@@ -57,7 +56,6 @@
class Spinner :
public CommonControl,
// Aspects
- public AspectPainting< Spinner >,
public AspectScrollable< Spinner >
{
typedef CommonControl BaseType;
=== modified file 'dwt/include/dwt/widgets/StatusBar.h'
--- dwt/include/dwt/widgets/StatusBar.h 2010-02-19 19:56:30 +0000
+++ dwt/include/dwt/widgets/StatusBar.h 2010-10-28 20:31:03 +0000
@@ -38,7 +38,6 @@
#include "../aspects/AspectClickable.h"
#include "../aspects/AspectDblClickable.h"
-#include "../aspects/AspectPainting.h"
#include "Control.h"
#include <vector>
@@ -64,8 +63,7 @@
// Aspects
public AspectClickable<StatusBar>,
- public AspectDblClickable<StatusBar>,
- public AspectPainting<StatusBar>
+ public AspectDblClickable<StatusBar>
{
typedef CommonControl BaseType;
typedef AspectClickable<StatusBar> ClickType;
=== modified file 'dwt/include/dwt/widgets/TabView.h'
--- dwt/include/dwt/widgets/TabView.h 2010-08-11 16:48:27 +0000
+++ dwt/include/dwt/widgets/TabView.h 2010-10-28 20:31:03 +0000
@@ -35,7 +35,6 @@
#include "../resources/ImageList.h"
#include "../Rectangle.h"
#include "../aspects/AspectCollection.h"
-#include "../aspects/AspectPainting.h"
#include "../aspects/AspectSelection.h"
#include "../aspects/AspectText.h"
#include "Control.h"
@@ -52,7 +51,6 @@
public CommonControl,
// Aspects
private AspectCollection<TabView, int>,
- public AspectPainting< TabView >,
public AspectSelection< TabView, int >,
public AspectText< TabView >
{