Menu
▾
▴
[Dcplusplus-commit] SF.net SVN: dcplusplus: [1211] dcplusplus/trunk
|
From: <arn...@us...> - 2008-04-24 13:50:21
|
Revision: 1211
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1211&view=rev
Author: arnetheduck
Date: 2008-04-24 06:50:11 -0700 (Thu, 24 Apr 2008)
Log Message:
-----------
Rename exceptions, convert some exceptions to asserts
Modified Paths:
--------------
dcplusplus/trunk/dwt/include/dwt/Application.h
dcplusplus/trunk/dwt/include/dwt/ClipBoard.h
dcplusplus/trunk/dwt/include/dwt/LibraryLoader.h
dcplusplus/trunk/dwt/include/dwt/aspects/AspectFileFilter.h
dcplusplus/trunk/dwt/include/dwt/aspects/AspectScrollable.h
dcplusplus/trunk/dwt/include/dwt/aspects/AspectSizable.h
dcplusplus/trunk/dwt/include/dwt/resources/Font.h
dcplusplus/trunk/dwt/include/dwt/widgets/ComboBox.h
dcplusplus/trunk/dwt/include/dwt/widgets/CoolBar.h
dcplusplus/trunk/dwt/include/dwt/widgets/DateTime.h
dcplusplus/trunk/dwt/include/dwt/widgets/MDIParent.h
dcplusplus/trunk/dwt/include/dwt/widgets/Menu.h
dcplusplus/trunk/dwt/include/dwt/widgets/Spinner.h
dcplusplus/trunk/dwt/include/dwt/widgets/StatusBar.h
dcplusplus/trunk/dwt/include/dwt/widgets/Table.h
dcplusplus/trunk/dwt/include/dwt/widgets/TextBox.h
dcplusplus/trunk/dwt/include/dwt/widgets/ToolBar.h
dcplusplus/trunk/dwt/include/dwt/widgets/ToolTip.h
dcplusplus/trunk/dwt/include/dwt/widgets/WidgetListViewEditBox.h
dcplusplus/trunk/dwt/src/Application.cpp
dcplusplus/trunk/dwt/src/CanvasClasses.cpp
dcplusplus/trunk/dwt/src/ImageList.cpp
dcplusplus/trunk/dwt/src/LibraryLoader.cpp
dcplusplus/trunk/dwt/src/Widget.cpp
dcplusplus/trunk/dwt/src/WindowClass.cpp
dcplusplus/trunk/dwt/src/widgets/CoolBar.cpp
dcplusplus/trunk/dwt/src/widgets/MDIChild.cpp
dcplusplus/trunk/dwt/src/widgets/MDIParent.cpp
dcplusplus/trunk/dwt/src/widgets/Menu.cpp
dcplusplus/trunk/dwt/src/widgets/ModalDialog.cpp
dcplusplus/trunk/dwt/src/widgets/ModelessDialog.cpp
dcplusplus/trunk/dwt/src/widgets/RichTextBox.cpp
dcplusplus/trunk/dwt/src/widgets/TabView.cpp
dcplusplus/trunk/dwt/src/widgets/Table.cpp
dcplusplus/trunk/dwt/src/widgets/ToolBar.cpp
dcplusplus/trunk/dwt/src/widgets/ToolTip.cpp
dcplusplus/trunk/win32/WinUtil.cpp
dcplusplus/trunk/win32/main.cpp
Added Paths:
-----------
dcplusplus/trunk/dwt/include/dwt/DWTException.h
dcplusplus/trunk/dwt/include/dwt/util/check.h
dcplusplus/trunk/dwt/src/DWTException.cpp
Removed Paths:
-------------
dcplusplus/trunk/dwt/include/dwt/xCeption.h
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-04-21 13:10:32.687999964 +0200
committer: poy <po...@12...>
properties:
branch-nick: repo
+ timestamp: 2008-04-21 13:27:43.910000086 +0200
committer: Jacek Sieka <arn...@gm...>
properties:
branch-nick: dcplusplus
Name: bzr:file-ids
-
+ dwt/include/dwt/DWTException.h 712@f586c4b0-9d0d-0410-bc51-f1fe239209fc:dcplusplus%2Ftrunk:smartwin%2Finclude%2Fsmartwin%2FxCeption.h
dwt/include/dwt/util/check.h check.h-20080421112644-f99r6p5ifproaii9-2
dwt/src/DWTException.cpp dwtexception.cpp-20080421112644-f99r6p5ifproaii9-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
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
1185 po...@12...-20080421111032-2mwe6we5llzbqfj1
+ 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
1185 po...@12...-20080421111032-2mwe6we5llzbqfj1
1186 arn...@gm...-20080421112743-av3pdgtq20m91f8c
Modified: dcplusplus/trunk/dwt/include/dwt/Application.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/Application.h 2008-04-24 13:45:26 UTC (rev 1210)
+++ dcplusplus/trunk/dwt/include/dwt/Application.h 2008-04-24 13:50:11 UTC (rev 1211)
@@ -60,7 +60,6 @@
// Forward declaration of friends
class Widget;
-class xCeption;
namespace Policies {
class ModelessDialog;
@@ -151,11 +150,6 @@
*/
static void checkCorruptOrMemleak( bool & corruptMemMemLeak );
- /// Shows the xCeption.
- /** Used if an exception occurs in the message loop in WinMain.
- */
- static unsigned int reportErr( xCeption & err, bool corruptMemMemLeak );
-
/// Returns the command line object
/** The command line object contains the parameters given to the process during
* startup. <br>
Modified: dcplusplus/trunk/dwt/include/dwt/ClipBoard.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/ClipBoard.h 2008-04-24 13:45:26 UTC (rev 1210)
+++ dcplusplus/trunk/dwt/include/dwt/ClipBoard.h 2008-04-24 13:50:11 UTC (rev 1211)
@@ -38,6 +38,7 @@
#include "WindowsHeaders.h"
#include "tstring.h"
+#include "DWTException.h"
namespace dwt {
@@ -123,24 +124,17 @@
void setClipBoardData( const tstring & str, const Widget * owner )
{
if ( !::OpenClipboard( owner->handle() ) )
- throw dwt::xCeption( _T( "Couldn't open the clipboard" ) );
- try
- {
- ::EmptyClipboard();
- HGLOBAL handle = ::GlobalAlloc( GMEM_MOVEABLE, sizeof( TCHAR ) * str.size() + 1 );
- if ( 0 == handle )
- throw dwt::xCeption( _T( "Couldn't allocate memory to hold clipboard data" ) );
- TCHAR * buffer = reinterpret_cast< TCHAR * >( GlobalLock( handle ) );
- memcpy( buffer, str.c_str(), sizeof( TCHAR ) * str.size() );
- GlobalUnlock( handle );
- SetClipboardData( CF_TEXT, handle );
- CloseClipboard();
- }
- catch ( ... )
- {
- ::CloseClipboard();
- throw;
- }
+ throw Win32Excepction( "Couldn't open the clipboard" );
+
+ ::EmptyClipboard();
+ HGLOBAL handle = ::GlobalAlloc( GMEM_MOVEABLE, sizeof( TCHAR ) * str.size() + 1 );
+ if ( 0 == handle )
+ throw Win32Exception( "Couldn't allocate memory to hold clipboard data" );
+ TCHAR * buffer = reinterpret_cast< TCHAR * >( GlobalLock( handle ) );
+ memcpy( buffer, str.c_str(), sizeof( TCHAR ) * str.size() );
+ GlobalUnlock( handle );
+ SetClipboardData( CF_TEXT, handle );
+ CloseClipboard();
}
/// Retrieves clipboard data from the clipboard (assumes clipboard format is string)
Copied: dcplusplus/trunk/dwt/include/dwt/DWTException.h (from rev 1210, dcplusplus/trunk/dwt/include/dwt/xCeption.h)
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/DWTException.h (rev 0)
+++ dcplusplus/trunk/dwt/include/dwt/DWTException.h 2008-04-24 13:50:11 UTC (rev 1211)
@@ -0,0 +1,87 @@
+/*
+ DC++ Widget Toolkit
+
+ Copyright (c) 2007-2008, Jacek Sieka
+
+ SmartWin++
+
+ Copyright (c) 2005 Thomas Hansen
+
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without modification,
+ are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+ * Neither the name of the DWT nor SmartWin++ nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef DWT_EXCEPTION_H
+#define DWT_EXCEPTION_H
+
+#include "WindowsHeaders.h"
+
+#include <string>
+#include <stdexcept>
+
+namespace dwt {
+
+/// Exception class used in SmartWin
+/** All exceptions thrown by SmartWin will be either of this class or derived from
+ * this class. <br>
+ * You should derive from this class yourself if you throw exceptions inside your
+ * event handlers. <br>
+ * Otherwise SmartWin may not be able to respond correctly to the Exception.
+ */
+class DWTException : public std::runtime_error {
+public:
+
+ DWTException( const std::string& err ) : std::runtime_error(err) {
+
+ }
+
+ virtual ~DWTException() throw() {
+ };
+
+private:
+};
+
+/// Utility class for handling win32 errors - don't use it directly...
+class Win32Exception : public DWTException {
+public:
+ Win32Exception() : DWTException(translateLastError()), code(::GetLastError()) {
+
+ }
+
+ Win32Exception(const std::string& msg) : DWTException(msg + " (" + translateLastError() + ")"), code(::GetLastError()) {
+
+ }
+
+ DWORD getCode() { return code; }
+
+private:
+ DWORD code;
+
+ static std::string translateLastError();
+};
+
+}
+
+#endif
Modified: dcplusplus/trunk/dwt/include/dwt/LibraryLoader.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/LibraryLoader.h 2008-04-24 13:45:26 UTC (rev 1210)
+++ dcplusplus/trunk/dwt/include/dwt/LibraryLoader.h 2008-04-24 13:50:11 UTC (rev 1211)
@@ -38,7 +38,6 @@
#include "WindowsHeaders.h"
#include "tstring.h"
-#include "xCeption.h"
#include <boost/noncopyable.hpp>
Modified: dcplusplus/trunk/dwt/include/dwt/aspects/AspectFileFilter.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/aspects/AspectFileFilter.h 2008-04-24 13:45:26 UTC (rev 1210)
+++ dcplusplus/trunk/dwt/include/dwt/aspects/AspectFileFilter.h 2008-04-24 13:50:11 UTC (rev 1211)
@@ -38,7 +38,7 @@
#include "../WindowsHeaders.h"
#include "../tstring.h"
-#include "../xCeption.h"
+#include "../util/check.h"
namespace dwt {
@@ -75,10 +75,9 @@
* filter used when first showing the dialog.
*/
WidgetType& setActiveFilter( unsigned filterNo ) {
- if ( filterNo >= itsFilter.size() )
- {
- xCeption x( _T( "Tried to set active filter to more than number of filters in filter..." ) );
- throw x;
+ if ( filterNo >= itsFilter.size() ) {
+ dwtDebugFail( "Tried to set active filter to more than number of filters in filter..." );
+ return W();
}
itsActiveFilter = filterNo;
return W();
Modified: dcplusplus/trunk/dwt/include/dwt/aspects/AspectScrollable.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/aspects/AspectScrollable.h 2008-04-24 13:45:26 UTC (rev 1210)
+++ dcplusplus/trunk/dwt/include/dwt/aspects/AspectScrollable.h 2008-04-24 13:50:11 UTC (rev 1211)
@@ -38,6 +38,7 @@
#include "../Dispatchers.h"
#include "../Message.h"
+#include "../util/check.h"
namespace dwt {
@@ -90,7 +91,7 @@
{
SCROLLINFO scrollInfo = { sizeof(SCROLLINFO), SIF_RANGE | SIF_PAGE | SIF_POS };
BOOL ret = ::GetScrollInfo(static_cast<WidgetType*>(this)->handle(), SB_VERT, &scrollInfo);
- xAssert(ret != FALSE, _T("Can't get scroll info in scrollIsAtEnd"));
+ dwtassert(ret != FALSE, _T("Can't get scroll info in scrollIsAtEnd"));
return (scrollInfo.nPos == static_cast<int>(scrollInfo.nMax - std::max(scrollInfo.nPage - 1, 0u)));
}
Modified: dcplusplus/trunk/dwt/include/dwt/aspects/AspectSizable.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/aspects/AspectSizable.h 2008-04-24 13:45:26 UTC (rev 1210)
+++ dcplusplus/trunk/dwt/include/dwt/aspects/AspectSizable.h 2008-04-24 13:50:11 UTC (rev 1211)
@@ -38,7 +38,7 @@
#include "../Widget.h"
#include "../Place.h"
-#include "../xCeption.h"
+#include "../util/check.h"
#include "../Dispatchers.h"
#include "../Events.h"
@@ -250,37 +250,20 @@
virtual ~AspectSizable() { }
};
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// Implementation of class
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
template< class WidgetType >
-void AspectSizable< WidgetType >::setBounds( const Rectangle & rect, bool updateWindow )
-{
- if ( ::MoveWindow( H(),
- rect.x(), rect.y(), rect.width(), rect.height(), updateWindow ? TRUE : FALSE ) == 0 )
- {
- xCeption err( _T( "Couldn't reposition windows" ) );
- throw err;
- }
+void AspectSizable< WidgetType >::setBounds( const Rectangle & rect, bool updateWindow) {
+ setBounds(rect.x(), rect.y(), rect.width(), rect.height(), updateWindow);
}
template< class WidgetType >
-void AspectSizable< WidgetType >::setBounds( const Point & newPos, const Point & newSize, bool updateWindow )
-{
- if ( ::MoveWindow( H(), newPos.x, newPos.y, newSize.x, newSize.y, updateWindow ? TRUE : FALSE ) == 0 )
- {
- xCeption err( _T( "Couldn't reposition windows" ) );
- throw err;
- }
+void AspectSizable< WidgetType >::setBounds( const Point & newPos, const Point & newSize, bool updateWindow ) {
+ setBounds(newPos.x, newPos.y, newSize.x, newSize.y, updateWindow);
}
template< class WidgetType >
-void AspectSizable< WidgetType >::setBounds( int x, int y, int width, int height, bool updateWindow )
-{
- if ( ::MoveWindow( H(), x, y, width, height, updateWindow ? TRUE : FALSE ) == 0 )
- {
- xCeption err( _T( "Couldn't reposition windows" ) );
- throw err;
+void AspectSizable< WidgetType >::setBounds( int x, int y, int width, int height, bool updateWindow ) {
+ if ( ::MoveWindow( H(), x, y, width, height, updateWindow ? TRUE : FALSE ) == 0 ) {
+ dwtDebugFail("Couldn't reposition windows");
}
}
Modified: dcplusplus/trunk/dwt/include/dwt/resources/Font.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/resources/Font.h 2008-04-24 13:45:26 UTC (rev 1210)
+++ dcplusplus/trunk/dwt/include/dwt/resources/Font.h 2008-04-24 13:50:11 UTC (rev 1211)
@@ -38,7 +38,6 @@
#include "../WindowsHeaders.h"
#include "../tstring.h"
-#include "../xCeption.h"
#include "Handle.h"
namespace dwt {
Added: dcplusplus/trunk/dwt/include/dwt/util/check.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/util/check.h (rev 0)
+++ dcplusplus/trunk/dwt/include/dwt/util/check.h 2008-04-24 13:50:11 UTC (rev 1211)
@@ -0,0 +1,21 @@
+#ifndef CHECK_H_
+#define CHECK_H_
+
+namespace dwt { namespace util {
+
+#ifdef _DEBUG
+
+#define dwtDebugFail(m) assert( (false && (m)) )
+
+#else
+
+#define dwtDebugFail(m)
+
+#endif
+
+#define dwtassert(x, m) assert( (x) && (m) )
+
+#define dwtWin32DebugFail(m) dwtDebugFail(m)
+
+} }
+#endif /*CHECK_H_*/
Modified: dcplusplus/trunk/dwt/include/dwt/widgets/ComboBox.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/widgets/ComboBox.h 2008-04-24 13:45:26 UTC (rev 1210)
+++ dcplusplus/trunk/dwt/include/dwt/widgets/ComboBox.h 2008-04-24 13:50:11 UTC (rev 1211)
@@ -86,7 +86,6 @@
/// Object type
typedef ThisType* ObjectType;
-
/// 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
@@ -129,9 +128,8 @@
void create( const Seed & cs = Seed() );
protected:
- /// Constructor Taking pointer to parent
- explicit ComboBox( Widget * parent );
-
+ ComboBox(Widget* parent);
+
// Protected to avoid direct instantiation, you can inherit and use
// WidgetFactory class which is friend
virtual ~ComboBox()
@@ -200,8 +198,7 @@
int newIdx = ComboBox_AddString( handle(), ( TCHAR * ) val.c_str() );
if ( newIdx == CB_ERR )
{
- xCeption x( _T( "Error while trying to add string into ComboBox" ) );
- throw x;
+ dwtWin32DebugFail("Error while trying to add string into ComboBox");
}
return newIdx;
}
@@ -211,8 +208,7 @@
int newIdx = ComboBox_InsertString( handle(), pos, ( TCHAR * ) val.c_str() );
if ( newIdx == CB_ERR )
{
- xCeption x( _T( "Error while trying to insert string into ComboBox" ) );
- throw x;
+ dwtWin32DebugFail("Error while trying to insert string into ComboBox");
}
return newIdx;
}
@@ -221,9 +217,9 @@
return static_cast<size_t>(ComboBox_GetCount( handle() )); // Number of items present.
}
-inline ComboBox::ComboBox( Widget * parent )
- : BaseType( parent )
-{
+
+inline ComboBox::ComboBox( Widget* parent ) : BaseType(parent) {
+
}
}
Modified: dcplusplus/trunk/dwt/include/dwt/widgets/CoolBar.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/widgets/CoolBar.h 2008-04-24 13:45:26 UTC (rev 1210)
+++ dcplusplus/trunk/dwt/include/dwt/widgets/CoolBar.h 2008-04-24 13:50:11 UTC (rev 1211)
@@ -45,7 +45,7 @@
#include "../aspects/AspectRaw.h"
#include "../aspects/AspectSizable.h"
#include "../aspects/AspectVisible.h"
-#include "../xCeption.h"
+#include "../util/check.h"
namespace dwt {
@@ -142,24 +142,17 @@
: BaseType( parent )
{
// Can't have a text box without a parent...
- xAssert( parent, _T( "Can't have a Button without a parent..." ) );
+ dwtassert( parent, _T( "Can't have a Button without a parent..." ) );
}
-inline void CoolBar::refresh()
-{
+inline void CoolBar::refresh() {
// This might look a bit stupid, but Windows API have some minor flaws. One of
// those flaws is that a Coolbar (and a Toolbar) control must be "resized" with
// a dummy value to make sure the Coolbar (&& the Toolbar) fills up the
// complete area of the container Widget...
-
- // HC comment: sorry ;( but no smiley faces ;) anywhere, not even in comments.
- // They mess up with my macros to check delimiters ...
- Rectangle rect;
- if ( ::MoveWindow( this->handle(),
- rect.x(), rect.y(), rect.width(), rect.height(), TRUE ) == 0 )
- {
- xCeption err( _T( "Couldn't reposition windows" ) );
- throw err;
+
+ if ( ::MoveWindow( this->handle(), 0, 0, 0, 0, TRUE ) == 0 ) {
+ dwtWin32DebugFail("Couldn't reposition windows");
}
}
Modified: dcplusplus/trunk/dwt/include/dwt/widgets/DateTime.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/widgets/DateTime.h 2008-04-24 13:45:26 UTC (rev 1210)
+++ dcplusplus/trunk/dwt/include/dwt/widgets/DateTime.h 2008-04-24 13:50:11 UTC (rev 1211)
@@ -240,7 +240,7 @@
: BaseType( parent )
{
// Can't have a text box without a parent...
- xAssert( parent, _T( "Can't have a TextBox without a parent..." ) );
+ dwtassert( parent, _T( "Can't have a TextBox without a parent..." ) );
}
inline void DateTime::setBackgroundColor( COLORREF color )
Modified: dcplusplus/trunk/dwt/include/dwt/widgets/MDIParent.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/widgets/MDIParent.h 2008-04-24 13:45:26 UTC (rev 1210)
+++ dcplusplus/trunk/dwt/include/dwt/widgets/MDIParent.h 2008-04-24 13:50:11 UTC (rev 1211)
@@ -148,7 +148,7 @@
: BaseType( parent )
{
// Can't have a text box without a parent...
- xAssert( parent, _T( "Can't have a MDIParent without a parent..." ) );
+ dwtassert( parent, _T( "Can't have a MDIParent without a parent..." ) );
}
// end namespace dwt
Modified: dcplusplus/trunk/dwt/include/dwt/widgets/Menu.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/widgets/Menu.h 2008-04-24 13:45:26 UTC (rev 1210)
+++ dcplusplus/trunk/dwt/include/dwt/widgets/Menu.h 2008-04-24 13:50:11 UTC (rev 1211)
@@ -186,7 +186,7 @@
void attach(HMENU hMenu, const Seed& cs);
- bool setMenu();
+ void 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.
*/
- bool appendItem(unsigned int id, const tstring & text, BitmapPtr image = BitmapPtr());
+ void appendItem(unsigned int id, const tstring & text, BitmapPtr image = BitmapPtr());
template<typename DispatcherType>
- bool appendItem(unsigned int id, const tstring & text, const typename DispatcherType::F& f, BitmapPtr image = BitmapPtr()) {
+ void 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);
+ appendItem(id, text, image);
}
- bool appendItem(unsigned int id, const tstring & text, const IdDispatcher::F& f, BitmapPtr image = BitmapPtr()) {
- return appendItem<IdDispatcher>(id, text, f, image);
+ void appendItem(unsigned int id, const tstring & text, const IdDispatcher::F& f, BitmapPtr image = BitmapPtr()) {
+ 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
*/
- bool setItemEnabled( unsigned id, bool byPosition = false, bool value = true );
+ void 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);
- bool setDefaultItem(UINT id, bool byPosition = false);
+ void 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.
*/
- bool setText( unsigned id, const tstring& text );
+ void setText( unsigned id, const tstring& text );
ObjectType getChild(UINT position);
Modified: dcplusplus/trunk/dwt/include/dwt/widgets/Spinner.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/widgets/Spinner.h 2008-04-24 13:45:26 UTC (rev 1210)
+++ dcplusplus/trunk/dwt/include/dwt/widgets/Spinner.h 2008-04-24 13:50:11 UTC (rev 1211)
@@ -152,8 +152,7 @@
LRESULT retVal = ::SendMessage( this->handle(), UDM_GETPOS, 0, 0 );
if ( HIWORD( retVal ) != 0 )
{
- xCeption err( _T( " Something went wrong while trying to retrieve value if Spinner" ) );
- throw err;
+ dwtWin32DebugFail(" Something went wrong while trying to retrieve value if Spinner");
}
return LOWORD( retVal );
#else
Modified: dcplusplus/trunk/dwt/include/dwt/widgets/StatusBar.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/widgets/StatusBar.h 2008-04-24 13:45:26 UTC (rev 1210)
+++ dcplusplus/trunk/dwt/include/dwt/widgets/StatusBar.h 2008-04-24 13:50:11 UTC (rev 1211)
@@ -161,12 +161,9 @@
// A status bar can't really be resized since its size is controlled by the
// parent window. But to not let the status bar "hang" we need to refresh its
// size after the main window is being resized.
- dwt::Rectangle rect;
- if ( ::MoveWindow( this->handle(),
- rect.x(), rect.y(), rect.width(), rect.height(), TRUE ) == 0 )
+ if ( ::MoveWindow( this->handle(), 0, 0, 0, 0, TRUE ) == 0 )
{
- xCeption err( _T( "Couldn't reposition windows" ) );
- throw err;
+ dwtWin32DebugFail("Couldn't reposition windows");
}
}
Modified: dcplusplus/trunk/dwt/include/dwt/widgets/Table.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/widgets/Table.h 2008-04-24 13:45:26 UTC (rev 1210)
+++ dcplusplus/trunk/dwt/include/dwt/widgets/Table.h 2008-04-24 13:50:11 UTC (rev 1211)
@@ -231,7 +231,7 @@
/// Change the current icon of an item
/** Sets a new icon for a given item
*/
- bool setIcon( unsigned row, int newIconIndex );
+ void 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.
*/
- bool setColumnWidth( unsigned columnNo, int width );
+ void 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.
*/
- bool redraw( int firstRow = 0, int lastRow = -1 );
+ void redraw( int firstRow = 0, int lastRow = -1 );
void setTableStyle(int style);
@@ -733,12 +733,14 @@
}
inline void Table::eraseColumn( unsigned columnNo ) {
- xAssert( columnNo != 0, _T( "Can't delete the leftmost column" ) );
+ dwtassert( columnNo != 0, _T( "Can't delete the leftmost column" ) );
ListView_DeleteColumn( this->handle(), columnNo );
}
-inline bool Table::setColumnWidth( unsigned columnNo, int width ) {
- return ListView_SetColumnWidth( this->handle(), columnNo, width );
+inline void Table::setColumnWidth( unsigned columnNo, int width ) {
+ if ( ListView_SetColumnWidth( this->handle(), columnNo, width ) == FALSE ) {
+ dwtWin32DebugFail("Couldn't resize columns of Table");
+ }
}
inline void Table::clearImpl() {
Modified: dcplusplus/trunk/dwt/include/dwt/widgets/TextBox.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/widgets/TextBox.h 2008-04-24 13:45:26 UTC (rev 1210)
+++ dcplusplus/trunk/dwt/include/dwt/widgets/TextBox.h 2008-04-24 13:50:11 UTC (rev 1211)
@@ -371,7 +371,7 @@
: BaseType( parent )
{
// Can't have a text box without a parent...
- xAssert( parent, _T( "Cant have a TextBox without a parent..." ) );
+ dwtassert( parent, _T( "Cant have a TextBox without a parent..." ) );
}
inline TextBox::TextBox( Widget * parent )
Modified: dcplusplus/trunk/dwt/include/dwt/widgets/ToolBar.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/widgets/ToolBar.h 2008-04-24 13:45:26 UTC (rev 1210)
+++ dcplusplus/trunk/dwt/include/dwt/widgets/ToolBar.h 2008-04-24 13:50:11 UTC (rev 1211)
@@ -42,6 +42,7 @@
#include "../aspects/AspectFocus.h"
#include "../aspects/AspectFont.h"
#include "../resources/ImageList.h"
+#include "../DWTException.h"
#include "Control.h"
#include <vector>
@@ -203,8 +204,7 @@
if ( this->sendMessage(TB_SETBUTTONSIZE, 0, static_cast< LPARAM >( MAKELONG( width, height ) ) ) != TRUE ||
this->sendMessage(TB_SETBITMAPSIZE, 0, static_cast< LPARAM >( MAKELONG( width, height ) ) ) != TRUE )
{
- xCeption x( _T( "Error while trying to set toolbar button size..." ) );
- throw x;
+ throw Win32Exception( "Error while trying to set toolbar button size...");
}
}
Modified: dcplusplus/trunk/dwt/include/dwt/widgets/ToolTip.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/widgets/ToolTip.h 2008-04-24 13:45:26 UTC (rev 1210)
+++ dcplusplus/trunk/dwt/include/dwt/widgets/ToolTip.h 2008-04-24 13:50:11 UTC (rev 1211)
@@ -37,6 +37,7 @@
#include "../aspects/AspectFont.h"
#include "../aspects/AspectRaw.h"
#include "../aspects/AspectVisible.h"
+#include "../util/check.h"
namespace dwt {
@@ -115,7 +116,7 @@
: BaseType( parent )
{
// Can't have a text box without a parent...
- xAssert( parent, _T( "Can't have a ToolTip without a parent..." ) );
+ dwtassert( parent, _T( "Can't have a ToolTip without a parent..." ) );
}
inline void ToolTip::setMaxTipWidth(int width) {
Modified: dcplusplus/trunk/dwt/include/dwt/widgets/WidgetListViewEditBox.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/widgets/WidgetListViewEditBox.h 2008-04-24 13:45:26 UTC (rev 1210)
+++ dcplusplus/trunk/dwt/include/dwt/widgets/WidgetListViewEditBox.h 2008-04-24 13:50:11 UTC (rev 1211)
@@ -70,7 +70,7 @@
: TextBox( parent )
{
// Can't have a text box without a parent...
- xAssert( parent, _T( "Cant have a TextBox without a parent..." ) );
+ dwtassert( parent, _T( "Cant have a TextBox without a parent..." ) );
}
#ifdef PORT_ME
Deleted: dcplusplus/trunk/dwt/include/dwt/xCeption.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/xCeption.h 2008-04-24 13:45:26 UTC (rev 1210)
+++ dcplusplus/trunk/dwt/include/dwt/xCeption.h 2008-04-24 13:50:11 UTC (rev 1211)
@@ -1,148 +0,0 @@
-/*
- DC++ Widget Toolkit
-
- Copyright (c) 2007-2008, Jacek Sieka
-
- SmartWin++
-
- Copyright (c) 2005 Thomas Hansen
-
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- * Neither the name of the DWT nor SmartWin++ nor the names of its contributors
- may be used to endorse or promote products derived from this software
- without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#ifndef DWT_xCeption_h
-#define DWT_xCeption_h
-
-#include "WindowsHeaders.h"
-#include "tstring.h"
-#include "util/StringConversion.h"
-#include <stdexcept>
-
-namespace dwt {
-
-/// Exception class used in SmartWin
-/** All exceptions thrown by SmartWin will be either of this class or derived from
- * this class. <br>
- * You should derive from this class yourself if you throw exceptions inside your
- * event handlers. <br>
- * Otherwise SmartWin may not be able to respond correctly to the Exception.
- */
-class xCeption : public std::exception
-{
-public:
- /// Constructor taking a const char pointer
- /** The TCHAR * will contain the description returned from the virtual member
- * function called what()
- */
- xCeption( const TCHAR * err ) throw()
- : std::exception(),
- itsAsciiErrorMsg( util::AsciiGuaranteed::doConvert( err, util::ConversionCodepage::ANSI ) ),
- itsFormatWndMessage( 0 )
- {
- errId = ::GetLastError();
- }
-
- /// Overloaded Constructor basically doing the same as the const TCHAR * version
- /** See the const TCHAR * err overloaded version
- */
- xCeption( const tstring & err ) throw()
- : std::exception(),
- itsAsciiErrorMsg( util::AsciiGuaranteed::doConvert( err, util::ConversionCodepage::ANSI ) ),
- itsFormatWndMessage( 0 )
- {
- errId = ::GetLastError();
- }
-
- /// Returns a descriptive error message explaining what went wrong
- /** Overridden from the std::exception::what()<br>
- * Related Members<br>
- * <ul>
- * <li>getErrorCode()</li>
- * <li>whatWndMsg()</li>
- * </ul>
- * This function will ALWAYS return a char * string since it must be compliant
- * with std::exception::what() function
- */
- virtual const char * what() const throw()
- {
- return itsAsciiErrorMsg.c_str();
- }
-
- /// Returns a DWORD defining what went wrong, basically just a GetErrorCode
- /// call from Windows API called in the Constructor
- /** Returns the Windows Error code which is a DWORD, can be used in combination
- * with FormatMessage from the <br>
- * Windows API to get a descriptive Windows Error code explaining what went
- * wrong (if it was a windows error) <br>
- * You should in most cases rather use whatWndMsg to get a formatted message
- * from Windows API. <br>
- * Related Members <br>
- * - what()
- * - whatWndMsg()
- */
- virtual DWORD getErrorCode() const
- {
- return errId;
- }
-
- /// Returns a descriptive windows error message explaining what went wrong.
- /** Returns the formatted Windows Error message<br>
- * Related Members<br>
- * - what()
- * - getErrorCode()
- */
- virtual const TCHAR * whatWndMsg() const
- {
- ::FormatMessage( FORMAT_MESSAGE_ALLOCATE_BUFFER |
- FORMAT_MESSAGE_FROM_SYSTEM |
- FORMAT_MESSAGE_IGNORE_INSERTS,
- NULL,
- errId,
- MAKELANGID( LANG_NEUTRAL, SUBLANG_DEFAULT ),
- ( LPTSTR ) & itsFormatWndMessage,
- 0,
- NULL );
- return itsFormatWndMessage;
- }
-
- virtual ~xCeption() throw()
- {
- ::LocalFree( itsFormatWndMessage );
- };
-
-private:
- std::string itsAsciiErrorMsg;
- DWORD errId;
- mutable TCHAR * itsFormatWndMessage;
-};
-
-/// Contains a wrapper around assert/xception which will toss out an assertion if
-/// we're in debug mode but anyway throw an exception
-#define xAssert( x, y ) do{ if( !(x) ) { assert(false&&(y)); throw xCeption((y)); } } while(false);
-
-}
-
-#endif
Modified: dcplusplus/trunk/dwt/src/Application.cpp
===================================================================
--- dcplusplus/trunk/dwt/src/Application.cpp 2008-04-24 13:45:26 UTC (rev 1210)
+++ dcplusplus/trunk/dwt/src/Application.cpp 2008-04-24 13:50:11 UTC (rev 1211)
@@ -35,9 +35,8 @@
#include <dwt/Application.h>
#include <dwt/tstring.h>
-#include <dwt/xCeption.h>
+#include <dwt/DWTException.h>
-
extern int SmartWinMain( dwt::Application & app );
namespace dwt {
@@ -101,35 +100,6 @@
#endif
}
-unsigned int Application::reportErr( xCeption & err, bool corruptMemMemLeak )
-{
- unsigned int retVal;
-
- if ( corruptMemMemLeak )
- retVal = 0xdeadbeef;
- else
- retVal = err.getErrorCode();
-
-#ifdef _MSC_VER
-#ifndef WINCE
-#ifdef _DEBUG
- _RPT0( _CRT_WARN, "\r\n" );
- _RPT0( _CRT_WARN, "*** ERROR ***\r\n" );
- _RPT0( _CRT_WARN, err.what() );
- _RPT0( _CRT_WARN, "\r\n" );
- if ( ! corruptMemMemLeak )
- {
- _RPT0( _CRT_WARN, err.whatWndMsg() );
- _RPT0( _CRT_WARN, "\r\n" );
- }
- _RPT0( _CRT_WARN, "*** END OF ERROR ***" );
- _RPT0( _CRT_WARN, "\r\n" );
-#endif
-#endif
-#endif
- return retVal;
-}
-
Application::Application( int nCmdShow )
: itsCmdShow(nCmdShow)
{
@@ -307,11 +277,11 @@
}
else if ( dwWaitResult < WAIT_ABANDONED_0 + itsVHEvents.size() )
{
- throw xCeption( _T( "Application::run : Encountered an abandoned wait mutex object ") );
+ throw Win32Exception("Mutex abandoned");
}
else if ( dwWaitResult != WAIT_TIMEOUT )
{
- throw xCeption( _T( "Application::run : MsgWaitForMultipleObjects() failed!" ) );
+ throw Win32Exception("Application::run : MsgWaitForMultipleObjects() failed!" );
}
}
return static_cast< int >( msg.wParam );
@@ -353,14 +323,12 @@
bool corruptMemMemLeak = false;
dwt::Application::init( nCmdShow );
- try {
- retVal = SmartWinMain( dwt::Application::instance() ); // Call library user's startup function.
- dwt::Application::uninit();
+
+ retVal = SmartWinMain( dwt::Application::instance() ); // Call library user's startup function.
- dwt::Application::checkCorruptOrMemleak( corruptMemMemLeak );
- } catch ( dwt::xCeption & err ) {
- retVal = dwt::Application::reportErr( err, corruptMemMemLeak );
- }
+ dwt::Application::uninit();
+ dwt::Application::checkCorruptOrMemleak( corruptMemMemLeak );
+
return retVal;
}
Modified: dcplusplus/trunk/dwt/src/CanvasClasses.cpp
===================================================================
--- dcplusplus/trunk/dwt/src/CanvasClasses.cpp 2008-04-24 13:45:26 UTC (rev 1210)
+++ dcplusplus/trunk/dwt/src/CanvasClasses.cpp 2008-04-24 13:50:11 UTC (rev 1211)
@@ -30,7 +30,7 @@
*/
#include <dwt/CanvasClasses.h>
-#include <dwt/xCeption.h>
+#include <dwt/util/check.h>
#include <dwt/resources/Brush.h>
namespace dwt {
@@ -47,10 +47,8 @@
void Canvas::moveTo( int x, int y )
{
- if ( !::MoveToEx( itsHdc, x, y, 0 ) )
- {
- xCeption x( _T( "Error in CanvasClasses moveTo" ) );
- throw x;
+ if ( !::MoveToEx( itsHdc, x, y, 0 ) ) {
+ dwtWin32DebugFail("Error in CanvasClasses moveTo");
}
}
@@ -61,15 +59,12 @@
void Canvas::lineTo( int x, int y )
{
- if ( !::LineTo( itsHdc, x, y ) )
- {
- xCeption x( _T( "Error in CanvasClasses lineTo" ) );
- throw x;
+ if ( !::LineTo( itsHdc, x, y ) ) {
+ dwtWin32DebugFail("Error in CanvasClasses lineTo");
}
}
-void Canvas::lineTo( const Point & coord )
-{
+void Canvas::lineTo( const Point & coord ) {
lineTo( coord.x, coord.y );
}
@@ -98,37 +93,29 @@
void Canvas::polygon( const Point points[], unsigned count )
{
- if ( !::Polygon( itsHdc, reinterpret_cast< POINT * >( const_cast < Point * >( & points[0] ) ), count ) )
- {
- xCeption x( _T( "Error in CanvasClasses polygon" ) );
- throw x;
+ if ( !::Polygon( itsHdc, reinterpret_cast< POINT * >( const_cast < Point * >( & points[0] ) ), count ) ) {
+ dwtWin32DebugFail("Error in CanvasClasses polygon");
}
}
void Canvas::polygon( POINT points[], unsigned count )
{
- if ( !::Polygon( itsHdc, points, count ) )
- {
- xCeption x( _T( "Error in CanvasClasses polygon" ) );
- throw x;
+ if ( !::Polygon( itsHdc, points, count ) ) {
+ dwtWin32DebugFail("Error in CanvasClasses polygon" );
}
}
void Canvas::ellipse( int left, int top, int right, int bottom )
{
- if ( ! ::Ellipse( itsHdc, left, top, right, bottom ) )
- {
- xCeption x( _T( "Error in CanvasClasses ellipse" ) );
- throw x;
+ if ( ! ::Ellipse( itsHdc, left, top, right, bottom ) ) {
+ dwtWin32DebugFail("Error in CanvasClasses ellipse");
}
}
void Canvas::rectangle( int left, int top, int right, int bottom )
{
- if ( ! ::Rectangle( itsHdc, left, top, right, bottom ) )
- {
- xCeption x( _T( "Error in CanvasClasses Rectangle" ) );
- throw x;
+ if ( ! ::Rectangle( itsHdc, left, top, right, bottom ) ) {
+ dwtWin32DebugFail("Error in CanvasClasses Rectangle");
}
}
@@ -142,10 +129,8 @@
void Canvas::ellipse( const dwt::Rectangle & rect )
{
- if ( ! ::Ellipse( itsHdc, rect.left(), rect.top(), rect.right(), rect.bottom() ) )
- {
- xCeption x( _T( "Error in CanvasClasses ellipse" ) );
- throw x;
+ if ( ! ::Ellipse( itsHdc, rect.left(), rect.top(), rect.right(), rect.bottom() ) ) {
+ dwtWin32DebugFail("Error in CanvasClasses ellipse");
}
}
@@ -195,18 +180,15 @@
int retVal = ::DrawText( itsHdc, text.c_str(), ( int ) text.length(), & rc, format );
if ( 0 == retVal )
{
- xCeption x( _T( "Error while trying to draw text to canvas" ) );
- throw x;
+ dwtWin32DebugFail("Error while trying to draw text to canvas");
}
return retVal;
}
void Canvas::extTextOut( const tstring & text, unsigned x, unsigned y )
{
- if ( 0 == ::ExtTextOut( itsHdc, x, y, 0, NULL, text.c_str(), ( unsigned ) text.length(), 0 ) )
- {
- xCeption xc( _T( "Error while trying to do TextOut operation" ) );
- throw xc;
+ if ( 0 == ::ExtTextOut( itsHdc, x, y, 0, NULL, text.c_str(), ( unsigned ) text.length(), 0 ) ) {
+ dwtWin32DebugFail("Error while trying to do TextOut operation");
}
}
Added: dcplusplus/trunk/dwt/src/DWTException.cpp
===================================================================
--- dcplusplus/trunk/dwt/src/DWTException.cpp (rev 0)
+++ dcplusplus/trunk/dwt/src/DWTException.cpp 2008-04-24 13:50:11 UTC (rev 1211)
@@ -0,0 +1,68 @@
+/*
+ DC++ Widget Toolkit
+
+ Copyright (c) 2007-2008, Jacek Sieka
+
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without modification,
+ are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+ * Neither the name of the DWT nor SmartWin++ nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#include <dwt/DWTException.h>
+
+namespace dwt {
+
+std::string Win32Exception::translateLastError() {
+ DWORD code = ::GetLastError();
+
+ LPSTR lpMsgBuf = 0;
+ DWORD chars = FormatMessageA(
+ FORMAT_MESSAGE_ALLOCATE_BUFFER |
+ FORMAT_MESSAGE_FROM_SYSTEM |
+ FORMAT_MESSAGE_IGNORE_INSERTS,
+ NULL,
+ code,
+ MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
+ (LPSTR) &lpMsgBuf,
+ 0,
+ NULL
+ );
+
+ if(chars == 0) {
+ ::LocalFree( lpMsgBuf );
+ return std::string();
+ }
+ std::string tmp(lpMsgBuf, chars);
+ // Free the buffer.
+ ::LocalFree( lpMsgBuf );
+ std::string::size_type i = 0;
+
+ while( (i = tmp.find_first_of("\r\n", i)) != std::string::npos) {
+ tmp.erase(i, 1);
+ }
+ return tmp;
+
+}
+
+}
Modified: dcplusplus/trunk/dwt/src/ImageList.cpp
===================================================================
--- dcplusplus/trunk/dwt/src/ImageList.cpp 2008-04-24 13:45:26 UTC (rev 1210)
+++ dcplusplus/trunk/dwt/src/ImageList.cpp 2008-04-24 13:50:11 UTC (rev 1211)
@@ -34,7 +34,8 @@
*/
#include <dwt/resources/ImageList....
[truncated message content] |
