Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
38,624 Commits 1 Branch 330 Tags
e08dc08405682d161fac6b0cd67da8c4e8581821
Commit Graph

223 Commits

Author SHA1 Message Date
Václav Slavík
2c74c55876 fixed wxCSConv to work again for iso-8859-1 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43941 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-12-11 21:14:48 +00:00
Vadim Zeitlin
1c714a5d07 implement To/FromWchar() as wxCSConv methods, otherwise wxCSConv(wxFONTENCODING_UTF16) didn't work correctly even if the underlying wxMBConvUTF16 did 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43877 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-12-09 16:19:34 +00:00
Włodzimierz Skiba
57bd4c6031 Include wx/msw/wrap*.h according to pch support (with other minor cleaning). 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41054 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-09-07 19:01:45 +00:00
Vadim Zeitlin
d3c7fc996a mark all dtors which are virtual because base class dtor is virtual explicitly virtual themselves 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41020 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-09-05 20:47:48 +00:00
Václav Slavík
4c75209fc3 made wxCSConv fall back to iso-8859-1 if wxFONTENCODING_SYSTEM is specified and wxLocale cannot be used to determine the default charset because wxUSE_INTL=0 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40864 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-08-27 09:29:25 +00:00
Paul Cornett
406d283a64 build fixes 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40653 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-08-17 03:02:15 +00:00
Stefan Csomor
3c67ec06a7 on mac using macroman only created once a successful wxCSConv, because the iconv' miss was entered as a failure into the cache, which then killed any subsequent attempt .. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40411 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-08-01 09:37:42 +00:00
Václav Slavík
3ef10cfc2e warnings fixes for !wxUSE_FONTMAP 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40397 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-07-31 12:28:05 +00:00
Václav Slavík
91cb7f52cc compilation fix for !wxUSE_FONTMAPstrconv.cpp 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40396 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-07-31 12:22:33 +00:00
Stefan Csomor
fbb0b8afd0 adding back-conversion to filenames (wide composed) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40227 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-07-22 07:18:32 +00:00
Stefan Csomor
d43d9ee796 was crashing wxCocoa builds (decomposition will be needed there as well, but the current implementation is based on the TEConverters) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39969 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-07-04 09:12:34 +00:00
Stefan Neis
6a17b868de Fixed typos in comments (patch #1515724) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39943 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-07-02 21:40:38 +00:00
Stefan Csomor
739cb14a31 making sure mac filenames are always decomposed D Unicode UTF8 and the internal wxStrings are using composed D Unicode 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39905 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-06-30 14:24:14 +00:00
Włodzimierz Skiba
df69528b7e Include wx/hashmap.h according to precompiled headers of wx/wx.h (with other minor cleaning). 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39802 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-06-20 10:24:07 +00:00
Vadim Zeitlin
1e1c5d6276 explicitly call base class ctor to silent gcc warning (patch 1492701) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39375 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-05-28 14:33:56 +00:00
Vadim Zeitlin
168a76fe3d corrected last change to cWC2MB() to also work for encoding with NUL length > 1 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39076 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-05-06 18:53:43 +00:00
Vadim Zeitlin
13d92ad62a don't allocate 0-sized buffer in cWC2MB() even if input size is 0 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39075 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-05-06 18:49:47 +00:00
Włodzimierz Skiba
de6185e212 Include wx/utils.h according to precompiled headers of wx/wx.h (with other minor cleaning). 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38972 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-05-02 10:39:23 +00:00
Vadim Zeitlin
a78c43f158 initialize nulLen to 0 for all compilers as some versions of gcc don't see that it's not used if left uninitialized too (bug 1469637) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38696 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-04-13 12:16:38 +00:00
Vadim Zeitlin
d5bef0a323 added wxConvUI which determines the conversion used for the UI elements and can be changed from the user code 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38665 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-04-11 00:36:24 +00:00
Vadim Zeitlin
9088c87bd0 leave enough space for the trailing NUL when converting UTF-16 to UTF-32 in Mac conversion 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38603 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-04-06 12:43:38 +00:00
Vadim Zeitlin
8d3dd06948 added missing const to fix last commit 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38598 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-04-06 11:51:41 +00:00
Vadim Zeitlin
e27a15e146 added a cast to wxDecodeSurrogate() to fix wxMSW cross-compilation 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38596 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-04-06 11:27:40 +00:00
David Surovell
ef1991645a cleanup (repeat of v197) - added whitespace around operators, some blank lines, fixed comment typos, renamed out-in vars to outBuff-inBuff 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38592 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-04-06 02:30:52 +00:00
Vadim Zeitlin
35d11700a5 implemented UTF-16/32 using To/FromWChar() instead of MB2WC/WC2MB for sizeof(wchar_t)==4 platforms too 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38586 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-04-05 23:04:10 +00:00
Vadim Zeitlin
467e04791c 1. use a manifest constant wxNO_LEN instead of -1 for lengths everywhere 
2. reimplemented UTF-16/32 conversions using To/FromWChar() API instead
   of MB2WC/WC2MB for Windows (or rather SIZEOF_WCHAR_T == 2 platforms),
   the first tangible result is that reading UTF-32BE text streams now
   works too
3. more off by 1 fixes


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38585 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-04-05 22:12:45 +00:00
David Surovell
d32a507d02 cleanup - added whitespace around operators, some blank lines, fixed comment typos, renamed out-in vars to outBuff-inBuff 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38582 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-04-05 18:02:26 +00:00
Vadim Zeitlin
d3478e2cf1 Mac compilation fix after last commit 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38580 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-04-05 17:10:01 +00:00
Vadim Zeitlin
d36c9347ea added wxMBConv::Clone() to be able to copy conversion objects polymorphically 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38576 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-04-05 16:10:08 +00:00
Vadim Zeitlin
64f56529a8 properly NUL-terminate the output in wxMBConvUTF16swap::WC2MB() 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38575 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-04-05 15:18:05 +00:00
Vadim Zeitlin
830f8f11bc 1. changed all "wxMBConv& conv" parameters to "const wxMBConv&" 
2. this allows to use wxConvAuto() instead of wxConvUTF8 as default value
   for this parameter in the classes which read text from the file: wxConvAuto
   automatically recognizes the BOM at the start of file and uses the correct
   conversion
3. don't use Windows for UTF-7 conversions as there is no way to make it
   fail on invalid UTF-7 strings; use our own wxMBConvUtf7 instead


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38570 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-04-05 14:37:47 +00:00
Vadim Zeitlin
509da4510f MB2WC/WC2MB are not pure virtual any longer, implement them in terms of To/FromWChar() 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38542 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-04-04 13:04:47 +00:00
Vadim Zeitlin
483b0434bf added new To/FromWChar() API with more reasonable semantics than old MB2WC/WC2MB; for now both coexist and the change is/should be backwards compatible 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38541 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-04-04 12:35:21 +00:00
Vadim Zeitlin
7ef3ab50e9 renamed GetMinMBCharWidth() to GetMBNulLen(), made it public and documented it 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38540 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-04-04 07:49:08 +00:00
Vadim Zeitlin
69373110a5 fixed wxMBConv_iconv to work with UTF-16/32 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38529 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-04-02 20:03:42 +00:00
Vadim Zeitlin
39406a5d05 compilation fix for iconv call 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38527 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-04-02 15:59:57 +00:00
Vadim Zeitlin
c1464d9d10 replaced recently added wxMBConv::GetMBNul() with a less clever but better 
working GetMinMBCharWidth(): the idea is that we can't deal with completely
arbitrary encodings anyhow using the current API as we get confused by NUL
runs in the middle of the string, so instead just deal correctly with normal
multibyte encodings, UTF-16/UCS-2 and UTF-32/UCS-4 which should cover 99.9% of
the cases


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38523 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-04-02 14:59:53 +00:00
David Surovell
e9531db94d fix compilation problem in prior commit 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38505 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-04-01 16:40:08 +00:00
Vadim Zeitlin
356410fc88 fixed wxMBConv_iconv::GetMBNul() 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38503 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-04-01 15:34:42 +00:00
Vadim Zeitlin
22886fb3c3 Unix compilation fixes after last commit 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38500 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-04-01 13:38:28 +00:00
Vadim Zeitlin
eec47cc6c4 Described in the comments and documented the semantics of the parameters and 
return values of wxMBConv methods and tried to make them more consistent. The
only (intentional) backwards incompatible change is that cMB2WC/cWC2MB now
return the length of the converted string in outLen parameter and not length+1

Added wxMBConv::GetMBNul() and use it instead of supposing that all multibyte
strings are always terminated with a single NUL which is wrong for UTF-16/32.

Using GetMBNul(), completely rewrote cMB2WC/cWC2MB() to accept a string of the
specified length, whether it is NUL-terminated or not. This means that they
don't overwrite the provided buffer any more and convert the entire string in
all cases.

Fixed bug in wxMBConvUTF16::WC2MB() which didn't NUL-terminate the string
properlyv even if there was enough space.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38498 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-04-01 12:43:03 +00:00
Vadim Zeitlin
da12017a64 undid last (wrong) change to wxMBConvUTF16swap::MB2WC(); added comment to explain why 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38489 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-03-31 20:28:37 +00:00
Vadim Zeitlin
bfab25d4c4 fixed fatal buffer overwrite in wxMBConvUTF16swap::MB2WC() 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38487 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-03-31 20:23:33 +00:00
Vadim Zeitlin
04a378342d detect some invalid UTF7 strings when decoding them in wxMBConvUTF7 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38486 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-03-31 20:04:07 +00:00
Vadim Zeitlin
53c174fcd5 really pass the proper output buffer size in wxMBConv_win32 round trip check, at least for the encodings without NULs such as UTF7 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38474 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-03-31 17:40:17 +00:00
Vadim Zeitlin
2f96d9bb8d pass proper output buffer size in round trip conversion success check in wxMBConv_win32, otherwise conversions from UTF-7 always failed for example 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38473 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-03-31 17:34:48 +00:00
Włodzimierz Skiba
8942f83aca wxWinCE build fix. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37836 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-03-06 23:58:27 +00:00
Václav Slavík
8902898054 fixed win32 code to not use MB_ERR_INVALID_CHARS on win version where it isn't available; roundtrip check is used instead 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37830 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-03-06 17:36:36 +00:00
Vadim Zeitlin
e4277538a5 set m_encoding in wxCSConv ctor from name 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37409 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-02-09 14:58:08 +00:00
Julian Smart
3f5c62f982 Reverted semicolons patch 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-01-18 16:45:41 +00:00