Menu
▾
▴
[Dcplusplus-commit] SF.net SVN: dcplusplus: [1113] dcplusplus/trunk
|
From: <arn...@us...> - 2008-04-07 19:25:44
|
Revision: 1113
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1113&view=rev
Author: arnetheduck
Date: 2008-04-07 12:24:43 -0700 (Mon, 07 Apr 2008)
Log Message:
-----------
remove radiobutton 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/Advanced3Page.cpp
dcplusplus/trunk/win32/CommandDlg.cpp
dcplusplus/trunk/win32/DownloadPage.cpp
dcplusplus/trunk/win32/MagnetDlg.cpp
dcplusplus/trunk/win32/NetworkPage.cpp
dcplusplus/trunk/win32/stdafx.h
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-04-02 15:31:05.088000059 +0200
committer: Jacek Sieka <arn...@gm...>
properties:
branch-nick: dcplusplus
+ timestamp: 2008-04-02 16:24:17.150000095 +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
+ 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
Modified: dcplusplus/trunk/smartwin/include/smartwin/SmartWin.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/SmartWin.h 2008-04-07 19:23:14 UTC (rev 1112)
+++ dcplusplus/trunk/smartwin/include/smartwin/SmartWin.h 2008-04-07 19:24:43 UTC (rev 1113)
@@ -46,12 +46,12 @@
#include "../SmartUtil.h"
#include "Anchors.h"
#include "Application.h"
-#include "Point.h"
-#include "Rectangle.h"
#include "ClipBoard.h"
#include "Cursor.h"
#include "LibraryLoader.h"
#include "Place.h"
+#include "Point.h"
+#include "Rectangle.h"
#include "Resource.h"
#include "Threads.h"
#include "WidgetFactory.h"
@@ -63,14 +63,15 @@
#include "resources/Icon.h"
#include "resources/ImageList.h"
#include "resources/Pen.h"
+#include "widgets/DateTime.h"
+#include "widgets/MDIChild.h"
+#include "widgets/MDIFrame.h"
+#include "widgets/MDIParent.h"
#include "widgets/ModalDialog.h"
#include "widgets/ModelessDialog.h"
-#include "widgets/DateTime.h"
+#include "widgets/RadioButton.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/WidgetFactory.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/WidgetFactory.h 2008-04-07 19:23:14 UTC (rev 1112)
+++ dcplusplus/trunk/smartwin/include/smartwin/WidgetFactory.h 2008-04-07 19:24:43 UTC (rev 1113)
@@ -40,7 +40,6 @@
#include "widgets/GroupBox.h"
#include "widgets/LoadDialog.h"
#include "widgets/ProgressBar.h"
-#include "widgets/RadioButton.h"
#include "widgets/SaveDialog.h"
#include "widgets/Label.h"
#include "widgets/StatusBar.h"
@@ -147,12 +146,6 @@
/// GroupBox object type.
typedef typename GroupBox::ObjectType GroupBoxPtr;
- /// RadioButton class type.
- typedef SmartWin::RadioButton RadioButton;
-
- /// RadioButton object type.
- typedef typename RadioButton::ObjectType RadioButtonPtr;
-
/// LoadFileDialog class type.
typedef SmartWin::LoadDialog LoadDialog;
@@ -347,16 +340,6 @@
*/
GroupBoxPtr attachGroupBox( unsigned id );
- /// Creates a Radio Button Control and returns a pointer to it.
- /** DON'T delete the returned pointer!!!
- */
- RadioButtonPtr createRadioButton( GroupBoxPtr parent, const typename RadioButton::Seed & cs = RadioButton::Seed() );
-
- /// Subclasses a Radio Button Control and returns a pointer to it.
- /** DON'T delete the returned pointer!!!
- */
- RadioButtonPtr attachRadioButton( unsigned id );
-
/// Creates a Comb Box and returns a pointer to it.
/** DON'T delete the returned pointer!!!
*/
@@ -568,25 +551,6 @@
}
template<typename ContainerWidgetType>
-typename WidgetFactory< ContainerWidgetType >::RadioButtonPtr
-WidgetFactory< ContainerWidgetType >::createRadioButton( GroupBoxPtr parent, const typename RadioButton::Seed & cs )
-{
-#ifdef PORT_ME
- RadioButtonPtr retVal = WidgetCreator< RadioButton >::create( parent, internal_::getTypedParentOrThrow < EventHandlerClass * >( this ), cs );
- parent->addChild( retVal );
- return retVal;
-#endif
-}
-
-template<typename ContainerWidgetType>
-typename WidgetFactory< ContainerWidgetType >::RadioButtonPtr
-WidgetFactory< ContainerWidgetType >::attachRadioButton( unsigned id )
-{
- RadioButtonPtr retVal = WidgetCreator< RadioButton >::attach( this, id );
- return retVal;
-}
-
-template<typename ContainerWidgetType>
typename WidgetFactory< ContainerWidgetType >::ComboBoxPtr
WidgetFactory< ContainerWidgetType >::createComboBox( const typename ComboBox::Seed & cs )
{
Modified: dcplusplus/trunk/smartwin/include/smartwin/forward.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/forward.h 2008-04-07 19:23:14 UTC (rev 1112)
+++ dcplusplus/trunk/smartwin/include/smartwin/forward.h 2008-04-07 19:24:43 UTC (rev 1113)
@@ -27,6 +27,9 @@
class MDIParent;
typedef MDIParent* MDIParentPtr;
+class RadioButton;
+typedef RadioButton* RadioButtonPtr;
+
class Spinner;
typedef Spinner* SpinnerPtr;
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/Composite.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/Composite.h 2008-04-07 19:23:14 UTC (rev 1112)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/Composite.h 2008-04-07 19:24:43 UTC (rev 1113)
@@ -42,14 +42,23 @@
typedef Control<Policy> BaseType;
// TODO Maybe move this to a separate class?
-
+ // This brings these classes into the namespace of classes that inherit from Composite
+ typedef SmartWin::Button Button;
typedef SmartWin::ButtonPtr ButtonPtr;
+ typedef SmartWin::CheckBox CheckBox;
typedef SmartWin::CheckBoxPtr CheckBoxPtr;
+ typedef SmartWin::DateTime DateTime;
typedef SmartWin::DateTimePtr DateTimePtr;
+ typedef SmartWin::Label Label;
typedef SmartWin::LabelPtr LabelPtr;
+ typedef SmartWin::Table Table;
typedef SmartWin::TablePtr TablePtr;
+ typedef SmartWin::Tree Tree;
typedef SmartWin::TreePtr TreePtr;
+ typedef SmartWin::Spinner Spinner;
typedef SmartWin::SpinnerPtr SpinnerPtr;
+ typedef SmartWin::RadioButton RadioButton;
+ typedef SmartWin::RadioButtonPtr RadioButtonPtr;
/// Seed class
/** This class contains all of the values needed to create the widget. It also
Modified: dcplusplus/trunk/win32/Advanced3Page.cpp
===================================================================
--- dcplusplus/trunk/win32/Advanced3Page.cpp 2008-04-07 19:23:14 UTC (rev 1112)
+++ dcplusplus/trunk/win32/Advanced3Page.cpp 2008-04-07 19:24:43 UTC (rev 1113)
@@ -117,7 +117,7 @@
PropPage::translate(handle(), texts);
PropPage::read(handle(), items, 0, 0);
- SpinnerPtr spinner = attachChild<SmartWin::Spinner>(IDC_SEARCH_HISTORY_SPIN);
+ SpinnerPtr spinner = attachChild<Spinner>(IDC_SEARCH_HISTORY_SPIN);
spinner->setRange(0, 100);
attachTextBox(IDC_ROLLBACK);
Modified: dcplusplus/trunk/win32/CommandDlg.cpp
===================================================================
--- dcplusplus/trunk/win32/CommandDlg.cpp 2008-04-07 19:23:14 UTC (rev 1112)
+++ dcplusplus/trunk/win32/CommandDlg.cpp 2008-04-07 19:24:43 UTC (rev 1113)
@@ -99,19 +99,19 @@
setItemText(IDC_SETTINGS_TO, T_("To"));
setItemText(IDC_USER_CMD_PREVIEW, T_("Text sent to hub"));
- separator = attachRadioButton(IDC_SETTINGS_SEPARATOR);
+ attachChild(separator, IDC_SETTINGS_SEPARATOR);
separator->setText(T_("Separator"));
separator->onClicked(std::tr1::bind(&CommandDlg::handleTypeChanged, this));
- raw = attachRadioButton(IDC_SETTINGS_RAW);
+ attachChild(raw, IDC_SETTINGS_RAW);
raw->setText(T_("Raw"));
raw->onClicked(std::tr1::bind(&CommandDlg::handleTypeChanged, this));
- chat = attachRadioButton(IDC_SETTINGS_CHAT);
+ attachChild(chat, IDC_SETTINGS_CHAT);
chat->setText(T_("Chat"));
chat->onClicked(std::tr1::bind(&CommandDlg::handleTypeChanged, this));
- PM = attachRadioButton(IDC_SETTINGS_PM);
+ attachChild(PM, IDC_SETTINGS_PM);
PM->setText(T_("PM"));
PM->onClicked(std::tr1::bind(&CommandDlg::handleTypeChanged, this));
Modified: dcplusplus/trunk/win32/DownloadPage.cpp
===================================================================
--- dcplusplus/trunk/win32/DownloadPage.cpp 2008-04-07 19:23:14 UTC (rev 1112)
+++ dcplusplus/trunk/win32/DownloadPage.cpp 2008-04-07 19:24:43 UTC (rev 1113)
@@ -86,7 +86,7 @@
attachButton(IDC_SETTINGS_LIST_CONFIG)->onClicked(std::tr1::bind(&DownloadPage::handleConfigHubLists, this));
- SpinnerPtr spinner = attachChild<SmartWin::Spinner>(IDC_SLOTSSPIN);
+ SpinnerPtr spinner = attachChild<Spinner>(IDC_SLOTSSPIN);
spinner->setRange(0, 100);
attachChild(spinner, IDC_SPEEDSPIN);
Modified: dcplusplus/trunk/win32/MagnetDlg.cpp
===================================================================
--- dcplusplus/trunk/win32/MagnetDlg.cpp 2008-04-07 19:23:14 UTC (rev 1112)
+++ dcplusplus/trunk/win32/MagnetDlg.cpp 2008-04-07 19:24:43 UTC (rev 1113)
@@ -53,12 +53,12 @@
//queue->onClicked(std::tr1::bind(&MagnetDlg::handleRadioButtonClicked, this, queue));
::ShowWindow(getItem(IDC_MAGNET_1_QUEUE), false);
- search = attachRadioButton(IDC_MAGNET_2_SEARCH);
+ attachChild(search, IDC_MAGNET_2_SEARCH);
search->setText(T_("Start a search for this file"));
search->setFocus();
//search->onClicked(std::tr1::bind(&MagnetDlg::handleRadioButtonClicked, this, search));
- doNothing = attachRadioButton(IDC_MAGNET_3_NOTHING);
+ attachChild(doNothing, IDC_MAGNET_3_NOTHING);
doNothing->setText(T_("Do nothing"));
//doNothing->onClicked(std::tr1::bind(&MagnetDlg::handleRadioButtonClicked, this, doNothing));
Modified: dcplusplus/trunk/win32/NetworkPage.cpp
===================================================================
--- dcplusplus/trunk/win32/NetworkPage.cpp 2008-04-07 19:23:14 UTC (rev 1112)
+++ dcplusplus/trunk/win32/NetworkPage.cpp 2008-04-07 19:24:43 UTC (rev 1113)
@@ -121,7 +121,7 @@
fixControls();
-#define RADIO_ATTACH(id) attachRadioButton(id)->onClicked((std::tr1::bind(&NetworkPage::fixControls, this)))
+#define RADIO_ATTACH(id) attachChild<RadioButton>(id)->onClicked((std::tr1::bind(&NetworkPage::fixControls, this)))
RADIO_ATTACH(IDC_DIRECT);
RADIO_ATTACH(IDC_FIREWALL_UPNP);
RADIO_ATTACH(IDC_FIREWALL_NAT);
Modified: dcplusplus/trunk/win32/stdafx.h
===================================================================
--- dcplusplus/trunk/win32/stdafx.h 2008-04-07 19:23:14 UTC (rev 1112)
+++ dcplusplus/trunk/win32/stdafx.h 2008-04-07 19:24:43 UTC (rev 1113)
@@ -35,6 +35,7 @@
#include <smartwin/widgets/Label.h>
#include <smartwin/widgets/ModalDialog.h>
#include <smartwin/widgets/ModelessDialog.h>
+#include <smartwin/widgets/RadioButton.h>
#include <smartwin/widgets/Spinner.h>
#include <smartwin/widgets/Table.h>
#include <smartwin/widgets/TextBox.h>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
