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
a1999705b6
rebaked after adding convauto.cpp/.h
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38573 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-05 15:06:15 +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
Mart Raudsepp
cc845a6142
encconv.cpp: Remove comment about 5 being big enough value for ENC_PER_PLATFORM - it should be the minimum
...
necessary instead.
fmapbase.cpp: Slightly reduce the size of an array - it should be reduced further (we only have one item with the
size of 9, rest are not over 6)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38569 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-05 10:02:28 +00:00
Mart Raudsepp
da9619e046
Update unictabl.inc manually, keeping KOI8-U, while doing it as close as possible for as how the regenerator would
...
have done if it had a matching KOI8-U.TXT file at hand.
This moves 5.9KB from .data to .rodata (guaranteed to be shared among wx apps).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38568 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-05 00:37:45 +00:00
Mart Raudsepp
cd1a22d1d3
Support having const encoding tables. Modify generator code to regenerate as such.
...
Can't simply regenerate src/common/unictabl.inc, because KOI8-U.TXT is missing, and mk_fallbacks has issues
(sort +2 isn't valid on my system)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38567 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-05 00:30:18 +00:00
Mart Raudsepp
8ddbb13781
Make EquivalentEncodings 3-dimensional array const, moving 864 bytes from data segment (copy-on-write) to
...
.rodata segment (always guaranteed to be shared among processes) in wxBase.
Make said array as big as necessary, not bigger than necessary (as before) - shaving 122 bytes off of that 864
bytes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38563 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-04 23:01:57 +00:00
Mart Raudsepp
ac131bab11
wxGTK2: No need to warn about threads being unsupported if gtk+ is lower than 1.2.4 - this is source code for gtk2
...
only.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38562 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-04 19:44:27 +00:00
Mart Raudsepp
08f600190c
gdk_window_get_colormap -> gdk_drawable_get_colormap
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38560 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-04 18:56:39 +00:00
Mart Raudsepp
bc8b8220f8
gdk_cursor_destroy -> gdk_cursor_unref
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38559 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-04 18:19:55 +00:00
Mart Raudsepp
2454dc8a64
GDK_ROOT_PARENT -> gdk_get_default_root_window
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38558 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-04 17:50:58 +00:00
Mart Raudsepp
791d7ea2d6
gdk_window_get_size -> gdk_drawable_get_size
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38556 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-04 17:19:42 +00:00
David Surovell
ee32d4354f
added missing paren
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38553 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-04 16:40:38 +00:00
Mart Raudsepp
e6e9293af3
gdk_gc_destroy -> gdk_gc_unref -> g_object_unref
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38552 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-04 15:06:55 +00:00
Mart Raudsepp
4e84399d42
gdk_image_destroy -> g_object_unref (gdk_image_destroy is deprecated in favor of gdk_image_unref, and is just a
...
#define to it; gdk_image_unref deprecated in favor of g_object_unref)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38551 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-04 14:57:45 +00:00
Mart Raudsepp
1a3a1b2df2
gdk_pixbuf_unref -> g_object_unref
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38550 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-04 14:44:06 +00:00
Mart Raudsepp
5e4bf05abd
gdk_gc_unref -> g_object_unref
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38549 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-04 14:26:57 +00:00
Mart Raudsepp
f5af73080a
And gdk_drawable_unref is in turn deprecated in favor of g_object_unref
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38547 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-04 14:06:00 +00:00
Mart Raudsepp
f368b5b9ab
gdk_bitmap/pixmap_unref -> gdk_drawable_unref
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38546 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-04 13:54:02 +00:00
Mart Raudsepp
15f0ad7014
gdk_draw_pixmap -> gdk_draw_drawable
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38545 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-04 13:46:34 +00:00
Mart Raudsepp
62d4b5d6fe
gdk_window_copy_area(drawable,gc,x,y,source_drawable,source_x,source_y,width,height) ->
...
gdk_draw_pixmap(drawable,gc,source_drawable,source_x,source_y,x,y,width,height)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38544 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-04 13:37:31 +00:00
Mart Raudsepp
22a3bce465
gdk_window_get_visual -> gdk_drawable_get_visual
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38543 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-04 13:13:04 +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
Václav Slavík
e7feeafa56
added ParseInnerSource() to make <pre>-like parsing easier
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38535 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-03 19:34:21 +00:00
Włodzimierz Skiba
47eb93d02d
Warning fix.
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38533 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-03 17:38:05 +00:00
David Surovell
bee1995894
minor cleanup - reformatting
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38531 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-03 00:21:00 +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
Vadim Zeitlin
ef25e5a4c8
don't crash when loading images with verbose==false (patch 1449823)
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38513 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-02 01:27:36 +00:00
Vadim Zeitlin
1819a5c1ac
report error for GIF images without CLEAR code in the stream instead of crashing (patch 1449734)
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38512 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-02 01:21:53 +00:00
Julian Smart
48a102f9e5
Reset the position when auto-sizing toolbar
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38506 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-01 18:16:17 +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
David Surovell
b8c3d6306c
simplify KeywordSearch; cleanup and reformat
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38481 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-31 19:04:25 +00:00
Włodzimierz Skiba
d879e16fc3
Build fix for 2.6 compatibility off.
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38479 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-31 18:26:24 +00:00
Włodzimierz Skiba
1c067fe3c1
Removed every usage of obsolete wxTLW flags. 2.6 compatibility markup for them.
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38477 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-31 18:07:22 +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
Vadim Zeitlin
44327ff375
don't give error when reading empty file in Unicode build
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38466 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-31 14:00:31 +00:00
Vadim Zeitlin
dbcf443c7d
rewrote Read() to slurp all the file at once to avoid problems in Unicode build
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38464 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-31 13:53:20 +00:00
Vadim Zeitlin
b3825734fc
don't compile DirectDraw code when wxUSE_DIRECTDRAW==0 (patch 1461271); set wxUSE_DIRECTDRAW to 0 by default
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38457 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-30 23:49:34 +00:00
Jamie Gadd
82d492f145
Include compatibility guard for int GetItemSpacing( bool isSmall ) in implementation file also.
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38456 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-30 23:01:55 +00:00