Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add wxXLocale class and wxIsxxx_l() and wxToxxx_l() functions (heavily modified and extended patch 1874287)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51632 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-02-10 17:03:23 +00:00
parent 451c13c85c
commit 6e4ae332ac
38 changed files with 1108 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/bakefiles/files.bkl
View File

@@ -416,6 +416,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/common/wfstream.cpp
src/common/wxcrt.cpp
src/common/wxprintf.cpp
src/common/xlocale.cpp
src/common/xti.cpp
src/common/xtistrm.cpp
src/common/zipstrm.cpp
@@ -550,6 +551,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/wxcrtbase.h
wx/wxcrtvararg.h
wx/wxprec.h
wx/xlocale.h
wx/xti.h
wx/xtistrm.h
wx/zipstrm.h

16
build/msw/makefile.bcc
View File

@@ -377,6 +377,7 @@ MONODLL_OBJECTS = \
$(OBJS)\monodll_wfstream.obj \
$(OBJS)\monodll_wxcrt.obj \
$(OBJS)\monodll_wxprintf.obj \
$(OBJS)\monodll_xlocale.obj \
$(OBJS)\monodll_xti.obj \
$(OBJS)\monodll_xtistrm.obj \
$(OBJS)\monodll_zipstrm.obj \
@@ -514,6 +515,7 @@ MONOLIB_OBJECTS = \
$(OBJS)\monolib_wfstream.obj \
$(OBJS)\monolib_wxcrt.obj \
$(OBJS)\monolib_wxprintf.obj \
$(OBJS)\monolib_xlocale.obj \
$(OBJS)\monolib_xti.obj \
$(OBJS)\monolib_xtistrm.obj \
$(OBJS)\monolib_zipstrm.obj \
@@ -648,6 +650,7 @@ BASEDLL_OBJECTS = \
$(OBJS)\basedll_wfstream.obj \
$(OBJS)\basedll_wxcrt.obj \
$(OBJS)\basedll_wxprintf.obj \
$(OBJS)\basedll_xlocale.obj \
$(OBJS)\basedll_xti.obj \
$(OBJS)\basedll_xtistrm.obj \
$(OBJS)\basedll_zipstrm.obj \
@@ -766,6 +769,7 @@ BASELIB_OBJECTS = \
$(OBJS)\baselib_wfstream.obj \
$(OBJS)\baselib_wxcrt.obj \
$(OBJS)\baselib_wxprintf.obj \
$(OBJS)\baselib_xlocale.obj \
$(OBJS)\baselib_xti.obj \
$(OBJS)\baselib_xtistrm.obj \
$(OBJS)\baselib_zipstrm.obj \
@@ -5387,6 +5391,9 @@ $(OBJS)\monodll_wxcrt.obj: ..\..\src\common\wxcrt.cpp
$(OBJS)\monodll_wxprintf.obj: ..\..\src\common\wxprintf.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\wxprintf.cpp
$(OBJS)\monodll_xlocale.obj: ..\..\src\common\xlocale.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\xlocale.cpp
$(OBJS)\monodll_xti.obj: ..\..\src\common\xti.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\xti.cpp
@@ -7490,6 +7497,9 @@ $(OBJS)\monolib_wxcrt.obj: ..\..\src\common\wxcrt.cpp
$(OBJS)\monolib_wxprintf.obj: ..\..\src\common\wxprintf.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\wxprintf.cpp
$(OBJS)\monolib_xlocale.obj: ..\..\src\common\xlocale.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\xlocale.cpp
$(OBJS)\monolib_xti.obj: ..\..\src\common\xti.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\xti.cpp
@@ -9593,6 +9603,9 @@ $(OBJS)\basedll_wxcrt.obj: ..\..\src\common\wxcrt.cpp
$(OBJS)\basedll_wxprintf.obj: ..\..\src\common\wxprintf.cpp
$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\wxprintf.cpp
$(OBJS)\basedll_xlocale.obj: ..\..\src\common\xlocale.cpp
$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\xlocale.cpp
$(OBJS)\basedll_xti.obj: ..\..\src\common\xti.cpp
$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\xti.cpp
@@ -9896,6 +9909,9 @@ $(OBJS)\baselib_wxcrt.obj: ..\..\src\common\wxcrt.cpp
$(OBJS)\baselib_wxprintf.obj: ..\..\src\common\wxprintf.cpp
$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\wxprintf.cpp
$(OBJS)\baselib_xlocale.obj: ..\..\src\common\xlocale.cpp
$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\xlocale.cpp
$(OBJS)\baselib_xti.obj: ..\..\src\common\xti.cpp
$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\xti.cpp

