moving XRC to the core

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29232 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-09-20 19:15:54 +00:00
parent 3849327bce
commit a32f9aaf5f
24 changed files with 3551 additions and 362 deletions

View File

@@ -93,6 +93,11 @@ USE_GUI = 1
USE_HTML = 1 USE_HTML = 1
!endif !endif
# Build wxXRC library (USE_GUI must be 1)? [0,1]
!ifndef USE_XRC
USE_XRC = 1
!endif
# Build OpenGL canvas library (USE_GUI must be 1)? [0,1] # Build OpenGL canvas library (USE_GUI must be 1)? [0,1]
!ifndef USE_OPENGL !ifndef USE_OPENGL
USE_OPENGL = 0 USE_OPENGL = 0

View File

@@ -61,6 +61,9 @@ USE_GUI = 1
# Build wxHTML library (USE_GUI must be 1)? [0,1] # Build wxHTML library (USE_GUI must be 1)? [0,1]
USE_HTML = 1 USE_HTML = 1
# Build wxXRC library (USE_GUI must be 1)? [0,1]
USE_XRC = 1
# Build OpenGL canvas library (USE_GUI must be 1)? [0,1] # Build OpenGL canvas library (USE_GUI must be 1)? [0,1]
USE_OPENGL = 0 USE_OPENGL = 0

View File

@@ -65,6 +65,9 @@ USE_GUI = 1
# Build wxHTML library (USE_GUI must be 1)? [0,1] # Build wxHTML library (USE_GUI must be 1)? [0,1]
USE_HTML = 1 USE_HTML = 1
# Build wxXRC library (USE_GUI must be 1)? [0,1]
USE_XRC = 1
# Build OpenGL canvas library (USE_GUI must be 1)? [0,1] # Build OpenGL canvas library (USE_GUI must be 1)? [0,1]
USE_OPENGL = 0 USE_OPENGL = 0

View File

@@ -58,6 +58,9 @@ USE_GUI = 1
# Build wxHTML library (USE_GUI must be 1)? [0,1] # Build wxHTML library (USE_GUI must be 1)? [0,1]
USE_HTML = 1 USE_HTML = 1
# Build wxXRC library (USE_GUI must be 1)? [0,1]
USE_XRC = 1
# Build OpenGL canvas library (USE_GUI must be 1)? [0,1] # Build OpenGL canvas library (USE_GUI must be 1)? [0,1]
USE_OPENGL = 0 USE_OPENGL = 0

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -170,6 +170,18 @@ Package=<4>
############################################################################### ###############################################################################
Project: "xrc"=wx_xrc.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "gl"=wx_gl.dsp - Package Owner=<4> Project: "gl"=wx_gl.dsp - Package Owner=<4>
Package=<5> Package=<5>

View File

@@ -1,4 +1,4 @@
# Microsoft Developer Studio Project File - Name="wx_adv" - Package Owner=<4> # Microsoft Developer Studio Project File - Name="adv" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00 # Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT ** # ** DO NOT EDIT **

View File

@@ -1,4 +1,4 @@
# Microsoft Developer Studio Project File - Name="wx_base" - Package Owner=<4> # Microsoft Developer Studio Project File - Name="base" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00 # Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT ** # ** DO NOT EDIT **
@@ -605,6 +605,10 @@ SOURCE=..\..\src\common\regex.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\src\common\sstream.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\common\stopwatch.cpp SOURCE=..\..\src\common\stopwatch.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -1231,6 +1235,10 @@ SOURCE=..\..\include\wx\snglinst.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\sstream.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\stack.h SOURCE=..\..\include\wx\stack.h
# End Source File # End Source File
# Begin Source File # Begin Source File

View File

