Commit Graph

240 Commits

Author SHA1 Message Date
David Elliott
5c4ed98d99 Rename wxMBConv_cocoa to wxMBConv_cf and use it when __DARWIN__ (all Darwin and OS X systems).
Add comment about __WXMAC__ code path.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47199 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-07-06 18:20:32 +00:00
David Elliott
f762ea32ed Fix wxCocoa compilation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47181 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-07-06 00:14:17 +00:00
Vadim Zeitlin
999020e1bb fix Sun CC warnings about converting literal strings to non-const char *
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46639 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-06-22 17:09:18 +00:00
Václav Slavík
faa60a4f0b OS X compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46399 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-06-11 07:28:54 +00:00
Václav Slavík
8650108199 don't use implicit wxString->char*/wchar_t* conversion, it will not be available in wxUSE_STL build in the future
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46391 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-06-10 17:42:41 +00:00
Václav Slavík
48a2e193ec compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46322 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-06-04 12:51:25 +00:00
Václav Slavík
ba98e032a7 implemented wxMBConv::IsUTF8() helper for more classes so that all uses of UTF-8 are detected and optimized in wxString
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46265 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-06-02 12:42:57 +00:00
Václav Slavík
5487ff0f50 use const wxMBConv& instead of wxMBConv& in public methods so that it's possible to pass in temporary objects;
don't use global wxConvUTF8 object internally, it may be unavailable at static objects destruction time


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-05-11 20:55:24 +00:00
Václav Slavík
092ee46f03 fixed DLL linking of wxConvLibc etc.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-05-03 15:35:07 +00:00
Václav Slavík
1e50d914af made wxConvXXX objects usable at static initialization time
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45751 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-05-02 09:03:03 +00:00
Michael Wetherell
5deedd6e79 Map illegal UTF-8 sequences to a range in Unicode's private use area as
discussed recently on wx-users.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45707 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-28 15:56:17 +00:00
Vadim Zeitlin
02c7347b7f modify m_encoding, not m_name, in wxCSConv::CreateConvIfNeeded() if we don't have either (as is the case with wxConvLocal); this fixes an infinite recursion in wxMac after the latest changes as wxLocale::GetSystemEncodingName() there returned empty (and not NULL) string which resulted in call to wxFontMapperBase::CharsetToEncoding() and reentrancy into wxConvLocal
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44900 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-18 21:12:20 +00:00
Václav Slavík
c9f7896861 first phase of transition to unified Unicode build:
1. changed c_str() to return wxCStrData (implicitly convertible to wxChar*)
2. added template type-safe wrappers for vararg functions
3. added wxUniChar class representing single Unicode character
4. changed wxString::operator[] and wxString::iterator to return wxUniChar


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44865 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-17 10:26:10 +00:00
Václav Slavík
480f42ec8e added missing #pragma hdrstop
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44861 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-16 20:19:35 +00:00
Vadim Zeitlin
a6c2e2c765 include wx/msw/missing.h after wx/msw/private.h, otherwise we get warnings when compiling without PCH (replaces patch 1674510)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44844 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-16 00:56:28 +00:00
Vadim Zeitlin
69c928ef47 added wxSafeConvertMB2WX/WX2MB() and use them when interfacing with C functions which crash if we pass them NULL pointers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44771 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-11 23:38:42 +00:00
Vadim Zeitlin
0f0298b10c added wxCSConv::IsOk() (patch 1637944)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44251 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-18 20:39:10 +00:00
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