Menu
▾
▴
[Dcplusplus-commit] SF.net SVN: dcplusplus: [1110] dcplusplus/trunk
|
From: <arn...@us...> - 2008-04-07 19:21:16
|
Revision: 1110
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1110&view=rev
Author: arnetheduck
Date: 2008-04-07 12:20:49 -0700 (Mon, 07 Apr 2008)
Log Message:
-----------
reducing include set
Modified Paths:
--------------
dcplusplus/trunk/smartwin/include/smartwin/SmartWin.h
dcplusplus/trunk/smartwin/include/smartwin/Widget.h
dcplusplus/trunk/smartwin/include/smartwin/WidgetFactory.h
dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectDialog.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/Button.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/Composite.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/DateTime.h
dcplusplus/trunk/win32/UploadPage.cpp
dcplusplus/trunk/win32/stdafx.h
Added Paths:
-----------
dcplusplus/trunk/smartwin/include/smartwin/forward.h
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-04-01 20:55:30.028000116 +0200
committer: Jacek Sieka <arn...@gm...>
properties:
branch-nick: dcplusplus
+ timestamp: 2008-04-01 23:26:16.296000004 +0200
committer: Jacek Sieka <arn...@gm...>
properties:
branch-nick: dcplusplus
Name: bzr:file-ids
-
+ smartwin/include/smartwin/forward.h forward.h-20080401212555-mepp3hg0ki55396w-1
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
+ 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
Modified: dcplusplus/trunk/smartwin/include/smartwin/SmartWin.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/SmartWin.h 2008-04-07 19:19:11 UTC (rev 1109)
+++ dcplusplus/trunk/smartwin/include/smartwin/SmartWin.h 2008-04-07 19:20:49 UTC (rev 1110)
@@ -65,6 +65,12 @@
#include "resources/Pen.h"
#include "widgets/ModalDialog.h"
#include "widgets/ModelessDialog.h"
+#include "widgets/DateTime.h"
+#include "widgets/Slider.h"
+#include "widgets/Spinner.h"
+#include "widgets/MDIChild.h"
+#include "widgets/MDIFrame.h"
+#include "widgets/MDIParent.h"
namespace sw = SmartWin;
Modified: dcplusplus/trunk/smartwin/include/smartwin/Widget.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/Widget.h 2008-04-07 19:19:11 UTC (rev 1109)
+++ dcplusplus/trunk/smartwin/include/smartwin/Widget.h 2008-04-07 19:20:49 UTC (rev 1110)
@@ -28,6 +28,7 @@
#ifndef Widget_h
#define Widget_h
+#include "forward.h"
#include "Atom.h"
#include "Rectangle.h"
#include "Message.h"
Modified: dcplusplus/trunk/smartwin/include/smartwin/WidgetFactory.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/WidgetFactory.h 2008-04-07 19:19:11 UTC (rev 1109)
+++ dcplusplus/trunk/smartwin/include/smartwin/WidgetFactory.h 2008-04-07 19:20:49 UTC (rev 1110)
@@ -37,17 +37,11 @@
#include "widgets/ComboBox.h"
#include "widgets/Container.h"
#include "widgets/Table.h"
-#include "widgets/DateTime.h"
#include "widgets/GroupBox.h"
#include "widgets/LoadDialog.h"
-#include "widgets/MDIChild.h"
-#include "widgets/MDIFrame.h"
-#include "widgets/MDIParent.h"
#include "widgets/ProgressBar.h"
#include "widgets/RadioButton.h"
#include "widgets/SaveDialog.h"
-#include "widgets/Slider.h"
-#include "widgets/Spinner.h"
#include "widgets/Label.h"
#include "widgets/StatusBar.h"
#include "widgets/WidgetTabView.h"
@@ -56,7 +50,6 @@
#include "widgets/Tree.h"
#include "widgets/ToolTip.h"
#include "widgets/Window.h"
-#include "widgets/Frame.h"
#include "WidgetFactoryPlatformImplementation.h"
#include "WidgetCreator.h"
@@ -136,12 +129,6 @@
/// StatusBarSections object type.
typedef typename StatusBarSections::ObjectType StatusBarSectionsPtr;
- /// MDIWindow class type.
- typedef SmartWin::MDIParent MDIParent;
-
- /// MDIWindow object type.
- typedef typename MDIParent::ObjectType MDIParentPtr;
-
/// TabView class type.
typedef SmartWin::WidgetTabView WidgetTabView;
@@ -154,18 +141,6 @@
/// TabSheet object type.
typedef typename TabSheet::ObjectType TabSheetPtr;
- /// Slider class type.
- typedef SmartWin::Slider Slider;
-
- /// Slider object type.
- typedef typename Slider::ObjectType SliderPtr;
-
- /// Spinner class type.
- typedef SmartWin::Spinner Spinner;
-
- /// Spinner object type.
- typedef typename Spinner::ObjectType SpinnerPtr;
-
/// GroupBox class type.
typedef SmartWin::GroupBox GroupBox;
@@ -205,12 +180,6 @@
/// CheckBox object type.
typedef typename CheckBox::ObjectType CheckBoxPtr;
- /// DateTimePicker class type.
- typedef SmartWin::DateTime DateTime;
-
- /// DateTimePicker object type.
- typedef typename DateTime::ObjectType DateTimePtr;
-
/// WidgetChildWindow class type.
typedef SmartWin::Container Container;
@@ -223,12 +192,6 @@
/// Window object type.
typedef typename Window::ObjectType WindowPtr;
- /// MDIFrame class type.
- typedef SmartWin::MDIFrame MDIFrame;
-
- /// Window object type.
- typedef typename MDIFrame::ObjectType MDIFramePtr;
-
/// ProgressBar class type.
typedef SmartWin::ProgressBar ProgressBar;
@@ -345,11 +308,6 @@
*/
ButtonPtr createButton( const typename Button::Seed & cs = Button::Seed() );
- /// Creates a Button Control and returns a pointer to it.
- /** DON'T delete the returned pointer!!!
- */
- MDIParentPtr createMDIParent( const typename MDIParent::Seed & cs = MDIParent::Seed() );
-
/// Creates a Tab View and returns a pointer to it.
/** DON'T delete the returned pointer!!!
*/
@@ -360,16 +318,6 @@
*/
TabSheetPtr createTabSheet( const typename TabSheet::Seed & cs = TabSheet::Seed() );
- /// Creates a Slider Control and returns a pointer to it.
- /** DON'T delete the returned pointer!!!
- */
- SliderPtr createSlider( const typename Slider::Seed & cs = Slider::Seed() );
-
- /// Creates a Spinner Control and returns a pointer to it.
- /** DON'T delete the returned pointer!!!
- */
- SpinnerPtr createSpinner( const typename Spinner::Seed & cs = Spinner::Seed() );
-
/// Creates a Progress Bar Control and returns a pointer to it.
/** DON'T delete the returned pointer!!!
*/
@@ -389,22 +337,6 @@
*/
ProgressBarPtr attachProgressBar( unsigned id );
- /// \ingroup SubclassDialog
- /// Subclasses a Slider 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.
- */
- SliderPtr attachSlider( unsigned id );
-
- /// \ingroup SubclassDialog
- /// Subclasses a Spinner 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.
- */
- SpinnerPtr attachSpinner( unsigned id );
-
/// Creates a Group Box Control and returns a pointer to it.
/** DON'T delete the returned pointer!!!
*/
@@ -415,16 +347,6 @@
*/
GroupBoxPtr attachGroupBox( unsigned id );
- /// Creates a DateTime Picker Control and returns a pointer to it.
- /** DON'T delete the returned pointer!!!
- */
- DateTimePtr createDateTimePicker( const typename DateTime::Seed & cs = DateTime::Seed() );
-
- /// Suvclasses a DateTime Picker Control and returns a pointer to it.
- /** DON'T delete the returned pointer!!!
- */
- DateTimePtr attachDateTimePicker( unsigned id );
-
/// Creates a Radio Button Control and returns a pointer to it.
/** DON'T delete the returned pointer!!!
*/
@@ -597,13 +519,6 @@
}
template<typename ContainerWidgetType>
-typename WidgetFactory< ContainerWidgetType >::MDIParentPtr
-WidgetFactory< ContainerWidgetType >::createMDIParent( const typename MDIParent::Seed & cs )
-{
- return WidgetCreator< MDIParent >::create( this, cs );
-}
-
-template<typename ContainerWidgetType>
typename WidgetFactory< ContainerWidgetType >::WidgetTabViewPtr
WidgetFactory< ContainerWidgetType >::createTabView( const typename WidgetTabView::Seed & cs )
{
@@ -618,20 +533,6 @@
}
template<typename ContainerWidgetType>
-typename WidgetFactory< ContainerWidgetType >::SliderPtr
-WidgetFactory< ContainerWidgetType >::createSlider( const typename Slider::Seed & cs )
-{
- return WidgetCreator< Slider >::create( this, cs );
-}
-
-template<typename ContainerWidgetType>
-typename WidgetFactory< ContainerWidgetType >::SpinnerPtr
-WidgetFactory< ContainerWidgetType >::createSpinner( const typename Spinner::Seed & cs )
-{
- return WidgetCreator< Spinner >::create( this, cs );
-}
-
-template<typename ContainerWidgetType>
typename WidgetFactory< ContainerWidgetType >::ProgressBarPtr
WidgetFactory< ContainerWidgetType >::createProgressBar( const typename ProgressBar::Seed & cs )
{
@@ -653,20 +554,6 @@
}
template<typename ContainerWidgetType>
-typename WidgetFactory< ContainerWidgetType >::SliderPtr
-WidgetFactory< ContainerWidgetType >::attachSlider( unsigned id )
-{
- return WidgetCreator< Slider >::attach( this, id );
-}
-
-template<typename ContainerWidgetType>
-typename WidgetFactory< ContainerWidgetType >::SpinnerPtr
-WidgetFactory< ContainerWidgetType >::attachSpinner( unsigned id )
-{
- return WidgetCreator< Spinner >::attach( this, id );
-}
-
-template<typename ContainerWidgetType>
typename WidgetFactory< ContainerWidgetType >::GroupBoxPtr
WidgetFactory< ContainerWidgetType >::createGroupBox( const typename GroupBox::Seed & cs )
{
@@ -681,20 +568,6 @@
}
template<typename ContainerWidgetType>
-typename WidgetFactory< ContainerWidgetType >::DateTimePtr
-WidgetFactory< ContainerWidgetType >::createDateTimePicker( const typename DateTime::Seed & cs )
-{
- return WidgetCreator< DateTime >::create( this, cs );
-}
-
-template<typename ContainerWidgetType>
-typename WidgetFactory< ContainerWidgetType >::DateTimePtr
-WidgetFactory< ContainerWidgetType >::attachDateTimePicker( unsigned id )
-{
- return WidgetCreator< DateTime >::attach( this, id );
-}
-
-template<typename ContainerWidgetType>
typename WidgetFactory< ContainerWidgetType >::RadioButtonPtr
WidgetFactory< ContainerWidgetType >::createRadioButton( GroupBoxPtr parent, const typename RadioButton::Seed & cs )
{
Modified: dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectDialog.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectDialog.h 2008-04-07 19:19:11 UTC (rev 1109)
+++ dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectDialog.h 2008-04-07 19:20:49 UTC (rev 1110)
@@ -3,18 +3,34 @@
#include "../../SmartUtil.h"
+#include <type_traits>
+
namespace SmartWin {
-template<typename T>
+template<typename WidgetType>
class AspectDialog {
+ WidgetType& W() { return *static_cast<WidgetType*>(this); }
+ HWND H() { return W().handle(); }
+
public:
HWND getItem(int id) {
- return ::GetDlgItem(static_cast<T*>(this)->handle(), id);
+ return ::GetDlgItem(H(), id);
}
void setItemText(int id, const SmartUtil::tstring& text) {
- ::SetDlgItemText(static_cast<T*>(this)->handle(), id, text.c_str());
+ ::SetDlgItemText(H(), id, text.c_str());
}
+
+ template<typename T>
+ void attachChild(T& childPtr, int id) {
+ childPtr = attachChild<typename std::tr1::remove_pointer<T>::type >(id);
+ }
+
+ template<typename T>
+ typename T::ObjectType attachChild(int id) {
+ return WidgetCreator<T>::attach(&W(), id);
+ }
+
};
}
Added: dcplusplus/trunk/smartwin/include/smartwin/forward.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/forward.h (rev 0)
+++ dcplusplus/trunk/smartwin/include/smartwin/forward.h 2008-04-07 19:20:49 UTC (rev 1110)
@@ -0,0 +1,44 @@
+#ifndef FORWARD_H_
+#define FORWARD_H_
+
+namespace SmartWin {
+
+template< class WidgetType >
+class WidgetCreator;
+
+class Button;
+typedef Button* ButtonPtr;
+
+class CheckBox;
+typedef CheckBox* CheckBoxPtr;
+
+class DateTime;
+typedef DateTime* DateTimePtr;
+
+class Label;
+typedef Label* LabelPtr;
+
+class MDIChild;
+typedef MDIChild* MDIChildPtr;
+
+class MDIFrame;
+typedef MDIFrame* MDIFramePtr;
+
+class MDIParent;
+typedef MDIParent* MDIParentPtr;
+
+class Spinner;
+typedef Spinner* SpinnerPtr;
+
+class Slider;
+typedef Slider* SliderPtr;
+
+class Table;
+typedef Table* TablePtr;
+
+class Tree;
+typedef Tree* TreePtr;
+
+
+}
+#endif /*FORWARD_H_*/
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/Button.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/Button.h 2008-04-07 19:19:11 UTC (rev 1109)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/Button.h 2008-04-07 19:20:49 UTC (rev 1110)
@@ -13,8 +13,6 @@
namespace SmartWin {
// Forward declaring friends
-template< class WidgetType >
-class WidgetCreator;
/** Common stuff for all buttons */
class Button :
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/Composite.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/Composite.h 2008-04-07 19:19:11 UTC (rev 1109)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/Composite.h 2008-04-07 19:20:49 UTC (rev 1110)
@@ -1,6 +1,8 @@
#ifndef COMPOSITE_H_
#define COMPOSITE_H_
+#include "../forward.h"
+
#include "../aspects/AspectActivate.h"
#include "../aspects/AspectCommand.h"
#include "../aspects/AspectDragDrop.h"
@@ -39,6 +41,16 @@
typedef Control<Policy> BaseType;
+ // TODO Maybe move this to a separate class?
+
+ typedef SmartWin::ButtonPtr ButtonPtr;
+ typedef SmartWin::CheckBoxPtr CheckBoxPtr;
+ typedef SmartWin::DateTimePtr DateTimePtr;
+ typedef SmartWin::LabelPtr LabelPtr;
+ typedef SmartWin::TablePtr TablePtr;
+ typedef SmartWin::TreePtr TreePtr;
+ typedef SmartWin::SpinnerPtr SpinnerPtr;
+
/// 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/smartwin/include/smartwin/widgets/DateTime.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/DateTime.h 2008-04-07 19:19:11 UTC (rev 1109)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/DateTime.h 2008-04-07 19:20:49 UTC (rev 1110)
@@ -39,10 +39,6 @@
{
// begin namespace SmartWin
-// Forward declaring friends
-template< class WidgetType >
-class WidgetCreator;
-
/// DateTimePicker Control class
/** \ingroup WidgetControls
* \WidgetUsageInfo
Modified: dcplusplus/trunk/win32/UploadPage.cpp
===================================================================
--- dcplusplus/trunk/win32/UploadPage.cpp 2008-04-07 19:19:11 UTC (rev 1109)
+++ dcplusplus/trunk/win32/UploadPage.cpp 2008-04-07 19:20:49 UTC (rev 1110)
@@ -111,19 +111,20 @@
total = attachLabel(IDC_TOTAL);
total->setText(Text::toT(Util::formatBytes(ShareManager::getInstance()->getShareSize())));
- ButtonPtr button = attachButton(IDC_RENAME);
+ ButtonPtr button = attachChild<SmartWin::Button>(IDC_RENAME);
button->onClicked(std::tr1::bind(&UploadPage::handleRenameClicked, this));
- button = attachButton(IDC_REMOVE);
+ attachChild(button, IDC_REMOVE);
button->onClicked(std::tr1::bind(&UploadPage::handleRemoveClicked, this));
- button = attachButton(IDC_ADD);
+ attachChild(button, IDC_ADD);
button->onClicked(std::tr1::bind(&UploadPage::handleAddClicked, this));
- SpinnerPtr spinner = attachSpinner(IDC_SLOTSPIN);
+ SpinnerPtr spinner;
+ attachChild(spinner, IDC_SLOTSPIN);
spinner->setRange(1, UD_MAXVAL);
- spinner = attachSpinner(IDC_MIN_UPLOAD_SPIN);
+ attachChild(spinner, IDC_MIN_UPLOAD_SPIN);
spinner->setRange(0, UD_MAXVAL);
attachTextBox(IDC_MIN_UPLOAD_SPEED);
Modified: dcplusplus/trunk/win32/stdafx.h
===================================================================
--- dcplusplus/trunk/win32/stdafx.h 2008-04-07 19:19:11 UTC (rev 1109)
+++ dcplusplus/trunk/win32/stdafx.h 2008-04-07 19:20:49 UTC (rev 1110)
@@ -22,12 +22,23 @@
#include <dcpp/stdinc.h>
#include <dcpp/DCPlusPlus.h>
-#include <SmartWin.h>
#include <shlobj.h>
#include <malloc.h>
#include <htmlhelp.h>
#include <libintl.h>
+#include <smartwin/WidgetFactory.h>
+#include <smartwin/resources/Accelerator.h>
+#include <smartwin/widgets/Button.h>
+#include <smartwin/widgets/ComboBox.h>
+#include <smartwin/widgets/Label.h>
+#include <smartwin/widgets/ModalDialog.h>
+#include <smartwin/widgets/ModelessDialog.h>
+#include <smartwin/widgets/Spinner.h>
+#include <smartwin/widgets/Table.h>
+#include <smartwin/widgets/TextBox.h>
+#include <smartwin/widgets/Tree.h>
+
enum {
WM_SPEAKER = WM_APP + 500
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
