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

Applied patch [ 1164975 ] xml handler for wxStaticPicture

Browse Source 
David Norris


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33189 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2005-03-30 17:14:41 +00:00
parent 2a1f999faf
commit 92c45b12e2
9 changed files with 154 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/build/gizmos/gizmos.bkl
View File

@@ -12,6 +12,7 @@
multicell.cpp
splittree.cpp
statpict.cpp
xh_statpict.cpp
</set>
<headers template="wx_contrib_headers">
@@ -22,6 +23,7 @@
wx/gizmos/multicell.h
wx/gizmos/splittree.h
wx/gizmos/statpict.h
wx/gizmos/xh_statpict.h
wx/gizmos/gizmos.h
</files>
</headers>

4
contrib/build/gizmos/gizmos.dsp
View File

@@ -542,6 +542,10 @@ SOURCE=../../src/gizmos\..\..\..\src\msw\version.rc
!ENDIF
# End Source File
# Begin Source File
SOURCE=../../src/gizmos\xh_statpict.cpp
# End Source File
# End Group
# End Target

12
contrib/build/gizmos/makefile.bcc
View File

@@ -42,7 +42,8 @@ GIZMOSDLL_OBJECTS = \
$(OBJS)\gizmosdll_ledctrl.obj \
$(OBJS)\gizmosdll_multicell.obj \
$(OBJS)\gizmosdll_splittree.obj \
$(OBJS)\gizmosdll_statpict.obj
$(OBJS)\gizmosdll_statpict.obj \
$(OBJS)\gizmosdll_xh_statpict.obj
GIZMOSLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
$(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
@@ -57,7 +58,8 @@ GIZMOSLIB_OBJECTS = \
$(OBJS)\gizmoslib_ledctrl.obj \
$(OBJS)\gizmoslib_multicell.obj \
$(OBJS)\gizmoslib_splittree.obj \
$(OBJS)\gizmoslib_statpict.obj
$(OBJS)\gizmoslib_statpict.obj \
$(OBJS)\gizmoslib_xh_statpict.obj
### Conditionally set variables: ###
@@ -279,6 +281,9 @@ $(OBJS)\gizmosdll_splittree.obj: ../../src/gizmos\splittree.cpp
$(OBJS)\gizmosdll_statpict.obj: ../../src/gizmos\statpict.cpp
$(CXX) -q -c -P -o$@ $(GIZMOSDLL_CXXFLAGS) $**
$(OBJS)\gizmosdll_xh_statpict.obj: ../../src/gizmos\xh_statpict.cpp
$(CXX) -q -c -P -o$@ $(GIZMOSDLL_CXXFLAGS) $**
$(OBJS)\gizmoslib_dummy.obj: ../../src/gizmos\..\..\..\src\msw\dummy.cpp
$(CXX) -q -c -P -o$@ $(GIZMOSLIB_CXXFLAGS) -H $**
@@ -300,3 +305,6 @@ $(OBJS)\gizmoslib_splittree.obj: ../../src/gizmos\splittree.cpp
$(OBJS)\gizmoslib_statpict.obj: ../../src/gizmos\statpict.cpp
$(CXX) -q -c -P -o$@ $(GIZMOSLIB_CXXFLAGS) $**
$(OBJS)\gizmoslib_xh_statpict.obj: ../../src/gizmos\xh_statpict.cpp
$(CXX) -q -c -P -o$@ $(GIZMOSLIB_CXXFLAGS) $**

12
contrib/build/gizmos/makefile.gcc
View File

@@ -35,7 +35,8 @@ GIZMOSDLL_OBJECTS = \
$(OBJS)\gizmosdll_ledctrl.o \
$(OBJS)\gizmosdll_multicell.o \
$(OBJS)\gizmosdll_splittree.o \
$(OBJS)\gizmosdll_statpict.o
$(OBJS)\gizmosdll_statpict.o \
$(OBJS)\gizmosdll_xh_statpict.o
GIZMOSLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
$(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
@@ -50,7 +51,8 @@ GIZMOSLIB_OBJECTS = \
$(OBJS)\gizmoslib_ledctrl.o \
$(OBJS)\gizmoslib_multicell.o \
$(OBJS)\gizmoslib_splittree.o \
$(OBJS)\gizmoslib_statpict.o
$(OBJS)\gizmoslib_statpict.o \
$(OBJS)\gizmoslib_xh_statpict.o
### Conditionally set variables: ###
@@ -268,6 +270,9 @@ $(OBJS)\gizmosdll_splittree.o: ../../src/gizmos/splittree.cpp
$(OBJS)\gizmosdll_statpict.o: ../../src/gizmos/statpict.cpp
$(CXX) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $<
$(OBJS)\gizmosdll_xh_statpict.o: ../../src/gizmos/xh_statpict.cpp
$(CXX) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $<
$(OBJS)\gizmoslib_dummy.o: ../../src/gizmos/../../../src/msw/dummy.cpp
$(CXX) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $<
@@ -289,6 +294,9 @@ $(OBJS)\gizmoslib_splittree.o: ../../src/gizmos/splittree.cpp
$(OBJS)\gizmoslib_statpict.o: ../../src/gizmos/statpict.cpp
$(CXX) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $<
$(OBJS)\gizmoslib_xh_statpict.o: ../../src/gizmos/xh_statpict.cpp
$(CXX) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $<
.PHONY: all clean

12
contrib/build/gizmos/makefile.vc
View File

@@ -37,7 +37,8 @@ GIZMOSDLL_OBJECTS = \
$(OBJS)\gizmosdll_ledctrl.obj \
$(OBJS)\gizmosdll_multicell.obj \
$(OBJS)\gizmosdll_splittree.obj \
$(OBJS)\gizmosdll_statpict.obj
$(OBJS)\gizmosdll_statpict.obj \
$(OBJS)\gizmosdll_xh_statpict.obj
GIZMOSLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_22)$(__DEBUGRUNTIME_17) /DWIN32 \
$(__DEBUGINFO_1) \
/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.pdb \
@@ -54,7 +55,8 @@ GIZMOSLIB_OBJECTS = \
$(OBJS)\gizmoslib_ledctrl.obj \
$(OBJS)\gizmoslib_multicell.obj \
$(OBJS)\gizmoslib_splittree.obj \
$(OBJS)\gizmoslib_statpict.obj
$(OBJS)\gizmoslib_statpict.obj \
$(OBJS)\gizmoslib_xh_statpict.obj
### Conditionally set variables: ###
@@ -383,6 +385,9 @@ $(OBJS)\gizmosdll_splittree.obj: ../../src/gizmos\splittree.cpp
$(OBJS)\gizmosdll_statpict.obj: ../../src/gizmos\statpict.cpp
$(CXX) /c /nologo /TP /Fo$@ $(GIZMOSDLL_CXXFLAGS) $**
$(OBJS)\gizmosdll_xh_statpict.obj: ../../src/gizmos\xh_statpict.cpp
$(CXX) /c /nologo /TP /Fo$@ $(GIZMOSDLL_CXXFLAGS) $**
$(OBJS)\gizmoslib_dummy.obj: ../../src/gizmos\..\..\..\src\msw\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(GIZMOSLIB_CXXFLAGS) /Ycwx/wxprec.h $**
@@ -404,3 +409,6 @@ $(OBJS)\gizmoslib_splittree.obj: ../../src/gizmos\splittree.cpp
$(OBJS)\gizmoslib_statpict.obj: ../../src/gizmos\statpict.cpp
$(CXX) /c /nologo /TP /Fo$@ $(GIZMOSLIB_CXXFLAGS) $**
$(OBJS)\gizmoslib_xh_statpict.obj: ../../src/gizmos\xh_statpict.cpp
$(CXX) /c /nologo /TP /Fo$@ $(GIZMOSLIB_CXXFLAGS) $**

12
contrib/build/gizmos/makefile.wat
View File

@@ -235,7 +235,8 @@ GIZMOSDLL_OBJECTS = &
$(OBJS)\gizmosdll_ledctrl.obj &
$(OBJS)\gizmosdll_multicell.obj &
$(OBJS)\gizmosdll_splittree.obj &
$(OBJS)\gizmosdll_statpict.obj
$(OBJS)\gizmosdll_statpict.obj &
$(OBJS)\gizmosdll_xh_statpict.obj
GIZMOSLIB_CXXFLAGS = $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
@@ -250,7 +251,8 @@ GIZMOSLIB_OBJECTS = &
$(OBJS)\gizmoslib_ledctrl.obj &
$(OBJS)\gizmoslib_multicell.obj &
$(OBJS)\gizmoslib_splittree.obj &
$(OBJS)\gizmoslib_statpict.obj
$(OBJS)\gizmoslib_statpict.obj &
$(OBJS)\gizmoslib_xh_statpict.obj
all : $(OBJS)
@@ -317,6 +319,9 @@ $(OBJS)\gizmosdll_splittree.obj : .AUTODEPEND ../../src/gizmos\splittree.cpp
$(OBJS)\gizmosdll_statpict.obj : .AUTODEPEND ../../src/gizmos\statpict.cpp
$(CXX) -zq -fo=$^@ $(GIZMOSDLL_CXXFLAGS) $<
$(OBJS)\gizmosdll_xh_statpict.obj : .AUTODEPEND ../../src/gizmos\xh_statpict.cpp
$(CXX) -zq -fo=$^@ $(GIZMOSDLL_CXXFLAGS) $<
$(OBJS)\gizmoslib_dummy.obj : .AUTODEPEND ../../src/gizmos\..\..\..\src\msw\dummy.cpp
$(CXX) -zq -fo=$^@ $(GIZMOSLIB_CXXFLAGS) $<
@@ -338,3 +343,6 @@ $(OBJS)\gizmoslib_splittree.obj : .AUTODEPEND ../../src/gizmos\splittree.cpp
$(OBJS)\gizmoslib_statpict.obj : .AUTODEPEND ../../src/gizmos\statpict.cpp
$(CXX) -zq -fo=$^@ $(GIZMOSLIB_CXXFLAGS) $<
$(OBJS)\gizmoslib_xh_statpict.obj : .AUTODEPEND ../../src/gizmos\xh_statpict.cpp
$(CXX) -zq -fo=$^@ $(GIZMOSLIB_CXXFLAGS) $<