added support for ellipsization and markup in wxStaticText (modified patch 1629946)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45199 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-04-01 14:13:15 +00:00
parent 9d529fa05c
commit 39bc0347fd
35 changed files with 1387 additions and 280 deletions

View File

@@ -1525,6 +1525,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_sizer.o \
$(OBJS)\monodll_srchcmn.o \
$(OBJS)\monodll_statbar.o \
$(OBJS)\monodll_stattextcmn.o \
$(OBJS)\monodll_stockitem.o \
$(OBJS)\monodll_tbarbase.o \
$(OBJS)\monodll_textcmn.o \
@@ -1754,6 +1755,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_sizer.o \
$(OBJS)\monodll_srchcmn.o \
$(OBJS)\monodll_statbar.o \
$(OBJS)\monodll_stattextcmn.o \
$(OBJS)\monodll_stockitem.o \
$(OBJS)\monodll_tbarbase.o \
$(OBJS)\monodll_textcmn.o \
@@ -2153,6 +2155,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_sizer.o \
$(OBJS)\monolib_srchcmn.o \
$(OBJS)\monolib_statbar.o \
$(OBJS)\monolib_stattextcmn.o \
$(OBJS)\monolib_stockitem.o \
$(OBJS)\monolib_tbarbase.o \
$(OBJS)\monolib_textcmn.o \
@@ -2382,6 +2385,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_sizer.o \
$(OBJS)\monolib_srchcmn.o \
$(OBJS)\monolib_statbar.o \
$(OBJS)\monolib_stattextcmn.o \
$(OBJS)\monolib_stockitem.o \
$(OBJS)\monolib_tbarbase.o \
$(OBJS)\monolib_textcmn.o \
@@ -2711,6 +2715,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_sizer.o \
$(OBJS)\coredll_srchcmn.o \
$(OBJS)\coredll_statbar.o \
$(OBJS)\coredll_stattextcmn.o \
$(OBJS)\coredll_stockitem.o \
$(OBJS)\coredll_tbarbase.o \
$(OBJS)\coredll_textcmn.o \
@@ -2940,6 +2945,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_sizer.o \
$(OBJS)\coredll_srchcmn.o \
$(OBJS)\coredll_statbar.o \
$(OBJS)\coredll_stattextcmn.o \
$(OBJS)\coredll_stockitem.o \
$(OBJS)\coredll_tbarbase.o \
$(OBJS)\coredll_textcmn.o \
@@ -3174,6 +3180,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_sizer.o \
$(OBJS)\corelib_srchcmn.o \
$(OBJS)\corelib_statbar.o \
$(OBJS)\corelib_stattextcmn.o \
$(OBJS)\corelib_stockitem.o \
$(OBJS)\corelib_tbarbase.o \
$(OBJS)\corelib_textcmn.o \
@@ -3403,6 +3410,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_sizer.o \
$(OBJS)\corelib_srchcmn.o \
$(OBJS)\corelib_statbar.o \
$(OBJS)\corelib_stattextcmn.o \
$(OBJS)\corelib_stockitem.o \
$(OBJS)\corelib_tbarbase.o \
$(OBJS)\corelib_textcmn.o \
@@ -6635,6 +6643,11 @@ $(OBJS)\monodll_statbar.o: ../../src/common/statbar.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_stattextcmn.o: ../../src/common/stattextcmn.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_stockitem.o: ../../src/common/stockitem.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -8762,6 +8775,11 @@ $(OBJS)\monolib_statbar.o: ../../src/common/statbar.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_stattextcmn.o: ../../src/common/stattextcmn.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_stockitem.o: ../../src/common/stockitem.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -10928,6 +10946,11 @@ $(OBJS)\coredll_statbar.o: ../../src/common/statbar.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\coredll_stattextcmn.o: ../../src/common/stattextcmn.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\coredll_stockitem.o: ../../src/common/stockitem.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -12313,6 +12336,11 @@ $(OBJS)\corelib_statbar.o: ../../src/common/statbar.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\corelib_stattextcmn.o: ../../src/common/stattextcmn.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\corelib_stockitem.o: ../../src/common/stockitem.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<