Menu
▾
▴
[Dcplusplus-commit] SF.net SVN: dcplusplus: [1119] dcplusplus/trunk
|
From: <arn...@us...> - 2008-04-07 19:35:19
|
Revision: 1119
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1119&view=rev
Author: arnetheduck
Date: 2008-04-07 12:35:01 -0700 (Mon, 07 Apr 2008)
Log Message:
-----------
combo, table, group, progress, tab, tree gone from factory
Modified Paths:
--------------
dcplusplus/trunk/changelog.txt
dcplusplus/trunk/smartwin/include/smartwin/SmartWin.h
dcplusplus/trunk/smartwin/include/smartwin/WidgetFactory.h
dcplusplus/trunk/smartwin/include/smartwin/forward.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/Composite.h
dcplusplus/trunk/win32/FavoriteDirsPage.cpp
dcplusplus/trunk/win32/HashProgressDlg.cpp
dcplusplus/trunk/win32/HubListsDlg.cpp
dcplusplus/trunk/win32/LogPage.cpp
dcplusplus/trunk/win32/SettingsDialog.cpp
dcplusplus/trunk/win32/UCPage.cpp
dcplusplus/trunk/win32/UploadPage.cpp
dcplusplus/trunk/win32/WaitingUsersFrame.cpp
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-04-02 20:06:28.881000042 +0200
committer: Jacek Sieka <arn...@gm...>
properties:
branch-nick: dcplusplus
+ timestamp: 2008-04-02 20:12:35.286000013 +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
+ 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
Modified: dcplusplus/trunk/changelog.txt
===================================================================
--- dcplusplus/trunk/changelog.txt 2008-04-07 19:33:49 UTC (rev 1118)
+++ dcplusplus/trunk/changelog.txt 2008-04-07 19:35:01 UTC (rev 1119)
@@ -19,7 +19,7 @@
* [L#209684] Fixed parsing of non-XML hub lists (poy)
* [L#205660] Readded hub column to transfers (thanks mikejj)
* Fixed file list refresh happening 1 minute later than expected (poy)
-* [L#209277] Fixed crash on bad translation
+* [L#209277] Fixed crash on bad translation (thanks poy)
* More controls now use the font defined in settings (poy)
-- 0.705 2008-03-14 --
Modified: dcplusplus/trunk/smartwin/include/smartwin/SmartWin.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/SmartWin.h 2008-04-07 19:33:49 UTC (rev 1118)
+++ dcplusplus/trunk/smartwin/include/smartwin/SmartWin.h 2008-04-07 19:35:01 UTC (rev 1119)
@@ -63,18 +63,24 @@
#include "resources/Icon.h"
#include "resources/ImageList.h"
#include "resources/Pen.h"
+#include "widgets/ComboBox.h"
#include "widgets/Container.h"
#include "widgets/CoolBar.h"
#include "widgets/DateTime.h"
+#include "widgets/GroupBox.h"
#include "widgets/Label.h"
#include "widgets/MDIChild.h"
#include "widgets/MDIFrame.h"
#include "widgets/MDIParent.h"
#include "widgets/ModalDialog.h"
#include "widgets/ModelessDialog.h"
+#include "widgets/ProgressBar.h"
#include "widgets/RadioButton.h"
#include "widgets/Slider.h"
#include "widgets/Spinner.h"
+#include "widgets/Table.h"
+#include "widgets/TabSheet.h"
+#include "widgets/Tree.h"
#include "widgets/ToolBar.h"
#include "widgets/Window.h"
Modified: dcplusplus/trunk/smartwin/include/smartwin/WidgetFactory.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/WidgetFactory.h 2008-04-07 19:33:49 UTC (rev 1118)
+++ dcplusplus/trunk/smartwin/include/smartwin/WidgetFactory.h 2008-04-07 19:35:01 UTC (rev 1119)
@@ -34,17 +34,11 @@
#include "widgets/FolderDialog.h"
#include "widgets/MessageBox.h"
#include "widgets/CheckBox.h"
-#include "widgets/ComboBox.h"
-#include "widgets/Table.h"
-#include "widgets/GroupBox.h"
#include "widgets/LoadDialog.h"
-#include "widgets/ProgressBar.h"
#include "widgets/SaveDialog.h"
#include "widgets/StatusBar.h"
#include "widgets/WidgetTabView.h"
-#include "widgets/TabSheet.h"
#include "widgets/TextBox.h"
-#include "widgets/Tree.h"
#include "widgets/ToolTip.h"
#include "WidgetFactoryPlatformImplementation.h"
#include "WidgetCreator.h"
@@ -87,26 +81,14 @@
// Bring widgets into the namespace of the class that inherits from us
typedef SmartWin::Button Button;
+
typedef typename Button::ObjectType ButtonPtr;
typedef SmartWin::FolderDialog FolderDialog;
-
/// MessageBox class and object type.
typedef SmartWin::MessageBox MessageBox;
- /// Table class type.
- typedef SmartWin::Table Table;
-
- /// Table object type.
- typedef typename Table::ObjectType TablePtr;
-
- /// TreeView class type.
- typedef SmartWin::Tree Tree;
-
- /// TreeView object type.
- typedef typename Tree::ObjectType TreePtr;
-
/// TextBox class type.
typedef SmartWin::TextBox TextBox;
@@ -131,18 +113,6 @@
/// TabView object type.
typedef typename WidgetTabView::ObjectType WidgetTabViewPtr;
- /// TabSheet class type.
- typedef SmartWin::TabSheet TabSheet;
-
- /// TabSheet object type.
- typedef typename TabSheet::ObjectType TabSheetPtr;
-
- /// GroupBox class type.
- typedef SmartWin::GroupBox GroupBox;
-
- /// GroupBox object type.
- typedef typename GroupBox::ObjectType GroupBoxPtr;
-
/// LoadFileDialog class type.
typedef SmartWin::LoadDialog LoadDialog;
@@ -152,24 +122,12 @@
/// ColorDialog class and object type.
typedef SmartWin::ColorDialog ColorDialog;
- /// ComboBox class type.
- typedef SmartWin::ComboBox ComboBox;
-
- /// ComboBox object type.
- typedef typename ComboBox::ObjectType ComboBoxPtr;
-
/// CheckBox class type.
typedef SmartWin::CheckBox CheckBox;
/// CheckBox object type.
typedef typename CheckBox::ObjectType CheckBoxPtr;
- /// ProgressBar class type.
- typedef SmartWin::ProgressBar ProgressBar;
-
- /// ProgressBar object type.
- typedef typename ProgressBar::ObjectType ProgressBarPtr;
-
typedef SmartWin::ToolTip ToolTip;
typedef typename ToolTip::ObjectType ToolTipPtr;
@@ -207,19 +165,6 @@
*/
MessageBox createMessageBox();
- /// Creates a List View and returns a pointer to it.
- /** DON'T delete the returned pointer!!!
- */
- TablePtr createTable( const typename Table::Seed & cs = Table::Seed() );
-
- /// \ingroup SubclassDialog
- /// Subclasses a Check Box from the given resource id.
- /** DON'T delete the returned pointer!!! <br>
- * Use e.g. the Dialog Designer to design a dialog and attach the controls
- * with this function.
- */
- TablePtr attachTable( unsigned id );
-
/// Creates a Check Box and returns a pointer to it.
/** DON'T delete the returned pointer!!!
*/
@@ -233,19 +178,6 @@
*/
CheckBoxPtr attachCheckBox( unsigned id );
- /// Creates a Tree View and returns a pointer to it.
- /** DON'T delete the returned pointer!!!
- */
- TreePtr createTreeView( const typename Tree::Seed & cs = Tree::Seed() );
-
- /// \ingroup SubclassDialog
- /// Subclasses a Tree View Control from the given resource id.
- /** DON'T delete the returned pointer!!! <br>
- * Use e.g. the Dialog Designer to design a dialog and attach the controls
- * with this function.
- */
- TreePtr attachTreeView( unsigned id );
-
/// Creates a Edit Control and returns a pointer to it.
/** DON'T delete the returned pointer!!!
*/
@@ -280,16 +212,6 @@
*/
WidgetTabViewPtr createTabView( const typename WidgetTabView::Seed& cs = WidgetTabView::Seed() );
- /// Creates a Tab Sheet and returns a pointer to it.
- /** DON'T delete the returned pointer!!!
- */
- TabSheetPtr createTabSheet( const typename TabSheet::Seed & cs = TabSheet::Seed() );
-
- /// Creates a Progress Bar Control and returns a pointer to it.
- /** DON'T delete the returned pointer!!!
- */
- ProgressBarPtr createProgressBar( const typename ProgressBar::Seed & cs = ProgressBar::Seed() );
-
/// \ingroup SubclassDialog
/// Subclasses a Button Control from the given resource id.
/** DON'T delete the returned pointer!!!< br >
@@ -297,36 +219,6 @@
*/
ButtonPtr attachButton( unsigned id );
- /// \ingroup SubclassDialog
- /// Subclasses a Progress Bar Control from the given resource id.
- /** DON'T delete the returned pointer!!!< br >
- * Use e.g. the Dialog Designer to design a dialog and attach the controls with this function.
- */
- ProgressBarPtr attachProgressBar( unsigned id );
-
- /// Creates a Group Box Control and returns a pointer to it.
- /** DON'T delete the returned pointer!!!
- */
- GroupBoxPtr createGroupBox( const typename GroupBox::Seed & cs = GroupBox::Seed() );
-
- /// Subclasses a Group Box Control and returns a pointer to it.
- /** DON'T delete the returned pointer!!!
- */
- GroupBoxPtr attachGroupBox( unsigned id );
-
- /// Creates a Comb Box and returns a pointer to it.
- /** DON'T delete the returned pointer!!!
- */
- ComboBoxPtr createComboBox( const typename ComboBox::Seed & cs = ComboBox::Seed() );
-
- /// \ingroup SubclassDialog
- /// Subclasses a ComboBox Control from the given resource id.
- /** DON'T delete the returned pointer!!! <br>
- * Use e.g. the Dialog Designer to design a dialog and attach the controls
- * with this function.
- */
- ComboBoxPtr attachComboBox( unsigned id );
-
ToolTipPtr createToolTip( const typename ToolTip::Seed & cs = ToolTip::Seed() );
protected:
// Protected to try to avoid stack creation...
@@ -379,20 +271,6 @@
}
template<typename ContainerWidgetType>
-typename WidgetFactory< ContainerWidgetType >::TablePtr
-WidgetFactory< ContainerWidgetType >::createTable( const typename Table::Seed & cs )
-{
- return WidgetCreator< Table >::create( this, cs );
-}
-
-template<typename ContainerWidgetType>
-typename WidgetFactory< ContainerWidgetType >::TablePtr
-WidgetFactory< ContainerWidgetType >::attachTable( unsigned id )
-{
- return WidgetCreator< Table >::attach( this, id );
-}
-
-template<typename ContainerWidgetType>
typename WidgetFactory< ContainerWidgetType >::CheckBoxPtr
WidgetFactory< ContainerWidgetType >::createCheckBox( const typename CheckBox::Seed & cs )
{
@@ -407,20 +285,6 @@
}
template<typename ContainerWidgetType>
-typename WidgetFactory< ContainerWidgetType >::TreePtr
-WidgetFactory< ContainerWidgetType >::createTreeView( const typename Tree::Seed & cs )
-{
- return WidgetCreator< Tree >::create( this, cs );
-}
-
-template<typename ContainerWidgetType>
-typename WidgetFactory< ContainerWidgetType >::TreePtr
-WidgetFactory< ContainerWidgetType >::attachTreeView( unsigned id )
-{
- return WidgetCreator< Tree >::attach( this, id );
-}
-
-template<typename ContainerWidgetType>
typename WidgetFactory< ContainerWidgetType >::TextBoxPtr
WidgetFactory< ContainerWidgetType >::createTextBox( const typename TextBox::Seed & cs )
{
@@ -463,20 +327,6 @@
}
template<typename ContainerWidgetType>
-typename WidgetFactory< ContainerWidgetType >::TabSheetPtr
-WidgetFactory< ContainerWidgetType >::createTabSheet( const typename TabSheet::Seed & cs )
-{
- return WidgetCreator< TabSheet >::create( this, cs );
-}
-
-template<typename ContainerWidgetType>
-typename WidgetFactory< ContainerWidgetType >::ProgressBarPtr
-WidgetFactory< ContainerWidgetType >::createProgressBar( const typename ProgressBar::Seed & cs )
-{
- return WidgetCreator< ProgressBar >::create( this, cs );
-}
-
-template<typename ContainerWidgetType>
typename WidgetFactory< ContainerWidgetType >::ButtonPtr
WidgetFactory< ContainerWidgetType >::attachButton( unsigned id )
{
@@ -484,41 +334,6 @@
}
template<typename ContainerWidgetType>
-typename WidgetFactory< ContainerWidgetType >::ProgressBarPtr
-WidgetFactory< ContainerWidgetType >::attachProgressBar( unsigned id )
-{
- return WidgetCreator< ProgressBar >::attach( this, id );
-}
-
-template<typename ContainerWidgetType>
-typename WidgetFactory< ContainerWidgetType >::GroupBoxPtr
-WidgetFactory< ContainerWidgetType >::createGroupBox( const typename GroupBox::Seed & cs )
-{
- return WidgetCreator< GroupBox >::create( this, cs );
-}
-
-template<typename ContainerWidgetType>
-typename WidgetFactory< ContainerWidgetType >::GroupBoxPtr
-WidgetFactory< ContainerWidgetType >::attachGroupBox( unsigned id )
-{
- return WidgetCreator< GroupBox >::attach( this, id );
-}
-
-template<typename ContainerWidgetType>
-typename WidgetFactory< ContainerWidgetType >::ComboBoxPtr
-WidgetFactory< ContainerWidgetType >::createComboBox( const typename ComboBox::Seed & cs )
-{
- return WidgetCreator< ComboBox >::create( this, cs );
-}
-
-template<typename ContainerWidgetType>
-typename WidgetFactory< ContainerWidgetType >::ComboBoxPtr
-WidgetFactory< ContainerWidgetType >::attachComboBox( unsigned id )
-{
- return WidgetCreator< ComboBox >::attach( this, id );
-}
-
-template<typename ContainerWidgetType>
typename WidgetFactory< ContainerWidgetType >::ToolTipPtr
WidgetFactory< ContainerWidgetType >::createToolTip( const typename ToolTip::Seed & cs )
{
Modified: dcplusplus/trunk/smartwin/include/smartwin/forward.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/forward.h 2008-04-07 19:33:49 UTC (rev 1118)
+++ dcplusplus/trunk/smartwin/include/smartwin/forward.h 2008-04-07 19:35:01 UTC (rev 1119)
@@ -12,6 +12,9 @@
class CheckBox;
typedef CheckBox* CheckBoxPtr;
+class ComboBox;
+typedef ComboBox* ComboBoxPtr;
+
class Container;
typedef Container* ContainerPtr;
@@ -21,6 +24,9 @@
class DateTime;
typedef DateTime* DateTimePtr;
+class GroupBox;
+typedef GroupBox* GroupBoxPtr;
+
class Label;
typedef Label* LabelPtr;
@@ -33,6 +39,9 @@
class MDIParent;
typedef MDIParent* MDIParentPtr;
+class ProgressBar;
+typedef ProgressBar* ProgressBarPtr;
+
class RadioButton;
typedef RadioButton* RadioButtonPtr;
@@ -45,6 +54,9 @@
class Table;
typedef Table* TablePtr;
+class TabSheet;
+typedef TabSheet* TabSheetPtr;
+
class ToolBar;
typedef ToolBar* ToolBarPtr;
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/Composite.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/Composite.h 2008-04-07 19:33:49 UTC (rev 1118)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/Composite.h 2008-04-07 19:35:01 UTC (rev 1119)
@@ -48,20 +48,28 @@
typedef SmartWin::ButtonPtr ButtonPtr;
typedef SmartWin::CheckBox CheckBox;
typedef SmartWin::CheckBoxPtr CheckBoxPtr;
+ typedef SmartWin::ComboBox ComboBox;
+ typedef SmartWin::ComboBoxPtr ComboBoxPtr;
typedef SmartWin::Container Container;
typedef SmartWin::ContainerPtr ContainerPtr;
typedef SmartWin::CoolBar CoolBar;
typedef SmartWin::CoolBarPtr CoolBarPtr;
typedef SmartWin::DateTime DateTime;
typedef SmartWin::DateTimePtr DateTimePtr;
+ typedef SmartWin::GroupBox GroupBox;
+ typedef SmartWin::GroupBoxPtr GroupBoxPtr;
typedef SmartWin::Label Label;
typedef SmartWin::LabelPtr LabelPtr;
+ typedef SmartWin::ProgressBar ProgressBar;
+ typedef SmartWin::ProgressBarPtr ProgressBarPtr;
typedef SmartWin::RadioButton RadioButton;
typedef SmartWin::RadioButtonPtr RadioButtonPtr;
typedef SmartWin::Spinner Spinner;
typedef SmartWin::SpinnerPtr SpinnerPtr;
typedef SmartWin::Table Table;
typedef SmartWin::TablePtr TablePtr;
+ typedef SmartWin::TabSheet TabSheet;
+ typedef SmartWin::TabSheetPtr TabSheetPtr;
typedef SmartWin::ToolBar ToolBar;
typedef SmartWin::ToolBarPtr ToolBarPtr;
typedef SmartWin::Tree Tree;
Modified: dcplusplus/trunk/win32/FavoriteDirsPage.cpp
===================================================================
--- dcplusplus/trunk/win32/FavoriteDirsPage.cpp 2008-04-07 19:33:49 UTC (rev 1118)
+++ dcplusplus/trunk/win32/FavoriteDirsPage.cpp 2008-04-07 19:35:01 UTC (rev 1119)
@@ -52,7 +52,7 @@
WinUtil::setHelpIds(this, helpItems);
PropPage::translate(handle(), texts);
- directories = attachTable(IDC_FAVORITE_DIRECTORIES);
+ attachChild(directories, IDC_FAVORITE_DIRECTORIES);
directories->setTableStyle(LVS_EX_LABELTIP | LVS_EX_FULLROWSELECT);
TStringList columns;
Modified: dcplusplus/trunk/win32/HashProgressDlg.cpp
===================================================================
--- dcplusplus/trunk/win32/HashProgressDlg.cpp 2008-04-07 19:33:49 UTC (rev 1118)
+++ dcplusplus/trunk/win32/HashProgressDlg.cpp 2008-04-07 19:35:01 UTC (rev 1119)
@@ -23,6 +23,7 @@
#include "HashProgressDlg.h"
#include <dcpp/HashManager.h>
+#include <smartwin/widgets/ProgressBar.h>
HashProgressDlg::HashProgressDlg(SmartWin::Widget* parent, bool aAutoClose) :
SmartWin::WidgetFactory<SmartWin::ModalDialog>(parent),
@@ -43,7 +44,7 @@
setItemText(IDC_HASH_INDEXING, T_("Please wait while DC++ indexes your files (they won't be shared until they've been indexed)..."));
setItemText(IDC_STATISTICS, T_("Statistics"));
- progress = attachProgressBar(IDC_HASH_PROGRESS);
+ attachChild(progress, IDC_HASH_PROGRESS);
progress->setRange(0, 10000);
ButtonPtr ok = attachButton(IDOK);
Modified: dcplusplus/trunk/win32/HubListsDlg.cpp
===================================================================
--- dcplusplus/trunk/win32/HubListsDlg.cpp 2008-04-07 19:33:49 UTC (rev 1118)
+++ dcplusplus/trunk/win32/HubListsDlg.cpp 2008-04-07 19:35:01 UTC (rev 1119)
@@ -62,7 +62,7 @@
editBox = attachTextBox(IDC_LIST_EDIT_BOX);
- hubLists = attachTable(IDC_LIST_LIST);
+ attachChild(hubLists, IDC_LIST_LIST);
hubLists->setTableStyle(LVS_EX_LABELTIP | LVS_EX_FULLROWSELECT);
TStringList columns;
Modified: dcplusplus/trunk/win32/LogPage.cpp
===================================================================
--- dcplusplus/trunk/win32/LogPage.cpp 2008-04-07 19:33:49 UTC (rev 1118)
+++ dcplusplus/trunk/win32/LogPage.cpp 2008-04-07 19:35:01 UTC (rev 1119)
@@ -78,7 +78,7 @@
attachButton(IDC_BROWSE_LOG)->onClicked(std::tr1::bind(&LogPage::handleBrowseClicked, this));
- dataGrid = attachTable(IDC_LOG_OPTIONS);
+ attachChild(dataGrid, IDC_LOG_OPTIONS);
dataGrid->onRaw(std::tr1::bind(&LogPage::handleItemChanged, this), SmartWin::Message(WM_NOTIFY, LVN_ITEMCHANGED));
logFormat = attachTextBox(IDC_LOG_FORMAT);
Modified: dcplusplus/trunk/win32/SettingsDialog.cpp
===================================================================
--- dcplusplus/trunk/win32/SettingsDialog.cpp 2008-04-07 19:33:49 UTC (rev 1118)
+++ dcplusplus/trunk/win32/SettingsDialog.cpp 2008-04-07 19:35:01 UTC (rev 1119)
@@ -70,7 +70,7 @@
setText(T_("Settings"));
- pageTree = attachTreeView(IDC_SETTINGS_PAGES);
+ attachChild(pageTree, IDC_SETTINGS_PAGES);
pageTree->onSelectionChanged(std::tr1::bind(&SettingsDialog::selectionChanged, this));
{
Modified: dcplusplus/trunk/win32/UCPage.cpp
===================================================================
--- dcplusplus/trunk/win32/UCPage.cpp 2008-04-07 19:33:49 UTC (rev 1118)
+++ dcplusplus/trunk/win32/UCPage.cpp 2008-04-07 19:35:01 UTC (rev 1119)
@@ -59,7 +59,7 @@
PropPage::translate(handle(), texts);
PropPage::read(handle(), items);
- commands = attachTable(IDC_MENU_ITEMS);
+ attachChild(commands, IDC_MENU_ITEMS);
commands->setTableStyle(LVS_EX_LABELTIP | LVS_EX_FULLROWSELECT);
TStringList columns;
Modified: dcplusplus/trunk/win32/UploadPage.cpp
===================================================================
--- dcplusplus/trunk/win32/UploadPage.cpp 2008-04-07 19:33:49 UTC (rev 1118)
+++ dcplusplus/trunk/win32/UploadPage.cpp 2008-04-07 19:35:01 UTC (rev 1119)
@@ -78,7 +78,7 @@
PropPage::translate(handle(), texts);
PropPage::read(handle(), items);
- directories = attachTable(IDC_DIRECTORIES);
+ attachChild(directories, IDC_DIRECTORIES);
directories->setTableStyle(LVS_EX_LABELTIP | LVS_EX_FULLROWSELECT);
TStringList columns;
Modified: dcplusplus/trunk/win32/WaitingUsersFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/WaitingUsersFrame.cpp 2008-04-07 19:33:49 UTC (rev 1118)
+++ dcplusplus/trunk/win32/WaitingUsersFrame.cpp 2008-04-07 19:35:01 UTC (rev 1119)
@@ -36,7 +36,7 @@
// Create tree control
{
- queued = createTreeView(WinUtil::Seeds::treeView);
+ queued = addChild(WinUtil::Seeds::treeView);
addWidget(queued);
queued->onContextMenu(std::tr1::bind(&WaitingUsersFrame::handleContextMenu, this, _1));
queued->onChar(std::tr1::bind(&WaitingUsersFrame::handleChar, this, _1));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