16
build/msw/makefile.gcc
View File

@@ -364,6 +364,7 @@ MONODLL_OBJECTS = \
$(OBJS)\monodll_wfstream.o \
$(OBJS)\monodll_wxcrt.o \
$(OBJS)\monodll_wxprintf.o \
$(OBJS)\monodll_xlocale.o \
$(OBJS)\monodll_xti.o \
$(OBJS)\monodll_xtistrm.o \
$(OBJS)\monodll_zipstrm.o \
@@ -502,6 +503,7 @@ MONOLIB_OBJECTS = \
$(OBJS)\monolib_wfstream.o \
$(OBJS)\monolib_wxcrt.o \
$(OBJS)\monolib_wxprintf.o \
$(OBJS)\monolib_xlocale.o \
$(OBJS)\monolib_xti.o \
$(OBJS)\monolib_xtistrm.o \
$(OBJS)\monolib_zipstrm.o \
@@ -638,6 +640,7 @@ BASEDLL_OBJECTS = \
$(OBJS)\basedll_wfstream.o \
$(OBJS)\basedll_wxcrt.o \
$(OBJS)\basedll_wxprintf.o \
$(OBJS)\basedll_xlocale.o \
$(OBJS)\basedll_xti.o \
$(OBJS)\basedll_xtistrm.o \
$(OBJS)\basedll_zipstrm.o \
@@ -756,6 +759,7 @@ BASELIB_OBJECTS = \
$(OBJS)\baselib_wfstream.o \
$(OBJS)\baselib_wxcrt.o \
$(OBJS)\baselib_wxprintf.o \
$(OBJS)\baselib_xlocale.o \
$(OBJS)\baselib_xti.o \
$(OBJS)\baselib_xtistrm.o \
$(OBJS)\baselib_zipstrm.o \
@@ -5529,6 +5533,9 @@ $(OBJS)\monodll_wxcrt.o: ../../src/common/wxcrt.cpp
$(OBJS)\monodll_wxprintf.o: ../../src/common/wxprintf.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_xlocale.o: ../../src/common/xlocale.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_xti.o: ../../src/common/xti.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -7734,6 +7741,9 @@ $(OBJS)\monolib_wxcrt.o: ../../src/common/wxcrt.cpp
$(OBJS)\monolib_wxprintf.o: ../../src/common/wxprintf.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_xlocale.o: ../../src/common/xlocale.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_xti.o: ../../src/common/xti.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -9939,6 +9949,9 @@ $(OBJS)\basedll_wxcrt.o: ../../src/common/wxcrt.cpp
$(OBJS)\basedll_wxprintf.o: ../../src/common/wxprintf.cpp
$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\basedll_xlocale.o: ../../src/common/xlocale.cpp
$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\basedll_xti.o: ../../src/common/xti.cpp
$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -10242,6 +10255,9 @@ $(OBJS)\baselib_wxcrt.o: ../../src/common/wxcrt.cpp
$(OBJS)\baselib_wxprintf.o: ../../src/common/wxprintf.cpp
$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\baselib_xlocale.o: ../../src/common/xlocale.cpp
$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\baselib_xti.o: ../../src/common/xti.cpp
$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<

16
build/msw/makefile.vc
View File

@@ -379,6 +379,7 @@ MONODLL_OBJECTS = \
$(OBJS)\monodll_wfstream.obj \
$(OBJS)\monodll_wxcrt.obj \
$(OBJS)\monodll_wxprintf.obj \
$(OBJS)\monodll_xlocale.obj \
$(OBJS)\monodll_xti.obj \
$(OBJS)\monodll_xtistrm.obj \
$(OBJS)\monodll_zipstrm.obj \
@@ -521,6 +522,7 @@ MONOLIB_OBJECTS = \
$(OBJS)\monolib_wfstream.obj \
$(OBJS)\monolib_wxcrt.obj \
$(OBJS)\monolib_wxprintf.obj \
$(OBJS)\monolib_xlocale.obj \
$(OBJS)\monolib_xti.obj \
$(OBJS)\monolib_xtistrm.obj \
$(OBJS)\monolib_zipstrm.obj \
@@ -661,6 +663,7 @@ BASEDLL_OBJECTS = \
$(OBJS)\basedll_wfstream.obj \
$(OBJS)\basedll_wxcrt.obj \
$(OBJS)\basedll_wxprintf.obj \
$(OBJS)\basedll_xlocale.obj \
$(OBJS)\basedll_xti.obj \
$(OBJS)\basedll_xtistrm.obj \
$(OBJS)\basedll_zipstrm.obj \
@@ -784,6 +787,7 @@ BASELIB_OBJECTS = \
$(OBJS)\baselib_wfstream.obj \
$(OBJS)\baselib_wxcrt.obj \
$(OBJS)\baselib_wxprintf.obj \
$(OBJS)\baselib_xlocale.obj \
$(OBJS)\baselib_xti.obj \
$(OBJS)\baselib_xtistrm.obj \
$(OBJS)\baselib_zipstrm.obj \
@@ -5719,6 +5723,9 @@ $(OBJS)\monodll_wxcrt.obj: ..\..\src\common\wxcrt.cpp
$(OBJS)\monodll_wxprintf.obj: ..\..\src\common\wxprintf.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\wxprintf.cpp
$(OBJS)\monodll_xlocale.obj: ..\..\src\common\xlocale.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\xlocale.cpp
$(OBJS)\monodll_xti.obj: ..\..\src\common\xti.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\xti.cpp
@@ -7822,6 +7829,9 @@ $(OBJS)\monolib_wxcrt.obj: ..\..\src\common\wxcrt.cpp
$(OBJS)\monolib_wxprintf.obj: ..\..\src\common\wxprintf.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\wxprintf.cpp
$(OBJS)\monolib_xlocale.obj: ..\..\src\common\xlocale.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\xlocale.cpp
$(OBJS)\monolib_xti.obj: ..\..\src\common\xti.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\xti.cpp
@@ -9925,6 +9935,9 @@ $(OBJS)\basedll_wxcrt.obj: ..\..\src\common\wxcrt.cpp
$(OBJS)\basedll_wxprintf.obj: ..\..\src\common\wxprintf.cpp
$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\wxprintf.cpp
$(OBJS)\basedll_xlocale.obj: ..\..\src\common\xlocale.cpp
$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\xlocale.cpp
$(OBJS)\basedll_xti.obj: ..\..\src\common\xti.cpp
$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\xti.cpp
@@ -10228,6 +10241,9 @@ $(OBJS)\baselib_wxcrt.obj: ..\..\src\common\wxcrt.cpp
$(OBJS)\baselib_wxprintf.obj: ..\..\src\common\wxprintf.cpp
$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\wxprintf.cpp
$(OBJS)\baselib_xlocale.obj: ..\..\src\common\xlocale.cpp
$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\xlocale.cpp
$(OBJS)\baselib_xti.obj: ..\..\src\common\xti.cpp
$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\xti.cpp

16
build/msw/makefile.wat
View File

