Menu
▾
▴
wxdevcenter-cvs — cvs/svn commits for wxDevCenter and StdPlugin
You can subscribe to this list here.
| 2005 |
Jan
(98) |
Feb
(101) |
Mar
(60) |
Apr
(38) |
May
(26) |
Jun
|
Jul
|
Aug
(159) |
Sep
(78) |
Oct
(31) |
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(4) |
Sep
(6) |
Oct
|
Nov
(1) |
Dec
(3) |
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
(3) |
May
(5) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
(8) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Emilien K. <cur...@us...> - 2005-08-23 15:43:15
|
Update of /cvsroot/wxdevcenter/wxDevCenter/build In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32561/build Modified Files: install.bkl Log Message: Unify icons and bitmap location. Index: install.bkl =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/build/install.bkl,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** install.bkl 23 Aug 2005 12:31:33 -0000 1.7 --- install.bkl 23 Aug 2005 15:43:02 -0000 1.8 *************** *** 62,67 **** icons/unknow.ico icons/wxDevCenter.ico ! img/wx.png ! img/wxDevCenter.png </files> </data-files-tree> --- 62,67 ---- icons/unknow.ico icons/wxDevCenter.ico ! icons/wx.png ! icons/wxDevCenter.png </files> </data-files-tree> |
|
From: Emilien K. <cur...@us...> - 2005-08-23 15:43:15
|
Update of /cvsroot/wxdevcenter/wxDevCenter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32561 Modified Files: GNUmakefile Log Message: Unify icons and bitmap location. Index: GNUmakefile =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/GNUmakefile,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** GNUmakefile 23 Aug 2005 12:31:34 -0000 1.7 --- GNUmakefile 23 Aug 2005 15:43:02 -0000 1.8 *************** *** 179,183 **** done $(INSTALL) -d $(prefix)/share/wxDevCenter/data ! for f in icons/cd-dvd.ico icons/computer.ico icons/desktop.ico icons/dir.ico icons/docs.ico icons/floppy.ico icons/harddrive.ico icons/icon-big.ico icons/icon-list.ico icons/icon-report.ico icons/none.ico icons/Progs.ico icons/ramdisk.ico icons/remote.ico icons/removeable.ico icons/shortcut.ico icons/unknow.ico icons/wxDevCenter.ico img/wx.png img/wxDevCenter.png; do \ if test ! -d $(prefix)/share/wxDevCenter/data/`dirname $$f` ; then \ $(INSTALL) -d $(prefix)/share/wxDevCenter/data/`dirname $$f`; \ --- 179,183 ---- done $(INSTALL) -d $(prefix)/share/wxDevCenter/data ! for f in icons/cd-dvd.ico icons/computer.ico icons/desktop.ico icons/dir.ico icons/docs.ico icons/floppy.ico icons/harddrive.ico icons/icon-big.ico icons/icon-list.ico icons/icon-report.ico icons/none.ico icons/Progs.ico icons/ramdisk.ico icons/remote.ico icons/removeable.ico icons/shortcut.ico icons/unknow.ico icons/wxDevCenter.ico icons/wx.png icons/wxDevCenter.png; do \ if test ! -d $(prefix)/share/wxDevCenter/data/`dirname $$f` ; then \ $(INSTALL) -d $(prefix)/share/wxDevCenter/data/`dirname $$f`; \ |
|
From: Emilien K. <cur...@us...> - 2005-08-23 15:43:13
|
Update of /cvsroot/wxdevcenter/wxDevCenter/data/icons In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32561/data/icons Added Files: wx.png wxDevCenter.png Log Message: Unify icons and bitmap location. --- NEW FILE: wxDevCenter.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: wx.png --- (This appears to be a binary file; contents omitted.) |
|
From: Emilien K. <cur...@us...> - 2005-08-23 15:43:13
|
Update of /cvsroot/wxdevcenter/wxDevCenter/data/img In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32561/data/img Removed Files: wx.png wxDevCenter.png Log Message: Unify icons and bitmap location. --- wxDevCenter.png DELETED --- --- wx.png DELETED --- |
|
From: Emilien K. <cur...@us...> - 2005-08-23 12:55:08
|
Update of /cvsroot/wxdevcenter/wxDevCenter/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21671/data Modified Files: wxdevcenter.desktop wxdevcenterd.desktop Log Message: Change category utility -> development. Index: wxdevcenterd.desktop =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/data/wxdevcenterd.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxdevcenterd.desktop 11 Aug 2005 15:48:37 -0000 1.1 --- wxdevcenterd.desktop 23 Aug 2005 12:55:00 -0000 1.2 *************** *** 7,11 **** Terminal=false Type=Application ! Categories=Application;Utility; StartupNotify=true --- 7,11 ---- Terminal=false Type=Application ! Categories=Application;Development; StartupNotify=true Index: wxdevcenter.desktop =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/data/wxdevcenter.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxdevcenter.desktop 11 Aug 2005 15:48:37 -0000 1.1 --- wxdevcenter.desktop 23 Aug 2005 12:55:00 -0000 1.2 *************** *** 7,11 **** Terminal=false Type=Application ! Categories=Application;Utility; StartupNotify=true --- 7,11 ---- Terminal=false Type=Application ! Categories=Application;Development; StartupNotify=true |
|
From: Emilien K. <cur...@us...> - 2005-08-23 12:31:46
|
Update of /cvsroot/wxdevcenter/wxDevCenter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16388 Modified Files: GNUmakefile Log Message: Fix bakefile rules for install freedesktop shortcut. Index: GNUmakefile =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/GNUmakefile,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** GNUmakefile 23 Aug 2005 11:42:30 -0000 1.6 --- GNUmakefile 23 Aug 2005 12:31:34 -0000 1.7 *************** *** 128,135 **** endif ifeq ($(BUILD),debug) ! FREEDESKTOP_MENU_FILE = data/wxdevcenterd.desktop endif ifeq ($(BUILD),release) ! FREEDESKTOP_MENU_FILE = data/wxdevcenter.desktop endif ifeq ($(BUILD),debug) --- 128,135 ---- endif ifeq ($(BUILD),debug) ! FREEDESKTOP_MENU_FILE = wxdevcenterd.desktop endif ifeq ($(BUILD),release) ! FREEDESKTOP_MENU_FILE = wxdevcenter.desktop endif ifeq ($(BUILD),debug) *************** *** 170,174 **** all: ./lib/libspecific.a lib/libwxDevCenterLib.so ./bin/wxDevCenter$(SUFFIX) ! install: all install_wxDevCenterLib install_wxDevCenter $(prefix)/share/applications/wxdevcenter.desktop $(INSTALL) -d $(prefix)/include for f in wxDevCenter.h wxDevCenterPlugin.h wxDevCenter/AboutBox.h wxDevCenter/Application.h wxDevCenter/ArtProvider.h wxDevCenter/Config.h wxDevCenter/DocView.h wxDevCenter/Element.h wxDevCenter/FileSystem.h wxDevCenter/FileSystemCtrl.h wxDevCenter/FileSystemListCtrl.h wxDevCenter/FileSystemTreeCtrl.h wxDevCenter/FileSystemStandard.h wxDevCenter/FileTools.h wxDevCenter/Frame.h wxDevCenter/language.h wxDevCenter/MainFrame.h wxDevCenter/Manager.h wxDevCenter/MDIFrame.h wxDevCenter/Plugin.h wxDevCenter/Project.h wxDevCenter/setup.h wxDevCenter/StatusBar.h wxDevCenter/WorkBar.h wxDevCenter/unix/Config.h wxDevCenter/unix/FileSystemStandard.h; do \ --- 170,174 ---- all: ./lib/libspecific.a lib/libwxDevCenterLib.so ./bin/wxDevCenter$(SUFFIX) ! install: all install_wxDevCenterLib install_wxDevCenter $(INSTALL) -d $(prefix)/include for f in wxDevCenter.h wxDevCenterPlugin.h wxDevCenter/AboutBox.h wxDevCenter/Application.h wxDevCenter/ArtProvider.h wxDevCenter/Config.h wxDevCenter/DocView.h wxDevCenter/Element.h wxDevCenter/FileSystem.h wxDevCenter/FileSystemCtrl.h wxDevCenter/FileSystemListCtrl.h wxDevCenter/FileSystemTreeCtrl.h wxDevCenter/FileSystemStandard.h wxDevCenter/FileTools.h wxDevCenter/Frame.h wxDevCenter/language.h wxDevCenter/MainFrame.h wxDevCenter/Manager.h wxDevCenter/MDIFrame.h wxDevCenter/Plugin.h wxDevCenter/Project.h wxDevCenter/setup.h wxDevCenter/StatusBar.h wxDevCenter/WorkBar.h wxDevCenter/unix/Config.h wxDevCenter/unix/FileSystemStandard.h; do \ *************** *** 185,188 **** --- 185,192 ---- $(INSTALL) -m 644 data//$$f $(prefix)/share/wxDevCenter/data/$$f; \ done + $(INSTALL) -d $(prefix)/share/applications + (cd data/ ; $(INSTALL) -m 644 $(FREEDESKTOP_MENU_FILE) $(prefix)/share/applications) + $(INSTALL) -d $(prefix)/share/pixmaps + (cd data/img/ ; $(INSTALL) -m 644 wxDevCenter.png $(prefix)/share/pixmaps) uninstall: *************** *** 216,225 **** install -c ./bin/wxDevCenter$(SUFFIX) $(prefix)/bin - $(prefix)/share/applications/wxdevcenter.desktop: $(FREEDESKTOP_MENU_FILE) $(prefix)/share/pixmaps/wxDevCenter.png - cp -pf $(FREEDESKTOP_MENU_FILE) $(prefix)/share/applications/wxdevcenter.desktop - - $(prefix)/share/pixmaps/wxDevCenter.png: data/img/wxDevCenter.png - cp -pf data/img/wxDevCenter.png $(prefix)/share/pixmaps/wxDevCenter.png - ./build/$(BUILD)/specific_Config.o: ./src/unix/Config.cpp $(CXX) -c -o $@ $(SPECIFIC_CXXFLAGS) $(CPPDEPS) $< --- 220,223 ---- |
|
From: Emilien K. <cur...@us...> - 2005-08-23 12:31:46
|
Update of /cvsroot/wxdevcenter/wxDevCenter/build In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16388/build Modified Files: install.bkl Log Message: Fix bakefile rules for install freedesktop shortcut. Index: install.bkl =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/build/install.bkl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** install.bkl 23 Aug 2005 11:42:30 -0000 1.6 --- install.bkl 23 Aug 2005 12:31:33 -0000 1.7 *************** *** 69,87 **** <!-- Install freedesktop menu info. --> <set var="FREEDESKTOP_MENU_FILE"> ! <if cond="BUILD=='release'">data/wxdevcenter.desktop</if> ! <if cond="BUILD=='debug'">data/wxdevcenterd.desktop</if> ! </set> ! <copy-file-to-file id="freedesktop_menu_test"> ! <dependency-of>install</dependency-of> ! <src>$(FREEDESKTOP_MENU_FILE)</src> ! <dst>$(DATADIR)/applications/wxdevcenter.desktop</dst> ! </copy-file-to-file> ! <!-- Install freedesktop menu info. --> ! <copy-file-to-file id="freedesktop_menu_icon"> ! <dependency-of>freedesktop_menu_test</dependency-of> ! <src>data/img/wxDevCenter.png</src> ! <dst>$(DATADIR)/pixmaps/wxDevCenter.png</dst> ! </copy-file-to-file> </makefile> --- 69,87 ---- <!-- Install freedesktop menu info. --> <set var="FREEDESKTOP_MENU_FILE"> ! <if cond="BUILD=='release'">wxdevcenter.desktop</if> ! <if cond="BUILD=='debug'">wxdevcenterd.desktop</if> ! </set> ! <data-files id="freedesktop_menu_test"> ! <srcdir>data</srcdir> ! <install-to>$(DATADIR)/applications</install-to> ! <files>$(FREEDESKTOP_MENU_FILE)</files> ! </data-files> ! <!-- Install freedesktop menu icon. --> ! <data-files id="freedesktop_menu_icon"> ! <srcdir>data/img</srcdir> ! <install-to>$(DATADIR)/pixmaps</install-to> ! <files>wxDevCenter.png</files> ! </data-files> </makefile> |
|
From: Emilien K. <cur...@us...> - 2005-08-23 11:42:38
|
Update of /cvsroot/wxdevcenter/wxDevCenter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5553 Modified Files: GNUmakefile Log Message: Dependancy for install freedesktop shortcut. Index: GNUmakefile =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/GNUmakefile,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** GNUmakefile 13 Aug 2005 16:27:34 -0000 1.5 --- GNUmakefile 23 Aug 2005 11:42:30 -0000 1.6 *************** *** 170,174 **** all: ./lib/libspecific.a lib/libwxDevCenterLib.so ./bin/wxDevCenter$(SUFFIX) ! install: all install_wxDevCenterLib install_wxDevCenter $(INSTALL) -d $(prefix)/include for f in wxDevCenter.h wxDevCenterPlugin.h wxDevCenter/AboutBox.h wxDevCenter/Application.h wxDevCenter/ArtProvider.h wxDevCenter/Config.h wxDevCenter/DocView.h wxDevCenter/Element.h wxDevCenter/FileSystem.h wxDevCenter/FileSystemCtrl.h wxDevCenter/FileSystemListCtrl.h wxDevCenter/FileSystemTreeCtrl.h wxDevCenter/FileSystemStandard.h wxDevCenter/FileTools.h wxDevCenter/Frame.h wxDevCenter/language.h wxDevCenter/MainFrame.h wxDevCenter/Manager.h wxDevCenter/MDIFrame.h wxDevCenter/Plugin.h wxDevCenter/Project.h wxDevCenter/setup.h wxDevCenter/StatusBar.h wxDevCenter/WorkBar.h wxDevCenter/unix/Config.h wxDevCenter/unix/FileSystemStandard.h; do \ --- 170,174 ---- all: ./lib/libspecific.a lib/libwxDevCenterLib.so ./bin/wxDevCenter$(SUFFIX) ! install: all install_wxDevCenterLib install_wxDevCenter $(prefix)/share/applications/wxdevcenter.desktop $(INSTALL) -d $(prefix)/include for f in wxDevCenter.h wxDevCenterPlugin.h wxDevCenter/AboutBox.h wxDevCenter/Application.h wxDevCenter/ArtProvider.h wxDevCenter/Config.h wxDevCenter/DocView.h wxDevCenter/Element.h wxDevCenter/FileSystem.h wxDevCenter/FileSystemCtrl.h wxDevCenter/FileSystemListCtrl.h wxDevCenter/FileSystemTreeCtrl.h wxDevCenter/FileSystemStandard.h wxDevCenter/FileTools.h wxDevCenter/Frame.h wxDevCenter/language.h wxDevCenter/MainFrame.h wxDevCenter/Manager.h wxDevCenter/MDIFrame.h wxDevCenter/Plugin.h wxDevCenter/Project.h wxDevCenter/setup.h wxDevCenter/StatusBar.h wxDevCenter/WorkBar.h wxDevCenter/unix/Config.h wxDevCenter/unix/FileSystemStandard.h; do \ *************** *** 216,220 **** install -c ./bin/wxDevCenter$(SUFFIX) $(prefix)/bin ! $(prefix)/share/applications/wxdevcenter.desktop: $(FREEDESKTOP_MENU_FILE) cp -pf $(FREEDESKTOP_MENU_FILE) $(prefix)/share/applications/wxdevcenter.desktop --- 216,220 ---- install -c ./bin/wxDevCenter$(SUFFIX) $(prefix)/bin ! $(prefix)/share/applications/wxdevcenter.desktop: $(FREEDESKTOP_MENU_FILE) $(prefix)/share/pixmaps/wxDevCenter.png cp -pf $(FREEDESKTOP_MENU_FILE) $(prefix)/share/applications/wxdevcenter.desktop |
|
From: Emilien K. <cur...@us...> - 2005-08-23 11:42:37
|
Update of /cvsroot/wxdevcenter/wxDevCenter/build In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5553/build Modified Files: install.bkl Log Message: Dependancy for install freedesktop shortcut. Index: install.bkl =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/build/install.bkl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** install.bkl 13 Aug 2005 16:27:34 -0000 1.5 --- install.bkl 23 Aug 2005 11:42:30 -0000 1.6 *************** *** 73,76 **** --- 73,77 ---- </set> <copy-file-to-file id="freedesktop_menu_test"> + <dependency-of>install</dependency-of> <src>$(FREEDESKTOP_MENU_FILE)</src> <dst>$(DATADIR)/applications/wxdevcenter.desktop</dst> *************** *** 79,82 **** --- 80,84 ---- <!-- Install freedesktop menu info. --> <copy-file-to-file id="freedesktop_menu_icon"> + <dependency-of>freedesktop_menu_test</dependency-of> <src>data/img/wxDevCenter.png</src> <dst>$(DATADIR)/pixmaps/wxDevCenter.png</dst> |
|
From: Emilien K. <cur...@us...> - 2005-08-22 19:32:31
|
Update of /cvsroot/wxdevcenter/StdPlugin/build In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4613/build Modified Files: install.bkl Log Message: Replace space by - in config filename. Index: install.bkl =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/build/install.bkl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** install.bkl 22 Aug 2005 19:18:14 -0000 1.3 --- install.bkl 22 Aug 2005 19:32:21 -0000 1.4 *************** *** 15,19 **** StdPlugin/extmouse.h StdPlugin/language.h - StdPlugin/OrganigramPanel.h StdPlugin/SimpleTextDocView.h </files> --- 15,18 ---- *************** *** 29,33 **** img/scintilla.png img/bmp/brush.png ! img/bmp/DOT.png img/bmp/DOT_DASH.PNG img/bmp/ellipse.png --- 28,32 ---- img/scintilla.png img/bmp/brush.png ! img/bmp/DOT.PNG img/bmp/DOT_DASH.PNG img/bmp/ellipse.png *************** *** 98,102 **** Text/EiffelKW.conf Text/ERLANG.conf ! Text/Error list.conf Text/ESCRIPT.conf Text/F77.conf --- 97,101 ---- Text/EiffelKW.conf Text/ERLANG.conf ! Text/Error-list.conf Text/ESCRIPT.conf Text/F77.conf |
|
From: Emilien K. <cur...@us...> - 2005-08-22 19:32:30
|
Update of /cvsroot/wxdevcenter/StdPlugin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4613 Modified Files: GNUmakefile Log Message: Replace space by - in config filename. Index: GNUmakefile =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/GNUmakefile,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** GNUmakefile 22 Aug 2005 19:18:14 -0000 1.3 --- GNUmakefile 22 Aug 2005 19:32:21 -0000 1.4 *************** *** 138,142 **** install: all install_Text install_Bitmap $(INSTALL) -d $(prefix)/include/wxDevCenter ! for f in StdPlugin.h StdPlugin/BitmapCtrl.h StdPlugin/BitmapDocView.h StdPlugin/Controls.h StdPlugin/extmouse.h StdPlugin/language.h StdPlugin/OrganigramPanel.h StdPlugin/SimpleTextDocView.h; do \ if test ! -d $(prefix)/include/wxDevCenter/`dirname $$f` ; then \ $(INSTALL) -d $(prefix)/include/wxDevCenter/`dirname $$f`; \ --- 138,142 ---- install: all install_Text install_Bitmap $(INSTALL) -d $(prefix)/include/wxDevCenter ! for f in StdPlugin.h StdPlugin/BitmapCtrl.h StdPlugin/BitmapDocView.h StdPlugin/Controls.h StdPlugin/extmouse.h StdPlugin/language.h StdPlugin/SimpleTextDocView.h; do \ if test ! -d $(prefix)/include/wxDevCenter/`dirname $$f` ; then \ $(INSTALL) -d $(prefix)/include/wxDevCenter/`dirname $$f`; \ *************** *** 145,149 **** done $(INSTALL) -d $(prefix)/share/wxDevCenter/data ! for f in icons/filetypes/bmp.ico icons/filetypes/txt.ico img/scintilla.png img/bmp/brush.png img/bmp/DOT.png img/bmp/DOT_DASH.PNG img/bmp/ellipse.png img/bmp/handdraw.png img/bmp/line.png img/bmp/LONG_DASH.PNG img/bmp/rect.png img/bmp/rrect.png img/bmp/selall.png img/bmp/selcopy.png img/bmp/selcut.png img/bmp/selection.png img/bmp/selmove.png img/bmp/selpaste.png img/bmp/selremove.png img/bmp/sizeall.png img/bmp/SHORT_DASH.PNG img/bmp/SOLID.PNG img/bmp/spray.png img/bmp/TRANSPARENT.PNG; do \ if test ! -d $(prefix)/share/wxDevCenter/data/`dirname $$f` ; then \ $(INSTALL) -d $(prefix)/share/wxDevCenter/data/`dirname $$f`; \ --- 145,149 ---- done $(INSTALL) -d $(prefix)/share/wxDevCenter/data ! for f in icons/filetypes/bmp.ico icons/filetypes/txt.ico img/scintilla.png img/bmp/brush.png img/bmp/DOT.PNG img/bmp/DOT_DASH.PNG img/bmp/ellipse.png img/bmp/handdraw.png img/bmp/line.png img/bmp/LONG_DASH.PNG img/bmp/rect.png img/bmp/rrect.png img/bmp/selall.png img/bmp/selcopy.png img/bmp/selcut.png img/bmp/selection.png img/bmp/selmove.png img/bmp/selpaste.png img/bmp/selremove.png img/bmp/sizeall.png img/bmp/SHORT_DASH.PNG img/bmp/SOLID.PNG img/bmp/spray.png img/bmp/TRANSPARENT.PNG; do \ if test ! -d $(prefix)/share/wxDevCenter/data/`dirname $$f` ; then \ $(INSTALL) -d $(prefix)/share/wxDevCenter/data/`dirname $$f`; \ *************** *** 166,170 **** done $(INSTALL) -d $(prefix)/share/wxDevCenter/conf ! for f in Text.conf Text/.conf Text/ADA.conf Text/APDL.conf Text/ASM.conf Text/ASP.conf Text/AU3.conf Text/AVE.conf Text/BAAM.conf Text/BASH.conf Text/Batch.conf Text/Bullant.conf Text/CLW-no-case.conf Text/CLW.conf Text/Config.conf Text/CPP-no-case.conf Text/CPP.conf Text/CSS.conf Text/Diff.conf Text/Eiffel.conf Text/EiffelKW.conf Text/ERLANG.conf Text/Error list.conf Text/ESCRIPT.conf Text/F77.conf Text/FORTH.conf Text/Fortran.conf Text/GUI2CLI.conf Text/HTML.conf Text/KIX.conf Text/LaTeX.conf Text/Lisp.conf Text/LOT.conf Text/LOUT.conf Text/LUA.conf Text/Makefile.conf Text/MATLab.conf Text/METAPOST.conf Text/MMIXAL.conf Text/MS-SQL.conf Text/NN-Cron-Table.conf Text/NSIS.conf Text/Octave.conf Text/Pascal.conf Text/Perl.conf Text/PHP.conf Text/POV.conf Text/Power-Basic.conf Text/Properties.conf Text/PS.conf Text/Python.conf Text/Ruby.conf Text/Scriptol.conf Text/SPECMAN.conf Text/SQL.conf Text/TCL.conf Text/TeX.conf Text/Text.conf Text/Verilog.conf Text/Visual-Basic-Script.conf Text/Visual-Basic.conf Text/XCode.conf Text/XML.conf Text/YAML.conf; do \ if test ! -d $(prefix)/share/wxDevCenter/conf/`dirname $$f` ; then \ $(INSTALL) -d $(prefix)/share/wxDevCenter/conf/`dirname $$f`; \ --- 166,170 ---- done $(INSTALL) -d $(prefix)/share/wxDevCenter/conf ! for f in Text.conf Text/.conf Text/ADA.conf Text/APDL.conf Text/ASM.conf Text/ASP.conf Text/AU3.conf Text/AVE.conf Text/BAAM.conf Text/BASH.conf Text/Batch.conf Text/Bullant.conf Text/CLW-no-case.conf Text/CLW.conf Text/Config.conf Text/CPP-no-case.conf Text/CPP.conf Text/CSS.conf Text/Diff.conf Text/Eiffel.conf Text/EiffelKW.conf Text/ERLANG.conf Text/Error-list.conf Text/ESCRIPT.conf Text/F77.conf Text/FORTH.conf Text/Fortran.conf Text/GUI2CLI.conf Text/HTML.conf Text/KIX.conf Text/LaTeX.conf Text/Lisp.conf Text/LOT.conf Text/LOUT.conf Text/LUA.conf Text/Makefile.conf Text/MATLab.conf Text/METAPOST.conf Text/MMIXAL.conf Text/MS-SQL.conf Text/NN-Cron-Table.conf Text/NSIS.conf Text/Octave.conf Text/Pascal.conf Text/Perl.conf Text/PHP.conf Text/POV.conf Text/Power-Basic.conf Text/Properties.conf Text/PS.conf Text/Python.conf Text/Ruby.conf Text/Scriptol.conf Text/SPECMAN.conf Text/SQL.conf Text/TCL.conf Text/TeX.conf Text/Text.conf Text/Verilog.conf Text/Visual-Basic-Script.conf Text/Visual-Basic.conf Text/XCode.conf Text/XML.conf Text/YAML.conf; do \ if test ! -d $(prefix)/share/wxDevCenter/conf/`dirname $$f` ; then \ $(INSTALL) -d $(prefix)/share/wxDevCenter/conf/`dirname $$f`; \ |
|
From: Emilien K. <cur...@us...> - 2005-08-22 19:18:23
|
Update of /cvsroot/wxdevcenter/StdPlugin/conf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv477/conf Modified Files: Text.conf Log Message: Replace space by - in config filename. Index: Text.conf =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/conf/Text.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Text.conf 16 Feb 2005 15:10:03 -0000 1.1 --- Text.conf 22 Aug 2005 19:18:14 -0000 1.2 *************** *** 7,13 **** name06=Perl name07=SQL ! name08=Visual Basic name09=Properties ! name10=Error list name11=Makefile name12=Batch --- 7,13 ---- name06=Perl name07=SQL ! name08=Visual-Basic name09=Properties ! name10=Error-list name11=Makefile name12=Batch *************** *** 25,31 **** name24=EiffelKW name25=TCL ! name26=NN Cron Table name27=Bullant ! name28=Visual Basic Script name29=ASP name30=PHP --- 25,31 ---- name24=EiffelKW name25=TCL ! name26=NN-Cron-Table name27=Bullant ! name28=Visual-Basic-Script name29=ASP name30=PHP *************** *** 34,38 **** name33=Scriptol name34=ASM ! name35=CPP no case name36=Fortran name37=F77 --- 34,38 ---- name33=Scriptol name34=ASM ! name35=CPP-no-case name36=Fortran name37=F77 *************** *** 45,54 **** name44=MMIXAL name45=CLW ! name46=CLW no case name47=LOT name48=YAML name49=TeX name50=METAPOST ! name51=Power Basic name52=FORTH name53=ERLANG --- 45,54 ---- name44=MMIXAL name45=CLW ! name46=CLW-no-case name47=LOT name48=YAML name49=TeX name50=METAPOST ! name51=Power-Basic name52=FORTH name53=ERLANG |
|
From: Emilien K. <cur...@us...> - 2005-08-22 19:18:22
|
Update of /cvsroot/wxdevcenter/StdPlugin/conf/Text In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv477/conf/Text Added Files: NN-Cron-Table.conf Visual-Basic.conf Error-list.conf Visual-Basic-Script.conf CLW-no-case.conf Power-Basic.conf CPP-no-case.conf Removed Files: NN Cron Table.conf Power Basic.conf Visual Basic.conf CPP no case.conf CLW no case.conf Visual Basic Script.conf Error list.conf Log Message: Replace space by - in config filename. --- Visual Basic Script.conf DELETED --- --- NEW FILE: CLW-no-case.conf --- name=CLW no case --- CPP no case.conf DELETED --- --- Power Basic.conf DELETED --- --- NEW FILE: NN-Cron-Table.conf --- name=NN Cron Table --- NEW FILE: Visual-Basic-Script.conf --- name=Visual Basic Script --- NEW FILE: Visual-Basic.conf --- name=Visual Basic --- NEW FILE: Error-list.conf --- name=Error list --- NN Cron Table.conf DELETED --- --- Visual Basic.conf DELETED --- --- NEW FILE: CPP-no-case.conf --- name=C++ no case --- Error list.conf DELETED --- --- NEW FILE: Power-Basic.conf --- name=Power Basic --- CLW no case.conf DELETED --- |
|
From: Emilien K. <cur...@us...> - 2005-08-22 19:18:22
|
Update of /cvsroot/wxdevcenter/StdPlugin/build In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv477/build Modified Files: install.bkl Log Message: Replace space by - in config filename. Index: install.bkl =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/build/install.bkl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** install.bkl 22 Aug 2005 17:52:23 -0000 1.2 --- install.bkl 22 Aug 2005 19:18:14 -0000 1.3 *************** *** 88,95 **** Text/Batch.conf Text/Bullant.conf ! "Text/CLW no case.conf" Text/CLW.conf Text/Config.conf ! "Text/CPP no case.conf" Text/CPP.conf Text/CSS.conf --- 88,95 ---- Text/Batch.conf Text/Bullant.conf ! Text/CLW-no-case.conf Text/CLW.conf Text/Config.conf ! Text/CPP-no-case.conf Text/CPP.conf Text/CSS.conf *************** *** 116,120 **** Text/MMIXAL.conf Text/MS-SQL.conf ! "Text/NN Cron Table.conf" Text/NSIS.conf Text/Octave.conf --- 116,120 ---- Text/MMIXAL.conf Text/MS-SQL.conf ! Text/NN-Cron-Table.conf Text/NSIS.conf Text/Octave.conf *************** *** 123,127 **** Text/PHP.conf Text/POV.conf ! "Text/Power Basic.conf" Text/Properties.conf Text/PS.conf --- 123,127 ---- Text/PHP.conf Text/POV.conf ! Text/Power-Basic.conf Text/Properties.conf Text/PS.conf *************** *** 135,140 **** Text/Text.conf Text/Verilog.conf ! "Text/Visual Basic Script.conf" ! "Text/Visual Basic.conf" Text/XCode.conf Text/XML.conf --- 135,140 ---- Text/Text.conf Text/Verilog.conf ! Text/Visual-Basic-Script.conf ! Text/Visual-Basic.conf Text/XCode.conf Text/XML.conf |
|
From: Emilien K. <cur...@us...> - 2005-08-22 19:18:22
|
Update of /cvsroot/wxdevcenter/StdPlugin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv477 Modified Files: GNUmakefile Log Message: Replace space by - in config filename. Index: GNUmakefile =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/GNUmakefile,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** GNUmakefile 22 Aug 2005 17:52:22 -0000 1.2 --- GNUmakefile 22 Aug 2005 19:18:14 -0000 1.3 *************** *** 166,170 **** done $(INSTALL) -d $(prefix)/share/wxDevCenter/conf ! for f in Text.conf Text/.conf Text/ADA.conf Text/APDL.conf Text/ASM.conf Text/ASP.conf Text/AU3.conf Text/AVE.conf Text/BAAM.conf Text/BASH.conf Text/Batch.conf Text/Bullant.conf "Text/CLW no case.conf" Text/CLW.conf Text/Config.conf "Text/CPP no case.conf" Text/CPP.conf Text/CSS.conf Text/Diff.conf Text/Eiffel.conf Text/EiffelKW.conf Text/ERLANG.conf Text/Error list.conf Text/ESCRIPT.conf Text/F77.conf Text/FORTH.conf Text/Fortran.conf Text/GUI2CLI.conf Text/HTML.conf Text/KIX.conf Text/LaTeX.conf Text/Lisp.conf Text/LOT.conf Text/LOUT.conf Text/LUA.conf Text/Makefile.conf Text/MATLab.conf Text/METAPOST.conf Text/MMIXAL.conf Text/MS-SQL.conf "Text/NN Cron Table.conf" Text/NSIS.conf Text/Octave.conf Text/Pascal.conf Text/Perl.conf Text/PHP.conf Text/POV.conf "Text/Power Basic.conf" Text/Properties.conf Text/PS.conf Text/Python.conf Text/Ruby.conf Text/Scriptol.conf Text/SPECMAN.conf Text/SQL.conf Text/TCL.conf Text/TeX.conf Text/Text.conf Text/Verilog.conf "Text/Visual Basic Script.conf" "Text/Visual Basic.conf" Text/XCode.conf Text/XML.conf Text/YAML.conf; do \ if test ! -d $(prefix)/share/wxDevCenter/conf/`dirname $$f` ; then \ $(INSTALL) -d $(prefix)/share/wxDevCenter/conf/`dirname $$f`; \ --- 166,170 ---- done $(INSTALL) -d $(prefix)/share/wxDevCenter/conf ! for f in Text.conf Text/.conf Text/ADA.conf Text/APDL.conf Text/ASM.conf Text/ASP.conf Text/AU3.conf Text/AVE.conf Text/BAAM.conf Text/BASH.conf Text/Batch.conf Text/Bullant.conf Text/CLW-no-case.conf Text/CLW.conf Text/Config.conf Text/CPP-no-case.conf Text/CPP.conf Text/CSS.conf Text/Diff.conf Text/Eiffel.conf Text/EiffelKW.conf Text/ERLANG.conf Text/Error list.conf Text/ESCRIPT.conf Text/F77.conf Text/FORTH.conf Text/Fortran.conf Text/GUI2CLI.conf Text/HTML.conf Text/KIX.conf Text/LaTeX.conf Text/Lisp.conf Text/LOT.conf Text/LOUT.conf Text/LUA.conf Text/Makefile.conf Text/MATLab.conf Text/METAPOST.conf Text/MMIXAL.conf Text/MS-SQL.conf Text/NN-Cron-Table.conf Text/NSIS.conf Text/Octave.conf Text/Pascal.conf Text/Perl.conf Text/PHP.conf Text/POV.conf Text/Power-Basic.conf Text/Properties.conf Text/PS.conf Text/Python.conf Text/Ruby.conf Text/Scriptol.conf Text/SPECMAN.conf Text/SQL.conf Text/TCL.conf Text/TeX.conf Text/Text.conf Text/Verilog.conf Text/Visual-Basic-Script.conf Text/Visual-Basic.conf Text/XCode.conf Text/XML.conf Text/YAML.conf; do \ if test ! -d $(prefix)/share/wxDevCenter/conf/`dirname $$f` ; then \ $(INSTALL) -d $(prefix)/share/wxDevCenter/conf/`dirname $$f`; \ |
|
From: Emilien K. <cur...@us...> - 2005-08-22 17:52:30
|
Update of /cvsroot/wxdevcenter/StdPlugin/build In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9144/build Modified Files: install.bkl wx.bkl StdPlugin.bkl Log Message: Error in bakefiles. protect file names containing spaces with ". Index: wx.bkl =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/build/wx.bkl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wx.bkl 14 May 2005 12:45:32 -0000 1.2 --- wx.bkl 22 Aug 2005 17:52:23 -0000 1.3 *************** *** 9,13 **** <values>0,1</values> <values-description>LIB,DLL</values-description> ! <default-value>0</default-value> <description> What type of library to build ? --- 9,13 ---- <values>0,1</values> <values-description>LIB,DLL</values-description> ! <default-value>1</default-value> <description> What type of library to build ? *************** *** 29,33 **** <values>debug,release</values> <values-description>Debug,Release</values-description> ! <default-value>debug</default-value> <description> Type of compiled binaries. --- 29,33 ---- <values>debug,release</values> <values-description>Debug,Release</values-description> ! <default-value>release</default-value> <description> Type of compiled binaries. *************** *** 39,43 **** <values>25, 26</values> <values-description>wx2.5.x, wx2.6.x</values-description> ! <default-value>25</default-value> <description> Version of wxWidgets. --- 39,43 ---- <values>25, 26</values> <values-description>wx2.5.x, wx2.6.x</values-description> ! <default-value>26</default-value> <description> Version of wxWidgets. *************** *** 45,52 **** </option> <!-- wxWidgets port. --> <option name="WXPORTNAME"> ! <values>msw,gtk,x11,mac,os2</values> ! <default-value>msw</default-value> <description>Port to use for wxWidgets library.</description> </option> --- 45,60 ---- </option> + + <set var="WXPORTNAME_DEFAULT"> + <if cond="PLATFORM_WIN32=='1'">msw</if> + <if cond="PLATFORM_UNIX=='1'">gtk2</if> + <if cond="PLATFORM_MAC=='1'">mac</if> + <if cond="PLATFORM_OS2=='1'">os2</if> + </set> + <!-- wxWidgets port. --> <option name="WXPORTNAME"> ! <values>msw,gtk,gtk2,x11,mac,os2</values> ! <default-value>$(WXPORTNAME_DEFAULT)</default-value> <description>Port to use for wxWidgets library.</description> </option> *************** *** 106,112 **** <set var="WXDEF_PLATEFORM"> <if cond="PLATFORM_WIN32=='1'">__WINDOWS__</if> ! <if cond="PLATFORM_UNIX=='1'">__UNIX_LIKE__</if> <if cond="PLATFORM_MAC=='1'">__WXMAC__ </if> ! <if cond="PLATFORM_OS2=='1'">__WXOS2__ </if> </set> --- 114,126 ---- <set var="WXDEF_PLATEFORM"> <if cond="PLATFORM_WIN32=='1'">__WINDOWS__</if> ! <!-- <if cond="PLATFORM_UNIX=='1'">__UNIX_LIKE__</if> <if cond="PLATFORM_MAC=='1'">__WXMAC__ </if> ! <if cond="PLATFORM_OS2=='1'">__WXOS2__ </if>--> ! </set> ! ! ! <set var="TARGETING_WIN32"> ! <if cond="FORMAT=='autoconf' or FORMAT=='gnu'">0</if> ! <if cond="FORMAT!='autoconf' and FORMAT!='gnu'">1</if> </set> *************** *** 122,142 **** <set var="WXVERSIONTAG"> ! <if cond="WXVER=='25'">25</if> ! <if cond="WXVER=='26'">26</if> ! </set> ! ! <set var="TARGETING_WIN32"> ! <if cond="FORMAT=='autoconf' or FORMAT=='gnu'">0</if> ! <if cond="FORMAT!='autoconf' and FORMAT!='gnu'">1</if> </set> <set var="WXNAMEPREFIX"> <if cond="TARGETING_WIN32=='1'">wxbase$(WXVERSIONTAG)$(WXLIBPOSTFIX)</if> ! <if cond="TARGETING_WIN32=='0'">wx_base</if> </set> <set var="WXNAMEPREFIXGUI"> <if cond="TARGETING_WIN32=='1'">wx$(WXPORTNAME)$(WXVERSIONTAG)$(WXLIBPOSTFIX)</if> ! <if cond="TARGETING_WIN32=='0'">wx_$(WXPORTNAME)</if> </set> --- 136,153 ---- <set var="WXVERSIONTAG"> ! <if cond="TARGETING_WIN32=='1' and WXVER=='25'">25</if> ! <if cond="TARGETING_WIN32=='1' and WXVER=='26'">26</if> ! <if cond="TARGETING_WIN32=='0' and WXVER=='25'">2.5</if> ! <if cond="TARGETING_WIN32=='0' and WXVER=='26'">2.6</if> </set> <set var="WXNAMEPREFIX"> <if cond="TARGETING_WIN32=='1'">wxbase$(WXVERSIONTAG)$(WXLIBPOSTFIX)</if> ! <if cond="TARGETING_WIN32=='0'">wx_base$(WXLIBPOSTFIX)</if> </set> <set var="WXNAMEPREFIXGUI"> <if cond="TARGETING_WIN32=='1'">wx$(WXPORTNAME)$(WXVERSIONTAG)$(WXLIBPOSTFIX)</if> ! <if cond="TARGETING_WIN32=='0'">wx_$(WXPORTNAME)$(WXLIBPOSTFIX)</if> </set> *************** *** 150,154 **** </if> <if cond="TARGETING_WIN32=='0'"> ! <sys-lib>lib$(WXNAMEPREFIX)$(WXVERSIONTAG)</sys-lib> </if> </define-tag> --- 161,165 ---- </if> <if cond="TARGETING_WIN32=='0'"> ! <sys-lib>$(WXNAMEPREFIX)-$(WXVERSIONTAG)</sys-lib> </if> </define-tag> *************** *** 160,164 **** </if> <if cond="TARGETING_WIN32=='0'"> ! <sys-lib>lib$(WXNAMEPREFIX)_$(value)$(WXVERSIONTAG)</sys-lib> </if> </define-tag> --- 171,175 ---- </if> <if cond="TARGETING_WIN32=='0'"> ! <sys-lib>$(WXNAMEPREFIX)_$(value)-$(WXVERSIONTAG)</sys-lib> </if> </define-tag> *************** *** 170,174 **** </if> <if cond="TARGETING_WIN32=='0'"> ! <sys-lib>lib$(WXNAMEPREFIXGUI)_$(value)$(WXVERSIONTAG)</sys-lib> </if> </define-tag> --- 181,185 ---- </if> <if cond="TARGETING_WIN32=='0'"> ! <sys-lib>$(WXNAMEPREFIXGUI)_$(value)-$(WXVERSIONTAG)</sys-lib> </if> </define-tag> *************** *** 180,184 **** </if> <if cond="TARGETING_WIN32=='0'"> ! <sys-lib>lib$(WXNAMEPREFIX)$(WXVERSIONTAG)</sys-lib> <!-- Already in wxlib. --> </if> </define-tag> --- 191,195 ---- </if> <if cond="TARGETING_WIN32=='0'"> ! <sys-lib>$(WXNAMEPREFIX)$(WXVERSIONTAG)</sys-lib> <!-- Already in wxlib. --> </if> </define-tag> *************** *** 201,204 **** --- 212,221 ---- <define>$(WXUSINGDLL)</define> <define>$(WXDEF_PLATEFORM)</define> + <if cond="PLATFORM_UNIX=='1'"> + <cppflags>`wx-config --cppflags`</cppflags> + </if> + <if cond="PLATFORM_UNIX=='1'"> + <ldflags>`wx-config --libs`</ldflags> + </if> </template> Index: install.bkl =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/build/install.bkl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** install.bkl 25 Apr 2005 15:40:14 -0000 1.1 --- install.bkl 22 Aug 2005 17:52:23 -0000 1.2 *************** *** 52,56 **** </data-files-tree> ! <!-- Install data. --> <data-files-tree > <srcdir>conf</srcdir> --- 52,75 ---- </data-files-tree> ! <!-- Install feature descriptor. --> ! <data-files-tree > ! <srcdir>features</srcdir> ! <install-to>$(DATADIR)/wxDevCenter/features</install-to> ! <files> ! StdPlugin/feature.xml ! </files> ! </data-files-tree> ! ! <!-- Install plugin descriptors. --> ! <data-files-tree > ! <srcdir>plugins</srcdir> ! <install-to>$(DATADIR)/wxDevCenter/plugins</install-to> ! <files> ! StdPlugin.Bitmap/plugin.xml ! StdPlugin.Text/plugin.xml ! </files> ! </data-files-tree> ! ! <!-- Install config. --> <data-files-tree > <srcdir>conf</srcdir> *************** *** 69,76 **** Text/Batch.conf Text/Bullant.conf ! Text/CLW no case.conf Text/CLW.conf Text/Config.conf ! Text/CPP no case.conf Text/CPP.conf Text/CSS.conf --- 88,95 ---- Text/Batch.conf Text/Bullant.conf ! "Text/CLW no case.conf" Text/CLW.conf Text/Config.conf ! "Text/CPP no case.conf" Text/CPP.conf Text/CSS.conf *************** *** 97,101 **** Text/MMIXAL.conf Text/MS-SQL.conf ! Text/NN Cron Table.conf Text/NSIS.conf Text/Octave.conf --- 116,120 ---- Text/MMIXAL.conf Text/MS-SQL.conf ! "Text/NN Cron Table.conf" Text/NSIS.conf Text/Octave.conf *************** *** 104,108 **** Text/PHP.conf Text/POV.conf ! Text/Power Basic.conf Text/Properties.conf Text/PS.conf --- 123,127 ---- Text/PHP.conf Text/POV.conf ! "Text/Power Basic.conf" Text/Properties.conf Text/PS.conf *************** *** 116,121 **** Text/Text.conf Text/Verilog.conf ! Text/Visual Basic Script.conf ! Text/Visual Basic.conf Text/XCode.conf Text/XML.conf --- 135,140 ---- Text/Text.conf Text/Verilog.conf ! "Text/Visual Basic Script.conf" ! "Text/Visual Basic.conf" Text/XCode.conf Text/XML.conf Index: StdPlugin.bkl =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/build/StdPlugin.bkl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** StdPlugin.bkl 14 May 2005 12:45:29 -0000 1.2 --- StdPlugin.bkl 22 Aug 2005 17:52:23 -0000 1.3 *************** *** 4,8 **** <set var="BUILDDIR">./build/$(BUILD)</set> ! <option name="WXDCINCLUDE"> --- 4,9 ---- <set var="BUILDDIR">./build/$(BUILD)</set> ! ! <set var="STDPLUGIN_VERSION">0.3.0</set> <option name="WXDCINCLUDE"> *************** *** 12,28 **** <option name="WXDCLIB"> <description>Additional path to find wxDevCenter include directory.</description> ! <values>../wxDevCenter/bin</values> ! </option> ! <option name="EXPORTBIN"> ! <description>Additional path prefix to export plugins.</description> ! <values>../wxDevCenter, .</values> ! <default-value>.</default-value> </option> - <dll id="Text" template="wxDLL"> ! <libname>StdPlugin.Text$(SUFFIX)</libname> ! <dirname>$(EXPORTBIN)/plugins/StdPlugin.Text</dirname> <include>$(WXDCINCLUDE)</include> <include>include</include> --- 13,23 ---- <option name="WXDCLIB"> <description>Additional path to find wxDevCenter include directory.</description> ! <values>../wxDevCenter/lib</values> </option> <dll id="Text" template="wxDLL"> ! <libname>Text-$(STDPLUGIN_VERSION)</libname> ! <dirname>./plugins/StdPlugin.Text</dirname> <include>$(WXDCINCLUDE)</include> <include>include</include> *************** *** 36,39 **** --- 31,35 ---- <wxlib-gui>adv</wxlib-gui> <wxlib-gui>stc</wxlib-gui> + <lib-path>$(WXDCLIB)</lib-path> <sys-lib>wxDevCenterLib</sys-lib> *************** *** 43,48 **** <dll id="Bitmap" template="wxDLL"> ! <libname>StdPlugin.Bitmap$(SUFFIX)</libname> ! <dirname>$(EXPORTBIN)/plugins/StdPlugin.Bitmap</dirname> <include>$(WXDCINCLUDE)</include> <include>include</include> --- 39,44 ---- <dll id="Bitmap" template="wxDLL"> ! <libname>Bitmap-$(STDPLUGIN_VERSION)</libname> ! <dirname>./plugins/StdPlugin.Bitmap</dirname> <include>$(WXDCINCLUDE)</include> <include>include</include> *************** *** 51,55 **** src/BitmapDocView.cpp src/Controls.cpp ! src/extMouse.cpp </sources> --- 47,51 ---- src/BitmapDocView.cpp src/Controls.cpp ! src/extmouse.cpp </sources> *************** *** 57,60 **** --- 53,57 ---- <wxlib-gui>core</wxlib-gui> <wxlib-gui>adv</wxlib-gui> + <lib-path>$(WXDCLIB)</lib-path> <sys-lib>wxDevCenterLib</sys-lib> |
|
From: Emilien K. <cur...@us...> - 2005-08-22 17:52:30
|
Update of /cvsroot/wxdevcenter/StdPlugin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9144 Modified Files: GNUmakefile Log Message: Error in bakefiles. protect file names containing spaces with ". Index: GNUmakefile =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/GNUmakefile,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** GNUmakefile 22 Aug 2005 17:00:57 -0000 1.1 --- GNUmakefile 22 Aug 2005 17:52:22 -0000 1.2 *************** *** 166,170 **** done $(INSTALL) -d $(prefix)/share/wxDevCenter/conf ! for f in Text.conf Text/.conf Text/ADA.conf Text/APDL.conf Text/ASM.conf Text/ASP.conf Text/AU3.conf Text/AVE.conf Text/BAAM.conf Text/BASH.conf Text/Batch.conf Text/Bullant.conf Text/CLW no case.conf Text/CLW.conf Text/Config.conf Text/CPP no case.conf Text/CPP.conf Text/CSS.conf Text/Diff.conf Text/Eiffel.conf Text/EiffelKW.conf Text/ERLANG.conf Text/Error list.conf Text/ESCRIPT.conf Text/F77.conf Text/FORTH.conf Text/Fortran.conf Text/GUI2CLI.conf Text/HTML.conf Text/KIX.conf Text/LaTeX.conf Text/Lisp.conf Text/LOT.conf Text/LOUT.conf Text/LUA.conf Text/Makefile.conf Text/MATLab.conf Text/METAPOST.conf Text/MMIXAL.conf Text/MS-SQL.conf Text/NN Cron Table.conf Text/NSIS.conf Text/Octave.conf Text/Pascal.conf Text/Perl.conf Text/PHP.conf Text/POV.conf Text/Power Basic.conf Text/Properties.conf Text/PS.conf Text/Python.conf Text/Ruby.conf Text/Scriptol.conf Text/SPECMAN.conf Text/SQL.conf Text/TCL.conf Text/TeX.conf Text/Text.conf Text/Verilog.conf Text/Visual Basic Script.conf Text/Visual Basic.conf Text/XCode.conf Text/XML.conf Text/YAML.conf; do \ if test ! -d $(prefix)/share/wxDevCenter/conf/`dirname $$f` ; then \ $(INSTALL) -d $(prefix)/share/wxDevCenter/conf/`dirname $$f`; \ --- 166,170 ---- done $(INSTALL) -d $(prefix)/share/wxDevCenter/conf ! for f in Text.conf Text/.conf Text/ADA.conf Text/APDL.conf Text/ASM.conf Text/ASP.conf Text/AU3.conf Text/AVE.conf Text/BAAM.conf Text/BASH.conf Text/Batch.conf Text/Bullant.conf "Text/CLW no case.conf" Text/CLW.conf Text/Config.conf "Text/CPP no case.conf" Text/CPP.conf Text/CSS.conf Text/Diff.conf Text/Eiffel.conf Text/EiffelKW.conf Text/ERLANG.conf Text/Error list.conf Text/ESCRIPT.conf Text/F77.conf Text/FORTH.conf Text/Fortran.conf Text/GUI2CLI.conf Text/HTML.conf Text/KIX.conf Text/LaTeX.conf Text/Lisp.conf Text/LOT.conf Text/LOUT.conf Text/LUA.conf Text/Makefile.conf Text/MATLab.conf Text/METAPOST.conf Text/MMIXAL.conf Text/MS-SQL.conf "Text/NN Cron Table.conf" Text/NSIS.conf Text/Octave.conf Text/Pascal.conf Text/Perl.conf Text/PHP.conf Text/POV.conf "Text/Power Basic.conf" Text/Properties.conf Text/PS.conf Text/Python.conf Text/Ruby.conf Text/Scriptol.conf Text/SPECMAN.conf Text/SQL.conf Text/TCL.conf Text/TeX.conf Text/Text.conf Text/Verilog.conf "Text/Visual Basic Script.conf" "Text/Visual Basic.conf" Text/XCode.conf Text/XML.conf Text/YAML.conf; do \ if test ! -d $(prefix)/share/wxDevCenter/conf/`dirname $$f` ; then \ $(INSTALL) -d $(prefix)/share/wxDevCenter/conf/`dirname $$f`; \ |
|
From: Emilien K. <cur...@us...> - 2005-08-22 17:01:06
|
Update of /cvsroot/wxdevcenter/StdPlugin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28685 Added Files: GNUmakefile Log Message: Initial commit. --- NEW FILE: GNUmakefile --- # ========================================================================= # This makefile was generated by # Bakefile 0.1.9 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= # ------------------------------------------------------------------------- # These are configurable options: # ------------------------------------------------------------------------- # 'install' program location INSTALL = install # Location where the package is installed by 'make install' prefix = /usr/local # C++ compiler CXX = g++ # Standard flags for C++ CXXFLAGS = # Standard preprocessor flags (common for CC and CXX) CPPFLAGS = # Standard linker flags LDFLAGS = # What type of library to build ? [0,1] SHARED = 1 # Compile Unicode build of wxWidgets ? [0,1] UNICODE = 0 # Type of compiled binaries. [debug,release] BUILD = release # Version of wxWidgets. [25, 26] WXVER = 26 # Port to use for wxWidgets library. [msw,gtk,gtk2,x11,mac,os2] WXPORTNAME = gtk2 # Additional path to find wxDevCenter include directory. [../wxDevCenter/include] WXDCINCLUDE = # Additional path to find wxDevCenter include directory. [../wxDevCenter/lib] WXDCLIB = # ------------------------------------------------------------------------- # Do not modify the rest of this file! # ------------------------------------------------------------------------- ### Variables: ### CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD TEXT_CXXFLAGS = -D_THREAD_SAFE -pthread $(__WARNINGS) $(__UNICODE_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__OPTIMIZEFLAG) $(__DEBUGINFO) $(__WXUSINGDLL_p) \ `wx-config --cppflags` -I$(WXDCINCLUDE) -Iinclude -fPIC -DPIC $(CPPFLAGS) \ $(CXXFLAGS) TEXT_OBJECTS = \ ./build/$(BUILD)/Text_Controls.o \ ./build/$(BUILD)/Text_SimpleTextDocView.o BITMAP_CXXFLAGS = -D_THREAD_SAFE -pthread $(__WARNINGS) $(__UNICODE_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__OPTIMIZEFLAG) $(__DEBUGINFO) $(__WXUSINGDLL_p) \ `wx-config --cppflags` -I$(WXDCINCLUDE) -Iinclude -fPIC -DPIC $(CPPFLAGS) \ $(CXXFLAGS) BITMAP_OBJECTS = \ ./build/$(BUILD)/Bitmap_BitmapCtrl.o \ ./build/$(BUILD)/Bitmap_BitmapDocView.o \ ./build/$(BUILD)/Bitmap_Controls.o \ ./build/$(BUILD)/Bitmap_extmouse.o ### Conditionally set variables: ### ifeq ($(BUILD),debug) ifeq ($(UNICODE),1) WXLIBPOSTFIX = ud endif endif ifeq ($(BUILD),debug) ifeq ($(UNICODE),0) WXLIBPOSTFIX = d endif endif ifeq ($(BUILD),release) ifeq ($(UNICODE),1) WXLIBPOSTFIX = u endif endif ifeq ($(WXVER),25) WXVERSIONTAG = 2.5 endif ifeq ($(WXVER),26) WXVERSIONTAG = 2.6 endif ifeq ($(BUILD),debug) __WARNINGS = -W -Wall endif ifeq ($(BUILD),release) __WARNINGS = endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -D_UNICODE endif ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) __OPTIMIZEFLAG = -O0 endif ifeq ($(BUILD),release) __OPTIMIZEFLAG = -O2 endif ifeq ($(SHARED),1) __WXUSINGDLL_p = -DWXUSINGDLL endif ifeq ($(BUILD),debug) __DEBUGINFO = -g endif ifeq ($(BUILD),release) __DEBUGINFO = endif all: ./build/$(BUILD) ./build/$(BUILD): @mkdir -p ./build/$(BUILD) ### Targets: ### all: ./plugins/StdPlugin.Text/libText-0.3.0.so ./plugins/StdPlugin.Bitmap/libBitmap-0.3.0.so install: all install_Text install_Bitmap $(INSTALL) -d $(prefix)/include/wxDevCenter for f in StdPlugin.h StdPlugin/BitmapCtrl.h StdPlugin/BitmapDocView.h StdPlugin/Controls.h StdPlugin/extmouse.h StdPlugin/language.h StdPlugin/OrganigramPanel.h StdPlugin/SimpleTextDocView.h; do \ if test ! -d $(prefix)/include/wxDevCenter/`dirname $$f` ; then \ $(INSTALL) -d $(prefix)/include/wxDevCenter/`dirname $$f`; \ fi; \ $(INSTALL) -m 644 include/wxDevCenter//$$f $(prefix)/include/wxDevCenter/$$f; \ done $(INSTALL) -d $(prefix)/share/wxDevCenter/data for f in icons/filetypes/bmp.ico icons/filetypes/txt.ico img/scintilla.png img/bmp/brush.png img/bmp/DOT.png img/bmp/DOT_DASH.PNG img/bmp/ellipse.png img/bmp/handdraw.png img/bmp/line.png img/bmp/LONG_DASH.PNG img/bmp/rect.png img/bmp/rrect.png img/bmp/selall.png img/bmp/selcopy.png img/bmp/selcut.png img/bmp/selection.png img/bmp/selmove.png img/bmp/selpaste.png img/bmp/selremove.png img/bmp/sizeall.png img/bmp/SHORT_DASH.PNG img/bmp/SOLID.PNG img/bmp/spray.png img/bmp/TRANSPARENT.PNG; do \ if test ! -d $(prefix)/share/wxDevCenter/data/`dirname $$f` ; then \ $(INSTALL) -d $(prefix)/share/wxDevCenter/data/`dirname $$f`; \ fi; \ $(INSTALL) -m 644 data//$$f $(prefix)/share/wxDevCenter/data/$$f; \ done $(INSTALL) -d $(prefix)/share/wxDevCenter/features for f in StdPlugin/feature.xml; do \ if test ! -d $(prefix)/share/wxDevCenter/features/`dirname $$f` ; then \ $(INSTALL) -d $(prefix)/share/wxDevCenter/features/`dirname $$f`; \ fi; \ $(INSTALL) -m 644 features//$$f $(prefix)/share/wxDevCenter/features/$$f; \ done $(INSTALL) -d $(prefix)/share/wxDevCenter/plugins for f in StdPlugin.Bitmap/plugin.xml StdPlugin.Text/plugin.xml; do \ if test ! -d $(prefix)/share/wxDevCenter/plugins/`dirname $$f` ; then \ $(INSTALL) -d $(prefix)/share/wxDevCenter/plugins/`dirname $$f`; \ fi; \ $(INSTALL) -m 644 plugins//$$f $(prefix)/share/wxDevCenter/plugins/$$f; \ done $(INSTALL) -d $(prefix)/share/wxDevCenter/conf for f in Text.conf Text/.conf Text/ADA.conf Text/APDL.conf Text/ASM.conf Text/ASP.conf Text/AU3.conf Text/AVE.conf Text/BAAM.conf Text/BASH.conf Text/Batch.conf Text/Bullant.conf Text/CLW no case.conf Text/CLW.conf Text/Config.conf Text/CPP no case.conf Text/CPP.conf Text/CSS.conf Text/Diff.conf Text/Eiffel.conf Text/EiffelKW.conf Text/ERLANG.conf Text/Error list.conf Text/ESCRIPT.conf Text/F77.conf Text/FORTH.conf Text/Fortran.conf Text/GUI2CLI.conf Text/HTML.conf Text/KIX.conf Text/LaTeX.conf Text/Lisp.conf Text/LOT.conf Text/LOUT.conf Text/LUA.conf Text/Makefile.conf Text/MATLab.conf Text/METAPOST.conf Text/MMIXAL.conf Text/MS-SQL.conf Text/NN Cron Table.conf Text/NSIS.conf Text/Octave.conf Text/Pascal.conf Text/Perl.conf Text/PHP.conf Text/POV.conf Text/Power Basic.conf Text/Properties.conf Text/PS.conf Text/Python.conf Text/Ruby.conf Text/Scriptol.conf Text/SPECMAN.conf Text/SQL.conf Text/TCL.conf Text/TeX.conf Text/Text.conf Text/Verilog.conf Text/Visual Basic Script.conf Text/Visual Basic.conf Text/XCode.conf Text/XML.conf Text/YAML.conf; do \ if test ! -d $(prefix)/share/wxDevCenter/conf/`dirname $$f` ; then \ $(INSTALL) -d $(prefix)/share/wxDevCenter/conf/`dirname $$f`; \ fi; \ $(INSTALL) -m 644 conf//$$f $(prefix)/share/wxDevCenter/conf/$$f; \ done uninstall: clean: rm -f ./build/$(BUILD)/*.o rm -f ./build/$(BUILD)/*.d rm -f ./plugins/StdPlugin.Text/libText-0.3.0.so rm -f ./plugins/StdPlugin.Text/libText-0.3.0.so rm -f ./plugins/StdPlugin.Bitmap/libBitmap-0.3.0.so rm -f ./plugins/StdPlugin.Bitmap/libBitmap-0.3.0.so ./plugins/StdPlugin.Text/libText-0.3.0.so: $(TEXT_OBJECTS) $(CXX) -shared -fPIC -o $@ $(TEXT_OBJECTS) $(LDFLAGS) -pthread $(__DEBUGINFO) `wx-config --libs` -L$(WXDCLIB) -lwx_base$(WXLIBPOSTFIX)-$(WXVERSIONTAG) -lwx_base$(WXLIBPOSTFIX)-$(WXVERSIONTAG) -lwx_$(WXPORTNAME)$(WXLIBPOSTFIX)_core-$(WXVERSIONTAG) -lwx_$(WXPORTNAME)$(WXLIBPOSTFIX)_adv-$(WXVERSIONTAG) -lwx_$(WXPORTNAME)$(WXLIBPOSTFIX)_stc-$(WXVERSIONTAG) -lwxDevCenterLib install_Text: $(INSTALL) -d $(prefix)/lib/wxDevCenter/plugins/StdPlugin.Text $(INSTALL) -m 644 ./plugins/StdPlugin.Text/libText-0.3.0.so $(prefix)/lib/wxDevCenter/plugins/StdPlugin.Text install -c ./plugins/StdPlugin.Text/libText-0.3.0.so $(prefix)/lib/wxDevCenter/plugins/StdPlugin.Text ./plugins/StdPlugin.Bitmap/libBitmap-0.3.0.so: $(BITMAP_OBJECTS) $(CXX) -shared -fPIC -o $@ $(BITMAP_OBJECTS) $(LDFLAGS) -pthread $(__DEBUGINFO) `wx-config --libs` -L$(WXDCLIB) -lwx_base$(WXLIBPOSTFIX)-$(WXVERSIONTAG) -lwx_base$(WXLIBPOSTFIX)-$(WXVERSIONTAG) -lwx_$(WXPORTNAME)$(WXLIBPOSTFIX)_core-$(WXVERSIONTAG) -lwx_$(WXPORTNAME)$(WXLIBPOSTFIX)_adv-$(WXVERSIONTAG) -lwxDevCenterLib install_Bitmap: $(INSTALL) -d $(prefix)/lib/wxDevCenter/plugins/StdPlugin.Bitmap $(INSTALL) -m 644 ./plugins/StdPlugin.Bitmap/libBitmap-0.3.0.so $(prefix)/lib/wxDevCenter/plugins/StdPlugin.Bitmap install -c ./plugins/StdPlugin.Bitmap/libBitmap-0.3.0.so $(prefix)/lib/wxDevCenter/plugins/StdPlugin.Bitmap ./build/$(BUILD)/Text_Controls.o: ./src/Controls.cpp $(CXX) -c -o $@ $(TEXT_CXXFLAGS) $(CPPDEPS) $< ./build/$(BUILD)/Text_SimpleTextDocView.o: ./src/SimpleTextDocView.cpp $(CXX) -c -o $@ $(TEXT_CXXFLAGS) $(CPPDEPS) $< ./build/$(BUILD)/Bitmap_BitmapCtrl.o: ./src/BitmapCtrl.cpp $(CXX) -c -o $@ $(BITMAP_CXXFLAGS) $(CPPDEPS) $< ./build/$(BUILD)/Bitmap_BitmapDocView.o: ./src/BitmapDocView.cpp $(CXX) -c -o $@ $(BITMAP_CXXFLAGS) $(CPPDEPS) $< ./build/$(BUILD)/Bitmap_Controls.o: ./src/Controls.cpp $(CXX) -c -o $@ $(BITMAP_CXXFLAGS) $(CPPDEPS) $< ./build/$(BUILD)/Bitmap_extmouse.o: ./src/extmouse.cpp $(CXX) -c -o $@ $(BITMAP_CXXFLAGS) $(CPPDEPS) $< .PHONY: all install uninstall clean install_Text install_Bitmap # Dependencies tracking: -include ./build/$(BUILD)/*.d |
|
From: Emilien K. <cur...@us...> - 2005-08-17 16:35:04
|
Update of /cvsroot/wxdevcenter/StdPlugin/include/wxDevCenter/StdPlugin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28833/include/wxDevCenter/StdPlugin Modified Files: SimpleTextDocView.h BitmapDocView.h BitmapCtrl.h Log Message: Use of wxInput/OutputStream instead of Archive to serialize documents and projects. Index: BitmapCtrl.h =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/include/wxDevCenter/StdPlugin/BitmapCtrl.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** BitmapCtrl.h 12 Apr 2005 12:10:55 -0000 1.11 --- BitmapCtrl.h 17 Aug 2005 16:34:55 -0000 1.12 *************** *** 152,156 **** * @return Point en coordonnées bitmap. (-1,-1) si en dehors de l'image.*/ wxPoint ClientToBitmap(wxPoint ptClient)const; ! wxSize ClientToBitmap(wxSize szClient)const{register wxPoint pt(ClientToBitmap(wxPoint(szClient.x, szClient.y))); return wxSize(pt.x, pt.y);} wxRect ClientToBitmap(wxRect r)const{return wxRect(ClientToBitmap(r.GetPosition()), ClientToBitmap(r.GetSize()));} /** Calcul les coordonnées dans la zone cliente à partir des coordonnées bitmap. --- 152,156 ---- * @return Point en coordonnées bitmap. (-1,-1) si en dehors de l'image.*/ wxPoint ClientToBitmap(wxPoint ptClient)const; ! wxSize ClientToBitmap(wxSize szClient)const{wxPoint pt(ClientToBitmap(wxPoint(szClient.x, szClient.y))); return wxSize(pt.x, pt.y);} wxRect ClientToBitmap(wxRect r)const{return wxRect(ClientToBitmap(r.GetPosition()), ClientToBitmap(r.GetSize()));} /** Calcul les coordonnées dans la zone cliente à partir des coordonnées bitmap. *************** *** 158,162 **** * @return Point en coordonnées clientes.*/ wxPoint BitmapToClient(wxPoint ptBitmap)const; ! wxSize BitmapToClient(wxSize szClient)const{register wxPoint pt(BitmapToClient(wxPoint(szClient.x, szClient.y))); return wxSize(pt.x, pt.y);} wxRect BitmapToClient(wxRect r)const{return wxRect(BitmapToClient(r.GetPosition()), BitmapToClient(r.GetSize()));} /** Flags de test de position.*/ --- 158,162 ---- * @return Point en coordonnées clientes.*/ wxPoint BitmapToClient(wxPoint ptBitmap)const; ! wxSize BitmapToClient(wxSize szClient)const{wxPoint pt(BitmapToClient(wxPoint(szClient.x, szClient.y))); return wxSize(pt.x, pt.y);} wxRect BitmapToClient(wxRect r)const{return wxRect(BitmapToClient(r.GetPosition()), BitmapToClient(r.GetSize()));} /** Flags de test de position.*/ Index: BitmapDocView.h =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/include/wxDevCenter/StdPlugin/BitmapDocView.h,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** BitmapDocView.h 25 Apr 2005 15:40:14 -0000 1.19 --- BitmapDocView.h 17 Aug 2005 16:34:55 -0000 1.20 *************** *** 27,32 **** - class wxDevCenter::Archive; - namespace StdPlugin --- 27,30 ---- *************** *** 294,300 **** /** Charge le texte depuis l'archive.*/ ! bool LoadDocument(wxDevCenter::Archive *ar); /** Sauvegarde le texte depuis l'archive.*/ ! bool SaveDocument(wxDevCenter::Archive *ar); virtual bool OnNewDocument(); --- 292,298 ---- /** Charge le texte depuis l'archive.*/ ! bool LoadDocument(wxInputStream* in); /** Sauvegarde le texte depuis l'archive.*/ ! bool SaveDocument(wxOutputStream* out); virtual bool OnNewDocument(); *************** *** 581,587 **** wxImage m_Image; /** Initialisation du document.*/ ! virtual bool OnInitialize(wxDevCenter::Archive *pArchive); /** Modification du document.*/ ! virtual bool OnFileModified(wxDevCenter::Archive *pArchive); public: /** Constructeur.*/ --- 579,585 ---- wxImage m_Image; /** Initialisation du document.*/ ! virtual bool OnInitialize(wxInputStream* in); /** Modification du document.*/ ! virtual bool OnFileModified(wxInputStream* in); public: /** Constructeur.*/ Index: SimpleTextDocView.h =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/include/wxDevCenter/StdPlugin/SimpleTextDocView.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** SimpleTextDocView.h 7 Mar 2005 15:23:53 -0000 1.9 --- SimpleTextDocView.h 17 Aug 2005 16:34:55 -0000 1.10 *************** *** 184,190 **** /** Charge le texte depuis l'archive.*/ ! bool LoadDocument(wxDevCenter::Archive *ar); /** Sauvegarde le texte depuis l'archive.*/ ! bool SaveDocument(wxDevCenter::Archive *ar); virtual bool CanCloseDocument(); --- 184,190 ---- /** Charge le texte depuis l'archive.*/ ! bool LoadDocument(wxInputStream* in); /** Sauvegarde le texte depuis l'archive.*/ ! bool SaveDocument(wxOutputStream* out); virtual bool CanCloseDocument(); *************** *** 307,317 **** /** Interception de l'évènement menu : Affichage/Options.*/ void OnShowOptions(wxCommandEvent& event); ! /** Interception des évènements menu : Langage/* .*/ void OnLangage(wxCommandEvent& event); ! /** Prépare les menus Langage/* .*/ void OnUpdateLangageUI(wxUpdateUIEvent& event); /** Intercepte l'évènement clic sur une marge.*/ void OnMarginClick(wxStyledTextEvent& event); ! /** Intercepte les évènements menus Rechercher/* .*/ void OnFindMenu(wxCommandEvent &event); /** Intercepte les évènements liés à la boite de dialogue rechercher/remplacer.*/ --- 307,317 ---- /** Interception de l'évènement menu : Affichage/Options.*/ void OnShowOptions(wxCommandEvent& event); ! /** Interception des évènements menu : Langage/ * .*/ void OnLangage(wxCommandEvent& event); ! /** Prépare les menus Langage/ * .*/ void OnUpdateLangageUI(wxUpdateUIEvent& event); /** Intercepte l'évènement clic sur une marge.*/ void OnMarginClick(wxStyledTextEvent& event); ! /** Intercepte les évènements menus Rechercher/ * .*/ void OnFindMenu(wxCommandEvent &event); /** Intercepte les évènements liés à la boite de dialogue rechercher/remplacer.*/ |
|
From: Emilien K. <cur...@us...> - 2005-08-17 16:35:04
|
Update of /cvsroot/wxdevcenter/StdPlugin/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28833/src Modified Files: BitmapDocView.cpp BitmapCtrl.cpp SimpleTextDocView.cpp Log Message: Use of wxInput/OutputStream instead of Archive to serialize documents and projects. Index: SimpleTextDocView.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/src/SimpleTextDocView.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** SimpleTextDocView.cpp 14 May 2005 12:45:33 -0000 1.12 --- SimpleTextDocView.cpp 17 Aug 2005 16:34:55 -0000 1.13 *************** *** 26,29 **** --- 26,31 ---- #include <wxDevCenter/StdPlugin/SimpleTextDocView.h> + #include <wx/stream.h> + #include <wx/sstream.h> #include <wx/stc/stc.h> #include <wx/choice.h> *************** *** 191,195 **** pLang->iFolds = Config.Read(WXDC_SIMPLETEXT_VIEWCONFIGFOLDS, pLang->iFolds); ! wxLogDebug("Lang %02d : %s - %s", iLang, pLang->strShortName, pLang->strName); for(NumKeyword = 0; NumKeyword<=wxSTC_KEYWORDSET_MAX; NumKeyword++) --- 193,197 ---- pLang->iFolds = Config.Read(WXDC_SIMPLETEXT_VIEWCONFIGFOLDS, pLang->iFolds); ! wxLogDebug(wxT("Lang %02d : %s - %s"), iLang, pLang->strShortName.GetData(), pLang->strName.GetData()); for(NumKeyword = 0; NumKeyword<=wxSTC_KEYWORDSET_MAX; NumKeyword++) *************** *** 566,588 **** ! bool SimpleTextDocument::LoadDocument(wxDevCenter::Archive *ar) { ! char *pBuffer = new wxChar[65536]; ! int iSize; ! m_strText.Empty(); ! while(!ar->Eof()) ! { ! ar->Read(pBuffer, 65535); ! iSize = ar->LastRead(); ! if(iSize<65535) ! pBuffer[iSize] = 0; ! m_strText.Append(pBuffer); ! } ! delete [] pBuffer; return true; } ! bool SimpleTextDocument::SaveDocument(wxDevCenter::Archive *ar) { View *pView; --- 568,582 ---- ! bool SimpleTextDocument::LoadDocument(wxInputStream* in) { ! m_strText.Empty(); ! wxStringOutputStream SOS(&m_strText); ! SOS.Write(*in); ! return true; } ! bool SimpleTextDocument::SaveDocument(wxOutputStream* out) { View *pView; *************** *** 600,605 **** if(pTextView==NULL) return false; m_strText = pTextView->GetText(); ! ar->Write((const void*)(const char*)m_strText, m_strText.Length()); return true; } --- 594,603 ---- if(pTextView==NULL) return false; + m_strText = pTextView->GetText(); ! ! wxStringInputStream SIS(m_strText); ! SIS.Read(*out); ! return true; } Index: BitmapCtrl.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/src/BitmapCtrl.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** BitmapCtrl.cpp 12 Apr 2005 12:10:55 -0000 1.15 --- BitmapCtrl.cpp 17 Aug 2005 16:34:55 -0000 1.16 *************** *** 86,90 **** dc.BeginDrawing(); dc.SetUserScale(dScale, dScale); ! dc.SetDeviceOrigin((m_ptOrigin.x-GetScrollPos(wxHORIZONTAL))*dScale, (m_ptOrigin.y-GetScrollPos(wxVERTICAL))*dScale); dc.DrawBitmap(m_Bmp, 0, 0); --- 86,90 ---- dc.BeginDrawing(); dc.SetUserScale(dScale, dScale); ! dc.SetDeviceOrigin((wxCoord)(m_ptOrigin.x-GetScrollPos(wxHORIZONTAL))*dScale, (wxCoord)(m_ptOrigin.y-GetScrollPos(wxVERTICAL))*dScale); dc.DrawBitmap(m_Bmp, 0, 0); *************** *** 218,222 **** { wxSize szc = GetClientSize(); ! wxPoint pt(m_Bmp.GetWidth()*ZoomToScale(), m_Bmp.GetHeight()*ZoomToScale()); pt.x = -(szc.x - pt.x)/2; --- 218,222 ---- { wxSize szc = GetClientSize(); ! wxPoint pt((wxCoord)m_Bmp.GetWidth()*ZoomToScale(), (wxCoord)m_Bmp.GetHeight()*ZoomToScale()); pt.x = -(szc.x - pt.x)/2; *************** *** 272,277 **** wxPoint BitmapCtrl::ClientToBitmap(wxPoint ptClient)const { ! ptClient.x /= ZoomToScale(); ! ptClient.y /= ZoomToScale(); ptClient += wxPoint(GetScrollPos(wxHORIZONTAL), GetScrollPos(wxVERTICAL)); --- 272,277 ---- wxPoint BitmapCtrl::ClientToBitmap(wxPoint ptClient)const { ! ptClient.x = (wxCoord) (ptClient.x/ZoomToScale()); ! ptClient.y = (wxCoord) (ptClient.y/ZoomToScale()); ptClient += wxPoint(GetScrollPos(wxHORIZONTAL), GetScrollPos(wxVERTICAL)); *************** *** 287,292 **** ptBitmap -= wxPoint(GetScrollPos(wxHORIZONTAL), GetScrollPos(wxVERTICAL)); ! ptBitmap.x *= ZoomToScale(); ! ptBitmap.y *= ZoomToScale(); return ptBitmap; --- 287,292 ---- ptBitmap -= wxPoint(GetScrollPos(wxHORIZONTAL), GetScrollPos(wxVERTICAL)); ! ptBitmap.x = (wxCoord) (ptBitmap.x*ZoomToScale()); ! ptBitmap.y = (wxCoord) (ptBitmap.y*ZoomToScale()); return ptBitmap; Index: BitmapDocView.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/src/BitmapDocView.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** BitmapDocView.cpp 14 May 2005 12:45:32 -0000 1.25 --- BitmapDocView.cpp 17 Aug 2005 16:34:55 -0000 1.26 *************** *** 442,445 **** --- 442,447 ---- BitmapDrawEllipse(m_pDoc->GetBitmap(), m_rect, m_pen, m_brush); break; + default: + break; } m_pDoc->UpdateAllViews(NULL, 1, &r); *************** *** 592,599 **** ! bool BitmapDocument::LoadDocument(wxDevCenter::Archive *ar) { wxImage Img; ! if(!Img.LoadFile((wxInputStream&)*ar)) { wxMessageBox(WXDC_BITMAP_ERROR_LOAD); --- 594,601 ---- ! bool BitmapDocument::LoadDocument(wxInputStream* in) { wxImage Img; ! if(!Img.LoadFile(*in)) { wxMessageBox(WXDC_BITMAP_ERROR_LOAD); *************** *** 605,609 **** ! bool BitmapDocument::SaveDocument(wxDevCenter::Archive* ar) { int type = GetBitmapType(GetDocumentPath()); --- 607,611 ---- ! bool BitmapDocument::SaveDocument(wxOutputStream* out) { int type = GetBitmapType(GetDocumentPath()); *************** *** 616,620 **** wxImage Img = m_Bmp.ConvertToImage(); ! if(!Img.SaveFile((wxOutputStream&)*ar, type)) { wxMessageBox(WXDC_BITMAP_ERROR_SAVE); --- 618,622 ---- wxImage Img = m_Bmp.ConvertToImage(); ! if(!Img.SaveFile(*out, type)) { wxMessageBox(WXDC_BITMAP_ERROR_SAVE); *************** *** 1222,1225 **** --- 1224,1229 ---- SetCursor(*wxSTANDARD_CURSOR); break; + default: + break; } *************** *** 1250,1253 **** --- 1254,1259 ---- SetStatusText(wxString::Format("(%d,%d)",pt.x-m_pt.x, pt.y-m_pt.y)); break; + default: + break; } *************** *** 1322,1325 **** --- 1328,1333 ---- break; + default: + break; } } *************** *** 1380,1384 **** ChangeTool(BVD_NONE); break; ! */ } } --- 1388,1395 ---- ChangeTool(BVD_NONE); break; ! */ ! default: ! break; ! } } *************** *** 1436,1440 **** GetDocument()->ResizeBitmap(r.GetSize(), m_Brush); break; ! */ } } --- 1447,1454 ---- GetDocument()->ResizeBitmap(r.GetSize(), m_Brush); break; ! */ ! default: ! break; ! } } *************** *** 1450,1453 **** --- 1464,1469 ---- SetCursor(*wxSTANDARD_CURSOR); break; + default: + break; } *************** *** 1466,1469 **** --- 1482,1487 ---- m_pBitmapCtrl->Refresh(); break; + default: + break; } } *************** *** 1480,1483 **** --- 1498,1503 ---- event.Enable(GetDocument()->HasSelection()); break; + default: + break; } } *************** *** 1585,1597 **** /** Initialisation du document.*/ ! bool BitmapMiniDoc::OnInitialize(Archive *pArchive) { ! return m_Image.LoadFile((wxInputStream&)*pArchive, wxBITMAP_TYPE_ANY); } /** Modification du document.*/ ! bool BitmapMiniDoc::OnFileModified(Archive *pArchive) { ! return m_Image.LoadFile((wxInputStream&)*pArchive, wxBITMAP_TYPE_ANY); } --- 1605,1617 ---- /** Initialisation du document.*/ ! bool BitmapMiniDoc::OnInitialize(wxInputStream* in) { ! return m_Image.LoadFile(*in, wxBITMAP_TYPE_ANY); } /** Modification du document.*/ ! bool BitmapMiniDoc::OnFileModified(wxInputStream* in) { ! return m_Image.LoadFile(*in, wxBITMAP_TYPE_ANY); } |
|
From: Emilien K. <cur...@us...> - 2005-08-17 16:33:28
|
Update of /cvsroot/wxdevcenter/wxDevCenter/src/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28502/src/msw Modified Files: FileSystemStandard.cpp Log Message: Use of wxInput/OutputStream instead of Archive to serialize documents and projects. Index: FileSystemStandard.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/msw/FileSystemStandard.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** FileSystemStandard.cpp 19 Apr 2005 09:30:46 -0000 1.4 --- FileSystemStandard.cpp 17 Aug 2005 16:33:18 -0000 1.5 *************** *** 69,77 **** - Archive* FileSystemStandardWindows::GetFileArchive(FilePath strPath, unsigned int nMode) - { - return new ArchiveFile(LogicalToPhysical(strPath), (Archive::ARCHIVE_OPEN_MODE)nMode); - } - wxString FileSystemStandardWindows::FindFirst(FilePath strPath, int iFlags) { --- 69,72 ---- |
|
From: Emilien K. <cur...@us...> - 2005-08-17 16:33:27
|
Update of /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28502/include/wxDevCenter/msw Modified Files: FileSystemStandard.h Log Message: Use of wxInput/OutputStream instead of Archive to serialize documents and projects. Index: FileSystemStandard.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/msw/FileSystemStandard.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FileSystemStandard.h 7 Mar 2005 15:23:03 -0000 1.2 --- FileSystemStandard.h 17 Aug 2005 16:33:19 -0000 1.3 *************** *** 78,81 **** --- 78,86 ---- wxString LogicalToPhysical(FilePath strPath); + /** Retourne le chemin physique d'un fichier depuis son chemin logique. + * @param strFilePath Chemin logique du fichier. + * @return Chemin physique du fichier.*/ + virtual wxString GetPhysicalFilePath(FilePath strFilePath){return LogicalToPhysical(strFilePath);} + /** Peuple le Drapeau des disques.*/ void PopulateDrives(); |
|
From: Emilien K. <cur...@us...> - 2005-08-17 16:33:26
|
Update of /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/unix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28502/include/wxDevCenter/unix Modified Files: FileSystemStandard.h Log Message: Use of wxInput/OutputStream instead of Archive to serialize documents and projects. Index: FileSystemStandard.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/unix/FileSystemStandard.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FileSystemStandard.h 17 Aug 2005 15:01:06 -0000 1.2 --- FileSystemStandard.h 17 Aug 2005 16:33:18 -0000 1.3 *************** *** 60,65 **** bool IsDirectory(FilePath strPath); int GetDirectorySystemType(FilePath strPath); - - Archive* GetFileArchive(FilePath strPath, unsigned int nMode); }; --- 60,63 ---- |
|
From: Emilien K. <cur...@us...> - 2005-08-17 16:33:26
|
Update of /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28502/include/wxDevCenter Modified Files: DocView.h Project.h FileSystem.h FileSystemStandard.h Application.h Log Message: Use of wxInput/OutputStream instead of Archive to serialize documents and projects. Index: Project.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/Project.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Project.h 14 May 2005 12:15:55 -0000 1.7 --- Project.h 17 Aug 2005 16:33:17 -0000 1.8 *************** *** 82,93 **** /** Méthode d'ouverture de projet. * Appelé lorqu'un projet est ouvert. ! * @param ar Archive de lecture des données du projet. * @return Faux si erreur de chargement.*/ ! virtual bool OnOpenProject(Archive& ar); /** Méthode de sauvegarde de projet. * Appelé lorsqu'un projet doit sauvegarder ses données. ! * @param ar Archive de sauvegarde des données du projet. * @return Faux si erreur de sauvegarde.*/ ! virtual bool OnSaveProject(Archive& ar); /** Méthode testant la possibilité de fermer un projet. * Appelé lors de la demande de fermeture du projet. --- 82,93 ---- /** Méthode d'ouverture de projet. * Appelé lorqu'un projet est ouvert. ! * @param in Flux de lecture des données du projet. * @return Faux si erreur de chargement.*/ ! virtual bool OnOpenProject(wxInputStream* in); /** Méthode de sauvegarde de projet. * Appelé lorsqu'un projet doit sauvegarder ses données. ! * @param out Flux de sauvegarde des données du projet. * @return Faux si erreur de sauvegarde.*/ ! virtual bool OnSaveProject(wxOutputStream* out); /** Méthode testant la possibilité de fermer un projet. * Appelé lors de la demande de fermeture du projet. Index: DocView.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/DocView.h,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** DocView.h 13 Aug 2005 14:07:37 -0000 1.19 --- DocView.h 17 Aug 2005 16:33:17 -0000 1.20 *************** *** 72,76 **** class DocTemplate; class ViewTemplate; - class Archive; class ViewFrame; class Project; --- 72,75 ---- *************** *** 284,304 **** protected: /** @name Fonction virtuelles de spécialisation du document. - * Se sont les fonctions à dériver pour implémenter la gestion spécifique de la sérialisation des données. * @{ */ /** Sauvegarde du document. * A dériver pour implémenter la sauvegarde des données. ! * Note : la fonction de base procède à la sérialisation via la fonction SerializeDocument ! * @param ar Archive dans laquelle sauvegarder le document.*/ ! virtual bool SaveDocument(Archive *ar); /** Lecture du document. * A dériver pour implémenter la lecture des documents. ! * Note : la fonction de base procède à la sérialisation via la fonction SerializeDocument ! * @param ar Archive depuis laquelle lire le document.*/ ! virtual bool LoadDocument(Archive *ar); ! /** Sérialisation du document. ! * La sérialisation est le processus de lecture/sauvegarde parallèle du document. ! * C'est à dire si la lecture suit le même chemin que l'écriture. ! * @param ar Archive dans laquelle sérialiser le document.*/ ! virtual bool SerializeDocument(Archive *ar); /** Initialisation du document en cas de création. --- 283,295 ---- protected: /** @name Fonction virtuelles de spécialisation du document. * @{ */ /** Sauvegarde du document. * A dériver pour implémenter la sauvegarde des données. ! * @param out Flux dans lequel sauvegarder le document.*/ ! virtual bool SaveDocument(wxOutputStream* out); /** Lecture du document. * A dériver pour implémenter la lecture des documents. ! * @param in Flux depuis lequel lire le document.*/ ! virtual bool LoadDocument(wxInputStream* in); /** Initialisation du document en cas de création. *************** *** 385,398 **** /** Initialisation du document. * Initialise les membres du document et lit le fichier source via l'archive. ! * @param pArchive Archive du fichier source. * @return True si l'initialisation est correcte. */ ! virtual bool OnInitialize(Archive *pArchive); /** Modification du document. * Modification du document due à la modification externe du fichier source. ! * @param pArchive Archive du fichier source pour relire les donées. * @return True si la modification est correcte. */ ! virtual bool OnFileModified(Archive *pArchive); /** Fermeture du document. * Le document doit être fermé. --- 376,389 ---- /** Initialisation du document. * Initialise les membres du document et lit le fichier source via l'archive. ! * @param in Flux du fichier source. * @return True si l'initialisation est correcte. */ ! virtual bool OnInitialize(wxInputStream* in); /** Modification du document. * Modification du document due à la modification externe du fichier source. ! * @param in Flux du fichier source pour relire les donées. * @return True si la modification est correcte. */ ! virtual bool OnFileModified(wxInputStream* in); /** Fermeture du document. * Le document doit être fermé. Index: FileSystemStandard.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/FileSystemStandard.h,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** FileSystemStandard.h 17 Aug 2005 15:01:06 -0000 1.13 --- FileSystemStandard.h 17 Aug 2005 16:33:17 -0000 1.14 *************** *** 71,74 **** --- 71,77 ---- virtual int GetFileType(const FilePath& strPath); + virtual wxInputStream* GetInputStream(FilePath strPath); + virtual wxOutputStream* GetOutputStream(FilePath strPath); + protected: /** Retourne le type de répertoire. *************** *** 76,106 **** * @return Type de répertoire si celui-ci est un répertoire système, 0 sinon.*/ virtual int GetDirectorySystemType(FilePath strPath)=0; ! }; ! ! ! /** Archive vers un fichier. ! * Archive sérialisant vers un fichier standard. ! */ ! class ArchiveFile : public Archive ! { ! protected: ! /** Flux vers/depuis un fichier. ! * Acces vers un fichier. ! */ ! wxFile m_File; ! public: ! /** Constructeur. ! * @param strFilePath Chemin physique et nom du fichier. ! * @param nMode Mode d'ouverture de l'archive.*/ ! ArchiveFile(wxString strFilePath, ARCHIVE_OPEN_MODE nMode = read); ! virtual ~ArchiveFile(); ! virtual bool Eof(); ! virtual bool Flush(); ! ! protected: ! virtual size_t OnSysRead(void* buffer, size_t bufsize); ! virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode); ! virtual wxFileOffset OnSysTell() const; ! virtual size_t OnSysWrite(const void *buffer, size_t bufsize); }; --- 79,91 ---- * @return Type de répertoire si celui-ci est un répertoire système, 0 sinon.*/ virtual int GetDirectorySystemType(FilePath strPath)=0; ! ! /** Retourne le chemin physique d'un fichier depuis son chemin logique. ! * @param strFilePath Chemin logique du fichier. ! * @return Chemin physique du fichier.*/ ! virtual wxString GetPhysicalFilePath(FilePath strFilePath) ! { ! strFilePath.RemoveProtocol(); ! return strFilePath; ! } }; Index: Application.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/Application.h,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Application.h 13 Aug 2005 14:07:37 -0000 1.14 --- Application.h 17 Aug 2005 16:33:17 -0000 1.15 *************** *** 41,45 **** class FilePath; class FileSystem; - class Archive; class Document; class MainFrame; --- 41,44 ---- *************** *** 190,197 **** */ bool SaveDocument(Document* pDoc, bool bForceChooseName=false); - /** Crée une archive (pointeur vers Archive) pour la sérialisation des documents. - * @return Retourne l'adresse de l'archive et NULL si erreur. - */ - Archive* CreateDocumentArchive(FilePath &strDocPath, unsigned int nMode); /** @}*/ --- 189,192 ---- *************** *** 204,214 **** FileSystem* GetStandardFileSystem() {return m_pStandardFileSystem;} ! /** Crée une archive sur un fichier. ! * @param strPath Chemin du fichier. ! * @param nMode Mode d'ouverture de l'archive. ! * @return Adresse de l'archive et NULL si erreur. ! */ ! Archive* GetFileArchive(FilePath strPath, unsigned int nMode) ! {return m_FileSystemManager.GetFileArchive(strPath, nMode);} /** @}*/ --- 199,212 ---- FileSystem* GetStandardFileSystem() {return m_pStandardFileSystem;} ! /** Retourne le flux de lecture sur un fichier. ! * @param strPath Chemin du fichier à lire. ! * @return Adresse du flux de lecture, NULL si erreur de création.*/ ! virtual wxInputStream* GetInputStream(FilePath strPath) ! {return m_FileSystemManager.GetInputStream(strPath);} ! /** Retourne le flux d'écriture sur un fichier. ! * @param strPath Chemin du fichier à écrire. ! * @return Adresse du flux d'écriture, NULL si erreur de création.*/ ! virtual wxOutputStream* GetOutputStream(FilePath strPath) ! {return m_FileSystemManager.GetOutputStream(strPath);} /** @}*/ Index: FileSystem.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/FileSystem.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** FileSystem.h 17 Aug 2005 15:01:06 -0000 1.10 --- FileSystem.h 17 Aug 2005 16:33:17 -0000 1.11 *************** *** 7,11 **** * Déclaration des classes interfaces de * - Systèmes de fichiers virtuels (wxDevCenter::FileSystem) - * - Archives de sérialisation (wxDevCenter::Archive) * . * Déclaration de la classe de gestionnaire de systèmes de fichiers (wxDevCenter::FileSystemManager). --- 7,10 ---- *************** *** 51,108 **** { - /** Interface d'archive. - * Une archive est un flux sur lequel on peut écrire ou lire les données des documents sans se préoccuper - * si cette archive écrit (ou lit) sur un fichier ou dans un package de données. - * @see Document - * @see FileArchive - * @see PackageArchive - */ - class WXDC_DLL_BASE Archive : public wxInputStream, public wxOutputStream - { - protected: - /** Mode d'ouverture de l'archive (Lecture/Ecriture).*/ - unsigned int m_nOpenMode; - public: - /** Modes d'ouverture d'une archive.*/ - enum ARCHIVE_OPEN_MODE - { - read =0, - write =1, - readwrite =2 - }; - - Archive(ARCHIVE_OPEN_MODE nMode = readwrite); - virtual ~Archive(void); - - /** End of file (stream). - * Teste le flux (lecture seulement) pour voir si la fin du flux est atteint. - * La fonction de base retourne Vrai si le flux est en mode lecture ou lecture/ecriture. - * @return True si la fin est atteinte. - */ - virtual bool Eof(); - /** Flush (stream). - * Force un stream flush. - * La fonction de base retourne Vrai si le flux est en écriture ou en lecture/ecriture. - * @return True si le flush à réussi. - */ - virtual bool Flush(); - - Archive& operator>>(int &i); - Archive& operator>>(unsigned int &n); - Archive& operator>>(short &s); - Archive& operator>>(double &d); - Archive& operator>>(char &c); - Archive& operator>>(wxString &str); - Archive& operator>>(wxImage &img); - - Archive& operator<<(int i); - Archive& operator<<(unsigned int n); - Archive& operator<<(short s); - Archive& operator<<(double d); - Archive& operator<<(char c); - Archive& operator<<(wxString str); - Archive& operator<<(wxImage &img); - }; - WX_DECLARE_STRING_HASH_MAP_WITH_DECL( wxString, FileDescriptorExtPropMap, class WXDC_DLL_BASE); --- 50,53 ---- *************** *** 250,258 **** * @return Vrai si succès.*/ virtual bool RemoveFile(FilePath strFilePath)=0; ! /** Crée une archive sur un fichier. ! * @param strPath Chemin du fichier. ! * @param nMode Mode d'ouverture de l'archive. ! */ ! virtual Archive* GetFileArchive(FilePath strPath, unsigned int nMode)=0; /** @} */ --- 195,207 ---- * @return Vrai si succès.*/ virtual bool RemoveFile(FilePath strFilePath)=0; ! ! /** Retourne le flux de lecture sur un fichier. ! * @param strPath Chemin du fichier à lire. ! * @return Adresse du flux de lecture, NULL si erreur de création.*/ ! virtual wxInputStream* GetInputStream(FilePath strPath); ! /** Retourne le flux d'écriture sur un fichier. ! * @param strPath Chemin du fichier à écrire. ! * @return Adresse du flux d'écriture, NULL si erreur de création.*/ ! virtual wxOutputStream* GetOutputStream(FilePath strPath); /** @} */ *************** *** 315,324 **** */ FileSystem* GetFileSystem(FilePath& strPath); ! ! /** Crée une archive sur un fichier. ! * @param strPath Chemin du fichier. ! * @param nMode Mode d'ouverture de l'archive. ! */ ! Archive* GetFileArchive(FilePath strPath, unsigned int nMode); }; --- 264,276 ---- */ FileSystem* GetFileSystem(FilePath& strPath); ! ! /** Retourne le flux de lecture sur un fichier. ! * @param strPath Chemin du fichier à lire. ! * @return Adresse du flux de lecture, NULL si erreur de création.*/ ! virtual wxInputStream* GetInputStream(FilePath strPath); ! /** Retourne le flux d'écriture sur un fichier. ! * @param strPath Chemin du fichier à écrire. ! * @return Adresse du flux d'écriture, NULL si erreur de création.*/ ! virtual wxOutputStream* GetOutputStream(FilePath strPath); }; |
|
From: Emilien K. <cur...@us...> - 2005-08-17 16:33:26
|
Update of /cvsroot/wxdevcenter/wxDevCenter/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28502/src Modified Files: Document.cpp FileSystemStandard.cpp MiniView.cpp Application.cpp FileSystem.cpp Project.cpp Log Message: Use of wxInput/OutputStream instead of Archive to serialize documents and projects. Index: FileSystemStandard.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/FileSystemStandard.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** FileSystemStandard.cpp 13 Aug 2005 14:07:37 -0000 1.16 --- FileSystemStandard.cpp 17 Aug 2005 16:33:17 -0000 1.17 *************** *** 27,30 **** --- 27,31 ---- #include <wx/utils.h> + #include <wx/wfstream.h> #include <wx/artprov.h> *************** *** 94,144 **** } ! ! ////////////////////////////////////////////////////////////////////// ! // Archive de fichiers ! ////////////////////////////////////////////////////////////////////// ! ! ArchiveFile::ArchiveFile(wxString strFilePath, ARCHIVE_OPEN_MODE nMode): ! Archive(nMode) ! { ! m_File.Open(strFilePath ,(wxFile::OpenMode)nMode); ! } ! ! ArchiveFile::~ArchiveFile() ! { ! //Flush(); ! m_File.Close(); ! } ! ! bool ArchiveFile::Eof() ! { ! return (Archive::Eof()&&m_File.Eof()); ! } ! ! bool ArchiveFile::Flush() ! { ! if(!Archive::Flush()) ! return false; ! return m_File.Flush(); ! } ! ! size_t ArchiveFile::OnSysRead(void* buffer, size_t bufsize) ! { ! return m_File.Read(buffer, bufsize); ! } ! ! wxFileOffset ArchiveFile::OnSysSeek(wxFileOffset pos, wxSeekMode mode) ! { ! return m_File.Seek(pos, mode); ! } ! ! wxFileOffset ArchiveFile::OnSysTell() const { ! return m_File.Tell();; } ! size_t ArchiveFile::OnSysWrite(const void *buffer, size_t bufsize) { ! return m_File.Write(buffer, bufsize); } --- 95,106 ---- } ! wxInputStream* FileSystemStandardBase::GetInputStream(FilePath strPath) { ! return new wxFileInputStream(GetPhysicalFilePath(strPath)); } ! wxOutputStream* FileSystemStandardBase::GetOutputStream(FilePath strPath) { ! return new wxFileOutputStream(GetPhysicalFilePath(strPath)); } Index: FileSystem.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/FileSystem.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** FileSystem.cpp 17 Aug 2005 15:01:06 -0000 1.7 --- FileSystem.cpp 17 Aug 2005 16:33:17 -0000 1.8 *************** *** 136,254 **** ! ////////////////////////////////////////////////////////////////////// ! // Archive de base ! ////////////////////////////////////////////////////////////////////// ! ! Archive::Archive(ARCHIVE_OPEN_MODE nMode): ! m_nOpenMode(nMode) ! { ! } ! ! Archive::~Archive(void) ! { ! } ! ! bool Archive::Eof() ! { ! return (m_nOpenMode==read)||(m_nOpenMode==readwrite); ! } ! ! bool Archive::Flush() ! { ! return (m_nOpenMode==write)||(m_nOpenMode==readwrite); ! } ! ! Archive& Archive::operator>>(int &i) ! { ! Read(&i, sizeof(int)); ! return *this; ! } ! ! Archive& Archive::operator>>(unsigned int &n) ! { ! Read(&n, sizeof(unsigned int)); ! return *this; ! } ! ! Archive& Archive::operator>>(short &s) ! { ! Read(&s, sizeof(short)); ! return *this; ! } ! ! Archive& Archive::operator>>(double &d) ! { ! Read(&d, sizeof(double)); ! return *this; ! } ! ! Archive& Archive::operator>>(char &c) ! { ! Read(&c, sizeof(char)); ! return *this; ! } ! ! Archive& Archive::operator>>(wxString &str) ! { ! unsigned short s; ! Read(&s, sizeof(unsigned short)); ! Read(str.GetWriteBuf(s+1), s); ! str.SetChar(s, 0); ! str.UngetWriteBuf(); ! return *this; ! } ! ! Archive& Archive::operator>>(wxImage &img) ! { ! img.LoadFile( (wxInputStream&)*this); ! return *this; ! } ! ! Archive& Archive::operator<<(int i) ! { ! Write(&i, sizeof(int)); ! return *this; ! } ! ! Archive& Archive::operator<<(unsigned int n) ! { ! Write(&n, sizeof(unsigned int)); ! return *this; ! } ! ! Archive& Archive::operator<<(short s) ! { ! Write(&s, sizeof(short)); ! return *this; ! } ! ! Archive& Archive::operator<<(double d) ! { ! Write(&d, sizeof(double)); ! return *this; ! } ! ! Archive& Archive::operator<<(char c) ! { ! Write(&c, sizeof(char)); ! return *this; ! } ! ! Archive& Archive::operator<<(wxString str) { ! unsigned short n = str.Length(); ! Write(&n, sizeof(unsigned short)); ! Write(str.GetData(), n); ! return *this; } ! Archive& Archive::operator<<(wxImage &img) { ! img.SaveFile( (wxOutputStream&)*this, wxBITMAP_TYPE_PNG); ! return *this; } - ////////////////////////////////////////////////////////////////////// // Gestionnaire de systèmes de fichiers --- 136,152 ---- ! // Retourne le flux de lecture sur un fichier. ! wxInputStream* FileSystem::GetInputStream(FilePath WXUNUSED(strPath)) { ! return NULL; } ! // Retourne le flux d'écriture sur un fichier. ! wxOutputStream* FileSystem::GetOutputStream(FilePath WXUNUSED(strPath)) { ! return NULL; } ////////////////////////////////////////////////////////////////////// // Gestionnaire de systèmes de fichiers *************** *** 276,289 **** } ! // Crée une archive sur un fichier. ! Archive* FileSystemManager::GetFileArchive(FilePath strPath, unsigned int nMode) { FileSystem* pFS = GetFileSystem(strPath); if(pFS!=NULL) ! return pFS->GetFileArchive(strPath, nMode); else return NULL; } // Enregistre un système de fichier. bool FileSystemManager::Register(FileSystem* pFileSystem, bool bMountWorkBar) --- 174,199 ---- } ! // Retourne le flux de lecture sur un fichier. ! wxInputStream* FileSystemManager::GetInputStream(FilePath strPath) { FileSystem* pFS = GetFileSystem(strPath); if(pFS!=NULL) ! return pFS->GetInputStream(strPath); ! else ! return NULL; ! } ! ! // Retourne le flux d'écriture sur un fichier. ! wxOutputStream* FileSystemManager::GetOutputStream(FilePath strPath) ! { ! FileSystem* pFS = GetFileSystem(strPath); ! if(pFS!=NULL) ! return pFS->GetOutputStream(strPath); else return NULL; } + + // Enregistre un système de fichier. bool FileSystemManager::Register(FileSystem* pFileSystem, bool bMountWorkBar) Index: Application.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/Application.cpp,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** Application.cpp 13 Aug 2005 14:07:37 -0000 1.30 --- Application.cpp 17 Aug 2005 16:33:17 -0000 1.31 *************** *** 381,393 **** - - // Crée une archive (pointeur vers Archive) pour la sérialisation des documents. - Archive* Application::CreateDocumentArchive(FilePath &strDocPath, unsigned int nMode) - { - return m_FileSystemManager.GetFileArchive(strDocPath, nMode); - } - - - ////////////////////////////////////////////////////////////////////// // Gestion de l'application --- 381,384 ---- Index: Project.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/Project.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Project.cpp 3 Aug 2005 19:21:23 -0000 1.7 --- Project.cpp 17 Aug 2005 16:33:17 -0000 1.8 *************** *** 27,30 **** --- 27,32 ---- #include <wx/tokenzr.h> + #include <wx/stream.h> + using namespace wxDevCenter; *************** *** 61,65 **** // Méthode d'ouverture de projet. ! bool Project::OnOpenProject(Archive& WXUNUSED(ar)) { return true; --- 63,67 ---- // Méthode d'ouverture de projet. ! bool Project::OnOpenProject(wxInputStream* WXUNUSED(in)) { return true; *************** *** 67,71 **** // Méthode de sauvegarde de projet. ! bool Project::OnSaveProject(Archive& WXUNUSED(ar)) { return true; --- 69,73 ---- // Méthode de sauvegarde de projet. ! bool Project::OnSaveProject(wxOutputStream* WXUNUSED(out)) { return true; *************** *** 201,210 **** { // Appelle de le chargement du projet. ! Archive* pAr = Application::GetApp().CreateDocumentArchive(strFile, Archive::read); ! if(pAr!=NULL) { ! if(GetProject().OnOpenProject(*pAr)) { ! delete pAr; return true; } --- 203,212 ---- { // Appelle de le chargement du projet. ! wxInputStream* pIn = Application::GetApp().GetInputStream(strFile); ! if(pIn!=NULL) { ! if(GetProject().OnOpenProject(pIn)) { ! delete pIn; return true; } *************** *** 222,231 **** // Appelle de le chargement du projet. FilePath path = GetProject().GetPath(); ! Archive* pAr = Application::GetApp().CreateDocumentArchive(path, Archive::write); ! if(pAr!=NULL) { ! if(GetProject().OnSaveProject(*pAr)) { ! delete pAr; return true; } --- 224,233 ---- // Appelle de le chargement du projet. FilePath path = GetProject().GetPath(); ! wxOutputStream* pOut = Application::GetApp().GetOutputStream(path); ! if(pOut!=NULL) { ! if(GetProject().OnSaveProject(pOut)) { ! delete pOut; return true; } Index: Document.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/Document.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Document.cpp 12 Aug 2005 15:50:00 -0000 1.13 --- Document.cpp 17 Aug 2005 16:33:17 -0000 1.14 *************** *** 162,183 **** // Sauvegarde les données du document ! bool Document::SaveDocument(Archive* ar) { ! return SerializeDocument(ar); } // Lit les données du document ! bool Document::LoadDocument(Archive* ar) { ! return SerializeDocument(ar); } - // Processus de lecture/ecriture des données du document - bool Document::SerializeDocument(Archive* WXUNUSED(ar)) - { - return true; - } - ////////////////////////////////////////////////////////////////////// --- 162,177 ---- // Sauvegarde les données du document ! bool Document::SaveDocument(wxOutputStream* WXUNUSED(out)) { ! return true; } // Lit les données du document ! bool Document::LoadDocument(wxInputStream* WXUNUSED(in)) { ! return true; } ////////////////////////////////////////////////////////////////////// *************** *** 194,200 **** { SetDocumentPath(strDocumentPath); ! ! Archive *pArchive = Application::GetApp().CreateDocumentArchive(strDocumentPath, wxStreamBuffer::read); ! if(pArchive==NULL) { wxMessageBox(WXDC_ERROR_LOADDOCUMENT); --- 188,194 ---- { SetDocumentPath(strDocumentPath); ! ! wxInputStream* pIn = Application::GetApp().GetInputStream(strDocumentPath); ! if(pIn==NULL) { wxMessageBox(WXDC_ERROR_LOADDOCUMENT); *************** *** 202,207 **** } ! bool state = LoadDocument(pArchive); ! delete pArchive; SetModifiedFlag(false); return state; --- 196,201 ---- } ! bool state = LoadDocument(pIn); ! delete pIn; SetModifiedFlag(false); return state; *************** *** 214,225 **** SetDocumentPath(strDocumentPath); ! Archive *pArchive = Application::GetApp().CreateDocumentArchive(strDocumentPath, wxStreamBuffer::write); ! if(pArchive==NULL) { wxMessageBox(WXDC_ERROR_SAVEDOCUMENT); return false; } ! bool state = SaveDocument(pArchive); ! delete pArchive; SetModifiedFlag(false); return state; --- 208,219 ---- SetDocumentPath(strDocumentPath); ! wxOutputStream* pOut = Application::GetApp().GetOutputStream(strDocumentPath); ! if(pOut==NULL) { wxMessageBox(WXDC_ERROR_SAVEDOCUMENT); return false; } ! bool state = SaveDocument(pOut); ! delete pOut; SetModifiedFlag(false); return state; Index: MiniView.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/MiniView.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MiniView.cpp 3 Dec 2004 16:47:46 -0000 1.1 --- MiniView.cpp 17 Aug 2005 16:33:17 -0000 1.2 *************** *** 25,28 **** --- 25,31 ---- #include <wxDevCenter.h> #include <wxDevCenter/DocView.h> + + #include <wx/stream.h> + using namespace wxDevCenter; *************** *** 54,58 **** /** Initialisation du document.*/ ! bool MiniDoc::OnInitialize(Archive* WXUNUSED(pArchive)) { return true; --- 57,61 ---- /** Initialisation du document.*/ ! bool MiniDoc::OnInitialize(wxInputStream* WXUNUSED(in)) { return true; *************** *** 60,64 **** /** Modification du document.*/ ! bool MiniDoc::OnFileModified(Archive* WXUNUSED(pArchive)) { return true; --- 63,67 ---- /** Modification du document.*/ ! bool MiniDoc::OnFileModified(wxInputStream* WXUNUSED(in)) { return true; |
