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

changed wxXML to XRC, wx/xml/*.h->wx/xrc/*.h

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10489 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2001-06-09 22:18:45 +00:00
parent 447002a131
commit 999d9a9f79
204 changed files with 2599 additions and 15844 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/utils/convertrc/makefile.b32
View File

@@ -8,7 +8,7 @@
# Makefile : Builds convert for 32-bit BC++
WXDIR = $(WXWIN)
EXTRALIBS=$(WXDIR)\lib\wxxml.lib
EXTRALIBS=$(WXDIR)\lib\wxxrc.lib
TARGET=wxconvert

2
contrib/utils/convertrc/makefile.g95
View File

@@ -10,7 +10,7 @@
WXDIR = ../../..
TARGET=wxconvert
EXTRALIBS=-lwxxml
EXTRALIBS=-lwxxrc
OBJECTS=convert.o rc2xml.o rc2wxr.o wxr2xml.o
include $(WXDIR)/src/makeprog.g95

4
contrib/utils/convertrc/makefile.vc
View File

@@ -18,9 +18,9 @@ PROGRAM=wxconvert
FINAL=0
!if "$(FINAL)" == "0"
EXTRALIBS=$(WXDIR)\lib\wxxmld.lib
EXTRALIBS=$(WXDIR)\lib\wxxrcd.lib
!else
EXTRALIBS=$(WXDIR)\lib\wxxml.lib
EXTRALIBS=$(WXDIR)\lib\wxxrc.lib
!endif
OBJECTS=convert.obj rc2xml.obj rc2wxr.obj wxr2xml.obj

2
contrib/utils/convertrc/makefile.wat
View File

@@ -6,7 +6,7 @@
WXDIR = $(%WXWIN)
PROGRAM = wxconvert
EXTRALIBS = $(WXDIR)\lib\wxxml.lib
EXTRALIBS = $(WXDIR)\lib\wxxrc.lib
OBJECTS=convert.obj rc2xml.obj rc2wxr.obj wxr2xml.obj
!include $(WXDIR)\src\makeprog.wat

2
contrib/utils/wxrc/Makefile.in
View File

@@ -9,7 +9,7 @@ PROGRAM=wxrc
OBJECTS=wxrc.o
APPEXTRALIBS=$(top_builddir)/lib/libwxxml.@WX_TARGET_LIBRARY_TYPE@
APPEXTRALIBS=$(top_builddir)/lib/libwxxrc.@WX_TARGET_LIBRARY_TYPE@
APPEXTRADEFS=-I$(top_srcdir)/contrib/include
include $(top_builddir)/src/makeprog.env

2
contrib/utils/wxrc/makefile.b32
View File

@@ -10,7 +10,7 @@
WXDIR = $(WXWIN)
TARGET=wxrc
EXTRALIBS=$(WXDIR)\lib\wxxml.lib
EXTRALIBS=$(WXDIR)\lib\wxxrc.lib
OBJECTS = $(TARGET).obj
!include $(WXDIR)\src\makeprog.b32

2
contrib/utils/wxrc/makefile.g95
View File

@@ -10,7 +10,7 @@
WXDIR = ../../..
TARGET=wxrc
EXTRALIBS=-lwxxml
EXTRALIBS=-lwxxrc
OBJECTS = $(TARGET).o
include $(WXDIR)/src/makeprog.g95

6
contrib/utils/wxrc/makefile.vc
View File

@@ -18,15 +18,15 @@ PROGRAM=wxrc
FINAL=0
!if "$(FINAL)" == "0"
EXTRALIBS=$(WXDIR)\lib\wxxmld.lib
EXTRALIBS=$(WXDIR)\lib\wxxrcd.lib
!endif
!if "$(FINAL)" == "1"
EXTRALIBS=$(WXDIR)\lib\wxxml.lib
EXTRALIBS=$(WXDIR)\lib\wxxrc.lib
!endif
!if "$(FINAL)" == "hybrid"
EXTRALIBS=$(WXDIR)\lib\wxxmlh.lib
EXTRALIBS=$(WXDIR)\lib\wxxrch.lib
!endif

2
contrib/utils/wxrc/makefile.wat
View File

@@ -6,7 +6,7 @@
WXDIR = $(%WXWIN)
PROGRAM = wxrc
EXTRALIBS = $(WXDIR)\lib\wxxml.lib
EXTRALIBS = $(WXDIR)\lib\wxxrc.lib
OBJECTS = $(PROGRAM).obj
!include $(WXDIR)\src\makeprog.wat

8
contrib/utils/wxrc/wxrc.cpp
View File

@@ -27,8 +27,8 @@
#endif
#include "wx/cmdline.h"
#include "wx/xml/xml.h"
#include "wx/xml/xmlio.h"
#include "wx/xrc/xml.h"
#include "wx/xrc/xmlio.h"
#include "wx/ffile.h"
#include "wx/wfstream.h"
@@ -358,8 +358,8 @@ void XmlResApp::MakePackageCPP(const wxArrayString& flist)
\
#include \"wx/filesys.h\"\n\
#include \"wx/fs_mem.h\"\n\
#include \"wx/xml/xmlres.h\"\n\
#include \"wx/xml/xh_all.h\"\n\
#include \"wx/xrc/xmlres.h\"\n\
#include \"wx/xrc/xh_all.h\"\n\
\n");
for (i = 0; i < flist.Count(); i++)

2
contrib/utils/wxrcedit/Makefile.in
View File

@@ -25,7 +25,7 @@ DATAFILES = df/break.df df/control.df df/menu_item.df df/notebookpage.df \
df/wxStaticLine.df df/wxStaticText.df df/wxTextCtrl.df \
df/wxToolBar.df df/wxTreeCtrl.df
APPEXTRALIBS=$(top_builddir)/lib/libwxxml.@WX_TARGET_LIBRARY_TYPE@
APPEXTRALIBS=$(top_builddir)/lib/libwxxrc.@WX_TARGET_LIBRARY_TYPE@
APPEXTRADEFS=-I$(top_srcdir)/contrib/include
include $(top_builddir)/src/makeprog.env

2
contrib/utils/wxrcedit/edapp.cpp
View File

@@ -25,7 +25,7 @@
#include "wx/wx.h"
#endif
#include "wx/xml/xml.h"
#include "wx/xrc/xml.h"
#include "wx/image.h"
#include "wx/wx.h"

4
contrib/utils/wxrcedit/editor.cpp
View File

@@ -19,8 +19,8 @@
#endif
#include "wx/wx.h"
#include "wx/xml/xml.h"
#include "wx/xml/xmlres.h"
#include "wx/xrc/xml.h"
#include "wx/xrc/xmlres.h"
#include "wx/splitter.h"
#include "wx/config.h"
#include "wx/dir.h"

2
contrib/utils/wxrcedit/makefile.b32
View File

@@ -10,7 +10,7 @@
WXDIR = $(WXWIN)
TARGET=wxrcedit
EXTRALIBS=$(WXDIR)\lib\wxxml.lib
EXTRALIBS=$(WXDIR)\lib\wxxrc.lib
OBJECTS=edapp.obj editor.obj nodehnd.obj xmlhelpr.obj preview.obj nodesdb.obj \
pe_basic.obj pe_adv.obj propedit.obj propframe.obj splittree.obj

2
contrib/utils/wxrcedit/makefile.g95
View File

@@ -10,7 +10,7 @@
WXDIR = ../../..
TARGET=wxrcedit
EXTRALIBS=-lwxxml
EXTRALIBS=-lwxxrc
OBJECTS=edapp.o editor.o nodehnd.o xmlhelpr.o preview.o nodesdb.o \
pe_basic.o pe_adv.o propedit.o propframe.o splittree.o
include $(WXDIR)/src/makeprog.g95

6
contrib/utils/wxrcedit/makefile.vc
View File

@@ -18,15 +18,15 @@ PROGRAM=wxrcedit
FINAL=0
!if "$(FINAL)" == "0"
EXTRALIBS=$(WXDIR)\lib\wxxmld.lib
EXTRALIBS=$(WXDIR)\lib\wxxrcd.lib
!endif
!if "$(FINAL)" == "1"
EXTRALIBS=$(WXDIR)\lib\wxxml.lib
EXTRALIBS=$(WXDIR)\lib\wxxrc.lib
!endif
!if "$(FINAL)" == "hybrid"
EXTRALIBS=$(WXDIR)\lib\wxxmlh.lib
EXTRALIBS=$(WXDIR)\lib\wxxrch.lib
!endif
OBJECTS=edapp.obj editor.obj nodehnd.obj xmlhelpr.obj preview.obj nodesdb.obj \

2
contrib/utils/wxrcedit/makefile.wat
View File

@@ -6,7 +6,7 @@
WXDIR = $(%WXWIN)
PROGRAM = wxrcedit
EXTRALIBS = $(WXDIR)\lib\wxxml.lib
EXTRALIBS = $(WXDIR)\lib\wxxrc.lib
OBJECTS=edapp.obj editor.obj nodehnd.obj xmlhelpr.obj preview.obj nodesdb.obj pe_basic.obj pe_adv.obj propedit.obj propframe.obj splittree.obj
!include $(WXDIR)\src\makeprog.wat

2
contrib/utils/wxrcedit/nodehnd.cpp
View File

@@ -18,7 +18,7 @@
#endif
#include "nodehnd.h"
#include "wx/xml/xml.h"
#include "wx/xrc/xml.h"
#include "wx/filefn.h"
#include "wx/wx.h"
#include "wx/arrimpl.cpp"

2
contrib/utils/wxrcedit/nodehnd.h
View File

@@ -22,7 +22,7 @@ class WXDLLEXPORT wxListCtrl;
class EditorFrame;
#include "wx/treectrl.h"
#include "wx/xml/xml.h"
#include "wx/xrc/xml.h"
#include "nodesdb.h"

2
contrib/utils/wxrcedit/pe_adv.cpp
View File

@@ -18,7 +18,7 @@
#endif
#include "wx/wx.h"
#include "wx/xml/xml.h"
#include "wx/xrc/xml.h"
#include "wx/tokenzr.h"
#include "wx/wx.h"
#include "wx/dialog.h"

2
contrib/utils/wxrcedit/pe_basic.cpp
View File

@@ -18,7 +18,7 @@
#endif
#include "wx/wx.h"
#include "wx/xml/xml.h"
#include "wx/xrc/xml.h"
#include "wx/tokenzr.h"
#include "pe_basic.h"
#include "xmlhelpr.h"

6
contrib/utils/wxrcedit/preview.cpp
View File

@@ -18,8 +18,8 @@
#endif
#include "wx/wx.h"
#include "wx/xml/xml.h"
#include "wx/xml/xmlres.h"
#include "wx/xrc/xml.h"
#include "wx/xrc/xmlres.h"
#include "wx/config.h"
#include "wx/log.h"
#include "wx/splitter.h"
@@ -27,7 +27,7 @@
#include "xmlhelpr.h"
#include "editor.h"
#include "wx/xml/xh_menu.h"
#include "wx/xrc/xh_menu.h"
class MyMenubarHandler : public wxMenuBarXmlHandler
{

2
contrib/utils/wxrcedit/propedit.cpp
View File

@@ -18,7 +18,7 @@
#endif
#include "wx/wx.h"
#include "wx/xml/xml.h"
#include "wx/xrc/xml.h"
#include "propframe.h"
#include "propedit.h"
#include "xmlhelpr.h"

2
contrib/utils/wxrcedit/propframe.cpp
View File

@@ -18,7 +18,7 @@
#endif
#include "wx/wx.h"
#include "wx/xml/xml.h"
#include "wx/xrc/xml.h"
#include "wx/config.h"
#include "splittree.h"
#include "xmlhelpr.h"

2
contrib/utils/wxrcedit/xmlhelpr.cpp
View File

@@ -17,7 +17,7 @@
#pragma hdrstop
#endif
#include "wx/xml/xml.h"
#include "wx/xrc/xml.h"
#include "wx/wx.h"
#include "wx/tokenzr.h"
#include "xmlhelpr.h"