Menu
▾
▴
[Dcplusplus-commit] SF.net SVN: dcplusplus: [1153] dcplusplus/trunk
|
From: <arn...@us...> - 2008-04-14 20:23:32
|
Revision: 1153
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1153&view=rev
Author: arnetheduck
Date: 2008-04-14 13:23:20 -0700 (Mon, 14 Apr 2008)
Log Message:
-----------
consolidate basetype usage
Modified Paths:
--------------
dcplusplus/trunk/dwt/include/dwt/Dispatchers.h
dcplusplus/trunk/dwt/include/dwt/widgets/Button.h
dcplusplus/trunk/dwt/include/dwt/widgets/CheckBox.h
dcplusplus/trunk/dwt/include/dwt/widgets/ComboBox.h
dcplusplus/trunk/dwt/include/dwt/widgets/Container.h
dcplusplus/trunk/dwt/include/dwt/widgets/CoolBar.h
dcplusplus/trunk/dwt/include/dwt/widgets/DateTime.h
dcplusplus/trunk/dwt/include/dwt/widgets/Frame.h
dcplusplus/trunk/dwt/include/dwt/widgets/GroupBox.h
dcplusplus/trunk/dwt/include/dwt/widgets/Label.h
dcplusplus/trunk/dwt/include/dwt/widgets/MDIChild.h
dcplusplus/trunk/dwt/include/dwt/widgets/MDIFrame.h
dcplusplus/trunk/dwt/include/dwt/widgets/MDIParent.h
dcplusplus/trunk/dwt/include/dwt/widgets/ModalDialog.h
dcplusplus/trunk/dwt/include/dwt/widgets/ModelessDialog.h
dcplusplus/trunk/dwt/include/dwt/widgets/RadioButton.h
dcplusplus/trunk/dwt/include/dwt/widgets/StatusBar.h
dcplusplus/trunk/dwt/include/dwt/widgets/TabSheet.h
dcplusplus/trunk/dwt/include/dwt/widgets/TabView.h
dcplusplus/trunk/dwt/include/dwt/widgets/Table.h
dcplusplus/trunk/dwt/include/dwt/widgets/TextBox.h
dcplusplus/trunk/dwt/include/dwt/widgets/ToolBar.h
dcplusplus/trunk/dwt/include/dwt/widgets/ToolTip.h
dcplusplus/trunk/dwt/include/dwt/widgets/Tree.h
dcplusplus/trunk/win32/ADLSearchFrame.h
dcplusplus/trunk/win32/DirectoryListingFrame.h
dcplusplus/trunk/win32/FavHubsFrame.h
dcplusplus/trunk/win32/FinishedDLFrame.h
dcplusplus/trunk/win32/FinishedFrameBase.h
dcplusplus/trunk/win32/FinishedULFrame.h
dcplusplus/trunk/win32/MDIChildFrame.h
dcplusplus/trunk/win32/NotepadFrame.h
dcplusplus/trunk/win32/PrivateFrame.h
dcplusplus/trunk/win32/PublicHubsFrame.h
dcplusplus/trunk/win32/QueueFrame.h
dcplusplus/trunk/win32/SearchFrame.h
dcplusplus/trunk/win32/SpyFrame.h
dcplusplus/trunk/win32/StatsFrame.h
dcplusplus/trunk/win32/SystemFrame.h
dcplusplus/trunk/win32/TextFrame.h
dcplusplus/trunk/win32/TypedTable.h
dcplusplus/trunk/win32/TypedTree.h
dcplusplus/trunk/win32/UsersFrame.h
dcplusplus/trunk/win32/WaitingUsersFrame.h
dcplusplus/trunk/win32/WidgetPaned.h
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-04-10 12:24:47.999000072 +0200
committer: Jacek Sieka <arn...@gm...>
properties:
branch-nick: dcplusplus
+ timestamp: 2008-04-10 23:41:18.571000099 +0200
committer: Jacek Sieka <arn...@gm...>
properties:
branch-nick: dcplusplus
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
1046 arn...@gm...-20080326170438-uzl2rx8fqnohak7g
1047 zouzou123gen-20080326172821-d6uqcbmfb0c6rwlv
1048 arn...@gm...-20080326213257-qlgdh7m2712p2l0q
1049 arn...@gm...-20080326214313-ktnoekgk3s0wmatz
1050 arn...@gm...-20080326215256-0j1iqrf286b9g7zf
1051 arn...@gm...-20080327082121-hoi22wh1gwjdfbyd
1052 arn...@gm...-20080327120639-um3tukdt374rwvgm
1053 zouzou123gen-20080327130703-6vtek6uxy3vua543
1054 arn...@gm...-20080327215831-dmg5mkufskabwkro
1055 arn...@gm...-20080327231459-cdztcv25alsuyqmf
1056 arn...@gm...-20080328085925-gceybsr53oml1p24
1057 arn...@gm...-20080328200512-1sjuu6bcnl2dyd2a
1058 arn...@gm...-20080328210347-bussqjrm5mfswh7o
1059 arn...@gm...-20080329055630-braiir1dskv7a4qm
1060 arn...@gm...-20080329061558-rck8dz60wpj3c5ja
1061 arn...@gm...-20080329081253-if6o5jn329mbzfpl
1062 arn...@gm...-20080329081619-cb4x930j8sp55cs0
1063 arn...@gm...-20080329103216-hgjzo7ra2zixbztd
1064 arn...@gm...-20080329124042-q3aw4iodmo5kafyp
1065 arn...@gm...-20080329124926-2je1z18p0272zpua
1066 arn...@gm...-20080329150901-ehj9t32en7eps2dp
1067 zouzou123gen-20080329153653-36xlvpik2ns9r84r
1068 zouzou123gen-20080329162703-51xr8hg073pg7wq5
1069 zouzou123gen-20080329234706-8ddipdqu0xeudkql
1070 arn...@gm...-20080330081232-ubqr1171ewalrd4q
1071 zouzou123gen-20080330131607-yppbs3mgyjef1cux
1072 zouzou123gen-20080330134835-yv1nogy77ib1uehd
1073 zouzou123gen-20080331124549-alyw7vugdn30piqy
1074 zouzou123gen-20080331135108-q8frtqsin5bosfzm
1075 zouzou123gen-20080331140757-u94q52yccl5lsifk
1076 zouzou123gen-20080331152513-ue1x5qhigcw51348
1077 arn...@gm...-20080331184436-a8g6chibmg8nswls
1078 arn...@gm...-20080331220648-81485k28qmwruwz6
1079 zouzou123gen-20080401081001-2yjn07cf8s5sxr3a
1080 zouzou123gen-20080401081247-f3p4hdjojnd460jw
1081 zouzou123gen-20080401084117-24a454g8o0x656kg
1082 zouzou123gen-20080401133146-jabb5i8870fg6f66
1083 zouzou123gen-20080401154610-mxdqoo5bksru93e6
1084 arn...@gm...-20080401185530-lqj4tflt5ldmx46f
1085 arn...@gm...-20080401212616-ffl7m0xm8gt15knk
1086 arn...@gm...-20080402084515-ofmnwihzv159jton
1087 arn...@gm...-20080402133105-y70soi38owzl76i9
1088 arn...@gm...-20080402142417-rn2dbkx19wfz3vae
1089 arn...@gm...-20080402144459-u3z3hqvl8aqjc4a0
1090 zouzou123gen-20080402145051-zi8tmvy8u3r2mzu8
1091 arn...@gm...-20080402152137-f397uz1yp9qjvfwh
1092 zouzou123gen-20080402170355-29wda40wk3cy7lu5
1093 arn...@gm...-20080402180628-ipos9li0c4bsmq1h
1094 arn...@gm...-20080402181235-s2a6f4ww4lzayl46
1095 arn...@gm...-20080402193851-6mu64vgep6tijith
1096 arn...@gm...-20080402203810-86zpxsx69q83zf3r
1097 arn...@gm...-20080402204331-so2e8n892o23pejr
1098 poy-20080402224153-225qylr2cfwhqrg7
1099 mrmikejj-20080403125112-o8polh8rkn62umyh
1100 arn...@gm...-20080403125139-8xub76j1xazhfxna
1101 po...@12...-20080403140544-13kockkjho883nb4
1102 po...@12...-20080403143012-bxghtoodiolugpbs
1103 arn...@gm...-20080403190809-bbi4bz5rfcvjnt20
1104 arn...@gm...-20080403205410-czxru1vcg1s4wcws
1105 arn...@gm...-20080403213124-54spdrwszgyimd90
1106 po...@12...-20080404002406-aj74x5tngi6mmmj1
1107 arn...@gm...-20080404122415-mjy07qzbaxyhagra
1108 po...@12...-20080404145445-84lyk5tyy3b3br14
1109 po...@12...-20080404231417-v4v8x7u3f0hm0ejc
1110 po...@12...-20080405001107-14d1ojjof8xhvcj8
1111 arn...@gm...-20080405071929-jmnrul21sxx04kky
1112 arn...@gm...-20080405080105-9qbda7be0pi7y1ai
1113 po...@12...-20080405154555-yuj2n5kyndfjlpsf
1114 po...@12...-20080405220250-8y09d0samsj8ja94
1115 po...@12...-20080406134101-4860ytb61sbu3yhg
1116 po...@12...-20080406155849-2wzxzuzs5m8zpk0g
1117 po...@12...-20080406164835-bv5dydhm3qqydsty
1118 arn...@gm...-20080406210237-c7tyfgiz2sjgv044
1119 po...@12...-20080407114423-4yajg1rffidq76bj
1120 arn...@gm...-20080407194826-c42t4bjzw4vflejn
1121 po...@12...-20080407214303-o7ul1bvcn6gvaoc9
1122 po...@12...-20080407220647-r7f3em92til5j67s
1123 po...@12...-20080408212439-54t3bqlhvw1nu4xc
1124 arn...@gm...-20080409193708-y6erfzwrcb1seet3
1125 arn...@gm...-20080409195827-ub6t2s3wdf28nfpz
1126 po...@12...-20080409215055-1zmqhhm2859878c1
1127 arn...@gm...-20080410102447-l4es4cbukkqwcnpc
+ 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
1047 zouzou123gen-20080326172821-d6uqcbmfb0c6rwlv
1048 arn...@gm...-20080326213257-qlgdh7m2712p2l0q
1049 arn...@gm...-20080326214313-ktnoekgk3s0wmatz
1050 arn...@gm...-20080326215256-0j1iqrf286b9g7zf
1051 arn...@gm...-20080327082121-hoi22wh1gwjdfbyd
1052 arn...@gm...-20080327120639-um3tukdt374rwvgm
1053 zouzou123gen-20080327130703-6vtek6uxy3vua543
1054 arn...@gm...-20080327215831-dmg5mkufskabwkro
1055 arn...@gm...-20080327231459-cdztcv25alsuyqmf
1056 arn...@gm...-20080328085925-gceybsr53oml1p24
1057 arn...@gm...-20080328200512-1sjuu6bcnl2dyd2a
1058 arn...@gm...-20080328210347-bussqjrm5mfswh7o
1059 arn...@gm...-20080329055630-braiir1dskv7a4qm
1060 arn...@gm...-20080329061558-rck8dz60wpj3c5ja
1061 arn...@gm...-20080329081253-if6o5jn329mbzfpl
1062 arn...@gm...-20080329081619-cb4x930j8sp55cs0
1063 arn...@gm...-20080329103216-hgjzo7ra2zixbztd
1064 arn...@gm...-20080329124042-q3aw4iodmo5kafyp
1065 arn...@gm...-20080329124926-2je1z18p0272zpua
1066 arn...@gm...-20080329150901-ehj9t32en7eps2dp
1067 zouzou123gen-20080329153653-36xlvpik2ns9r84r
1068 zouzou123gen-20080329162703-51xr8hg073pg7wq5
1069 zouzou123gen-20080329234706-8ddipdqu0xeudkql
1070 arn...@gm...-20080330081232-ubqr1171ewalrd4q
1071 zouzou123gen-20080330131607-yppbs3mgyjef1cux
1072 zouzou123gen-20080330134835-yv1nogy77ib1uehd
1073 zouzou123gen-20080331124549-alyw7vugdn30piqy
1074 zouzou123gen-20080331135108-q8frtqsin5bosfzm
1075 zouzou123gen-20080331140757-u94q52yccl5lsifk
1076 zouzou123gen-20080331152513-ue1x5qhigcw51348
1077 arn...@gm...-20080331184436-a8g6chibmg8nswls
1078 arn...@gm...-20080331220648-81485k28qmwruwz6
1079 zouzou123gen-20080401081001-2yjn07cf8s5sxr3a
1080 zouzou123gen-20080401081247-f3p4hdjojnd460jw
1081 zouzou123gen-20080401084117-24a454g8o0x656kg
1082 zouzou123gen-20080401133146-jabb5i8870fg6f66
1083 zouzou123gen-20080401154610-mxdqoo5bksru93e6
1084 arn...@gm...-20080401185530-lqj4tflt5ldmx46f
1085 arn...@gm...-20080401212616-ffl7m0xm8gt15knk
1086 arn...@gm...-20080402084515-ofmnwihzv159jton
1087 arn...@gm...-20080402133105-y70soi38owzl76i9
1088 arn...@gm...-20080402142417-rn2dbkx19wfz3vae
1089 arn...@gm...-20080402144459-u3z3hqvl8aqjc4a0
1090 zouzou123gen-20080402145051-zi8tmvy8u3r2mzu8
1091 arn...@gm...-20080402152137-f397uz1yp9qjvfwh
1092 zouzou123gen-20080402170355-29wda40wk3cy7lu5
1093 arn...@gm...-20080402180628-ipos9li0c4bsmq1h
1094 arn...@gm...-20080402181235-s2a6f4ww4lzayl46
1095 arn...@gm...-20080402193851-6mu64vgep6tijith
1096 arn...@gm...-20080402203810-86zpxsx69q83zf3r
1097 arn...@gm...-20080402204331-so2e8n892o23pejr
1098 poy-20080402224153-225qylr2cfwhqrg7
1099 mrmikejj-20080403125112-o8polh8rkn62umyh
1100 arn...@gm...-20080403125139-8xub76j1xazhfxna
1101 po...@12...-20080403140544-13kockkjho883nb4
1102 po...@12...-20080403143012-bxghtoodiolugpbs
1103 arn...@gm...-20080403190809-bbi4bz5rfcvjnt20
1104 arn...@gm...-20080403205410-czxru1vcg1s4wcws
1105 arn...@gm...-20080403213124-54spdrwszgyimd90
1106 po...@12...-20080404002406-aj74x5tngi6mmmj1
1107 arn...@gm...-20080404122415-mjy07qzbaxyhagra
1108 po...@12...-20080404145445-84lyk5tyy3b3br14
1109 po...@12...-20080404231417-v4v8x7u3f0hm0ejc
1110 po...@12...-20080405001107-14d1ojjof8xhvcj8
1111 arn...@gm...-20080405071929-jmnrul21sxx04kky
1112 arn...@gm...-20080405080105-9qbda7be0pi7y1ai
1113 po...@12...-20080405154555-yuj2n5kyndfjlpsf
1114 po...@12...-20080405220250-8y09d0samsj8ja94
1115 po...@12...-20080406134101-4860ytb61sbu3yhg
1116 po...@12...-20080406155849-2wzxzuzs5m8zpk0g
1117 po...@12...-20080406164835-bv5dydhm3qqydsty
1118 arn...@gm...-20080406210237-c7tyfgiz2sjgv044
1119 po...@12...-20080407114423-4yajg1rffidq76bj
1120 arn...@gm...-20080407194826-c42t4bjzw4vflejn
1121 po...@12...-20080407214303-o7ul1bvcn6gvaoc9
1122 po...@12...-20080407220647-r7f3em92til5j67s
1123 po...@12...-20080408212439-54t3bqlhvw1nu4xc
1124 arn...@gm...-20080409193708-y6erfzwrcb1seet3
1125 arn...@gm...-20080409195827-ub6t2s3wdf28nfpz
1126 po...@12...-20080409215055-1zmqhhm2859878c1
1127 arn...@gm...-20080410102447-l4es4cbukkqwcnpc
1128 arn...@gm...-20080410214118-b70g50tl27cq9q29
Modified: dcplusplus/trunk/dwt/include/dwt/Dispatchers.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/Dispatchers.h 2008-04-14 20:19:59 UTC (rev 1152)
+++ dcplusplus/trunk/dwt/include/dwt/Dispatchers.h 2008-04-14 20:23:20 UTC (rev 1153)
@@ -53,8 +53,9 @@
}
template<typename P, P (*C)(const MSG&) = convert<P>, bool handled = true >
-struct ConvertBase : public Base<void(const P&)> {
+class ConvertBase : public Base<void(const P&)> {
typedef Base<void(const P&)> BaseType;
+public:
ConvertBase(const typename BaseType::F& f_) : BaseType(f_) { }
bool operator()(const MSG& msg, LRESULT& ret) {
Modified: dcplusplus/trunk/dwt/include/dwt/widgets/Button.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/widgets/Button.h 2008-04-14 20:19:59 UTC (rev 1152)
+++ dcplusplus/trunk/dwt/include/dwt/widgets/Button.h 2008-04-14 20:23:20 UTC (rev 1153)
@@ -59,6 +59,7 @@
public AspectPainting< Button >,
public AspectText< Button >
{
+ typedef CommonControl BaseType;
friend class AspectClickable<Button>;
friend class AspectDblClickable<Button>;
friend class WidgetCreator<Button>;
@@ -69,8 +70,6 @@
/// Object type
typedef ThisType* ObjectType;
- typedef CommonControl BaseType;
-
/// Seed class
/** This class contains all of the values needed to create the widget. It also
* knows the type of the class whose seed values it contains. Every widget
Modified: dcplusplus/trunk/dwt/include/dwt/widgets/CheckBox.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/widgets/CheckBox.h 2008-04-14 20:19:59 UTC (rev 1152)
+++ dcplusplus/trunk/dwt/include/dwt/widgets/CheckBox.h 2008-04-14 20:23:20 UTC (rev 1153)
@@ -53,7 +53,9 @@
// Aspect classes
public Button
{
+ typedef Button BaseType;
friend class WidgetCreator< CheckBox >;
+
public:
/// Class type
typedef CheckBox ThisType;
@@ -61,8 +63,6 @@
/// Object type
typedef ThisType* ObjectType;
- typedef Button BaseType;
-
/// Seed class
/** This class contains all of the values needed to create the widget. It also
* knows the type of the class whose seed values it contains. Every widget
Modified: dcplusplus/trunk/dwt/include/dwt/widgets/ComboBox.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/widgets/ComboBox.h 2008-04-14 20:19:59 UTC (rev 1152)
+++ dcplusplus/trunk/dwt/include/dwt/widgets/ComboBox.h 2008-04-14 20:23:20 UTC (rev 1153)
@@ -71,6 +71,7 @@
public AspectSelection< ComboBox, int >,
public AspectText< ComboBox >
{
+ typedef CommonControl BaseType;
friend class WidgetCreator< ComboBox >;
friend class AspectCollection<ComboBox, int>;
friend class AspectColor<ComboBox>;
@@ -85,7 +86,6 @@
/// Object type
typedef ThisType* ObjectType;
- typedef CommonControl BaseType;
/// Seed class
/** This class contains all of the values needed to create the widget. It also
Modified: dcplusplus/trunk/dwt/include/dwt/widgets/Container.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/widgets/Container.h 2008-04-14 20:19:59 UTC (rev 1152)
+++ dcplusplus/trunk/dwt/include/dwt/widgets/Container.h 2008-04-14 20:23:20 UTC (rev 1153)
@@ -43,14 +43,13 @@
class Container :
public Composite<Policies::Normal>
{
+ typedef Composite<Policies::Normal> BaseType;
friend class WidgetCreator<Container>;
public:
typedef Container ThisType;
typedef ThisType* ObjectType;
- typedef Composite<Policies::Normal> BaseType;
-
struct Seed : public BaseType::Seed {
typedef ThisType WidgetType;
Modified: dcplusplus/trunk/dwt/include/dwt/widgets/CoolBar.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/widgets/CoolBar.h 2008-04-14 20:19:59 UTC (rev 1152)
+++ dcplusplus/trunk/dwt/include/dwt/widgets/CoolBar.h 2008-04-14 20:23:20 UTC (rev 1153)
@@ -73,6 +73,7 @@
private AspectSizable< CoolBar >,
public AspectVisible< CoolBar >
{
+ typedef MessageMap<Policies::Subclassed> BaseType;
typedef dwt::AspectSizable< CoolBar > AspectSizable;
friend class WidgetCreator< CoolBar >;
public:
@@ -95,8 +96,6 @@
/// Object type
typedef ThisType* ObjectType;
- typedef MessageMap<Policies::Subclassed> BaseType;
-
/// Seed class
/** This class contains all of the values needed to create the widget. It also
* knows the type of the class whose seed values it contains. Every widget
Modified: dcplusplus/trunk/dwt/include/dwt/widgets/DateTime.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/widgets/DateTime.h 2008-04-14 20:19:59 UTC (rev 1152)
+++ dcplusplus/trunk/dwt/include/dwt/widgets/DateTime.h 2008-04-14 20:23:20 UTC (rev 1153)
@@ -61,6 +61,7 @@
public AspectFont< DateTime >,
public AspectPainting< DateTime >
{
+ typedef CommonControl BaseType;
friend class WidgetCreator< DateTime >;
friend class AspectClickable<DateTime>;
@@ -85,8 +86,6 @@
/// Object type
typedef ThisType* ObjectType;
- typedef CommonControl BaseType;
-
/// Seed class
/** This class contains all of the values needed to create the widget. It also
* knows the type of the class whose seed values it contains. Every widget
Modified: dcplusplus/trunk/dwt/include/dwt/widgets/Frame.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/widgets/Frame.h 2008-04-14 20:19:59 UTC (rev 1152)
+++ dcplusplus/trunk/dwt/include/dwt/widgets/Frame.h 2008-04-14 20:23:20 UTC (rev 1153)
@@ -73,6 +73,7 @@
public Composite< Policy >,
public AspectMinMax<Frame<Policy> >
{
+ typedef Composite< Policy > BaseType;
public:
/// Class type
typedef Frame< Policy > ThisType;
@@ -80,8 +81,6 @@
/// Object type
typedef ThisType * ObjectType;
- typedef Composite< Policy > BaseType;
-
#ifndef WINCE
/// Animates a window
/** Slides the window into view from either right or left depending on the
Modified: dcplusplus/trunk/dwt/include/dwt/widgets/GroupBox.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/widgets/GroupBox.h 2008-04-14 20:19:59 UTC (rev 1152)
+++ dcplusplus/trunk/dwt/include/dwt/widgets/GroupBox.h 2008-04-14 20:23:20 UTC (rev 1153)
@@ -51,6 +51,8 @@
class GroupBox :
public Button
{
+ typedef Button BaseType;
+
friend class WidgetCreator< GroupBox >;
public:
/// Class type
@@ -59,8 +61,6 @@
/// Object type
typedef ThisType* ObjectType;
- typedef Button BaseType;
-
/// Seed class
/** This class contains all of the values needed to create the widget. It also
* knows the type of the class whose seed values it contains. Every widget
Modified: dcplusplus/trunk/dwt/include/dwt/widgets/Label.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/widgets/Label.h 2008-04-14 20:19:59 UTC (rev 1152)
+++ dcplusplus/trunk/dwt/include/dwt/widgets/Label.h 2008-04-14 20:23:20 UTC (rev 1153)
@@ -72,6 +72,7 @@
public AspectPainting< Label >,
public AspectText< Label >
{
+ typedef CommonControl BaseType;
friend class WidgetCreator< Label >;
friend class AspectClickable<Label>;
friend class AspectDblClickable<Label>;
@@ -81,9 +82,7 @@
/// Object type
typedef ThisType* ObjectType;
-
- typedef CommonControl BaseType;
-
+
/// Seed class
/** This class contains all of the values needed to create the widget. It also
* knows the type of the class whose seed values it contains. Every widget
Modified: dcplusplus/trunk/dwt/include/dwt/widgets/MDIChild.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/widgets/MDIChild.h 2008-04-14 20:19:59 UTC (rev 1152)
+++ dcplusplus/trunk/dwt/include/dwt/widgets/MDIChild.h 2008-04-14 20:23:20 UTC (rev 1153)
@@ -68,8 +68,8 @@
public AspectMinMax<MDIChild>
{
+ typedef Composite<Policies::MDIChild> BaseType;
public:
- typedef Composite<Policies::MDIChild> BaseType;
/// Class type
typedef MDIChild ThisType;
Modified: dcplusplus/trunk/dwt/include/dwt/widgets/MDIFrame.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/widgets/MDIFrame.h 2008-04-14 20:19:59 UTC (rev 1152)
+++ dcplusplus/trunk/dwt/include/dwt/widgets/MDIFrame.h 2008-04-14 20:23:20 UTC (rev 1153)
@@ -55,6 +55,7 @@
class MDIFrame
: public Frame< Policies::MDIFrame<MDIFrame> >
{
+ typedef Frame< Policies::MDIFrame<MDIFrame> > BaseType;
public:
/// Class type
typedef MDIFrame ThisType;
@@ -62,7 +63,6 @@
/// Object type
typedef ThisType* ObjectType;
- typedef Frame< Policies::MDIFrame<MDIFrame> > BaseType;
/// Seed class
/** This class contains all of the values needed to create the widget. It also
Modified: dcplusplus/trunk/dwt/include/dwt/widgets/MDIParent.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/widgets/MDIParent.h 2008-04-14 20:19:59 UTC (rev 1152)
+++ dcplusplus/trunk/dwt/include/dwt/widgets/MDIParent.h 2008-04-14 20:23:20 UTC (rev 1153)
@@ -65,15 +65,14 @@
public Control< Policies::Subclassed >
{
+ typedef Control<Policies::Subclassed> BaseType;
friend class WidgetCreator< MDIParent >;
public:
/// Class type
typedef MDIParent ThisType;
/// Object type
- typedef ThisType * ObjectType;
-
- typedef Control<Policies::Subclassed> BaseType;
+ typedef ThisType * ObjectType;
/// Seed class
/** This class contains all of the values needed to create the widget. It also
Modified: dcplusplus/trunk/dwt/include/dwt/widgets/ModalDialog.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/widgets/ModalDialog.h 2008-04-14 20:19:59 UTC (rev 1152)
+++ dcplusplus/trunk/dwt/include/dwt/widgets/ModalDialog.h 2008-04-14 20:23:20 UTC (rev 1153)
@@ -64,6 +64,7 @@
public Frame< Policies::ModalDialog >,
public AspectDialog<ModalDialog >
{
+ typedef Frame< Policies::ModalDialog > BaseType;
struct Dispatcher
{
typedef std::tr1::function<bool ()> F;
@@ -79,7 +80,6 @@
};
public:
- typedef Frame< Policies::ModalDialog > BaseType;
/// Class type
typedef ModalDialog ThisType;
Modified: dcplusplus/trunk/dwt/include/dwt/widgets/ModelessDialog.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/widgets/ModelessDialog.h 2008-04-14 20:19:59 UTC (rev 1152)
+++ dcplusplus/trunk/dwt/include/dwt/widgets/ModelessDialog.h 2008-04-14 20:23:20 UTC (rev 1153)
@@ -54,6 +54,7 @@
public Frame< Policies::ModelessDialog >,
public AspectDialog<ModelessDialog >
{
+ typedef Frame< Policies::ModelessDialog > BaseType;
public:
/// Class type
typedef ModelessDialog ThisType;
@@ -61,7 +62,6 @@
/// Object type
typedef ThisType * ObjectType;
- typedef Frame< Policies::ModelessDialog > BaseType;
/// Creates a Dialog Window
/** This version creates a window from the given Dialog Resource Id.
*/
Modified: dcplusplus/trunk/dwt/include/dwt/widgets/RadioButton.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/widgets/RadioButton.h 2008-04-14 20:19:59 UTC (rev 1152)
+++ dcplusplus/trunk/dwt/include/dwt/widgets/RadioButton.h 2008-04-14 20:23:20 UTC (rev 1153)
@@ -52,9 +52,9 @@
* previously selected one.
*/
class RadioButton :
- // Aspects
public Button
{
+ typedef Button BaseType;
friend class WidgetCreator< RadioButton >;
public:
/// Class type
@@ -63,8 +63,6 @@
/// Object type
typedef ThisType* ObjectType;
- typedef Button BaseType;
-
/// Seed class
/** This class contains all of the values needed to create the widget. It also
* knows the type of the class whose seed values it contains. Every widget
Modified: dcplusplus/trunk/dwt/include/dwt/widgets/StatusBar.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/widgets/StatusBar.h 2008-04-14 20:19:59 UTC (rev 1152)
+++ dcplusplus/trunk/dwt/include/dwt/widgets/StatusBar.h 2008-04-14 20:23:20 UTC (rev 1153)
@@ -113,6 +113,7 @@
public AspectFont< StatusBar< TypeOfStatusBar > >,
public AspectPainting< StatusBar< TypeOfStatusBar > >
{
+ typedef CommonControl BaseType;
friend class WidgetCreator< StatusBar >;
friend class AspectClickable< StatusBar< TypeOfStatusBar > >;
friend class AspectDblClickable< StatusBar< TypeOfStatusBar > >;
@@ -123,8 +124,6 @@
/// Object type
typedef ThisType* ObjectType;
- typedef CommonControl BaseType;
-
/// Seed class
/** This class contains all of the values needed to create the widget. It also
* knows the type of the class whose seed values it contains. Every widget
Modified: dcplusplus/trunk/dwt/include/dwt/widgets/TabSheet.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/widgets/TabSheet.h 2008-04-14 20:19:59 UTC (rev 1152)
+++ dcplusplus/trunk/dwt/include/dwt/widgets/TabSheet.h 2008-04-14 20:23:20 UTC (rev 1153)
@@ -72,6 +72,7 @@
public AspectSelection< TabSheet, int >,
public AspectText< TabSheet >
{
+ typedef CommonControl BaseType;
friend class AspectCollection<TabSheet, int>;
friend class AspectSelection<TabSheet, int>;
friend class WidgetCreator< TabSheet >;
@@ -100,8 +101,6 @@
/// Object type
typedef ThisType* ObjectType;
- typedef CommonControl BaseType;
-
/// Seed class
/** This class contains all of the values needed to create the widget. It also
* knows the type of the class whose seed values it contains. Every widget
Modified: dcplusplus/trunk/dwt/include/dwt/widgets/TabView.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/widgets/TabView.h 2008-04-14 20:19:59 UTC (rev 1152)
+++ dcplusplus/trunk/dwt/include/dwt/widgets/TabView.h 2008-04-14 20:23:20 UTC (rev 1153)
@@ -50,6 +50,7 @@
public AspectRaw<TabView>,
public AspectSizable<TabView>
{
+ typedef MessageMap<Policies::Normal> BaseType;
typedef std::tr1::function<void (const SmartUtil::tstring&)> TitleChangedFunction;
typedef std::tr1::function<void (HWND, unsigned)> HelpFunction;
typedef std::tr1::function<bool (const ScreenCoordinate&)> ContextMenuFunction;
@@ -61,8 +62,6 @@
/// Object type
typedef ThisType* ObjectType;
- typedef MessageMap<Policies::Normal> BaseType;
-
struct Seed : public BaseType::Seed {
typedef ThisType WidgetType;
Modified: dcplusplus/trunk/dwt/include/dwt/widgets/Table.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/widgets/Table.h 2008-04-14 20:19:59 UTC (rev 1152)
+++ dcplusplus/trunk/dwt/include/dwt/widgets/Table.h 2008-04-14 20:23:20 UTC (rev 1153)
@@ -81,6 +81,8 @@
public AspectScrollable< Table >,
public AspectSelection< Table, int >
{
+ typedef CommonControl BaseType;
+
struct HeaderDispatcher {
typedef std::tr1::function<void (int)> F;
@@ -111,8 +113,6 @@
/// Object type
typedef ThisType* ObjectType;
- typedef CommonControl BaseType;
-
typedef std::tr1::function<int (LPARAM a, LPARAM b)> SortFunction;
/// Seed class
Modified: dcplusplus/trunk/dwt/include/dwt/widgets/TextBox.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/widgets/TextBox.h 2008-04-14 20:19:59 UTC (rev 1152)
+++ dcplusplus/trunk/dwt/include/dwt/widgets/TextBox.h 2008-04-14 20:23:20 UTC (rev 1153)
@@ -75,13 +75,13 @@
public AspectText< TextBoxBase >,
public AspectUpdate< TextBoxBase >
{
+ typedef CommonControl BaseType;
friend class WidgetCreator< TextBoxBase >;
friend class AspectUpdate<TextBoxBase>;
typedef Dispatchers::VoidVoid<> Dispatcher;
protected:
- typedef CommonControl BaseType;
public:
/// Sets the current selection of the Edit Control
@@ -194,6 +194,7 @@
class TextBox :
public TextBoxBase
{
+ typedef TextBoxBase BaseType;
public:
typedef TextBox ThisType;
Modified: dcplusplus/trunk/dwt/include/dwt/widgets/ToolBar.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/widgets/ToolBar.h 2008-04-14 20:19:59 UTC (rev 1152)
+++ dcplusplus/trunk/dwt/include/dwt/widgets/ToolBar.h 2008-04-14 20:23:20 UTC (rev 1153)
@@ -64,6 +64,7 @@
public AspectFocus< ToolBar >,
public AspectFont< ToolBar >
{
+ typedef CommonControl BaseType;
typedef Dispatchers::VoidVoid<> Dispatcher;
friend class WidgetCreator< ToolBar >;
public:
@@ -73,8 +74,6 @@
/// Object type
typedef ThisType* ObjectType;
- typedef CommonControl BaseType;
-
/// Seed class
/** This class contains all of the values needed to create the widget. It also
* knows the type of the class whose seed values it contains. Every widget
Modified: dcplusplus/trunk/dwt/include/dwt/widgets/ToolTip.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/widgets/ToolTip.h 2008-04-14 20:19:59 UTC (rev 1152)
+++ dcplusplus/trunk/dwt/include/dwt/widgets/ToolTip.h 2008-04-14 20:23:20 UTC (rev 1153)
@@ -49,6 +49,7 @@
public AspectRaw< ToolTip >,
public AspectVisible< ToolTip >
{
+ typedef MessageMap< Policies::Subclassed > BaseType;
friend class WidgetCreator< ToolTip >;
struct Dispatcher
@@ -73,8 +74,6 @@
/// Object type
typedef ThisType * ObjectType;
- typedef MessageMap< Policies::Subclassed > BaseType;
-
struct Seed : public BaseType::Seed {
typedef ThisType WidgetType;
Modified: dcplusplus/trunk/dwt/include/dwt/widgets/Tree.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/widgets/Tree.h 2008-04-14 20:19:59 UTC (rev 1152)
+++ dcplusplus/trunk/dwt/include/dwt/widgets/Tree.h 2008-04-14 20:23:20 UTC (rev 1153)
@@ -73,6 +73,7 @@
public AspectFont< Tree >,
public AspectSelection< Tree, HTREEITEM >
{
+ typedef CommonControl BaseType;
protected:
struct Dispatcher
{
@@ -109,8 +110,6 @@
/// Object type
typedef ThisType* ObjectType;
- typedef CommonControl BaseType;
-
/// Seed class
/** This class contains all of the values needed to create the widget. It also
* knows the type of the class whose seed values it contains. Every widget
Modified: dcplusplus/trunk/win32/ADLSearchFrame.h
===================================================================
--- dcplusplus/trunk/win32/ADLSearchFrame.h 2008-04-14 20:19:59 UTC (rev 1152)
+++ dcplusplus/trunk/win32/ADLSearchFrame.h 2008-04-14 20:23:20 UTC (rev 1153)
@@ -22,7 +22,10 @@
#include "StaticFrame.h"
#include <dcpp/ADLSearch.h>
-class ADLSearchFrame : public StaticFrame<ADLSearchFrame> {
+class ADLSearchFrame :
+ public StaticFrame<ADLSearchFrame>
+{
+ typedef StaticFrame<ADLSearchFrame> BaseType;
public:
enum Status {
STATUS_STATUS,
@@ -30,7 +33,6 @@
};
protected:
- typedef StaticFrame<ADLSearchFrame> BaseType;
friend class StaticFrame<ADLSearchFrame>;
friend class MDIChildFrame<ADLSearchFrame>;
Modified: dcplusplus/trunk/win32/DirectoryListingFrame.h
===================================================================
--- dcplusplus/trunk/win32/DirectoryListingFrame.h 2008-04-14 20:19:59 UTC (rev 1152)
+++ dcplusplus/trunk/win32/DirectoryListingFrame.h 2008-04-14 20:23:20 UTC (rev 1153)
@@ -33,6 +33,7 @@
public MDIChildFrame<DirectoryListingFrame>,
public AspectUserCommand<DirectoryListingFrame>
{
+ typedef MDIChildFrame<DirectoryListingFrame> BaseType;
public:
enum Status {
STATUS_STATUS,
@@ -53,7 +54,6 @@
static void closeAll();
protected:
- typedef MDIChildFrame<DirectoryListingFrame> BaseType;
friend class MDIChildFrame<DirectoryListingFrame>;
friend class AspectUserCommand<DirectoryListingFrame>;
Modified: dcplusplus/trunk/win32/FavHubsFrame.h
===================================================================
--- dcplusplus/trunk/win32/FavHubsFrame.h 2008-04-14 20:19:59 UTC (rev 1152)
+++ dcplusplus/trunk/win32/FavHubsFrame.h 2008-04-14 20:23:20 UTC (rev 1153)
@@ -28,6 +28,7 @@
public StaticFrame<FavHubsFrame>,
private FavoriteManagerListener
{
+ typedef StaticFrame<FavHubsFrame> BaseType;
public:
enum Status {
STATUS_STATUS,
@@ -35,7 +36,6 @@
};
protected:
- typedef StaticFrame<FavHubsFrame> BaseType;
friend class StaticFrame<FavHubsFrame>;
friend class MDIChildFrame<FavHubsFrame>;
Modified: dcplusplus/trunk/win32/FinishedDLFrame.h
===================================================================
--- dcplusplus/trunk/win32/FinishedDLFrame.h 2008-04-14 20:19:59 UTC (rev 1152)
+++ dcplusplus/trunk/win32/FinishedDLFrame.h 2008-04-14 20:23:20 UTC (rev 1153)
@@ -24,11 +24,11 @@
class FinishedDLFrame : public FinishedFrameBase<FinishedDLFrame, false>
{
+ typedef FinishedFrameBase<FinishedDLFrame, false> BaseType;
public:
FinishedDLFrame(dwt::TabView* mdiParent);
virtual ~FinishedDLFrame() { }
- typedef FinishedFrameBase<FinishedDLFrame, false> BaseType;
};
#endif // !defined(DCPLUSPLUS_WIN32_FINISHED_DL_FRAME_H)
Modified: dcplusplus/trunk/win32/FinishedFrameBase.h
===================================================================
--- dcplusplus/trunk/win32/FinishedFrameBase.h 2008-04-14 20:19:59 UTC (rev 1152)
+++ dcplusplus/trunk/win32/FinishedFrameBase.h 2008-04-14 20:23:20 UTC (rev 1153)
@@ -30,7 +30,11 @@
#include <dcpp/TimerManager.h>
template<class T, bool in_UL>
-class FinishedFrameBase : public StaticFrame<T>, private FinishedManagerListener {
+class FinishedFrameBase :
+ public StaticFrame<T>,
+ private FinishedManagerListener
+{
+ typedef StaticFrame<T> BaseType;
public:
enum Status {
STATUS_STATUS,
@@ -41,7 +45,6 @@
};
protected:
- typedef StaticFrame<T> BaseType;
typedef MDIChildFrame<T> MDIChildType;
friend class StaticFrame<T>;
friend class MDIChildFrame<T>;
Modified: dcplusplus/trunk/win32/FinishedULFrame.h
===================================================================
--- dcplusplus/trunk/win32/FinishedULFrame.h 2008-04-14 20:19:59 UTC (rev 1152)
+++ dcplusplus/trunk/win32/FinishedULFrame.h 2008-04-14 20:23:20 UTC (rev 1153)
@@ -24,11 +24,11 @@
class FinishedULFrame : public FinishedFrameBase<FinishedULFrame, true>
{
+ typedef FinishedFrameBase<FinishedULFrame, true> BaseType;
public:
FinishedULFrame(dwt::TabView* mdiParent);
virtual ~FinishedULFrame() { }
- typedef FinishedFrameBase<FinishedULFrame, true> BaseType;
};
#endif // !defined(DCPLUSPLUS_WIN32_FINISHED_UL_FRAME_H)
Modified: dcplusplus/trunk/win32/MDIChildFrame.h
===================================================================
--- dcplusplus/trunk/win32/MDIChildFrame.h 2008-04-14 20:19:59 UTC (rev 1152)
+++ dcplusplus/trunk/win32/MDIChildFrame.h 2008-04-14 20:23:20 UTC (rev 1153)
@@ -33,9 +33,9 @@
public AspectSpeaker<T>,
public AspectStatus<T>
{
+ typedef WidgetFactory< dwt::Container > BaseType;
public:
typedef MDIChildFrame<T> ThisType;
- typedef WidgetFactory< dwt::Container > BaseType;
protected:
MDIChildFrame(dwt::TabView* tabView, const tstring& title, unsigned helpId = 0, dwt::IconPtr icon = dwt::IconPtr(), bool activate = true) :
Modified: dcplusplus/trunk/win32/NotepadFrame.h
===================================================================
--- dcplusplus/trunk/win32/NotepadFrame.h 2008-04-14 20:19:59 UTC (rev 1152)
+++ dcplusplus/trunk/win32/NotepadFrame.h 2008-04-14 20:23:20 UTC (rev 1153)
@@ -22,7 +22,10 @@
#include "StaticFrame.h"
#include "resource.h"
-class NotepadFrame : public StaticFrame<NotepadFrame> {
+class NotepadFrame :
+ public StaticFrame<NotepadFrame>
+{
+ typedef StaticFrame<NotepadFrame> BaseType;
public:
enum Status {
STATUS_STATUS,
@@ -30,7 +33,6 @@
};
protected:
- typedef StaticFrame<NotepadFrame> BaseType;
friend class StaticFrame<NotepadFrame>;
friend class MDIChildFrame<NotepadFrame>;
Modified: dcplusplus/trunk/win32/PrivateFrame.h
===================================================================
--- dcplusplus/trunk/win32/PrivateFrame.h 2008-04-14 20:19:59 UTC (rev 1152)
+++ dcplusplus/trunk/win32/PrivateFrame.h 2008-04-14 20:23:20 UTC (rev 1153)
@@ -30,6 +30,7 @@
private ClientManagerListener,
public AspectUserCommand<PrivateFrame>
{
+ typedef MDIChildFrame<PrivateFrame> BaseType;
public:
enum Status {
STATUS_STATUS,
@@ -45,7 +46,6 @@
void sendMessage(const tstring& msg, bool thirdPerson = false);
private:
- typedef MDIChildFrame<PrivateFrame> BaseType;
friend class MDIChildFrame<PrivateFrame>;
friend class AspectUserCommand<PrivateFrame>;
Modified: dcplusplus/trunk/win32/PublicHubsFrame.h
===================================================================
--- dcplusplus/trunk/win32/PublicHubsFrame.h 2008-04-14 20:19:59 UTC (rev 1152)
+++ dcplusplus/trunk/win32/PublicHubsFrame.h 2008-04-14 20:23:20 UTC (rev 1153)
@@ -31,6 +31,7 @@
public StaticFrame<PublicHubsFrame>,
public FavoriteManagerListener
{
+ typedef StaticFrame<PublicHubsFrame> BaseType;
public:
enum Status {
STATUS_STATUS,
@@ -40,7 +41,6 @@
};
private:
- typedef StaticFrame<PublicHubsFrame> BaseType;
friend class StaticFrame<PublicHubsFrame>;
friend class MDIChildFrame<PublicHubsFrame>;
Modified: dcplusplus/trunk/win32/QueueFrame.h
===================================================================
--- dcplusplus/trunk/win32/QueueFrame.h 2008-04-14 20:19:59 UTC (rev 1152)
+++ dcplusplus/trunk/win32/QueueFrame.h 2008-04-14 20:23:20 UTC (rev 1153)
@@ -33,6 +33,7 @@
public StaticFrame<QueueFrame>,
private QueueManagerListener
{
+ typedef StaticFrame<QueueFrame> BaseType;
public:
enum Status {
STATUS_SHOW_TREE,
@@ -45,7 +46,6 @@
};
private:
- typedef StaticFrame<QueueFrame> BaseType;
friend class StaticFrame<QueueFrame>;
friend class MDIChildFrame<QueueFrame>;
Modified: dcplusplus/trunk/win32/SearchFrame.h
===================================================================
--- dcplusplus/trunk/win32/SearchFrame.h 2008-04-14 20:19:59 UTC (rev 1152)
+++ dcplusplus/trunk/win32/SearchFrame.h 2008-04-14 20:23:20 UTC (rev 1153)
@@ -35,6 +35,7 @@
public AspectUserInfo<SearchFrame>,
public AspectUserCommand<SearchFrame>
{
+ typedef MDIChildFrame<SearchFrame> BaseType;
public:
enum Status {
STATUS_SHOW_UI,
@@ -48,7 +49,6 @@
static void closeAll();
private:
- typedef MDIChildFrame<SearchFrame> BaseType;
friend class MDIChildFrame<SearchFrame>;
friend class AspectUserInfo<SearchFrame>;
friend class AspectUserCommand<SearchFrame>;
Modified: dcplusplus/trunk/win32/SpyFrame.h
===================================================================
--- dcplusplus/trunk/win32/SpyFrame.h 2008-04-14 20:19:59 UTC (rev 1152)
+++ dcplusplus/trunk/win32/SpyFrame.h 2008-04-14 20:23:20 UTC (rev 1153)
@@ -25,6 +25,7 @@
#include "resource.h"
class SpyFrame : public StaticFrame<SpyFrame>, private ClientManagerListener {
+ typedef StaticFrame<SpyFrame> BaseType;
public:
enum Status {
STATUS_IGNORE_TTH,
@@ -37,7 +38,6 @@
};
protected:
- typedef StaticFrame<SpyFrame> BaseType;
friend class StaticFrame<SpyFrame>;
friend class MDIChildFrame<SpyFrame>;
Modified: dcplusplus/trunk/win32/StatsFrame.h
===================================================================
--- dcplusplus/trunk/win32/StatsFrame.h 2008-04-14 20:19:59 UTC (rev 1152)
+++ dcplusplus/trunk/win32/StatsFrame.h 2008-04-14 20:23:20 UTC (rev 1153)
@@ -24,6 +24,7 @@
class StatsFrame : public StaticFrame<StatsFrame>
{
+ typedef StaticFrame<StatsFrame> BaseType;
public:
enum Stats {
STATUS_STATUS,
@@ -31,7 +32,6 @@
};
private:
- typedef StaticFrame<StatsFrame> BaseType;
friend class StaticFrame<StatsFrame>;
friend class MDIChildFrame<StatsFrame>;
Modified: dcplusplus/trunk/win32/SystemFrame.h
===================================================================
--- dcplusplus/trunk/win32/SystemFrame.h 2008-04-14 20:19:59 UTC (rev 1152)
+++ dcplusplus/trunk/win32/SystemFrame.h 2008-04-14 20:23:20 UTC (rev 1153)
@@ -27,6 +27,7 @@
class SystemFrame : public StaticFrame<SystemFrame>,
private LogManagerListener
{
+ typedef StaticFrame<SystemFrame> BaseType;
public:
enum Status {
STATUS_STATUS,
@@ -34,7 +35,6 @@
};
private:
- typedef StaticFrame<SystemFrame> BaseType;
friend class StaticFrame<SystemFrame>;
friend class MDIChildFrame<SystemFrame>;
Modified: dcplusplus/trunk/win32/TextFrame.h
===================================================================
--- dcplusplus/trunk/win32/TextFrame.h 2008-04-14 20:19:59 UTC (rev 1152)
+++ dcplusplus/trunk/win32/TextFrame.h 2008-04-14 20:23:20 UTC (rev 1153)
@@ -23,6 +23,7 @@
class TextFrame : public MDIChildFrame<TextFrame>
{
+ typedef MDIChildFrame<TextFrame> BaseType;
public:
TextFrame(dwt::TabView* mdiParent, const string& fileName);
enum Status {
@@ -31,7 +32,6 @@
};
private:
- typedef MDIChildFrame<TextFrame> BaseType;
friend class MDIChildFrame<TextFrame>;
TextBoxPtr pad;
Modified: dcplusplus/trunk/win32/TypedTable.h
===================================================================
--- dcplusplus/trunk/win32/TypedTable.h 2008-04-14 20:19:59 UTC (rev 1152)
+++ dcplusplus/trunk/win32/TypedTable.h 2008-04-14 20:23:20 UTC (rev 1153)
@@ -24,7 +24,6 @@
template<class ContentType, bool managed = true>
class TypedTable : public dwt::Table
{
-private:
typedef typename dwt::Table BaseType;
typedef TypedTable<ContentType, managed> ThisType;
Modified: dcplusplus/trunk/win32/TypedTree.h
===================================================================
--- dcplusplus/trunk/win32/TypedTree.h 2008-04-14 20:19:59 UTC (rev 1152)
+++ dcplusplus/trunk/win32/TypedTree.h 2008-04-14 20:23:20 UTC (rev 1153)
@@ -24,7 +24,6 @@
template<class ContentType>
class TypedTree : public dwt::Tree
{
-private:
typedef typename dwt::Tree BaseType;
typedef TypedTree<ContentType> ThisType;
Modified: dcplusplus/trunk/win32/UsersFrame.h
===================================================================
--- dcplusplus/trunk/win32/UsersFrame.h 2008-04-14 20:19:59 UTC (rev 1152)
+++ dcplusplus/trunk/win32/UsersFrame.h 2008-04-14 20:23:20 UTC (rev 1153)
@@ -33,6 +33,7 @@
private FavoriteManagerListener,
public AspectUserInfo<UsersFrame>
{
+ typedef StaticFrame<UsersFrame> BaseType;
public:
enum Status {
STATUS_STATUS,
@@ -40,7 +41,6 @@
};
protected:
- typedef StaticFrame<UsersFrame> BaseType;
friend class StaticFrame<UsersFrame>;
friend class MDIChildFrame<UsersFrame>;
friend class AspectUserInfo<UsersFrame>;
Modified: dcplusplus/trunk/win32/WaitingUsersFrame.h
===================================================================
--- dcplusplus/trunk/win32/WaitingUsersFrame.h 2008-04-14 20:19:59 UTC (rev 1152)
+++ dcplusplus/trunk/win32/WaitingUsersFrame.h 2008-04-14 20:23:20 UTC (rev 1153)
@@ -30,13 +30,13 @@
public StaticFrame<WaitingUsersFrame>,
public UploadManagerListener
{
+ typedef StaticFrame<WaitingUsersFrame> BaseType;
public:
enum Status {
STATUS_STATUS,
STATUS_LAST
};
protected:
- typedef StaticFrame<WaitingUsersFrame> BaseType;
friend class StaticFrame<WaitingUsersFrame>;
friend class MDIChildFrame<WaitingUsersFrame>;
Modified: dcplusplus/trunk/win32/WidgetPaned.h
===================================================================
--- dcplusplus/trunk/win32/WidgetPaned.h 2008-04-14 20:19:59 UTC (rev 1152)
+++ dcplusplus/trunk/win32/WidgetPaned.h 2008-04-14 20:23:20 UTC (rev 1153)
@@ -27,6 +27,7 @@
public dwt::AspectVisible< WidgetPaned< horizontal > >,
public dwt::AspectRaw< WidgetPaned< horizontal > >
{
+ typedef dwt::MessageMap< dwt::Policies::Normal > BaseType;
friend class dwt::WidgetCreator< WidgetPaned >;
public:
/// Class type
@@ -35,8 +36,6 @@
/// Object type
typedef ThisType * ObjectType;
- typedef dwt::MessageMap< dwt::Policies::Normal > BaseType;
-
struct Seed : public BaseType::Seed {
typedef ThisType WidgetType;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
