Commit Graph

117 Commits

Author SHA1 Message Date
Vadim Zeitlin
f8d791e0a4 src/common/strconv.cpps/wcslen/wxWcslen/g
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17130 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-09-11 12:33:01 +00:00
Julian Smart
ce68ad2572 Replaced wcslen with wxWcslen
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17129 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-09-11 11:28:51 +00:00
Václav Slavík
77ab277914 compilation fix for wxUSE_WCHAR_T=0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16978 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-09-04 22:07:12 +00:00
Julian Smart
3bce6687f4 Mods for Wine compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16869 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-30 20:34:27 +00:00
Vadim Zeitlin
129db666f1 Windows compilation fixes after recent changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16785 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-25 19:03:06 +00:00
Vadim Zeitlin
e5cceba0ea no real changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16769 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-25 17:15:03 +00:00
Václav Slavík
e4c2bd8403 reverted Robert's preference for tables-driven EC_CharSet
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16606 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-19 23:09:18 +00:00
Robert Roebling
ca11abde11 Lots more Unicode fixes.
wxClipboard fixes for GTK2 and UTF8.
  wxFileConfig now uses wxConvLocal to convert text
    and doesn't crash anymore..


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16601 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-19 17:02:10 +00:00
Václav Slavík
49dd9820ac don't crash if used in iconv-like fashion
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16588 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-18 17:23:08 +00:00
Robert Roebling
7291c37aa8 iconv() really never set the trailing 0.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16578 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-17 19:36:07 +00:00
Robert Roebling
4bc6e5c51a iconv() doesn't set the trailing zero
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16573 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-17 18:20:53 +00:00
Václav Slavík
ab217dba91 reverted previous checkin
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16494 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-13 23:09:40 +00:00
Robert Roebling
0c15fcc814 This way strconv copmiles again. I don't think
this is the intended use of ICONV_CONST, though.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16487 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-13 19:55:14 +00:00
Robert Roebling
04c7912765 Killing more wxConvLibc calls...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16455 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-11 16:32:50 +00:00
Robert Roebling
b1ac3b56e6 Added wxString::FromAscii() wxString::ToAscii().
Removed wxConvFile, made it a define wxConvLocal.
  Exchanged some wxConvLibc to wxConvLocal calls.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16453 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-11 13:09:57 +00:00
Robert Roebling
24f588af92 Fix for Unicode conversion.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16440 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-10 11:24:25 +00:00
Robert Roebling
d1efca1a2a Hopefully corrected conversion buffer size.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16423 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-08 21:40:30 +00:00
Gilles Depeyrot
54380f29f0 implemented explicit copy constructor and assignement operator
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15411 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-05-07 20:40:04 +00:00
Václav Slavík
142b3bc26a added wxFontMapper::Get/Set
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14969 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-04-06 15:04:27 +00:00
David Webster
7f1698c34c need wxUSE_WCHAR_T around wxConvLocal
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14955 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-04-05 20:08:51 +00:00
Julian Smart
65e5084827 Added wxTB_NODIVIDER and wxTB_NOALIGN so native Windows toolbar can
used in FL.
Adjusted Windows toolbar height for wxTB_NODIVIDER style.
Removed some false memory leak reporting from fontmap.cpp, mimecmn.cpp,
strconv.cpp.
Added and used MapBitmap function in newbmpbtn.cpp so the right
colours are used under Windows.
<controversial>Added iniconf.cpp to WIN32 compilation</conroversial>


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14936 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-04-04 13:13:51 +00:00
Kendall Bennett
574c939ef1 Merges from Scitech Branch (George Davison):
Added wxDisplayChangedEvent and triggering in MSW, when display mode changes
this event gets triggered. I don't know what should happen with other OS's
since I am not familiar with how they handle mode changes.

Watcome Version 11 now compiles with wide character support.

Fixed watcom warnings in
	html/htmlwin.h
	imagbmp.h
	listctrl.h
	imagbmp.cpp
	quantize.cpp
	strconv.cpp
	variant.cpp
	dirctrlg.cpp
	treectlg.cpp
	m_style.cpp
	fontenum.cpp
	listctrl.cpp
	ole\dataobj.cpp
	textctrl.cpp
	window.cpp
	xml.cpp

