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
|
Update of /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21767/include/wxDevCenter Modified Files: Tag: modularisation Element.h FileSystemStandard.h Frame.h MainFrame.h Application.h Plugin.h Module.h Log Message: Rename Plugin::Module(RefData) in Plugin::DynLib(RefData). Make all chages to compile with module support. Index: Module.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/Attic/Module.h,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.h 21 Sep 2005 15:00:38 -0000 1.1.2.1 --- Module.h 22 Sep 2005 16:41:35 -0000 1.1.2.2 *************** *** 31,57 **** class WXDC_DLL_BASE Module : public wxObject { DECLARE_CLASS(Module); - - static ObjectManager<wxClassInfo> s_ModuleClassInfoManager; - - wxClassInfo* m_pClassInfo; public: ! Module(wxClassInfo* pClassInfo); ! ! static void RegisterModules(); }; - #define WXDC_DECLARE_MODULE_CLASS(CLASS) static wxDevCenter::Module gs_wxdcModule(CLASSINFO(CLASS)); - class WXDC_DLL_BASE ModuleClass - { - protected: - static ObjectManager<wxClassInfo> s_ModuleClassInfoManager; - public: - - }; } --- 31,63 ---- + /** 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)); } Index: MainFrame.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/MainFrame.h,v retrieving revision 1.12 retrieving revision 1.12.2.1 diff -C2 -d -r1.12 -r1.12.2.1 *** MainFrame.h 2 Aug 2005 17:13:01 -0000 1.12 --- MainFrame.h 22 Sep 2005 16:41:35 -0000 1.12.2.1 *************** *** 48,60 **** class MainFrame : public TopFrame { ! friend class Application; ! /** Déclare la table d'interception des évènements de fenêtres.*/ ! DECLARE_EVENT_TABLE(); ! /** Déclare les infos RTTI de la classe.*/ ! DECLARE_CLASS(MainFrame); protected: - MainFrame(void); - virtual ~MainFrame(void); - /** LayoutManager.*/ wxLayoutManager* m_pLayoutManager; --- 48,56 ---- 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.*/ wxLayoutManager* m_pLayoutManager; *************** *** 156,159 **** --- 152,161 ---- // Fonctions de manipulation des vues: public: + MainFrame(void); + virtual ~MainFrame(void); + /** Créateur.*/ + virtual bool Create(const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE); + + /** Ajoute une vue. * Ajoute une vue à la fenêtre. *************** *** 162,166 **** * @param pView Vue à attacher. */ ! void AddView(View *pView); /** Retourne la fenetre cadre fille des vues.*/ --- 164,168 ---- * @param pView Vue à attacher. */ ! virtual bool AddView(View *pView); /** Retourne la fenetre cadre fille des vues.*/ Index: FileSystemStandard.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/FileSystemStandard.h,v retrieving revision 1.14 retrieving revision 1.14.2.1 diff -C2 -d -r1.14 -r1.14.2.1 *** FileSystemStandard.h 17 Aug 2005 16:33:17 -0000 1.14 --- FileSystemStandard.h 22 Sep 2005 16:41:35 -0000 1.14.2.1 *************** *** 57,62 **** * Implémentation partielle commune aux systèmes de fichiers réels (physiques) comme ceux de Windows ou Unix. */ ! class FileSystemStandardBase : public FileSystem { public: virtual wxString GetFileSystemName()const{return WXDC_SYSTEM_STDFS_NAME;} --- 57,64 ---- * Implémentation partielle commune aux systèmes de fichiers réels (physiques) comme ceux de Windows ou Unix. */ ! class FileSystemStandard : public FileSystem { + WXDC_DECLARE_MODULE_BASE_CLASS(FileSystemStandard) + DECLARE_ABSTRACT_CLASS(FileSystemStandard) public: virtual wxString GetFileSystemName()const{return WXDC_SYSTEM_STDFS_NAME;} *************** *** 91,108 **** } // Fin du namespace - - - // Inclut la déclaration spécifique à la plateforme. - #ifdef __WINDOWS__ - - #include <wxDevCenter/msw/FileSystemStandard.h> - - #else - - #include <wxDevCenter/unix/FileSystemStandard.h> - - #endif - - - #endif --- 93,95 ---- Index: Application.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/Application.h,v retrieving revision 1.20 retrieving revision 1.20.2.1 diff -C2 -d -r1.20 -r1.20.2.1 *** Application.h 15 Sep 2005 16:11:47 -0000 1.20 --- Application.h 22 Sep 2005 16:41:35 -0000 1.20.2.1 *************** *** 38,42 **** class FilePath; class Document; ! class MainFrame; class FileSystem; class DocManager; --- 38,42 ---- class FilePath; class Document; ! class TopFrame; class FileSystem; class DocManager; *************** *** 69,73 **** /** Fenêtre cadre principale.*/ ! MainFrame *m_pMainFrame; /** Données de configuration de la mise en pages.*/ --- 69,73 ---- /** Fenêtre cadre principale.*/ ! TopFrame *m_pTopFrame; /** Données de configuration de la mise en pages.*/ *************** *** 98,102 **** void AboutBox(int nPage=0); /** Fenêtre principale.*/ ! MainFrame& GetMainFrame(){return *m_pMainFrame;} /** Acces sur l'application. --- 98,102 ---- void AboutBox(int nPage=0); /** Fenêtre principale.*/ ! TopFrame& GetTopFrame(){return *m_pTopFrame;} /** Acces sur l'application. Index: Frame.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/Frame.h,v retrieving revision 1.13 retrieving revision 1.13.2.1 diff -C2 -d -r1.13 -r1.13.2.1 *** Frame.h 14 Sep 2005 15:37:06 -0000 1.13 --- Frame.h 22 Sep 2005 16:41:35 -0000 1.13.2.1 *************** *** 33,36 **** --- 33,38 ---- #include <wxDevCenter/Layout.h> + #include <wxDevCenter/Module.h> + namespace wxDevCenter *************** *** 136,142 **** class WXDC_DLL_BASE TopFrame : public wxFrame { ! DECLARE_CLASS(TopFrame); DECLARE_EVENT_TABLE() ! friend class MenuBar; protected: /** Fenetre cadre fille contenant les vues.*/ --- 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.*/ *************** *** 147,161 **** public: /** Constructeur.*/ ! TopFrame(const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE); /** Destructeur.*/ ~TopFrame(void); ! /** Fixe la fenetre cadre fille des vues.*/ void SetViewFrame(ViewFrame* pViewFrame){m_pViewFrame = pViewFrame;} /** Retourne la fenetre cadre fille des vues.*/ ViewFrame* GetViewFrame()const{return m_pViewFrame;} ! ! /** Ajoute une fenetre comme barre de travail. * @param pWorkBar Adresse de la barre de travail. --- 149,175 ---- public: + /** Constructeur.*/ ! TopFrame(); ! /** Créateur.*/ ! virtual bool Create(const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE); /** Destructeur.*/ ~TopFrame(void); ! /** @name View. ! * @{ */ ! virtual bool AddView(View* WXUNUSED(pView)){return false;} ! /** @} */ ! ! /** @name ViewFrame. ! * @{ */ ! /** Fixe la fenetre cadre fille des vues.*/ void SetViewFrame(ViewFrame* pViewFrame){m_pViewFrame = pViewFrame;} /** Retourne la fenetre cadre fille des vues.*/ ViewFrame* GetViewFrame()const{return m_pViewFrame;} ! /** @} */ ! ! /** @name WorkBar. ! * @{ */ /** Ajoute une fenetre comme barre de travail. * @param pWorkBar Adresse de la barre de travail. *************** *** 167,171 **** * @return Faux si la barre n'était pas attachée à cette fenêtre cadre.*/ virtual bool RemoveWorkBar(WorkBar* WXUNUSED(pWorkBar)){return false;} - /** Affiche/Cache une workbar. * @param pWorkBar Adresse de la workbar à afficher. --- 181,184 ---- *************** *** 173,177 **** --- 186,192 ---- * @return True si l'action a été effectuée correctement.*/ virtual bool ShowWorkBar(WorkBar* WXUNUSED(pWorkBar), bool WXUNUSED(bShow)){return false;} + /** @} */ + /** Retourne le layout attaché à la fenetre. Index: Plugin.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/Plugin.h,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -C2 -d -r1.5 -r1.5.2.1 *** Plugin.h 12 Aug 2005 09:25:19 -0000 1.5 --- Plugin.h 22 Sep 2005 16:41:35 -0000 1.5.2.1 *************** *** 52,57 **** // Prédéclaration des classes : struct Version; ! class ModuleRefData; ! class Module; class Plugin; class Feature; --- 52,57 ---- // Prédéclaration des classes : struct Version; ! class DynLibRefData; ! class DynLib; class Plugin; class Feature; *************** *** 134,140 **** /** Descriptif de module. * Objet référençable des modules.*/ ! class WXDC_DLL_BASE ModuleRefData : public wxObjectRefData { ! friend class Module; protected: /** Flag d'état du module.*/ --- 134,140 ---- /** Descriptif de module. * Objet référençable des modules.*/ ! class WXDC_DLL_BASE DynLibRefData : public wxObjectRefData { ! friend class DynLib; protected: /** Flag d'état du module.*/ *************** *** 150,155 **** BaseElementManager m_Elements; public: ! ModuleRefData(); ! virtual ~ModuleRefData(); /** Débugage : Dump du contenu. */ --- 150,155 ---- BaseElementManager m_Elements; public: ! DynLibRefData(); ! virtual ~DynLibRefData(); /** Débugage : Dump du contenu. */ *************** *** 175,179 **** /** Drapeaux d'états du module.*/ ! enum ModuleState { Initial = 0x0000, --- 175,179 ---- /** Drapeaux d'états du module.*/ ! enum DynLibState { Initial = 0x0000, *************** *** 189,207 **** * Un module est une dll/so qui contient des objets enregistrables. */ ! class WXDC_DLL_BASE Module : public wxObject { friend class Plugin; ! DECLARE_CLASS(Module) protected: /** Accesseur sur la référence de module.*/ ! ModuleRefData* GetModuleRef()const {return (ModuleRefData*) GetRefData();} // create a new m_refData ! virtual wxObjectRefData *CreateRefData() const{return new ModuleRefData;} public: /** Constructeur.*/ ! Module(); /** Constructeur.*/ ! Module(const Module& module):wxObject(){Ref(module);} /** Débugage : Dump du contenu. */ --- 189,207 ---- * Un module est une dll/so qui contient des objets enregistrables. */ ! class WXDC_DLL_BASE DynLib : public wxObject { friend class Plugin; ! DECLARE_CLASS(DynLib) protected: /** Accesseur sur la référence de module.*/ ! DynLibRefData* GetDynLibRef()const {return (DynLibRefData*) GetRefData();} // create a new m_refData ! virtual wxObjectRefData *CreateRefData() const{return new DynLibRefData;} public: /** Constructeur.*/ ! DynLib(); /** Constructeur.*/ ! DynLib(const DynLib& module):wxObject(){Ref(module);} /** Débugage : Dump du contenu. */ *************** *** 271,275 **** wxString m_strURL; /** Liste des modules du plugin.*/ ! wxArrayString m_arrstrModules; /** Liste des plugins dépendants.*/ wxArrayString m_arrstrPlugins; --- 271,275 ---- wxString m_strURL; /** Liste des modules du plugin.*/ ! wxArrayString m_arrstrDynLibs; /** Liste des plugins dépendants.*/ wxArrayString m_arrstrPlugins; *************** *** 423,427 **** WX_DECLARE_STRING_HASH_MAP_WITH_DECL(Feature, FeatureMap, class WXDC_DLL_BASE); WX_DECLARE_STRING_HASH_MAP_WITH_DECL(Plugin, PluginMap, class WXDC_DLL_BASE); ! WX_DECLARE_STRING_HASH_MAP_WITH_DECL(Module, ModuleMap, class WXDC_DLL_BASE); --- 423,427 ---- WX_DECLARE_STRING_HASH_MAP_WITH_DECL(Feature, FeatureMap, class WXDC_DLL_BASE); WX_DECLARE_STRING_HASH_MAP_WITH_DECL(Plugin, PluginMap, class WXDC_DLL_BASE); ! WX_DECLARE_STRING_HASH_MAP_WITH_DECL(DynLib, DynLibMap, class WXDC_DLL_BASE); *************** *** 434,438 **** FeatureMap m_FeatureMap; /**> Fonctionnalité indéxé par son nom.*/ PluginMap m_PluginMap; /**> Plugin indexé par son nom.*/ ! ModuleMap m_ModuleMap; /**> Module indexé par son chemin.*/ public: --- 434,438 ---- FeatureMap m_FeatureMap; /**> Fonctionnalité indéxé par son nom.*/ PluginMap m_PluginMap; /**> Plugin indexé par son nom.*/ ! DynLibMap m_DynLibMap; /**> DynLib indexé par son chemin.*/ public: *************** *** 446,450 **** * @param strPath Adrese du module. * @return Adresse du descripteur de module associé si chargé et NULL sinon..*/ ! Module* LoadModule(wxString strPath); /** Précharge la description des fonctionnalités et des plugins.*/ --- 446,450 ---- * @param strPath Adrese du module. * @return Adresse du descripteur de module associé si chargé et NULL sinon..*/ ! DynLib* LoadDynLib(wxString strPath); /** Précharge la description des fonctionnalités et des plugins.*/ *************** *** 493,497 **** * @return Vrai si le module est correctement initialisé. */ ! bool InitializeModule(wxString strName); /** Initialise le contenu chargé. --- 493,497 ---- * @return Vrai si le module est correctement initialisé. */ ! bool InitializeDynLib(wxString strName); /** Initialise le contenu chargé. *************** *** 569,573 **** m_strNotes, m_strURL; ! wxArrayString m_arrstrModules, m_arrstrPlugins; public: /** Constructeur. --- 569,573 ---- m_strNotes, m_strURL; ! wxArrayString m_arrstrDynLibs, m_arrstrPlugins; public: /** Constructeur. *************** *** 603,607 **** void FillDependantPluginArray(wxArrayString& array); /** Remplit une liste des chemins relatifs des modules à charger.*/ ! void FillModuleArray(wxArrayString& array); }; --- 603,607 ---- void FillDependantPluginArray(wxArrayString& array); /** Remplit une liste des chemins relatifs des modules à charger.*/ ! void FillDynLibArray(wxArrayString& array); }; Index: Element.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/Element.h,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -d -r1.3 -r1.3.2.1 *** Element.h 3 Aug 2005 19:21:22 -0000 1.3 --- Element.h 22 Sep 2005 16:41:35 -0000 1.3.2.1 *************** *** 92,96 **** namespace plugins { ! class ModuleRefData; } --- 92,96 ---- namespace plugins { ! class DynLibRefData; } *************** *** 101,105 **** class WXDC_DLL_BASE Element { ! friend class plugins::ModuleRefData; DECLARE_CLASS(Element) private: --- 101,105 ---- class WXDC_DLL_BASE Element { ! friend class plugins::DynLibRefData; DECLARE_CLASS(Element) private: |
|
From: Emilien K. <cur...@us...> - 2005-09-22 16:41:44
|
Update of /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21767/include/wxDevCenter/msw Modified Files: Tag: modularisation FileSystemStandard.h Log Message: Rename Plugin::Module(RefData) in Plugin::DynLib(RefData). Make all chages to compile with module support. Index: FileSystemStandard.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/msw/FileSystemStandard.h,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -d -r1.3 -r1.3.2.1 *** FileSystemStandard.h 17 Aug 2005 16:33:19 -0000 1.3 --- FileSystemStandard.h 22 Sep 2005 16:41:35 -0000 1.3.2.1 *************** *** 38,43 **** /** Système de fichiers physique des systèmes Windows.*/ ! class FileSystemStandardWindows : public FileSystemStandardBase { protected: FilePath m_strFindPath; /**< Chemin de la recherche actuelle.*/ --- 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.*/ *************** *** 94,99 **** }; - typedef FileSystemStandardWindows FileSystemStandard; - --- 95,98 ---- |
|
From: Emilien K. <cur...@us...> - 2005-09-22 16:41:44
|
Update of /cvsroot/wxdevcenter/wxDevCenter/src/unix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21767/src/unix 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/unix/FileSystemStandard.cpp,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -d -r1.3 -r1.3.2.1 *** FileSystemStandard.cpp 17 Aug 2005 16:33:18 -0000 1.3 --- FileSystemStandard.cpp 22 Sep 2005 16:41:35 -0000 1.3.2.1 *************** *** 24,27 **** --- 24,28 ---- #include <wxDevCenter.h> #include <wxDevCenter/FileSystemStandard.h> + #include <wxDevCenter/unix/FileSystemStandard.h> #include <wx/utils.h> *************** *** 35,41 **** // Implémentation spécifique UNIX ////////////////////////////////////////////////////////////////////// FileSystemStandardUnix::FileSystemStandardUnix(): ! FileSystemStandardBase() { } --- 36,44 ---- // Implémentation spécifique UNIX ////////////////////////////////////////////////////////////////////// + IMPLEMENT_DYNAMIC_CLASS(FileSystemStandardUnix, FileSystemStandard) + WXDC_DECLARE_MODULE_CLASS(FileSystemStandardUnix, FileSystemStandard) FileSystemStandardUnix::FileSystemStandardUnix(): ! FileSystemStandard() { } |
|
From: Emilien K. <cur...@us...> - 2005-09-22 16:41:44
|
Update of /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/unix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21767/include/wxDevCenter/unix Modified Files: Tag: modularisation FileSystemStandard.h Log Message: Rename Plugin::Module(RefData) in Plugin::DynLib(RefData). Make all chages to compile with module support. Index: FileSystemStandard.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/unix/FileSystemStandard.h,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -d -r1.3 -r1.3.2.1 *** FileSystemStandard.h 17 Aug 2005 16:33:18 -0000 1.3 --- FileSystemStandard.h 22 Sep 2005 16:41:35 -0000 1.3.2.1 *************** *** 43,48 **** * Valables pour les systèmes UNIX, Linux, MacOS. */ ! class FileSystemStandardUnix : public FileSystemStandardBase { protected: FilePath m_strFindPath; --- 43,49 ---- * Valables pour les systèmes UNIX, Linux, MacOS. */ ! class FileSystemStandardUnix : public FileSystemStandard { + DECLARE_DYNAMIC_CLASS(FileSystemStandardUnix) protected: FilePath m_strFindPath; *************** *** 62,67 **** }; - typedef FileSystemStandardUnix FileSystemStandard; - --- 63,66 ---- |
|
From: Emilien K. <cur...@us...> - 2005-09-21 15:00:56
|
Update of /cvsroot/wxdevcenter/wxDevCenter/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8401/src Added Files: Tag: modularisation Module.cpp Log Message: Modularize bakefiles. Begining of Module class. --- NEW FILE: Module.cpp --- (This appears to be a binary file; contents omitted.) |
|
From: Emilien K. <cur...@us...> - 2005-09-21 15:00:55
|
Update of /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8401/include/wxDevCenter Added Files: Tag: modularisation Module.h Log Message: Modularize bakefiles. Begining of Module class. --- NEW FILE: Module.h --- (This appears to be a binary file; contents omitted.) |
|
From: Emilien K. <cur...@us...> - 2005-09-21 15:00:54
|
Update of /cvsroot/wxdevcenter/wxDevCenter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8401 Modified Files: Tag: modularisation wxDevCenter.bkl GNUmakefile Removed Files: Tag: modularisation wx.bkl Log Message: Modularize bakefiles. Begining of Module class. --- wx.bkl DELETED --- Index: GNUmakefile =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/GNUmakefile,v retrieving revision 1.11 retrieving revision 1.11.2.1 diff -C2 -d -r1.11 -r1.11.2.1 *** GNUmakefile 14 Sep 2005 14:19:11 -0000 1.11 --- GNUmakefile 21 Sep 2005 15:00:38 -0000 1.11.2.1 *************** *** 17,26 **** prefix = /usr/local - # - AR = ar - - # - RANLIB = ranlib - # C++ compiler CXX = g++ --- 17,20 ---- *************** *** 50,53 **** --- 44,50 ---- WXPORTNAME = gtk2 + # Version of installed wxDockIt. [21] + WXDOCKIT = 21 + *************** *** 59,73 **** CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD - SPECIFIC_CXXFLAGS = -D_THREAD_SAFE -pthread $(__WARNINGS) $(__UNICODE_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__OPTIMIZEFLAG) $(__DEBUGINFO) $(__WXUSINGDLL_p) \ - `wx-config --cppflags` -Iinclude -DwxDC_INSTALL_TARGET=\"$(prefix)\" \ - $(CPPFLAGS) $(CXXFLAGS) - SPECIFIC_OBJECTS = \ - ./build/$(BUILD)/specific_Config.o \ - ./build/$(BUILD)/specific_FileSystemStandard.o WXDEVCENTERLIB_CXXFLAGS = -D_THREAD_SAFE -pthread $(__WARNINGS) \ $(__UNICODE_DEFINE_p) $(__DEBUG_DEFINE_p) $(__OPTIMIZEFLAG) $(__DEBUGINFO) \ ! $(__WXUSINGDLL_p) `wx-config --cppflags` -Iinclude -fPIC -DPIC $(CPPFLAGS) \ ! $(CXXFLAGS) WXDEVCENTERLIB_OBJECTS = \ ./build/$(BUILD)/wxDevCenterLib_AboutBox.o \ --- 56,63 ---- CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD WXDEVCENTERLIB_CXXFLAGS = -D_THREAD_SAFE -pthread $(__WARNINGS) \ $(__UNICODE_DEFINE_p) $(__DEBUG_DEFINE_p) $(__OPTIMIZEFLAG) $(__DEBUGINFO) \ ! $(__WXUSINGDLL_p) `wx-config --cppflags` -Iinclude \ ! -DwxDC_INSTALL_TARGET=\"$(prefix)\" -fPIC -DPIC $(CPPFLAGS) $(CXXFLAGS) WXDEVCENTERLIB_OBJECTS = \ ./build/$(BUILD)/wxDevCenterLib_AboutBox.o \ *************** *** 76,79 **** --- 66,70 ---- ./build/$(BUILD)/wxDevCenterLib_Command.o \ ./build/$(BUILD)/wxDevCenterLib_Config.o \ + ./build/$(BUILD)/wxDevCenterLib_Config_unix.o \ ./build/$(BUILD)/wxDevCenterLib_DocManager.o \ ./build/$(BUILD)/wxDevCenterLib_DocType.o \ *************** *** 88,95 **** ./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_Plugin.o \ ./build/$(BUILD)/wxDevCenterLib_Project.o \ --- 79,85 ---- ./build/$(BUILD)/wxDevCenterLib_Frame.o \ ./build/$(BUILD)/wxDevCenterLib_Layout.o \ ./build/$(BUILD)/wxDevCenterLib_Manager.o \ ./build/$(BUILD)/wxDevCenterLib_MiniView.o \ + ./build/$(BUILD)/wxDevCenterLib_Module.o \ ./build/$(BUILD)/wxDevCenterLib_Plugin.o \ ./build/$(BUILD)/wxDevCenterLib_Project.o \ *************** *** 102,105 **** --- 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: ### *************** *** 129,132 **** --- 127,133 ---- WXVERSIONTAG = 2.6 endif + ifeq ($(WXDOCKIT),21) + WXDOCKIT_VERSION = 2.1 + endif ifeq ($(BUILD),debug) FREEDESKTOP_MENU_FILE = wxdevcenterd.desktop *************** *** 170,178 **** ### Targets: ### ! 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/Command.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/Layout.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 \ if test ! -d $(prefix)/include/`dirname $$f` ; then \ $(INSTALL) -d $(prefix)/include/`dirname $$f`; \ --- 171,179 ---- ### 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 \ if test ! -d $(prefix)/include/`dirname $$f` ; then \ $(INSTALL) -d $(prefix)/include/`dirname $$f`; \ *************** *** 197,212 **** rm -f ./build/$(BUILD)/*.o rm -f ./build/$(BUILD)/*.d - rm -f ./lib/libspecific.a rm -f lib/libwxDevCenterLib.so rm -f lib/libwxDevCenterLib.so rm -f ./bin/wxDevCenter$(SUFFIX) ! ./lib/libspecific.a: $(SPECIFIC_OBJECTS) ! rm -f $@ ! $(AR) rcu $@ $(SPECIFIC_OBJECTS) ! $(RANLIB) $@ ! ! lib/libwxDevCenterLib.so: $(WXDEVCENTERLIB_OBJECTS) ./lib/libspecific.a ./lib/libspecific.a ! $(CXX) -shared -fPIC -o $@ $(WXDEVCENTERLIB_OBJECTS) $(LDFLAGS) -pthread $(__DEBUGINFO) `wx-config --libs` -lwx_base$(WXLIBPOSTFIX)-$(WXVERSIONTAG) ./lib/libspecific.a -lwx_base$(WXLIBPOSTFIX)-$(WXVERSIONTAG) -lwx_base$(WXLIBPOSTFIX)_xml-$(WXVERSIONTAG) -lwx_$(WXPORTNAME)$(WXLIBPOSTFIX)_core-$(WXVERSIONTAG) -lwx_$(WXPORTNAME)$(WXLIBPOSTFIX)_adv-$(WXVERSIONTAG) -lwx_$(WXPORTNAME)$(WXLIBPOSTFIX)_fl-$(WXVERSIONTAG) -lwxdockit-2.1 install_wxDevCenterLib: --- 198,208 ---- rm -f ./build/$(BUILD)/*.o rm -f ./build/$(BUILD)/*.d rm -f lib/libwxDevCenterLib.so 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: *************** *** 216,220 **** ./bin/wxDevCenter$(SUFFIX): $(WXDEVCENTER_OBJECTS) lib/libwxDevCenterLib.so ! $(CXX) -o $@ $(WXDEVCENTER_OBJECTS) $(LDFLAGS) -pthread $(__DEBUGINFO) `wx-config --libs` -L./lib -lwx_base$(WXLIBPOSTFIX)-$(WXVERSIONTAG) -lwxDevCenterLib -lwx_base$(WXLIBPOSTFIX)-$(WXVERSIONTAG) -lwx_$(WXPORTNAME)$(WXLIBPOSTFIX)_core-$(WXVERSIONTAG) install_wxDevCenter: --- 212,216 ---- ./bin/wxDevCenter$(SUFFIX): $(WXDEVCENTER_OBJECTS) lib/libwxDevCenterLib.so ! $(CXX) -o $@ $(WXDEVCENTER_OBJECTS) $(LDFLAGS) -pthread $(__DEBUGINFO) `wx-config --libs` -L./lib -lwxDevCenterLib -lwx_base$(WXLIBPOSTFIX)-$(WXVERSIONTAG) -lwx_$(WXPORTNAME)$(WXLIBPOSTFIX)_core-$(WXVERSIONTAG) install_wxDevCenter: *************** *** 222,230 **** install -c ./bin/wxDevCenter$(SUFFIX) $(prefix)/bin ! ./build/$(BUILD)/specific_Config.o: ./src/unix/Config.cpp ! $(CXX) -c -o $@ $(SPECIFIC_CXXFLAGS) $(CPPDEPS) $< ! ./build/$(BUILD)/specific_FileSystemStandard.o: ./src/unix/FileSystemStandard.cpp ! $(CXX) -c -o $@ $(SPECIFIC_CXXFLAGS) $(CPPDEPS) $< ./build/$(BUILD)/wxDevCenterLib_AboutBox.o: ./src/AboutBox.cpp --- 218,227 ---- 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: ! $(INSTALL) -d $(prefix)/lib/wxDevCenter/modules ! install -c ./modules/wxdc-unix.so $(prefix)/lib/wxDevCenter/modules ./build/$(BUILD)/wxDevCenterLib_AboutBox.o: ./src/AboutBox.cpp *************** *** 243,246 **** --- 240,246 ---- $(CXX) -c -o $@ $(WXDEVCENTERLIB_CXXFLAGS) $(CPPDEPS) $< + ./build/$(BUILD)/wxDevCenterLib_Config_unix.o: ./src/unix/Config-unix.cpp + $(CXX) -c -o $@ $(WXDEVCENTERLIB_CXXFLAGS) $(CPPDEPS) $< + ./build/$(BUILD)/wxDevCenterLib_DocManager.o: ./src/DocManager.cpp $(CXX) -c -o $@ $(WXDEVCENTERLIB_CXXFLAGS) $(CPPDEPS) $< *************** *** 279,292 **** $(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) $< --- 279,289 ---- $(CXX) -c -o $@ $(WXDEVCENTERLIB_CXXFLAGS) $(CPPDEPS) $< ./build/$(BUILD)/wxDevCenterLib_Manager.o: ./src/Manager.cpp $(CXX) -c -o $@ $(WXDEVCENTERLIB_CXXFLAGS) $(CPPDEPS) $< ! ./build/$(BUILD)/wxDevCenterLib_MiniView.o: ./src/MiniView.cpp $(CXX) -c -o $@ $(WXDEVCENTERLIB_CXXFLAGS) $(CPPDEPS) $< ! ./build/$(BUILD)/wxDevCenterLib_Module.o: ./src/Module.cpp $(CXX) -c -o $@ $(WXDEVCENTERLIB_CXXFLAGS) $(CPPDEPS) $< *************** *** 309,313 **** $(CXX) -c -o $@ $(WXDEVCENTER_CXXFLAGS) $(CPPDEPS) $< ! .PHONY: all install uninstall clean install_wxDevCenterLib install_wxDevCenter --- 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 Index: wxDevCenter.bkl =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/wxDevCenter.bkl,v retrieving revision 1.11 retrieving revision 1.11.2.1 diff -C2 -d -r1.11 -r1.11.2.1 *** wxDevCenter.bkl 24 Apr 2005 16:10:56 -0000 1.11 --- wxDevCenter.bkl 21 Sep 2005 15:00:38 -0000 1.11.2.1 *************** *** 2,10 **** <makefile> ! <include file="build/wx.bkl" /> ! <include file="build/wxDevCenter.bkl" /> ! <include file="build/install.bkl" /> </makefile> --- 2,21 ---- <makefile> ! <!-- Default wxWidgets template definition. --> ! <include file="build/bakefiles/wx.bkl" /> ! <!-- wxDevCenter rule definition. --> ! <include file="build/bakefiles/wxDevCenter.bkl" /> ! <!-- Standard modules. --> ! <if cond="PLATFORM_WIN32=='1'"> ! <include file="build/bakefiles/wxDevCenter-msw.bkl" /> ! </if> ! <if cond="PLATFORM_UNIX=='1'"> ! <include file="build/bakefiles/wxDevCenter-unix.bkl" /> ! </if> ! ! <!-- Installation rules. --> ! <include file="build/bakefiles/install.bkl" /> </makefile> |
|
From: Emilien K. <cur...@us...> - 2005-09-21 15:00:53
|
Update of /cvsroot/wxdevcenter/wxDevCenter/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8401/build/bakefiles Added Files: Tag: modularisation wxDockIt.bkl wxdc-plugins.bkl wxDevCenter.bkl wxdc-modules.bkl wxDevCenter-unix.bkl wx.bkl wxDevCenter-msw.bkl install.bkl Log Message: Modularize bakefiles. Begining of Module class. --- NEW FILE: wxDevCenter-unix.bkl --- <?xml version="1.0" ?> <makefile> <!-- wxDockIt. --> <include file="wxDockIt.bkl" /> <!-- wxdc-modules.bkl. --> <include file="wxdc-modules.bkl" /> <module id="wxdc-unix" template="wxdc-module" cond="PLATFORM_UNIX=='1'"> <dllname>wxdc-unix</dllname> <include>include</include> <dirname>./modules</dirname> <sources> src/unix/FileSystemStandard.cpp src/MainFrame.cpp src/MDIFrame.cpp </sources> <wxlib /> <wxlib-base>xml</wxlib-base> <wxlib-gui>adv</wxlib-gui> <wxDockItLib /> </module> </makefile> --- NEW FILE: wxdc-modules.bkl --- <?xml version="1.0" ?> <!-- wxDevCenter module base bakefile. --> <makefile> <template id="wxdc-module" template="wxDLL"> <install-to>$(LIBDIR)/wxDevCenter/modules</install-to> </template> </makefile> --- NEW FILE: wxdc-plugins.bkl --- <?xml version="1.0" ?> <makefile> <template id="wxdc-plugin" template="wxDLL"> <install-to>$(LIBDIR)/wxDevCenter/plugins</install-to> </template> </makefile> --- NEW FILE: wxDockIt.bkl --- <?xml version="1.0" ?> <!-- wxDockIt generic bakefile. --> <!-- WARNING : Make sure wx.bkl is included before this. --> <makefile> <!-- Static or shared library compilation. --> <option name="WXDOCKIT"> <values>21</values> <values-description>2.1</values-description> <default-value>21</default-value> <description>Version of installed wxDockIt.</description> </option> <!-- Set wxDockIt version var. --> <set var="WXDOCKIT_VERSION"> <if cond="WXDOCKIT=='21'">2.1</if> </set> <!-- Set debug library name for wxDockIt only on windows.--> <set var="WXDOCKIT_SUFFIX"> <if cond="TARGETING_WIN32=='1'">$(SUFFIX)</if> <if cond="TARGETING_WIN32=='0'">-$(WXDOCKIT_VERSION)</if> </set> <!-- wxDockIt lib. --> <define-tag name="wxDockItLib" rules="exe,dll,lib,module"> <sys-lib>wxdockit$(WXDOCKIT_SUFFIX)</sys-lib> </define-tag> </makefile> --- NEW FILE: wxDevCenter.bkl --- <?xml version="1.0" ?> <makefile> <!-- Determine what plateform is used. --> <set var="DIRSPEC"> <if cond="PLATFORM_WIN32=='1'">msw</if> <if cond="PLATFORM_UNIX=='1'">unix</if> </set> <!-- Set the build directory. --> <set var="BUILDDIR">.$(DIRSEP)build$(DIRSEP)$(BUILD)</set> <dll id="wxDevCenterLib" template="wxDLL"> <dllname>wxDevCenterLib</dllname> <libname>wxDevCenterLib</libname> <version>0.3.0</version> <dirname>lib</dirname> <include>include</include> <!-- Set the install directory. --> <define>wxDC_INSTALL_TARGET="$(prefix)"</define> <sources> src/AboutBox.cpp src/Application.cpp src/ArtProvider.cpp src/Command.cpp src/Config.cpp src/$(DIRSPEC)/Config-$(DIRSPEC).cpp src/DocManager.cpp src/DocType.cpp src/Document.cpp src/Element.cpp src/FileSystem.cpp src/FileSystemCtrl.cpp src/FileSystemListCtrl.cpp src/FileSystemTreeCtrl.cpp src/FileSystemStandard.cpp src/FileTools.cpp src/Frame.cpp src/Layout.cpp src/Manager.cpp src/MiniView.cpp src/Module.cpp src/Plugin.cpp src/Project.cpp src/StatusBar.cpp src/View.cpp src/WorkBar.cpp </sources> <wxlib /> <wxlib-base>xml</wxlib-base> <wxlib-gui>core</wxlib-gui> <wxlib-gui>adv</wxlib-gui> <win32-res>res-win32/wxDevCenter.rc</win32-res> <win32-res>res-win32/wxDevCenter.fragment.manifest</win32-res> <install-to>$(LIBDIR)</install-to> </dll> <exe id="wxDevCenter" template="wxEXE"> <app-type>gui</app-type> <exename>wxDevCenter$(SUFFIX)</exename> <dirname>./bin</dirname> <depends>wxDevCenterLib</depends> <lib-path>./lib</lib-path> <sys-lib>wxDevCenterLib</sys-lib> <include>include</include> <sources> src/AppImpl.cpp </sources> <win32-res>res-win32/wxDevCenter.rc</win32-res> <win32-res>res-win32/wxDevCenter.fragment.manifest</win32-res> <wxlib /> <wxlib-gui>core</wxlib-gui> <install-to>$(BINDIR)</install-to> </exe> </makefile> --- NEW FILE: wx.bkl --- <?xml version="1.0" ?> <makefile> <!-- Options --> <!-- Static or shared library compilation. --> <option name="SHARED"> <values>0,1</values> <values-description>LIB,DLL</values-description> <default-value>1</default-value> <description> What type of library to build ? </description> </option> <!-- Unicode strings or not (unicode or ansi). --> <option name="UNICODE"> <values>0,1</values> <values-description>ANSI,Unicode</values-description> <default-value>0</default-value> <description> Compile Unicode build of wxWidgets ? </description> </option> <!-- Build mode. --> <option name="BUILD"> <values>debug,release</values> <values-description>Debug,Release</values-description> <default-value>release</default-value> <description> Type of compiled binaries. </description> </option> <!-- wxWidgets version. --> <option name="WXVER"> <values>25, 26</values> <values-description>wx2.5.x, wx2.6.x</values-description> <default-value>26</default-value> <description> Version of wxWidgets. </description> </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> <!-- Variables declarations. --> <!-- ISDLL : 1 if choose to compile library for dynamic use. --> <set var="ISDLL" cond="SHARED=='1'">1</set> <set var="ISDLL" cond="SHARED=='0'">0</set> <!-- Preporcessor definition to say if wx is used in shared mode. --> <set var="WXUSINGDLL"> <if cond="SHARED=='1'">WXUSINGDLL</if> </set> <set var="SUFFIX"> <if cond="BUILD=='debug'">D</if> </set> <!-- UNICODE_DEFINE : Preprocessor definition for unicode use. --> <set var="UNICODE_DEFINE"> <if cond="FORMAT!='autoconf' and UNICODE=='1'">_UNICODE</if> </set> <set var="DEBUG_DEFINE"> <if cond="FORMAT!='autoconf' and BUILD=='debug'">__WXDEBUG__</if> </set> <!-- DEBUGINFO : is debug mode actived ? --> <set var="DEBUGINFO"> <if cond="BUILD=='debug'">on</if> <if cond="BUILD=='release'">off</if> </set> <!-- DEBUGRUNTIME : is runtime debug library used ? --> <set var="DEBUGRUNTIME"> <if cond="BUILD=='debug'">on</if> <if cond="BUILD=='release'">off</if> </set> <!-- OPTIMIZEFLAG : type of optimization. --> <set var="OPTIMIZEFLAG"> <if cond="BUILD=='debug'">off</if> <if cond="BUILD=='release'">speed</if> </set> <!-- WARNINGS : level of compilation warning to show. --> <set var="WARNINGS"> <if cond="BUILD=='debug'">max</if> <if cond="BUILD=='release'">no</if> </set> <!-- wxWidgets plateforms definitions. --> <!-- Set the main definition for plateform. --> <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> <!-- wxWidgets library variable definitions. --> <!-- wxWidgets libraries string flags. --> <set var="WXLIBPOSTFIX"> <if cond="BUILD=='debug' and UNICODE=='1'">ud</if> <if cond="BUILD=='debug' and UNICODE=='0'">d</if> <if cond="BUILD=='release' and UNICODE=='1'">u</if> </set> <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> <!-- wxWidgets library tag. --> <!-- wxWidgets lib. --> <define-tag name="wxlib" rules="exe,dll,lib,module"> <if cond="TARGETING_WIN32=='1'"> <sys-lib>$(WXNAMEPREFIX)</sys-lib> </if> <if cond="TARGETING_WIN32=='0'"> <sys-lib>$(WXNAMEPREFIX)-$(WXVERSIONTAG)</sys-lib> </if> </define-tag> <!-- wxWidgets base lib. Can be : net, odbc, xml. --> <define-tag name="wxlib-base" rules="exe,dll,lib,module"> <if cond="TARGETING_WIN32=='1'"> <sys-lib>$(WXNAMEPREFIX)_$(value)</sys-lib> </if> <if cond="TARGETING_WIN32=='0'"> <sys-lib>$(WXNAMEPREFIX)_$(value)-$(WXVERSIONTAG)</sys-lib> </if> </define-tag> <!-- wxWidgets GUI lib. Can be : adv, animate, core, dbgrid, deprecated, fl, gizmos, gl, html, mmedia, ogl, plot, stc, svg, xrc. --> <define-tag name="wxlib-gui" rules="exe,dll,lib,module"> <if cond="TARGETING_WIN32=='1'"> <sys-lib>$(WXNAMEPREFIXGUI)_$(value)</sys-lib> </if> <if cond="TARGETING_WIN32=='0'"> <sys-lib>$(WXNAMEPREFIXGUI)_$(value)-$(WXVERSIONTAG)</sys-lib> </if> </define-tag> <!-- wxWidgets dependent lib. Can be : expat, jpeg, png, regex, tiff, zlib. --> <define-tag name="wxlib-depend" rules="exe,dll,lib,module"> <if cond="TARGETING_WIN32=='1'"> <sys-lib>wx$(value)$(WXLIBPOSTFIX)</sys-lib> </if> <if cond="TARGETING_WIN32=='0'"> <sys-lib>$(WXNAMEPREFIX)$(WXVERSIONTAG)</sys-lib> <!-- Already in wxlib. --> </if> </define-tag> <!-- Template definitions. --> <!-- Base for all target using wxWidgets. --> <template id="wxBase"> <cxx-rtti>on</cxx-rtti> <cxx-exceptions>on</cxx-exceptions> <threading>multi</threading> <warnings>$(WARNINGS)</warnings> <define>$(UNICODE_DEFINE)</define> <define>$(DEBUG_DEFINE)</define> <optimize>$(OPTIMIZEFLAG)</optimize> <debug-info>$(DEBUGINFO)</debug-info> <debug-runtime-libs>$(DEBUGRUNTIME)</debug-runtime-libs> <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> <!-- Lib based on wxWidgets. --> <template id="wxLib" template="wxBase"> </template> <!-- Base for module (dll or exe) based on wxWidgets. --> <template id="wxModule" template="wxBase"> <!-- If targeting the Windows OS, link with the libraries manually. --> <if cond="FORMAT!='autoconf' and FORMAT!='gnu'"> <if cond="FORMAT=='borland'"> <sys-lib>ole2w32</sys-lib> </if> <if cond="FORMAT!='borland'"> <sys-lib>kernel32</sys-lib> <sys-lib>user32</sys-lib> <sys-lib>gdi32</sys-lib> <sys-lib>comdlg32</sys-lib> <sys-lib>winspool</sys-lib> <sys-lib>winmm</sys-lib> <sys-lib>shell32</sys-lib> <sys-lib>comctl32</sys-lib> <sys-lib>odbc32</sys-lib> <sys-lib>ole32</sys-lib> <sys-lib>oleaut32</sys-lib> <sys-lib>uuid</sys-lib> <sys-lib>rpcrt4</sys-lib> <sys-lib>advapi32</sys-lib> <sys-lib>wsock32</sys-lib> </if> <if cond="FORMAT=='msvc' or FORMAT=='msvc6prj' or FORMAT=='borland'"> <sys-lib>oleacc</sys-lib> </if> </if> <!-- end if windows. --> </template> <template id="wxDLL" template="wxModule"> </template> <template id="wxEXE" template="wxModule"> </template> </makefile> --- NEW FILE: install.bkl --- <?xml version="1.0" ?> <makefile> <using module="datafiles" /> <!-- Install headers. --> <data-files-tree > <srcdir>include</srcdir> <install-to>$(INCLUDEDIR)</install-to> <files> 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/$(DIRSPEC)/Config.h wxDevCenter/$(DIRSPEC)/FileSystemStandard.h </files> </data-files-tree> <!-- Install data. --> <data-files-tree > <srcdir>data</srcdir> <install-to>$(DATADIR)/wxDevCenter/data</install-to> <files> 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 </files> </data-files-tree> <!-- 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/icons</srcdir> <install-to>$(DATADIR)/pixmaps</install-to> <files>wxDevCenter.png</files> </data-files> </makefile> --- NEW FILE: wxDevCenter-msw.bkl --- <?xml version="1.0" ?> <makefile> <!-- wxDockIt. --> <include file="wxDockIt.bkl" /> <!-- wxdc-modules.bkl. --> <include file="wxdc-modules.bkl" /> <module id="wxdc-msw" template="wxdc-module" cond="PLATFORM_WIN32=='1'"> <dllname>wxdc-unix</dllname> <include>include</include> <version>0.3.0</version> <dirname>./modules</dirname> <sources> src/msw/FileSystemStandard.cpp src/MainFrame.cpp src/MDIFrame.cpp </sources> <wxlib /> <wxlib-base>xml</wxlib-base> <wxlib-gui>adv</wxlib-gui> <wxDockItLib /> </module> </makefile> |
|
From: Emilien K. <cur...@us...> - 2005-09-21 15:00:52
|
Update of /cvsroot/wxdevcenter/wxDevCenter/build In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8401/build Removed Files: Tag: modularisation wx.bkl install.bkl wxDevCenter.bkl Log Message: Modularize bakefiles. Begining of Module class. --- wx.bkl DELETED --- --- install.bkl DELETED --- --- wxDevCenter.bkl DELETED --- |
|
From: Emilien K. <cur...@us...> - 2005-09-21 15:00:44
|
Update of /cvsroot/wxdevcenter/wxDevCenter/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8369/build/bakefiles Log Message: Directory /cvsroot/wxdevcenter/wxDevCenter/build/bakefiles added to the repository --> Using per-directory sticky tag `modularisation' |
|
From: Emilien K. <cur...@us...> - 2005-09-15 20:26:25
|
Update of /cvsroot/wxdevcenter/wxDevCenter/src/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6762/src/msw Added Files: Tag: modularisation Config-msw.cpp Removed Files: Tag: modularisation Config.cpp Log Message: --- Config.cpp DELETED --- --- NEW FILE: Config-msw.cpp --- (This appears to be a binary file; contents omitted.) |
|
From: Emilien K. <cur...@us...> - 2005-09-15 20:26:25
|
Update of /cvsroot/wxdevcenter/wxDevCenter/src/unix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6762/src/unix Added Files: Tag: modularisation Config-unix.cpp Removed Files: Tag: modularisation Config.cpp Log Message: --- Config.cpp DELETED --- --- NEW FILE: Config-unix.cpp --- (This appears to be a binary file; contents omitted.) |
|
From: Emilien K. <cur...@us...> - 2005-09-15 20:26:25
|
Update of /cvsroot/wxdevcenter/wxDevCenter/build In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6762/build Modified Files: Tag: modularisation wxDevCenter.bkl Log Message: Index: wxDevCenter.bkl =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/build/wxDevCenter.bkl,v retrieving revision 1.13 retrieving revision 1.13.2.1 diff -C2 -d -r1.13 -r1.13.2.1 *** wxDevCenter.bkl 14 Sep 2005 14:19:11 -0000 1.13 --- wxDevCenter.bkl 15 Sep 2005 20:26:12 -0000 1.13.2.1 *************** *** 18,39 **** <set var="BUILDDIR">.$(DIRSEP)build$(DIRSEP)$(BUILD)</set> - - - <lib id="specific" template="wxLib"> - <include>include</include> - <dirname>./lib</dirname> - - <sources> - src/$(DIRSPEC)/Config.cpp - src/$(DIRSPEC)/FileSystemStandard.cpp - </sources> - - <!-- Set the install directory. --> - <define>wxDC_INSTALL_TARGET="$(prefix)"</define> - - <wxlib /> - <wxlib-base>xml</wxlib-base> - <wxlib-gui>adv</wxlib-gui> - </lib> <dll id="wxDevCenterLib" template="wxDLL"> --- 18,21 ---- *************** *** 43,48 **** <dirname>lib</dirname> - <depends>specific</depends> - <library>specific</library> <include>include</include> --- 25,28 ---- *************** *** 54,57 **** --- 34,38 ---- src/Command.cpp src/Config.cpp + src/$(DIRSPEC)/Config-$(DIRSPEC).cpp src/DocManager.cpp src/DocType.cpp *************** *** 66,72 **** src/Frame.cpp src/Layout.cpp - src/MainFrame.cpp src/Manager.cpp - src/MDIFrame.cpp src/MiniView.cpp src/Plugin.cpp --- 47,51 ---- *************** *** 98,102 **** <depends>wxDevCenterLib</depends> ! <lib-path>./lib</lib-path> <sys-lib>wxDevCenterLib</sys-lib> --- 77,81 ---- <depends>wxDevCenterLib</depends> ! <lib-path>./lib</lib-path> <sys-lib>wxDevCenterLib</sys-lib> *************** *** 114,117 **** --- 93,143 ---- <install-to>$(BINDIR)</install-to> </exe> + + <module id="wxdc-unix" template="wxDLL" cond="PLATFORM_UNIX=='1'"> + <dllname>wxdc-unix</dllname> + <include>include</include> + <version>0.3.0</version> + + <dirname>./modules</dirname> + + <sources> + src/unix/FileSystemStandard.cpp + src/MainFrame.cpp + src/MDIFrame.cpp + </sources> + + <!-- Set the install directory. --> + <define>wxDC_INSTALL_TARGET="$(prefix)"</define> + + <wxlib /> + <wxlib-base>xml</wxlib-base> + <wxlib-gui>adv</wxlib-gui> + + <install-to>$(LIBDIR)/modules</install-to> + </module> + + <module id="wxdc-msw" template="wxDLL" cond="PLATFORM_WIN32=='1'"> + <dllname>wxdc-unix</dllname> + <include>include</include> + <version>0.3.0</version> + + <dirname>./modules</dirname> + + <sources> + src/msw/FileSystemStandard.cpp + src/MainFrame.cpp + src/MDIFrame.cpp + </sources> + + <!-- Set the install directory. --> + <define>wxDC_INSTALL_TARGET="$(prefix)"</define> + + <wxlib /> + <wxlib-base>xml</wxlib-base> + <wxlib-gui>adv</wxlib-gui> + + <install-to>$(LIBDIR)/modules</install-to> + </module> + </makefile> |
|
From: Emilien K. <cur...@us...> - 2005-09-15 16:12:09
|
Update of /cvsroot/wxdevcenter/StdPlugin/src/Bitmap In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10110/src/Bitmap Modified Files: BitmapProp.cpp Log Message: Modularize Config. Use Config::GetConfig to retreive the unique config object. Index: BitmapProp.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/src/Bitmap/BitmapProp.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** BitmapProp.cpp 14 Sep 2005 20:01:43 -0000 1.2 --- BitmapProp.cpp 15 Sep 2005 16:11:55 -0000 1.3 *************** *** 9,12 **** --- 9,13 ---- #include <wxDevCenter/StdPlugin/Bitmap/BitmapProp.h> #include <wxDevCenter/ArtProvider.h> + #include <wxDevCenter/Config.h> #include <wx/bmpbuttn.h> *************** *** 421,425 **** { /** Ouvre la config.*/ ! wxConfigBase& Config = Application::GetApp().GetConfig()[WXDC_BITMAP_CONFIG_ROOT]; Config.SetPath(wxT("/formats")); --- 422,426 ---- { /** Ouvre la config.*/ ! wxConfigBase& Config = Config::GetConfig()[WXDC_BITMAP_CONFIG_ROOT]; Config.SetPath(wxT("/formats")); *************** *** 450,454 **** { /** Ouvre la config.*/ ! wxConfigBase& Config = Application::GetApp().GetConfig()[WXDC_BITMAP_CONFIG_ROOT]; Config.SetPath(wxT("/formats")); --- 451,455 ---- { /** Ouvre la config.*/ ! wxConfigBase& Config = Config::GetConfig()[WXDC_BITMAP_CONFIG_ROOT]; Config.SetPath(wxT("/formats")); |
|
From: Emilien K. <cur...@us...> - 2005-09-15 16:12:09
|
Update of /cvsroot/wxdevcenter/wxDevCenter/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9964/src Modified Files: Application.cpp ArtProvider.cpp Plugin.cpp Config.cpp Log Message: Modularize Config. Use Config::GetConfig to retreive the unique config object. Index: Config.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/Config.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Config.cpp 11 Aug 2005 09:58:17 -0000 1.10 --- Config.cpp 15 Sep 2005 16:11:47 -0000 1.11 *************** *** 34,37 **** --- 34,60 ---- wxNullConfig Config::m_ConfigNull; + Config* Config::s_pConfigManager = NULL; + + // Initialisation of the Config module. + void Config::InitialiseModule() + { + s_pConfigManager = new Configuration; + if(s_pConfigManager!=NULL) + { + s_pConfigManager->Initialize(); + } + } + + // Finalize the config module. + void Config::FinalizeModule() + { + if(s_pConfigManager!=NULL) + { + s_pConfigManager->Finalize(); + delete s_pConfigManager; + s_pConfigManager = NULL; + } + } + Config::Config(void): Index: ArtProvider.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/ArtProvider.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ArtProvider.cpp 15 Sep 2005 09:54:25 -0000 1.3 --- ArtProvider.cpp 15 Sep 2005 16:11:47 -0000 1.4 *************** *** 42,46 **** l=0; ! while(strPathRoot = Application::GetApp().GetConfig().GetDataPath(l++),!strPathRoot.IsEmpty()) { strPathRoot << wxT("/icons/") << id; --- 42,46 ---- l=0; ! while(strPathRoot = Config::GetConfig().GetDataPath(l++),!strPathRoot.IsEmpty()) { strPathRoot << wxT("/icons/") << id; Index: Application.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/Application.cpp,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** Application.cpp 15 Sep 2005 10:15:05 -0000 1.36 --- Application.cpp 15 Sep 2005 16:11:47 -0000 1.37 *************** *** 26,29 **** --- 26,30 ---- #include <wxDevCenter/AboutBox.h> + #include <wxDevCenter/Config.h> #include <wxDevCenter/FileSystem.h> #include <wxDevCenter/FileSystemStandard.h> *************** *** 71,80 **** // Initialisation du gestionnaire de configuration. ! m_ConfigManager.Initialize(); if(!wxApp::OnInit()) return false; ! m_ConfigManager.LogConfig(); wxArtProvider::PushProvider(new ArtProvider); --- 72,81 ---- // Initialisation du gestionnaire de configuration. ! Config::InitialiseModule(); if(!wxApp::OnInit()) return false; ! Config::GetConfig().LogConfig(); wxArtProvider::PushProvider(new ArtProvider); *************** *** 91,95 **** // Crée la config utilisateur. ! m_ConfigManager.CreateUserProfile(); // Enregistre les différents types de documents/vues --- 92,96 ---- // Crée la config utilisateur. ! Config::GetConfig().CreateUserProfile(); // Enregistre les différents types de documents/vues *************** *** 126,130 **** m_ProjectManager.Finalize(); // Enregistrement de la config ! m_ConfigManager.Finalize(); return wxApp::OnExit(); --- 127,131 ---- m_ProjectManager.Finalize(); // Enregistrement de la config ! Config::FinalizeModule(); return wxApp::OnExit(); *************** *** 410,429 **** - wxBitmap Application::LoadAppBitmap(wxString strBmp, long type) - { - wxString str; - wxBitmap Bmp; - - if(!Bmp.LoadFile(GetConfig().GetDataPath() + wxT("/img/") + strBmp, wxBitmapType(type))) - { - str = WXDC_ERROR_LOADDOCVIEWICON; - str.Replace(wxT("%1"), strBmp); - wxMessageBox(str); - return wxNullBitmap; - } - else - return Bmp; - } - // Initialise la ligne de commande. --- 411,414 ---- *************** *** 447,459 **** wxString str; if(parser.Found(wxT("APd"), (wxString*)&str)) ! GetConfig().AddDataPath(str); if(parser.Found(wxT("APf"), (wxString*)&str)) ! GetConfig().AddFeaturesPath(str); if(parser.Found(wxT("APp"), (wxString*)&str)) ! GetConfig().AddPluginsPath(str); if(parser.Found(wxT("APc"), (wxString*)&str)) ! GetConfig().AddGlobalConfPath(str); if(parser.Found(wxT("APu"), (wxString*)&str)) ! GetConfig().AddUserConfPath(str); wxLogDebug("Plop"); return true; --- 432,444 ---- wxString str; if(parser.Found(wxT("APd"), (wxString*)&str)) ! Config::GetConfig().AddDataPath(str); if(parser.Found(wxT("APf"), (wxString*)&str)) ! Config::GetConfig().AddFeaturesPath(str); if(parser.Found(wxT("APp"), (wxString*)&str)) ! Config::GetConfig().AddPluginsPath(str); if(parser.Found(wxT("APc"), (wxString*)&str)) ! Config::GetConfig().AddGlobalConfPath(str); if(parser.Found(wxT("APu"), (wxString*)&str)) ! Config::GetConfig().AddUserConfPath(str); wxLogDebug("Plop"); return true; Index: Plugin.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/Plugin.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Plugin.cpp 15 Sep 2005 09:54:25 -0000 1.10 --- Plugin.cpp 15 Sep 2005 16:11:47 -0000 1.11 *************** *** 25,32 **** --- 25,34 ---- #include <wxDevCenter.h> #include <wxDevCenter/Plugin.h> + #include <wxDevCenter/Config.h> using namespace wxDevCenter; using namespace plugins; + #include <wx/file.h> #include <wx/dir.h> *************** *** 73,77 **** long l=0; wxString strPath; ! while(strPath = Application::GetApp().GetConfig().GetPluginsPath(l++), !strPath.IsEmpty()) { strPath += wxT("/") + m_strPath; --- 75,79 ---- long l=0; wxString strPath; ! while(strPath = Config::GetConfig().GetPluginsPath(l++), !strPath.IsEmpty()) { strPath += wxT("/") + m_strPath; *************** *** 264,268 **** wxString strFilePath; ! while(strFilePath = Application::GetApp().GetConfig().GetPluginsPath(l++), !strFilePath.IsEmpty()) { strFilePath << wxT("/") << strName << wxT("/plugin.xml"); --- 266,270 ---- wxString strFilePath; ! while(strFilePath = Config::GetConfig().GetPluginsPath(l++), !strFilePath.IsEmpty()) { strFilePath << wxT("/") << strName << wxT("/plugin.xml"); *************** *** 386,390 **** l=0; ! while(strFilePath = Application::GetApp().GetConfig().GetFeaturesPath(l++), !strFilePath.IsEmpty()) { strFilePath << wxT("/") << strName << wxT("/feature.xml"); --- 388,392 ---- l=0; ! while(strFilePath = Config::GetConfig().GetFeaturesPath(l++), !strFilePath.IsEmpty()) { strFilePath << wxT("/") << strName << wxT("/feature.xml"); *************** *** 511,515 **** wxLogDebug(wxT("Preload feature descriptions :")); l = 0; ! while(strPath=Application::GetApp().GetConfig().GetFeaturesPath(l++), !strPath.IsEmpty()) { if(wxDir::Exists(strPath) && dir.Open(strPath)) --- 513,517 ---- wxLogDebug(wxT("Preload feature descriptions :")); l = 0; ! while(strPath=Config::GetConfig().GetFeaturesPath(l++), !strPath.IsEmpty()) { if(wxDir::Exists(strPath) && dir.Open(strPath)) *************** *** 528,532 **** wxLogDebug(wxT("Preload plugin descriptions :")); l = 0; ! while(strPath=Application::GetApp().GetConfig().GetPluginsPath(l++), !strPath.IsEmpty()) { if(wxDir::Exists(strPath) && dir.Open(strPath)) --- 530,534 ---- wxLogDebug(wxT("Preload plugin descriptions :")); l = 0; ! while(strPath=Config::GetConfig().GetPluginsPath(l++), !strPath.IsEmpty()) { if(wxDir::Exists(strPath) && dir.Open(strPath)) |
|
From: Emilien K. <cur...@us...> - 2005-09-15 16:12:09
|
Update of /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/unix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9964/include/wxDevCenter/unix Modified Files: Config.h Log Message: Modularize Config. Use Config::GetConfig to retreive the unique config object. Index: Config.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/unix/Config.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Config.h 11 Aug 2005 09:58:17 -0000 1.8 --- Config.h 15 Sep 2005 16:11:47 -0000 1.9 *************** *** 38,42 **** protected: wxConfig *m_pConfig; - public: ConfigUnix(void); --- 38,41 ---- |
|
From: Emilien K. <cur...@us...> - 2005-09-15 16:12:08
|
Update of /cvsroot/wxdevcenter/wxDevCenter/src/unix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9964/src/unix Modified Files: Config.cpp Log Message: Modularize Config. Use Config::GetConfig to retreive the unique config object. Index: Config.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/unix/Config.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Config.cpp 25 Aug 2005 15:49:25 -0000 1.11 --- Config.cpp 15 Sep 2005 16:11:47 -0000 1.12 *************** *** 32,35 **** --- 32,36 ---- using namespace wxDevCenter; + ConfigUnix::ConfigUnix(void): Config(), |
|
From: Emilien K. <cur...@us...> - 2005-09-15 16:12:08
|
Update of /cvsroot/wxdevcenter/StdPlugin/src/Text In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10110/src/Text Modified Files: SimpleTextDocView.cpp Log Message: Modularize Config. Use Config::GetConfig to retreive the unique config object. Index: SimpleTextDocView.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/src/Text/SimpleTextDocView.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SimpleTextDocView.cpp 14 Sep 2005 20:17:07 -0000 1.3 --- SimpleTextDocView.cpp 15 Sep 2005 16:11:55 -0000 1.4 *************** *** 26,30 **** --- 26,32 ---- #include <wxDevCenter/StdPlugin/Text/SimpleTextDocView.h> + #include <wxDevCenter/ArtProvider.h> + #include <wxDevCenter/Config.h> #include <wx/stream.h> *************** *** 202,206 **** LanguageProperty::LangagePropertyStyle* pCurStyle; ! wxConfigBase& GlobalConfig = Application::GetApp().GetConfig()[WXDC_SIMPLETEXT_CONFIG_ROOT]; GlobalConfig.SetPath(wxT("/")); --- 204,208 ---- LanguageProperty::LangagePropertyStyle* pCurStyle; ! wxConfigBase& GlobalConfig = Config::GetConfig().GetSubConfig(WXDC_SIMPLETEXT_CONFIG_ROOT); GlobalConfig.SetPath(wxT("/")); *************** *** 212,216 **** strRoot.Empty(); strRoot << WXDC_SIMPLETEXT_CONFIG_ROOT << wxT("/") << pLang->strShortName; ! wxConfigBase& Config = Application::GetApp().GetConfig()[strRoot]; Config.SetPath(wxT("/")); --- 214,218 ---- strRoot.Empty(); strRoot << WXDC_SIMPLETEXT_CONFIG_ROOT << wxT("/") << pLang->strShortName; ! wxConfigBase& Config = Config::GetConfig().GetSubConfig(strRoot); Config.SetPath(wxT("/")); *************** *** 253,257 **** LanguageProperty::LangagePropertyStyle* pCurStyle; ! wxConfigBase& GlobalConfig = Application::GetApp().GetConfig()[WXDC_SIMPLETEXT_CONFIG_ROOT]; GlobalConfig.SetPath(wxT("/")); --- 255,259 ---- LanguageProperty::LangagePropertyStyle* pCurStyle; ! wxConfigBase& GlobalConfig = Config::GetConfig()[WXDC_SIMPLETEXT_CONFIG_ROOT]; GlobalConfig.SetPath(wxT("/")); *************** *** 263,267 **** strRoot.Empty(); strRoot << WXDC_SIMPLETEXT_CONFIG_ROOT << wxT("/") << pLang->strShortName; ! wxConfigBase& Config = Application::GetApp().GetConfig()[strRoot]; Config.SetPath(wxT("/")); --- 265,269 ---- strRoot.Empty(); strRoot << WXDC_SIMPLETEXT_CONFIG_ROOT << wxT("/") << pLang->strShortName; ! wxConfigBase& Config = Config::GetConfig()[strRoot]; Config.SetPath(wxT("/")); |
|
From: Emilien K. <cur...@us...> - 2005-09-15 16:12:08
|
Update of /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9964/include/wxDevCenter Modified Files: Application.h Config.h Log Message: Modularize Config. Use Config::GetConfig to retreive the unique config object. Index: Config.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/Config.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Config.h 11 Aug 2005 09:58:17 -0000 1.10 --- Config.h 15 Sep 2005 16:11:47 -0000 1.11 *************** *** 100,109 **** class WXDC_DLL_BASE Config : public wxObject { public: Config(void); virtual ~Config(void); /** (Re)Initialise la configuration. ! * Relit les informations de chemins dans lees registres.*/ virtual void Initialize(); --- 100,124 ---- class WXDC_DLL_BASE Config : public wxObject { + protected: + /** The unique configuration object.*/ + static Config* s_pConfigManager; + + + /** Set configuration.*/ + static void SetConfig(Config* pConfig){s_pConfigManager = pConfig;} + public: + /** Accessor to the unique config object.*/ + static Config& GetConfig(){return *s_pConfigManager;} + /** Initialisation of the Config module.*/ + static void InitialiseModule(); + /** Finalize the config module.*/ + static void FinalizeModule(); + Config(void); virtual ~Config(void); /** (Re)Initialise la configuration. ! * Relit les informations de chemins dans les registres.*/ virtual void Initialize(); Index: Application.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/Application.h,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** Application.h 15 Sep 2005 10:15:05 -0000 1.19 --- Application.h 15 Sep 2005 16:11:47 -0000 1.20 *************** *** 29,33 **** #include <wxDevCenter/Project.h> #include <wxDevCenter/DocView.h> - #include <wxDevCenter/Config.h> --- 29,32 ---- *************** *** 48,57 **** * Gère la fenêtre cadre principale, le projet. * Contient le gestionnaire de types de documents et de vues. - * Contient le gestionnaire de systèmes de fichiers pour les manipuler facilement. - * - * Met à disposition une interface de configuration pour lire et écrire les préférences utilisateur. * @see MainFrame * @see DocManager - * @see FileSystemManager */ class WXDC_DLL_BASE Application : public wxApp --- 47,52 ---- *************** *** 76,82 **** MainFrame *m_pMainFrame; - /** Gestionnaire de configuration.*/ - Configuration m_ConfigManager; - /** Données de configuration de la mise en pages.*/ wxPageSetupDialogData* m_pPageSetupDialogData; --- 71,74 ---- *************** *** 113,127 **** /** @}*/ - /** @name Données - * Gestion des données de l'applications comme les images. - * @{*/ - /** Charge un dessin (bitmap) de l'application. - * @param strBmp Nom de l'image à charger. - * @param type Type de l'image. - * @return Bitmap de l'image. - */ - wxBitmap LoadAppBitmap(wxString strBmp, long type); - /** @}*/ - /** @name Projet * Membres relatifs à la gestion du projet. --- 105,108 ---- *************** *** 194,203 **** /** @}*/ - /** @name Configuration - * @{ */ - /** Accesseur sur la configuration.*/ - Config& GetConfig(){return m_ConfigManager;} - /** @} */ - /** @name Plugins * Gestion des plugins. --- 175,178 ---- |
|
From: Emilien K. <cur...@us...> - 2005-09-15 10:15:13
|
Update of /cvsroot/wxdevcenter/wxDevCenter/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22034/src Modified Files: Frame.cpp WorkBar.cpp Application.cpp FileSystem.cpp Log Message: Modularize WorkBarManager. Use WorkBarManager::GetManager to retreive the unique manager object. Index: Application.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/Application.cpp,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** Application.cpp 15 Sep 2005 09:54:25 -0000 1.35 --- Application.cpp 15 Sep 2005 10:15:05 -0000 1.36 *************** *** 36,39 **** --- 36,40 ---- #include <wxDevCenter/ArtProvider.h> #include <wxDevCenter/Command.h> + #include <wxDevCenter/WorkBar.h> #include <wx/dynlib.h> *************** *** 82,86 **** m_DocManager.Initialize(); m_ProjectManager.Initialize(); ! m_WorkBarManager.Initialize(); // Charge les plugins : phase de tests --- 83,87 ---- m_DocManager.Initialize(); m_ProjectManager.Initialize(); ! WorkBarManager::GetManager().Initialize(); // Charge les plugins : phase de tests *************** *** 113,117 **** // Enregistre la fenêtre principale dans le WorkBarManager ! Application::GetApp().GetWorkBarManager().RegisterFrame(m_pMainFrame); // Lance l'application. --- 114,118 ---- // Enregistre la fenêtre principale dans le WorkBarManager ! WorkBarManager::GetManager().RegisterFrame(m_pMainFrame); // Lance l'application. Index: Frame.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/Frame.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Frame.cpp 14 Sep 2005 15:37:06 -0000 1.11 --- Frame.cpp 15 Sep 2005 10:15:05 -0000 1.12 *************** *** 25,28 **** --- 25,29 ---- #include <wxDevCenter/Frame.h> #include <wxDevCenter/DocView.h> + #include <wxDevCenter/WorkBar.h> #include <wx/recguard.h> *************** *** 103,107 **** bool TopFrame::Destroy() { ! Application::GetApp().GetWorkBarManager().UnregisterFrame(this); return wxFrame::Destroy(); } --- 104,108 ---- bool TopFrame::Destroy() { ! WorkBarManager::GetManager().UnregisterFrame(this); return wxFrame::Destroy(); } Index: WorkBar.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/WorkBar.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** WorkBar.cpp 8 Aug 2005 19:16:42 -0000 1.8 --- WorkBar.cpp 15 Sep 2005 10:15:05 -0000 1.9 *************** *** 77,81 **** if(!WorkBarTemplate::Initialize()) return false; ! Application::GetApp().GetWorkBarManager().RegisterWorkBar(this); return true; } --- 77,81 ---- if(!WorkBarTemplate::Initialize()) return false; ! WorkBarManager::GetManager().RegisterWorkBar(this); return true; } *************** *** 100,103 **** --- 100,105 ---- */ + WorkBarManager WorkBarManager::s_WorkBarManager; + // Constructeur. WorkBarManager::WorkBarManager(): Index: FileSystem.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/FileSystem.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** FileSystem.cpp 15 Sep 2005 09:54:25 -0000 1.9 --- FileSystem.cpp 15 Sep 2005 10:15:05 -0000 1.10 *************** *** 25,28 **** --- 25,29 ---- #include <wxDevCenter/FileSystem.h> #include <wxDevCenter/FileSystemCtrl.h> + #include <wxDevCenter/WorkBar.h> #include <wx/tokenzr.h> *************** *** 203,207 **** return false; if(bMountWorkBar) ! Application::GetApp().GetWorkBarManager().RegisterWorkBar(CLASSINFO(FileSystemTreeWorkBar), pFileSystem->GetFileSystemName(), pFileSystem->GetProtocoleName(), pFileSystem); return true; } --- 204,208 ---- return false; if(bMountWorkBar) ! WorkBarManager::GetManager().RegisterWorkBar(CLASSINFO(FileSystemTreeWorkBar), pFileSystem->GetFileSystemName(), pFileSystem->GetProtocoleName(), pFileSystem); return true; } *************** *** 210,214 **** bool FileSystemManager::Unregister(FileSystem* pFileSystem) { ! Application::GetApp().GetWorkBarManager().UnregisterWorkBar(CLASSINFO(FileSystemTreeWorkBar), pFileSystem); return ObjectManager<FileSystem>::Unregister(pFileSystem); } --- 211,215 ---- bool FileSystemManager::Unregister(FileSystem* pFileSystem) { ! WorkBarManager::GetManager().UnregisterWorkBar(CLASSINFO(FileSystemTreeWorkBar), pFileSystem); return ObjectManager<FileSystem>::Unregister(pFileSystem); } |
|
From: Emilien K. <cur...@us...> - 2005-09-15 10:15:13
|
Update of /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22034/include/wxDevCenter Modified Files: WorkBar.h Application.h Log Message: Modularize WorkBarManager. Use WorkBarManager::GetManager to retreive the unique manager object. Index: WorkBar.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/WorkBar.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** WorkBar.h 2 Aug 2005 17:13:01 -0000 1.8 --- WorkBar.h 15 Sep 2005 10:15:05 -0000 1.9 *************** *** 128,132 **** --- 128,138 ---- /** Gestionnaire des fenêtres cadres attachants des barres.*/ ObjectManager<TopFrame> m_FrameManager; + protected: + /** The unique WorkBarManager object.*/ + static WorkBarManager s_WorkBarManager; public: + /** Accessor to the unique workbar manager.*/ + static WorkBarManager& GetManager(){return s_WorkBarManager;} + /** Constructeur.*/ WorkBarManager(); Index: Application.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/Application.h,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** Application.h 15 Sep 2005 09:54:25 -0000 1.18 --- Application.h 15 Sep 2005 10:15:05 -0000 1.19 *************** *** 29,33 **** #include <wxDevCenter/Project.h> #include <wxDevCenter/DocView.h> - #include <wxDevCenter/WorkBar.h> #include <wxDevCenter/Config.h> --- 29,32 ---- *************** *** 71,77 **** DocManager m_DocManager; - /** Gestionnaire de barres de travail.*/ - WorkBarManager m_WorkBarManager; - /** Système de fichier standard (lecture/écritures sur les réels).*/ FileSystem *m_pStandardFileSystem; --- 70,73 ---- *************** *** 211,220 **** /** @}*/ - /** @name WorkBar - * @{ */ - /** Acces au gestionnaire de Barres de travail.*/ - WorkBarManager& GetWorkBarManager(){return m_WorkBarManager;} - /** @} */ - /** @name Print * @{*/ --- 207,210 ---- |
|
From: Emilien K. <cur...@us...> - 2005-09-15 09:54:44
|
Update of /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16672/include/wxDevCenter Modified Files: Project.h Application.h FileSystem.h FileSystemTreeCtrl.h Log Message: Modularize FileSystemManager. Use FileSystemManager::GetManager to retreive the unique manager object. Index: Project.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/Project.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Project.h 17 Aug 2005 16:33:17 -0000 1.8 --- Project.h 15 Sep 2005 09:54:25 -0000 1.9 *************** *** 32,36 **** #include <wxDevCenter/Manager.h> #include <wxDevCenter/FileTools.h> - #include <wxDevCenter/FileSystem.h> #include <wx/dynarray.h> --- 32,35 ---- Index: FileSystemTreeCtrl.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/FileSystemTreeCtrl.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FileSystemTreeCtrl.h 17 Aug 2005 15:01:06 -0000 1.2 --- FileSystemTreeCtrl.h 15 Sep 2005 09:54:25 -0000 1.3 *************** *** 23,26 **** --- 23,28 ---- #define __WXDEVCENTER_FILESYSTEMTREECTRL + #include <wxDevCenter/FileSystem.h> + #include <wx/treectrl.h> *************** *** 28,32 **** { - class FileSystem; class DocManager; class FilePath; --- 30,33 ---- Index: Application.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/Application.h,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** Application.h 14 Sep 2005 14:19:10 -0000 1.17 --- Application.h 15 Sep 2005 09:54:25 -0000 1.18 *************** *** 30,34 **** #include <wxDevCenter/DocView.h> #include <wxDevCenter/WorkBar.h> - #include <wxDevCenter/FileSystem.h> #include <wxDevCenter/Config.h> --- 30,33 ---- *************** *** 40,49 **** class FilePath; - class FileSystem; class Document; class MainFrame; ! class DocManager; - class FileSystemManager; --- 39,46 ---- class FilePath; class Document; class MainFrame; ! class FileSystem; class DocManager; *************** *** 73,78 **** /** Gestionnaire de types de documents et de vues.*/ DocManager m_DocManager; - /** Gestionnaire de systèmes de fichiers.*/ - FileSystemManager m_FileSystemManager; /** Gestionnaire de barres de travail.*/ --- 70,73 ---- *************** *** 200,215 **** * @return Adresse du système de fichier standard. */ ! 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);} /** @}*/ --- 195,199 ---- * @return Adresse du système de fichier standard. */ ! FileSystem* GetStandardFileSystem(){return m_pStandardFileSystem;} /** @}*/ Index: FileSystem.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/FileSystem.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** FileSystem.h 17 Aug 2005 16:33:17 -0000 1.11 --- FileSystem.h 15 Sep 2005 09:54:25 -0000 1.12 *************** *** 245,249 **** --- 245,256 ---- class WXDC_DLL_BASE FileSystemManager : public Element, public ObjectManager<FileSystem> { + protected: + /** The only one FS manager.*/ + static FileSystemManager s_FileSystemManager; public: + /** Unique file system manager accessor.*/ + static FileSystemManager& GetManager(){return s_FileSystemManager;} + + FileSystemManager(); virtual ~FileSystemManager(); |
|
From: Emilien K. <cur...@us...> - 2005-09-15 09:54:44
|
Update of /cvsroot/wxdevcenter/wxDevCenter/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16672/src Modified Files: Application.cpp Document.cpp Project.cpp FileSystem.cpp ArtProvider.cpp FileSystemTreeCtrl.cpp Plugin.cpp Log Message: Modularize FileSystemManager. Use FileSystemManager::GetManager to retreive the unique manager object. Index: ArtProvider.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/ArtProvider.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ArtProvider.cpp 14 Sep 2005 20:01:53 -0000 1.2 --- ArtProvider.cpp 15 Sep 2005 09:54:25 -0000 1.3 *************** *** 27,30 **** --- 27,31 ---- #include <wxDevCenter/Config.h> + #include <wx/dir.h> // Utilisation du namespace Index: FileSystem.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/FileSystem.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** FileSystem.cpp 17 Aug 2005 16:33:17 -0000 1.8 --- FileSystem.cpp 15 Sep 2005 09:54:25 -0000 1.9 *************** *** 153,156 **** --- 153,157 ---- ////////////////////////////////////////////////////////////////////// + FileSystemManager FileSystemManager::s_FileSystemManager; FileSystemManager::FileSystemManager(): Index: Plugin.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/Plugin.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Plugin.cpp 12 Aug 2005 15:49:23 -0000 1.9 --- Plugin.cpp 15 Sep 2005 09:54:25 -0000 1.10 *************** *** 29,33 **** using namespace plugins; ! /** --- 29,33 ---- using namespace plugins; ! #include <wx/dir.h> /** Index: FileSystemTreeCtrl.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/FileSystemTreeCtrl.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FileSystemTreeCtrl.cpp 17 Aug 2005 15:01:06 -0000 1.2 --- FileSystemTreeCtrl.cpp 15 Sep 2005 09:54:25 -0000 1.3 *************** *** 22,26 **** #include <wxDevCenter.h> #include <wxDevCenter/FileSystemTreeCtrl.h> - #include <wxDevCenter/FileSystem.h> using namespace wxDevCenter; --- 22,25 ---- Index: Application.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/Application.cpp,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** Application.cpp 14 Sep 2005 20:01:53 -0000 1.34 --- Application.cpp 15 Sep 2005 09:54:25 -0000 1.35 *************** *** 97,101 **** // Initialise le gestionnaire de systèmes de fichiers m_pStandardFileSystem = new FileSystemStandard; ! m_FileSystemManager.Register(m_pStandardFileSystem, true); // Initialise les menus par défaut. --- 97,101 ---- // Initialise le gestionnaire de systèmes de fichiers m_pStandardFileSystem = new FileSystemStandard; ! FileSystemManager::GetManager().Register(m_pStandardFileSystem, true); // Initialise les menus par défaut. *************** *** 178,182 **** FileSystemDialog FD(NULL, -1, WXDC_PROJECT_QUERY_OPEN, WXDC_SYSTEM_DEFAULT_PATH); ! FD.AttachFileSystems(&m_FileSystemManager); FD.SetWildcard(m_ProjectManager.GetAllWildcard()); if(FD.ShowModal()==wxID_OK) --- 178,182 ---- FileSystemDialog FD(NULL, -1, WXDC_PROJECT_QUERY_OPEN, WXDC_SYSTEM_DEFAULT_PATH); ! FD.AttachFileSystems(&FileSystemManager::GetManager()); FD.SetWildcard(m_ProjectManager.GetAllWildcard()); if(FD.ShowModal()==wxID_OK) *************** *** 342,346 **** { FileSystemDialog FD(NULL, -1, WXDC_DOCUMENT_REQUEST_OPEN, WXDC_SYSTEM_DEFAULT_PATH); ! FD.AttachFileSystems(&m_FileSystemManager); FD.SetWildcard(m_DocManager.GetAllWildcard()); if(FD.ShowModal()==wxID_OK) --- 342,346 ---- { FileSystemDialog FD(NULL, -1, WXDC_DOCUMENT_REQUEST_OPEN, WXDC_SYSTEM_DEFAULT_PATH); ! FD.AttachFileSystems(&FileSystemManager::GetManager()); FD.SetWildcard(m_DocManager.GetAllWildcard()); if(FD.ShowModal()==wxID_OK) *************** *** 372,376 **** { FileSystemDialog FD(NULL, -1, WXDC_DOCUMENT_REQUEST_SAVE, WXDC_SYSTEM_DEFAULT_PATH, path); ! FD.AttachFileSystems(&m_FileSystemManager); FD.SetWildcard(pDoc->GetDocTemplate()->GetDocWildcard(true)); if(FD.ShowModal()==wxID_OK) --- 372,376 ---- { FileSystemDialog FD(NULL, -1, WXDC_DOCUMENT_REQUEST_SAVE, WXDC_SYSTEM_DEFAULT_PATH, path); ! FD.AttachFileSystems(&FileSystemManager::GetManager()); FD.SetWildcard(pDoc->GetDocTemplate()->GetDocWildcard(true)); if(FD.ShowModal()==wxID_OK) Index: Project.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/Project.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Project.cpp 17 Aug 2005 16:33:17 -0000 1.8 --- Project.cpp 15 Sep 2005 09:54:25 -0000 1.9 *************** *** 26,29 **** --- 26,31 ---- #include <wxDevCenter/Project.h> + #include <wxDevCenter/FileSystem.h> + #include <wx/tokenzr.h> #include <wx/stream.h> *************** *** 203,207 **** { // Appelle de le chargement du projet. ! wxInputStream* pIn = Application::GetApp().GetInputStream(strFile); if(pIn!=NULL) { --- 205,209 ---- { // Appelle de le chargement du projet. ! wxInputStream* pIn = FileSystemManager::GetManager().GetInputStream(strFile); if(pIn!=NULL) { *************** *** 224,228 **** // Appelle de le chargement du projet. FilePath path = GetProject().GetPath(); ! wxOutputStream* pOut = Application::GetApp().GetOutputStream(path); if(pOut!=NULL) { --- 226,230 ---- // Appelle de le chargement du projet. FilePath path = GetProject().GetPath(); ! wxOutputStream* pOut = FileSystemManager::GetManager().GetOutputStream(path); if(pOut!=NULL) { Index: Document.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/Document.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Document.cpp 17 Aug 2005 16:33:17 -0000 1.14 --- Document.cpp 15 Sep 2005 09:54:25 -0000 1.15 *************** *** 189,193 **** SetDocumentPath(strDocumentPath); ! wxInputStream* pIn = Application::GetApp().GetInputStream(strDocumentPath); if(pIn==NULL) { --- 189,193 ---- SetDocumentPath(strDocumentPath); ! wxInputStream* pIn = FileSystemManager::GetManager().GetInputStream(strDocumentPath); if(pIn==NULL) { *************** *** 208,212 **** SetDocumentPath(strDocumentPath); ! wxOutputStream* pOut = Application::GetApp().GetOutputStream(strDocumentPath); if(pOut==NULL) { --- 208,212 ---- SetDocumentPath(strDocumentPath); ! wxOutputStream* pOut = FileSystemManager::GetManager().GetOutputStream(strDocumentPath); if(pOut==NULL) { |
|
From: Emilien K. <cur...@us...> - 2005-09-14 20:17:15
|
Update of /cvsroot/wxdevcenter/StdPlugin/src/Text In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23660/src/Text Modified Files: SimpleTextDocView.cpp Log Message: Add standard icon to commands. Index: SimpleTextDocView.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/src/Text/SimpleTextDocView.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SimpleTextDocView.cpp 14 Sep 2005 15:36:25 -0000 1.2 --- SimpleTextDocView.cpp 14 Sep 2005 20:17:07 -0000 1.3 *************** *** 26,29 **** --- 26,30 ---- #include <wxDevCenter/StdPlugin/Text/SimpleTextDocView.h> + #include <wxDevCenter/ArtProvider.h> #include <wx/stream.h> *************** *** 763,777 **** { s_pEditCommandGroup = new wxDevCenter::CommandGroup(WXDC_MENU_EDIT); ! s_pEditCommandGroup->AppendCommand(IDM_EDIT_UNDO, WXDC_MENU_EDIT_UNDO); ! s_pEditCommandGroup->AppendCommand(IDM_EDIT_REDO, WXDC_MENU_EDIT_REDO); s_pEditCommandGroup->AppendSeparator(); ! s_pEditCommandGroup->AppendCommand(IDM_EDIT_CUT, WXDC_MENU_EDIT_CUT); ! s_pEditCommandGroup->AppendCommand(IDM_EDIT_COPY, WXDC_MENU_EDIT_COPY); ! s_pEditCommandGroup->AppendCommand(IDM_EDIT_PASTE, WXDC_MENU_EDIT_PASTE); ! s_pEditCommandGroup->AppendCommand(IDM_EDIT_CLEAR, WXDC_MENU_EDIT_DEL); s_pEditCommandGroup->AppendSeparator(); ! s_pEditCommandGroup->AppendCommand(IDM_EDIT_FIND, WXDC_MENU_FIND_FIND); ! s_pEditCommandGroup->AppendCommand(IDM_EDIT_FINDNEXT, WXDC_MENU_FIND_FINDNEXT); ! s_pEditCommandGroup->AppendCommand(IDM_EDIT_REPLACE, WXDC_MENU_FIND_REPLACE); wxDevCenter::CommandManager::GetCommandManager().AddCommandManager(s_pEditCommandGroup, CLASSINFO(SimpleTextView), CmdGrpType_View); } --- 764,778 ---- { s_pEditCommandGroup = new wxDevCenter::CommandGroup(WXDC_MENU_EDIT); ! s_pEditCommandGroup->AppendCommand(IDM_EDIT_UNDO, WXDC_MENU_EDIT_UNDO, wxT(""), wxART_UNDO); ! s_pEditCommandGroup->AppendCommand(IDM_EDIT_REDO, WXDC_MENU_EDIT_REDO, wxT(""), wxART_REDO); s_pEditCommandGroup->AppendSeparator(); ! s_pEditCommandGroup->AppendCommand(IDM_EDIT_CUT, WXDC_MENU_EDIT_CUT, wxT(""), wxART_CUT); ! s_pEditCommandGroup->AppendCommand(IDM_EDIT_COPY, WXDC_MENU_EDIT_COPY, wxT(""), wxART_COPY); ! s_pEditCommandGroup->AppendCommand(IDM_EDIT_PASTE, WXDC_MENU_EDIT_PASTE, wxT(""), wxART_PASTE); ! s_pEditCommandGroup->AppendCommand(IDM_EDIT_CLEAR, WXDC_MENU_EDIT_DEL, wxT(""), wxART_DELETE); s_pEditCommandGroup->AppendSeparator(); ! s_pEditCommandGroup->AppendCommand(IDM_EDIT_FIND, WXDC_MENU_FIND_FIND, wxT(""), wxART_FIND); ! s_pEditCommandGroup->AppendCommand(IDM_EDIT_FINDNEXT, WXDC_MENU_FIND_FINDNEXT, wxT(""), wxART_GO_FORWARD); ! s_pEditCommandGroup->AppendCommand(IDM_EDIT_REPLACE, WXDC_MENU_FIND_REPLACE, wxT(""), wxART_FIND_AND_REPLACE); wxDevCenter::CommandManager::GetCommandManager().AddCommandManager(s_pEditCommandGroup, CLASSINFO(SimpleTextView), CmdGrpType_View); } |
|
From: Emilien K. <cur...@us...> - 2005-09-14 20:17:10
|
Update of /cvsroot/wxdevcenter/wxDevCenter/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23635/src Modified Files: FileSystemStandard.cpp Log Message: Add standard icon to commands. Index: FileSystemStandard.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/FileSystemStandard.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** FileSystemStandard.cpp 14 Sep 2005 20:01:53 -0000 1.18 --- FileSystemStandard.cpp 14 Sep 2005 20:17:00 -0000 1.19 *************** *** 78,90 **** pIL->Add(ArtProvider::GetIcon(wxART_MAKE_ART_ID(none), wxART_FRAME_ICON, wxSize(width, width))); ! pIL->Add(ArtProvider::GetIcon(wxART_MAKE_ART_ID(unknow), wxART_FRAME_ICON, wxSize(width, width))); ! pIL->Add(ArtProvider::GetIcon(wxART_MAKE_ART_ID(dir), wxART_FRAME_ICON, wxSize(width, width))); pIL->Add(ArtProvider::GetIcon(wxART_MAKE_ART_ID(desktop), wxART_FRAME_ICON, wxSize(width, width))); pIL->Add(ArtProvider::GetIcon(wxART_MAKE_ART_ID(desktop), wxART_FRAME_ICON, wxSize(width, width))); pIL->Add(ArtProvider::GetIcon(wxART_MAKE_ART_ID(docs), wxART_FRAME_ICON, wxSize(width, width))); pIL->Add(ArtProvider::GetIcon(wxART_MAKE_ART_ID(computer), wxART_FRAME_ICON, wxSize(width, width))); ! pIL->Add(ArtProvider::GetIcon(wxART_MAKE_ART_ID(floppy), wxART_FRAME_ICON, wxSize(width, width))); ! pIL->Add(ArtProvider::GetIcon(wxART_MAKE_ART_ID(harddrive), wxART_FRAME_ICON, wxSize(width, width))); ! pIL->Add(ArtProvider::GetIcon(wxART_MAKE_ART_ID(cd-dvd), wxART_FRAME_ICON, wxSize(width, width))); pIL->Add(ArtProvider::GetIcon(wxART_MAKE_ART_ID(ramdisk), wxART_FRAME_ICON, wxSize(width, width))); pIL->Add(ArtProvider::GetIcon(wxART_MAKE_ART_ID(remote), wxART_FRAME_ICON, wxSize(width, width))); --- 78,90 ---- pIL->Add(ArtProvider::GetIcon(wxART_MAKE_ART_ID(none), wxART_FRAME_ICON, wxSize(width, width))); ! pIL->Add(ArtProvider::GetIcon(wxART_MISSING_IMAGE, wxART_FRAME_ICON, wxSize(width, width))); ! pIL->Add(ArtProvider::GetIcon(wxART_FOLDER, wxART_FRAME_ICON, wxSize(width, width))); pIL->Add(ArtProvider::GetIcon(wxART_MAKE_ART_ID(desktop), wxART_FRAME_ICON, wxSize(width, width))); pIL->Add(ArtProvider::GetIcon(wxART_MAKE_ART_ID(desktop), wxART_FRAME_ICON, wxSize(width, width))); pIL->Add(ArtProvider::GetIcon(wxART_MAKE_ART_ID(docs), wxART_FRAME_ICON, wxSize(width, width))); pIL->Add(ArtProvider::GetIcon(wxART_MAKE_ART_ID(computer), wxART_FRAME_ICON, wxSize(width, width))); ! pIL->Add(ArtProvider::GetIcon(wxART_FLOPPY, wxART_FRAME_ICON, wxSize(width, width))); ! pIL->Add(ArtProvider::GetIcon(wxART_HARDDISK, wxART_FRAME_ICON, wxSize(width, width))); ! pIL->Add(ArtProvider::GetIcon(wxART_CDROM, wxART_FRAME_ICON, wxSize(width, width))); pIL->Add(ArtProvider::GetIcon(wxART_MAKE_ART_ID(ramdisk), wxART_FRAME_ICON, wxSize(width, width))); pIL->Add(ArtProvider::GetIcon(wxART_MAKE_ART_ID(remote), wxART_FRAME_ICON, wxSize(width, width))); |
