From: <arn...@us...> - 2008-04-24 13:44:39
|
Revision: 1209 http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1209&view=rev Author: arnetheduck Date: 2008-04-24 06:44:17 -0700 (Thu, 24 Apr 2008) Log Message: ----------- remove some exceptions in Menu and Table Modified Paths: -------------- dcplusplus/trunk/dwt/include/dwt/widgets/Menu.h dcplusplus/trunk/dwt/include/dwt/widgets/Table.h dcplusplus/trunk/dwt/src/widgets/Menu.cpp dcplusplus/trunk/dwt/src/widgets/Table.cpp Property Changed: ---------------- dcplusplus/trunk/ Property changes on: dcplusplus/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-04-20 22:09:05.279999971 +0200 committer: Jacek Sieka <arn...@gm...> properties: branch-nick: dcplusplus + timestamp: 2008-04-21 13:01:51.312999964 +0200 committer: poy <po...@12...> properties: branch-nick: repo 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 1098 poy-20080402224153-225qylr2cfwhqrg7 1099 mrmikejj-20080403125112-o8polh8rkn62umyh 1100 arn...@gm...-20080403125139-8xub76j1xazhfxna 1101 po...@12...-20080403140544-13kockkjho883nb4 1102 po...@12...-20080403143012-bxghtoodiolugpbs 1103 arn...@gm...-20080403190809-bbi4bz5rfcvjnt20 1104 arn...@gm...-20080403205410-czxru1vcg1s4wcws 1105 arn...@gm...-20080403213124-54spdrwszgyimd90 1106 po...@12...-20080404002406-aj74x5tngi6mmmj1 1107 arn...@gm...-20080404122415-mjy07qzbaxyhagra 1108 po...@12...-20080404145445-84lyk5tyy3b3br14 1109 po...@12...-20080404231417-v4v8x7u3f0hm0ejc 1110 po...@12...-20080405001107-14d1ojjof8xhvcj8 1111 arn...@gm...-20080405071929-jmnrul21sxx04kky 1112 arn...@gm...-20080405080105-9qbda7be0pi7y1ai 1113 po...@12...-20080405154555-yuj2n5kyndfjlpsf 1114 po...@12...-20080405220250-8y09d0samsj8ja94 1115 po...@12...-20080406134101-4860ytb61sbu3yhg 1116 po...@12...-20080406155849-2wzxzuzs5m8zpk0g 1117 po...@12...-20080406164835-bv5dydhm3qqydsty 1118 arn...@gm...-20080406210237-c7tyfgiz2sjgv044 1119 po...@12...-20080407114423-4yajg1rffidq76bj 1120 arn...@gm...-20080407194826-c42t4bjzw4vflejn 1121 po...@12...-20080407214303-o7ul1bvcn6gvaoc9 1122 po...@12...-20080407220647-r7f3em92til5j67s 1123 po...@12...-20080408212439-54t3bqlhvw1nu4xc 1124 arn...@gm...-20080409193708-y6erfzwrcb1seet3 1125 arn...@gm...-20080409195827-ub6t2s3wdf28nfpz 1126 po...@12...-20080409215055-1zmqhhm2859878c1 1127 arn...@gm...-20080410102447-l4es4cbukkqwcnpc 1128 arn...@gm...-20080410214118-b70g50tl27cq9q29 1129 arn...@gm...-20080411074730-w1pu78qigtx87lx3 1130 arn...@gm...-20080411090724-kwdj9pg9hrv1xhwb 1131 po...@12...-20080411153057-tn7zhxqk0z7ceref 1132 arn...@gm...-20080411200946-ierqlg8v9vzj18n2 1133 arn...@gm...-20080411201718-ecshulwd7ic0wdci 1134 arn...@gm...-20080411204047-jc9vzcsf32j38dvc 1135 arn...@gm...-20080411205445-ojuz2a29yq8ww37j 1136 arn...@gm...-20080411214746-r420xmdgo35pkweb 1137 po...@12...-20080412010723-cibh8r0itlzqyt3f 1138 arn...@gm...-20080412200504-6qfeqnsghxgrk775 1139 arn...@gm...-20080413095435-2pkfb407hk8j54te 1140 arn...@gm...-20080413133927-zw2tpz8o8p3izyix 1141 arn...@gm...-20080413165025-ug342rxtq4blxck5 1142 arn...@gm...-20080413182618-6ihabn0tii6gb2m2 1143 arn...@gm...-20080413184517-9p08tedakta1h762 1144 arn...@gm...-20080413193655-kc98lx7kpzo42q43 1145 arn...@gm...-20080414132947-pguvkuzvyadukssc 1146 arn...@gm...-20080414133544-pxwxm9kcvw0k0vf3 1147 po...@12...-20080414174341-hw1im7ysymscpiq0 1148 arn...@gm...-20080414181459-5gu852lneflgf5d6 1149 po...@12...-20080414205719-d80e75fsl8zzi6je 1150 arn...@gm...-20080414211616-835ve71r1qdlbhb4 1151 arn...@gm...-20080415080409-4cid9q7opng8ijav 1152 arn...@gm...-20080415124540-roduj23x442jeefn 1153 arn...@gm...-20080415141450-cld2ym4s50uu31q7 1154 po...@12...-20080415143018-4emcs3u1fquzsu1f 1155 arn...@gm...-20080415174958-wfqu5kga5pe39xvc 1156 po...@12...-20080415182942-2ux0yn8immkrz7ch 1157 po...@12...-20080415185700-gdgpyn414bf4behz 1158 po...@12...-20080415202535-cvevdgrawpilji5b 1159 po...@12...-20080415214801-lgb1429qdm4ti6ub 1160 po...@12...-20080416123247-6dw18ea0lk4m5q8q 1161 po...@12...-20080416135834-6mtzcfy7pzxqfnq0 1162 po...@12...-20080416181626-0ex66f1lv1maf38l 1163 arn...@gm...-20080416183603-yxbj16t2nd8rdzzd 1164 arn...@gm...-20080416200700-wncbhytfixz9b15u 1165 po...@12...-20080416200941-5oigemky43sz6r87 1166 arn...@gm...-20080416204550-0dx3qhxasdkdohx1 1167 arn...@gm...-20080416211510-3ilsym0bom7u2cer 1168 tom@athlon-20080417125238-0hhhchg951y7p83w 1169 arn...@gm...-20080418203137-e6szrje3fje5dgh9 1170 arn...@gm...-20080419164722-vyjrwwvglxr4yxuu 1171 arn...@gm...-20080419164802-o2boulbfrea4e0dx 1172 arn...@gm...-20080419165129-zj3axn731fo84vd5 1173 po...@12...-20080419172806-2qspfwerslo10rd2 1174 arn...@gm...-20080419212304-3wjafor82amtvik3 1175 arn...@gm...-20080419212347-t5oze1b59dk7vkiv 1176 arn...@gm...-20080420133104-h16loa3kvzrpkxiv 1177 po...@12...-20080420141642-z9mgyje16kkfy11z 1178 arn...@gm...-20080420173012-we22yoyvldt8u1az 1179 arn...@gm...-20080420173645-l296bgbr60wj267s 1180 arn...@gm...-20080420181134-ypu4ik21vc9ma1u9 1181 arn...@gm...-20080420192935-g59ddftmp35o6wdq 1182 arn...@gm...-20080420194530-qbyih90fixp3jevq 1183 arn...@gm...-20080420200905-mc0wa2egjt6k0783 + 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 1099 mrmikejj-20080403125112-o8polh8rkn62umyh 1100 arn...@gm...-20080403125139-8xub76j1xazhfxna 1101 po...@12...-20080403140544-13kockkjho883nb4 1102 po...@12...-20080403143012-bxghtoodiolugpbs 1103 arn...@gm...-20080403190809-bbi4bz5rfcvjnt20 1104 arn...@gm...-20080403205410-czxru1vcg1s4wcws 1105 arn...@gm...-20080403213124-54spdrwszgyimd90 1106 po...@12...-20080404002406-aj74x5tngi6mmmj1 1107 arn...@gm...-20080404122415-mjy07qzbaxyhagra 1108 po...@12...-20080404145445-84lyk5tyy3b3br14 1109 po...@12...-20080404231417-v4v8x7u3f0hm0ejc 1110 po...@12...-20080405001107-14d1ojjof8xhvcj8 1111 arn...@gm...-20080405071929-jmnrul21sxx04kky 1112 arn...@gm...-20080405080105-9qbda7be0pi7y1ai 1113 po...@12...-20080405154555-yuj2n5kyndfjlpsf 1114 po...@12...-20080405220250-8y09d0samsj8ja94 1115 po...@12...-20080406134101-4860ytb61sbu3yhg 1116 po...@12...-20080406155849-2wzxzuzs5m8zpk0g 1117 po...@12...-20080406164835-bv5dydhm3qqydsty 1118 arn...@gm...-20080406210237-c7tyfgiz2sjgv044 1119 po...@12...-20080407114423-4yajg1rffidq76bj 1120 arn...@gm...-20080407194826-c42t4bjzw4vflejn 1121 po...@12...-20080407214303-o7ul1bvcn6gvaoc9 1122 po...@12...-20080407220647-r7f3em92til5j67s 1123 po...@12...-20080408212439-54t3bqlhvw1nu4xc 1124 arn...@gm...-20080409193708-y6erfzwrcb1seet3 1125 arn...@gm...-20080409195827-ub6t2s3wdf28nfpz 1126 po...@12...-20080409215055-1zmqhhm2859878c1 1127 arn...@gm...-20080410102447-l4es4cbukkqwcnpc 1128 arn...@gm...-20080410214118-b70g50tl27cq9q29 1129 arn...@gm...-20080411074730-w1pu78qigtx87lx3 1130 arn...@gm...-20080411090724-kwdj9pg9hrv1xhwb 1131 po...@12...-20080411153057-tn7zhxqk0z7ceref 1132 arn...@gm...-20080411200946-ierqlg8v9vzj18n2 1133 arn...@gm...-20080411201718-ecshulwd7ic0wdci 1134 arn...@gm...-20080411204047-jc9vzcsf32j38dvc 1135 arn...@gm...-20080411205445-ojuz2a29yq8ww37j 1136 arn...@gm...-20080411214746-r420xmdgo35pkweb 1137 po...@12...-20080412010723-cibh8r0itlzqyt3f 1138 arn...@gm...-20080412200504-6qfeqnsghxgrk775 1139 arn...@gm...-20080413095435-2pkfb407hk8j54te 1140 arn...@gm...-20080413133927-zw2tpz8o8p3izyix 1141 arn...@gm...-20080413165025-ug342rxtq4blxck5 1142 arn...@gm...-20080413182618-6ihabn0tii6gb2m2 1143 arn...@gm...-20080413184517-9p08tedakta1h762 1144 arn...@gm...-20080413193655-kc98lx7kpzo42q43 1145 arn...@gm...-20080414132947-pguvkuzvyadukssc 1146 arn...@gm...-20080414133544-pxwxm9kcvw0k0vf3 1147 po...@12...-20080414174341-hw1im7ysymscpiq0 1148 arn...@gm...-20080414181459-5gu852lneflgf5d6 1149 po...@12...-20080414205719-d80e75fsl8zzi6je 1150 arn...@gm...-20080414211616-835ve71r1qdlbhb4 1151 arn...@gm...-20080415080409-4cid9q7opng8ijav 1152 arn...@gm...-20080415124540-roduj23x442jeefn 1153 arn...@gm...-20080415141450-cld2ym4s50uu31q7 1154 po...@12...-20080415143018-4emcs3u1fquzsu1f 1155 arn...@gm...-20080415174958-wfqu5kga5pe39xvc 1156 po...@12...-20080415182942-2ux0yn8immkrz7ch 1157 po...@12...-20080415185700-gdgpyn414bf4behz 1158 po...@12...-20080415202535-cvevdgrawpilji5b 1159 po...@12...-20080415214801-lgb1429qdm4ti6ub 1160 po...@12...-20080416123247-6dw18ea0lk4m5q8q 1161 po...@12...-20080416135834-6mtzcfy7pzxqfnq0 1162 po...@12...-20080416181626-0ex66f1lv1maf38l 1163 arn...@gm...-20080416183603-yxbj16t2nd8rdzzd 1164 arn...@gm...-20080416200700-wncbhytfixz9b15u 1165 po...@12...-20080416200941-5oigemky43sz6r87 1166 arn...@gm...-20080416204550-0dx3qhxasdkdohx1 1167 arn...@gm...-20080416211510-3ilsym0bom7u2cer 1168 tom@athlon-20080417125238-0hhhchg951y7p83w 1169 arn...@gm...-20080418203137-e6szrje3fje5dgh9 1170 arn...@gm...-20080419164722-vyjrwwvglxr4yxuu 1171 arn...@gm...-20080419164802-o2boulbfrea4e0dx 1172 arn...@gm...-20080419165129-zj3axn731fo84vd5 1173 po...@12...-20080419172806-2qspfwerslo10rd2 1174 arn...@gm...-20080419212304-3wjafor82amtvik3 1175 arn...@gm...-20080419212347-t5oze1b59dk7vkiv 1176 arn...@gm...-20080420133104-h16loa3kvzrpkxiv 1177 po...@12...-20080420141642-z9mgyje16kkfy11z 1178 arn...@gm...-20080420173012-we22yoyvldt8u1az 1179 arn...@gm...-20080420173645-l296bgbr60wj267s 1180 arn...@gm...-20080420181134-ypu4ik21vc9ma1u9 1181 arn...@gm...-20080420192935-g59ddftmp35o6wdq 1182 arn...@gm...-20080420194530-qbyih90fixp3jevq 1183 arn...@gm...-20080420200905-mc0wa2egjt6k0783 1184 po...@12...-20080421110151-tm3apquwg3p4otyv Modified: dcplusplus/trunk/dwt/include/dwt/widgets/Menu.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/widgets/Menu.h 2008-04-24 13:41:54 UTC (rev 1208) +++ dcplusplus/trunk/dwt/include/dwt/widgets/Menu.h 2008-04-24 13:44:17 UTC (rev 1209) @@ -39,8 +39,8 @@ #include "../resources/Bitmap.h" #include "../resources/Font.h" +#include "../CanvasClasses.h" #include "../Dispatchers.h" -#include "../CanvasClasses.h" #include <memory> #include <vector> @@ -186,7 +186,7 @@ void attach(HMENU hMenu, const Seed& cs); - void setMenu(); + bool setMenu(); /// Appends a popup to the menu /** Everything you "append" to a menu is added sequentially to the menu <br> @@ -261,16 +261,16 @@ * this number should be unique across the application. */ - void appendItem(unsigned int id, const tstring & text, BitmapPtr image = BitmapPtr()); + bool appendItem(unsigned int id, const tstring & text, BitmapPtr image = BitmapPtr()); template<typename DispatcherType> - void appendItem(unsigned int id, const tstring & text, const typename DispatcherType::F& f, BitmapPtr image = BitmapPtr()) { - appendItem(id, text, image); + bool appendItem(unsigned int id, const tstring & text, const typename DispatcherType::F& f, BitmapPtr image = BitmapPtr()) { itsParent->setCallback(Message(WM_COMMAND, id), DispatcherType(f)); + return appendItem(id, text, image); } - void appendItem(unsigned int id, const tstring & text, const IdDispatcher::F& f, BitmapPtr image = BitmapPtr()) { - appendItem<IdDispatcher>(id, text, f, image); + bool appendItem(unsigned int id, const tstring & text, const IdDispatcher::F& f, BitmapPtr image = BitmapPtr()) { + return appendItem<IdDispatcher>(id, text, f, image); } /// Removes specified item from this menu @@ -350,7 +350,7 @@ * parameter. <br> * If the "value" parameter is true the item becomes enabled, otherwise disabled */ - void setItemEnabled( unsigned id, bool byPosition = false, bool value = true ); + bool setItemEnabled( unsigned id, bool byPosition = false, bool value = true ); UINT getMenuState(UINT id, bool byPosition = false); @@ -363,7 +363,7 @@ /// Return true if the menu item is enabled (not grey and not disabled) bool isEnabled(UINT id, bool byPosition = false); - void setDefaultItem(UINT id, bool byPosition = false); + bool setDefaultItem(UINT id, bool byPosition = false); /// Returns true if menu is "system menu" (icon in top left of window) bool isSystemMenu() @@ -381,7 +381,7 @@ /** Which menu item you wish to set the text is defined by the "id" * parameter of the function. */ - void setText( unsigned id, const tstring& text ); + bool setText( unsigned id, const tstring& text ); ObjectType getChild(UINT position); Modified: dcplusplus/trunk/dwt/include/dwt/widgets/Table.h =================================================================== --- dcplusplus/trunk/dwt/include/dwt/widgets/Table.h 2008-04-24 13:41:54 UTC (rev 1208) +++ dcplusplus/trunk/dwt/include/dwt/widgets/Table.h 2008-04-24 13:44:17 UTC (rev 1209) @@ -231,7 +231,7 @@ /// Change the current icon of an item /** Sets a new icon for a given item */ - void setIcon( unsigned row, int newIconIndex ); + bool setIcon( unsigned row, int newIconIndex ); /// Returns a boolean indicating if the Grid is in "read only" mode or not /** If the return value is true the Grid is in "read only" mode and cannot be @@ -302,7 +302,7 @@ * width of the list which is quite useful to make the Data Grid fill its whole * client area. */ - void setColumnWidth( unsigned columnNo, int width ); + bool setColumnWidth( unsigned columnNo, int width ); /// Returns the checked state of the given row /** A list view can have checkboxes in each row, if the checkbox for the given @@ -433,7 +433,7 @@ /// Force redraw of a range of items. /** You may want to call invalidateWidget after the this call to force repaint. */ - void redraw( int firstRow = 0, int lastRow = -1 ); + bool redraw( int firstRow = 0, int lastRow = -1 ); void setTableStyle(int style); @@ -737,12 +737,8 @@ ListView_DeleteColumn( this->handle(), columnNo ); } -inline void Table::setColumnWidth( unsigned columnNo, int width ) { - if ( ListView_SetColumnWidth( this->handle(), columnNo, width ) == FALSE ) - { - xCeption x( _T( "Couldn't resize columns of Table" ) ); - throw x; - } +inline bool Table::setColumnWidth( unsigned columnNo, int width ) { + return ListView_SetColumnWidth( this->handle(), columnNo, width ); } inline void Table::clearImpl() { Modified: dcplusplus/trunk/dwt/src/widgets/Menu.cpp =================================================================== --- dcplusplus/trunk/dwt/src/widgets/Menu.cpp 2008-04-24 13:41:54 UTC (rev 1208) +++ dcplusplus/trunk/dwt/src/widgets/Menu.cpp 2008-04-24 13:44:17 UTC (rev 1209) @@ -120,27 +120,26 @@ // set flags info.fMask = MIIM_FTYPE | MIIM_DATA; - if(::GetMenuItemInfo(itsHandle, i, TRUE, &info)) { - info.fMask |= MIIM_DATA; - info.fType |= MFT_OWNERDRAW; + BOOL ret = ::GetMenuItemInfo(itsHandle, i, TRUE, &info); + assert(ret); - // create item data wrapper - ItemDataWrapper * wrapper = new ItemDataWrapper( this, i ); - info.dwItemData = reinterpret_cast< ULONG_PTR >( wrapper ); + info.fMask |= MIIM_DATA; + info.fType |= MFT_OWNERDRAW; - if(::SetMenuItemInfo(itsHandle, i, TRUE, &info)) - itsItemData.push_back( wrapper ); - else - throw xCeption( _T( "SetMenuItemInfo in Menu::attach fizzled..." ) ); - } else - throw xCeption( _T( "GetMenuItemInfo in Menu::attach fizzled..." ) ); + // create item data wrapper + ItemDataWrapper * wrapper = new ItemDataWrapper( this, i ); + info.dwItemData = reinterpret_cast< ULONG_PTR >( wrapper ); + + ret = ::SetMenuItemInfo(itsHandle, i, TRUE, &info); + assert(ret); + + itsItemData.push_back( wrapper ); } } } -void Menu::setMenu() { - if ( ::SetMenu( itsParent->handle(), itsHandle ) == FALSE ) - throw xCeption( _T( "SetMenu in Menu::setMenu fizzled..." ) ); +bool Menu::setMenu() { + return ::SetMenu( itsParent->handle(), itsHandle ); } Menu::ObjectType Menu::appendPopup( const tstring & text ) @@ -256,13 +255,9 @@ ::CheckMenuItem( handle(), id, value ? MF_CHECKED : MF_UNCHECKED ); } -void Menu::setItemEnabled( unsigned id, bool byPosition, bool value ) +bool Menu::setItemEnabled( unsigned id, bool byPosition, bool value ) { - if ( ::EnableMenuItem( handle(), id, (byPosition ? MF_BYPOSITION : MF_BYCOMMAND) | (value ? MF_ENABLED : MF_GRAYED) ) == - 1 ) - { - xCeption x( _T( "Couldn't enable/disable the menu item, item doesn't exist" ) ); - throw x; - } + return ::EnableMenuItem( handle(), id, (byPosition ? MF_BYPOSITION : MF_BYCOMMAND) | (value ? MF_ENABLED : MF_GRAYED) ) != - 1; } UINT Menu::getMenuState( UINT id, bool byPosition ) @@ -290,9 +285,9 @@ return !(getMenuState(id, byPosition) & (MF_DISABLED | MF_GRAYED)); } -void Menu::setDefaultItem( UINT id, bool byPosition ) +bool Menu::setDefaultItem( UINT id, bool byPosition ) { - ::SetMenuDefaultItem(handle(), id, byPosition); + return ::SetMenuDefaultItem(handle(), id, byPosition); } tstring Menu::getText( unsigned id, bool byPosition ) @@ -302,17 +297,17 @@ // set flag mi.fMask = MIIM_STRING; - if ( ::GetMenuItemInfo( itsHandle, id, byPosition, & mi ) == FALSE ) - throw xCeption( _T( "Couldn't get item info in Menu::getText" ) ); + BOOL ret = ::GetMenuItemInfo( itsHandle, id, byPosition, & mi ); + assert(ret); boost::scoped_array< TCHAR > buffer( new TCHAR[++mi.cch] ); mi.dwTypeData = buffer.get(); - if ( ::GetMenuItemInfo( itsHandle, id, byPosition, & mi ) == FALSE ) - throw xCeption( _T( "Couldn't get item info in Menu::getText" ) ); + ret = ::GetMenuItemInfo( itsHandle, id, byPosition, & mi ); + assert(ret); return mi.dwTypeData; } -void Menu::setText( unsigned id, const tstring& text ) +bool Menu::setText( unsigned id, const tstring& text ) { MENUITEMINFO mi = { sizeof(MENUITEMINFO) }; @@ -320,8 +315,7 @@ mi.fMask = MIIM_STRING; mi.dwTypeData = (TCHAR*) text.c_str(); - if ( ::SetMenuItemInfo( itsHandle, id, FALSE, & mi ) == FALSE ) - throw xCeption( _T( "Couldn't set item info in Menu::setText" ) ); + return ::SetMenuItemInfo( itsHandle, id, FALSE, & mi ); } void Menu::setTitle( const tstring & title, bool drawSidebar /* = false */) @@ -374,7 +368,7 @@ // get item data wrapper ItemDataWrapper * wrapper = reinterpret_cast< ItemDataWrapper * >( drawInfo->itemData ); - xAssert( wrapper != 0, _T( "Unsupported menu item in drawItem()" ) ); + assert(wrapper); // if processing menu bar const bool isMenuBar = ::GetMenu( wrapper->menu->getParent()->handle() ) == wrapper->menu->handle(); @@ -385,11 +379,11 @@ // set flags info.fMask = MIIM_CHECKMARKS | MIIM_FTYPE | MIIM_DATA | MIIM_STATE | MIIM_STRING; - if ( ::GetMenuItemInfo( wrapper->menu->handle(), wrapper->index, TRUE, & info ) == FALSE ) - throw xCeption ( _T( "Couldn't get menu item info in drawItem()" ) ); + BOOL ret = ::GetMenuItemInfo( wrapper->menu->handle(), wrapper->index, TRUE, & info ); + assert(ret); // check if item is owner drawn - xAssert( ( info.fType & MFT_OWNERDRAW ) != 0, _T( "Not a owner - drawn item in drawItem()" ) ); + assert(info.fType & MFT_OWNERDRAW); // get state info bool isGrayed = ( drawInfo->itemState & ODS_GRAYED ) == ODS_GRAYED; @@ -701,7 +695,7 @@ // get item data wrapper ItemDataWrapper * wrapper = reinterpret_cast< ItemDataWrapper * >( measureInfo->itemData ); - xAssert( wrapper != 0, _T( "Unsupported menu item type in measureItem()" ) ); + assert(wrapper); // this will contain item size UINT & itemWidth = measureInfo->itemWidth; @@ -714,11 +708,11 @@ info.fMask = MIIM_FTYPE | MIIM_DATA | MIIM_CHECKMARKS | MIIM_STRING; // try to get item info - if ( ::GetMenuItemInfo( wrapper->menu->handle(), wrapper->index, TRUE, & info ) == FALSE ) - throw xCeption ( _T( "Couldn't get item info in measureItem()" ) ); + BOOL ret = ::GetMenuItemInfo( wrapper->menu->handle(), wrapper->index, TRUE, & info ); + assert(ret); // check if item is owner drawn - xAssert( ( info.fType & MFT_OWNERDRAW ) != 0, _T( "Not owner - drawn item encountered in measureItem()" ) ); + assert(info.fType & MFT_OWNERDRAW); // check if separator if ( info.fType & MFT_SEPARATOR ) @@ -850,38 +844,36 @@ HMENU popup = ::GetSubMenu( itsHandle, itemIndex ); // try to remove item - if ( ::RemoveMenu( itsHandle, itemIndex, MF_BYPOSITION ) ) - { - if(ownerDrawn) { - ItemDataWrapper * wrapper = 0; - int itemRemoved = -1; + BOOL ret = ::RemoveMenu( itsHandle, itemIndex, MF_BYPOSITION ); + assert(ret); - for(size_t i = 0; i < itsItemData.size(); ++i) { - // get current data wrapper - wrapper = itsItemData[i]; + if(ownerDrawn) { + ItemDataWrapper * wrapper = 0; + int itemRemoved = -1; - if ( wrapper->index == int(itemIndex) ) // if found - { - itemRemoved = int(i); - delete wrapper; - itsItemData[i] = 0; - } - else if ( wrapper->index > int(itemIndex) ) - --wrapper->index; // adjust succeeding item indices - } + for(size_t i = 0; i < itsItemData.size(); ++i) { + // get current data wrapper + wrapper = itsItemData[i]; - if( itemRemoved != -1 ) - itsItemData.erase( itsItemData.begin() + itemRemoved ); + if ( wrapper->index == int(itemIndex) ) // if found + { + itemRemoved = int(i); + delete wrapper; + itsItemData[i] = 0; + } + else if ( wrapper->index > int(itemIndex) ) + --wrapper->index; // adjust succeeding item indices } - // remove sub menus if any - if(popup) - for(size_t i = 0; i < itsChildren.size(); ++i) - if(itsChildren[i]->handle() == popup) - itsChildren[i].reset(); + if( itemRemoved != -1 ) + itsItemData.erase( itsItemData.begin() + itemRemoved ); } - else - throw xCeption( _T( "Couldn't remove item in removeItem()" ) ); + + // remove sub menus if any + if(popup) + for(size_t i = 0; i < itsChildren.size(); ++i) + if(itsChildren[i]->handle() == popup) + itsChildren[i].reset(); } void Menu::removeAllItems() @@ -895,13 +887,10 @@ int Menu::getCount() const { - int count = ::GetMenuItemCount( itsHandle ); - if( count == -1 ) - throw xCeption( _T( "Couldn't get item count in getCount()" ) ); - return count; + return ::GetMenuItemCount( itsHandle ); } -void Menu::appendItem(unsigned int id, const tstring & text, BitmapPtr image) +bool Menu::appendItem(unsigned int id, const tstring & text, BitmapPtr image) { // init structure for new item MENUITEMINFO info = { sizeof(MENUITEMINFO) }; @@ -938,9 +927,9 @@ { if(ownerDrawn) itsItemData.push_back( wrapper ); + return true; } - else - throw xCeption( _T( "Couldn't insert/update item in Menu::appendItem" ) ); + return false; } unsigned Menu::trackPopupMenu( const ScreenCoordinate& sc, unsigned flags ) Modified: dcplusplus/trunk/dwt/src/widgets/Table.cpp =================================================================== --- dcplusplus/trunk/dwt/src/widgets/Table.cpp 2008-04-24 13:41:54 UTC (rev 1208) +++ dcplusplus/trunk/dwt/src/widgets/Table.cpp 2008-04-24 13:44:17 UTC (rev 1209) @@ -165,11 +165,8 @@ ++idx, ++x ) { lvColumn.pszText = const_cast < TCHAR * >( idx->c_str() ); - if ( ListView_InsertColumn( this->handle(), x, & lvColumn ) == - 1 ) - { - xCeption x( _T( "Error while trying to create Columns in list view" ) ); - throw x; - } + bool ret = ListView_InsertColumn( this->handle(), x, & lvColumn ) != - 1; + assert(ret); } } @@ -187,19 +184,15 @@ lvi.pszText = const_cast < TCHAR * >(row[0].c_str() ); lvi.lParam = lPar; lvi.iItem = index; - if ( ListView_InsertItem( this->handle(), & lvi ) == - 1) { - xCeption x( _T( "Error while trying to insert row in Table" )); - throw x; - } + bool ret = ListView_InsertItem( this->handle(), & lvi ) != - 1; + assert(ret); lvi.mask = LVIF_TEXT; lvi.iSubItem = 1; for (std::vector< tstring >::const_iterator idx = row.begin() + 1; idx != row.end(); ++idx ) { lvi.pszText = const_cast < TCHAR * >(idx->c_str() ); lvi.cchTextMax = static_cast< int >(idx->size() ); - if ( !ListView_SetItem( this->handle(), & lvi )) { - xCeption x( _T( "Error while trying to insert row in Table" )); - throw x; - } + ret = ListView_SetItem( this->handle(), & lvi ); + assert(ret); lvi.iSubItem++; } return index; @@ -309,15 +302,12 @@ ListView_SetItem(handle(), &item); } -void Table::setIcon( unsigned row, int newIconIndex ) { +bool Table::setIcon( unsigned row, int newIconIndex ) { LVITEM it = { LVIF_IMAGE }; it.iItem = row; it.iImage = newIconIndex; //Set item - if(ListView_SetItem( this->handle(), &it) != TRUE) { - xCeption err( _T( "Something went wrong while trying to change the selected item of the Table" ) ); - throw err; - } + return ListView_SetItem( this->handle(), &it); } void Table::setNormalImageList( ImageListPtr imageList ) { @@ -349,14 +339,11 @@ } } -void Table::redraw( int firstRow, int lastRow ) { +bool Table::redraw( int firstRow, int lastRow ) { if(lastRow == -1) { lastRow = size(); } - if( ListView_RedrawItems( this->handle(), firstRow, lastRow ) == FALSE ) - { - throw xCeption( _T( "Error while redrawing items in Table" ) ); - } + return ListView_RedrawItems( this->handle(), firstRow, lastRow ); } template<typename T> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |