enable wxFontMapper in wxDFB port

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44288 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2007-01-22 14:05:07 +00:00
parent 47b6ebde09
commit c3a58b249e
14 changed files with 216 additions and 47 deletions

View File

@ -3466,6 +3466,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS = \
monodll_fontcmn.o \
monodll_fontenumcmn.o \
monodll_fontmap.o \
monodll_fontutilcmn.o \
monodll_framecmn.o \
monodll_gaugecmn.o \
monodll_gbsizer.o \
@ -3641,6 +3642,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \
monodll_fontcmn.o \
monodll_fontenumcmn.o \
monodll_fontmap.o \
monodll_fontutilcmn.o \
monodll_framecmn.o \
monodll_gaugecmn.o \
monodll_gbsizer.o \
@ -5247,6 +5249,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 = \
monolib_fontcmn.o \
monolib_fontenumcmn.o \
monolib_fontmap.o \
monolib_fontutilcmn.o \
monolib_framecmn.o \
monolib_gaugecmn.o \
monolib_gbsizer.o \
@ -5422,6 +5425,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \
monolib_fontcmn.o \
monolib_fontenumcmn.o \
monolib_fontmap.o \
monolib_fontutilcmn.o \
monolib_framecmn.o \
monolib_gaugecmn.o \
monolib_gbsizer.o \
@ -7258,6 +7262,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 = \
coredll_fontcmn.o \
coredll_fontenumcmn.o \
coredll_fontmap.o \
coredll_fontutilcmn.o \
coredll_framecmn.o \
coredll_gaugecmn.o \
coredll_gbsizer.o \
@ -7433,6 +7438,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \
coredll_fontcmn.o \
coredll_fontenumcmn.o \
coredll_fontmap.o \
coredll_fontutilcmn.o \
coredll_framecmn.o \
coredll_gaugecmn.o \
coredll_gbsizer.o \
@ -8713,6 +8719,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 = \
corelib_fontcmn.o \
corelib_fontenumcmn.o \
corelib_fontmap.o \
corelib_fontutilcmn.o \
corelib_framecmn.o \
corelib_gaugecmn.o \
corelib_gbsizer.o \
@ -8888,6 +8895,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \
corelib_fontcmn.o \
corelib_fontenumcmn.o \
corelib_fontmap.o \
corelib_fontutilcmn.o \
corelib_framecmn.o \
corelib_gaugecmn.o \
corelib_gbsizer.o \
@ -16157,6 +16165,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_USE_GUI_1@monodll_fontmap.o: $(srcdir)/src/common/fontmap.cpp $(MONODLL_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fontmap.cpp
@COND_USE_GUI_1@monodll_fontutilcmn.o: $(srcdir)/src/common/fontutilcmn.cpp $(MONODLL_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fontutilcmn.cpp
@COND_USE_GUI_1@monodll_framecmn.o: $(srcdir)/src/common/framecmn.cpp $(MONODLL_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/framecmn.cpp
@ -20276,6 +20287,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_USE_GUI_1@monolib_fontmap.o: $(srcdir)/src/common/fontmap.cpp $(MONOLIB_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fontmap.cpp
@COND_USE_GUI_1@monolib_fontutilcmn.o: $(srcdir)/src/common/fontutilcmn.cpp $(MONOLIB_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fontutilcmn.cpp
@COND_USE_GUI_1@monolib_framecmn.o: $(srcdir)/src/common/framecmn.cpp $(MONOLIB_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/framecmn.cpp
@ -24740,6 +24754,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
@COND_USE_GUI_1@coredll_fontmap.o: $(srcdir)/src/common/fontmap.cpp $(COREDLL_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/fontmap.cpp
@COND_USE_GUI_1@coredll_fontutilcmn.o: $(srcdir)/src/common/fontutilcmn.cpp $(COREDLL_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/fontutilcmn.cpp
@COND_USE_GUI_1@coredll_framecmn.o: $(srcdir)/src/common/framecmn.cpp $(COREDLL_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/framecmn.cpp
@ -27695,6 +27712,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
@COND_USE_GUI_1@corelib_fontmap.o: $(srcdir)/src/common/fontmap.cpp $(CORELIB_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/fontmap.cpp
@COND_USE_GUI_1@corelib_fontutilcmn.o: $(srcdir)/src/common/fontutilcmn.cpp $(CORELIB_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/fontutilcmn.cpp
@COND_USE_GUI_1@corelib_framecmn.o: $(srcdir)/src/common/framecmn.cpp $(CORELIB_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/framecmn.cpp

View File

@ -599,6 +599,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/common/fontcmn.cpp
src/common/fontenumcmn.cpp
src/common/fontmap.cpp
src/common/fontutilcmn.cpp
src/common/framecmn.cpp
src/common/gaugecmn.cpp
src/common/gbsizer.cpp

View File

@ -1451,6 +1451,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_fontcmn.obj \
$(OBJS)\monodll_fontenumcmn.obj \
$(OBJS)\monodll_fontmap.obj \
$(OBJS)\monodll_fontutilcmn.obj \
$(OBJS)\monodll_framecmn.obj \
$(OBJS)\monodll_gaugecmn.obj \
$(OBJS)\monodll_gbsizer.obj \
@ -1676,6 +1677,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_fontcmn.obj \
$(OBJS)\monodll_fontenumcmn.obj \
$(OBJS)\monodll_fontmap.obj \
$(OBJS)\monodll_fontutilcmn.obj \
$(OBJS)\monodll_framecmn.obj \
$(OBJS)\monodll_gaugecmn.obj \
$(OBJS)\monodll_gbsizer.obj \
@ -2067,6 +2069,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_fontcmn.obj \
$(OBJS)\monolib_fontenumcmn.obj \
$(OBJS)\monolib_fontmap.obj \
$(OBJS)\monolib_fontutilcmn.obj \
$(OBJS)\monolib_framecmn.obj \
$(OBJS)\monolib_gaugecmn.obj \
$(OBJS)\monolib_gbsizer.obj \
@ -2292,6 +2295,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_fontcmn.obj \
$(OBJS)\monolib_fontenumcmn.obj \
$(OBJS)\monolib_fontmap.obj \
$(OBJS)\monolib_fontutilcmn.obj \
$(OBJS)\monolib_framecmn.obj \
$(OBJS)\monolib_gaugecmn.obj \
$(OBJS)\monolib_gbsizer.obj \
@ -2591,6 +2595,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_fontcmn.obj \
$(OBJS)\coredll_fontenumcmn.obj \
$(OBJS)\coredll_fontmap.obj \
$(OBJS)\coredll_fontutilcmn.obj \
$(OBJS)\coredll_framecmn.obj \
$(OBJS)\coredll_gaugecmn.obj \
$(OBJS)\coredll_gbsizer.obj \
@ -2816,6 +2821,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_fontcmn.obj \
$(OBJS)\coredll_fontenumcmn.obj \
$(OBJS)\coredll_fontmap.obj \
$(OBJS)\coredll_fontutilcmn.obj \
$(OBJS)\coredll_framecmn.obj \
$(OBJS)\coredll_gaugecmn.obj \
$(OBJS)\coredll_gbsizer.obj \
@ -3042,6 +3048,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_fontcmn.obj \
$(OBJS)\corelib_fontenumcmn.obj \
$(OBJS)\corelib_fontmap.obj \
$(OBJS)\corelib_fontutilcmn.obj \
$(OBJS)\corelib_framecmn.obj \
$(OBJS)\corelib_gaugecmn.obj \
$(OBJS)\corelib_gbsizer.obj \
@ -3267,6 +3274,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_fontcmn.obj \
$(OBJS)\corelib_fontenumcmn.obj \
$(OBJS)\corelib_fontmap.obj \
$(OBJS)\corelib_fontutilcmn.obj \
$(OBJS)\corelib_framecmn.obj \
$(OBJS)\corelib_gaugecmn.obj \
$(OBJS)\corelib_gbsizer.obj \
@ -5989,6 +5997,11 @@ $(OBJS)\monodll_fontmap.obj: ..\..\src\common\fontmap.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_fontutilcmn.obj: ..\..\src\common\fontutilcmn.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_framecmn.obj: ..\..\src\common\framecmn.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@ -7986,6 +7999,11 @@ $(OBJS)\monolib_fontmap.obj: ..\..\src\common\fontmap.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_fontutilcmn.obj: ..\..\src\common\fontutilcmn.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_framecmn.obj: ..\..\src\common\framecmn.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@ -10007,6 +10025,11 @@ $(OBJS)\coredll_fontmap.obj: ..\..\src\common\fontmap.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_fontutilcmn.obj: ..\..\src\common\fontutilcmn.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_framecmn.obj: ..\..\src\common\framecmn.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
@ -11282,6 +11305,11 @@ $(OBJS)\corelib_fontmap.obj: ..\..\src\common\fontmap.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_fontutilcmn.obj: ..\..\src\common\fontutilcmn.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_framecmn.obj: ..\..\src\common\framecmn.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**

View File

@ -1461,6 +1461,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_fontcmn.o \
$(OBJS)\monodll_fontenumcmn.o \
$(OBJS)\monodll_fontmap.o \
$(OBJS)\monodll_fontutilcmn.o \
$(OBJS)\monodll_framecmn.o \
$(OBJS)\monodll_gaugecmn.o \
$(OBJS)\monodll_gbsizer.o \
@ -1688,6 +1689,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_fontcmn.o \
$(OBJS)\monodll_fontenumcmn.o \
$(OBJS)\monodll_fontmap.o \
$(OBJS)\monodll_fontutilcmn.o \
$(OBJS)\monodll_framecmn.o \
$(OBJS)\monodll_gaugecmn.o \
$(OBJS)\monodll_gbsizer.o \
@ -2083,6 +2085,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_fontcmn.o \
$(OBJS)\monolib_fontenumcmn.o \
$(OBJS)\monolib_fontmap.o \
$(OBJS)\monolib_fontutilcmn.o \
$(OBJS)\monolib_framecmn.o \
$(OBJS)\monolib_gaugecmn.o \
$(OBJS)\monolib_gbsizer.o \
@ -2310,6 +2313,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_fontcmn.o \
$(OBJS)\monolib_fontenumcmn.o \
$(OBJS)\monolib_fontmap.o \
$(OBJS)\monolib_fontutilcmn.o \
$(OBJS)\monolib_framecmn.o \
$(OBJS)\monolib_gaugecmn.o \
$(OBJS)\monolib_gbsizer.o \
@ -2623,6 +2627,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_fontcmn.o \
$(OBJS)\coredll_fontenumcmn.o \
$(OBJS)\coredll_fontmap.o \
$(OBJS)\coredll_fontutilcmn.o \
$(OBJS)\coredll_framecmn.o \
$(OBJS)\coredll_gaugecmn.o \
$(OBJS)\coredll_gbsizer.o \
@ -2850,6 +2855,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_fontcmn.o \
$(OBJS)\coredll_fontenumcmn.o \
$(OBJS)\coredll_fontmap.o \
$(OBJS)\coredll_fontutilcmn.o \
$(OBJS)\coredll_framecmn.o \
$(OBJS)\coredll_gaugecmn.o \
$(OBJS)\coredll_gbsizer.o \
@ -3082,6 +3088,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_fontcmn.o \
$(OBJS)\corelib_fontenumcmn.o \
$(OBJS)\corelib_fontmap.o \
$(OBJS)\corelib_fontutilcmn.o \
$(OBJS)\corelib_framecmn.o \
$(OBJS)\corelib_gaugecmn.o \
$(OBJS)\corelib_gbsizer.o \
@ -3309,6 +3316,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_fontcmn.o \
$(OBJS)\corelib_fontenumcmn.o \
$(OBJS)\corelib_fontmap.o \
$(OBJS)\corelib_fontutilcmn.o \
$(OBJS)\corelib_framecmn.o \
$(OBJS)\corelib_gaugecmn.o \
$(OBJS)\corelib_gbsizer.o \
@ -6218,6 +6226,11 @@ $(OBJS)\monodll_fontmap.o: ../../src/common/fontmap.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_fontutilcmn.o: ../../src/common/fontutilcmn.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_framecmn.o: ../../src/common/framecmn.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@ -8315,6 +8328,11 @@ $(OBJS)\monolib_fontmap.o: ../../src/common/fontmap.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_fontutilcmn.o: ../../src/common/fontutilcmn.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_framecmn.o: ../../src/common/framecmn.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@ -10436,6 +10454,11 @@ $(OBJS)\coredll_fontmap.o: ../../src/common/fontmap.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\coredll_fontutilcmn.o: ../../src/common/fontutilcmn.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\coredll_framecmn.o: ../../src/common/framecmn.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
@ -11811,6 +11834,11 @@ $(OBJS)\corelib_fontmap.o: ../../src/common/fontmap.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\corelib_fontutilcmn.o: ../../src/common/fontutilcmn.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\corelib_framecmn.o: ../../src/common/framecmn.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<

View File

@ -1618,6 +1618,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_fontcmn.obj \
$(OBJS)\monodll_fontenumcmn.obj \
$(OBJS)\monodll_fontmap.obj \
$(OBJS)\monodll_fontutilcmn.obj \
$(OBJS)\monodll_framecmn.obj \
$(OBJS)\monodll_gaugecmn.obj \
$(OBJS)\monodll_gbsizer.obj \
@ -1843,6 +1844,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_fontcmn.obj \
$(OBJS)\monodll_fontenumcmn.obj \
$(OBJS)\monodll_fontmap.obj \
$(OBJS)\monodll_fontutilcmn.obj \
$(OBJS)\monodll_framecmn.obj \
$(OBJS)\monodll_gaugecmn.obj \
$(OBJS)\monodll_gbsizer.obj \
@ -2240,6 +2242,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_fontcmn.obj \
$(OBJS)\monolib_fontenumcmn.obj \
$(OBJS)\monolib_fontmap.obj \
$(OBJS)\monolib_fontutilcmn.obj \
$(OBJS)\monolib_framecmn.obj \
$(OBJS)\monolib_gaugecmn.obj \
$(OBJS)\monolib_gbsizer.obj \
@ -2465,6 +2468,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_fontcmn.obj \
$(OBJS)\monolib_fontenumcmn.obj \
$(OBJS)\monolib_fontmap.obj \
$(OBJS)\monolib_fontutilcmn.obj \
$(OBJS)\monolib_framecmn.obj \
$(OBJS)\monolib_gaugecmn.obj \
$(OBJS)\monolib_gbsizer.obj \
@ -2794,6 +2798,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_fontcmn.obj \
$(OBJS)\coredll_fontenumcmn.obj \
$(OBJS)\coredll_fontmap.obj \
$(OBJS)\coredll_fontutilcmn.obj \
$(OBJS)\coredll_framecmn.obj \
$(OBJS)\coredll_gaugecmn.obj \
$(OBJS)\coredll_gbsizer.obj \
@ -3019,6 +3024,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_fontcmn.obj \
$(OBJS)\coredll_fontenumcmn.obj \
$(OBJS)\coredll_fontmap.obj \
$(OBJS)\coredll_fontutilcmn.obj \
$(OBJS)\coredll_framecmn.obj \
$(OBJS)\coredll_gaugecmn.obj \
$(OBJS)\coredll_gbsizer.obj \
@ -3251,6 +3257,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_fontcmn.obj \
$(OBJS)\corelib_fontenumcmn.obj \
$(OBJS)\corelib_fontmap.obj \
$(OBJS)\corelib_fontutilcmn.obj \
$(OBJS)\corelib_framecmn.obj \
$(OBJS)\corelib_gaugecmn.obj \
$(OBJS)\corelib_gbsizer.obj \
@ -3476,6 +3483,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_fontcmn.obj \
$(OBJS)\corelib_fontenumcmn.obj \
$(OBJS)\corelib_fontmap.obj \
$(OBJS)\corelib_fontutilcmn.obj \
$(OBJS)\corelib_framecmn.obj \
$(OBJS)\corelib_gaugecmn.obj \
$(OBJS)\corelib_gbsizer.obj \
@ -6322,6 +6330,11 @@ $(OBJS)\monodll_fontmap.obj: ..\..\src\common\fontmap.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_fontutilcmn.obj: ..\..\src\common\fontutilcmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_framecmn.obj: ..\..\src\common\framecmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@ -8319,6 +8332,11 @@ $(OBJS)\monolib_fontmap.obj: ..\..\src\common\fontmap.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_fontutilcmn.obj: ..\..\src\common\fontutilcmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_framecmn.obj: ..\..\src\common\framecmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@ -10340,6 +10358,11 @@ $(OBJS)\coredll_fontmap.obj: ..\..\src\common\fontmap.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_fontutilcmn.obj: ..\..\src\common\fontutilcmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_framecmn.obj: ..\..\src\common\framecmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@ -11615,6 +11638,11 @@ $(OBJS)\corelib_fontmap.obj: ..\..\src\common\fontmap.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_fontutilcmn.obj: ..\..\src\common\fontutilcmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_framecmn.obj: ..\..\src\common\framecmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**

View File

@ -344,6 +344,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_fontcmn.obj &
$(OBJS)\monodll_fontenumcmn.obj &
$(OBJS)\monodll_fontmap.obj &
$(OBJS)\monodll_fontutilcmn.obj &
$(OBJS)\monodll_framecmn.obj &
$(OBJS)\monodll_gaugecmn.obj &
$(OBJS)\monodll_gbsizer.obj &
@ -571,6 +572,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_fontcmn.obj &
$(OBJS)\monodll_fontenumcmn.obj &
$(OBJS)\monodll_fontmap.obj &
$(OBJS)\monodll_fontutilcmn.obj &
$(OBJS)\monodll_framecmn.obj &
$(OBJS)\monodll_gaugecmn.obj &
$(OBJS)\monodll_gbsizer.obj &
@ -970,6 +972,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_fontcmn.obj &
$(OBJS)\monolib_fontenumcmn.obj &
$(OBJS)\monolib_fontmap.obj &
$(OBJS)\monolib_fontutilcmn.obj &
$(OBJS)\monolib_framecmn.obj &
$(OBJS)\monolib_gaugecmn.obj &
$(OBJS)\monolib_gbsizer.obj &
@ -1197,6 +1200,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_fontcmn.obj &
$(OBJS)\monolib_fontenumcmn.obj &
$(OBJS)\monolib_fontmap.obj &
$(OBJS)\monolib_fontutilcmn.obj &
$(OBJS)\monolib_framecmn.obj &
$(OBJS)\monolib_gaugecmn.obj &
$(OBJS)\monolib_gbsizer.obj &
@ -1517,6 +1521,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = &
$(OBJS)\coredll_fontcmn.obj &
$(OBJS)\coredll_fontenumcmn.obj &
$(OBJS)\coredll_fontmap.obj &
$(OBJS)\coredll_fontutilcmn.obj &
$(OBJS)\coredll_framecmn.obj &
$(OBJS)\coredll_gaugecmn.obj &
$(OBJS)\coredll_gbsizer.obj &
@ -1744,6 +1749,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = &
$(OBJS)\coredll_fontcmn.obj &
$(OBJS)\coredll_fontenumcmn.obj &
$(OBJS)\coredll_fontmap.obj &
$(OBJS)\coredll_fontutilcmn.obj &
$(OBJS)\coredll_framecmn.obj &
$(OBJS)\coredll_gaugecmn.obj &
$(OBJS)\coredll_gbsizer.obj &
@ -1978,6 +1984,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = &
$(OBJS)\corelib_fontcmn.obj &
$(OBJS)\corelib_fontenumcmn.obj &
$(OBJS)\corelib_fontmap.obj &
$(OBJS)\corelib_fontutilcmn.obj &
$(OBJS)\corelib_framecmn.obj &
$(OBJS)\corelib_gaugecmn.obj &
$(OBJS)\corelib_gbsizer.obj &
@ -2205,6 +2212,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = &
$(OBJS)\corelib_fontcmn.obj &
$(OBJS)\corelib_fontenumcmn.obj &
$(OBJS)\corelib_fontmap.obj &
$(OBJS)\corelib_fontutilcmn.obj &
$(OBJS)\corelib_framecmn.obj &
$(OBJS)\corelib_gaugecmn.obj &
$(OBJS)\corelib_gbsizer.obj &
@ -6448,6 +6456,11 @@ $(OBJS)\monodll_fontmap.obj : .AUTODEPEND ..\..\src\common\fontmap.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monodll_fontutilcmn.obj : .AUTODEPEND ..\..\src\common\fontutilcmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monodll_framecmn.obj : .AUTODEPEND ..\..\src\common\framecmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@ -8545,6 +8558,11 @@ $(OBJS)\monolib_fontmap.obj : .AUTODEPEND ..\..\src\common\fontmap.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monolib_fontutilcmn.obj : .AUTODEPEND ..\..\src\common\fontutilcmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monolib_framecmn.obj : .AUTODEPEND ..\..\src\common\framecmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@ -10666,6 +10684,11 @@ $(OBJS)\coredll_fontmap.obj : .AUTODEPEND ..\..\src\common\fontmap.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\coredll_fontutilcmn.obj : .AUTODEPEND ..\..\src\common\fontutilcmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\coredll_framecmn.obj : .AUTODEPEND ..\..\src\common\framecmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
@ -12041,6 +12064,11 @@ $(OBJS)\corelib_fontmap.obj : .AUTODEPEND ..\..\src\common\fontmap.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\corelib_fontutilcmn.obj : .AUTODEPEND ..\..\src\common\fontutilcmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\corelib_framecmn.obj : .AUTODEPEND ..\..\src\common\framecmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<

View File

@ -614,6 +614,10 @@ SOURCE=..\..\src\common\fontpickercmn.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\common\fontutilcmn.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\common\framecmn.cpp
# End Source File
# Begin Source File

View File

@ -49,10 +49,7 @@ $ ./configure --with-directfb \
--disable-datepick \
--disable-hyperlink \
--disable-aui \
--disable-richtext \
--disable-fontmap \
--disable-xrc \
--disable-html
--disable-richtext
$ make

View File

@ -59,9 +59,6 @@
#define __WXBASE__
#endif
/* include the feature test macros */
#include "wx/features.h"
/* suppress some Visual C++ warnings */
#ifdef __VISUALC__
/* the only "real" warning here is 4244 but there are just too many of them */
@ -2842,6 +2839,10 @@ typedef const void* WXWidget;
#endif
/* __WXMSW__ */
/* include the feature test macros */
#include "wx/features.h"
/* --------------------------------------------------------------------------- */
/* macro to define a class without copy ctor nor assignment operator */
/* --------------------------------------------------------------------------- */

View File

@ -53,13 +53,10 @@ struct WXDLLEXPORT wxNativeEncodingInfo
#elif defined(_WX_X_FONTLIKE)
wxString xregistry,
xencoding;
#elif defined(__WXGTK20__)
// No way to specify this in Pango as this
// seems to be handled internally.
#elif defined(wxHAS_UTF8_FONTS)
// ports using UTF-8 for text don't need encoding information for fonts
#elif defined(__WXMGL__)
int mglEncoding;
#elif defined(__WXDFB__)
// DirectFB uses UTF-8 internally, doesn't use font encodings
#else
#error "Unsupported toolkit"
#endif

View File

@ -60,5 +60,11 @@
#undef wxHAS_REGEX_ADVANCED
#endif
/* Pango-based ports and wxDFB use UTF-8 for text and font encodings
* internally and so their fonts can handle any encodings: */
#if wxUSE_PANGO || defined(__WXDFB__)
#define wxHAS_UTF8_FONTS
#endif
#endif /* _WX_FEATURES_H_ */

View File

@ -16,11 +16,6 @@
#include "wx/fontenc.h"
#include "wx/arrstr.h"
#if wxUSE_PANGO || defined(__WXDFB__)
// defined if the port uses only UTF-8 font encodings internally
#define wxHAS_UTF8_FONTS
#endif
// ----------------------------------------------------------------------------
// wxFontEnumerator enumerates all available fonts on the system or only the
// fonts with given attributes

View File

@ -0,0 +1,66 @@
/////////////////////////////////////////////////////////////////////////////
// Name: src/common/fontutilcmn.cpp
// Purpose: Font helper functions common for all ports
// Author: Vaclav Slavik
// Modified by:
// Created: 2006-12-20
// RCS-ID: $Id$
// Copyright: (c) Vadim Zeitlin, Vaclav Slavik
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// ============================================================================
// declarations
// ============================================================================
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif
#include "wx/fontutil.h"
#include "wx/encinfo.h"
// ============================================================================
// implementation
// ============================================================================
#ifdef wxHAS_UTF8_FONTS
// ----------------------------------------------------------------------------
// wxNativeEncodingInfo
// ----------------------------------------------------------------------------
bool wxNativeEncodingInfo::FromString(const wxString& WXUNUSED(s))
{
return false;
}
wxString wxNativeEncodingInfo::ToString() const
{
return wxEmptyString;
}
bool wxTestFontEncoding(const wxNativeEncodingInfo& WXUNUSED(info))
{
return true;
}
bool wxGetNativeFontEncoding(wxFontEncoding encoding,
wxNativeEncodingInfo *info)
{
// all encodings are available because we translate text in any encoding to
// UTF-8 internally anyhow
info->facename.clear();
info->encoding = encoding;
return true;
}
#endif // wxHAS_UTF8_FONTS

View File

@ -340,36 +340,6 @@ wxString wxNativeFontInfo::ToUserString() const
return ToString();
}
// ----------------------------------------------------------------------------
// wxNativeEncodingInfo
// ----------------------------------------------------------------------------
bool wxNativeEncodingInfo::FromString(const wxString& WXUNUSED(s))
{
return false;
}
wxString wxNativeEncodingInfo::ToString() const
{
return wxEmptyString;
}
bool wxTestFontEncoding(const wxNativeEncodingInfo& WXUNUSED(info))
{
return true;
}
bool wxGetNativeFontEncoding(wxFontEncoding encoding,
wxNativeEncodingInfo *info)
{
// all encodings are available in GTK+ 2 because we translate text in any
// encoding to UTF-8 internally anyhow
info->facename.clear();
info->encoding = encoding;
return true;
}
#else // GTK+ 1.x
#ifdef __X__