Menu
▾
▴
[Dcplusplus-commit] SF.net SVN: dcplusplus: [1123] dcplusplus/trunk
|
From: <arn...@us...> - 2008-04-07 21:26:41
|
Revision: 1123
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1123&view=rev
Author: arnetheduck
Date: 2008-04-07 14:26:29 -0700 (Mon, 07 Apr 2008)
Log Message:
-----------
fix combo boxes notifications
Modified Paths:
--------------
dcplusplus/trunk/smartwin/include/smartwin/widgets/ComboBox.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/Table.h
dcplusplus/trunk/smartwin/include/smartwin/widgets/Tree.h
dcplusplus/trunk/smartwin/source/widgets/ComboBox.cpp
dcplusplus/trunk/win32/PublicHubsFrame.cpp
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-04-02 22:43:31.286000013 +0200
committer: Jacek Sieka <arn...@gm...>
properties:
branch-nick: dcplusplus
+ timestamp: 2008-04-03 00:41:53.520999908 +0200
committer: poy
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
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
1095 arn...@gm...-20080402193851-6mu64vgep6tijith
1096 arn...@gm...-20080402203810-86zpxsx69q83zf3r
1097 arn...@gm...-20080402204331-so2e8n892o23pejr
+ 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
1095 arn...@gm...-20080402193851-6mu64vgep6tijith
1096 arn...@gm...-20080402203810-86zpxsx69q83zf3r
1097 arn...@gm...-20080402204331-so2e8n892o23pejr
1098 poy-20080402224153-225qylr2cfwhqrg7
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/ComboBox.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/ComboBox.h 2008-04-07 21:25:42 UTC (rev 1122)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/ComboBox.h 2008-04-07 21:26:29 UTC (rev 1123)
@@ -76,6 +76,7 @@
friend class AspectSelection<ComboBox, int>;
friend class AspectClickable<ComboBox>;
friend class AspectDblClickable<ComboBox>;
+
public:
/// Class type
typedef ComboBox ThisType;
@@ -145,32 +146,34 @@
void eraseImpl( int row );
void clearImpl();
size_t sizeImpl() const;
-
+
// Aspect expectation implementation
- static Message getSelectionChangedMessage();
+ static const Message& getSelectionChangedMessage();
// Aspect expectation implementation
- static Message getClickMessage();
+ static const Message& getClickMessage();
// Aspect expectation implementation
- static Message getDblClickMessage();
-
+ static const Message& getDblClickMessage();
};
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Implementation of class
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-inline Message ComboBox::getSelectionChangedMessage() {
- return Message( WM_COMMAND, MAKEWPARAM(0, CBN_SELENDOK) );
+inline const Message& ComboBox::getSelectionChangedMessage() {
+ static const Message retVal( WM_COMMAND, CBN_SELENDOK );
+ return retVal;
}
-inline Message ComboBox::getClickMessage() {
- return Message( WM_COMMAND, MAKEWPARAM(0, CBN_DROPDOWN) );
+inline const Message& ComboBox::getClickMessage() {
+ static const Message retVal( WM_COMMAND, CBN_DROPDOWN );
+ return retVal;
}
-inline Message ComboBox::getDblClickMessage() {
- return Message( WM_COMMAND, MAKEWPARAM(0, CBN_DBLCLK) );
+inline const Message& ComboBox::getDblClickMessage() {
+ static const Message retVal( WM_COMMAND, CBN_DBLCLK );
+ return retVal;
}
inline int ComboBox::getSelectedImpl() const {
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/Table.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/Table.h 2008-04-07 21:25:42 UTC (rev 1122)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/Table.h 2008-04-07 21:26:29 UTC (rev 1123)
@@ -100,6 +100,8 @@
friend class AspectColor<Table>;
friend class AspectData<Table, int>;
friend class AspectSelection<Table, int>;
+ friend class AspectClickable<Table>;
+ friend class AspectDblClickable<Table>;
public:
/// Class type
@@ -137,14 +139,6 @@
SORT_FLOAT
};
- // Aspect expectation implementation
- static const Message & getSelectionChangedMessage();
-
- // Contract needed by AspectClickable Aspect class
- static const Message & getClickMessage();
-
- // Contract needed by AspectDblClickable Aspect class
- static const Message & getDblClickMessage();
#ifdef PORT_ME
/// \ingroup EventHandlersTable
/// Validation event handler setter
@@ -535,6 +529,14 @@
void setSelectedImpl( int idx );
size_t countSelectedImpl() const;
+ // Aspect expectation implementation
+ static const Message & getSelectionChangedMessage();
+
+ // Contract needed by AspectClickable Aspect class
+ static const Message & getClickMessage();
+
+ // Contract needed by AspectDblClickable Aspect class
+ static const Message & getDblClickMessage();
};
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/Tree.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/Tree.h 2008-04-07 21:25:42 UTC (rev 1122)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/Tree.h 2008-04-07 21:26:29 UTC (rev 1123)
@@ -98,7 +98,9 @@
friend class AspectColor<Tree>;
friend class AspectData<Tree, HTREEITEM>;
friend class AspectSelection<Tree, HTREEITEM>;
-
+ friend class AspectClickable<Tree>;
+ friend class AspectDblClickable<Tree>;
+
public:
/// Class type
typedef Tree ThisType;
@@ -246,15 +248,6 @@
);
}
- // Contract needed by AspectClickable Aspect class
- static const Message & getSelectionChangedMessage();
-
- // Contract needed by AspectClickable Aspect class
- static const Message& getClickMessage();
-
- // Contract needed by AspectDblClickable Aspect class
- static const Message& getDblClickMessage();
-
/// Returns true if fired, else false
virtual bool tryFire( const MSG & msg, LRESULT & retVal );
@@ -295,6 +288,14 @@
void setSelectedImpl( HTREEITEM item );
size_t countSelectedImpl() const;
+ // Contract needed by AspectClickable Aspect class
+ static const Message & getSelectionChangedMessage();
+
+ // Contract needed by AspectClickable Aspect class
+ static const Message& getClickMessage();
+
+ // Contract needed by AspectDblClickable Aspect class
+ static const Message& getDblClickMessage();
};
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
Modified: dcplusplus/trunk/smartwin/source/widgets/ComboBox.cpp
===================================================================
--- dcplusplus/trunk/smartwin/source/widgets/ComboBox.cpp 2008-04-07 21:25:42 UTC (rev 1122)
+++ dcplusplus/trunk/smartwin/source/widgets/ComboBox.cpp 2008-04-07 21:26:29 UTC (rev 1123)
@@ -10,7 +10,7 @@
}
void ComboBox::create( const Seed & cs ) {
- ControlType::create(cs);
+ BaseType::create(cs);
if(cs.font)
setFont( cs.font );
if(cs.extended)
Modified: dcplusplus/trunk/win32/PublicHubsFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/PublicHubsFrame.cpp 2008-04-07 21:25:42 UTC (rev 1122)
+++ dcplusplus/trunk/win32/PublicHubsFrame.cpp 2008-04-07 21:26:29 UTC (rev 1123)
@@ -285,6 +285,8 @@
}
void PublicHubsFrame::updateList() {
+ dcdebug("PublicHubsFrame::updateList\n");
+
hubs->clear();
users = 0;
visibleHubs = 0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
