Menu
▾
▴
[Dcplusplus-commit] SF.net SVN: dcplusplus: [1104] dcplusplus/trunk
|
From: <arn...@us...> - 2008-04-07 19:08:50
|
Revision: 1104
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1104&view=rev
Author: arnetheduck
Date: 2008-04-07 12:08:26 -0700 (Mon, 07 Apr 2008)
Log Message:
-----------
use addChild, update&add Seeds
Modified Paths:
--------------
dcplusplus/trunk/smartwin/include/smartwin/widgets/Button.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/Frame.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/StatusBar.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/TabSheet.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/Table.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetTabView.h
dcplusplus/trunk/smartwin/source/widgets/CoolBar.cpp
dcplusplus/trunk/smartwin/source/widgets/TabSheet.cpp
dcplusplus/trunk/smartwin/source/widgets/Table.cpp
dcplusplus/trunk/win32/ADLSearchFrame.cpp
dcplusplus/trunk/win32/AspectStatus.h
dcplusplus/trunk/win32/ComboBox.cpp
dcplusplus/trunk/win32/ComboBox.h
dcplusplus/trunk/win32/DirectoryListingFrame.cpp
dcplusplus/trunk/win32/FavHubsFrame.cpp
dcplusplus/trunk/win32/HubFrame.cpp
dcplusplus/trunk/win32/MainWindow.cpp
dcplusplus/trunk/win32/NotepadFrame.cpp
dcplusplus/trunk/win32/PrivateFrame.cpp
dcplusplus/trunk/win32/PublicHubsFrame.cpp
dcplusplus/trunk/win32/QueueFrame.cpp
dcplusplus/trunk/win32/SearchFrame.cpp
dcplusplus/trunk/win32/SettingsDialog.cpp
dcplusplus/trunk/win32/SettingsDialog.h
dcplusplus/trunk/win32/SplashWindow.cpp
dcplusplus/trunk/win32/SpyFrame.cpp
dcplusplus/trunk/win32/SystemFrame.cpp
dcplusplus/trunk/win32/TextBox.cpp
dcplusplus/trunk/win32/TextBox.h
dcplusplus/trunk/win32/TextFrame.cpp
dcplusplus/trunk/win32/TransferView.cpp
dcplusplus/trunk/win32/WinUtil.cpp
dcplusplus/trunk/win32/WinUtil.h
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-04-01 00:06:48.601000071 +0200
committer: Jacek Sieka <arn...@gm...>
properties:
branch-nick: dcplusplus
+ timestamp: 2008-04-01 10:10:01.834000111 +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
+ 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
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/Button.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/Button.h 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/Button.h 2008-04-07 19:08:26 UTC (rev 1104)
@@ -38,6 +38,8 @@
/// 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
@@ -54,6 +56,7 @@
template<typename SeedType>
void create(const SeedType& cs = SeedType());
+
protected:
typedef Button ButtonType;
@@ -76,7 +79,7 @@
return Message( WM_COMMAND, MAKEWPARAM(0, BN_DBLCLK) );
}
-inline Button::Button(Widget* parent) : ControlType(parent) {
+inline Button::Button(Widget* parent) : BaseType(parent) {
}
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/Frame.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/Frame.h 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/Frame.h 2008-04-07 19:08:26 UTC (rev 1104)
@@ -147,7 +147,7 @@
template<typename Policy>
Frame<Policy>::Seed::Seed(const SmartUtil::tstring& caption, DWORD style, DWORD exStyle) :
- BaseType::Seed(caption, WS_OVERLAPPEDWINDOW, exStyle)
+ BaseType::Seed(caption, style | WS_OVERLAPPEDWINDOW, exStyle)
{
}
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/StatusBar.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/StatusBar.h 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/StatusBar.h 2008-04-07 19:08:26 UTC (rev 1104)
@@ -122,19 +122,20 @@
/// 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
* should define one of these.
*/
- class Seed
- : public Widget::Seed
- {
- public:
+ struct Seed : public BaseType::Seed {
+ typedef ThisType WidgetType;
+
FontPtr font;
/// Fills with default parameters
- explicit Seed();
+ explicit Seed(bool sizeGrip = true);
};
/// Refreshes the status bar, must be called after main window has been resized
@@ -175,8 +176,10 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
template< class TypeOfStatusBar >
-StatusBar< TypeOfStatusBar >::Seed::Seed() : Widget::Seed(STATUSCLASSNAME, WS_CHILD | WS_VISIBLE | SBARS_SIZEGRIP | WS_CLIPSIBLINGS) {
-
+StatusBar< TypeOfStatusBar >::Seed::Seed(bool sizeGrip) : BaseType::Seed(STATUSCLASSNAME, WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS) {
+ if(sizeGrip) {
+ style |= SBARS_SIZEGRIP;
+ }
}
inline void Section::setSections( const std::vector< unsigned > & width )
@@ -235,14 +238,14 @@
template< class TypeOfStatusBar >
StatusBar< TypeOfStatusBar >::StatusBar( SmartWin::Widget * parent )
- : ControlType( parent )
+ : BaseType( parent )
{
}
template< class TypeOfStatusBar >
void StatusBar< TypeOfStatusBar >::create( const Seed & cs )
{
- ControlType::create(cs);
+ BaseType::create(cs);
if(cs.font)
setFont( cs.font );
}
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/TabSheet.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/TabSheet.h 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/TabSheet.h 2008-04-07 19:08:26 UTC (rev 1104)
@@ -116,15 +116,17 @@
/// 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
* should define one of these.
*/
- class Seed
- : public Widget::Seed
- {
+ struct Seed : public BaseType::Seed {
public:
+ typedef ThisType WidgetType;
+
FontPtr font;
/// Fills with default parameters
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/Table.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/Table.h 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/Table.h 2008-04-07 19:08:26 UTC (rev 1104)
@@ -108,6 +108,8 @@
/// Object type
typedef ThisType* ObjectType;
+ typedef CommonControl BaseType;
+
typedef std::tr1::function<int (LPARAM a, LPARAM b)> SortFunction;
/// Seed class
@@ -115,10 +117,9 @@
* knows the type of the class whose seed values it contains. Every widget
* should define one of these.
*/
- class Seed
- : public Widget::Seed
- {
- public:
+ struct Seed : public BaseType::Seed {
+ typedef ThisType WidgetType;
+
FontPtr font;
/// List view extended styles (LVS_EX_*)
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetTabView.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetTabView.h 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/WidgetTabView.h 2008-04-07 19:08:26 UTC (rev 1104)
@@ -56,7 +56,7 @@
titleChangedFunction = f;
}
- void onTabContextMenu(Container* w, const std::tr1::function<bool (const ScreenCoordinate& pt)>& f);
+ void onTabContextMenu(Container* w, const ContextMenuFunction& f);
void onHelp(const HelpFunction& f) {
helpFunction = f;
Modified: dcplusplus/trunk/smartwin/source/widgets/CoolBar.cpp
===================================================================
--- dcplusplus/trunk/smartwin/source/widgets/CoolBar.cpp 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/smartwin/source/widgets/CoolBar.cpp 2008-04-07 19:08:26 UTC (rev 1104)
@@ -5,7 +5,7 @@
namespace SmartWin {
CoolBar::Seed::Seed() :
- Widget::Seed(REBARCLASSNAME, WS_CHILD | WS_VISIBLE | RBS_VARHEIGHT | WS_CLIPCHILDREN | WS_CLIPSIBLINGS | CCS_NODIVIDER)
+ BaseType::Seed(REBARCLASSNAME, WS_CHILD | WS_VISIBLE | RBS_VARHEIGHT | WS_CLIPCHILDREN | WS_CLIPSIBLINGS | CCS_NODIVIDER)
{
}
Modified: dcplusplus/trunk/smartwin/source/widgets/TabSheet.cpp
===================================================================
--- dcplusplus/trunk/smartwin/source/widgets/TabSheet.cpp 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/smartwin/source/widgets/TabSheet.cpp 2008-04-07 19:08:26 UTC (rev 1104)
@@ -3,7 +3,7 @@
namespace SmartWin {
TabSheet::Seed::Seed() :
- Widget::Seed(WC_TABCONTROL, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN),
+ BaseType::Seed(WC_TABCONTROL, WS_CHILD | WS_TABSTOP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN),
font(new Font(DefaultGuiFont))
{
}
Modified: dcplusplus/trunk/smartwin/source/widgets/Table.cpp
===================================================================
--- dcplusplus/trunk/smartwin/source/widgets/Table.cpp 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/smartwin/source/widgets/Table.cpp 2008-04-07 19:08:26 UTC (rev 1104)
@@ -11,7 +11,7 @@
bool Table::ComCtl6 = false;
Table::Seed::Seed() :
- Widget::Seed(WC_LISTVIEW, WS_CHILD | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_EDITLABELS),
+ BaseType::Seed(WC_LISTVIEW, WS_CHILD | WS_TABSTOP | LVS_REPORT | LVS_EDITLABELS),
font(new Font(DefaultGuiFont)),
lvStyle(0)
{
@@ -37,7 +37,7 @@
}
Table::Table( SmartWin::Widget * parent )
- : ControlType( parent ),
+ : BaseType( parent ),
itsEditRow(0),
itsEditColumn(0),
itsXMousePosition(0),
Modified: dcplusplus/trunk/win32/ADLSearchFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/ADLSearchFrame.cpp 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/win32/ADLSearchFrame.cpp 2008-04-07 19:08:26 UTC (rev 1104)
@@ -48,7 +48,7 @@
{
Table::Seed cs = WinUtil::Seeds::Table;
cs.lvStyle |= LVS_EX_CHECKBOXES;
- items = createTable(cs);
+ items = addChild(cs);
addWidget(items);
items->createColumns(WinUtil::getStrings(columnNames));
@@ -65,37 +65,37 @@
Button::Seed cs = WinUtil::Seeds::button;
cs.caption = T_("&New...");
- add = createButton(cs);
+ add = addChild(cs);
add->setHelpId(IDH_ADLS_NEW);
add->onClicked(std::tr1::bind(&ADLSearchFrame::handleAdd, this));
addWidget(add);
cs.caption = T_("&Properties");
- properties = createButton(cs);
+ properties = addChild(cs);
properties->setHelpId(IDH_ADLS_PROPERTIES);
properties->onClicked(std::tr1::bind(&ADLSearchFrame::handleProperties, this));
addWidget(properties);
cs.caption = T_("Move &Up");
- up = createButton(cs);
+ up = addChild(cs);
up->setHelpId(IDH_ADLS_MOVE_UP);
up->onClicked(std::tr1::bind(&ADLSearchFrame::handleUp, this));
addWidget(up);
cs.caption = T_("Move &Down");
- down = createButton(cs);
+ down = addChild(cs);
down->setHelpId(IDH_ADLS_MOVE_DOWN);
down->onClicked(std::tr1::bind(&ADLSearchFrame::handleDown, this));
addWidget(down);
cs.caption = T_("&Remove");
- remove = createButton(cs);
+ remove = addChild(cs);
remove->setHelpId(IDH_ADLS_REMOVE);
remove->onClicked(std::tr1::bind(&ADLSearchFrame::handleRemove, this));
addWidget(remove);
cs.caption = T_("&Help");
- help = createButton(cs);
+ help = addChild(cs);
help->setHelpId(IDH_DCPP_HELP);
help->onClicked(std::tr1::bind(&WinUtil::help, handle(), IDH_ADL_SEARCH));
addWidget(help);
Modified: dcplusplus/trunk/win32/AspectStatus.h
===================================================================
--- dcplusplus/trunk/win32/AspectStatus.h 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/win32/AspectStatus.h 2008-04-07 19:08:26 UTC (rev 1104)
@@ -36,12 +36,7 @@
}
void initStatus(bool sizeGrip = false) {
- StatusBarSections::Seed cs;
- cs.style = WS_VISIBLE | WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS;
- if(sizeGrip) {
- cs.style |= SBARS_SIZEGRIP;
- }
- status = static_cast<WidgetType*>(this)->createStatusBarSections(cs);
+ status = static_cast<WidgetType*>(this)->addChild(StatusBarSections::Seed(sizeGrip));
statusTip = static_cast<WidgetType*>(this)->createToolTip();
statusTip->setTool(status, std::tr1::bind(&ThisType::handleToolTip, this));
Modified: dcplusplus/trunk/win32/ComboBox.cpp
===================================================================
--- dcplusplus/trunk/win32/ComboBox.cpp 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/win32/ComboBox.cpp 2008-04-07 19:08:26 UTC (rev 1104)
@@ -20,6 +20,11 @@
#include "ComboBox.h"
+ComboBox::Seed::Seed() :
+ BaseType::Seed()
+{
+}
+
ComboBox::ComboBox( SmartWin::Widget * parent ) : BaseType(parent), textBox(0) {
}
Modified: dcplusplus/trunk/win32/ComboBox.h
===================================================================
--- dcplusplus/trunk/win32/ComboBox.h 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/win32/ComboBox.h 2008-04-07 19:08:26 UTC (rev 1104)
@@ -22,13 +22,19 @@
#include "TextBox.h"
class ComboBox : public SmartWin::ComboBox {
-private:
typedef SmartWin::ComboBox BaseType;
+
public:
typedef ComboBox ThisType;
typedef ThisType* ObjectType;
+ struct Seed : public BaseType::Seed {
+ typedef ThisType WidgetType;
+
+ Seed();
+ };
+
explicit ComboBox( SmartWin::Widget * parent );
typedef TextBox::ObjectType TextBoxPtr;
Modified: dcplusplus/trunk/win32/DirectoryListingFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/DirectoryListingFrame.cpp 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/win32/DirectoryListingFrame.cpp 2008-04-07 19:08:26 UTC (rev 1104)
@@ -158,22 +158,22 @@
Button::Seed cs = WinUtil::Seeds::button;
cs.caption = T_("Subtract list");
- listDiff = createButton(cs);
+ listDiff = addChild(cs);
listDiff->setHelpId(IDH_FILE_LIST_SUBSTRACT);
listDiff->onClicked(std::tr1::bind(&DirectoryListingFrame::handleListDiff, this));
cs.caption = T_("Match queue");
- matchQueue = createButton(cs);
+ matchQueue = addChild(cs);
matchQueue->setHelpId(IDH_FILE_LIST_MATCH_QUEUE);
matchQueue->onClicked(std::tr1::bind(&DirectoryListingFrame::handleMatchQueue, this));
cs.caption = T_("Find");
- find = createButton(cs);
+ find = addChild(cs);
find->setHelpId(IDH_FILE_LIST_FIND);
find->onClicked(std::tr1::bind(&DirectoryListingFrame::handleFind, this));
cs.caption = T_("Next");
- findNext = createButton(cs);
+ findNext = addChild(cs);
findNext->setHelpId(IDH_FILE_LIST_NEXT);
findNext->onClicked(std::tr1::bind(&DirectoryListingFrame::handleFindNext, this));
}
Modified: dcplusplus/trunk/win32/FavHubsFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/FavHubsFrame.cpp 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/win32/FavHubsFrame.cpp 2008-04-07 19:08:26 UTC (rev 1104)
@@ -52,7 +52,7 @@
Table::Seed cs = WinUtil::Seeds::Table;
cs.style |= LVS_NOSORTHEADER;
cs.lvStyle |= LVS_EX_CHECKBOXES;
- hubs = createTable(cs);
+ hubs = addChild(cs);
addWidget(hubs);
hubs->createColumns(WinUtil::getStrings(columnNames));
@@ -69,37 +69,37 @@
Button::Seed cs = WinUtil::Seeds::button;
cs.caption = T_("&Connect");
- connect = createButton(cs);
+ connect = addChild(cs);
connect->setHelpId(IDH_FAVORITE_HUBS_CONNECT);
connect->onClicked(std::tr1::bind(&FavHubsFrame::openSelected, this));
addWidget(connect);
cs.caption = T_("&New...");
- add = createButton(cs);
+ add = addChild(cs);
add->setHelpId(IDH_FAVORITE_HUBS_NEW);
add->onClicked(std::tr1::bind(&FavHubsFrame::handleAdd, this));
addWidget(add);
cs.caption = T_("&Properties");
- properties = createButton(cs);
+ properties = addChild(cs);
properties->setHelpId(IDH_FAVORITE_HUBS_PROPERTIES);
properties->onClicked(std::tr1::bind(&FavHubsFrame::handleProperties, this));
addWidget(properties);
cs.caption = T_("Move &Up");
- up = createButton(cs);
+ up = addChild(cs);
up->setHelpId(IDH_FAVORITE_HUBS_MOVE_UP);
up->onClicked(std::tr1::bind(&FavHubsFrame::handleUp, this));
addWidget(up);
cs.caption = T_("Move &Down");
- down = createButton(cs);
+ down = addChild(cs);
down->setHelpId(IDH_FAVORITE_HUBS_MOVE_DOWN);
down->onClicked(std::tr1::bind(&FavHubsFrame::handleDown, this));
addWidget(down);
cs.caption = T_("&Remove");
- remove = createButton(cs);
+ remove = addChild(cs);
remove->setHelpId(IDH_FAVORITE_HUBS_REMOVE);
remove->onClicked(std::tr1::bind(&FavHubsFrame::handleRemove, this));
addWidget(remove);
Modified: dcplusplus/trunk/win32/HubFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/HubFrame.cpp 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/win32/HubFrame.cpp 2008-04-07 19:08:26 UTC (rev 1104)
@@ -94,7 +94,7 @@
{
TextBox::Seed cs = WinUtil::Seeds::textBox;
cs.style = WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | ES_AUTOHSCROLL | ES_AUTOVSCROLL | ES_MULTILINE;
- message = createTextBox(cs);
+ message = addChild(cs);
message->setHelpId(IDH_HUB_MESSAGE);
addWidget(message, true, false);
message->onRaw(std::tr1::bind(&HubFrame::handleMessageGetDlgCode, this), SmartWin::Message(WM_GETDLGCODE));
@@ -106,14 +106,14 @@
{
TextBox::Seed cs = WinUtil::Seeds::textBox;
cs.style = WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL;
- filter = createTextBox(cs);
+ filter = addChild(cs);
filter->setHelpId(IDH_HUB_FILTER);
addWidget(filter);
filter->onKeyUp(std::tr1::bind(&HubFrame::handleFilterKey, this, _1));
}
{
- filterType = createComboBox(WinUtil::Seeds::comboBoxStatic);
+ filterType = addChild(WinUtil::Seeds::comboBoxStatic);
filterType->setHelpId(IDH_HUB_FILTER);
addWidget(filterType);
@@ -128,7 +128,7 @@
{
TextBox::Seed cs = WinUtil::Seeds::textBox;
cs.style = WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | ES_MULTILINE | ES_NOHIDESEL | ES_READONLY;
- chat = createTextBox(cs);
+ chat = addChild(cs);
chat->setHelpId(IDH_HUB_CHAT);
chat->setTextLimit(0);
addWidget(chat);
@@ -156,7 +156,7 @@
{
CheckBox::Seed cs(_T("+/-"));
cs.style &= ~WS_TABSTOP;
- showUsers = createCheckBox(cs);
+ showUsers = addChild(cs);
showUsers->setChecked(BOOLSETTING(GET_USER_INFO));
}
Modified: dcplusplus/trunk/win32/MainWindow.cpp
===================================================================
--- dcplusplus/trunk/win32/MainWindow.cpp 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/win32/MainWindow.cpp 2008-04-07 19:08:26 UTC (rev 1104)
@@ -161,8 +161,7 @@
cs.location = SmartWin::Rectangle(pos_x, pos_y, size_x, size_y);
}
- cs.style = WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN;
- cs.exStyle = WS_EX_APPWINDOW | WS_EX_WINDOWEDGE;
+ cs.exStyle |= WS_EX_APPWINDOW;
if (ResourceManager::getInstance()->isRTL())
cs.exStyle |= WS_EX_RTLREADING;
Modified: dcplusplus/trunk/win32/NotepadFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/NotepadFrame.cpp 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/win32/NotepadFrame.cpp 2008-04-07 19:08:26 UTC (rev 1104)
@@ -30,7 +30,7 @@
{
TextBox::Seed cs = WinUtil::Seeds::textBox;
cs.style = WS_CHILD | WS_VISIBLE | WS_VSCROLL | ES_MULTILINE | ES_AUTOVSCROLL | ES_NOHIDESEL | ES_WANTRETURN;
- pad = createTextBox(cs);
+ pad = addChild(cs);
addWidget(pad);
}
Modified: dcplusplus/trunk/win32/PrivateFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/PrivateFrame.cpp 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/win32/PrivateFrame.cpp 2008-04-07 19:08:26 UTC (rev 1104)
@@ -100,7 +100,7 @@
{
TextBox::Seed cs = WinUtil::Seeds::textBox;
cs.style = WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | ES_AUTOHSCROLL | ES_AUTOVSCROLL | ES_MULTILINE;
- message = createTextBox(cs);
+ message = addChild(cs);
message->setHelpId(IDH_PM_MESSAGE);
addWidget(message, true);
message->onKeyDown(std::tr1::bind(&PrivateFrame::handleKeyDown, this, _1));
@@ -110,7 +110,7 @@
{
TextBox::Seed cs = WinUtil::Seeds::textBox;
cs.style = WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | ES_MULTILINE | ES_NOHIDESEL | ES_READONLY;
- chat = createTextBox(cs);
+ chat = addChild(cs);
chat->setHelpId(IDH_PM_CHAT);
chat->setTextLimit(0);
addWidget(chat);
Modified: dcplusplus/trunk/win32/PublicHubsFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/PublicHubsFrame.cpp 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/win32/PublicHubsFrame.cpp 2008-04-07 19:08:26 UTC (rev 1104)
@@ -121,14 +121,14 @@
{
TextBox::Seed cs = WinUtil::Seeds::textBox;
cs.style = WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL;
- filter = createTextBox(cs);
+ filter = addChild(cs);
filter->setHelpId(IDH_PUBLIC_HUBS_FILTER);
addWidget(filter);
filter->onKeyDown(std::tr1::bind(&PublicHubsFrame::handleFilterKeyDown, this, _1));
}
{
- filterSel = createComboBox(WinUtil::Seeds::comboBoxStatic);
+ filterSel = addChild(WinUtil::Seeds::comboBoxStatic);
filterSel->setHelpId(IDH_PUBLIC_HUBS_FILTER);
addWidget(filterSel);
@@ -140,7 +140,7 @@
filterSel->setSelected(COLUMN_LAST);
filterSel->onSelectionChanged(std::tr1::bind(&PublicHubsFrame::updateList, this));
- pubLists = createComboBox(WinUtil::Seeds::comboBoxStatic);
+ pubLists = addChild(WinUtil::Seeds::comboBoxStatic);
pubLists->setHelpId(IDH_PUBLIC_HUBS_LISTS);
addWidget(pubLists);
pubLists->onSelectionChanged(std::tr1::bind(&PublicHubsFrame::handleListSelChanged, this));
@@ -150,14 +150,14 @@
Button::Seed cs = WinUtil::Seeds::button;
cs.caption = T_("&Configure");
- configure = createButton(cs);
+ configure = addChild(cs);
configure->setHelpId(IDH_PUBLIC_HUBS_LISTS);
configure->setFont(WinUtil::font);
addWidget(configure);
configure->onClicked(std::tr1::bind(&PublicHubsFrame::handleConfigure, this));
cs.caption = T_("&Refresh");
- refresh = createButton(cs);
+ refresh = addChild(cs);
refresh->setHelpId(IDH_PUBLIC_HUBS_REFRESH);
refresh->setFont(WinUtil::font);
addWidget(refresh);
@@ -167,12 +167,12 @@
cs.exStyle = WS_EX_TRANSPARENT;
cs.caption = T_("F&ilter");
- filterDesc = createButton(cs);
+ filterDesc = addChild(cs);
filterDesc->setHelpId(IDH_PUBLIC_HUBS_FILTER);
filterDesc->setFont(WinUtil::font);
cs.caption = T_("Configured Public Hub Lists");
- lists = createButton(cs);
+ lists = addChild(cs);
lists->setHelpId(IDH_PUBLIC_HUBS_LISTS);
lists->setFont(WinUtil::font);
}
Modified: dcplusplus/trunk/win32/QueueFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/QueueFrame.cpp 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/win32/QueueFrame.cpp 2008-04-07 19:08:26 UTC (rev 1104)
@@ -98,7 +98,7 @@
{
CheckBox::Seed cs;
cs.caption = _T("+/-");
- showTree = createCheckBox(cs);
+ showTree = addChild(cs);
showTree->setChecked(BOOLSETTING(QUEUEFRAME_SHOW_TREE));
showTree->onClicked(std::tr1::bind(&QueueFrame::handleShowTreeClicked, this));
}
Modified: dcplusplus/trunk/win32/SearchFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/SearchFrame.cpp 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/win32/SearchFrame.cpp 2008-04-07 19:08:26 UTC (rev 1104)
@@ -117,23 +117,23 @@
searchLabel->setHelpId(IDH_SEARCH_SEARCH_FOR);
cs.caption = T_("Size");
- sizeLabel = createLabel(cs);
+ sizeLabel = addChild(cs);
sizeLabel->setHelpId(IDH_SEARCH_SIZE);
cs.caption = T_("File type");
- typeLabel = createLabel(cs);
+ typeLabel = addChild(cs);
typeLabel->setHelpId(IDH_SEARCH_TYPE);
cs.caption = T_("Search options");
- optionLabel = createLabel(cs);
+ optionLabel = addChild(cs);
cs.caption = T_("Hubs");
- hubsLabel = createLabel(cs);
+ hubsLabel = addChild(cs);
hubsLabel->setHelpId(IDH_SEARCH_HUBS);
}
{
- searchBox = createComboBox(WinUtil::Seeds::comboBoxEdit);
+ searchBox = addChild(WinUtil::Seeds::comboBoxEdit);
searchBox->setHelpId(IDH_SEARCH_SEARCH_FOR);
addWidget(searchBox);
@@ -146,19 +146,19 @@
{
Button::Seed cs = WinUtil::Seeds::button;
cs.caption = T_("Purge");
- purge = createButton(cs);
+ purge = addChild(cs);
purge->setHelpId(IDH_SEARCH_PURGE);
purge->onClicked(std::tr1::bind(&SearchFrame::handlePurgeClicked, this));
cs.style |= BS_DEFPUSHBUTTON;
cs.caption = T_("Search");
- doSearch = createButton(cs);
+ doSearch = addChild(cs);
doSearch->setHelpId(IDH_SEARCH_SEARCH);
doSearch->onClicked(std::tr1::bind(&SearchFrame::runSearch, this));
}
{
- mode = createComboBox(WinUtil::Seeds::comboBoxStatic);
+ mode = addChild(WinUtil::Seeds::comboBoxStatic);
mode->setHelpId(IDH_SEARCH_SIZE);
addWidget(mode);
@@ -170,13 +170,13 @@
{
TextBox::Seed cs = WinUtil::Seeds::textBox;
cs.style |= ES_AUTOHSCROLL | ES_NUMBER;
- size = createTextBox(cs);
+ size = addChild(cs);
size->setHelpId(IDH_SEARCH_SIZE);
addWidget(size);
}
{
- sizeMode = createComboBox(WinUtil::Seeds::comboBoxStatic);
+ sizeMode = addChild(WinUtil::Seeds::comboBoxStatic);
sizeMode->setHelpId(IDH_SEARCH_SIZE);
addWidget(sizeMode);
@@ -188,7 +188,7 @@
}
{
- fileType = createComboBox(WinUtil::Seeds::comboBoxStatic);
+ fileType = addChild(WinUtil::Seeds::comboBoxStatic);
fileType->setHelpId(IDH_SEARCH_TYPE);
addWidget(fileType);
@@ -205,7 +205,7 @@
{
CheckBox::Seed cs(T_("Only users with free slots"));
- slots = createCheckBox(cs);
+ slots = addChild(cs);
slots->setHelpId(IDH_SEARCH_SLOTS);
slots->setChecked(onlyFree);
@@ -247,7 +247,7 @@
{
CheckBox::Seed cs(_T("+/-"));
- showUI = createCheckBox(cs);
+ showUI = addChild(cs);
showUI->setChecked(bShowUI);
showUI->onClicked(std::tr1::bind(&SearchFrame::handleShowUIClicked, this));
Modified: dcplusplus/trunk/win32/SettingsDialog.cpp
===================================================================
--- dcplusplus/trunk/win32/SettingsDialog.cpp 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/win32/SettingsDialog.cpp 2008-04-07 19:08:26 UTC (rev 1104)
@@ -114,7 +114,7 @@
void SettingsDialog::addPage(const tstring& title, PropPage* page) {
pages.push_back(page);
- createTree(title, TVI_ROOT, page);
+ addChild(title, TVI_ROOT, page);
}
void SettingsDialog::handleOKClicked() {
@@ -148,7 +148,7 @@
}
}
-HTREEITEM SettingsDialog::createTree(const tstring& str, HTREEITEM parent, PropPage* page) {
+HTREEITEM SettingsDialog::addChild(const tstring& str, HTREEITEM parent, PropPage* page) {
TVINSERTSTRUCT tvi;
tvi.hInsertAfter = TVI_LAST;
tvi.hParent = parent;
@@ -185,7 +185,7 @@
}
TreeView_Expand(pageTree->handle(), parent, TVE_EXPAND);
// Recurse...
- return createTree(str.substr(i+1), item, page);
+ return addChild(str.substr(i+1), item, page);
}
}
Modified: dcplusplus/trunk/win32/SettingsDialog.h
===================================================================
--- dcplusplus/trunk/win32/SettingsDialog.h 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/win32/SettingsDialog.h 2008-04-07 19:08:26 UTC (rev 1104)
@@ -47,7 +47,7 @@
void selectionChanged();
void showPage(PropPage* page);
- HTREEITEM createTree(const tstring& str, HTREEITEM parent, PropPage* page);
+ HTREEITEM addChild(const tstring& str, HTREEITEM parent, PropPage* page);
HTREEITEM find(const tstring& str, HTREEITEM start);
};
Modified: dcplusplus/trunk/win32/SplashWindow.cpp
===================================================================
--- dcplusplus/trunk/win32/SplashWindow.cpp 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/win32/SplashWindow.cpp 2008-04-07 19:08:26 UTC (rev 1104)
@@ -47,7 +47,7 @@
TextBox::Seed cs;
cs.style = WS_CHILD | ES_CENTER | ES_READONLY;
cs.exStyle = WS_EX_STATICEDGE;
- text = createTextBox(cs);
+ text = addChild(cs);
}
text->setFont(SmartWin::DefaultGuiFont);
Modified: dcplusplus/trunk/win32/SpyFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/SpyFrame.cpp 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/win32/SpyFrame.cpp 2008-04-07 19:08:26 UTC (rev 1104)
@@ -49,7 +49,7 @@
{
Table::Seed cs = WinUtil::Seeds::Table;
cs.style |= LVS_SINGLESEL;
- searches = createTable(cs);
+ searches = addChild(cs);
addWidget(searches);
searches->createColumns(WinUtil::getStrings(columnNames));
@@ -62,7 +62,7 @@
{
CheckBox::Seed cs(T_("Ignore TTH searches"));
- ignoreTTH = createCheckBox(cs);
+ ignoreTTH = addChild(cs);
ignoreTTH->setHelpId(IDH_SPY_IGNORE_TTH);
ignoreTTH->setChecked(bIgnoreTTH);
ignoreTTH->onClicked(std::tr1::bind(&SpyFrame::handleIgnoreTTHClicked, this));
Modified: dcplusplus/trunk/win32/SystemFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/SystemFrame.cpp 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/win32/SystemFrame.cpp 2008-04-07 19:08:26 UTC (rev 1104)
@@ -29,7 +29,7 @@
{
TextBox::Seed cs = WinUtil::Seeds::textBox;
cs.style = WS_CHILD | WS_VISIBLE | WS_VSCROLL | ES_AUTOVSCROLL | ES_MULTILINE | ES_NOHIDESEL | ES_READONLY;
- log = createTextBox(cs);
+ log = addChild(cs);
addWidget(log);
}
Modified: dcplusplus/trunk/win32/TextBox.cpp
===================================================================
--- dcplusplus/trunk/win32/TextBox.cpp 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/win32/TextBox.cpp 2008-04-07 19:08:26 UTC (rev 1104)
@@ -22,6 +22,11 @@
#include "WinUtil.h"
+TextBox::Seed::Seed(const SmartUtil::tstring& caption) :
+ BaseType::Seed(caption)
+{
+}
+
TextBox::TextBox( SmartWin::Widget * parent ) : BaseType(parent), menuOpened(false) {
this->onLeftMouseDblClick(std::tr1::bind(&TextBox::handleLeftDblClick, this, _1));
Modified: dcplusplus/trunk/win32/TextBox.h
===================================================================
--- dcplusplus/trunk/win32/TextBox.h 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/win32/TextBox.h 2008-04-07 19:08:26 UTC (rev 1104)
@@ -21,13 +21,19 @@
/** Our own flavour of text boxes that handle double clicks and have fancy menus */
class TextBox : public SmartWin::TextBox {
-private:
typedef SmartWin::TextBox BaseType;
+
public:
typedef TextBox ThisType;
typedef ThisType* ObjectType;
+ struct Seed : public BaseType::Seed {
+ typedef ThisType WidgetType;
+
+ Seed(const SmartUtil::tstring& caption = SmartUtil::tstring());
+ };
+
explicit TextBox( SmartWin::Widget * parent );
private:
Modified: dcplusplus/trunk/win32/TextFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/TextFrame.cpp 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/win32/TextFrame.cpp 2008-04-07 19:08:26 UTC (rev 1104)
@@ -32,7 +32,7 @@
TextBox::Seed cs = WinUtil::Seeds::textBox;
cs.style = WS_CHILD | WS_VISIBLE | WS_VSCROLL | ES_AUTOVSCROLL | ES_MULTILINE | ES_NOHIDESEL | ES_READONLY;
cs.font = WinUtil::monoFont;
- pad = createTextBox(cs);
+ pad = addChild(cs);
addWidget(pad);
pad->setTextLimit(0);
Modified: dcplusplus/trunk/win32/TransferView.cpp
===================================================================
--- dcplusplus/trunk/win32/TransferView.cpp 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/win32/TransferView.cpp 2008-04-07 19:08:26 UTC (rev 1104)
@@ -74,7 +74,7 @@
TabSheet::Seed tcs;
tcs.style = WS_CHILD | WS_CLIPCHILDREN | WS_VISIBLE |
TCS_HOTTRACK | TCS_RAGGEDRIGHT | TCS_TOOLTIPS | TCS_FOCUSNEVER;
- tabs = createTabSheet(tcs);
+ tabs = addChild(tcs);
tabs->onSelectionChanged(std::tr1::bind(&TransferView::handleTabSelected, this));
}
Modified: dcplusplus/trunk/win32/WinUtil.cpp
===================================================================
--- dcplusplus/trunk/win32/WinUtil.cpp 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/win32/WinUtil.cpp 2008-04-07 19:08:26 UTC (rev 1104)
@@ -59,11 +59,11 @@
DWORD WinUtil::helpCookie = 0;
const SmartWin::Button::Seed WinUtil::Seeds::button;
-const SmartWin::ComboBox::Seed WinUtil::Seeds::comboBoxStatic;
-const SmartWin::ComboBox::Seed WinUtil::Seeds::comboBoxEdit;
+const ComboBox::Seed WinUtil::Seeds::comboBoxStatic;
+const ComboBox::Seed WinUtil::Seeds::comboBoxEdit;
const SmartWin::Table::Seed WinUtil::Seeds::Table;
const SmartWin::WidgetMenu::Seed WinUtil::Seeds::menu;
-const SmartWin::TextBox::Seed WinUtil::Seeds::textBox;
+const TextBox::Seed WinUtil::Seeds::textBox;
const SmartWin::Tree::Seed WinUtil::Seeds::treeView;
void WinUtil::init() {
@@ -121,11 +121,11 @@
// Const so that noone else will change them after they've been initialized
//SmartWin::Button::Seed& xbutton = const_cast<SmartWin::Button::Seed&>(Seeds::button);
- SmartWin::ComboBox::Seed& xcomboBoxEdit = const_cast<SmartWin::ComboBox::Seed&>(Seeds::comboBoxEdit);
- SmartWin::ComboBox::Seed& xcomboBoxStatic = const_cast<SmartWin::ComboBox::Seed&>(Seeds::comboBoxStatic);
+ ComboBox::Seed& xcomboBoxEdit = const_cast<ComboBox::Seed&>(Seeds::comboBoxEdit);
+ ComboBox::Seed& xcomboBoxStatic = const_cast<ComboBox::Seed&>(Seeds::comboBoxStatic);
SmartWin::Table::Seed& xTable = const_cast<SmartWin::Table::Seed&>(Seeds::Table);
SmartWin::WidgetMenu::Seed& xmenu = const_cast<SmartWin::WidgetMenu::Seed&>(Seeds::menu);
- SmartWin::TextBox::Seed& xtextBox = const_cast<SmartWin::TextBox::Seed&>(Seeds::textBox);
+ TextBox::Seed& xtextBox = const_cast<TextBox::Seed&>(Seeds::textBox);
SmartWin::Tree::Seed& xtreeView = const_cast<SmartWin::Tree::Seed&>(Seeds::treeView);
xcomboBoxStatic.style = WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_HSCROLL | WS_VSCROLL | CBS_DROPDOWNLIST;
Modified: dcplusplus/trunk/win32/WinUtil.h
===================================================================
--- dcplusplus/trunk/win32/WinUtil.h 2008-04-07 19:04:50 UTC (rev 1103)
+++ dcplusplus/trunk/win32/WinUtil.h 2008-04-07 19:08:26 UTC (rev 1104)
@@ -23,6 +23,7 @@
#include <dcpp/Util.h>
#include <dcpp/forward.h>
#include <dcpp/MerkleTree.h>
+#include "WidgetFactory.h"
#ifdef PORT_ME
// Some utilities for handling HLS colors, taken from Jean-Michel LE FOL's codeproject
@@ -68,11 +69,11 @@
struct Seeds {
static const SmartWin::Button::Seed button;
- static const SmartWin::ComboBox::Seed comboBoxStatic;
- static const SmartWin::ComboBox::Seed comboBoxEdit;
+ static const ComboBox::Seed comboBoxStatic;
+ static const ComboBox::Seed comboBoxEdit;
static const SmartWin::Table::Seed Table;
static const SmartWin::WidgetMenu::Seed menu;
- static const SmartWin::TextBox::Seed textBox;
+ static const TextBox::Seed textBox;
static const SmartWin::Tree::Seed treeView;
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