msw/setup.h
	with watcom version 11 it now compiles with wide character support.

xrc/xml.cpp
	fixed memory leak and compile warnings


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14057 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-02-07 18:46:31 +00:00
Vadim Zeitlin
373658eb49 fixed for compilation without wxUSE_WCHAR_T and minor cleanups associated with this
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14005 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-02-04 22:33:52 +00:00
Vadim Zeitlin
734eda8ab9 fixed crash in wxGetCharacterSet when not using iconv
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13827 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-26 12:31:55 +00:00
Vadim Zeitlin
cafbf6fb1f fixes to handling of the 7 bit ASCII encoding
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13799 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-25 14:29:33 +00:00
Václav Slavík
4f61e22c77 iconv-based conversion works again, after being broken for a while
(the code always felt back to wxEncodingConverter)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13781 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-24 21:14:21 +00:00
Václav Slavík
b040e242e7 use AM_ICONV for iconv configure checks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13749 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-22 18:55:06 +00:00
Václav Slavík
957686c882 don't crash if we can't detect g_wcCharset
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13665 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-19 23:22:48 +00:00
Vadim Zeitlin
405d8f4657 fixed crash in iconv_close() as well
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13657 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-19 15:42:07 +00:00
Vadim Zeitlin
36acb88072 fixed crash in iconv_open() and cleaned up the code a bit further
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13652 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-19 13:15:56 +00:00
Vadim Zeitlin
dc7c324430 wxBase compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12976 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-12-10 23:24:53 +00:00
Vadim Zeitlin
b1d66b5415 added wxEncodingToCodepage() and implemented it properly (using in32 API instead of directly reading from the registry)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12943 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-12-09 00:46:15 +00:00
Vadim Zeitlin
de85a884d7 applied patch 473558: fixes for CW compilation under MSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12154 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-10-23 20:43:23 +00:00
Ron Lee
3a922bb4bd More build system polishing.. mostly. Some stuff ported over from
recent changes to the 2.2 branch.

Rationalised the autoconf scripts again, removed lots of stuff that
shouldn't be there anymore and pounded the rest into an even tighter
furball. (There's more work to be done here, but we're getting there..)

Implemented the library naming scheme outlined in tn0012.txt -- introduced
'toolchain' and 'widget set' into the autoconf scripts, obsoleted the
top level wx/setup.h and much of the mess associated with it.

More changes for cross compiling and 2.3 debs.

s/burnt_name/soname/g ; s/CC/CXX/g ; s/CCC/CC/g ;  Just because it's Right.
(Thanks Vadim for already doing *FLAGS..)

Fixed libfl Makefile to actually work.

Removed *_DEPS from tmake templates, in every case they can be determined
from the relevant *_OBJS

Added BASE_MSW_OBJS, a couple of missing #includes, some missing files to
the 'dist' targets, and fixed some compile warnings.