@@ -1,4 +1,4 @@
# Microsoft Developer Studio Project File - Name="wx_core" - Package Owner=<4> # Microsoft Developer Studio Project File - Name="core" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00 # Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT ** # ** DO NOT EDIT **
@@ -8627,6 +8627,162 @@ SOURCE=..\..\include\wx\wxhtml.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\xrc\xh_all.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\xrc\xh_bmp.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\xrc\xh_bmpbt.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\xrc\xh_bttn.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\xrc\xh_cald.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\xrc\xh_chckb.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\xrc\xh_chckl.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\xrc\xh_choic.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\xrc\xh_combo.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\xrc\xh_dlg.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\xrc\xh_frame.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\xrc\xh_gauge.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\xrc\xh_gdctl.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\xrc\xh_html.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\xrc\xh_listb.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\xrc\xh_listc.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\xrc\xh_menu.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\xrc\xh_notbk.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\xrc\xh_panel.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\xrc\xh_radbt.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\xrc\xh_radbx.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\xrc\xh_scrol.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\xrc\xh_scwin.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\xrc\xh_sizer.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\xrc\xh_slidr.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\xrc\xh_spin.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\xrc\xh_split.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\xrc\xh_statbar.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\xrc\xh_stbmp.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\xrc\xh_stbox.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\xrc\xh_stlin.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\xrc\xh_sttxt.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\xrc\xh_text.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\xrc\xh_tglbtn.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\xrc\xh_toolb.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\xrc\xh_tree.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\xrc\xh_unkwn.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\xrc\xh_wizrd.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\xrc\xmlres.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\xpmdecod.h SOURCE=..\..\include\wx\xpmdecod.h
# End Source File # End Source File
# Begin Source File # Begin Source File

View File

@@ -1,4 +1,4 @@
# Microsoft Developer Studio Project File - Name="wx_dbgrid" - Package Owner=<4> # Microsoft Developer Studio Project File - Name="dbgrid" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00 # Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT ** # ** DO NOT EDIT **

View File

@@ -1,4 +1,4 @@
# Microsoft Developer Studio Project File - Name="wx_gl" - Package Owner=<4> # Microsoft Developer Studio Project File - Name="gl" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00 # Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT ** # ** DO NOT EDIT **

View File

@@ -1,4 +1,4 @@
# Microsoft Developer Studio Project File - Name="wx_html" - Package Owner=<4> # Microsoft Developer Studio Project File - Name="html" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00 # Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT ** # ** DO NOT EDIT **

View File

@@ -1,4 +1,4 @@
# Microsoft Developer Studio Project File - Name="wx_net" - Package Owner=<4> # Microsoft Developer Studio Project File - Name="net" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00 # Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT ** # ** DO NOT EDIT **

View File

@@ -1,4 +1,4 @@
# Microsoft Developer Studio Project File - Name="wx_odbc" - Package Owner=<4> # Microsoft Developer Studio Project File - Name="odbc" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00 # Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT ** # ** DO NOT EDIT **

View File

@@ -1,4 +1,4 @@
# Microsoft Developer Studio Project File - Name="wx_wxexpat" - Package Owner=<4> # Microsoft Developer Studio Project File - Name="wxexpat" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00 # Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT ** # ** DO NOT EDIT **

View File

@@ -1,4 +1,4 @@
# Microsoft Developer Studio Project File - Name="wx_wxjpeg" - Package Owner=<4> # Microsoft Developer Studio Project File - Name="wxjpeg" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00 # Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT ** # ** DO NOT EDIT **

View File

@@ -1,4 +1,4 @@
# Microsoft Developer Studio Project File - Name="wx_wxpng" - Package Owner=<4> # Microsoft Developer Studio Project File - Name="wxpng" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00 # Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT ** # ** DO NOT EDIT **

View File

@@ -1,4 +1,4 @@
# Microsoft Developer Studio Project File - Name="wx_wxregex" - Package Owner=<4> # Microsoft Developer Studio Project File - Name="wxregex" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00 # Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT ** # ** DO NOT EDIT **

View File

@@ -1,4 +1,4 @@
# Microsoft Developer Studio Project File - Name="wx_wxtiff" - Package Owner=<4> # Microsoft Developer Studio Project File - Name="wxtiff" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00 # Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT ** # ** DO NOT EDIT **

View File

@@ -1,4 +1,4 @@
# Microsoft Developer Studio Project File - Name="wx_wxzlib" - Package Owner=<4> # Microsoft Developer Studio Project File - Name="wxzlib" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00 # Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT ** # ** DO NOT EDIT **

View File

@@ -1,4 +1,4 @@
# Microsoft Developer Studio Project File - Name="wx_xml" - Package Owner=<4> # Microsoft Developer Studio Project File - Name="xml" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00 # Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT ** # ** DO NOT EDIT **