Menu
▾
▴
[Dcplusplus-commit] SF.net SVN: dcplusplus: [1114] dcplusplus/trunk
|
From: <arn...@us...> - 2008-04-07 19:27:17
|
Revision: 1114
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1114&view=rev
Author: arnetheduck
Date: 2008-04-07 12:26:50 -0700 (Mon, 07 Apr 2008)
Log Message:
-----------
remove window, container from factory
Modified Paths:
--------------
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/stdafx.h
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-04-02 16:24:17.150000095 +0200
committer: Jacek Sieka <arn...@gm...>
properties:
branch-nick: dcplusplus
+ timestamp: 2008-04-02 16:44:59.851999998 +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
+ 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
Modified: dcplusplus/trunk/smartwin/include/smartwin/SmartWin.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/SmartWin.h 2008-04-07 19:24:43 UTC (rev 1113)
+++ dcplusplus/trunk/smartwin/include/smartwin/SmartWin.h 2008-04-07 19:26:50 UTC (rev 1114)
@@ -63,6 +63,7 @@
#include "resources/Icon.h"
#include "resources/ImageList.h"
#include "resources/Pen.h"
+#include "widgets/Container.h"
#include "widgets/DateTime.h"
#include "widgets/MDIChild.h"
#include "widgets/MDIFrame.h"
@@ -72,6 +73,7 @@
#include "widgets/RadioButton.h"
#include "widgets/Slider.h"
#include "widgets/Spinner.h"
+#include "widgets/Window.h"
namespace sw = SmartWin;
Modified: dcplusplus/trunk/smartwin/include/smartwin/WidgetFactory.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/WidgetFactory.h 2008-04-07 19:24:43 UTC (rev 1113)
+++ dcplusplus/trunk/smartwin/include/smartwin/WidgetFactory.h 2008-04-07 19:26:50 UTC (rev 1114)
@@ -35,7 +35,6 @@
#include "widgets/MessageBox.h"
#include "widgets/CheckBox.h"
#include "widgets/ComboBox.h"
-#include "widgets/Container.h"
#include "widgets/Table.h"
#include "widgets/GroupBox.h"
#include "widgets/LoadDialog.h"
@@ -48,7 +47,6 @@
#include "widgets/TextBox.h"
#include "widgets/Tree.h"
#include "widgets/ToolTip.h"
-#include "widgets/Window.h"
#include "WidgetFactoryPlatformImplementation.h"
#include "WidgetCreator.h"
@@ -173,18 +171,6 @@
/// CheckBox object type.
typedef typename CheckBox::ObjectType CheckBoxPtr;
- /// WidgetChildWindow class type.
- typedef SmartWin::Container Container;
-
- /// WidgetChildWindow object type.
- typedef typename Container::ObjectType ContainerPtr;
-
- /// Window class type.
- typedef SmartWin::Window Window;
-
- /// Window object type.
- typedef typename Window::ObjectType WindowPtr;
-
/// ProgressBar class type.
typedef SmartWin::ProgressBar ProgressBar;
@@ -254,11 +240,6 @@
*/
CheckBoxPtr attachCheckBox( unsigned id );
- /// Creates a child window and returns a pointer to it.
- /** DON'T delete the returned pointer!!!
- */
- ContainerPtr createContainer( const typename Container::Seed & cs = Container::Seed() );
-
/// Creates a Tree View and returns a pointer to it.
/** DON'T delete the returned pointer!!!
*/
@@ -446,13 +427,6 @@
}
template<typename ContainerWidgetType>
-typename WidgetFactory< ContainerWidgetType >::ContainerPtr
-WidgetFactory< ContainerWidgetType >::createContainer( const typename Container::Seed & cs )
-{
- return WidgetCreator< Container >::create( this, cs );
-}
-
-template<typename ContainerWidgetType>
typename WidgetFactory< ContainerWidgetType >::TreePtr
WidgetFactory< ContainerWidgetType >::createTreeView( const typename Tree::Seed & cs )
{
Modified: dcplusplus/trunk/smartwin/include/smartwin/forward.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/forward.h 2008-04-07 19:24:43 UTC (rev 1113)
+++ dcplusplus/trunk/smartwin/include/smartwin/forward.h 2008-04-07 19:26:50 UTC (rev 1114)
@@ -12,6 +12,9 @@
class CheckBox;
typedef CheckBox* CheckBoxPtr;
+class Container;
+typedef Container* ContainerPtr;
+
class DateTime;
typedef DateTime* DateTimePtr;
@@ -42,6 +45,8 @@
class Tree;
typedef Tree* TreePtr;
+class Window;
+typedef Window* WindowPtr;
}
#endif /*FORWARD_H_*/
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/Composite.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/Composite.h 2008-04-07 19:24:43 UTC (rev 1113)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/Composite.h 2008-04-07 19:26:50 UTC (rev 1114)
@@ -43,10 +43,13 @@
// TODO Maybe move this to a separate class?
// This brings these classes into the namespace of classes that inherit from Composite
+ // Note; only child windows should be here...
typedef SmartWin::Button Button;
typedef SmartWin::ButtonPtr ButtonPtr;
typedef SmartWin::CheckBox CheckBox;
typedef SmartWin::CheckBoxPtr CheckBoxPtr;
+ typedef SmartWin::Container Container;
+ typedef SmartWin::ContainerPtr ContainerPtr;
typedef SmartWin::DateTime DateTime;
typedef SmartWin::DateTimePtr DateTimePtr;
typedef SmartWin::Label Label;
Modified: dcplusplus/trunk/win32/stdafx.h
===================================================================
--- dcplusplus/trunk/win32/stdafx.h 2008-04-07 19:24:43 UTC (rev 1113)
+++ dcplusplus/trunk/win32/stdafx.h 2008-04-07 19:26:50 UTC (rev 1114)
@@ -32,6 +32,7 @@
#include <smartwin/resources/Pen.h>
#include <smartwin/widgets/Button.h>
#include <smartwin/widgets/ComboBox.h>
+#include <smartwin/widgets/Container.h>
#include <smartwin/widgets/Label.h>
#include <smartwin/widgets/ModalDialog.h>
#include <smartwin/widgets/ModelessDialog.h>
@@ -40,6 +41,7 @@
#include <smartwin/widgets/Table.h>
#include <smartwin/widgets/TextBox.h>
#include <smartwin/widgets/Tree.h>
+#include <smartwin/widgets/Window.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.
|
