Menu
▾
▴
[Dcplusplus-commit] SF.net SVN: dcplusplus: [1108] dcplusplus/trunk
|
From: <arn...@us...> - 2008-04-07 19:18:25
|
Revision: 1108
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1108&view=rev
Author: arnetheduck
Date: 2008-04-07 12:17:43 -0700 (Mon, 07 Apr 2008)
Log Message:
-----------
fix errors, more addChild&Seed stuff; now compiles and runs
Modified Paths:
--------------
dcplusplus/trunk/smartwin/include/smartwin/widgets/Button.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/CheckBox.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/Container.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/Control.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/TabSheet.h
dcplusplus/trunk/smartwin/source/widgets/TabSheet.cpp
dcplusplus/trunk/win32/DirectoryListingFrame.cpp
dcplusplus/trunk/win32/FinishedFrameBase.h
dcplusplus/trunk/win32/HubFrame.cpp
dcplusplus/trunk/win32/PublicHubsFrame.cpp
dcplusplus/trunk/win32/QueueFrame.cpp
dcplusplus/trunk/win32/SearchFrame.cpp
dcplusplus/trunk/win32/TransferView.cpp
dcplusplus/trunk/win32/TypedTable.h
dcplusplus/trunk/win32/TypedTree.h
dcplusplus/trunk/win32/UsersFrame.cpp
dcplusplus/trunk/win32/WidgetPaned.h
dcplusplus/trunk/win32/WinUtil.cpp
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-04-01 15:31:46.911999941 +0200
committer: zouzou123gen
properties:
branch-nick: bzr
+ timestamp: 2008-04-01 17:46:10.145999908 +0200
committer: zouzou123gen
properties:
branch-nick: bzr
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
+ 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
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/Button.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/Button.h 2008-04-07 19:14:27 UTC (rev 1107)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/Button.h 2008-04-07 19:17:43 UTC (rev 1108)
@@ -85,7 +85,7 @@
template<typename SeedType>
void Button::create( const SeedType & cs ) {
- ControlType::create(cs);
+ BaseType::create(cs);
if(cs.font)
setFont( cs.font );
}
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/CheckBox.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/CheckBox.h 2008-04-07 19:14:27 UTC (rev 1107)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/CheckBox.h 2008-04-07 19:17:43 UTC (rev 1108)
@@ -69,8 +69,6 @@
*/
struct Seed : public BaseType::Seed {
typedef ThisType WidgetType;
-
- FontPtr font;
/// Fills with default parameters
Seed(const SmartUtil::tstring& caption_ = SmartUtil::tstring());
@@ -111,7 +109,7 @@
}
inline CheckBox::CheckBox( SmartWin::Widget * parent )
- : ButtonType( parent )
+ : BaseType( parent )
{
}
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/Container.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/Container.h 2008-04-07 19:14:27 UTC (rev 1107)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/Container.h 2008-04-07 19:17:43 UTC (rev 1108)
@@ -30,7 +30,7 @@
Container(Widget* parent) : BaseType(parent) { }
};
-inline Container::Seed::Seed() : BaseType::Seed(NULL, WS_CHILD | WS_CLIPSIBLINGS, 0) {
+inline Container::Seed::Seed() : BaseType::Seed(SmartUtil::tstring(), WS_CHILD | WS_CLIPSIBLINGS, 0) {
}
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/Control.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/Control.h 2008-04-07 19:14:27 UTC (rev 1107)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/Control.h 2008-04-07 19:17:43 UTC (rev 1108)
@@ -51,7 +51,7 @@
typedef Control<Policies::Subclassed> CommonControl;
template<typename Policy>
-Control<Policy>::Control(Widget* parent) : MessageMap<Policy>(parent) {
+Control<Policy>::Control(Widget* parent) : BaseType(parent) {
}
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/TabSheet.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/TabSheet.h 2008-04-07 19:14:27 UTC (rev 1107)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/TabSheet.h 2008-04-07 19:17:43 UTC (rev 1108)
@@ -124,7 +124,6 @@
* should define one of these.
*/
struct Seed : public BaseType::Seed {
- public:
typedef ThisType WidgetType;
FontPtr font;
@@ -332,7 +331,7 @@
}
inline TabSheet::TabSheet( SmartWin::Widget * parent )
- : ControlType( parent )
+ : BaseType( parent )
{
}
Modified: dcplusplus/trunk/smartwin/source/widgets/TabSheet.cpp
===================================================================
--- dcplusplus/trunk/smartwin/source/widgets/TabSheet.cpp 2008-04-07 19:14:27 UTC (rev 1107)
+++ dcplusplus/trunk/smartwin/source/widgets/TabSheet.cpp 2008-04-07 19:17:43 UTC (rev 1108)
@@ -10,7 +10,7 @@
void TabSheet::create( const Seed & cs )
{
- ControlType::create(cs);
+ BaseType::create(cs);
if(cs.font)
setFont( cs.font );
}
Modified: dcplusplus/trunk/win32/DirectoryListingFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/DirectoryListingFrame.cpp 2008-04-07 19:14:27 UTC (rev 1107)
+++ dcplusplus/trunk/win32/DirectoryListingFrame.cpp 2008-04-07 19:17:43 UTC (rev 1108)
@@ -127,7 +127,7 @@
paned->setRelativePos(0.3);
{
- dirs = SmartWin::WidgetCreator<WidgetDirs>::create(this, WinUtil::Seeds::treeView);
+ dirs = addChild(WidgetDirs::Seed());
dirs->setHelpId(IDH_FILE_LIST_DIRS);
addWidget(dirs);
paned->setFirst(dirs);
@@ -137,7 +137,7 @@
}
{
- files = SmartWin::WidgetCreator<WidgetFiles>::create(this, WinUtil::Seeds::Table);
+ files = addChild(WidgetFiles::Seed());
files->setHelpId(IDH_FILE_LIST_FILES);
addWidget(files);
paned->setSecond(files);
Modified: dcplusplus/trunk/win32/FinishedFrameBase.h
===================================================================
--- dcplusplus/trunk/win32/FinishedFrameBase.h 2008-04-07 19:14:27 UTC (rev 1107)
+++ dcplusplus/trunk/win32/FinishedFrameBase.h 2008-04-07 19:17:43 UTC (rev 1108)
@@ -54,10 +54,7 @@
totalTime(0)
{
{
- typename MDIChildType::Table::Seed cs;
- cs.style = WS_CHILD | WS_VISIBLE | WS_HSCROLL | WS_VSCROLL | LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS;
- cs.exStyle = WS_EX_CLIENTEDGE;
- items = SmartWin::WidgetCreator<WidgetItems>::create(static_cast<T*>(this), cs);
+ items = static_cast<T*>(this)->addChild(typename WidgetItems::Seed());
items->setTableStyle(LVS_EX_LABELTIP | LVS_EX_HEADERDRAGDROP | LVS_EX_FULLROWSELECT);
addWidget(items);
Modified: dcplusplus/trunk/win32/HubFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/HubFrame.cpp 2008-04-07 19:14:27 UTC (rev 1107)
+++ dcplusplus/trunk/win32/HubFrame.cpp 2008-04-07 19:17:43 UTC (rev 1108)
@@ -137,7 +137,7 @@
}
{
- users = SmartWin::WidgetCreator<WidgetUsers>::create(this, WinUtil::Seeds::Table);
+ users = addChild(WidgetUsers::Seed());
addWidget(users);
paned->setSecond(users);
Modified: dcplusplus/trunk/win32/PublicHubsFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/PublicHubsFrame.cpp 2008-04-07 19:14:27 UTC (rev 1107)
+++ dcplusplus/trunk/win32/PublicHubsFrame.cpp 2008-04-07 19:17:43 UTC (rev 1108)
@@ -103,9 +103,9 @@
users(0)
{
{
- Table::Seed cs = WinUtil::Seeds::Table;
+ WidgetHubs::Seed cs;
cs.style |= LVS_SINGLESEL;
- hubs = SmartWin::WidgetCreator<WidgetHubs>::create(this, cs);
+ hubs = addChild(cs);
addWidget(hubs);
hubs->createColumns(WinUtil::getStrings(columnNames));
Modified: dcplusplus/trunk/win32/QueueFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/QueueFrame.cpp 2008-04-07 19:14:27 UTC (rev 1107)
+++ dcplusplus/trunk/win32/QueueFrame.cpp 2008-04-07 19:17:43 UTC (rev 1108)
@@ -65,10 +65,11 @@
queueItems(0),
fileLists(0)
{
- paned = createVPaned();
+ paned = addChild(WidgetVPaned::Seed());
paned->setRelativePos(0.3);
+
{
- dirs = SmartWin::WidgetCreator<WidgetDirs>::create(this, WinUtil::Seeds::treeView);
+ dirs = addChild(WidgetDirs::Seed());
addWidget(dirs);
paned->setFirst(dirs);
@@ -80,7 +81,7 @@
}
{
- files = SmartWin::WidgetCreator<WidgetFiles>::create(this, WinUtil::Seeds::Table);
+ files = addChild(WidgetFiles::Seed());
addWidget(files, true);
paned->setSecond(files);
Modified: dcplusplus/trunk/win32/SearchFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/SearchFrame.cpp 2008-04-07 19:14:27 UTC (rev 1107)
+++ dcplusplus/trunk/win32/SearchFrame.cpp 2008-04-07 19:17:43 UTC (rev 1108)
@@ -213,10 +213,10 @@
}
{
- Table::Seed cs = WinUtil::Seeds::Table;
+ WidgetHubs::Seed cs;
cs.style |= LVS_NOCOLUMNHEADER;
cs.lvStyle |= LVS_EX_CHECKBOXES;
- hubs = SmartWin::WidgetCreator<WidgetHubs>::create(this, cs);
+ hubs = addChild(cs);
hubs->setHelpId(IDH_SEARCH_HUBS);
addWidget(hubs);
@@ -231,7 +231,7 @@
}
{
- results = SmartWin::WidgetCreator<WidgetResults>::create(this, WinUtil::Seeds::Table);
+ results = addChild(WidgetResults::Seed());
addWidget(results);
results->createColumns(WinUtil::getStrings(columnNames));
Modified: dcplusplus/trunk/win32/TransferView.cpp
===================================================================
--- dcplusplus/trunk/win32/TransferView.cpp 2008-04-07 19:14:27 UTC (rev 1107)
+++ dcplusplus/trunk/win32/TransferView.cpp 2008-04-07 19:17:43 UTC (rev 1108)
@@ -72,23 +72,20 @@
{
TabSheet::Seed tcs;
- tcs.style = WS_CHILD | WS_CLIPCHILDREN | WS_VISIBLE |
- TCS_HOTTRACK | TCS_RAGGEDRIGHT | TCS_TOOLTIPS | TCS_FOCUSNEVER;
+ tcs.style |= TCS_HOTTRACK | TCS_RAGGEDRIGHT | TCS_FOCUSNEVER;
tabs = addChild(tcs);
tabs->onSelectionChanged(std::tr1::bind(&TransferView::handleTabSelected, this));
}
{
Container::Seed cs;
- cs.style |= WS_CLIPCHILDREN | WS_VISIBLE;
+ cs.style |= WS_VISIBLE;
cs.caption = T_("Connections");
cs.background = (HBRUSH)(COLOR_3DFACE + 1);
cs.location = tabs->getUsableArea(true);
-
connectionsWindow = SmartWin::WidgetCreator<Container>::create(tabs, cs);
-
tabs->addPage(T_("Connections"), 0);
-
+
cs.style &= ~WS_VISIBLE;
cs.caption = T_("Downloads");
downloadsWindow = SmartWin::WidgetCreator<Container>::create(tabs, cs);
@@ -101,7 +98,7 @@
arrows->add(tmp, RGB(255, 0, 255));
}
{
- connections = SmartWin::WidgetCreator<WidgetConnections>::create(connectionsWindow, WinUtil::Seeds::Table);
+ connections = connectionsWindow->addChild(WidgetConnections::Seed());
connections->setSmallImageList(arrows);
connections->createColumns(WinUtil::getStrings(connectionNames));
@@ -115,7 +112,7 @@
}
{
- downloads = SmartWin::WidgetCreator<WidgetDownloads>::create(downloadsWindow, WinUtil::Seeds::Table);
+ downloads = downloadsWindow->addChild(WidgetDownloads::Seed());
downloads->createColumns(WinUtil::getStrings(downloadNames));
downloads->setColumnOrder(WinUtil::splitTokens(SETTING(DOWNLOADS_ORDER), downloadIndexes));
Modified: dcplusplus/trunk/win32/TypedTable.h
===================================================================
--- dcplusplus/trunk/win32/TypedTable.h 2008-04-07 19:14:27 UTC (rev 1107)
+++ dcplusplus/trunk/win32/TypedTable.h 2008-04-07 19:17:43 UTC (rev 1108)
@@ -19,7 +19,7 @@
#ifndef DCPLUSPLUS_WIN32_TYPED_LIST_VIEW_H
#define DCPLUSPLUS_WIN32_TYPED_LIST_VIEW_H
-#include <dcpp/Util.h>
+#include "WinUtil.h"
template<class ContentType, bool managed = true>
class TypedTable : public SmartWin::Table
@@ -34,7 +34,19 @@
explicit TypedTable( SmartWin::Widget * parent ) : BaseType(parent) {
}
-
+
+ struct Seed : public BaseType::Seed {
+ typedef ThisType WidgetType;
+
+ Seed() : BaseType::Seed() {
+ // @todo find a better way to directly use styles set in WinUtil...
+ style = WinUtil::Seeds::Table.style;
+ exStyle = WinUtil::Seeds::Table.exStyle;
+ lvStyle = WinUtil::Seeds::Table.lvStyle;
+ font = WinUtil::Seeds::Table.font;
+ }
+ };
+
~TypedTable() {
if(managed)
this->clear();
Modified: dcplusplus/trunk/win32/TypedTree.h
===================================================================
--- dcplusplus/trunk/win32/TypedTree.h 2008-04-07 19:14:27 UTC (rev 1107)
+++ dcplusplus/trunk/win32/TypedTree.h 2008-04-07 19:17:43 UTC (rev 1108)
@@ -19,6 +19,7 @@
#ifndef DCPLUSPLUS_WIN32_TYPED_TREE_VIEW_H
#define DCPLUSPLUS_WIN32_TYPED_TREE_VIEW_H
+#include "WinUtil.h"
template<class ContentType>
class TypedTree : public SmartWin::Tree
@@ -31,7 +32,18 @@
typedef ThisType* ObjectType;
explicit TypedTree( SmartWin::Widget* parent ) : BaseType(parent) { }
-
+
+ struct Seed : public BaseType::Seed {
+ typedef ThisType WidgetType;
+
+ Seed() : BaseType::Seed() {
+ // @todo find a better way to directly use styles set in WinUtil...
+ style = WinUtil::Seeds::treeView.style;
+ exStyle = WinUtil::Seeds::treeView.exStyle;
+ font = WinUtil::Seeds::treeView.font;
+ }
+ };
+
void create( const typename BaseType::Seed & cs = BaseType::Seed() ) {
BaseType::create(cs);
this->addCallback(
Modified: dcplusplus/trunk/win32/UsersFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/UsersFrame.cpp 2008-04-07 19:14:27 UTC (rev 1107)
+++ dcplusplus/trunk/win32/UsersFrame.cpp 2008-04-07 19:17:43 UTC (rev 1108)
@@ -40,9 +40,9 @@
startup(true)
{
{
- WidgetUsers::Seed cs = WinUtil::Seeds::Table;
+ WidgetUsers::Seed cs;
cs.lvStyle |= LVS_EX_CHECKBOXES;
- users = SmartWin::WidgetCreator<WidgetUsers>::create(this, cs);
+ users = addChild(cs);
addWidget(users);
users->createColumns(WinUtil::getStrings(columnNames));
Modified: dcplusplus/trunk/win32/WidgetPaned.h
===================================================================
--- dcplusplus/trunk/win32/WidgetPaned.h 2008-04-07 19:14:27 UTC (rev 1107)
+++ dcplusplus/trunk/win32/WidgetPaned.h 2008-04-07 19:17:43 UTC (rev 1108)
@@ -19,8 +19,6 @@
#ifndef DCPLUSPLUS_WIN32_WIDGETPANED_H_
#define DCPLUSPLUS_WIN32_WIDGETPANED_H_
-#include <boost/scoped_ptr.hpp>
-
template< bool horizontal >
class WidgetPaned :
public SmartWin::MessageMap< SmartWin::Policies::Normal >,
Modified: dcplusplus/trunk/win32/WinUtil.cpp
===================================================================
--- dcplusplus/trunk/win32/WinUtil.cpp 2008-04-07 19:14:27 UTC (rev 1107)
+++ dcplusplus/trunk/win32/WinUtil.cpp 2008-04-07 19:17:43 UTC (rev 1108)
@@ -147,7 +147,6 @@
xtreeView.style |= TVS_HASBUTTONS | TVS_LINESATROOT | TVS_HASLINES | TVS_SHOWSELALWAYS | TVS_DISABLEDRAGDROP;
xtreeView.exStyle = WS_EX_CLIENTEDGE;
xtreeView.font = font;
-
::HtmlHelp(NULL, NULL, HH_INITIALIZE, (DWORD)&helpCookie);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
