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-09-29 17:05:05
|
Update of /cvsroot/wxdevcenter/wxDevCenter/features/wxdc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22462/features/wxdc Log Message: Directory /cvsroot/wxdevcenter/wxDevCenter/features/wxdc added to the repository |
|
From: Emilien K. <cur...@us...> - 2005-09-29 17:05:02
|
Update of /cvsroot/wxdevcenter/wxDevCenter/plugins/wxdc.fs.unix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22462/plugins/wxdc.fs.unix Log Message: Directory /cvsroot/wxdevcenter/wxDevCenter/plugins/wxdc.fs.unix added to the repository |
|
From: Emilien K. <cur...@us...> - 2005-09-29 17:05:02
|
Update of /cvsroot/wxdevcenter/wxDevCenter/plugins/wxdc.ui.frames In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22462/plugins/wxdc.ui.frames Log Message: Directory /cvsroot/wxdevcenter/wxDevCenter/plugins/wxdc.ui.frames added to the repository |
|
From: Emilien K. <cur...@us...> - 2005-09-29 17:05:01
|
Update of /cvsroot/wxdevcenter/wxDevCenter/features In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22462/features Log Message: Directory /cvsroot/wxdevcenter/wxDevCenter/features added to the repository --> Using per-directory sticky tag `modularisation' |
|
From: Emilien K. <cur...@us...> - 2005-09-24 12:45:57
|
Update of /cvsroot/wxdevcenter/wxDevCenter/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3761/src Modified Files: Tag: modularisation Module.cpp Frame.cpp MainFrame.cpp Application.cpp Log Message: Return to a monobloc structure. Index: Frame.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/Frame.cpp,v retrieving revision 1.12.2.2 retrieving revision 1.12.2.3 diff -C2 -d -r1.12.2.2 -r1.12.2.3 *** Frame.cpp 24 Sep 2005 11:44:20 -0000 1.12.2.2 --- Frame.cpp 24 Sep 2005 12:45:44 -0000 1.12.2.3 *************** *** 65,75 **** ////////////////////////////////////////////////////////////////////// ! IMPLEMENT_DYNAMIC_CLASS(TopFrame, wxFrame) BEGIN_EVENT_TABLE(wxDevCenter::TopFrame, wxFrame) END_EVENT_TABLE() - wxClassInfo* TopFrame::s_pClassInfo=NULL; - TopFrame::TopFrame(): wxFrame(), --- 65,73 ---- ////////////////////////////////////////////////////////////////////// ! WXDC_IMPLEMENT_MODULE_BASE_CLASS(TopFrame, wxFrame) BEGIN_EVENT_TABLE(wxDevCenter::TopFrame, wxFrame) END_EVENT_TABLE() TopFrame::TopFrame(): wxFrame(), Index: Module.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/Attic/Module.cpp,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -d -r1.1.2.3 -r1.1.2.4 *** Module.cpp 24 Sep 2005 11:44:20 -0000 1.1.2.3 --- Module.cpp 24 Sep 2005 12:45:44 -0000 1.1.2.4 *************** *** 34,44 **** IMPLEMENT_DYNAMIC_CLASS(Module, wxObject) - Module* Module::s_pFirst=NULL; Module::Module(): wxObject() { ! m_pNext = s_pFirst; ! s_pFirst = this; } --- 34,47 ---- IMPLEMENT_DYNAMIC_CLASS(Module, wxObject) Module::Module(): wxObject() { ! } ! ! Module::Module(wxClassInfo* pCI, wxClassInfo** ppBaseCI): ! wxObject() ! { ! *ppBaseCI = pCI; } *************** *** 64,74 **** wxLogDebug("Load module \"%s\" : error", arFiles[l].GetData()); } - - Module* pModule = s_pFirst; - while(pModule!=NULL) - { - pModule->Initialize(); - pModule = pModule->m_pNext; - } } --- 67,70 ---- Index: Application.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/Application.cpp,v retrieving revision 1.37.2.2 retrieving revision 1.37.2.3 diff -C2 -d -r1.37.2.2 -r1.37.2.3 *** Application.cpp 24 Sep 2005 11:44:20 -0000 1.37.2.2 --- Application.cpp 24 Sep 2005 12:45:44 -0000 1.37.2.3 *************** *** 83,87 **** // Charge les modules. ! Module::LoadModules(); // Initialise les gestionnaires --- 83,87 ---- // Charge les modules. ! // Module::LoadModules(); // Initialise les gestionnaires *************** *** 102,107 **** // Initialise le gestionnaire de systèmes de fichiers ! // m_pStandardFileSystem = FileSystemStandard::CreateDerivateClass(); ! // FileSystemManager::GetManager().Register(m_pStandardFileSystem, true); // Initialise les menus par défaut. --- 102,107 ---- // Initialise le gestionnaire de systèmes de fichiers ! m_pStandardFileSystem = FileSystemStandard::CreateFileSystemStandard(); ! FileSystemManager::GetManager().Register(m_pStandardFileSystem, true); // Initialise les menus par défaut. Index: MainFrame.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/MainFrame.cpp,v retrieving revision 1.22.2.2 retrieving revision 1.22.2.3 diff -C2 -d -r1.22.2.2 -r1.22.2.3 *** MainFrame.cpp 24 Sep 2005 11:44:20 -0000 1.22.2.2 --- MainFrame.cpp 24 Sep 2005 12:45:44 -0000 1.22.2.3 *************** *** 53,57 **** ! IMPLEMENT_DYNAMIC_CLASS(MainFrame, TopFrame) BEGIN_EVENT_TABLE(MainFrame, TopFrame) --- 53,57 ---- ! WXDC_IMPLEMENT_MODULE_CLASS(MainFrame, TopFrame, TopFrame) BEGIN_EVENT_TABLE(MainFrame, TopFrame) *************** *** 431,454 **** } - - - class MainFrameModule : public Module - { - DECLARE_DYNAMIC_CLASS(MainFrameModule) - public: - MainFrameModule():Module() - { - } - - virtual void Initialize() - { - TopFrame::s_pClassInfo = CLASSINFO(MainFrame); - wxLogDebug("MainFrameModule : %p / %p", TopFrame::s_pClassInfo, CLASSINFO(MainFrame)); - } - }; - - IMPLEMENT_DYNAMIC_CLASS(MainFrameModule, Module) - - MainFrameModule g_MainFrameModule; - - --- 431,432 ---- |
|
From: Emilien K. <cur...@us...> - 2005-09-24 12:45:57
|
Update of /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3761/include/wxDevCenter Modified Files: Tag: modularisation FileSystemStandard.h Frame.h MainFrame.h Module.h Log Message: Return to a monobloc structure. Index: Module.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/Attic/Module.h,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -d -r1.1.2.3 -r1.1.2.4 *** Module.h 24 Sep 2005 11:44:20 -0000 1.1.2.3 --- Module.h 24 Sep 2005 12:45:44 -0000 1.1.2.4 *************** *** 35,47 **** { DECLARE_DYNAMIC_CLASS(Module) - protected: - wxClassInfo* m_pClassInfo; - - static Module* s_pFirst; - Module* m_pNext; public: Module(); ! ! virtual void Initialize(){} static void LoadModules(); --- 35,41 ---- { DECLARE_DYNAMIC_CLASS(Module) public: Module(); ! Module(wxClassInfo* pCI, wxClassInfo** ppBaseCI); static void LoadModules(); *************** *** 51,67 **** /** Macro to declare a module base class.*/ #define WXDC_DECLARE_MODULE_BASE_CLASS(CLASS)\ ! DECLARE_ABSTRACT_CLASS(CLASS) /** Macro to implement module class.*/ #define WXDC_IMPLEMENT_MODULE_BASE_CLASS(CLASS, BASECLASS) \ ! IMPLEMENT_ABSTRACT_CLASS(CLASS, BASECLASS) /** Macro to declare module class.*/ #define WXDC_DECLARE_MODULE_CLASS(CLASS) \ ! DECLARE_DYNAMIC_CLASS(CLASS) /** Macro to implement module class.*/ #define WXDC_IMPLEMENT_MODULE_CLASS(CLASS, BASECLASS, INTERFACECLASS) \ ! IMPLEMENT_DYNAMIC_CLASS(CLASS, BASECLASS) } --- 45,72 ---- /** Macro to declare a module base class.*/ #define WXDC_DECLARE_MODULE_BASE_CLASS(CLASS)\ ! DECLARE_ABSTRACT_CLASS(CLASS)\ ! static wxClassInfo* s_pClassInfo;\ ! static CLASS* CreateModuleObject()\ ! {\ ! if(s_pClassInfo==NULL)return NULL;\ ! return (CLASS*)s_pClassInfo->CreateObject();\ ! } ! /** Macro to implement module class.*/ #define WXDC_IMPLEMENT_MODULE_BASE_CLASS(CLASS, BASECLASS) \ ! IMPLEMENT_ABSTRACT_CLASS(CLASS, BASECLASS)\ ! wxClassInfo* CLASS::s_pClassInfo=NULL; /** Macro to declare module class.*/ #define WXDC_DECLARE_MODULE_CLASS(CLASS) \ ! DECLARE_DYNAMIC_CLASS(CLASS)\ ! static Module s_##CLASS##Module; /** Macro to implement module class.*/ #define WXDC_IMPLEMENT_MODULE_CLASS(CLASS, BASECLASS, INTERFACECLASS) \ ! IMPLEMENT_DYNAMIC_CLASS(CLASS, BASECLASS)\ ! Module CLASS::s_##CLASS##Module(CLASSINFO(CLASS), &(INTERFACECLASS::s_pClassInfo)); ! } Index: MainFrame.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/MainFrame.h,v retrieving revision 1.12.2.2 retrieving revision 1.12.2.3 diff -C2 -d -r1.12.2.2 -r1.12.2.3 *** MainFrame.h 24 Sep 2005 11:44:20 -0000 1.12.2.2 --- MainFrame.h 24 Sep 2005 12:45:44 -0000 1.12.2.3 *************** *** 53,57 **** DECLARE_EVENT_TABLE() /** Déclare la classe comme implémentation d'interface de module.*/ ! DECLARE_DYNAMIC_CLASS(MainFrame) protected: /** LayoutManager.*/ --- 53,57 ---- DECLARE_EVENT_TABLE() /** Déclare la classe comme implémentation d'interface de module.*/ ! WXDC_DECLARE_MODULE_CLASS(MainFrame) protected: /** LayoutManager.*/ Index: FileSystemStandard.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/FileSystemStandard.h,v retrieving revision 1.14.2.2 retrieving revision 1.14.2.3 diff -C2 -d -r1.14.2.2 -r1.14.2.3 *** FileSystemStandard.h 24 Sep 2005 11:44:20 -0000 1.14.2.2 --- FileSystemStandard.h 24 Sep 2005 12:45:44 -0000 1.14.2.3 *************** *** 61,65 **** WXDC_DECLARE_MODULE_BASE_CLASS(FileSystemStandard) public: ! virtual wxString GetFileSystemName()const{return WXDC_SYSTEM_STDFS_NAME;} virtual wxString GetIconName()const{return wxT("desktop");} --- 61,67 ---- WXDC_DECLARE_MODULE_BASE_CLASS(FileSystemStandard) public: ! static FileSystemStandard* CreateFileSystemStandard(){return CreateModuleObject();} ! FileSystemStandard():FileSystem(){} ! virtual wxString GetFileSystemName()const{return WXDC_SYSTEM_STDFS_NAME;} virtual wxString GetIconName()const{return wxT("desktop");} Index: Frame.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/Frame.h,v retrieving revision 1.13.2.2 retrieving revision 1.13.2.3 diff -C2 -d -r1.13.2.2 -r1.13.2.3 *** Frame.h 24 Sep 2005 11:44:20 -0000 1.13.2.2 --- Frame.h 24 Sep 2005 12:45:44 -0000 1.13.2.3 *************** *** 139,143 **** { DECLARE_EVENT_TABLE() ! DECLARE_DYNAMIC_CLASS(TopFrame) protected: /** Fenetre cadre fille contenant les vues.*/ --- 139,143 ---- { DECLARE_EVENT_TABLE() ! WXDC_DECLARE_MODULE_BASE_CLASS(TopFrame) protected: /** Fenetre cadre fille contenant les vues.*/ *************** *** 148,157 **** public: - static wxClassInfo* s_pClassInfo; static TopFrame* CreateTopFrame() { ! if(s_pClassInfo==NULL) ! return NULL; ! return (TopFrame*) s_pClassInfo->CreateObject(); } --- 148,154 ---- public: static TopFrame* CreateTopFrame() { ! return CreateModuleObject(); } |
|
From: Emilien K. <cur...@us...> - 2005-09-24 12:45:57
|
Update of /cvsroot/wxdevcenter/wxDevCenter/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3761/build/bakefiles Modified Files: Tag: modularisation wxDevCenter.bkl Log Message: Return to a monobloc structure. Index: wxDevCenter.bkl =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/build/bakefiles/Attic/wxDevCenter.bkl,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** wxDevCenter.bkl 21 Sep 2005 15:00:38 -0000 1.1.2.1 --- wxDevCenter.bkl 24 Sep 2005 12:45:44 -0000 1.1.2.2 *************** *** 8,11 **** --- 8,13 ---- </set> + <!-- wxDockIt. --> + <include file="wxDockIt.bkl" /> <!-- Set the build directory. --> *************** *** 39,46 **** --- 41,51 ---- src/FileSystemTreeCtrl.cpp src/FileSystemStandard.cpp + src/$(DIRSPEC)/FileSystemStandard-$(DIRSPEC).cpp src/FileTools.cpp src/Frame.cpp src/Layout.cpp + src/MainFrame.cpp src/Manager.cpp + src/MDIFrame.cpp src/MiniView.cpp src/Module.cpp *************** *** 55,58 **** --- 60,64 ---- <wxlib-gui>core</wxlib-gui> <wxlib-gui>adv</wxlib-gui> + <wxDockItLib /> <win32-res>res-win32/wxDevCenter.rc</win32-res> |
|
From: Emilien K. <cur...@us...> - 2005-09-24 12:45:57
|
Update of /cvsroot/wxdevcenter/wxDevCenter/src/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3761/src/msw Added Files: Tag: modularisation FileSystemStandard-msw.cpp Removed Files: Tag: modularisation FileSystemStandard.cpp Log Message: Return to a monobloc structure. --- NEW FILE: FileSystemStandard-msw.cpp --- (This appears to be a binary file; contents omitted.) --- FileSystemStandard.cpp DELETED --- |
|
From: Emilien K. <cur...@us...> - 2005-09-24 12:45:57
|
Update of /cvsroot/wxdevcenter/wxDevCenter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3761 Modified Files: Tag: modularisation wxDevCenter.bkl GNUmakefile Log Message: Return to a monobloc structure. Index: GNUmakefile =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/GNUmakefile,v retrieving revision 1.11.2.2 retrieving revision 1.11.2.3 diff -C2 -d -r1.11.2.2 -r1.11.2.3 *** GNUmakefile 24 Sep 2005 11:44:21 -0000 1.11.2.2 --- GNUmakefile 24 Sep 2005 12:45:44 -0000 1.11.2.3 *************** *** 76,83 **** --- 76,86 ---- ./build/$(BUILD)/wxDevCenterLib_FileSystemTreeCtrl.o \ ./build/$(BUILD)/wxDevCenterLib_FileSystemStandard.o \ + ./build/$(BUILD)/wxDevCenterLib_FileSystemStandard_unix.o \ ./build/$(BUILD)/wxDevCenterLib_FileTools.o \ ./build/$(BUILD)/wxDevCenterLib_Frame.o \ ./build/$(BUILD)/wxDevCenterLib_Layout.o \ + ./build/$(BUILD)/wxDevCenterLib_MainFrame.o \ ./build/$(BUILD)/wxDevCenterLib_Manager.o \ + ./build/$(BUILD)/wxDevCenterLib_MDIFrame.o \ ./build/$(BUILD)/wxDevCenterLib_MiniView.o \ ./build/$(BUILD)/wxDevCenterLib_Module.o \ *************** *** 92,103 **** WXDEVCENTER_OBJECTS = \ ./build/$(BUILD)/wxDevCenter_AppImpl.o - WXDC_UNIX_CXXFLAGS = -D_THREAD_SAFE -pthread $(__WARNINGS) \ - $(__UNICODE_DEFINE_p) $(__DEBUG_DEFINE_p) $(__OPTIMIZEFLAG) $(__DEBUGINFO) \ - $(__WXUSINGDLL_p) `wx-config --cppflags` -Iinclude -fPIC -DPIC $(CPPFLAGS) \ - $(CXXFLAGS) - WXDC_UNIX_OBJECTS = \ - ./build/$(BUILD)/wxdc_unix_FileSystemStandard.o \ - ./build/$(BUILD)/wxdc_unix_MainFrame.o \ - ./build/$(BUILD)/wxdc_unix_MDIFrame.o ### Conditionally set variables: ### --- 95,98 ---- *************** *** 171,177 **** ### Targets: ### ! all: lib/libwxDevCenterLib.so ./bin/wxDevCenter$(SUFFIX) ./modules/wxdc-unix.so ! install: all install_wxDevCenterLib install_wxDevCenter install_wxdc-unix $(INSTALL) -d $(prefix)/include for f in wxDevCenter.h wxDevCenterPlugin.h wxDevCenter/AboutBox.h wxDevCenter/Application.h wxDevCenter/ArtProvider.h wxDevCenter/Command.h wxDevCenter/Config.h wxDevCenter/DocView.h wxDevCenter/Element.h wxDevCenter/FileSystem.h wxDevCenter/FileSystemCtrl.h wxDevCenter/FileSystemListCtrl.h wxDevCenter/FileSystemTreeCtrl.h wxDevCenter/FileTools.h wxDevCenter/Frame.h wxDevCenter/language.h wxDevCenter/Layout.h wxDevCenter/Manager.h wxDevCenter/Module.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 \ --- 166,172 ---- ### Targets: ### ! all: 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/Command.h wxDevCenter/Config.h wxDevCenter/DocView.h wxDevCenter/Element.h wxDevCenter/FileSystem.h wxDevCenter/FileSystemCtrl.h wxDevCenter/FileSystemListCtrl.h wxDevCenter/FileSystemTreeCtrl.h wxDevCenter/FileTools.h wxDevCenter/Frame.h wxDevCenter/language.h wxDevCenter/Layout.h wxDevCenter/Manager.h wxDevCenter/Module.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 \ *************** *** 201,208 **** rm -f lib/libwxDevCenterLib.so rm -f ./bin/wxDevCenter$(SUFFIX) - rm -f ./modules/wxdc-unix.so lib/libwxDevCenterLib.so: $(WXDEVCENTERLIB_OBJECTS) ! $(CXX) -shared -fPIC -o $@ $(WXDEVCENTERLIB_OBJECTS) $(LDFLAGS) -pthread $(__DEBUGINFO) `wx-config --libs` -lwx_base$(WXLIBPOSTFIX)-$(WXVERSIONTAG) -lwx_base$(WXLIBPOSTFIX)_xml-$(WXVERSIONTAG) -lwx_$(WXPORTNAME)$(WXLIBPOSTFIX)_core-$(WXVERSIONTAG) -lwx_$(WXPORTNAME)$(WXLIBPOSTFIX)_adv-$(WXVERSIONTAG) install_wxDevCenterLib: --- 196,202 ---- rm -f lib/libwxDevCenterLib.so rm -f ./bin/wxDevCenter$(SUFFIX) lib/libwxDevCenterLib.so: $(WXDEVCENTERLIB_OBJECTS) ! $(CXX) -shared -fPIC -o $@ $(WXDEVCENTERLIB_OBJECTS) $(LDFLAGS) -pthread $(__DEBUGINFO) `wx-config --libs` -lwx_base$(WXLIBPOSTFIX)-$(WXVERSIONTAG) -lwx_base$(WXLIBPOSTFIX)_xml-$(WXVERSIONTAG) -lwx_$(WXPORTNAME)$(WXLIBPOSTFIX)_core-$(WXVERSIONTAG) -lwx_$(WXPORTNAME)$(WXLIBPOSTFIX)_adv-$(WXVERSIONTAG) -lwxdockit-$(WXDOCKIT_VERSION) install_wxDevCenterLib: *************** *** 218,228 **** install -c ./bin/wxDevCenter$(SUFFIX) $(prefix)/bin - ./modules/wxdc-unix.so: $(WXDC_UNIX_OBJECTS) lib/libwxDevCenterLib.so - $(CXX) -shared -fPIC -o $@ $(WXDC_UNIX_OBJECTS) $(LDFLAGS) -pthread $(__DEBUGINFO) `wx-config --libs` -L./lib -lwxDevCenterLib -lwx_base$(WXLIBPOSTFIX)-$(WXVERSIONTAG) -lwx_base$(WXLIBPOSTFIX)_xml-$(WXVERSIONTAG) -lwx_$(WXPORTNAME)$(WXLIBPOSTFIX)_adv-$(WXVERSIONTAG) -lwxdockit-$(WXDOCKIT_VERSION) - - install_wxdc-unix: - $(INSTALL) -d $(prefix)/lib/wxDevCenter/modules - install -c ./modules/wxdc-unix.so $(prefix)/lib/wxDevCenter/modules - ./build/$(BUILD)/wxDevCenterLib_AboutBox.o: ./src/AboutBox.cpp $(CXX) -c -o $@ $(WXDEVCENTERLIB_CXXFLAGS) $(CPPDEPS) $< --- 212,215 ---- *************** *** 270,273 **** --- 257,263 ---- $(CXX) -c -o $@ $(WXDEVCENTERLIB_CXXFLAGS) $(CPPDEPS) $< + ./build/$(BUILD)/wxDevCenterLib_FileSystemStandard_unix.o: ./src/unix/FileSystemStandard-unix.cpp + $(CXX) -c -o $@ $(WXDEVCENTERLIB_CXXFLAGS) $(CPPDEPS) $< + ./build/$(BUILD)/wxDevCenterLib_FileTools.o: ./src/FileTools.cpp $(CXX) -c -o $@ $(WXDEVCENTERLIB_CXXFLAGS) $(CPPDEPS) $< *************** *** 279,285 **** --- 269,281 ---- $(CXX) -c -o $@ $(WXDEVCENTERLIB_CXXFLAGS) $(CPPDEPS) $< + ./build/$(BUILD)/wxDevCenterLib_MainFrame.o: ./src/MainFrame.cpp + $(CXX) -c -o $@ $(WXDEVCENTERLIB_CXXFLAGS) $(CPPDEPS) $< + ./build/$(BUILD)/wxDevCenterLib_Manager.o: ./src/Manager.cpp $(CXX) -c -o $@ $(WXDEVCENTERLIB_CXXFLAGS) $(CPPDEPS) $< + ./build/$(BUILD)/wxDevCenterLib_MDIFrame.o: ./src/MDIFrame.cpp + $(CXX) -c -o $@ $(WXDEVCENTERLIB_CXXFLAGS) $(CPPDEPS) $< + ./build/$(BUILD)/wxDevCenterLib_MiniView.o: ./src/MiniView.cpp $(CXX) -c -o $@ $(WXDEVCENTERLIB_CXXFLAGS) $(CPPDEPS) $< *************** *** 306,319 **** $(CXX) -c -o $@ $(WXDEVCENTER_CXXFLAGS) $(CPPDEPS) $< ! ./build/$(BUILD)/wxdc_unix_FileSystemStandard.o: ./src/unix/FileSystemStandard.cpp ! $(CXX) -c -o $@ $(WXDC_UNIX_CXXFLAGS) $(CPPDEPS) $< ! ! ./build/$(BUILD)/wxdc_unix_MainFrame.o: ./src/MainFrame.cpp ! $(CXX) -c -o $@ $(WXDC_UNIX_CXXFLAGS) $(CPPDEPS) $< ! ! ./build/$(BUILD)/wxdc_unix_MDIFrame.o: ./src/MDIFrame.cpp ! $(CXX) -c -o $@ $(WXDC_UNIX_CXXFLAGS) $(CPPDEPS) $< ! ! .PHONY: all install uninstall clean install_wxDevCenterLib install_wxDevCenter install_wxdc-unix --- 302,306 ---- $(CXX) -c -o $@ $(WXDEVCENTER_CXXFLAGS) $(CPPDEPS) $< ! .PHONY: all install uninstall clean install_wxDevCenterLib install_wxDevCenter Index: wxDevCenter.bkl =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/wxDevCenter.bkl,v retrieving revision 1.11.2.1 retrieving revision 1.11.2.2 diff -C2 -d -r1.11.2.1 -r1.11.2.2 *** wxDevCenter.bkl 21 Sep 2005 15:00:38 -0000 1.11.2.1 --- wxDevCenter.bkl 24 Sep 2005 12:45:44 -0000 1.11.2.2 *************** *** 9,13 **** <!-- Standard modules. --> ! <if cond="PLATFORM_WIN32=='1'"> <include file="build/bakefiles/wxDevCenter-msw.bkl" /> </if> --- 9,13 ---- <!-- Standard modules. --> ! <!-- <if cond="PLATFORM_WIN32=='1'"> <include file="build/bakefiles/wxDevCenter-msw.bkl" /> </if> *************** *** 15,19 **** <include file="build/bakefiles/wxDevCenter-unix.bkl" /> </if> ! <!-- Installation rules. --> <include file="build/bakefiles/install.bkl" /> --- 15,19 ---- <include file="build/bakefiles/wxDevCenter-unix.bkl" /> </if> ! --> <!-- Installation rules. --> <include file="build/bakefiles/install.bkl" /> |
|
From: Emilien K. <cur...@us...> - 2005-09-24 12:45:56
|
Update of /cvsroot/wxdevcenter/wxDevCenter/src/unix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3761/src/unix Added Files: Tag: modularisation FileSystemStandard-unix.cpp Removed Files: Tag: modularisation FileSystemStandard.cpp Log Message: Return to a monobloc structure. --- NEW FILE: FileSystemStandard-unix.cpp --- (This appears to be a binary file; contents omitted.) --- FileSystemStandard.cpp DELETED --- |
Update of /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25588/include/wxDevCenter Modified Files: Tag: modularisation language.h Frame.h MainFrame.h MDIFrame.h FileSystemStandard.h Module.h Log Message: Intend to modularize. Index: Module.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/Attic/Module.h,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** Module.h 22 Sep 2005 16:41:35 -0000 1.1.2.2 --- Module.h 24 Sep 2005 11:44:20 -0000 1.1.2.3 *************** *** 27,63 **** #include <wxDevCenter/Manager.h> namespace wxDevCenter { - - /** Define a type manager of class info.*/ - typedef ObjectManager<wxClassInfo> ClassInfoManager; - - /** Module management.*/ class WXDC_DLL_BASE Module : public wxObject { ! DECLARE_CLASS(Module); public: ! Module(wxClassInfo* pClassInfo, ClassInfoManager* pBaseClassInfoManager); }; /** Macro to declare a module base class.*/ ! #define WXDC_DECLARE_MODULE_BASE_CLASS(BASECLASS) \ ! public:\ ! static ObjectManager<wxClassInfo> s_wxdc_ClassInfoManager;\ ! static BASECLASS* CreateDerivateClass()\ ! {\ ! if(s_wxdc_ClassInfoManager.GetCount()==0)return NULL;\ ! return (BASECLASS*) s_wxdc_ClassInfoManager[s_wxdc_ClassInfoManager.GetCount()-1].CreateObject();\ ! }\ ! protected: ! ! /** Macro to implement a module base class.*/ ! #define WXDC_IMPLEMENT_MODULE_BASE_CLASS(BASECLASS) ObjectManager<wxClassInfo> BASECLASS::s_wxdc_ClassInfoManager; ! /** Macro to automanipulate modules.*/ ! #define WXDC_DECLARE_MODULE_CLASS(CLASS, BASECLASS) static wxDevCenter::Module gs_wxdcModule(CLASSINFO(CLASS), &(BASECLASS::s_wxdc_ClassInfoManager)); } --- 27,67 ---- #include <wxDevCenter/Manager.h> + #include <wx/dynload.h> + namespace wxDevCenter { class WXDC_DLL_BASE Module : public wxObject { ! DECLARE_DYNAMIC_CLASS(Module) ! protected: ! wxClassInfo* m_pClassInfo; ! ! static Module* s_pFirst; ! Module* m_pNext; public: ! Module(); ! ! virtual void Initialize(){} ! ! static void LoadModules(); ! static void DumpClasses(); }; /** Macro to declare a module base class.*/ ! #define WXDC_DECLARE_MODULE_BASE_CLASS(CLASS)\ ! DECLARE_ABSTRACT_CLASS(CLASS) ! /** Macro to implement module class.*/ ! #define WXDC_IMPLEMENT_MODULE_BASE_CLASS(CLASS, BASECLASS) \ ! IMPLEMENT_ABSTRACT_CLASS(CLASS, BASECLASS) + /** Macro to declare module class.*/ + #define WXDC_DECLARE_MODULE_CLASS(CLASS) \ + DECLARE_DYNAMIC_CLASS(CLASS) + /** Macro to implement module class.*/ + #define WXDC_IMPLEMENT_MODULE_CLASS(CLASS, BASECLASS, INTERFACECLASS) \ + IMPLEMENT_DYNAMIC_CLASS(CLASS, BASECLASS) } Index: MainFrame.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/MainFrame.h,v retrieving revision 1.12.2.1 retrieving revision 1.12.2.2 diff -C2 -d -r1.12.2.1 -r1.12.2.2 *** MainFrame.h 22 Sep 2005 16:41:35 -0000 1.12.2.1 --- MainFrame.h 24 Sep 2005 11:44:20 -0000 1.12.2.2 *************** *** 28,35 **** #define __WXDEVCENTER_MAINFRAME ! #include <wx/dnd.h> ! #include "Frame.h" #include <wxDevCenter/FileSystemCtrl.h> class wxTreeEvent; class wxSashWindow; --- 28,37 ---- #define __WXDEVCENTER_MAINFRAME ! #include <wxDevCenter/Frame.h> ! #include <wxDevCenter/Module.h> #include <wxDevCenter/FileSystemCtrl.h> + #include <wx/dnd.h> + class wxTreeEvent; class wxSashWindow; *************** *** 46,55 **** * Fenêtre cadre contenant toutes les autres fenêtres et notament le conteneur de vues et les contrôles d'arborescence. */ ! class MainFrame : public TopFrame { /** Déclare la table d'interception des évènements de fenêtres.*/ ! DECLARE_EVENT_TABLE(); ! /** Déclare les infos RTTI de la classe.*/ ! DECLARE_DYNAMIC_CLASS(MainFrame); protected: /** LayoutManager.*/ --- 48,57 ---- * Fenêtre cadre contenant toutes les autres fenêtres et notament le conteneur de vues et les contrôles d'arborescence. */ ! class WXDC_DLL_MODULE MainFrame : public TopFrame { /** Déclare la table d'interception des évènements de fenêtres.*/ ! DECLARE_EVENT_TABLE() ! /** Déclare la classe comme implémentation d'interface de module.*/ ! DECLARE_DYNAMIC_CLASS(MainFrame) protected: /** LayoutManager.*/ Index: FileSystemStandard.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/FileSystemStandard.h,v retrieving revision 1.14.2.1 retrieving revision 1.14.2.2 diff -C2 -d -r1.14.2.1 -r1.14.2.2 *** FileSystemStandard.h 22 Sep 2005 16:41:35 -0000 1.14.2.1 --- FileSystemStandard.h 24 Sep 2005 11:44:20 -0000 1.14.2.2 *************** *** 60,65 **** { WXDC_DECLARE_MODULE_BASE_CLASS(FileSystemStandard) - DECLARE_ABSTRACT_CLASS(FileSystemStandard) public: virtual wxString GetFileSystemName()const{return WXDC_SYSTEM_STDFS_NAME;} virtual wxString GetIconName()const{return wxT("desktop");} --- 60,65 ---- { WXDC_DECLARE_MODULE_BASE_CLASS(FileSystemStandard) public: + virtual wxString GetFileSystemName()const{return WXDC_SYSTEM_STDFS_NAME;} virtual wxString GetIconName()const{return wxT("desktop");} Index: Frame.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/Frame.h,v retrieving revision 1.13.2.1 retrieving revision 1.13.2.2 diff -C2 -d -r1.13.2.1 -r1.13.2.2 *** Frame.h 22 Sep 2005 16:41:35 -0000 1.13.2.1 --- Frame.h 24 Sep 2005 11:44:20 -0000 1.13.2.2 *************** *** 138,144 **** class WXDC_DLL_BASE TopFrame : public wxFrame { - DECLARE_ABSTRACT_CLASS(TopFrame); DECLARE_EVENT_TABLE() ! WXDC_DECLARE_MODULE_BASE_CLASS(TopFrame) protected: /** Fenetre cadre fille contenant les vues.*/ --- 138,143 ---- class WXDC_DLL_BASE TopFrame : public wxFrame { DECLARE_EVENT_TABLE() ! DECLARE_DYNAMIC_CLASS(TopFrame) protected: /** Fenetre cadre fille contenant les vues.*/ *************** *** 149,152 **** --- 148,158 ---- public: + static wxClassInfo* s_pClassInfo; + static TopFrame* CreateTopFrame() + { + if(s_pClassInfo==NULL) + return NULL; + return (TopFrame*) s_pClassInfo->CreateObject(); + } /** Constructeur.*/ Index: MDIFrame.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/MDIFrame.h,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -C2 -d -r1.7 -r1.7.2.1 *** MDIFrame.h 14 Sep 2005 14:19:10 -0000 1.7 --- MDIFrame.h 24 Sep 2005 11:44:20 -0000 1.7.2.1 *************** *** 36,40 **** class View; ! class MDIFrame : public wxNotebook, public ViewFrame { friend class DocManager; --- 36,40 ---- class View; ! class WXDC_DLL_MODULE MDIFrame : public wxNotebook, public ViewFrame { friend class DocManager; Index: language.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/language.h,v retrieving revision 1.10 retrieving revision 1.10.2.1 diff -C2 -d -r1.10 -r1.10.2.1 *** language.h 26 Aug 2005 08:35:58 -0000 1.10 --- language.h 24 Sep 2005 11:44:20 -0000 1.10.2.1 *************** *** 191,194 **** --- 191,195 ---- #define WXDC_CMDLINE_ADDPATH_PLUGINS wxT("Add a path to search plugins") #define WXDC_CMDLINE_ADDPATH_FEATURES wxT("Add a path to search features") + #define WXDC_CMDLINE_ADDPATH_MODULE wxT("Add a path to search modules") #define WXDC_CMDLINE_ADDPATH_DATA wxT("Add a path to search data") #define WXDC_CMDLINE_ADDPATH_CONF wxT("Add a path to search config") |
|
From: Emilien K. <cur...@us...> - 2005-09-24 11:44:30
|
Update of /cvsroot/wxdevcenter/wxDevCenter/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25588/include Added Files: Tag: modularisation wxDevCenterModule.h Log Message: Intend to modularize. --- NEW FILE: wxDevCenterModule.h --- (This appears to be a binary file; contents omitted.) |
|
From: Emilien K. <cur...@us...> - 2005-09-24 11:44:30
|
Update of /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/unix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25588/include/wxDevCenter/unix Modified Files: Tag: modularisation FileSystemStandard.h Log Message: Intend to modularize. Index: FileSystemStandard.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/unix/FileSystemStandard.h,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -C2 -d -r1.3.2.1 -r1.3.2.2 *** FileSystemStandard.h 22 Sep 2005 16:41:35 -0000 1.3.2.1 --- FileSystemStandard.h 24 Sep 2005 11:44:21 -0000 1.3.2.2 *************** *** 43,49 **** * Valables pour les systèmes UNIX, Linux, MacOS. */ ! class FileSystemStandardUnix : public FileSystemStandard { ! DECLARE_DYNAMIC_CLASS(FileSystemStandardUnix) protected: FilePath m_strFindPath; --- 43,49 ---- * Valables pour les systèmes UNIX, Linux, MacOS. */ ! class WXDC_DLL_MODULE FileSystemStandardUnix : public FileSystemStandard { ! WXDC_DECLARE_MODULE_CLASS(FileSystemStandardUnix) protected: FilePath m_strFindPath; |
|
From: Emilien K. <cur...@us...> - 2005-09-24 11:44:30
|
Update of /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25588/include/wxDevCenter/msw Modified Files: Tag: modularisation FileSystemStandard.h Log Message: Intend to modularize. Index: FileSystemStandard.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/msw/FileSystemStandard.h,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -C2 -d -r1.3.2.1 -r1.3.2.2 *** FileSystemStandard.h 22 Sep 2005 16:41:35 -0000 1.3.2.1 --- FileSystemStandard.h 24 Sep 2005 11:44:20 -0000 1.3.2.2 *************** *** 38,44 **** /** Système de fichiers physique des systèmes Windows.*/ ! class FileSystemStandardWindows : public FileSystemStandard { DECLARE_DYNAMIC_CLASS(FileSystemStandardWindows) protected: FilePath m_strFindPath; /**< Chemin de la recherche actuelle.*/ --- 38,45 ---- /** Système de fichiers physique des systèmes Windows.*/ ! class WXDC_DLL_MODULE FileSystemStandardWindows : public FileSystemStandard { DECLARE_DYNAMIC_CLASS(FileSystemStandardWindows) + WXDC_DECLARE_MODULE_CLASS(FileSystemStandardWindows) protected: FilePath m_strFindPath; /**< Chemin de la recherche actuelle.*/ |
|
From: Emilien K. <cur...@us...> - 2005-09-24 11:44:30
|
Update of /cvsroot/wxdevcenter/wxDevCenter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25588 Modified Files: Tag: modularisation GNUmakefile Log Message: Intend to modularize. Index: GNUmakefile =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/GNUmakefile,v retrieving revision 1.11.2.1 retrieving revision 1.11.2.2 diff -C2 -d -r1.11.2.1 -r1.11.2.2 *** GNUmakefile 21 Sep 2005 15:00:38 -0000 1.11.2.1 --- GNUmakefile 24 Sep 2005 11:44:21 -0000 1.11.2.2 *************** *** 218,223 **** install -c ./bin/wxDevCenter$(SUFFIX) $(prefix)/bin ! ./modules/wxdc-unix.so: $(WXDC_UNIX_OBJECTS) ! $(CXX) -shared -fPIC -o $@ $(WXDC_UNIX_OBJECTS) $(LDFLAGS) -pthread $(__DEBUGINFO) `wx-config --libs` -lwx_base$(WXLIBPOSTFIX)-$(WXVERSIONTAG) -lwx_base$(WXLIBPOSTFIX)_xml-$(WXVERSIONTAG) -lwx_$(WXPORTNAME)$(WXLIBPOSTFIX)_adv-$(WXVERSIONTAG) -lwxdockit-$(WXDOCKIT_VERSION) install_wxdc-unix: --- 218,223 ---- install -c ./bin/wxDevCenter$(SUFFIX) $(prefix)/bin ! ./modules/wxdc-unix.so: $(WXDC_UNIX_OBJECTS) lib/libwxDevCenterLib.so ! $(CXX) -shared -fPIC -o $@ $(WXDC_UNIX_OBJECTS) $(LDFLAGS) -pthread $(__DEBUGINFO) `wx-config --libs` -L./lib -lwxDevCenterLib -lwx_base$(WXLIBPOSTFIX)-$(WXVERSIONTAG) -lwx_base$(WXLIBPOSTFIX)_xml-$(WXVERSIONTAG) -lwx_$(WXPORTNAME)$(WXLIBPOSTFIX)_adv-$(WXVERSIONTAG) -lwxdockit-$(WXDOCKIT_VERSION) install_wxdc-unix: |
|
From: Emilien K. <cur...@us...> - 2005-09-24 11:44:30
|
Update of /cvsroot/wxdevcenter/wxDevCenter/src/unix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25588/src/unix Modified Files: Tag: modularisation FileSystemStandard.cpp Log Message: Intend to modularize. Index: FileSystemStandard.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/unix/FileSystemStandard.cpp,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -C2 -d -r1.3.2.1 -r1.3.2.2 *** FileSystemStandard.cpp 22 Sep 2005 16:41:35 -0000 1.3.2.1 --- FileSystemStandard.cpp 24 Sep 2005 11:44:21 -0000 1.3.2.2 *************** *** 22,26 **** // 02111-1307, USA. ! #include <wxDevCenter.h> #include <wxDevCenter/FileSystemStandard.h> #include <wxDevCenter/unix/FileSystemStandard.h> --- 22,26 ---- // 02111-1307, USA. ! #include <wxDevCenterModule.h> #include <wxDevCenter/FileSystemStandard.h> #include <wxDevCenter/unix/FileSystemStandard.h> *************** *** 36,41 **** // Implémentation spécifique UNIX ////////////////////////////////////////////////////////////////////// ! IMPLEMENT_DYNAMIC_CLASS(FileSystemStandardUnix, FileSystemStandard) ! WXDC_DECLARE_MODULE_CLASS(FileSystemStandardUnix, FileSystemStandard) FileSystemStandardUnix::FileSystemStandardUnix(): --- 36,41 ---- // Implémentation spécifique UNIX ////////////////////////////////////////////////////////////////////// ! ! WXDC_IMPLEMENT_MODULE_CLASS(FileSystemStandardUnix, FileSystemStandard, FileSystemStandard) FileSystemStandardUnix::FileSystemStandardUnix(): |
|
From: Emilien K. <cur...@us...> - 2005-09-24 11:44:29
|
Update of /cvsroot/wxdevcenter/wxDevCenter/src/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25588/src/msw Modified Files: Tag: modularisation FileSystemStandard.cpp Log Message: Intend to modularize. Index: FileSystemStandard.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/msw/FileSystemStandard.cpp,v retrieving revision 1.5.2.1 retrieving revision 1.5.2.2 diff -C2 -d -r1.5.2.1 -r1.5.2.2 *** FileSystemStandard.cpp 22 Sep 2005 16:41:35 -0000 1.5.2.1 --- FileSystemStandard.cpp 24 Sep 2005 11:44:20 -0000 1.5.2.2 *************** *** 22,26 **** // 02111-1307, USA. ! #include <wxDevCenter.h> #include <wxDevCenter/FileSystemStandard.h> #include <wxDevCenter/msw/FileSystemStandard.h> --- 22,26 ---- // 02111-1307, USA. ! #include <wxDevCenterModule.h> #include <wxDevCenter/FileSystemStandard.h> #include <wxDevCenter/msw/FileSystemStandard.h> *************** *** 40,44 **** ////////////////////////////////////////////////////////////////////// IMPLEMENT_DYNAMIC_CLASS(FileSystemStandardWindows, FileSystemStandard) ! WXDC_DECLARE_MODULE_CLASS(FileSystemStandardWindows, FileSystemStandard) #define WXDC_WSFS_ERROR -1 // une erreur (ou la fin de l'énumération) s'est produite --- 40,44 ---- ////////////////////////////////////////////////////////////////////// IMPLEMENT_DYNAMIC_CLASS(FileSystemStandardWindows, FileSystemStandard) ! WXDC_IMPLEMENT_MODULE_CLASS(FileSystemStandardWindows, FileSystemStandard) #define WXDC_WSFS_ERROR -1 // une erreur (ou la fin de l'énumération) s'est produite |
|
From: Emilien K. <cur...@us...> - 2005-09-24 11:44:29
|
Update of /cvsroot/wxdevcenter/wxDevCenter/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25588/src Modified Files: Tag: modularisation Config.cpp Frame.cpp MainFrame.cpp Application.cpp DocManager.cpp Plugin.cpp MDIFrame.cpp FileSystemStandard.cpp Module.cpp Log Message: Intend to modularize. Index: Module.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/Attic/Module.cpp,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** Module.cpp 22 Sep 2005 16:41:35 -0000 1.1.2.2 --- Module.cpp 24 Sep 2005 11:44:20 -0000 1.1.2.3 *************** *** 25,37 **** #include <wxDevCenter.h> #include <wxDevCenter/Module.h> using namespace wxDevCenter; ! IMPLEMENT_CLASS(Module, wxObject) ! Module::Module(wxClassInfo* pClassInfo, ClassInfoManager* pBaseClassInfoManager): wxObject() { ! pBaseClassInfoManager->Register(pClassInfo); } --- 25,87 ---- #include <wxDevCenter.h> #include <wxDevCenter/Module.h> + #include <wxDevCenter/Config.h> + + #include <wx/dir.h> + #include <wx/dynlib.h> using namespace wxDevCenter; ! IMPLEMENT_DYNAMIC_CLASS(Module, wxObject) + Module* Module::s_pFirst=NULL; ! Module::Module(): wxObject() { ! m_pNext = s_pFirst; ! s_pFirst = this; ! } ! ! // Charge les modules. ! void Module::LoadModules() ! { ! wxArrayString arFiles; ! Config& conf = Config::GetConfig(); ! wxString strPath; ! long l=0; ! ! while(strPath = conf.GetModulePath(l++), !strPath.IsEmpty()) ! { ! wxDir::GetAllFiles(strPath, &arFiles); ! } ! ! for(l=0; l<(long)arFiles.GetCount(); l++) ! { ! wxDynamicLibrary lib; ! if(lib.Load(arFiles[l], wxDL_VERBATIM)) ! wxLogDebug("Load module \"%s\" : ok", arFiles[l].GetData()); ! else ! wxLogDebug("Load module \"%s\" : error", arFiles[l].GetData()); ! } ! ! Module* pModule = s_pFirst; ! while(pModule!=NULL) ! { ! pModule->Initialize(); ! pModule = pModule->m_pNext; ! } } + + // Dump les classes chargées. + void Module::DumpClasses() + { + wxClassInfo* pCI = wxClassInfo::sm_first; + while(pCI!=NULL) + { + wxString strName(pCI->m_className); + if(!strName.StartsWith(wxT("wx"), NULL)) + wxLogDebug("Class \"%s\" (%p)", strName.GetData(), pCI); + pCI = pCI->m_next; + } + } + Index: MainFrame.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/MainFrame.cpp,v retrieving revision 1.22.2.1 retrieving revision 1.22.2.2 diff -C2 -d -r1.22.2.1 -r1.22.2.2 *** MainFrame.cpp 22 Sep 2005 16:41:35 -0000 1.22.2.1 --- MainFrame.cpp 24 Sep 2005 11:44:20 -0000 1.22.2.2 *************** *** 23,27 **** ! #include <wxDevCenter.h> #include <wxDevCenter/MainFrame.h> --- 23,27 ---- ! #include <wxDevCenterModule.h> #include <wxDevCenter/MainFrame.h> *************** *** 95,99 **** END_EVENT_TABLE() - WXDC_DECLARE_MODULE_CLASS(MainFrame, TopFrame) MainFrame::MainFrame(void): --- 95,98 ---- *************** *** 431,432 **** --- 430,454 ---- wxFrame::UpdateWindowUI(flags); } + + + + class MainFrameModule : public Module + { + DECLARE_DYNAMIC_CLASS(MainFrameModule) + public: + MainFrameModule():Module() + { + } + + virtual void Initialize() + { + TopFrame::s_pClassInfo = CLASSINFO(MainFrame); + wxLogDebug("MainFrameModule : %p / %p", TopFrame::s_pClassInfo, CLASSINFO(MainFrame)); + } + }; + + IMPLEMENT_DYNAMIC_CLASS(MainFrameModule, Module) + + MainFrameModule g_MainFrameModule; + + Index: Plugin.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/Plugin.cpp,v retrieving revision 1.11.2.1 retrieving revision 1.11.2.2 diff -C2 -d -r1.11.2.1 -r1.11.2.2 *** Plugin.cpp 22 Sep 2005 16:41:35 -0000 1.11.2.1 --- Plugin.cpp 24 Sep 2005 11:44:20 -0000 1.11.2.2 *************** *** 62,66 **** ) ! // Charge le module. bool DynLibRefData::Load(wxString strLongName) { --- 62,66 ---- ) ! // Charge le dynlib. bool DynLibRefData::Load(wxString strLongName) { *************** *** 107,111 **** } ! // Décharge le module. bool DynLibRefData::Unload() { --- 107,111 ---- } ! // Décharge le dynlib. bool DynLibRefData::Unload() { *************** *** 113,117 **** } ! // Initialise le contenu du module. bool DynLibRefData::Initialize() { --- 113,117 ---- } ! // Initialise le contenu du dynlib. bool DynLibRefData::Initialize() { *************** *** 131,135 **** } ! // Finalise le contenu du module. bool DynLibRefData::Finalize() { --- 131,135 ---- } ! // Finalise le contenu du dynlib. bool DynLibRefData::Finalize() { *************** *** 164,168 **** ) ! // Teste si le module est chargé. bool DynLib::IsLoaded()const { --- 164,168 ---- ) ! // Teste si le dynlib est chargé. bool DynLib::IsLoaded()const { *************** *** 173,177 **** } ! // Teste si le module est initialisé. bool DynLib::IsInitialized()const { --- 173,177 ---- } ! // Teste si le dynlib est initialisé. bool DynLib::IsInitialized()const { *************** *** 183,187 **** ! // Charge le module et enregistre son contenu. bool DynLib::Load(wxString strPath) { --- 183,187 ---- ! // Charge le dynlib et enregistre son contenu. bool DynLib::Load(wxString strPath) { *************** *** 190,194 **** } ! // Décharge le module. bool DynLib::Unload() { --- 190,194 ---- } ! // Décharge le dynlib. bool DynLib::Unload() { *************** *** 196,200 **** } ! // Initialise le contenu du module. bool DynLib::Initialize() { --- 196,200 ---- } ! // Initialise le contenu du dynlib. bool DynLib::Initialize() { *************** *** 205,209 **** } ! // Finalise le contenu du module. bool DynLib::Finalize() { --- 205,209 ---- } ! // Finalise le contenu du dynlib. bool DynLib::Finalize() { *************** *** 239,243 **** for(long l=0; l<(long)m_arrstrPlugins.GetCount(); l++) str << wxT(" - ") << m_arrstrPlugins[l] << wxT("\n"); ! str << wxT("Used modules : ") << m_arrstrDynLibs.GetCount() << wxT("\n"); for(long l=0; l<(long)m_arrstrDynLibs.GetCount(); l++) str << wxT(" - ") << m_arrstrDynLibs[l] << wxT("\n"); --- 239,243 ---- for(long l=0; l<(long)m_arrstrPlugins.GetCount(); l++) str << wxT(" - ") << m_arrstrPlugins[l] << wxT("\n"); ! str << wxT("Used dynlibs : ") << m_arrstrDynLibs.GetCount() << wxT("\n"); for(long l=0; l<(long)m_arrstrDynLibs.GetCount(); l++) str << wxT(" - ") << m_arrstrDynLibs[l] << wxT("\n"); *************** *** 305,309 **** bOk &= m_pLoader->LoadPlugin(m_arrstrPlugins[l])!=NULL; ! // Préchargement des modules. for(l=0; l<m_arrstrDynLibs.GetCount(); l++) bOk &= m_pLoader->LoadDynLib(strName + wxT("/") + m_arrstrDynLibs[l])!=NULL; --- 305,309 ---- bOk &= m_pLoader->LoadPlugin(m_arrstrPlugins[l])!=NULL; ! // Préchargement des dynlibs. for(l=0; l<m_arrstrDynLibs.GetCount(); l++) bOk &= m_pLoader->LoadDynLib(strName + wxT("/") + m_arrstrDynLibs[l])!=NULL; *************** *** 602,615 **** ! // Charge un module à l'adresse spécifiée. DynLib* PluginLoader::LoadDynLib(wxString strPath) { ! wxLogDebug(wxT("Loading module %s"), strPath.GetData()); ! DynLib& module = m_DynLibMap[strPath]; ! if(module.IsLoaded()) ! return &module; ! else if(module.Load(strPath)) ! return &module; else return NULL; --- 602,615 ---- ! // Charge un dynlib à l'adresse spécifiée. DynLib* PluginLoader::LoadDynLib(wxString strPath) { ! wxLogDebug(wxT("Loading dynlib %s"), strPath.GetData()); ! DynLib& dynlib = m_DynLibMap[strPath]; ! if(dynlib.IsLoaded()) ! return &dynlib; ! else if(dynlib.Load(strPath)) ! return &dynlib; else return NULL; *************** *** 668,681 **** } ! // Initialise un module. bool PluginLoader::InitializeDynLib(wxString strName) { ! wxLogDebug(wxT("Initializing module %s"), strName.GetData()); ! DynLib& module = m_DynLibMap[strName]; ! if(module.IsInitialized()) return true; else ! return module.Initialize(); } --- 668,681 ---- } ! // Initialise un dynlib. bool PluginLoader::InitializeDynLib(wxString strName) { ! wxLogDebug(wxT("Initializing dynlib %s"), strName.GetData()); ! DynLib& dynlib = m_DynLibMap[strName]; ! if(dynlib.IsInitialized()) return true; else ! return dynlib.Initialize(); } *************** *** 698,702 **** InitializePlugin(it2->first); ! wxLogDebug("Initialize module :"); DynLibMap::iterator it3; for( it3 = m_DynLibMap.begin(); it3 != m_DynLibMap.end(); ++it3 ) --- 698,702 ---- InitializePlugin(it2->first); ! wxLogDebug("Initialize dynlib :"); DynLibMap::iterator it3; for( it3 = m_DynLibMap.begin(); it3 != m_DynLibMap.end(); ++it3 ) *************** *** 863,867 **** if(pDep->GetName()==wxT("plugin")) // Import d'un plugin. m_arrstrPlugins.Add(pDep->GetPropVal(wxT("name"), wxT(""))); ! else if(pDep->GetName()==wxT("module")) // Import d'un module. m_arrstrDynLibs.Add(pDep->GetPropVal(wxT("name"), wxT(""))); --- 863,867 ---- if(pDep->GetName()==wxT("plugin")) // Import d'un plugin. m_arrstrPlugins.Add(pDep->GetPropVal(wxT("name"), wxT(""))); ! else if(pDep->GetName()==wxT("dynlib")) // Import d'un dynlib. m_arrstrDynLibs.Add(pDep->GetPropVal(wxT("name"), wxT(""))); *************** *** 892,896 **** } ! // Remplit une liste des chemins relatifs des modules à charger. void PluginDescriptionFile::FillDynLibArray(wxArrayString& array) { --- 892,896 ---- } ! // Remplit une liste des chemins relatifs des dynlibs à charger. void PluginDescriptionFile::FillDynLibArray(wxArrayString& array) { Index: Config.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/Config.cpp,v retrieving revision 1.11.2.1 retrieving revision 1.11.2.2 diff -C2 -d -r1.11.2.1 -r1.11.2.2 *** Config.cpp 22 Sep 2005 17:06:44 -0000 1.11.2.1 --- Config.cpp 24 Sep 2005 11:44:20 -0000 1.11.2.2 *************** *** 220,223 **** --- 220,228 ---- wxLogDebug(wxT("Installation path : %s"), GetInstallPath().GetData()); + wxLogDebug(wxT("Module path :")); + l = 0; + while(str=GetModulePath(l++), !str.IsEmpty()) + wxLogDebug(wxT(" - %s"), str.GetData()); + wxLogDebug(wxT("Data path :")); l = 0; Index: Frame.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/Frame.cpp,v retrieving revision 1.12.2.1 retrieving revision 1.12.2.2 diff -C2 -d -r1.12.2.1 -r1.12.2.2 *** Frame.cpp 22 Sep 2005 16:41:35 -0000 1.12.2.1 --- Frame.cpp 24 Sep 2005 11:44:20 -0000 1.12.2.2 *************** *** 65,74 **** ////////////////////////////////////////////////////////////////////// ! IMPLEMENT_ABSTRACT_CLASS(TopFrame, wxFrame) BEGIN_EVENT_TABLE(wxDevCenter::TopFrame, wxFrame) END_EVENT_TABLE() ! WXDC_IMPLEMENT_MODULE_BASE_CLASS(TopFrame) TopFrame::TopFrame(): --- 65,74 ---- ////////////////////////////////////////////////////////////////////// ! IMPLEMENT_DYNAMIC_CLASS(TopFrame, wxFrame) BEGIN_EVENT_TABLE(wxDevCenter::TopFrame, wxFrame) END_EVENT_TABLE() ! wxClassInfo* TopFrame::s_pClassInfo=NULL; TopFrame::TopFrame(): Index: DocManager.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/DocManager.cpp,v retrieving revision 1.13.2.1 retrieving revision 1.13.2.2 diff -C2 -d -r1.13.2.1 -r1.13.2.2 *** DocManager.cpp 22 Sep 2005 16:41:35 -0000 1.13.2.1 --- DocManager.cpp 24 Sep 2005 11:44:20 -0000 1.13.2.2 *************** *** 24,29 **** #include <wxDevCenter.h> #include <wxDevCenter/DocView.h> ! #include <wxDevCenter/MainFrame.h> ! #include <wxDevCenter/MDIFrame.h> #include <wxDevCenter/ArtProvider.h> --- 24,28 ---- #include <wxDevCenter.h> #include <wxDevCenter/DocView.h> ! #include <wxDevCenter/Frame.h> #include <wxDevCenter/ArtProvider.h> Index: MDIFrame.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/MDIFrame.cpp,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -C2 -d -r1.8 -r1.8.2.1 *** MDIFrame.cpp 14 Sep 2005 14:19:11 -0000 1.8 --- MDIFrame.cpp 24 Sep 2005 11:44:20 -0000 1.8.2.1 *************** *** 23,27 **** ! #include <wxDevCenter.h> #include <wxDevCenter/MDIFrame.h> --- 23,27 ---- ! #include <wxDevCenterModule.h> #include <wxDevCenter/MDIFrame.h> Index: Application.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/Application.cpp,v retrieving revision 1.37.2.1 retrieving revision 1.37.2.2 diff -C2 -d -r1.37.2.1 -r1.37.2.2 *** Application.cpp 22 Sep 2005 16:41:35 -0000 1.37.2.1 --- Application.cpp 24 Sep 2005 11:44:20 -0000 1.37.2.2 *************** *** 27,30 **** --- 27,31 ---- #include <wxDevCenter/AboutBox.h> #include <wxDevCenter/Config.h> + #include <wxDevCenter/Module.h> #include <wxDevCenter/FileSystem.h> #include <wxDevCenter/FileSystemStandard.h> *************** *** 38,41 **** --- 39,43 ---- #include <wxDevCenter/WorkBar.h> + #include <wx/dir.h> #include <wx/dynlib.h> #include <wx/sysopt.h> *************** *** 80,83 **** --- 82,88 ---- wxArtProvider::PushProvider(new ArtProvider); + // Charge les modules. + Module::LoadModules(); + // Initialise les gestionnaires m_DocManager.Initialize(); *************** *** 97,108 **** // Initialise le gestionnaire de systèmes de fichiers ! m_pStandardFileSystem = FileSystemStandard::CreateDerivateClass(); ! FileSystemManager::GetManager().Register(m_pStandardFileSystem, true); // Initialise les menus par défaut. InitCommandGroups(); // Crée la fenetre principale ! m_pTopFrame = TopFrame::CreateDerivateClass(); if(!m_pTopFrame->Create(WXDC_NAME, wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_STYLE)) { --- 102,121 ---- // Initialise le gestionnaire de systèmes de fichiers ! // m_pStandardFileSystem = FileSystemStandard::CreateDerivateClass(); ! // FileSystemManager::GetManager().Register(m_pStandardFileSystem, true); // Initialise les menus par défaut. InitCommandGroups(); + Module::DumpClasses(); + // Crée la fenetre principale ! ! m_pTopFrame = TopFrame::CreateTopFrame(); ! if(m_pTopFrame==NULL) ! { ! wxLogError(wxT("No top frame implementation")); ! return false; ! } if(!m_pTopFrame->Create(WXDC_NAME, wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_STYLE)) { *************** *** 421,424 **** --- 434,438 ---- wxApp::OnInitCmdLine(parser); + parser.AddOption(wxT("APm"), wxT("addpath-module"), WXDC_CMDLINE_ADDPATH_MODULE, wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_MULTIPLE); parser.AddOption(wxT("APd"), wxT("addpath-data"), WXDC_CMDLINE_ADDPATH_DATA, wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_MULTIPLE); parser.AddOption(wxT("APf"), wxT("addpath-features"), WXDC_CMDLINE_ADDPATH_FEATURES, wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_MULTIPLE); *************** *** 435,438 **** --- 449,454 ---- wxString str; + if(parser.Found(wxT("APm"), (wxString*)&str)) + Config::GetConfig().AddModulePath(str); if(parser.Found(wxT("APd"), (wxString*)&str)) Config::GetConfig().AddDataPath(str); Index: FileSystemStandard.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/FileSystemStandard.cpp,v retrieving revision 1.19.2.1 retrieving revision 1.19.2.2 diff -C2 -d -r1.19.2.1 -r1.19.2.2 *** FileSystemStandard.cpp 22 Sep 2005 16:41:35 -0000 1.19.2.1 --- FileSystemStandard.cpp 24 Sep 2005 11:44:20 -0000 1.19.2.2 *************** *** 36,41 **** ////////////////////////////////////////////////////////////////////// // Standard file system ! IMPLEMENT_ABSTRACT_CLASS(FileSystemStandard, FileSystem) ! WXDC_IMPLEMENT_MODULE_BASE_CLASS(FileSystemStandard) bool FileSystemStandard::CreateDirectory(FilePath strDir) --- 36,41 ---- ////////////////////////////////////////////////////////////////////// // Standard file system ! WXDC_IMPLEMENT_MODULE_BASE_CLASS(FileSystemStandard, FileSystem) ! bool FileSystemStandard::CreateDirectory(FilePath strDir) |
|
From: Emilien K. <cur...@us...> - 2005-09-24 11:44:29
|
Update of /cvsroot/wxdevcenter/wxDevCenter/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25588/build/bakefiles Modified Files: Tag: modularisation wxdc-modules.bkl Log Message: Intend to modularize. Index: wxdc-modules.bkl =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/build/bakefiles/Attic/wxdc-modules.bkl,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** wxdc-modules.bkl 21 Sep 2005 15:00:38 -0000 1.1.2.1 --- wxdc-modules.bkl 24 Sep 2005 11:44:20 -0000 1.1.2.2 *************** *** 4,8 **** --- 4,11 ---- <template id="wxdc-module" template="wxDLL"> + <depends>wxDevCenterLib</depends> <install-to>$(LIBDIR)/wxDevCenter/modules</install-to> + <lib-path>./lib</lib-path> + <sys-lib>wxDevCenterLib</sys-lib> </template> |
|
From: Emilien K. <cur...@us...> - 2005-09-22 17:06:59
|
Update of /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26281/include/wxDevCenter Modified Files: Tag: modularisation Config.h Log Message: Append module directory to config. Index: Config.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/Config.h,v retrieving revision 1.11 retrieving revision 1.11.2.1 diff -C2 -d -r1.11 -r1.11.2.1 *** Config.h 15 Sep 2005 16:11:47 -0000 1.11 --- Config.h 22 Sep 2005 17:06:44 -0000 1.11.2.1 *************** *** 160,163 **** --- 160,168 ---- */ virtual wxString GetInstallPath(); + /** Retourne le chemin racine des modules. + * @param lStackIndex Indice dans la liste des chemins. + * @return Chemin racine de stockage des modules. + */ + virtual wxString GetModulePath(long lStackIndex=0); /** Retourne le chemin racine des données (images, icones, etc). * @param lStackIndex Indice dans la liste des chemins. *************** *** 186,189 **** --- 191,198 ---- virtual wxString GetUserConfPath(long lStackIndex=0); + /** Ajoute un chemin sur la pile des chemins des modules. + * @param strPath Nouveau chemin. + */ + virtual void AddModulePath(wxString strPath); /** Ajoute un chemin sur la pile des chemins de stockage de données. * @param strPath Nouveau chemin. *************** *** 245,248 **** --- 254,259 ---- /** Chemin d'installation.*/ wxString m_strInstallPath; + /** Chemin d'installation des modules.*/ + wxArrayString m_strModulePath; /** Chemin d'installation des données.*/ wxArrayString m_strDataPath; *************** *** 259,263 **** #define WXDC_CONF_KEYNAME_INSTALLDIR wxT("InstallDir") ! #define WXDC_CONF_KEYNAME_DATADIR wxT("DataDir") #define WXDC_CONF_KEYNAME_FEATURESDIR wxT("FeatureDir") #define WXDC_CONF_KEYNAME_PLUGINSDIR wxT("PluginDir") --- 270,275 ---- #define WXDC_CONF_KEYNAME_INSTALLDIR wxT("InstallDir") ! #define WXDC_CONF_KEYNAME_DATADIR wxT("ModuleDir") ! #define WXDC_CONF_KEYNAME_MODULEDIR wxT("DataDir") #define WXDC_CONF_KEYNAME_FEATURESDIR wxT("FeatureDir") #define WXDC_CONF_KEYNAME_PLUGINSDIR wxT("PluginDir") |
|
From: Emilien K. <cur...@us...> - 2005-09-22 17:06:56
|
Update of /cvsroot/wxdevcenter/wxDevCenter/src/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26281/src/msw Modified Files: Tag: modularisation Config-msw.cpp Log Message: Append module directory to config. Index: Config-msw.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/msw/Attic/Config-msw.cpp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** Config-msw.cpp 15 Sep 2005 20:26:12 -0000 1.1.2.1 --- Config-msw.cpp 22 Sep 2005 17:06:44 -0000 1.1.2.2 *************** *** 59,62 **** --- 59,63 ---- m_strInstallPath = ReadConfig(WXDC_CONF_KEYNAME_INSTALLDIR , wxT("")); + m_strDataPath.Add( ReadConfig(WXDC_CONF_KEYNAME_MODULEDIR , wxT(""))); m_strDataPath.Add( ReadConfig(WXDC_CONF_KEYNAME_DATADIR , wxT(""))); m_strFeaturesPath.Add( ReadConfig(WXDC_CONF_KEYNAME_FEATURESDIR , wxT(""))); |
|
From: Emilien K. <cur...@us...> - 2005-09-22 17:06:56
|
Update of /cvsroot/wxdevcenter/wxDevCenter/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26281/src Modified Files: Tag: modularisation Config.cpp Log Message: Append module directory to config. Index: Config.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/Config.cpp,v retrieving revision 1.11 retrieving revision 1.11.2.1 diff -C2 -d -r1.11 -r1.11.2.1 *** Config.cpp 15 Sep 2005 16:11:47 -0000 1.11 --- Config.cpp 22 Sep 2005 17:06:44 -0000 1.11.2.1 *************** *** 120,123 **** --- 120,132 ---- } + // Retourne le chemin racine des modules. + wxString Config::GetModulePath(long lStackIndex) + { + if(lStackIndex>=0l && lStackIndex<(long)m_strModulePath.GetCount()) + return m_strModulePath[lStackIndex]; + else + return wxT(""); + } + // Retourne le chemin racine des données (images, icones, etc). wxString Config::GetDataPath(long lStackIndex) *************** *** 165,168 **** --- 174,183 ---- } + // Ajoute un chemin sur la pile des chemins des modules. + void Config::AddModulePath(wxString strPath) + { + m_strModulePath.Insert(strPath, 0); + } + // Ajoute un chemin sur la pile des chemins de stockage de données. void Config::AddDataPath(wxString strPath) |
|
From: Emilien K. <cur...@us...> - 2005-09-22 17:06:52
|
Update of /cvsroot/wxdevcenter/wxDevCenter/src/unix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26281/src/unix Modified Files: Tag: modularisation Config-unix.cpp Log Message: Append module directory to config. Index: Config-unix.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/unix/Attic/Config-unix.cpp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** Config-unix.cpp 15 Sep 2005 20:26:12 -0000 1.1.2.1 --- Config-unix.cpp 22 Sep 2005 17:06:43 -0000 1.1.2.2 *************** *** 58,61 **** --- 58,62 ---- m_strInstallPath = ReadConfig(WXDC_CONF_KEYNAME_INSTALLDIR , wxT(wxDC_INSTALL_TARGET)); + AddModulePath( ReadConfig(WXDC_CONF_KEYNAME_MODULEDIR , wxString(wxDC_INSTALL_TARGET) + wxString(wxT("/lib/")) + WXDC_SETUP_APPIDENT + wxT("/modules"))); AddDataPath( ReadConfig(WXDC_CONF_KEYNAME_DATADIR , wxString(wxDC_INSTALL_TARGET) + wxString(wxT("/share/")) + WXDC_SETUP_APPIDENT + wxT("/data"))); AddFeaturesPath( ReadConfig(WXDC_CONF_KEYNAME_FEATURESDIR , wxString(wxDC_INSTALL_TARGET) + wxString(wxT("/share/")) + WXDC_SETUP_APPIDENT + wxT("/features"))); |
|
From: Emilien K. <cur...@us...> - 2005-09-22 16:41:49
|
Update of /cvsroot/wxdevcenter/wxDevCenter/src/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21767/src/msw Modified Files: Tag: modularisation FileSystemStandard.cpp Log Message: Rename Plugin::Module(RefData) in Plugin::DynLib(RefData). Make all chages to compile with module support. Index: FileSystemStandard.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/msw/FileSystemStandard.cpp,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -C2 -d -r1.5 -r1.5.2.1 *** FileSystemStandard.cpp 17 Aug 2005 16:33:18 -0000 1.5 --- FileSystemStandard.cpp 22 Sep 2005 16:41:35 -0000 1.5.2.1 *************** *** 24,27 **** --- 24,28 ---- #include <wxDevCenter.h> #include <wxDevCenter/FileSystemStandard.h> + #include <wxDevCenter/msw/FileSystemStandard.h> #include <wx/utils.h> *************** *** 38,42 **** // Implémentation spécifique WINDOWS ////////////////////////////////////////////////////////////////////// ! #define WXDC_WSFS_ERROR -1 // une erreur (ou la fin de l'énumération) s'est produite --- 39,44 ---- // Implémentation spécifique WINDOWS ////////////////////////////////////////////////////////////////////// ! IMPLEMENT_DYNAMIC_CLASS(FileSystemStandardWindows, FileSystemStandard) ! WXDC_DECLARE_MODULE_CLASS(FileSystemStandardWindows, FileSystemStandard) #define WXDC_WSFS_ERROR -1 // une erreur (ou la fin de l'énumération) s'est produite *************** *** 325,329 **** #include <Windows.h> FileSystemStandardWindows::FileSystemStandardWindows(): ! FileSystemStandardBase(), m_strNameDesktop(WXDC_WINDOWS_DESKTOP), m_strNameMyDocs(WXDC_WINDOWS_MYDOCS), --- 327,331 ---- #include <Windows.h> FileSystemStandardWindows::FileSystemStandardWindows(): ! FileSystemStandard(), m_strNameDesktop(WXDC_WINDOWS_DESKTOP), m_strNameMyDocs(WXDC_WINDOWS_MYDOCS), |
Update of /cvsroot/wxdevcenter/wxDevCenter/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21767/src Modified Files: Tag: modularisation FileSystemStandard.cpp Module.cpp MainFrame.cpp Frame.cpp Application.cpp DocManager.cpp Plugin.cpp Log Message: Rename Plugin::Module(RefData) in Plugin::DynLib(RefData). Make all chages to compile with module support. Index: Module.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/Attic/Module.cpp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** Module.cpp 21 Sep 2005 15:00:38 -0000 1.1.2.1 --- Module.cpp 22 Sep 2005 16:41:35 -0000 1.1.2.2 *************** *** 30,44 **** IMPLEMENT_CLASS(Module, wxObject) - ObjectManager<wxClassInfo> Module::s_ModuleClassInfoManager; ! Module::Module(wxClassInfo* pClassInfo): ! wxObject(), ! m_pClassInfo(pClassInfo) ! { ! s_ModuleClassInfoManager.Register(pClassInfo); ! } ! ! void Module::RegisterModules() { ! /** @todo Add register code.*/ } --- 30,37 ---- IMPLEMENT_CLASS(Module, wxObject) ! Module::Module(wxClassInfo* pClassInfo, ClassInfoManager* pBaseClassInfoManager): ! wxObject() { ! pBaseClassInfoManager->Register(pClassInfo); } Index: FileSystemStandard.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/FileSystemStandard.cpp,v retrieving revision 1.19 retrieving revision 1.19.2.1 diff -C2 -d -r1.19 -r1.19.2.1 *** FileSystemStandard.cpp 14 Sep 2005 20:17:00 -0000 1.19 --- FileSystemStandard.cpp 22 Sep 2005 16:41:35 -0000 1.19.2.1 *************** *** 36,41 **** ////////////////////////////////////////////////////////////////////// // Standard file system ! bool FileSystemStandardBase::CreateDirectory(FilePath strDir) { strDir.RemoveProtocol(); --- 36,43 ---- ////////////////////////////////////////////////////////////////////// // Standard file system + IMPLEMENT_ABSTRACT_CLASS(FileSystemStandard, FileSystem) + WXDC_IMPLEMENT_MODULE_BASE_CLASS(FileSystemStandard) ! bool FileSystemStandard::CreateDirectory(FilePath strDir) { strDir.RemoveProtocol(); *************** *** 43,47 **** } ! bool FileSystemStandardBase::RemoveDirectory(FilePath strDir) { strDir.RemoveProtocol(); --- 45,49 ---- } ! bool FileSystemStandard::RemoveDirectory(FilePath strDir) { strDir.RemoveProtocol(); *************** *** 49,53 **** } ! bool FileSystemStandardBase::RemoveFile(FilePath strFilePath) { strFilePath.RemoveProtocol(); --- 51,55 ---- } ! bool FileSystemStandard::RemoveFile(FilePath strFilePath) { strFilePath.RemoveProtocol(); *************** *** 55,59 **** } ! int FileSystemStandardBase::GetFileType(const FilePath& strPath) { long type; --- 57,61 ---- } ! int FileSystemStandard::GetFileType(const FilePath& strPath) { long type; *************** *** 73,77 **** } ! wxImageList* FileSystemStandardBase::GetImageList(int width) { wxImageList* pIL = new wxImageList(width, width, true, WXDC_STDFS_FILETYPES + Application::GetApp().GetDocManager().GetDocTemplateCount()); --- 75,79 ---- } ! wxImageList* FileSystemStandard::GetImageList(int width) { wxImageList* pIL = new wxImageList(width, width, true, WXDC_STDFS_FILETYPES + Application::GetApp().GetDocManager().GetDocTemplateCount()); *************** *** 96,105 **** } ! wxInputStream* FileSystemStandardBase::GetInputStream(FilePath strPath) { return new wxFileInputStream(GetPhysicalFilePath(strPath)); } ! wxOutputStream* FileSystemStandardBase::GetOutputStream(FilePath strPath) { return new wxFileOutputStream(GetPhysicalFilePath(strPath)); --- 98,107 ---- } ! wxInputStream* FileSystemStandard::GetInputStream(FilePath strPath) { return new wxFileInputStream(GetPhysicalFilePath(strPath)); } ! wxOutputStream* FileSystemStandard::GetOutputStream(FilePath strPath) { return new wxFileOutputStream(GetPhysicalFilePath(strPath)); Index: Plugin.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/Plugin.cpp,v retrieving revision 1.11 retrieving revision 1.11.2.1 diff -C2 -d -r1.11 -r1.11.2.1 *** Plugin.cpp 15 Sep 2005 16:11:47 -0000 1.11 --- Plugin.cpp 22 Sep 2005 16:41:35 -0000 1.11.2.1 *************** *** 37,41 **** */ ! ModuleRefData::ModuleRefData(): wxObjectRefData(), m_flagState(Initial), --- 37,41 ---- */ ! DynLibRefData::DynLibRefData(): wxObjectRefData(), m_flagState(Initial), *************** *** 45,49 **** } ! ModuleRefData::~ModuleRefData() { } --- 45,49 ---- } ! DynLibRefData::~DynLibRefData() { } *************** *** 51,55 **** // Débugage : Dump du contenu. wxDEBUG_CODE( ! wxString ModuleRefData::Dump() { wxString str; --- 51,55 ---- // Débugage : Dump du contenu. wxDEBUG_CODE( ! wxString DynLibRefData::Dump() { wxString str; *************** *** 63,67 **** // Charge le module. ! bool ModuleRefData::Load(wxString strLongName) { wxString strFileName; --- 63,67 ---- // Charge le module. ! bool DynLibRefData::Load(wxString strLongName) { wxString strFileName; *************** *** 82,86 **** m_strPath = strPath; ! wxLogDebug(wxT("Loading module %s"), m_strPath.GetData()); BaseElementManager* pOldBEM = Element::s_pElementManager; Element::s_pElementManager = &m_Elements; --- 82,86 ---- m_strPath = strPath; ! wxLogDebug(wxT("Loading dynlib %s"), m_strPath.GetData()); BaseElementManager* pOldBEM = Element::s_pElementManager; Element::s_pElementManager = &m_Elements; *************** *** 91,100 **** { m_flagState |= Loaded; ! wxLogDebug(wxT("Module %s loaded"), strLongName.GetData()); } else { m_flagState = Error; ! wxLogDebug(wxT("Module %s loading error"), strLongName.GetData()); } return flag; --- 91,100 ---- { m_flagState |= Loaded; ! wxLogDebug(wxT("Dynlib %s loaded"), strLongName.GetData()); } else { m_flagState = Error; ! wxLogDebug(wxT("Dynlib %s loading error"), strLongName.GetData()); } return flag; *************** *** 102,106 **** } m_flagState = Error; ! wxLogDebug(wxT("Module %s not found"), strLongName.GetData()); return false; --- 102,106 ---- } m_flagState = Error; ! wxLogDebug(wxT("Dynlib %s not found"), strLongName.GetData()); return false; *************** *** 108,112 **** // Décharge le module. ! bool ModuleRefData::Unload() { return false; --- 108,112 ---- // Décharge le module. ! bool DynLibRefData::Unload() { return false; *************** *** 114,120 **** // Initialise le contenu du module. ! bool ModuleRefData::Initialize() { ! wxLogDebug("ModuleRefData::Initialize : %d", m_Elements.GetCount()); bool bOK = true; for(long l=0; l<(long)m_Elements.GetCount(); l++) --- 114,120 ---- // Initialise le contenu du module. ! bool DynLibRefData::Initialize() { ! wxLogDebug("DynlibRefData::Initialize : %d", m_Elements.GetCount()); bool bOK = true; for(long l=0; l<(long)m_Elements.GetCount(); l++) *************** *** 132,136 **** // Finalise le contenu du module. ! bool ModuleRefData::Finalize() { /** @todo Finalize all dependant elements.*/ --- 132,136 ---- // Finalise le contenu du module. ! bool DynLibRefData::Finalize() { /** @todo Finalize all dependant elements.*/ *************** *** 141,151 **** /** ! * Implémentation de la classe wxDevCenter::plugins::Module. */ ! IMPLEMENT_CLASS(Module, wxObject) // Constructeur. ! Module::Module(): wxObject() { --- 141,151 ---- /** ! * Implémentation de la classe wxDevCenter::plugins::DynLib. */ ! IMPLEMENT_CLASS(DynLib, wxObject) // Constructeur. ! DynLib::DynLib(): wxObject() { *************** *** 154,172 **** // Débugage : Dump du contenu. wxDEBUG_CODE( ! wxString Module::Dump() { ! ModuleRefData* pModRef = GetModuleRef(); if(pModRef!=NULL) return pModRef->Dump(); else ! return wxT("Null module"); } ) // Teste si le module est chargé. ! bool Module::IsLoaded()const { ! if(GetModuleRef()!=NULL) ! return GetModuleRef()->IsLoaded(); else return false; --- 154,172 ---- // Débugage : Dump du contenu. wxDEBUG_CODE( ! wxString DynLib::Dump() { ! DynLibRefData* pModRef = GetDynLibRef(); if(pModRef!=NULL) return pModRef->Dump(); else ! return wxT("Null dynlib"); } ) // Teste si le module est chargé. ! bool DynLib::IsLoaded()const { ! if(GetDynLibRef()!=NULL) ! return GetDynLibRef()->IsLoaded(); else return false; *************** *** 174,181 **** // Teste si le module est initialisé. ! bool Module::IsInitialized()const { ! if(GetModuleRef()!=NULL) ! return GetModuleRef()->IsInitialized(); else return false; --- 174,181 ---- // Teste si le module est initialisé. ! bool DynLib::IsInitialized()const { ! if(GetDynLibRef()!=NULL) ! return GetDynLibRef()->IsInitialized(); else return false; *************** *** 184,195 **** // Charge le module et enregistre son contenu. ! bool Module::Load(wxString strPath) { AllocExclusive(); ! return GetModuleRef()->Load(strPath); } // Décharge le module. ! bool Module::Unload() { return false; --- 184,195 ---- // Charge le module et enregistre son contenu. ! bool DynLib::Load(wxString strPath) { AllocExclusive(); ! return GetDynLibRef()->Load(strPath); } // Décharge le module. ! bool DynLib::Unload() { return false; *************** *** 197,204 **** // Initialise le contenu du module. ! bool Module::Initialize() { ! if(GetModuleRef()!=NULL) ! return GetModuleRef()->Initialize(); else return false; --- 197,204 ---- // Initialise le contenu du module. ! bool DynLib::Initialize() { ! if(GetDynLibRef()!=NULL) ! return GetDynLibRef()->Initialize(); else return false; *************** *** 206,210 **** // Finalise le contenu du module. ! bool Module::Finalize() { return false; --- 206,210 ---- // Finalise le contenu du module. ! bool DynLib::Finalize() { return false; *************** *** 239,245 **** for(long l=0; l<(long)m_arrstrPlugins.GetCount(); l++) str << wxT(" - ") << m_arrstrPlugins[l] << wxT("\n"); ! str << wxT("Used modules : ") << m_arrstrModules.GetCount() << wxT("\n"); ! for(long l=0; l<(long)m_arrstrModules.GetCount(); l++) ! str << wxT(" - ") << m_arrstrModules[l] << wxT("\n"); } return str; --- 239,245 ---- for(long l=0; l<(long)m_arrstrPlugins.GetCount(); l++) str << wxT(" - ") << m_arrstrPlugins[l] << wxT("\n"); ! str << wxT("Used modules : ") << m_arrstrDynLibs.GetCount() << wxT("\n"); ! for(long l=0; l<(long)m_arrstrDynLibs.GetCount(); l++) ! str << wxT(" - ") << m_arrstrDynLibs[l] << wxT("\n"); } return str; *************** *** 282,286 **** m_strNotes = File.GetNotes(); m_strURL = File.GetURL(); ! File.FillModuleArray(m_arrstrModules); File.FillDependantPluginArray(m_arrstrPlugins); m_Status |= PreLoaded; --- 282,286 ---- m_strNotes = File.GetNotes(); m_strURL = File.GetURL(); ! File.FillDynLibArray(m_arrstrDynLibs); File.FillDependantPluginArray(m_arrstrPlugins); m_Status |= PreLoaded; *************** *** 306,311 **** // Préchargement des modules. ! for(l=0; l<m_arrstrModules.GetCount(); l++) ! bOk &= m_pLoader->LoadModule(strName + wxT("/") + m_arrstrModules[l])!=NULL; m_Status |= Loaded | (bOk?0:Partial); --- 306,311 ---- // Préchargement des modules. ! for(l=0; l<m_arrstrDynLibs.GetCount(); l++) ! bOk &= m_pLoader->LoadDynLib(strName + wxT("/") + m_arrstrDynLibs[l])!=NULL; m_Status |= Loaded | (bOk?0:Partial); *************** *** 482,486 **** m_FeatureMap(), m_PluginMap(), ! m_ModuleMap() { } --- 482,486 ---- m_FeatureMap(), m_PluginMap(), ! m_DynLibMap() { } *************** *** 589,595 **** } ! str << wxT("*** Modules : ") << m_ModuleMap.size() << wxT(" ***\n"); ! ModuleMap::iterator it3; ! for( it3 = m_ModuleMap.begin(); it3 != m_ModuleMap.end(); ++it3 ) { str << wxT(">> ") << it3->first << wxT("\n"); --- 589,595 ---- } ! str << wxT("*** DynLibs : ") << m_DynLibMap.size() << wxT(" ***\n"); ! DynLibMap::iterator it3; ! for( it3 = m_DynLibMap.begin(); it3 != m_DynLibMap.end(); ++it3 ) { str << wxT(">> ") << it3->first << wxT("\n"); *************** *** 603,611 **** // Charge un module à l'adresse spécifiée. ! Module* PluginLoader::LoadModule(wxString strPath) { wxLogDebug(wxT("Loading module %s"), strPath.GetData()); ! Module& module = m_ModuleMap[strPath]; if(module.IsLoaded()) return &module; --- 603,611 ---- // Charge un module à l'adresse spécifiée. ! DynLib* PluginLoader::LoadDynLib(wxString strPath) { wxLogDebug(wxT("Loading module %s"), strPath.GetData()); ! DynLib& module = m_DynLibMap[strPath]; if(module.IsLoaded()) return &module; *************** *** 669,677 **** // Initialise un module. ! bool PluginLoader::InitializeModule(wxString strName) { wxLogDebug(wxT("Initializing module %s"), strName.GetData()); ! Module& module = m_ModuleMap[strName]; if(module.IsInitialized()) return true; --- 669,677 ---- // Initialise un module. ! bool PluginLoader::InitializeDynLib(wxString strName) { wxLogDebug(wxT("Initializing module %s"), strName.GetData()); ! DynLib& module = m_DynLibMap[strName]; if(module.IsInitialized()) return true; *************** *** 699,705 **** wxLogDebug("Initialize module :"); ! ModuleMap::iterator it3; ! for( it3 = m_ModuleMap.begin(); it3 != m_ModuleMap.end(); ++it3 ) ! InitializeModule(it3->first); } --- 699,705 ---- wxLogDebug("Initialize module :"); ! DynLibMap::iterator it3; ! for( it3 = m_DynLibMap.begin(); it3 != m_DynLibMap.end(); ++it3 ) ! InitializeDynLib(it3->first); } *************** *** 864,868 **** m_arrstrPlugins.Add(pDep->GetPropVal(wxT("name"), wxT(""))); else if(pDep->GetName()==wxT("module")) // Import d'un module. ! m_arrstrModules.Add(pDep->GetPropVal(wxT("name"), wxT(""))); pDep = pDep->GetNext(); --- 864,868 ---- m_arrstrPlugins.Add(pDep->GetPropVal(wxT("name"), wxT(""))); else if(pDep->GetName()==wxT("module")) // Import d'un module. ! m_arrstrDynLibs.Add(pDep->GetPropVal(wxT("name"), wxT(""))); pDep = pDep->GetNext(); *************** *** 874,880 **** // Suppression des noms vides unsigned long l; ! for(l=0; l<m_arrstrModules.GetCount(); l++) ! if(m_arrstrModules[l].IsEmpty()) ! m_arrstrModules.RemoveAt(l--); for(l=0; l<m_arrstrPlugins.GetCount(); l++) if(m_arrstrPlugins[l].IsEmpty()) --- 874,880 ---- // Suppression des noms vides unsigned long l; ! for(l=0; l<m_arrstrDynLibs.GetCount(); l++) ! if(m_arrstrDynLibs[l].IsEmpty()) ! m_arrstrDynLibs.RemoveAt(l--); for(l=0; l<m_arrstrPlugins.GetCount(); l++) if(m_arrstrPlugins[l].IsEmpty()) *************** *** 893,901 **** // Remplit une liste des chemins relatifs des modules à charger. ! void PluginDescriptionFile::FillModuleArray(wxArrayString& array) { unsigned long l; ! for(l=0; l<m_arrstrModules.GetCount(); l++) ! array.Add(m_arrstrModules[l]); } --- 893,901 ---- // Remplit une liste des chemins relatifs des modules à charger. ! void PluginDescriptionFile::FillDynLibArray(wxArrayString& array) { unsigned long l; ! for(l=0; l<m_arrstrDynLibs.GetCount(); l++) ! array.Add(m_arrstrDynLibs[l]); } Index: Frame.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/Frame.cpp,v retrieving revision 1.12 retrieving revision 1.12.2.1 diff -C2 -d -r1.12 -r1.12.2.1 *** Frame.cpp 15 Sep 2005 10:15:05 -0000 1.12 --- Frame.cpp 22 Sep 2005 16:41:35 -0000 1.12.2.1 *************** *** 65,77 **** ////////////////////////////////////////////////////////////////////// ! IMPLEMENT_CLASS(TopFrame, wxFrame) BEGIN_EVENT_TABLE(wxDevCenter::TopFrame, wxFrame) END_EVENT_TABLE() ! TopFrame::TopFrame(const wxString& title, const wxPoint& pos, const wxSize& size, long style): ! wxFrame(NULL, -1, title, pos, size, style), m_pViewFrame(NULL) { } --- 65,84 ---- ////////////////////////////////////////////////////////////////////// ! IMPLEMENT_ABSTRACT_CLASS(TopFrame, wxFrame) BEGIN_EVENT_TABLE(wxDevCenter::TopFrame, wxFrame) END_EVENT_TABLE() ! WXDC_IMPLEMENT_MODULE_BASE_CLASS(TopFrame) ! ! TopFrame::TopFrame(): ! wxFrame(), m_pViewFrame(NULL) { + } + + bool TopFrame::Create(const wxString& title, const wxPoint& pos, const wxSize& size, long style) + { + return wxFrame::Create(NULL, -1, title, pos, size, style); } Index: DocManager.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/DocManager.cpp,v retrieving revision 1.13 retrieving revision 1.13.2.1 diff -C2 -d -r1.13 -r1.13.2.1 *** DocManager.cpp 14 Sep 2005 20:01:53 -0000 1.13 --- DocManager.cpp 22 Sep 2005 16:41:35 -0000 1.13.2.1 *************** *** 299,303 **** pView->OnCreate(); ! Application::GetApp().GetMainFrame().AddView(pView); pView->OnInitialUpdate(); --- 299,303 ---- pView->OnCreate(); ! Application::GetApp().GetTopFrame().AddView(pView); pView->OnInitialUpdate(); Index: MainFrame.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/MainFrame.cpp,v retrieving revision 1.22 retrieving revision 1.22.2.1 diff -C2 -d -r1.22 -r1.22.2.1 *** MainFrame.cpp 14 Sep 2005 20:01:53 -0000 1.22 --- MainFrame.cpp 22 Sep 2005 16:41:35 -0000 1.22.2.1 *************** *** 34,37 **** --- 34,39 ---- #include <wxDevCenter/Layout.h> #include <wxDevCenter/ArtProvider.h> + #include <wxDevCenter/Module.h> + #include <wx/dataobj.h> *************** *** 51,55 **** ! IMPLEMENT_CLASS(MainFrame, TopFrame) BEGIN_EVENT_TABLE(MainFrame, TopFrame) --- 53,57 ---- ! IMPLEMENT_DYNAMIC_CLASS(MainFrame, TopFrame) BEGIN_EVENT_TABLE(MainFrame, TopFrame) *************** *** 93,99 **** END_EVENT_TABLE() MainFrame::MainFrame(void): ! TopFrame(WXDC_NAME, wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_STYLE|wxCLIP_CHILDREN), m_pLayoutManager(NULL), m_WorkBarArray(), --- 95,102 ---- END_EVENT_TABLE() + WXDC_DECLARE_MODULE_CLASS(MainFrame, TopFrame) MainFrame::MainFrame(void): ! TopFrame(), m_pLayoutManager(NULL), m_WorkBarArray(), *************** *** 102,105 **** --- 105,114 ---- m_pMenuItemWorkBar(NULL) { + } + + bool MainFrame::Create(const wxString& title, const wxPoint& pos, const wxSize& size, long style) + { + if(!TopFrame::Create(title, pos, size, style)) + return false; // Création de la fenetre cadre cliente. *************** *** 123,126 **** --- 132,137 ---- SetDropTarget(new MainFrameDropTarget); + + return true; } *************** *** 304,310 **** // Ajoute une vue ! void MainFrame::AddView(View *pView) { GetViewFrame()->AddView(pView); } --- 315,322 ---- // Ajoute une vue ! bool MainFrame::AddView(View *pView) { GetViewFrame()->AddView(pView); + return true; } Index: Application.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/Application.cpp,v retrieving revision 1.37 retrieving revision 1.37.2.1 diff -C2 -d -r1.37 -r1.37.2.1 *** Application.cpp 15 Sep 2005 16:11:47 -0000 1.37 --- Application.cpp 22 Sep 2005 16:41:35 -0000 1.37.2.1 *************** *** 31,35 **** #include <wxDevCenter/FileSystemCtrl.h> #include <wxDevCenter/Frame.h> - #include <wxDevCenter/MainFrame.h> #include <wxDevCenter/DocView.h> #include <wxDevCenter/FileTools.h> --- 31,34 ---- *************** *** 98,102 **** // Initialise le gestionnaire de systèmes de fichiers ! m_pStandardFileSystem = new FileSystemStandard; FileSystemManager::GetManager().Register(m_pStandardFileSystem, true); --- 97,101 ---- // Initialise le gestionnaire de systèmes de fichiers ! m_pStandardFileSystem = FileSystemStandard::CreateDerivateClass(); FileSystemManager::GetManager().Register(m_pStandardFileSystem, true); *************** *** 105,119 **** // Crée la fenetre principale ! m_pMainFrame = new MainFrame(); ! SetTopWindow(m_pMainFrame); // Fixe le conteneur de vue par défaut du DocManager ! m_DocManager.m_pDefaultViewContainer = (wxWindow*) m_pMainFrame->GetViewFrame(); // Affiche la fenetre principale. ! m_pMainFrame->Show(true); // Enregistre la fenêtre principale dans le WorkBarManager ! WorkBarManager::GetManager().RegisterFrame(m_pMainFrame); // Lance l'application. --- 104,123 ---- // Crée la fenetre principale ! m_pTopFrame = TopFrame::CreateDerivateClass(); ! if(!m_pTopFrame->Create(WXDC_NAME, wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_STYLE)) ! { ! wxLogError(wxT("Can not create top frame")); ! return false; ! } ! SetTopWindow(m_pTopFrame); // Fixe le conteneur de vue par défaut du DocManager ! m_DocManager.m_pDefaultViewContainer = (wxWindow*) m_pTopFrame->GetViewFrame(); // Affiche la fenetre principale. ! m_pTopFrame->Show(true); // Enregistre la fenêtre principale dans le WorkBarManager ! WorkBarManager::GetManager().RegisterFrame(m_pTopFrame); // Lance l'application. *************** *** 333,337 **** } ! m_pMainFrame->AddView(pView); pView->OnInitialUpdate(); --- 337,341 ---- } ! m_pTopFrame->AddView(pView); pView->OnInitialUpdate(); |
