From dd0ef3324b56a108aa3850e4240d3f7160965c01 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Mon, 19 Mar 2007 14:39:58 +0000 Subject: [PATCH] split wxchar.h into several smaller headers git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44926 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 66 +- build/bakefiles/files.bkl | 7 +- build/msw/makefile.bcc | 48 +- build/msw/makefile.gcc | 48 +- build/msw/makefile.vc | 48 +- build/msw/makefile.wat | 48 +- build/msw/wx_base.dsp | 22 +- src/common/unichar.cpp | 53 + src/common/wxcrt.cpp | 1207 +++++++++++++++++++++++ src/common/{wxchar.cpp => wxprintf.cpp} | 1196 +--------------------- 10 files changed, 1503 insertions(+), 1240 deletions(-) create mode 100644 src/common/unichar.cpp create mode 100644 src/common/wxcrt.cpp rename src/common/{wxchar.cpp => wxprintf.cpp} (53%) diff --git a/Makefile.in b/Makefile.in index 3fc43e39eb..25b06d3efe 100644 --- a/Makefile.in +++ b/Makefile.in @@ -232,6 +232,7 @@ ALL_BASE_HEADERS = \ wx/beforestd.h \ wx/buffer.h \ wx/build.h \ + wx/chartype.h \ wx/chkconf.h \ wx/clntdata.h \ wx/cmdline.h \ @@ -322,6 +323,7 @@ ALL_BASE_HEADERS = \ wx/tokenzr.h \ wx/txtstrm.h \ wx/types.h \ + wx/unichar.h \ wx/uri.h \ wx/utils.h \ wx/variant.h \ @@ -331,6 +333,7 @@ ALL_BASE_HEADERS = \ wx/wfstream.h \ wx/wx.h \ wx/wxchar.h \ + wx/wxcrt.h \ wx/wxprec.h \ wx/xti.h \ wx/xtistrm.h \ @@ -367,6 +370,7 @@ ALL_PORTS_BASE_HEADERS = \ wx/beforestd.h \ wx/buffer.h \ wx/build.h \ + wx/chartype.h \ wx/chkconf.h \ wx/clntdata.h \ wx/cmdline.h \ @@ -457,6 +461,7 @@ ALL_PORTS_BASE_HEADERS = \ wx/tokenzr.h \ wx/txtstrm.h \ wx/types.h \ + wx/unichar.h \ wx/uri.h \ wx/utils.h \ wx/variant.h \ @@ -466,6 +471,7 @@ ALL_PORTS_BASE_HEADERS = \ wx/wfstream.h \ wx/wx.h \ wx/wxchar.h \ + wx/wxcrt.h \ wx/wxprec.h \ wx/xti.h \ wx/xtistrm.h \ @@ -588,10 +594,12 @@ ALL_BASE_SOURCES = \ src/common/textfile.cpp \ src/common/tokenzr.cpp \ src/common/txtstrm.cpp \ + src/common/unichar.cpp \ src/common/uri.cpp \ src/common/variant.cpp \ src/common/wfstream.cpp \ - src/common/wxchar.cpp \ + src/common/wxcrt.cpp \ + src/common/wxprintf.cpp \ src/common/xti.cpp \ src/common/xtistrm.cpp \ src/common/zipstrm.cpp \ @@ -744,10 +752,12 @@ MONODLL_OBJECTS = \ monodll_textfile.o \ monodll_tokenzr.o \ monodll_txtstrm.o \ + monodll_unichar.o \ monodll_uri.o \ monodll_variant.o \ monodll_wfstream.o \ - monodll_wxchar.o \ + monodll_wxcrt.o \ + monodll_wxprintf.o \ monodll_xti.o \ monodll_xtistrm.o \ monodll_zipstrm.o \ @@ -844,10 +854,12 @@ MONOLIB_OBJECTS = \ monolib_textfile.o \ monolib_tokenzr.o \ monolib_txtstrm.o \ + monolib_unichar.o \ monolib_uri.o \ monolib_variant.o \ monolib_wfstream.o \ - monolib_wxchar.o \ + monolib_wxcrt.o \ + monolib_wxprintf.o \ monolib_xti.o \ monolib_xtistrm.o \ monolib_zipstrm.o \ @@ -946,10 +958,12 @@ BASEDLL_OBJECTS = \ basedll_textfile.o \ basedll_tokenzr.o \ basedll_txtstrm.o \ + basedll_unichar.o \ basedll_uri.o \ basedll_variant.o \ basedll_wfstream.o \ - basedll_wxchar.o \ + basedll_wxcrt.o \ + basedll_wxprintf.o \ basedll_xti.o \ basedll_xtistrm.o \ basedll_zipstrm.o \ @@ -1031,10 +1045,12 @@ BASELIB_OBJECTS = \ baselib_textfile.o \ baselib_tokenzr.o \ baselib_txtstrm.o \ + baselib_unichar.o \ baselib_uri.o \ baselib_variant.o \ baselib_wfstream.o \ - baselib_wxchar.o \ + baselib_wxcrt.o \ + baselib_wxprintf.o \ baselib_xti.o \ baselib_xtistrm.o \ baselib_zipstrm.o \ @@ -12761,6 +12777,9 @@ monodll_tokenzr.o: $(srcdir)/src/common/tokenzr.cpp $(MONODLL_ODEP) monodll_txtstrm.o: $(srcdir)/src/common/txtstrm.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/txtstrm.cpp +monodll_unichar.o: $(srcdir)/src/common/unichar.cpp $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/unichar.cpp + monodll_uri.o: $(srcdir)/src/common/uri.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/uri.cpp @@ -12770,8 +12789,11 @@ monodll_variant.o: $(srcdir)/src/common/variant.cpp $(MONODLL_ODEP) monodll_wfstream.o: $(srcdir)/src/common/wfstream.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/wfstream.cpp -monodll_wxchar.o: $(srcdir)/src/common/wxchar.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/wxchar.cpp +monodll_wxcrt.o: $(srcdir)/src/common/wxcrt.cpp $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/wxcrt.cpp + +monodll_wxprintf.o: $(srcdir)/src/common/wxprintf.cpp $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/wxprintf.cpp monodll_xti.o: $(srcdir)/src/common/xti.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/xti.cpp @@ -16904,6 +16926,9 @@ monolib_tokenzr.o: $(srcdir)/src/common/tokenzr.cpp $(MONOLIB_ODEP) monolib_txtstrm.o: $(srcdir)/src/common/txtstrm.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/txtstrm.cpp +monolib_unichar.o: $(srcdir)/src/common/unichar.cpp $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/unichar.cpp + monolib_uri.o: $(srcdir)/src/common/uri.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/uri.cpp @@ -16913,8 +16938,11 @@ monolib_variant.o: $(srcdir)/src/common/variant.cpp $(MONOLIB_ODEP) monolib_wfstream.o: $(srcdir)/src/common/wfstream.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/wfstream.cpp -monolib_wxchar.o: $(srcdir)/src/common/wxchar.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/wxchar.cpp +monolib_wxcrt.o: $(srcdir)/src/common/wxcrt.cpp $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/wxcrt.cpp + +monolib_wxprintf.o: $(srcdir)/src/common/wxprintf.cpp $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/wxprintf.cpp monolib_xti.o: $(srcdir)/src/common/xti.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/xti.cpp @@ -21050,6 +21078,9 @@ basedll_tokenzr.o: $(srcdir)/src/common/tokenzr.cpp $(BASEDLL_ODEP) basedll_txtstrm.o: $(srcdir)/src/common/txtstrm.cpp $(BASEDLL_ODEP) $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/txtstrm.cpp +basedll_unichar.o: $(srcdir)/src/common/unichar.cpp $(BASEDLL_ODEP) + $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/unichar.cpp + basedll_uri.o: $(srcdir)/src/common/uri.cpp $(BASEDLL_ODEP) $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/uri.cpp @@ -21059,8 +21090,11 @@ basedll_variant.o: $(srcdir)/src/common/variant.cpp $(BASEDLL_ODEP) basedll_wfstream.o: $(srcdir)/src/common/wfstream.cpp $(BASEDLL_ODEP) $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/wfstream.cpp -basedll_wxchar.o: $(srcdir)/src/common/wxchar.cpp $(BASEDLL_ODEP) - $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/wxchar.cpp +basedll_wxcrt.o: $(srcdir)/src/common/wxcrt.cpp $(BASEDLL_ODEP) + $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/wxcrt.cpp + +basedll_wxprintf.o: $(srcdir)/src/common/wxprintf.cpp $(BASEDLL_ODEP) + $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/wxprintf.cpp basedll_xti.o: $(srcdir)/src/common/xti.cpp $(BASEDLL_ODEP) $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/xti.cpp @@ -21641,6 +21675,9 @@ baselib_tokenzr.o: $(srcdir)/src/common/tokenzr.cpp $(BASELIB_ODEP) baselib_txtstrm.o: $(srcdir)/src/common/txtstrm.cpp $(BASELIB_ODEP) $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/txtstrm.cpp +baselib_unichar.o: $(srcdir)/src/common/unichar.cpp $(BASELIB_ODEP) + $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/unichar.cpp + baselib_uri.o: $(srcdir)/src/common/uri.cpp $(BASELIB_ODEP) $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/uri.cpp @@ -21650,8 +21687,11 @@ baselib_variant.o: $(srcdir)/src/common/variant.cpp $(BASELIB_ODEP) baselib_wfstream.o: $(srcdir)/src/common/wfstream.cpp $(BASELIB_ODEP) $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/wfstream.cpp -baselib_wxchar.o: $(srcdir)/src/common/wxchar.cpp $(BASELIB_ODEP) - $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/wxchar.cpp +baselib_wxcrt.o: $(srcdir)/src/common/wxcrt.cpp $(BASELIB_ODEP) + $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/wxcrt.cpp + +baselib_wxprintf.o: $(srcdir)/src/common/wxprintf.cpp $(BASELIB_ODEP) + $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/wxprintf.cpp baselib_xti.o: $(srcdir)/src/common/xti.cpp $(BASELIB_ODEP) $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/xti.cpp diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index 06c3368516..8377b70d17 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -347,10 +347,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/common/textfile.cpp src/common/tokenzr.cpp src/common/txtstrm.cpp + src/common/unichar.cpp src/common/uri.cpp src/common/variant.cpp src/common/wfstream.cpp - src/common/wxchar.cpp + src/common/wxcrt.cpp + src/common/wxprintf.cpp src/common/xti.cpp src/common/xtistrm.cpp src/common/zipstrm.cpp @@ -372,6 +374,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/beforestd.h wx/buffer.h wx/build.h + wx/chartype.h wx/chkconf.h wx/clntdata.h wx/cmdline.h @@ -462,6 +465,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/tokenzr.h wx/txtstrm.h wx/types.h + wx/unichar.h wx/uri.h wx/utils.h wx/variant.h @@ -471,6 +475,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/wfstream.h wx/wx.h wx/wxchar.h + wx/wxcrt.h wx/wxprec.h wx/xti.h wx/xtistrm.h diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc index 186ecc2dce..0bdc78f5dc 100644 --- a/build/msw/makefile.bcc +++ b/build/msw/makefile.bcc @@ -260,10 +260,12 @@ MONODLL_OBJECTS = \ $(OBJS)\monodll_textfile.obj \ $(OBJS)\monodll_tokenzr.obj \ $(OBJS)\monodll_txtstrm.obj \ + $(OBJS)\monodll_unichar.obj \ $(OBJS)\monodll_uri.obj \ $(OBJS)\monodll_variant.obj \ $(OBJS)\monodll_wfstream.obj \ - $(OBJS)\monodll_wxchar.obj \ + $(OBJS)\monodll_wxcrt.obj \ + $(OBJS)\monodll_wxprintf.obj \ $(OBJS)\monodll_xti.obj \ $(OBJS)\monodll_xtistrm.obj \ $(OBJS)\monodll_zipstrm.obj \ @@ -381,10 +383,12 @@ MONOLIB_OBJECTS = \ $(OBJS)\monolib_textfile.obj \ $(OBJS)\monolib_tokenzr.obj \ $(OBJS)\monolib_txtstrm.obj \ + $(OBJS)\monolib_unichar.obj \ $(OBJS)\monolib_uri.obj \ $(OBJS)\monolib_variant.obj \ $(OBJS)\monolib_wfstream.obj \ - $(OBJS)\monolib_wxchar.obj \ + $(OBJS)\monolib_wxcrt.obj \ + $(OBJS)\monolib_wxprintf.obj \ $(OBJS)\monolib_xti.obj \ $(OBJS)\monolib_xtistrm.obj \ $(OBJS)\monolib_zipstrm.obj \ @@ -503,10 +507,12 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_textfile.obj \ $(OBJS)\basedll_tokenzr.obj \ $(OBJS)\basedll_txtstrm.obj \ + $(OBJS)\basedll_unichar.obj \ $(OBJS)\basedll_uri.obj \ $(OBJS)\basedll_variant.obj \ $(OBJS)\basedll_wfstream.obj \ - $(OBJS)\basedll_wxchar.obj \ + $(OBJS)\basedll_wxcrt.obj \ + $(OBJS)\basedll_wxprintf.obj \ $(OBJS)\basedll_xti.obj \ $(OBJS)\basedll_xtistrm.obj \ $(OBJS)\basedll_zipstrm.obj \ @@ -609,10 +615,12 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_textfile.obj \ $(OBJS)\baselib_tokenzr.obj \ $(OBJS)\baselib_txtstrm.obj \ + $(OBJS)\baselib_unichar.obj \ $(OBJS)\baselib_uri.obj \ $(OBJS)\baselib_variant.obj \ $(OBJS)\baselib_wfstream.obj \ - $(OBJS)\baselib_wxchar.obj \ + $(OBJS)\baselib_wxcrt.obj \ + $(OBJS)\baselib_wxprintf.obj \ $(OBJS)\baselib_xti.obj \ $(OBJS)\baselib_xtistrm.obj \ $(OBJS)\baselib_zipstrm.obj \ @@ -4738,6 +4746,9 @@ $(OBJS)\monodll_tokenzr.obj: ..\..\src\common\tokenzr.cpp $(OBJS)\monodll_txtstrm.obj: ..\..\src\common\txtstrm.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +$(OBJS)\monodll_unichar.obj: ..\..\src\common\unichar.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + $(OBJS)\monodll_uri.obj: ..\..\src\common\uri.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -4747,7 +4758,10 @@ $(OBJS)\monodll_variant.obj: ..\..\src\common\variant.cpp $(OBJS)\monodll_wfstream.obj: ..\..\src\common\wfstream.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -$(OBJS)\monodll_wxchar.obj: ..\..\src\common\wxchar.cpp +$(OBJS)\monodll_wxcrt.obj: ..\..\src\common\wxcrt.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_wxprintf.obj: ..\..\src\common\wxprintf.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** $(OBJS)\monodll_xti.obj: ..\..\src\common\xti.cpp @@ -6753,6 +6767,9 @@ $(OBJS)\monolib_tokenzr.obj: ..\..\src\common\tokenzr.cpp $(OBJS)\monolib_txtstrm.obj: ..\..\src\common\txtstrm.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +$(OBJS)\monolib_unichar.obj: ..\..\src\common\unichar.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + $(OBJS)\monolib_uri.obj: ..\..\src\common\uri.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -6762,7 +6779,10 @@ $(OBJS)\monolib_variant.obj: ..\..\src\common\variant.cpp $(OBJS)\monolib_wfstream.obj: ..\..\src\common\wfstream.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -$(OBJS)\monolib_wxchar.obj: ..\..\src\common\wxchar.cpp +$(OBJS)\monolib_wxcrt.obj: ..\..\src\common\wxcrt.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_wxprintf.obj: ..\..\src\common\wxprintf.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** $(OBJS)\monolib_xti.obj: ..\..\src\common\xti.cpp @@ -8771,6 +8791,9 @@ $(OBJS)\basedll_tokenzr.obj: ..\..\src\common\tokenzr.cpp $(OBJS)\basedll_txtstrm.obj: ..\..\src\common\txtstrm.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** +$(OBJS)\basedll_unichar.obj: ..\..\src\common\unichar.cpp + $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** + $(OBJS)\basedll_uri.obj: ..\..\src\common\uri.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** @@ -8780,7 +8803,10 @@ $(OBJS)\basedll_variant.obj: ..\..\src\common\variant.cpp $(OBJS)\basedll_wfstream.obj: ..\..\src\common\wfstream.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** -$(OBJS)\basedll_wxchar.obj: ..\..\src\common\wxchar.cpp +$(OBJS)\basedll_wxcrt.obj: ..\..\src\common\wxcrt.cpp + $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** + +$(OBJS)\basedll_wxprintf.obj: ..\..\src\common\wxprintf.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** $(OBJS)\basedll_xti.obj: ..\..\src\common\xti.cpp @@ -9041,6 +9067,9 @@ $(OBJS)\baselib_tokenzr.obj: ..\..\src\common\tokenzr.cpp $(OBJS)\baselib_txtstrm.obj: ..\..\src\common\txtstrm.cpp $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** +$(OBJS)\baselib_unichar.obj: ..\..\src\common\unichar.cpp + $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** + $(OBJS)\baselib_uri.obj: ..\..\src\common\uri.cpp $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** @@ -9050,7 +9079,10 @@ $(OBJS)\baselib_variant.obj: ..\..\src\common\variant.cpp $(OBJS)\baselib_wfstream.obj: ..\..\src\common\wfstream.cpp $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** -$(OBJS)\baselib_wxchar.obj: ..\..\src\common\wxchar.cpp +$(OBJS)\baselib_wxcrt.obj: ..\..\src\common\wxcrt.cpp + $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** + +$(OBJS)\baselib_wxprintf.obj: ..\..\src\common\wxprintf.cpp $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** $(OBJS)\baselib_xti.obj: ..\..\src\common\xti.cpp diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc index a0ecc3456f..c3ef908b32 100644 --- a/build/msw/makefile.gcc +++ b/build/msw/makefile.gcc @@ -246,10 +246,12 @@ MONODLL_OBJECTS = \ $(OBJS)\monodll_textfile.o \ $(OBJS)\monodll_tokenzr.o \ $(OBJS)\monodll_txtstrm.o \ + $(OBJS)\monodll_unichar.o \ $(OBJS)\monodll_uri.o \ $(OBJS)\monodll_variant.o \ $(OBJS)\monodll_wfstream.o \ - $(OBJS)\monodll_wxchar.o \ + $(OBJS)\monodll_wxcrt.o \ + $(OBJS)\monodll_wxprintf.o \ $(OBJS)\monodll_xti.o \ $(OBJS)\monodll_xtistrm.o \ $(OBJS)\monodll_zipstrm.o \ @@ -367,10 +369,12 @@ MONOLIB_OBJECTS = \ $(OBJS)\monolib_textfile.o \ $(OBJS)\monolib_tokenzr.o \ $(OBJS)\monolib_txtstrm.o \ + $(OBJS)\monolib_unichar.o \ $(OBJS)\monolib_uri.o \ $(OBJS)\monolib_variant.o \ $(OBJS)\monolib_wfstream.o \ - $(OBJS)\monolib_wxchar.o \ + $(OBJS)\monolib_wxcrt.o \ + $(OBJS)\monolib_wxprintf.o \ $(OBJS)\monolib_xti.o \ $(OBJS)\monolib_xtistrm.o \ $(OBJS)\monolib_zipstrm.o \ @@ -490,10 +494,12 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_textfile.o \ $(OBJS)\basedll_tokenzr.o \ $(OBJS)\basedll_txtstrm.o \ + $(OBJS)\basedll_unichar.o \ $(OBJS)\basedll_uri.o \ $(OBJS)\basedll_variant.o \ $(OBJS)\basedll_wfstream.o \ - $(OBJS)\basedll_wxchar.o \ + $(OBJS)\basedll_wxcrt.o \ + $(OBJS)\basedll_wxprintf.o \ $(OBJS)\basedll_xti.o \ $(OBJS)\basedll_xtistrm.o \ $(OBJS)\basedll_zipstrm.o \ @@ -596,10 +602,12 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_textfile.o \ $(OBJS)\baselib_tokenzr.o \ $(OBJS)\baselib_txtstrm.o \ + $(OBJS)\baselib_unichar.o \ $(OBJS)\baselib_uri.o \ $(OBJS)\baselib_variant.o \ $(OBJS)\baselib_wfstream.o \ - $(OBJS)\baselib_wxchar.o \ + $(OBJS)\baselib_wxcrt.o \ + $(OBJS)\baselib_wxprintf.o \ $(OBJS)\baselib_xti.o \ $(OBJS)\baselib_xtistrm.o \ $(OBJS)\baselib_zipstrm.o \ @@ -4867,6 +4875,9 @@ $(OBJS)\monodll_tokenzr.o: ../../src/common/tokenzr.cpp $(OBJS)\monodll_txtstrm.o: ../../src/common/txtstrm.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monodll_unichar.o: ../../src/common/unichar.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monodll_uri.o: ../../src/common/uri.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -4876,7 +4887,10 @@ $(OBJS)\monodll_variant.o: ../../src/common/variant.cpp $(OBJS)\monodll_wfstream.o: ../../src/common/wfstream.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\monodll_wxchar.o: ../../src/common/wxchar.cpp +$(OBJS)\monodll_wxcrt.o: ../../src/common/wxcrt.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< + +$(OBJS)\monodll_wxprintf.o: ../../src/common/wxprintf.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\monodll_xti.o: ../../src/common/xti.cpp @@ -6982,6 +6996,9 @@ $(OBJS)\monolib_tokenzr.o: ../../src/common/tokenzr.cpp $(OBJS)\monolib_txtstrm.o: ../../src/common/txtstrm.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monolib_unichar.o: ../../src/common/unichar.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monolib_uri.o: ../../src/common/uri.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -6991,7 +7008,10 @@ $(OBJS)\monolib_variant.o: ../../src/common/variant.cpp $(OBJS)\monolib_wfstream.o: ../../src/common/wfstream.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\monolib_wxchar.o: ../../src/common/wxchar.cpp +$(OBJS)\monolib_wxcrt.o: ../../src/common/wxcrt.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< + +$(OBJS)\monolib_wxprintf.o: ../../src/common/wxprintf.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\monolib_xti.o: ../../src/common/xti.cpp @@ -9100,6 +9120,9 @@ $(OBJS)\basedll_tokenzr.o: ../../src/common/tokenzr.cpp $(OBJS)\basedll_txtstrm.o: ../../src/common/txtstrm.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\basedll_unichar.o: ../../src/common/unichar.cpp + $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\basedll_uri.o: ../../src/common/uri.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< @@ -9109,7 +9132,10 @@ $(OBJS)\basedll_variant.o: ../../src/common/variant.cpp $(OBJS)\basedll_wfstream.o: ../../src/common/wfstream.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\basedll_wxchar.o: ../../src/common/wxchar.cpp +$(OBJS)\basedll_wxcrt.o: ../../src/common/wxcrt.cpp + $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< + +$(OBJS)\basedll_wxprintf.o: ../../src/common/wxprintf.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\basedll_xti.o: ../../src/common/xti.cpp @@ -9370,6 +9396,9 @@ $(OBJS)\baselib_tokenzr.o: ../../src/common/tokenzr.cpp $(OBJS)\baselib_txtstrm.o: ../../src/common/txtstrm.cpp $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\baselib_unichar.o: ../../src/common/unichar.cpp + $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\baselib_uri.o: ../../src/common/uri.cpp $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< @@ -9379,7 +9408,10 @@ $(OBJS)\baselib_variant.o: ../../src/common/variant.cpp $(OBJS)\baselib_wfstream.o: ../../src/common/wfstream.cpp $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\baselib_wxchar.o: ../../src/common/wxchar.cpp +$(OBJS)\baselib_wxcrt.o: ../../src/common/wxcrt.cpp + $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< + +$(OBJS)\baselib_wxprintf.o: ../../src/common/wxprintf.cpp $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\baselib_xti.o: ../../src/common/xti.cpp diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc index 42063c022f..47e91d956f 100644 --- a/build/msw/makefile.vc +++ b/build/msw/makefile.vc @@ -261,10 +261,12 @@ MONODLL_OBJECTS = \ $(OBJS)\monodll_textfile.obj \ $(OBJS)\monodll_tokenzr.obj \ $(OBJS)\monodll_txtstrm.obj \ + $(OBJS)\monodll_unichar.obj \ $(OBJS)\monodll_uri.obj \ $(OBJS)\monodll_variant.obj \ $(OBJS)\monodll_wfstream.obj \ - $(OBJS)\monodll_wxchar.obj \ + $(OBJS)\monodll_wxcrt.obj \ + $(OBJS)\monodll_wxprintf.obj \ $(OBJS)\monodll_xti.obj \ $(OBJS)\monodll_xtistrm.obj \ $(OBJS)\monodll_zipstrm.obj \ @@ -387,10 +389,12 @@ MONOLIB_OBJECTS = \ $(OBJS)\monolib_textfile.obj \ $(OBJS)\monolib_tokenzr.obj \ $(OBJS)\monolib_txtstrm.obj \ + $(OBJS)\monolib_unichar.obj \ $(OBJS)\monolib_uri.obj \ $(OBJS)\monolib_variant.obj \ $(OBJS)\monolib_wfstream.obj \ - $(OBJS)\monolib_wxchar.obj \ + $(OBJS)\monolib_wxcrt.obj \ + $(OBJS)\monolib_wxprintf.obj \ $(OBJS)\monolib_xti.obj \ $(OBJS)\monolib_xtistrm.obj \ $(OBJS)\monolib_zipstrm.obj \ @@ -515,10 +519,12 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_textfile.obj \ $(OBJS)\basedll_tokenzr.obj \ $(OBJS)\basedll_txtstrm.obj \ + $(OBJS)\basedll_unichar.obj \ $(OBJS)\basedll_uri.obj \ $(OBJS)\basedll_variant.obj \ $(OBJS)\basedll_wfstream.obj \ - $(OBJS)\basedll_wxchar.obj \ + $(OBJS)\basedll_wxcrt.obj \ + $(OBJS)\basedll_wxprintf.obj \ $(OBJS)\basedll_xti.obj \ $(OBJS)\basedll_xtistrm.obj \ $(OBJS)\basedll_zipstrm.obj \ @@ -627,10 +633,12 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_textfile.obj \ $(OBJS)\baselib_tokenzr.obj \ $(OBJS)\baselib_txtstrm.obj \ + $(OBJS)\baselib_unichar.obj \ $(OBJS)\baselib_uri.obj \ $(OBJS)\baselib_variant.obj \ $(OBJS)\baselib_wfstream.obj \ - $(OBJS)\baselib_wxchar.obj \ + $(OBJS)\baselib_wxcrt.obj \ + $(OBJS)\baselib_wxprintf.obj \ $(OBJS)\baselib_xti.obj \ $(OBJS)\baselib_xtistrm.obj \ $(OBJS)\baselib_zipstrm.obj \ @@ -5071,6 +5079,9 @@ $(OBJS)\monodll_tokenzr.obj: ..\..\src\common\tokenzr.cpp $(OBJS)\monodll_txtstrm.obj: ..\..\src\common\txtstrm.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** +$(OBJS)\monodll_unichar.obj: ..\..\src\common\unichar.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** + $(OBJS)\monodll_uri.obj: ..\..\src\common\uri.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** @@ -5080,7 +5091,10 @@ $(OBJS)\monodll_variant.obj: ..\..\src\common\variant.cpp $(OBJS)\monodll_wfstream.obj: ..\..\src\common\wfstream.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -$(OBJS)\monodll_wxchar.obj: ..\..\src\common\wxchar.cpp +$(OBJS)\monodll_wxcrt.obj: ..\..\src\common\wxcrt.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_wxprintf.obj: ..\..\src\common\wxprintf.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** $(OBJS)\monodll_xti.obj: ..\..\src\common\xti.cpp @@ -7086,6 +7100,9 @@ $(OBJS)\monolib_tokenzr.obj: ..\..\src\common\tokenzr.cpp $(OBJS)\monolib_txtstrm.obj: ..\..\src\common\txtstrm.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** +$(OBJS)\monolib_unichar.obj: ..\..\src\common\unichar.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** + $(OBJS)\monolib_uri.obj: ..\..\src\common\uri.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** @@ -7095,7 +7112,10 @@ $(OBJS)\monolib_variant.obj: ..\..\src\common\variant.cpp $(OBJS)\monolib_wfstream.obj: ..\..\src\common\wfstream.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -$(OBJS)\monolib_wxchar.obj: ..\..\src\common\wxchar.cpp +$(OBJS)\monolib_wxcrt.obj: ..\..\src\common\wxcrt.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_wxprintf.obj: ..\..\src\common\wxprintf.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** $(OBJS)\monolib_xti.obj: ..\..\src\common\xti.cpp @@ -9104,6 +9124,9 @@ $(OBJS)\basedll_tokenzr.obj: ..\..\src\common\tokenzr.cpp $(OBJS)\basedll_txtstrm.obj: ..\..\src\common\txtstrm.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** +$(OBJS)\basedll_unichar.obj: ..\..\src\common\unichar.cpp + $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** + $(OBJS)\basedll_uri.obj: ..\..\src\common\uri.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** @@ -9113,7 +9136,10 @@ $(OBJS)\basedll_variant.obj: ..\..\src\common\variant.cpp $(OBJS)\basedll_wfstream.obj: ..\..\src\common\wfstream.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** -$(OBJS)\basedll_wxchar.obj: ..\..\src\common\wxchar.cpp +$(OBJS)\basedll_wxcrt.obj: ..\..\src\common\wxcrt.cpp + $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** + +$(OBJS)\basedll_wxprintf.obj: ..\..\src\common\wxprintf.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** $(OBJS)\basedll_xti.obj: ..\..\src\common\xti.cpp @@ -9374,6 +9400,9 @@ $(OBJS)\baselib_tokenzr.obj: ..\..\src\common\tokenzr.cpp $(OBJS)\baselib_txtstrm.obj: ..\..\src\common\txtstrm.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** +$(OBJS)\baselib_unichar.obj: ..\..\src\common\unichar.cpp + $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** + $(OBJS)\baselib_uri.obj: ..\..\src\common\uri.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** @@ -9383,7 +9412,10 @@ $(OBJS)\baselib_variant.obj: ..\..\src\common\variant.cpp $(OBJS)\baselib_wfstream.obj: ..\..\src\common\wfstream.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** -$(OBJS)\baselib_wxchar.obj: ..\..\src\common\wxchar.cpp +$(OBJS)\baselib_wxcrt.obj: ..\..\src\common\wxcrt.cpp + $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** + +$(OBJS)\baselib_wxprintf.obj: ..\..\src\common\wxprintf.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** $(OBJS)\baselib_xti.obj: ..\..\src\common\xti.cpp diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat index 112bc4ae08..149ac1a4ae 100644 --- a/build/msw/makefile.wat +++ b/build/msw/makefile.wat @@ -3038,10 +3038,12 @@ MONODLL_OBJECTS = & $(OBJS)\monodll_textfile.obj & $(OBJS)\monodll_tokenzr.obj & $(OBJS)\monodll_txtstrm.obj & + $(OBJS)\monodll_unichar.obj & $(OBJS)\monodll_uri.obj & $(OBJS)\monodll_variant.obj & $(OBJS)\monodll_wfstream.obj & - $(OBJS)\monodll_wxchar.obj & + $(OBJS)\monodll_wxcrt.obj & + $(OBJS)\monodll_wxprintf.obj & $(OBJS)\monodll_xti.obj & $(OBJS)\monodll_xtistrm.obj & $(OBJS)\monodll_zipstrm.obj & @@ -3159,10 +3161,12 @@ MONOLIB_OBJECTS = & $(OBJS)\monolib_textfile.obj & $(OBJS)\monolib_tokenzr.obj & $(OBJS)\monolib_txtstrm.obj & + $(OBJS)\monolib_unichar.obj & $(OBJS)\monolib_uri.obj & $(OBJS)\monolib_variant.obj & $(OBJS)\monolib_wfstream.obj & - $(OBJS)\monolib_wxchar.obj & + $(OBJS)\monolib_wxcrt.obj & + $(OBJS)\monolib_wxprintf.obj & $(OBJS)\monolib_xti.obj & $(OBJS)\monolib_xtistrm.obj & $(OBJS)\monolib_zipstrm.obj & @@ -3282,10 +3286,12 @@ BASEDLL_OBJECTS = & $(OBJS)\basedll_textfile.obj & $(OBJS)\basedll_tokenzr.obj & $(OBJS)\basedll_txtstrm.obj & + $(OBJS)\basedll_unichar.obj & $(OBJS)\basedll_uri.obj & $(OBJS)\basedll_variant.obj & $(OBJS)\basedll_wfstream.obj & - $(OBJS)\basedll_wxchar.obj & + $(OBJS)\basedll_wxcrt.obj & + $(OBJS)\basedll_wxprintf.obj & $(OBJS)\basedll_xti.obj & $(OBJS)\basedll_xtistrm.obj & $(OBJS)\basedll_zipstrm.obj & @@ -3389,10 +3395,12 @@ BASELIB_OBJECTS = & $(OBJS)\baselib_textfile.obj & $(OBJS)\baselib_tokenzr.obj & $(OBJS)\baselib_txtstrm.obj & + $(OBJS)\baselib_unichar.obj & $(OBJS)\baselib_uri.obj & $(OBJS)\baselib_variant.obj & $(OBJS)\baselib_wfstream.obj & - $(OBJS)\baselib_wxchar.obj & + $(OBJS)\baselib_wxcrt.obj & + $(OBJS)\baselib_wxprintf.obj & $(OBJS)\baselib_xti.obj & $(OBJS)\baselib_xtistrm.obj & $(OBJS)\baselib_zipstrm.obj & @@ -5097,6 +5105,9 @@ $(OBJS)\monodll_tokenzr.obj : .AUTODEPEND ..\..\src\common\tokenzr.cpp $(OBJS)\monodll_txtstrm.obj : .AUTODEPEND ..\..\src\common\txtstrm.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_unichar.obj : .AUTODEPEND ..\..\src\common\unichar.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_uri.obj : .AUTODEPEND ..\..\src\common\uri.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -5106,7 +5117,10 @@ $(OBJS)\monodll_variant.obj : .AUTODEPEND ..\..\src\common\variant.cpp $(OBJS)\monodll_wfstream.obj : .AUTODEPEND ..\..\src\common\wfstream.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_wxchar.obj : .AUTODEPEND ..\..\src\common\wxchar.cpp +$(OBJS)\monodll_wxcrt.obj : .AUTODEPEND ..\..\src\common\wxcrt.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_wxprintf.obj : .AUTODEPEND ..\..\src\common\wxprintf.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< $(OBJS)\monodll_xti.obj : .AUTODEPEND ..\..\src\common\xti.cpp @@ -7212,6 +7226,9 @@ $(OBJS)\monolib_tokenzr.obj : .AUTODEPEND ..\..\src\common\tokenzr.cpp $(OBJS)\monolib_txtstrm.obj : .AUTODEPEND ..\..\src\common\txtstrm.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_unichar.obj : .AUTODEPEND ..\..\src\common\unichar.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_uri.obj : .AUTODEPEND ..\..\src\common\uri.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -7221,7 +7238,10 @@ $(OBJS)\monolib_variant.obj : .AUTODEPEND ..\..\src\common\variant.cpp $(OBJS)\monolib_wfstream.obj : .AUTODEPEND ..\..\src\common\wfstream.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_wxchar.obj : .AUTODEPEND ..\..\src\common\wxchar.cpp +$(OBJS)\monolib_wxcrt.obj : .AUTODEPEND ..\..\src\common\wxcrt.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_wxprintf.obj : .AUTODEPEND ..\..\src\common\wxprintf.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< $(OBJS)\monolib_xti.obj : .AUTODEPEND ..\..\src\common\xti.cpp @@ -9330,6 +9350,9 @@ $(OBJS)\basedll_tokenzr.obj : .AUTODEPEND ..\..\src\common\tokenzr.cpp $(OBJS)\basedll_txtstrm.obj : .AUTODEPEND ..\..\src\common\txtstrm.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< +$(OBJS)\basedll_unichar.obj : .AUTODEPEND ..\..\src\common\unichar.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< + $(OBJS)\basedll_uri.obj : .AUTODEPEND ..\..\src\common\uri.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< @@ -9339,7 +9362,10 @@ $(OBJS)\basedll_variant.obj : .AUTODEPEND ..\..\src\common\variant.cpp $(OBJS)\basedll_wfstream.obj : .AUTODEPEND ..\..\src\common\wfstream.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< -$(OBJS)\basedll_wxchar.obj : .AUTODEPEND ..\..\src\common\wxchar.cpp +$(OBJS)\basedll_wxcrt.obj : .AUTODEPEND ..\..\src\common\wxcrt.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< + +$(OBJS)\basedll_wxprintf.obj : .AUTODEPEND ..\..\src\common\wxprintf.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< $(OBJS)\basedll_xti.obj : .AUTODEPEND ..\..\src\common\xti.cpp @@ -9600,6 +9626,9 @@ $(OBJS)\baselib_tokenzr.obj : .AUTODEPEND ..\..\src\common\tokenzr.cpp $(OBJS)\baselib_txtstrm.obj : .AUTODEPEND ..\..\src\common\txtstrm.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< +$(OBJS)\baselib_unichar.obj : .AUTODEPEND ..\..\src\common\unichar.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< + $(OBJS)\baselib_uri.obj : .AUTODEPEND ..\..\src\common\uri.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< @@ -9609,7 +9638,10 @@ $(OBJS)\baselib_variant.obj : .AUTODEPEND ..\..\src\common\variant.cpp $(OBJS)\baselib_wfstream.obj : .AUTODEPEND ..\..\src\common\wfstream.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< -$(OBJS)\baselib_wxchar.obj : .AUTODEPEND ..\..\src\common\wxchar.cpp +$(OBJS)\baselib_wxcrt.obj : .AUTODEPEND ..\..\src\common\wxcrt.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< + +$(OBJS)\baselib_wxprintf.obj : .AUTODEPEND ..\..\src\common\wxprintf.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< $(OBJS)\baselib_xti.obj : .AUTODEPEND ..\..\src\common\xti.cpp diff --git a/build/msw/wx_base.dsp b/build/msw/wx_base.dsp index 5456be2fde..d710e7fa31 100644 --- a/build/msw/wx_base.dsp +++ b/build/msw/wx_base.dsp @@ -703,6 +703,10 @@ SOURCE=..\..\src\common\txtstrm.cpp # End Source File # Begin Source File +SOURCE=..\..\src\common\unichar.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\common\uri.cpp # End Source File # Begin Source File @@ -719,7 +723,11 @@ SOURCE=..\..\src\common\wfstream.cpp # End Source File # Begin Source File -SOURCE=..\..\src\common\wxchar.cpp +SOURCE=..\..\src\common\wxcrt.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\common\wxprintf.cpp # End Source File # Begin Source File @@ -1451,6 +1459,10 @@ SOURCE=..\..\include\wx\build.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\chartype.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\chkconf.h # End Source File # Begin Source File @@ -1799,6 +1811,10 @@ SOURCE=..\..\include\wx\types.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\unichar.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\uri.h # End Source File # Begin Source File @@ -1835,6 +1851,10 @@ SOURCE=..\..\include\wx\wxchar.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\wxcrt.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\wxprec.h # End Source File # Begin Source File diff --git a/src/common/unichar.cpp b/src/common/unichar.cpp new file mode 100644 index 0000000000..5dbe8b0825 --- /dev/null +++ b/src/common/unichar.cpp @@ -0,0 +1,53 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: src/common/unichar.cpp +// Purpose: wxUniChar and wxUniCharRef classes +// Author: Vaclav Slavik +// Created: 2007-03-19 +// RCS-ID: $Id$ +// Copyright: (c) 2007 REA Elektronik GmbH +// Licence: wxWindows licence +/////////////////////////////////////////////////////////////////////////////// + +// =========================================================================== +// headers +// =========================================================================== + +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#ifdef __BORLANDC__ + #pragma hdrstop +#endif + +#include "wx/unichar.h" + +// =========================================================================== +// implementation +// =========================================================================== + +/* static */ +wxUniChar::unicode_type wxUniChar::From8bit(char c) +{ + // all supported charsets have the first 128 characters same as ASCII: + if ( (unsigned char)c < 0x80 ) + return c; + + wchar_t buf[2]; + if ( wxConvLibc.ToWChar(buf, 2, &c, 1) != 2 ) + return wxT('?'); // FIXME-UTF8: what to use as failure character? + return buf[0]; +} + +/* static */ +char wxUniChar::To8bit(wxUniChar::unicode_type c) +{ + // all supported charsets have the first 128 characters same as ASCII: + if ( c < 0x80 ) + return c; + + wchar_t in = c; + char buf[2]; + if ( wxConvLibc.FromWChar(buf, 2, &in, 1) != 2 ) + return '?'; // FIXME-UTF8: what to use as failure character? + return buf[0]; +} diff --git a/src/common/wxcrt.cpp b/src/common/wxcrt.cpp new file mode 100644 index 0000000000..5f08d6d4d4 --- /dev/null +++ b/src/common/wxcrt.cpp @@ -0,0 +1,1207 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: src/common/wxcrt.cpp +// Purpose: wxChar CRT wrappers implementation +// Author: Ove Kaven +// Modified by: Ron Lee, Francesco Montorsi +// Created: 09/04/99 +// RCS-ID: $Id$ +// Copyright: (c) wxWidgets copyright +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +// =========================================================================== +// headers, declarations, constants +// =========================================================================== + +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#ifdef __BORLANDC__ + #pragma hdrstop +#endif + +#include "wx/wxchar.h" + +#define _ISOC9X_SOURCE 1 // to get vsscanf() +#define _BSD_SOURCE 1 // to still get strdup() + +#include +#include +#include + +#ifndef __WXWINCE__ + #include + #include +#else + #include "wx/msw/wince/time.h" +#endif + +#ifndef WX_PRECOMP + #include "wx/string.h" + #include "wx/hash.h" + #include "wx/utils.h" // for wxMin and wxMax + #include "wx/log.h" +#endif + +#if defined(__WIN32__) && defined(wxNEED_WX_CTYPE_H) + #include + #include + #include + #include +#endif + +#if defined(__MWERKS__) && __MSL__ >= 0x6000 +namespace std {} +using namespace std ; +#endif + +#if wxUSE_WCHAR_T +size_t WXDLLEXPORT wxMB2WC(wchar_t *buf, const char *psz, size_t n) +{ + // assume that we have mbsrtowcs() too if we have wcsrtombs() +#ifdef HAVE_WCSRTOMBS + mbstate_t mbstate; + memset(&mbstate, 0, sizeof(mbstate_t)); +#endif + + if (buf) { + if (!n || !*psz) { + if (n) *buf = wxT('\0'); + return 0; + } +#ifdef HAVE_WCSRTOMBS + return mbsrtowcs(buf, &psz, n, &mbstate); +#else + return wxMbstowcs(buf, psz, n); +#endif + } + + // note that we rely on common (and required by Unix98 but unfortunately not + // C99) extension which allows to call mbs(r)towcs() with NULL output pointer + // to just get the size of the needed buffer -- this is needed as otherwise + // we have no idea about how much space we need and if the CRT doesn't + // support it (the only currently known example being Metrowerks, see + // wx/wxchar.h) we don't use its mbstowcs() at all +#ifdef HAVE_WCSRTOMBS + return mbsrtowcs((wchar_t *) NULL, &psz, 0, &mbstate); +#else + return wxMbstowcs((wchar_t *) NULL, psz, 0); +#endif +} + +size_t WXDLLEXPORT wxWC2MB(char *buf, const wchar_t *pwz, size_t n) +{ +#ifdef HAVE_WCSRTOMBS + mbstate_t mbstate; + memset(&mbstate, 0, sizeof(mbstate_t)); +#endif + + if (buf) { + if (!n || !*pwz) { + // glibc2.1 chokes on null input + if (n) *buf = '\0'; + return 0; + } +#ifdef HAVE_WCSRTOMBS + return wcsrtombs(buf, &pwz, n, &mbstate); +#else + return wxWcstombs(buf, pwz, n); +#endif + } + +#ifdef HAVE_WCSRTOMBS + return wcsrtombs((char *) NULL, &pwz, 0, &mbstate); +#else + return wxWcstombs((char *) NULL, pwz, 0); +#endif +} +#endif // wxUSE_WCHAR_T + +bool WXDLLEXPORT wxOKlibc() +{ +#if wxUSE_WCHAR_T && defined(__UNIX__) && defined(__GLIBC__) && !defined(__WINE__) + // glibc 2.0 uses UTF-8 even when it shouldn't + wchar_t res = 0; + if ((MB_CUR_MAX == 2) && + (wxMB2WC(&res, "\xdd\xa5", 1) == 1) && + (res==0x765)) { + // this is UTF-8 allright, check whether that's what we want + char *cur_locale = setlocale(LC_CTYPE, NULL); + if ((strlen(cur_locale) < 4) || + (strcasecmp(cur_locale + strlen(cur_locale) - 4, "utf8")) || + (strcasecmp(cur_locale + strlen(cur_locale) - 5, "utf-8"))) { + // nope, don't use libc conversion + return false; + } + } +#endif + return true; +} + +// ============================================================================ +// printf() functions business +// ============================================================================ + +// special test mode: define all functions below even if we don't really need +// them to be able to test them +#ifdef wxTEST_PRINTF + #undef wxFprintf + #undef wxPrintf + #undef wxSprintf + #undef wxVfprintf + #undef wxVsprintf + #undef wxVprintf + #undef wxVsnprintf_ + #undef wxSnprintf_ + + #define wxNEED_WPRINTF + + int wxVfprintf( FILE *stream, const wxChar *format, va_list argptr ); +#endif + +#if !defined(wxSnprintf_) +int WXDLLEXPORT wxDoSnprintf_(wxChar *buf, size_t len, const wxChar *format, ...) +{ + va_list argptr; + va_start(argptr, format); + + int iLen = wxVsnprintf_(buf, len, format, argptr); + + va_end(argptr); + + return iLen; +} +#endif // wxSnprintf_ + +#if defined(__DMC__) + /* Digital Mars adds count to _stprintf (C99) so convert */ + #if wxUSE_UNICODE + int wxDoSprintf (wchar_t * __RESTRICT s, const wchar_t * __RESTRICT format, ... ) + { + va_list arglist; + + va_start( arglist, format ); + int iLen = swprintf ( s, -1, format, arglist ); + va_end( arglist ); + return iLen ; + } + + #endif // wxUSE_UNICODE + +#endif //__DMC__ + +// ---------------------------------------------------------------------------- +// implement the standard IO functions for wide char if libc doesn't have them +// ---------------------------------------------------------------------------- + +#ifdef wxNEED_FPUTS +int wxFputs(const wchar_t *ws, FILE *stream) +{ + wxCharBuffer buf(wxConvLibc.cWC2MB(ws)); + if ( !buf ) + return -1; + + // counting the number of wide characters written isn't worth the trouble, + // simply distinguish between ok and error + return fputs(buf, stream) == -1 ? -1 : 0; +} +#endif // wxNEED_FPUTS + +#ifdef wxNEED_PUTS +int wxPuts(const wxChar *ws) +{ + int rc = wxFputs(ws, stdout); + if ( rc != -1 ) + { + if ( wxFputs(L"\n", stdout) == -1 ) + return -1; + + rc++; + } + + return rc; +} +#endif // wxNEED_PUTS + +#ifdef wxNEED_PUTC +int /* not wint_t */ wxPutc(wchar_t wc, FILE *stream) +{ + wchar_t ws[2] = { wc, L'\0' }; + + return wxFputs(ws, stream); +} +#endif // wxNEED_PUTC + +// NB: we only implement va_list functions here, the ones taking ... are +// defined below for wxNEED_PRINTF_CONVERSION case anyhow and we reuse +// the definitions there to avoid duplicating them here +#ifdef wxNEED_WPRINTF + +// TODO: implement the scanf() functions +int vwscanf(const wxChar *format, va_list argptr) +{ + wxFAIL_MSG( _T("TODO") ); + + return -1; +} + +int vswscanf(const wxChar *ws, const wxChar *format, va_list argptr) +{ + // The best we can do without proper Unicode support in glibc is to + // convert the strings into MB representation and run ANSI version + // of the function. This doesn't work with %c and %s because of difference + // in size of char and wchar_t, though. + + wxCHECK_MSG( wxStrstr(format, _T("%s")) == NULL, -1, + _T("incomplete vswscanf implementation doesn't allow %s") ); + wxCHECK_MSG( wxStrstr(format, _T("%c")) == NULL, -1, + _T("incomplete vswscanf implementation doesn't allow %c") ); + + va_list argcopy; + wxVaCopy(argcopy, argptr); + return vsscanf(wxConvLibc.cWX2MB(ws), wxConvLibc.cWX2MB(format), argcopy); +} + +int vfwscanf(FILE *stream, const wxChar *format, va_list argptr) +{ + wxFAIL_MSG( _T("TODO") ); + + return -1; +} + +#define vswprintf wxVsnprintf_ + +int vfwprintf(FILE *stream, const wxChar *format, va_list argptr) +{ + wxString s; + int rc = s.PrintfV(format, argptr); + + if ( rc != -1 ) + { + // we can't do much better without Unicode support in libc... + if ( fprintf(stream, "%s", (const char*)s.mb_str() ) == -1 ) + return -1; + } + + return rc; +} + +int vwprintf(const wxChar *format, va_list argptr) +{ + return wxVfprintf(stdout, format, argptr); +} + +#endif // wxNEED_WPRINTF + +#ifdef wxNEED_PRINTF_CONVERSION + +// ---------------------------------------------------------------------------- +// wxFormatConverter: class doing the "%s" -> "%ls" conversion +// ---------------------------------------------------------------------------- + +/* + Here are the gory details. We want to follow the Windows/MS conventions, + that is to have + + In ANSI mode: + + format specifier results in + ----------------------------------- + %c, %hc, %hC char + %lc, %C, %lC wchar_t + + In Unicode mode: + + format specifier results in + ----------------------------------- + %hc, %C, %hC char + %c, %lc, %lC wchar_t + + + while on POSIX systems we have %C identical to %lc and %c always means char + (in any mode) while %lc always means wchar_t, + + So to use native functions in order to get our semantics we must do the + following translations in Unicode mode (nothing to do in ANSI mode): + + wxWidgets specifier POSIX specifier + ---------------------------------------- + + %hc, %C, %hC %c + %c %lc + + + And, of course, the same should be done for %s as well. +*/ + +class wxFormatConverter +{ +public: + wxFormatConverter(const wxChar *format); + + // notice that we only translated the string if m_fmtOrig == NULL (as set + // by CopyAllBefore()), otherwise we should simply use the original format + operator const wxChar *() const + { return m_fmtOrig ? m_fmtOrig : m_fmt.c_str(); } + +private: + // copy another character to the translated format: this function does the + // copy if we are translating but doesn't do anything at all if we don't, + // so we don't create the translated format string at all unless we really + // need to (i.e. InsertFmtChar() is called) + wxChar CopyFmtChar(wxChar ch) + { + if ( !m_fmtOrig ) + { + // we're translating, do copy + m_fmt += ch; + } + else + { + // simply increase the count which should be copied by + // CopyAllBefore() later if needed + m_nCopied++; + } + + return ch; + } + + // insert an extra character + void InsertFmtChar(wxChar ch) + { + if ( m_fmtOrig ) + { + // so far we haven't translated anything yet + CopyAllBefore(); + } + + m_fmt += ch; + } + + void CopyAllBefore() + { + wxASSERT_MSG( m_fmtOrig && m_fmt.empty(), _T("logic error") ); + + m_fmt = wxString(m_fmtOrig, m_nCopied); + + // we won't need it any longer + m_fmtOrig = NULL; + } + + static bool IsFlagChar(wxChar ch) + { + return ch == _T('-') || ch == _T('+') || + ch == _T('0') || ch == _T(' ') || ch == _T('#'); + } + + void SkipDigits(const wxChar **ptpc) + { + while ( **ptpc >= _T('0') && **ptpc <= _T('9') ) + CopyFmtChar(*(*ptpc)++); + } + + // the translated format + wxString m_fmt; + + // the original format + const wxChar *m_fmtOrig; + + // the number of characters already copied + size_t m_nCopied; +}; + +wxFormatConverter::wxFormatConverter(const wxChar *format) +{ + m_fmtOrig = format; + m_nCopied = 0; + + while ( *format ) + { + if ( CopyFmtChar(*format++) == _T('%') ) + { + // skip any flags + while ( IsFlagChar(*format) ) + CopyFmtChar(*format++); + + // and possible width + if ( *format == _T('*') ) + CopyFmtChar(*format++); + else + SkipDigits(&format); + + // precision? + if ( *format == _T('.') ) + { + CopyFmtChar(*format++); + if ( *format == _T('*') ) + CopyFmtChar(*format++); + else + SkipDigits(&format); + } + + // next we can have a size modifier + enum + { + Default, + Short, + Long + } size; + + switch ( *format ) + { + case _T('h'): + size = Short; + format++; + break; + + case _T('l'): + // "ll" has a different meaning! + if ( format[1] != _T('l') ) + { + size = Long; + format++; + break; + } + //else: fall through + + default: + size = Default; + } + + // and finally we should have the type + switch ( *format ) + { + case _T('C'): + case _T('S'): + // %C and %hC -> %c and %lC -> %lc + if ( size == Long ) + CopyFmtChar(_T('l')); + + InsertFmtChar(*format++ == _T('C') ? _T('c') : _T('s')); + break; + + case _T('c'): + case _T('s'): + // %c -> %lc but %hc stays %hc and %lc is still %lc + if ( size == Default) + InsertFmtChar(_T('l')); + // fall through + + default: + // nothing special to do + if ( size != Default ) + CopyFmtChar(*(format - 1)); + CopyFmtChar(*format++); + } + } + } +} + +#else // !wxNEED_PRINTF_CONVERSION + // no conversion necessary + #define wxFormatConverter(x) (x) +#endif // wxNEED_PRINTF_CONVERSION/!wxNEED_PRINTF_CONVERSION + +#ifdef __WXDEBUG__ +// For testing the format converter +wxString wxConvertFormat(const wxChar *format) +{ + return wxString(wxFormatConverter(format)); +} +#endif + +// ---------------------------------------------------------------------------- +// wxPrintf(), wxScanf() and relatives +// ---------------------------------------------------------------------------- + +#if defined(wxNEED_PRINTF_CONVERSION) || defined(wxNEED_WPRINTF) + +int wxDoScanf( const wxChar *format, ... ) +{ + va_list argptr; + va_start(argptr, format); + + int ret = vwscanf(wxFormatConverter(format), argptr ); + + va_end(argptr); + + return ret; +} + +int wxDoSscanf( const wxChar *str, const wxChar *format, ... ) +{ + va_list argptr; + va_start(argptr, format); + + int ret = vswscanf( str, wxFormatConverter(format), argptr ); + + va_end(argptr); + + return ret; +} + +int wxDoFscanf( FILE *stream, const wxChar *format, ... ) +{ + va_list argptr; + va_start(argptr, format); + int ret = vfwscanf(stream, wxFormatConverter(format), argptr); + + va_end(argptr); + + return ret; +} + +int wxDoPrintf( const wxChar *format, ... ) +{ + va_list argptr; + va_start(argptr, format); + + int ret = vwprintf( wxFormatConverter(format), argptr ); + + va_end(argptr); + + return ret; +} + +#ifndef wxSnprintf +int wxDoSnprintf( wxChar *str, size_t size, const wxChar *format, ... ) +{ + va_list argptr; + va_start(argptr, format); + + int ret = vswprintf( str, size, wxFormatConverter(format), argptr ); + + // VsnprintfTestCase reveals that glibc's implementation of vswprintf + // doesn't nul terminate on truncation. + str[size - 1] = 0; + + va_end(argptr); + + return ret; +} +#endif // wxSnprintf + +int wxDoSprintf( wxChar *str, const wxChar *format, ... ) +{ + va_list argptr; + va_start(argptr, format); + + // note that wxString::FormatV() uses wxVsnprintf(), not wxSprintf(), so + // it's safe to implement this one in terms of it + wxString s(wxString::FormatV(format, argptr)); + wxStrcpy(str, s); + + va_end(argptr); + + return s.length(); +} + +int wxDoFprintf( FILE *stream, const wxChar *format, ... ) +{ + va_list argptr; + va_start( argptr, format ); + + int ret = vfwprintf( stream, wxFormatConverter(format), argptr ); + + va_end(argptr); + + return ret; +} + +int wxVsscanf( const wxChar *str, const wxChar *format, va_list argptr ) +{ + return vswscanf( str, wxFormatConverter(format), argptr ); +} + +int wxVfprintf( FILE *stream, const wxChar *format, va_list argptr ) +{ + return vfwprintf( stream, wxFormatConverter(format), argptr ); +} + +int wxVprintf( const wxChar *format, va_list argptr ) +{ + return vwprintf( wxFormatConverter(format), argptr ); +} + +#ifndef wxVsnprintf +int wxVsnprintf( wxChar *str, size_t size, const wxChar *format, va_list argptr ) +{ + return vswprintf( str, size, wxFormatConverter(format), argptr ); +} +#endif // wxVsnprintf + +int wxVsprintf( wxChar *str, const wxChar *format, va_list argptr ) +{ + // same as for wxSprintf() + return vswprintf(str, INT_MAX / 4, wxFormatConverter(format), argptr); +} + +#endif // wxNEED_PRINTF_CONVERSION + +#if wxUSE_WCHAR_T + +// ---------------------------------------------------------------------------- +// ctype.h stuff (currently unused) +// ---------------------------------------------------------------------------- + +#if defined(__WIN32__) && defined(wxNEED_WX_CTYPE_H) +inline WORD wxMSW_ctype(wxChar ch) +{ + WORD ret; + GetStringTypeEx(LOCALE_USER_DEFAULT, CT_CTYPE1, &ch, 1, &ret); + return ret; +} + +WXDLLEXPORT int wxIsalnum(wxChar ch) { return IsCharAlphaNumeric(ch); } +WXDLLEXPORT int wxIsalpha(wxChar ch) { return IsCharAlpha(ch); } +WXDLLEXPORT int wxIscntrl(wxChar ch) { return wxMSW_ctype(ch) & C1_CNTRL; } +WXDLLEXPORT int wxIsdigit(wxChar ch) { return wxMSW_ctype(ch) & C1_DIGIT; } +WXDLLEXPORT int wxIsgraph(wxChar ch) { return wxMSW_ctype(ch) & (C1_DIGIT|C1_PUNCT|C1_ALPHA); } +WXDLLEXPORT int wxIslower(wxChar ch) { return IsCharLower(ch); } +WXDLLEXPORT int wxIsprint(wxChar ch) { return wxMSW_ctype(ch) & (C1_DIGIT|C1_SPACE|C1_PUNCT|C1_ALPHA); } +WXDLLEXPORT int wxIspunct(wxChar ch) { return wxMSW_ctype(ch) & C1_PUNCT; } +WXDLLEXPORT int wxIsspace(wxChar ch) { return wxMSW_ctype(ch) & C1_SPACE; } +WXDLLEXPORT int wxIsupper(wxChar ch) { return IsCharUpper(ch); } +WXDLLEXPORT int wxIsxdigit(wxChar ch) { return wxMSW_ctype(ch) & C1_XDIGIT; } +WXDLLEXPORT int wxTolower(wxChar ch) { return (wxChar)CharLower((LPTSTR)(ch)); } +WXDLLEXPORT int wxToupper(wxChar ch) { return (wxChar)CharUpper((LPTSTR)(ch)); } +#endif + +#ifdef wxNEED_WX_MBSTOWCS + +WXDLLEXPORT size_t wxMbstowcs (wchar_t * out, const char * in, size_t outlen) +{ + if (!out) + { + size_t outsize = 0; + while(*in++) + outsize++; + return outsize; + } + + const char* origin = in; + + while (outlen-- && *in) + { + *out++ = (wchar_t) *in++; + } + + *out = '\0'; + + return in - origin; +} + +WXDLLEXPORT size_t wxWcstombs (char * out, const wchar_t * in, size_t outlen) +{ + if (!out) + { + size_t outsize = 0; + while(*in++) + outsize++; + return outsize; + } + + const wchar_t* origin = in; + + while (outlen-- && *in) + { + *out++ = (char) *in++; + } + + *out = '\0'; + + return in - origin; +} + +#endif // wxNEED_WX_MBSTOWCS + +#if defined(wxNEED_WX_CTYPE_H) + +#include + +#define cfalnumset CFCharacterSetGetPredefined(kCFCharacterSetAlphaNumeric) +#define cfalphaset CFCharacterSetGetPredefined(kCFCharacterSetLetter) +#define cfcntrlset CFCharacterSetGetPredefined(kCFCharacterSetControl) +#define cfdigitset CFCharacterSetGetPredefined(kCFCharacterSetDecimalDigit) +//CFCharacterSetRef cfgraphset = kCFCharacterSetControl && !' ' +#define cflowerset CFCharacterSetGetPredefined(kCFCharacterSetLowercaseLetter) +//CFCharacterSetRef cfprintset = !kCFCharacterSetControl +#define cfpunctset CFCharacterSetGetPredefined(kCFCharacterSetPunctuation) +#define cfspaceset CFCharacterSetGetPredefined(kCFCharacterSetWhitespaceAndNewline) +#define cfupperset CFCharacterSetGetPredefined(kCFCharacterSetUppercaseLetter) + +WXDLLEXPORT int wxIsalnum(wxChar ch) { return CFCharacterSetIsCharacterMember(cfalnumset, ch); } +WXDLLEXPORT int wxIsalpha(wxChar ch) { return CFCharacterSetIsCharacterMember(cfalphaset, ch); } +WXDLLEXPORT int wxIscntrl(wxChar ch) { return CFCharacterSetIsCharacterMember(cfcntrlset, ch); } +WXDLLEXPORT int wxIsdigit(wxChar ch) { return CFCharacterSetIsCharacterMember(cfdigitset, ch); } +WXDLLEXPORT int wxIsgraph(wxChar ch) { return !CFCharacterSetIsCharacterMember(cfcntrlset, ch) && ch != ' '; } +WXDLLEXPORT int wxIslower(wxChar ch) { return CFCharacterSetIsCharacterMember(cflowerset, ch); } +WXDLLEXPORT int wxIsprint(wxChar ch) { return !CFCharacterSetIsCharacterMember(cfcntrlset, ch); } +WXDLLEXPORT int wxIspunct(wxChar ch) { return CFCharacterSetIsCharacterMember(cfpunctset, ch); } +WXDLLEXPORT int wxIsspace(wxChar ch) { return CFCharacterSetIsCharacterMember(cfspaceset, ch); } +WXDLLEXPORT int wxIsupper(wxChar ch) { return CFCharacterSetIsCharacterMember(cfupperset, ch); } +WXDLLEXPORT int wxIsxdigit(wxChar ch) { return wxIsdigit(ch) || (ch>='a' && ch<='f') || (ch>='A' && ch<='F'); } +WXDLLEXPORT int wxTolower(wxChar ch) { return (wxChar)tolower((char)(ch)); } +WXDLLEXPORT int wxToupper(wxChar ch) { return (wxChar)toupper((char)(ch)); } + +#endif // wxNEED_WX_CTYPE_H + +#ifndef wxStrdupA + +WXDLLEXPORT char *wxStrdupA(const char *s) +{ + return strcpy((char *)malloc(strlen(s) + 1), s); +} + +#endif // wxStrdupA + +#ifndef wxStrdupW + +WXDLLEXPORT wchar_t * wxStrdupW(const wchar_t *pwz) +{ + size_t size = (wxWcslen(pwz) + 1) * sizeof(wchar_t); + wchar_t *ret = (wchar_t *) malloc(size); + memcpy(ret, pwz, size); + return ret; +} + +#endif // wxStrdupW + +#ifndef wxStricmp +int WXDLLEXPORT wxStricmp(const wxChar *psz1, const wxChar *psz2) +{ + register wxChar c1, c2; + do { + c1 = wxTolower(*psz1++); + c2 = wxTolower(*psz2++); + } while ( c1 && (c1 == c2) ); + return c1 - c2; +} +#endif + +#ifndef wxStricmp +int WXDLLEXPORT wxStrnicmp(const wxChar *s1, const wxChar *s2, size_t n) +{ + // initialize the variables just to suppress stupid gcc warning + register wxChar c1 = 0, c2 = 0; + while (n && ((c1 = wxTolower(*s1)) == (c2 = wxTolower(*s2)) ) && c1) n--, s1++, s2++; + if (n) { + if (c1 < c2) return -1; + if (c1 > c2) return 1; + } + return 0; +} +#endif + +#ifndef wxSetlocale +WXDLLEXPORT wxWCharBuffer wxSetlocale(int category, const wxChar *locale) +{ + char *localeOld = setlocale(category, wxConvLibc.cWX2MB(locale)); + + return wxWCharBuffer(wxConvLibc.cMB2WC(localeOld)); +} +#endif + +#if wxUSE_WCHAR_T && !defined(HAVE_WCSLEN) +WXDLLEXPORT size_t wxWcslen(const wchar_t *s) +{ + size_t n = 0; + while ( *s++ ) + n++; + + return n; +} +#endif + +// ---------------------------------------------------------------------------- +// string.h functions +// ---------------------------------------------------------------------------- + +#ifdef wxNEED_WX_STRING_H + +// RN: These need to be c externed for the regex lib +#ifdef __cplusplus +extern "C" { +#endif + +WXDLLEXPORT wxChar * wxStrcat(wxChar *dest, const wxChar *src) +{ + wxChar *ret = dest; + while (*dest) dest++; + while ((*dest++ = *src++)); + return ret; +} + +WXDLLEXPORT const wxChar * wxStrchr(const wxChar *s, wxChar c) +{ + // be careful here as the terminating NUL makes part of the string + while ( *s != c ) + { + if ( !*s++ ) + return NULL; + } + + return s; +} + +WXDLLEXPORT int wxStrcmp(const wxChar *s1, const wxChar *s2) +{ + while ((*s1 == *s2) && *s1) s1++, s2++; + if ((wxUChar)*s1 < (wxUChar)*s2) return -1; + if ((wxUChar)*s1 > (wxUChar)*s2) return 1; + return 0; +} + +WXDLLEXPORT wxChar * wxStrcpy(wxChar *dest, const wxChar *src) +{ + wxChar *ret = dest; + while ((*dest++ = *src++)); + return ret; +} + +WXDLLEXPORT size_t wxStrlen_(const wxChar *s) +{ + size_t n = 0; + while ( *s++ ) + n++; + + return n; +} + + +WXDLLEXPORT wxChar * wxStrncat(wxChar *dest, const wxChar *src, size_t n) +{ + wxChar *ret = dest; + while (*dest) dest++; + while (n && (*dest++ = *src++)) n--; + return ret; +} + +WXDLLEXPORT int wxStrncmp(const wxChar *s1, const wxChar *s2, size_t n) +{ + while (n && (*s1 == *s2) && *s1) n--, s1++, s2++; + if (n) { + if ((wxUChar)*s1 < (wxUChar)*s2) return -1; + if ((wxUChar)*s1 > (wxUChar)*s2) return 1; + } + return 0; +} + +WXDLLEXPORT wxChar * wxStrncpy(wxChar *dest, const wxChar *src, size_t n) +{ + wxChar *ret = dest; + while (n && (*dest++ = *src++)) n--; + while (n) *dest++=0, n--; // the docs specify padding with zeroes + return ret; +} + +WXDLLEXPORT const wxChar * wxStrpbrk(const wxChar *s, const wxChar *accept) +{ + while (*s && !wxStrchr(accept, *s)) + s++; + + return *s ? s : NULL; +} + +WXDLLEXPORT const wxChar * wxStrrchr(const wxChar *s, wxChar c) +{ + const wxChar *ret = NULL; + do + { + if ( *s == c ) + ret = s; + s++; + } + while ( *s ); + + return ret; +} + +WXDLLEXPORT size_t wxStrspn(const wxChar *s, const wxChar *accept) +{ + size_t len = 0; + while (wxStrchr(accept, *s++)) len++; + return len; +} + +WXDLLEXPORT const wxChar *wxStrstr(const wxChar *haystack, const wxChar *needle) +{ + wxASSERT_MSG( needle != NULL, _T("NULL argument in wxStrstr") ); + + // VZ: this is not exactly the most efficient string search algorithm... + + const size_t len = wxStrlen(needle); + + while ( const wxChar *fnd = wxStrchr(haystack, *needle) ) + { + if ( !wxStrncmp(fnd, needle, len) ) + return fnd; + + haystack = fnd + 1; + } + + return NULL; +} + +#ifdef __cplusplus +} +#endif + +WXDLLEXPORT double wxStrtod(const wxChar *nptr, wxChar **endptr) +{ + const wxChar *start = nptr; + + // FIXME: only correct for C locale + while (wxIsspace(*nptr)) nptr++; + if (*nptr == wxT('+') || *nptr == wxT('-')) nptr++; + while (wxIsdigit(*nptr)) nptr++; + if (*nptr == wxT('.')) { + nptr++; + while (wxIsdigit(*nptr)) nptr++; + } + if (*nptr == wxT('E') || *nptr == wxT('e')) { + nptr++; + if (*nptr == wxT('+') || *nptr == wxT('-')) nptr++; + while (wxIsdigit(*nptr)) nptr++; + } + + wxString data(nptr, nptr-start); + wxWX2MBbuf dat = data.mb_str(wxConvLibc); + char *rdat = wxMBSTRINGCAST dat; + double ret = strtod(dat, &rdat); + + if (endptr) *endptr = (wxChar *)(start + (rdat - (const char *)dat)); + + return ret; +} + +WXDLLEXPORT long int wxStrtol(const wxChar *nptr, wxChar **endptr, int base) +{ + const wxChar *start = nptr; + + // FIXME: only correct for C locale + while (wxIsspace(*nptr)) nptr++; + if (*nptr == wxT('+') || *nptr == wxT('-')) nptr++; + if (((base == 0) || (base == 16)) && + (nptr[0] == wxT('0') && nptr[1] == wxT('x'))) { + nptr += 2; + base = 16; + } + else if ((base == 0) && (nptr[0] == wxT('0'))) base = 8; + else if (base == 0) base = 10; + + while ((wxIsdigit(*nptr) && (*nptr - wxT('0') < base)) || + (wxIsalpha(*nptr) && (wxToupper(*nptr) - wxT('A') + 10 < base))) nptr++; + + wxString data(start, nptr-start); + wxWX2MBbuf dat = data.mb_str(wxConvLibc); + char *rdat = wxMBSTRINGCAST dat; + long int ret = strtol(dat, &rdat, base); + + if (endptr) *endptr = (wxChar *)(start + (rdat - (const char *)dat)); + + return ret; +} + +WXDLLEXPORT unsigned long int wxStrtoul(const wxChar *nptr, wxChar **endptr, int base) +{ + return (unsigned long int) wxStrtol(nptr, endptr, base); +} + +#endif // wxNEED_WX_STRING_H + +#ifdef wxNEED_WX_STDIO_H +WXDLLEXPORT FILE * wxFopen(const wxChar *path, const wxChar *mode) +{ + char mode_buffer[10]; + for (size_t i = 0; i < wxStrlen(mode)+1; i++) + mode_buffer[i] = (char) mode[i]; + + return fopen( wxConvFile.cWX2MB(path), mode_buffer ); +} + +WXDLLEXPORT FILE * wxFreopen(const wxChar *path, const wxChar *mode, FILE *stream) +{ + char mode_buffer[10]; + for (size_t i = 0; i < wxStrlen(mode)+1; i++) + mode_buffer[i] = (char) mode[i]; + + return freopen( wxConvFile.cWX2MB(path), mode_buffer, stream ); +} + +WXDLLEXPORT int wxRemove(const wxChar *path) +{ + return remove( wxConvFile.cWX2MB(path) ); +} + +WXDLLEXPORT int wxRename(const wxChar *oldpath, const wxChar *newpath) +{ + return rename( wxConvFile.cWX2MB(oldpath), wxConvFile.cWX2MB(newpath) ); +} +#endif + +#ifndef wxAtof +double WXDLLEXPORT wxAtof(const wxChar *psz) +{ +#ifdef __WXWINCE__ + double d; + wxString str(psz); + if (str.ToDouble(& d)) + return d; + + return 0.0; +#else + return atof(wxConvLibc.cWX2MB(psz)); +#endif +} +#endif + +#ifdef wxNEED_WX_STDLIB_H +int WXDLLEXPORT wxAtoi(const wxChar *psz) +{ + return atoi(wxConvLibc.cWX2MB(psz)); +} + +long WXDLLEXPORT wxAtol(const wxChar *psz) +{ + return atol(wxConvLibc.cWX2MB(psz)); +} + +wxChar * WXDLLEXPORT wxGetenv(const wxChar *name) +{ +#if wxUSE_UNICODE + // NB: buffer returned by getenv() is allowed to be overwritten next + // time getenv() is called, so it is OK to use static string + // buffer to hold the data. + static wxWCharBuffer value((wxChar*)NULL); + value = wxConvLibc.cMB2WX(getenv(wxConvLibc.cWX2MB(name))); + return value.data(); +#else + return getenv(name); +#endif +} + +int WXDLLEXPORT wxSystem(const wxChar *psz) +{ + return system(wxConvLibc.cWX2MB(psz)); +} + +#endif // wxNEED_WX_STDLIB_H + +#ifdef wxNEED_WX_TIME_H +WXDLLEXPORT size_t +wxStrftime(wxChar *s, size_t maxsize, const wxChar *fmt, const struct tm *tm) +{ + if ( !maxsize ) + return 0; + + wxCharBuffer buf(maxsize); + + wxCharBuffer bufFmt(wxConvLibc.cWX2MB(fmt)); + if ( !bufFmt ) + return 0; + + size_t ret = strftime(buf.data(), maxsize, bufFmt, tm); + if ( !ret ) + return 0; + + wxWCharBuffer wbuf = wxConvLibc.cMB2WX(buf); + if ( !wbuf ) + return 0; + + wxStrncpy(s, wbuf, maxsize); + return wxStrlen(s); +} +#endif // wxNEED_WX_TIME_H + +#ifndef wxCtime +WXDLLEXPORT wxChar *wxCtime(const time_t *timep) +{ + // normally the string is 26 chars but give one more in case some broken + // DOS compiler decides to use "\r\n" instead of "\n" at the end + static wxChar buf[27]; + + // ctime() is guaranteed to return a string containing only ASCII + // characters, as its format is always the same for any locale + wxStrncpy(buf, wxString::FromAscii(ctime(timep)), WXSIZEOF(buf)); + buf[WXSIZEOF(buf) - 1] = _T('\0'); + + return buf; +} +#endif // wxCtime + +#endif // wxUSE_WCHAR_T + +// ---------------------------------------------------------------------------- +// functions which we may need even if !wxUSE_WCHAR_T +// ---------------------------------------------------------------------------- + +#ifndef wxStrtok + +WXDLLEXPORT wxChar * wxStrtok(wxChar *psz, const wxChar *delim, wxChar **save_ptr) +{ + if (!psz) + { + psz = *save_ptr; + if ( !psz ) + return NULL; + } + + psz += wxStrspn(psz, delim); + if (!*psz) + { + *save_ptr = (wxChar *)NULL; + return (wxChar *)NULL; + } + + wxChar *ret = psz; + psz = wxStrpbrk(psz, delim); + if (!psz) + { + *save_ptr = (wxChar*)NULL; + } + else + { + *psz = wxT('\0'); + *save_ptr = psz + 1; + } + + return ret; +} + +#endif // wxStrtok + +// ---------------------------------------------------------------------------- +// missing C RTL functions +// ---------------------------------------------------------------------------- + +#ifdef wxNEED_STRDUP + +char *strdup(const char *s) +{ + char *dest = (char*) malloc( strlen( s ) + 1 ) ; + if ( dest ) + strcpy( dest , s ) ; + return dest ; +} +#endif // wxNEED_STRDUP + +#if defined(__WXWINCE__) && (_WIN32_WCE <= 211) + +void *calloc( size_t num, size_t size ) +{ + void** ptr = (void **)malloc(num * size); + memset( ptr, 0, num * size); + return ptr; +} + +#endif // __WXWINCE__ <= 211 + +#ifdef __WXWINCE__ + +int wxRemove(const wxChar *path) +{ + return ::DeleteFile(path) == 0; +} + +#endif diff --git a/src/common/wxchar.cpp b/src/common/wxprintf.cpp similarity index 53% rename from src/common/wxchar.cpp rename to src/common/wxprintf.cpp index 9afb608e49..565f164921 100644 --- a/src/common/wxchar.cpp +++ b/src/common/wxprintf.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: src/common/wxchar.cpp -// Purpose: wxChar implementation +// Name: src/common/wxprintf.cpp +// Purpose: wxWidgets wxPrintf() implementation // Author: Ove Kaven // Modified by: Ron Lee, Francesco Montorsi // Created: 09/04/99 @@ -22,20 +22,8 @@ #include "wx/wxchar.h" -#define _ISOC9X_SOURCE 1 // to get vsscanf() -#define _BSD_SOURCE 1 // to still get strdup() - -#include -#include #include -#ifndef __WXWINCE__ - #include - #include -#else - #include "wx/msw/wince/time.h" -#endif - #ifndef WX_PRECOMP #include "wx/string.h" #include "wx/hash.h" @@ -43,120 +31,20 @@ #include "wx/log.h" #endif -#if defined(__WIN32__) && defined(wxNEED_WX_CTYPE_H) - #include - #include - #include - #include -#endif - #if defined(__MWERKS__) && __MSL__ >= 0x6000 namespace std {} using namespace std ; #endif -#if wxUSE_WCHAR_T -size_t WXDLLEXPORT wxMB2WC(wchar_t *buf, const char *psz, size_t n) -{ - // assume that we have mbsrtowcs() too if we have wcsrtombs() -#ifdef HAVE_WCSRTOMBS - mbstate_t mbstate; - memset(&mbstate, 0, sizeof(mbstate_t)); -#endif - - if (buf) { - if (!n || !*psz) { - if (n) *buf = wxT('\0'); - return 0; - } -#ifdef HAVE_WCSRTOMBS - return mbsrtowcs(buf, &psz, n, &mbstate); -#else - return wxMbstowcs(buf, psz, n); -#endif - } - - // note that we rely on common (and required by Unix98 but unfortunately not - // C99) extension which allows to call mbs(r)towcs() with NULL output pointer - // to just get the size of the needed buffer -- this is needed as otherwise - // we have no idea about how much space we need and if the CRT doesn't - // support it (the only currently known example being Metrowerks, see - // wx/wxchar.h) we don't use its mbstowcs() at all -#ifdef HAVE_WCSRTOMBS - return mbsrtowcs((wchar_t *) NULL, &psz, 0, &mbstate); -#else - return wxMbstowcs((wchar_t *) NULL, psz, 0); -#endif -} - -size_t WXDLLEXPORT wxWC2MB(char *buf, const wchar_t *pwz, size_t n) -{ -#ifdef HAVE_WCSRTOMBS - mbstate_t mbstate; - memset(&mbstate, 0, sizeof(mbstate_t)); -#endif - - if (buf) { - if (!n || !*pwz) { - // glibc2.1 chokes on null input - if (n) *buf = '\0'; - return 0; - } -#ifdef HAVE_WCSRTOMBS - return wcsrtombs(buf, &pwz, n, &mbstate); -#else - return wxWcstombs(buf, pwz, n); -#endif - } - -#ifdef HAVE_WCSRTOMBS - return wcsrtombs((char *) NULL, &pwz, 0, &mbstate); -#else - return wxWcstombs((char *) NULL, pwz, 0); -#endif -} -#endif // wxUSE_WCHAR_T - -bool WXDLLEXPORT wxOKlibc() -{ -#if wxUSE_WCHAR_T && defined(__UNIX__) && defined(__GLIBC__) && !defined(__WINE__) - // glibc 2.0 uses UTF-8 even when it shouldn't - wchar_t res = 0; - if ((MB_CUR_MAX == 2) && - (wxMB2WC(&res, "\xdd\xa5", 1) == 1) && - (res==0x765)) { - // this is UTF-8 allright, check whether that's what we want - char *cur_locale = setlocale(LC_CTYPE, NULL); - if ((strlen(cur_locale) < 4) || - (strcasecmp(cur_locale + strlen(cur_locale) - 4, "utf8")) || - (strcasecmp(cur_locale + strlen(cur_locale) - 5, "utf-8"))) { - // nope, don't use libc conversion - return false; - } - } -#endif - return true; -} // ============================================================================ -// printf() functions business +// printf() implementation // ============================================================================ // special test mode: define all functions below even if we don't really need // them to be able to test them #ifdef wxTEST_PRINTF - #undef wxFprintf - #undef wxPrintf - #undef wxSprintf - #undef wxVfprintf - #undef wxVsprintf - #undef wxVprintf #undef wxVsnprintf_ - #undef wxSnprintf_ - - #define wxNEED_WPRINTF - - int wxVfprintf( FILE *stream, const wxChar *format, va_list argptr ); #endif // ---------------------------------------------------------------------------- @@ -1218,1081 +1106,3 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax, #endif #endif // !wxVsnprintf_ - -#if !defined(wxSnprintf_) -int WXDLLEXPORT wxDoSnprintf_(wxChar *buf, size_t len, const wxChar *format, ...) -{ - va_list argptr; - va_start(argptr, format); - - int iLen = wxVsnprintf_(buf, len, format, argptr); - - va_end(argptr); - - return iLen; -} -#endif // wxSnprintf_ - -#if defined(__DMC__) - /* Digital Mars adds count to _stprintf (C99) so convert */ - #if wxUSE_UNICODE - int wxDoSprintf (wchar_t * __RESTRICT s, const wchar_t * __RESTRICT format, ... ) - { - va_list arglist; - - va_start( arglist, format ); - int iLen = swprintf ( s, -1, format, arglist ); - va_end( arglist ); - return iLen ; - } - - #endif // wxUSE_UNICODE - -#endif //__DMC__ - -// ---------------------------------------------------------------------------- -// implement the standard IO functions for wide char if libc doesn't have them -// ---------------------------------------------------------------------------- - -#ifdef wxNEED_FPUTS -int wxFputs(const wchar_t *ws, FILE *stream) -{ - wxCharBuffer buf(wxConvLibc.cWC2MB(ws)); - if ( !buf ) - return -1; - - // counting the number of wide characters written isn't worth the trouble, - // simply distinguish between ok and error - return fputs(buf, stream) == -1 ? -1 : 0; -} -#endif // wxNEED_FPUTS - -#ifdef wxNEED_PUTS -int wxPuts(const wxChar *ws) -{ - int rc = wxFputs(ws, stdout); - if ( rc != -1 ) - { - if ( wxFputs(L"\n", stdout) == -1 ) - return -1; - - rc++; - } - - return rc; -} -#endif // wxNEED_PUTS - -#ifdef wxNEED_PUTC -int /* not wint_t */ wxPutc(wchar_t wc, FILE *stream) -{ - wchar_t ws[2] = { wc, L'\0' }; - - return wxFputs(ws, stream); -} -#endif // wxNEED_PUTC - -// NB: we only implement va_list functions here, the ones taking ... are -// defined below for wxNEED_PRINTF_CONVERSION case anyhow and we reuse -// the definitions there to avoid duplicating them here -#ifdef wxNEED_WPRINTF - -// TODO: implement the scanf() functions -int vwscanf(const wxChar *format, va_list argptr) -{ - wxFAIL_MSG( _T("TODO") ); - - return -1; -} - -int vswscanf(const wxChar *ws, const wxChar *format, va_list argptr) -{ - // The best we can do without proper Unicode support in glibc is to - // convert the strings into MB representation and run ANSI version - // of the function. This doesn't work with %c and %s because of difference - // in size of char and wchar_t, though. - - wxCHECK_MSG( wxStrstr(format, _T("%s")) == NULL, -1, - _T("incomplete vswscanf implementation doesn't allow %s") ); - wxCHECK_MSG( wxStrstr(format, _T("%c")) == NULL, -1, - _T("incomplete vswscanf implementation doesn't allow %c") ); - - va_list argcopy; - wxVaCopy(argcopy, argptr); - return vsscanf(wxConvLibc.cWX2MB(ws), wxConvLibc.cWX2MB(format), argcopy); -} - -int vfwscanf(FILE *stream, const wxChar *format, va_list argptr) -{ - wxFAIL_MSG( _T("TODO") ); - - return -1; -} - -#define vswprintf wxVsnprintf_ - -int vfwprintf(FILE *stream, const wxChar *format, va_list argptr) -{ - wxString s; - int rc = s.PrintfV(format, argptr); - - if ( rc != -1 ) - { - // we can't do much better without Unicode support in libc... - if ( fprintf(stream, "%s", (const char*)s.mb_str() ) == -1 ) - return -1; - } - - return rc; -} - -int vwprintf(const wxChar *format, va_list argptr) -{ - return wxVfprintf(stdout, format, argptr); -} - -#endif // wxNEED_WPRINTF - -#ifdef wxNEED_PRINTF_CONVERSION - -// ---------------------------------------------------------------------------- -// wxFormatConverter: class doing the "%s" -> "%ls" conversion -// ---------------------------------------------------------------------------- - -/* - Here are the gory details. We want to follow the Windows/MS conventions, - that is to have - - In ANSI mode: - - format specifier results in - ----------------------------------- - %c, %hc, %hC char - %lc, %C, %lC wchar_t - - In Unicode mode: - - format specifier results in - ----------------------------------- - %hc, %C, %hC char - %c, %lc, %lC wchar_t - - - while on POSIX systems we have %C identical to %lc and %c always means char - (in any mode) while %lc always means wchar_t, - - So to use native functions in order to get our semantics we must do the - following translations in Unicode mode (nothing to do in ANSI mode): - - wxWidgets specifier POSIX specifier - ---------------------------------------- - - %hc, %C, %hC %c - %c %lc - - - And, of course, the same should be done for %s as well. -*/ - -class wxFormatConverter -{ -public: - wxFormatConverter(const wxChar *format); - - // notice that we only translated the string if m_fmtOrig == NULL (as set - // by CopyAllBefore()), otherwise we should simply use the original format - operator const wxChar *() const - { return m_fmtOrig ? m_fmtOrig : m_fmt.c_str(); } - -private: - // copy another character to the translated format: this function does the - // copy if we are translating but doesn't do anything at all if we don't, - // so we don't create the translated format string at all unless we really - // need to (i.e. InsertFmtChar() is called) - wxChar CopyFmtChar(wxChar ch) - { - if ( !m_fmtOrig ) - { - // we're translating, do copy - m_fmt += ch; - } - else - { - // simply increase the count which should be copied by - // CopyAllBefore() later if needed - m_nCopied++; - } - - return ch; - } - - // insert an extra character - void InsertFmtChar(wxChar ch) - { - if ( m_fmtOrig ) - { - // so far we haven't translated anything yet - CopyAllBefore(); - } - - m_fmt += ch; - } - - void CopyAllBefore() - { - wxASSERT_MSG( m_fmtOrig && m_fmt.empty(), _T("logic error") ); - - m_fmt = wxString(m_fmtOrig, m_nCopied); - - // we won't need it any longer - m_fmtOrig = NULL; - } - - static bool IsFlagChar(wxChar ch) - { - return ch == _T('-') || ch == _T('+') || - ch == _T('0') || ch == _T(' ') || ch == _T('#'); - } - - void SkipDigits(const wxChar **ptpc) - { - while ( **ptpc >= _T('0') && **ptpc <= _T('9') ) - CopyFmtChar(*(*ptpc)++); - } - - // the translated format - wxString m_fmt; - - // the original format - const wxChar *m_fmtOrig; - - // the number of characters already copied - size_t m_nCopied; -}; - -wxFormatConverter::wxFormatConverter(const wxChar *format) -{ - m_fmtOrig = format; - m_nCopied = 0; - - while ( *format ) - { - if ( CopyFmtChar(*format++) == _T('%') ) - { - // skip any flags - while ( IsFlagChar(*format) ) - CopyFmtChar(*format++); - - // and possible width - if ( *format == _T('*') ) - CopyFmtChar(*format++); - else - SkipDigits(&format); - - // precision? - if ( *format == _T('.') ) - { - CopyFmtChar(*format++); - if ( *format == _T('*') ) - CopyFmtChar(*format++); - else - SkipDigits(&format); - } - - // next we can have a size modifier - enum - { - Default, - Short, - Long - } size; - - switch ( *format ) - { - case _T('h'): - size = Short; - format++; - break; - - case _T('l'): - // "ll" has a different meaning! - if ( format[1] != _T('l') ) - { - size = Long; - format++; - break; - } - //else: fall through - - default: - size = Default; - } - - // and finally we should have the type - switch ( *format ) - { - case _T('C'): - case _T('S'): - // %C and %hC -> %c and %lC -> %lc - if ( size == Long ) - CopyFmtChar(_T('l')); - - InsertFmtChar(*format++ == _T('C') ? _T('c') : _T('s')); - break; - - case _T('c'): - case _T('s'): - // %c -> %lc but %hc stays %hc and %lc is still %lc - if ( size == Default) - InsertFmtChar(_T('l')); - // fall through - - default: - // nothing special to do - if ( size != Default ) - CopyFmtChar(*(format - 1)); - CopyFmtChar(*format++); - } - } - } -} - -#else // !wxNEED_PRINTF_CONVERSION - // no conversion necessary - #define wxFormatConverter(x) (x) -#endif // wxNEED_PRINTF_CONVERSION/!wxNEED_PRINTF_CONVERSION - -#ifdef __WXDEBUG__ -// For testing the format converter -wxString wxConvertFormat(const wxChar *format) -{ - return wxString(wxFormatConverter(format)); -} -#endif - -// ---------------------------------------------------------------------------- -// wxPrintf(), wxScanf() and relatives -// ---------------------------------------------------------------------------- - -#if defined(wxNEED_PRINTF_CONVERSION) || defined(wxNEED_WPRINTF) - -int wxDoScanf( const wxChar *format, ... ) -{ - va_list argptr; - va_start(argptr, format); - - int ret = vwscanf(wxFormatConverter(format), argptr ); - - va_end(argptr); - - return ret; -} - -int wxDoSscanf( const wxChar *str, const wxChar *format, ... ) -{ - va_list argptr; - va_start(argptr, format); - - int ret = vswscanf( str, wxFormatConverter(format), argptr ); - - va_end(argptr); - - return ret; -} - -int wxDoFscanf( FILE *stream, const wxChar *format, ... ) -{ - va_list argptr; - va_start(argptr, format); - int ret = vfwscanf(stream, wxFormatConverter(format), argptr); - - va_end(argptr); - - return ret; -} - -int wxDoPrintf( const wxChar *format, ... ) -{ - va_list argptr; - va_start(argptr, format); - - int ret = vwprintf( wxFormatConverter(format), argptr ); - - va_end(argptr); - - return ret; -} - -#ifndef wxSnprintf -int wxDoSnprintf( wxChar *str, size_t size, const wxChar *format, ... ) -{ - va_list argptr; - va_start(argptr, format); - - int ret = vswprintf( str, size, wxFormatConverter(format), argptr ); - - // VsnprintfTestCase reveals that glibc's implementation of vswprintf - // doesn't nul terminate on truncation. - str[size - 1] = 0; - - va_end(argptr); - - return ret; -} -#endif // wxSnprintf - -int wxDoSprintf( wxChar *str, const wxChar *format, ... ) -{ - va_list argptr; - va_start(argptr, format); - - // note that wxString::FormatV() uses wxVsnprintf(), not wxSprintf(), so - // it's safe to implement this one in terms of it - wxString s(wxString::FormatV(format, argptr)); - wxStrcpy(str, s); - - va_end(argptr); - - return s.length(); -} - -int wxDoFprintf( FILE *stream, const wxChar *format, ... ) -{ - va_list argptr; - va_start( argptr, format ); - - int ret = vfwprintf( stream, wxFormatConverter(format), argptr ); - - va_end(argptr); - - return ret; -} - -int wxVsscanf( const wxChar *str, const wxChar *format, va_list argptr ) -{ - return vswscanf( str, wxFormatConverter(format), argptr ); -} - -int wxVfprintf( FILE *stream, const wxChar *format, va_list argptr ) -{ - return vfwprintf( stream, wxFormatConverter(format), argptr ); -} - -int wxVprintf( const wxChar *format, va_list argptr ) -{ - return vwprintf( wxFormatConverter(format), argptr ); -} - -#ifndef wxVsnprintf -int wxVsnprintf( wxChar *str, size_t size, const wxChar *format, va_list argptr ) -{ - return vswprintf( str, size, wxFormatConverter(format), argptr ); -} -#endif // wxVsnprintf - -int wxVsprintf( wxChar *str, const wxChar *format, va_list argptr ) -{ - // same as for wxSprintf() - return vswprintf(str, INT_MAX / 4, wxFormatConverter(format), argptr); -} - -#endif // wxNEED_PRINTF_CONVERSION - -#if wxUSE_WCHAR_T - -// ---------------------------------------------------------------------------- -// ctype.h stuff (currently unused) -// ---------------------------------------------------------------------------- - -#if defined(__WIN32__) && defined(wxNEED_WX_CTYPE_H) -inline WORD wxMSW_ctype(wxChar ch) -{ - WORD ret; - GetStringTypeEx(LOCALE_USER_DEFAULT, CT_CTYPE1, &ch, 1, &ret); - return ret; -} - -WXDLLEXPORT int wxIsalnum(wxChar ch) { return IsCharAlphaNumeric(ch); } -WXDLLEXPORT int wxIsalpha(wxChar ch) { return IsCharAlpha(ch); } -WXDLLEXPORT int wxIscntrl(wxChar ch) { return wxMSW_ctype(ch) & C1_CNTRL; } -WXDLLEXPORT int wxIsdigit(wxChar ch) { return wxMSW_ctype(ch) & C1_DIGIT; } -WXDLLEXPORT int wxIsgraph(wxChar ch) { return wxMSW_ctype(ch) & (C1_DIGIT|C1_PUNCT|C1_ALPHA); } -WXDLLEXPORT int wxIslower(wxChar ch) { return IsCharLower(ch); } -WXDLLEXPORT int wxIsprint(wxChar ch) { return wxMSW_ctype(ch) & (C1_DIGIT|C1_SPACE|C1_PUNCT|C1_ALPHA); } -WXDLLEXPORT int wxIspunct(wxChar ch) { return wxMSW_ctype(ch) & C1_PUNCT; } -WXDLLEXPORT int wxIsspace(wxChar ch) { return wxMSW_ctype(ch) & C1_SPACE; } -WXDLLEXPORT int wxIsupper(wxChar ch) { return IsCharUpper(ch); } -WXDLLEXPORT int wxIsxdigit(wxChar ch) { return wxMSW_ctype(ch) & C1_XDIGIT; } -WXDLLEXPORT int wxTolower(wxChar ch) { return (wxChar)CharLower((LPTSTR)(ch)); } -WXDLLEXPORT int wxToupper(wxChar ch) { return (wxChar)CharUpper((LPTSTR)(ch)); } -#endif - -#ifdef wxNEED_WX_MBSTOWCS - -WXDLLEXPORT size_t wxMbstowcs (wchar_t * out, const char * in, size_t outlen) -{ - if (!out) - { - size_t outsize = 0; - while(*in++) - outsize++; - return outsize; - } - - const char* origin = in; - - while (outlen-- && *in) - { - *out++ = (wchar_t) *in++; - } - - *out = '\0'; - - return in - origin; -} - -WXDLLEXPORT size_t wxWcstombs (char * out, const wchar_t * in, size_t outlen) -{ - if (!out) - { - size_t outsize = 0; - while(*in++) - outsize++; - return outsize; - } - - const wchar_t* origin = in; - - while (outlen-- && *in) - { - *out++ = (char) *in++; - } - - *out = '\0'; - - return in - origin; -} - -#endif // wxNEED_WX_MBSTOWCS - -#if defined(wxNEED_WX_CTYPE_H) - -#include - -#define cfalnumset CFCharacterSetGetPredefined(kCFCharacterSetAlphaNumeric) -#define cfalphaset CFCharacterSetGetPredefined(kCFCharacterSetLetter) -#define cfcntrlset CFCharacterSetGetPredefined(kCFCharacterSetControl) -#define cfdigitset CFCharacterSetGetPredefined(kCFCharacterSetDecimalDigit) -//CFCharacterSetRef cfgraphset = kCFCharacterSetControl && !' ' -#define cflowerset CFCharacterSetGetPredefined(kCFCharacterSetLowercaseLetter) -//CFCharacterSetRef cfprintset = !kCFCharacterSetControl -#define cfpunctset CFCharacterSetGetPredefined(kCFCharacterSetPunctuation) -#define cfspaceset CFCharacterSetGetPredefined(kCFCharacterSetWhitespaceAndNewline) -#define cfupperset CFCharacterSetGetPredefined(kCFCharacterSetUppercaseLetter) - -WXDLLEXPORT int wxIsalnum(wxChar ch) { return CFCharacterSetIsCharacterMember(cfalnumset, ch); } -WXDLLEXPORT int wxIsalpha(wxChar ch) { return CFCharacterSetIsCharacterMember(cfalphaset, ch); } -WXDLLEXPORT int wxIscntrl(wxChar ch) { return CFCharacterSetIsCharacterMember(cfcntrlset, ch); } -WXDLLEXPORT int wxIsdigit(wxChar ch) { return CFCharacterSetIsCharacterMember(cfdigitset, ch); } -WXDLLEXPORT int wxIsgraph(wxChar ch) { return !CFCharacterSetIsCharacterMember(cfcntrlset, ch) && ch != ' '; } -WXDLLEXPORT int wxIslower(wxChar ch) { return CFCharacterSetIsCharacterMember(cflowerset, ch); } -WXDLLEXPORT int wxIsprint(wxChar ch) { return !CFCharacterSetIsCharacterMember(cfcntrlset, ch); } -WXDLLEXPORT int wxIspunct(wxChar ch) { return CFCharacterSetIsCharacterMember(cfpunctset, ch); } -WXDLLEXPORT int wxIsspace(wxChar ch) { return CFCharacterSetIsCharacterMember(cfspaceset, ch); } -WXDLLEXPORT int wxIsupper(wxChar ch) { return CFCharacterSetIsCharacterMember(cfupperset, ch); } -WXDLLEXPORT int wxIsxdigit(wxChar ch) { return wxIsdigit(ch) || (ch>='a' && ch<='f') || (ch>='A' && ch<='F'); } -WXDLLEXPORT int wxTolower(wxChar ch) { return (wxChar)tolower((char)(ch)); } -WXDLLEXPORT int wxToupper(wxChar ch) { return (wxChar)toupper((char)(ch)); } - -#endif // wxNEED_WX_CTYPE_H - -#ifndef wxStrdupA - -WXDLLEXPORT char *wxStrdupA(const char *s) -{ - return strcpy((char *)malloc(strlen(s) + 1), s); -} - -#endif // wxStrdupA - -#ifndef wxStrdupW - -WXDLLEXPORT wchar_t * wxStrdupW(const wchar_t *pwz) -{ - size_t size = (wxWcslen(pwz) + 1) * sizeof(wchar_t); - wchar_t *ret = (wchar_t *) malloc(size); - memcpy(ret, pwz, size); - return ret; -} - -#endif // wxStrdupW - -#ifndef wxStricmp -int WXDLLEXPORT wxStricmp(const wxChar *psz1, const wxChar *psz2) -{ - register wxChar c1, c2; - do { - c1 = wxTolower(*psz1++); - c2 = wxTolower(*psz2++); - } while ( c1 && (c1 == c2) ); - return c1 - c2; -} -#endif - -#ifndef wxStricmp -int WXDLLEXPORT wxStrnicmp(const wxChar *s1, const wxChar *s2, size_t n) -{ - // initialize the variables just to suppress stupid gcc warning - register wxChar c1 = 0, c2 = 0; - while (n && ((c1 = wxTolower(*s1)) == (c2 = wxTolower(*s2)) ) && c1) n--, s1++, s2++; - if (n) { - if (c1 < c2) return -1; - if (c1 > c2) return 1; - } - return 0; -} -#endif - -#ifndef wxSetlocale -WXDLLEXPORT wxWCharBuffer wxSetlocale(int category, const wxChar *locale) -{ - char *localeOld = setlocale(category, wxConvLibc.cWX2MB(locale)); - - return wxWCharBuffer(wxConvLibc.cMB2WC(localeOld)); -} -#endif - -#if wxUSE_WCHAR_T && !defined(HAVE_WCSLEN) -WXDLLEXPORT size_t wxWcslen(const wchar_t *s) -{ - size_t n = 0; - while ( *s++ ) - n++; - - return n; -} -#endif - -// ---------------------------------------------------------------------------- -// string.h functions -// ---------------------------------------------------------------------------- - -#ifdef wxNEED_WX_STRING_H - -// RN: These need to be c externed for the regex lib -#ifdef __cplusplus -extern "C" { -#endif - -WXDLLEXPORT wxChar * wxStrcat(wxChar *dest, const wxChar *src) -{ - wxChar *ret = dest; - while (*dest) dest++; - while ((*dest++ = *src++)); - return ret; -} - -WXDLLEXPORT const wxChar * wxStrchr(const wxChar *s, wxChar c) -{ - // be careful here as the terminating NUL makes part of the string - while ( *s != c ) - { - if ( !*s++ ) - return NULL; - } - - return s; -} - -WXDLLEXPORT int wxStrcmp(const wxChar *s1, const wxChar *s2) -{ - while ((*s1 == *s2) && *s1) s1++, s2++; - if ((wxUChar)*s1 < (wxUChar)*s2) return -1; - if ((wxUChar)*s1 > (wxUChar)*s2) return 1; - return 0; -} - -WXDLLEXPORT wxChar * wxStrcpy(wxChar *dest, const wxChar *src) -{ - wxChar *ret = dest; - while ((*dest++ = *src++)); - return ret; -} - -WXDLLEXPORT size_t wxStrlen_(const wxChar *s) -{ - size_t n = 0; - while ( *s++ ) - n++; - - return n; -} - - -WXDLLEXPORT wxChar * wxStrncat(wxChar *dest, const wxChar *src, size_t n) -{ - wxChar *ret = dest; - while (*dest) dest++; - while (n && (*dest++ = *src++)) n--; - return ret; -} - -WXDLLEXPORT int wxStrncmp(const wxChar *s1, const wxChar *s2, size_t n) -{ - while (n && (*s1 == *s2) && *s1) n--, s1++, s2++; - if (n) { - if ((wxUChar)*s1 < (wxUChar)*s2) return -1; - if ((wxUChar)*s1 > (wxUChar)*s2) return 1; - } - return 0; -} - -WXDLLEXPORT wxChar * wxStrncpy(wxChar *dest, const wxChar *src, size_t n) -{ - wxChar *ret = dest; - while (n && (*dest++ = *src++)) n--; - while (n) *dest++=0, n--; // the docs specify padding with zeroes - return ret; -} - -WXDLLEXPORT const wxChar * wxStrpbrk(const wxChar *s, const wxChar *accept) -{ - while (*s && !wxStrchr(accept, *s)) - s++; - - return *s ? s : NULL; -} - -WXDLLEXPORT const wxChar * wxStrrchr(const wxChar *s, wxChar c) -{ - const wxChar *ret = NULL; - do - { - if ( *s == c ) - ret = s; - s++; - } - while ( *s ); - - return ret; -} - -WXDLLEXPORT size_t wxStrspn(const wxChar *s, const wxChar *accept) -{ - size_t len = 0; - while (wxStrchr(accept, *s++)) len++; - return len; -} - -WXDLLEXPORT const wxChar *wxStrstr(const wxChar *haystack, const wxChar *needle) -{ - wxASSERT_MSG( needle != NULL, _T("NULL argument in wxStrstr") ); - - // VZ: this is not exactly the most efficient string search algorithm... - - const size_t len = wxStrlen(needle); - - while ( const wxChar *fnd = wxStrchr(haystack, *needle) ) - { - if ( !wxStrncmp(fnd, needle, len) ) - return fnd; - - haystack = fnd + 1; - } - - return NULL; -} - -#ifdef __cplusplus -} -#endif - -WXDLLEXPORT double wxStrtod(const wxChar *nptr, wxChar **endptr) -{ - const wxChar *start = nptr; - - // FIXME: only correct for C locale - while (wxIsspace(*nptr)) nptr++; - if (*nptr == wxT('+') || *nptr == wxT('-')) nptr++; - while (wxIsdigit(*nptr)) nptr++; - if (*nptr == wxT('.')) { - nptr++; - while (wxIsdigit(*nptr)) nptr++; - } - if (*nptr == wxT('E') || *nptr == wxT('e')) { - nptr++; - if (*nptr == wxT('+') || *nptr == wxT('-')) nptr++; - while (wxIsdigit(*nptr)) nptr++; - } - - wxString data(nptr, nptr-start); - wxWX2MBbuf dat = data.mb_str(wxConvLibc); - char *rdat = wxMBSTRINGCAST dat; - double ret = strtod(dat, &rdat); - - if (endptr) *endptr = (wxChar *)(start + (rdat - (const char *)dat)); - - return ret; -} - -WXDLLEXPORT long int wxStrtol(const wxChar *nptr, wxChar **endptr, int base) -{ - const wxChar *start = nptr; - - // FIXME: only correct for C locale - while (wxIsspace(*nptr)) nptr++; - if (*nptr == wxT('+') || *nptr == wxT('-')) nptr++; - if (((base == 0) || (base == 16)) && - (nptr[0] == wxT('0') && nptr[1] == wxT('x'))) { - nptr += 2; - base = 16; - } - else if ((base == 0) && (nptr[0] == wxT('0'))) base = 8; - else if (base == 0) base = 10; - - while ((wxIsdigit(*nptr) && (*nptr - wxT('0') < base)) || - (wxIsalpha(*nptr) && (wxToupper(*nptr) - wxT('A') + 10 < base))) nptr++; - - wxString data(start, nptr-start); - wxWX2MBbuf dat = data.mb_str(wxConvLibc); - char *rdat = wxMBSTRINGCAST dat; - long int ret = strtol(dat, &rdat, base); - - if (endptr) *endptr = (wxChar *)(start + (rdat - (const char *)dat)); - - return ret; -} - -WXDLLEXPORT unsigned long int wxStrtoul(const wxChar *nptr, wxChar **endptr, int base) -{ - return (unsigned long int) wxStrtol(nptr, endptr, base); -} - -#endif // wxNEED_WX_STRING_H - -#ifdef wxNEED_WX_STDIO_H -WXDLLEXPORT FILE * wxFopen(const wxChar *path, const wxChar *mode) -{ - char mode_buffer[10]; - for (size_t i = 0; i < wxStrlen(mode)+1; i++) - mode_buffer[i] = (char) mode[i]; - - return fopen( wxConvFile.cWX2MB(path), mode_buffer ); -} - -WXDLLEXPORT FILE * wxFreopen(const wxChar *path, const wxChar *mode, FILE *stream) -{ - char mode_buffer[10]; - for (size_t i = 0; i < wxStrlen(mode)+1; i++) - mode_buffer[i] = (char) mode[i]; - - return freopen( wxConvFile.cWX2MB(path), mode_buffer, stream ); -} - -WXDLLEXPORT int wxRemove(const wxChar *path) -{ - return remove( wxConvFile.cWX2MB(path) ); -} - -WXDLLEXPORT int wxRename(const wxChar *oldpath, const wxChar *newpath) -{ - return rename( wxConvFile.cWX2MB(oldpath), wxConvFile.cWX2MB(newpath) ); -} -#endif - -#ifndef wxAtof -double WXDLLEXPORT wxAtof(const wxChar *psz) -{ -#ifdef __WXWINCE__ - double d; - wxString str(psz); - if (str.ToDouble(& d)) - return d; - - return 0.0; -#else - return atof(wxConvLibc.cWX2MB(psz)); -#endif -} -#endif - -#ifdef wxNEED_WX_STDLIB_H -int WXDLLEXPORT wxAtoi(const wxChar *psz) -{ - return atoi(wxConvLibc.cWX2MB(psz)); -} - -long WXDLLEXPORT wxAtol(const wxChar *psz) -{ - return atol(wxConvLibc.cWX2MB(psz)); -} - -wxChar * WXDLLEXPORT wxGetenv(const wxChar *name) -{ -#if wxUSE_UNICODE - // NB: buffer returned by getenv() is allowed to be overwritten next - // time getenv() is called, so it is OK to use static string - // buffer to hold the data. - static wxWCharBuffer value((wxChar*)NULL); - value = wxConvLibc.cMB2WX(getenv(wxConvLibc.cWX2MB(name))); - return value.data(); -#else - return getenv(name); -#endif -} - -int WXDLLEXPORT wxSystem(const wxChar *psz) -{ - return system(wxConvLibc.cWX2MB(psz)); -} - -#endif // wxNEED_WX_STDLIB_H - -#ifdef wxNEED_WX_TIME_H -WXDLLEXPORT size_t -wxStrftime(wxChar *s, size_t maxsize, const wxChar *fmt, const struct tm *tm) -{ - if ( !maxsize ) - return 0; - - wxCharBuffer buf(maxsize); - - wxCharBuffer bufFmt(wxConvLibc.cWX2MB(fmt)); - if ( !bufFmt ) - return 0; - - size_t ret = strftime(buf.data(), maxsize, bufFmt, tm); - if ( !ret ) - return 0; - - wxWCharBuffer wbuf = wxConvLibc.cMB2WX(buf); - if ( !wbuf ) - return 0; - - wxStrncpy(s, wbuf, maxsize); - return wxStrlen(s); -} -#endif // wxNEED_WX_TIME_H - -#ifndef wxCtime -WXDLLEXPORT wxChar *wxCtime(const time_t *timep) -{ - // normally the string is 26 chars but give one more in case some broken - // DOS compiler decides to use "\r\n" instead of "\n" at the end - static wxChar buf[27]; - - // ctime() is guaranteed to return a string containing only ASCII - // characters, as its format is always the same for any locale - wxStrncpy(buf, wxString::FromAscii(ctime(timep)), WXSIZEOF(buf)); - buf[WXSIZEOF(buf) - 1] = _T('\0'); - - return buf; -} -#endif // wxCtime - -#endif // wxUSE_WCHAR_T - -// ---------------------------------------------------------------------------- -// functions which we may need even if !wxUSE_WCHAR_T -// ---------------------------------------------------------------------------- - -#ifndef wxStrtok - -WXDLLEXPORT wxChar * wxStrtok(wxChar *psz, const wxChar *delim, wxChar **save_ptr) -{ - if (!psz) - { - psz = *save_ptr; - if ( !psz ) - return NULL; - } - - psz += wxStrspn(psz, delim); - if (!*psz) - { - *save_ptr = (wxChar *)NULL; - return (wxChar *)NULL; - } - - wxChar *ret = psz; - psz = wxStrpbrk(psz, delim); - if (!psz) - { - *save_ptr = (wxChar*)NULL; - } - else - { - *psz = wxT('\0'); - *save_ptr = psz + 1; - } - - return ret; -} - -#endif // wxStrtok - -// ---------------------------------------------------------------------------- -// missing C RTL functions -// ---------------------------------------------------------------------------- - -#ifdef wxNEED_STRDUP - -char *strdup(const char *s) -{ - char *dest = (char*) malloc( strlen( s ) + 1 ) ; - if ( dest ) - strcpy( dest , s ) ; - return dest ; -} -#endif // wxNEED_STRDUP - -#if defined(__WXWINCE__) && (_WIN32_WCE <= 211) - -void *calloc( size_t num, size_t size ) -{ - void** ptr = (void **)malloc(num * size); - memset( ptr, 0, num * size); - return ptr; -} - -#endif // __WXWINCE__ <= 211 - -#ifdef __WXWINCE__ - -int wxRemove(const wxChar *path) -{ - return ::DeleteFile(path) == 0; -} - -#endif - -// ---------------------------------------------------------------------------- -// wxUniChar -// ---------------------------------------------------------------------------- - -/* static */ -wxUniChar::unicode_type wxUniChar::From8bit(char c) -{ - // all supported charsets have the first 128 characters same as ASCII: - if ( (unsigned char)c < 0x80 ) - return c; - - wchar_t buf[2]; - if ( wxConvLibc.ToWChar(buf, 2, &c, 1) != 2 ) - return wxT('?'); // FIXME-UTF8: what to use as failure character? - return buf[0]; -} - -/* static */ -char wxUniChar::To8bit(wxUniChar::unicode_type c) -{ - // all supported charsets have the first 128 characters same as ASCII: - if ( c < 0x80 ) - return c; - - wchar_t in = c; - char buf[2]; - if ( wxConvLibc.FromWChar(buf, 2, &in, 1) != 2 ) - return '?'; // FIXME-UTF8: what to use as failure character? - return buf[0]; -} -- 2.45.2