Changed setup.py to use wx-config --gl-libs instead of hard coded constants.

 Modified Files:
 	Makefile.in configure configure.in setup.h.in wx-config.in
 	wxBase.spec wxGTK.spec wxMotif.spec
 	contrib/include/wx/applet/window.h contrib/src/Makefile.in
 	contrib/src/applet/appletwindow.cpp contrib/src/fl/Makefile.in
 	debian/changelog debian/control.in debian/libwxbase-dbg.dirs
 	debian/libwxbase-dbg.links debian/libwxbase-dbg.postinst
 	debian/libwxbase-dbg.prerm debian/libwxbase-dev.dirs
 	debian/libwxbase-dev.files debian/libwxbase-dev.links
 	debian/libwxbase-dev.postinst debian/libwxbase-dev.prerm
 	debian/libwxgtk-dbg.dirs debian/libwxgtk-dbg.links
 	debian/libwxgtk-dbg.postinst debian/libwxgtk-dbg.prerm
 	debian/libwxgtk-dev.dirs debian/libwxgtk-dev.files
 	debian/libwxgtk-dev.links debian/libwxgtk-dev.postinst
 	debian/libwxgtk-dev.prerm debian/rules
 	distrib/msw/tmake/base.t distrib/msw/tmake/gtk.t
 	distrib/msw/tmake/mgl.t distrib/msw/tmake/motif.t
 	distrib/msw/tmake/msw.t distrib/msw/tmake/os2.t
 	distrib/msw/tmake/univ.t docs/motif/install.txt
 	include/wx/msw/private.h include/wx/os2/SETUP.H
 	include/wx/os2/SETUP0.H samples/ipc/Makefile.in
 	samples/sockets/Makefile.in src/files.lst src/make.env.in
 	src/makelib.env.in src/makeprog.env.in src/common/strconv.cpp
 	src/gtk/files.lst src/mgl/files.lst src/motif/files.lst
 	src/msw/files.lst src/msw/gsocket.c src/msw/gsockmsw.c
 	src/msw/toplevel.cpp src/msw/utils.cpp src/os2/files.lst
 	src/univ/files.lst wxPython/setup.py
 Added Files:
 	debian/libwxbase-msw-dev.dirs debian/libwxbase-msw-dev.links
 	debian/libwxbase-msw-dev.postinst
 	debian/libwxbase-msw-dev.prerm debian/libwxmsw-dev.dirs
 	debian/libwxmsw-dev.links debian/libwxmsw-dev.postinst
 	debian/libwxmsw-dev.prerm debian/wxwin-doc.doc-base
 	debian/wxwin-headers-msw.dirs
 Removed Files:
 	debian/wxwin-doc.doc-base.in include/wx/setup.h


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11713 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-09-28 07:00:13 +00:00
Václav Slavík
7af284fda7 nicer version compilation fix for wxUSE_WCHAR_T=0 (why should we duplicate definitions in all #ifdef branches???)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11415 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-19 22:22:59 +00:00
Stefan Neis
73a89308a4 Fix for wxUSE_WCHAR_T == 0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11413 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-19 18:31:10 +00:00
Václav Slavík
3a0d76bc6f hopefully fixed bytesex issues in strconv
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11247 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-01 22:56:12 +00:00
Vadim Zeitlin
a45a98fbb9 fix (?) for error in wxCSConv::LoadNow()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-02 15:38:33 +00:00
Julian Smart
04ef50df3a First pass at adding MicroWindows support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10717 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-29 10:58:59 +00:00
Vadim Zeitlin
1e6feb95a7 first pass of wxUniv merge - nothing works, most parts don't even compile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-26 20:59:19 +00:00
Václav Slavík
35d764b08c fixed another bug in strconv
(Off by one error that did not demonstrate itself in poEdit before because
windows native convertion wasn't used due to wxLocale returning cp12xx instead
of windows-12xx. MultiByteToWideChar and WideCharToMultiByte return size of
needed buffer, not number of output characters. Author of the code didn't know
this, hence off by one.)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10557 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-12 22:56:40 +00:00
Václav Slavík
9c904e251a fixed infinite loop when looking up nonexistent encoding in registry
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10544 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-11 22:55:01 +00:00
Vadim Zeitlin
eccf1b2c76 another attempt to fix strconv.cpp compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10530 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-11 12:19:06 +00:00
Julian Smart
264b3fc80f Project file updates; cast in strconv.cpp to compile with VC++ 6
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10526 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-11 07:49:38 +00:00
Vadim Zeitlin
14c90e0074 another compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10510 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-10 23:15:02 +00:00
Vadim Zeitlin
a3f2769e09 compilation fix for SIZEOF_WCHAR_T being undefined
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10497 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-10 17:00:32 +00:00
Vadim Zeitlin
bab1e72221 add #error for platforms with weird sizeof(wchar_t)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10491 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-09 23:22:44 +00:00
Václav Slavík
2ec6905c69 fixed new charset detection code (langinfo.h not included in intl.cpp; langinfo.h not neccessary in strconv.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10412 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-02 11:25:21 +00:00
Vadim Zeitlin
82713003dc fix for last commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10400 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-01 01:30:51 +00:00
Vadim Zeitlin
dccce9eae1 added wxLocale::GetSystemEncoding
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10394 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-05-31 20:27:37 +00:00