@@ -3314,6 +3314,7 @@ MONODLL_OBJECTS = &
$(OBJS)\monodll_wfstream.obj &
$(OBJS)\monodll_wxcrt.obj &
$(OBJS)\monodll_wxprintf.obj &
$(OBJS)\monodll_xlocale.obj &
$(OBJS)\monodll_xti.obj &
$(OBJS)\monodll_xtistrm.obj &
$(OBJS)\monodll_zipstrm.obj &
@@ -3451,6 +3452,7 @@ MONOLIB_OBJECTS = &
$(OBJS)\monolib_wfstream.obj &
$(OBJS)\monolib_wxcrt.obj &
$(OBJS)\monolib_wxprintf.obj &
$(OBJS)\monolib_xlocale.obj &
$(OBJS)\monolib_xti.obj &
$(OBJS)\monolib_xtistrm.obj &
$(OBJS)\monolib_zipstrm.obj &
@@ -3586,6 +3588,7 @@ BASEDLL_OBJECTS = &
$(OBJS)\basedll_wfstream.obj &
$(OBJS)\basedll_wxcrt.obj &
$(OBJS)\basedll_wxprintf.obj &
$(OBJS)\basedll_xlocale.obj &
$(OBJS)\basedll_xti.obj &
$(OBJS)\basedll_xtistrm.obj &
$(OBJS)\basedll_zipstrm.obj &
@@ -3704,6 +3707,7 @@ BASELIB_OBJECTS = &
$(OBJS)\baselib_wfstream.obj &
$(OBJS)\baselib_wxcrt.obj &
$(OBJS)\baselib_wxprintf.obj &
$(OBJS)\baselib_xlocale.obj &
$(OBJS)\baselib_xti.obj &
$(OBJS)\baselib_xtistrm.obj &
$(OBJS)\baselib_zipstrm.obj &
@@ -5761,6 +5765,9 @@ $(OBJS)\monodll_wxcrt.obj : .AUTODEPEND ..\..\src\common\wxcrt.cpp
$(OBJS)\monodll_wxprintf.obj : .AUTODEPEND ..\..\src\common\wxprintf.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_xlocale.obj : .AUTODEPEND ..\..\src\common\xlocale.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_xti.obj : .AUTODEPEND ..\..\src\common\xti.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -7966,6 +7973,9 @@ $(OBJS)\monolib_wxcrt.obj : .AUTODEPEND ..\..\src\common\wxcrt.cpp
$(OBJS)\monolib_wxprintf.obj : .AUTODEPEND ..\..\src\common\wxprintf.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_xlocale.obj : .AUTODEPEND ..\..\src\common\xlocale.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_xti.obj : .AUTODEPEND ..\..\src\common\xti.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -10171,6 +10181,9 @@ $(OBJS)\basedll_wxcrt.obj : .AUTODEPEND ..\..\src\common\wxcrt.cpp
$(OBJS)\basedll_wxprintf.obj : .AUTODEPEND ..\..\src\common\wxprintf.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
$(OBJS)\basedll_xlocale.obj : .AUTODEPEND ..\..\src\common\xlocale.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
$(OBJS)\basedll_xti.obj : .AUTODEPEND ..\..\src\common\xti.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
@@ -10474,6 +10487,9 @@ $(OBJS)\baselib_wxcrt.obj : .AUTODEPEND ..\..\src\common\wxcrt.cpp
$(OBJS)\baselib_wxprintf.obj : .AUTODEPEND ..\..\src\common\wxprintf.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
$(OBJS)\baselib_xlocale.obj : .AUTODEPEND ..\..\src\common\xlocale.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
$(OBJS)\baselib_xti.obj : .AUTODEPEND ..\..\src\common\xti.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<

8
build/msw/wx_base.dsp
View File

@@ -551,6 +551,10 @@ SOURCE=..\..\src\common\wxprintf.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\common\xlocale.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\common\xti.cpp
# End Source File
# Begin Source File
@@ -1507,6 +1511,10 @@ SOURCE=..\..\include\wx\wxprec.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\xlocale.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\xti.h
# End Source File
# Begin Source File

4
build/msw/wx_vc7_base.vcproj
View File

@@ -834,6 +834,8 @@
RelativePath="..\..\src\common\wxcrt.cpp"/>
<File
RelativePath="..\..\src\common\wxprintf.cpp"/>
<File
RelativePath="..\..\src\common\xlocale.cpp"/>
<File
RelativePath="..\..\src\common\xti.cpp"/>
<File
@@ -1374,6 +1376,8 @@
RelativePath="..\..\include\wx\wxcrtvararg.h"/>
<File
RelativePath="..\..\include\wx\wxprec.h"/>
<File
RelativePath="..\..\include\wx\xlocale.h"/>
<File
RelativePath="..\..\include\wx\xti.h"/>
<File

6
build/msw/wx_vc8_base.vcproj
View File

@@ -1080,6 +1080,9 @@
<File
RelativePath="..\..\src\common\wxprintf.cpp"
/>
<File
RelativePath="..\..\src\common\xlocale.cpp"
/>
<File
RelativePath="..\..\src\common\xti.cpp"
/>
@@ -1841,6 +1844,9 @@
<File
RelativePath="..\..\include\wx\wxprec.h"
/>
<File
RelativePath="..\..\include\wx\xlocale.h"
/>
<File
RelativePath="..\..\include\wx\xti.h"
/>