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-10-11 19:54:35
|
Update of /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29659/include/wxDevCenter/msw Modified Files: FileSystemStandard.h Log Message: Move bakefiles to /build/bakefiles. Modularize frames. Create PluginFileSystem and show it in AboutBox. Index: FileSystemStandard.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/msw/FileSystemStandard.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** FileSystemStandard.h 17 Aug 2005 16:33:19 -0000 1.3 --- FileSystemStandard.h 11 Oct 2005 19:54:25 -0000 1.4 *************** *** 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,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.*/ *************** *** 94,99 **** }; - typedef FileSystemStandardWindows FileSystemStandard; - --- 96,99 ---- |
|
From: Emilien K. <cur...@us...> - 2005-10-11 19:54:35
|
Update of /cvsroot/wxdevcenter/wxDevCenter/build In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29659/build Removed Files: install.bkl wx.bkl wxDevCenter.bkl Log Message: Move bakefiles to /build/bakefiles. Modularize frames. Create PluginFileSystem and show it in AboutBox. --- wx.bkl DELETED --- --- install.bkl DELETED --- --- wxDevCenter.bkl DELETED --- |
|
From: Emilien K. <cur...@us...> - 2005-10-11 19:54:33
|
Update of /cvsroot/wxdevcenter/wxDevCenter/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29659/src Modified Files: Frame.cpp MainFrame.cpp DocManager.cpp AboutBox.cpp Config.cpp Application.cpp FileSystemTreeCtrl.cpp Plugin.cpp MDIFrame.cpp FileSystemStandard.cpp Added Files: PluginFileSystem.cpp Log Message: Move bakefiles to /build/bakefiles. Modularize frames. Create PluginFileSystem and show it in AboutBox. --- NEW FILE: PluginFileSystem.cpp --- (This appears to be a binary file; contents omitted.) Index: AboutBox.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/AboutBox.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** AboutBox.cpp 14 Sep 2005 20:01:53 -0000 1.5 --- AboutBox.cpp 11 Oct 2005 19:54:24 -0000 1.6 *************** *** 24,28 **** #include <wxDevCenter.h> #include <wxDevCenter/AboutBox.h> ! #include <wxDevCenter/Plugin.h> #include <wxDevCenter/ArtProvider.h> --- 24,29 ---- #include <wxDevCenter.h> #include <wxDevCenter/AboutBox.h> ! #include <wxDevCenter/PluginFileSystem.h> ! #include <wxDevCenter/FileSystemTreeCtrl.h> #include <wxDevCenter/ArtProvider.h> *************** *** 112,127 **** ////////////////////////////////////////////////////////////////////// // Impl�mentation des fonctions de la classe des plugins AboutBoxPluginPage::AboutBoxPluginPage(wxWindow* parent, wxWindowID id): ! wxListbook(parent, id) { ! /* PluginManager& PM = Application::GetApp().GetPluginManager(); ! for(unsigned int n=0; n<PM.GetCount(); n++) ! { ! wxWindow* pWindow = PM[n].CreateAboutPanel(this, -1); ! if(pWindow==NULL) ! pWindow = new wxWindow(this, -1); ! AddPage(pWindow, PM[n].GetName()); ! }*/ } --- 113,138 ---- ////////////////////////////////////////////////////////////////////// // Impl�mentation des fonctions de la classe des plugins + BEGIN_EVENT_TABLE(wxDevCenter::AboutBoxPluginPage, wxPanel) + EVT_TREE_ITEM_ACTIVATED(wxID_ANY, AboutBoxPluginPage::OnActivateItem) + END_EVENT_TABLE() + AboutBoxPluginPage::AboutBoxPluginPage(wxWindow* parent, wxWindowID id): ! wxPanel(parent, id), ! m_PluginFileSystem() { ! m_pFileSystemTreeCtrl = new FileSystemTreeCtrl(this, -1); ! m_pFileSystemTreeCtrl->SetFileSystem(&m_PluginFileSystem); ! m_pFileSystemTreeCtrl->OpenRoot(); ! ! wxSizer* pSizer = new wxBoxSizer(wxHORIZONTAL); ! pSizer->Add(m_pFileSystemTreeCtrl, 1, wxEXPAND); ! SetSizerAndFit(pSizer); ! } ! void AboutBoxPluginPage::OnActivateItem(wxTreeEvent& event) ! { ! FileSystemTreeItemData* pData = (FileSystemTreeItemData*) m_pFileSystemTreeCtrl->GetItemData(event.GetItem()); ! ! wxLogWarning("Plop : %s, %s", event.GetLabel().GetData(), pData->GetFilePath().GetData()); } Index: MainFrame.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/MainFrame.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** MainFrame.cpp 14 Sep 2005 20:01:53 -0000 1.22 --- MainFrame.cpp 11 Oct 2005 19:54:24 -0000 1.23 *************** *** 23,27 **** ! #include <wxDevCenter.h> #include <wxDevCenter/MainFrame.h> --- 23,27 ---- ! #include <wxDevCenterPlugin.h> #include <wxDevCenter/MainFrame.h> *************** *** 35,38 **** --- 35,39 ---- #include <wxDevCenter/ArtProvider.h> + #include <wx/dataobj.h> #include <wx/dnd.h> *************** *** 50,55 **** #define WXDC_VIEWMENU_INSERT_AFTER 1 ! IMPLEMENT_CLASS(MainFrame, TopFrame) BEGIN_EVENT_TABLE(MainFrame, TopFrame) --- 51,57 ---- #define WXDC_VIEWMENU_INSERT_AFTER 1 + TopFrameTemplate MainFrameTemplate(CLASSINFO(MainFrame)); ! IMPLEMENT_DYNAMIC_CLASS(MainFrame, TopFrame) BEGIN_EVENT_TABLE(MainFrame, TopFrame) *************** *** 95,99 **** MainFrame::MainFrame(void): ! TopFrame(WXDC_NAME, wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_STYLE|wxCLIP_CHILDREN), m_pLayoutManager(NULL), m_WorkBarArray(), --- 97,101 ---- MainFrame::MainFrame(void): ! TopFrame(), m_pLayoutManager(NULL), m_WorkBarArray(), *************** *** 102,105 **** --- 104,113 ---- 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 **** --- 131,136 ---- SetDropTarget(new MainFrameDropTarget); + + return true; } *************** *** 138,145 **** void MainFrame::OnClose(wxCloseEvent &event) { ! if(!Application::GetApp().GetDocManager().CloseAllDocuments()) event.Veto(); - else - Destroy(); } --- 148,153 ---- void MainFrame::OnClose(wxCloseEvent &event) { ! if(!Destroy(false)) event.Veto(); } *************** *** 304,310 **** // Ajoute une vue ! void MainFrame::AddView(View *pView) { GetViewFrame()->AddView(pView); } --- 312,319 ---- // Ajoute une vue ! bool MainFrame::AddView(View *pView) { GetViewFrame()->AddView(pView); + return true; } *************** *** 419,420 **** --- 428,430 ---- wxFrame::UpdateWindowUI(flags); } + Index: Config.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/Config.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Config.cpp 15 Sep 2005 16:11:47 -0000 1.11 --- Config.cpp 11 Oct 2005 19:54:24 -0000 1.12 *************** *** 27,30 **** --- 27,31 ---- #include <wx/fileconf.h> #include <wx/filefn.h> + #include <wx/tokenzr.h> using namespace wxDevCenter; *************** *** 168,172 **** void Config::AddDataPath(wxString strPath) { ! m_strDataPath.Insert(strPath, 0); } --- 169,178 ---- void Config::AddDataPath(wxString strPath) { ! wxStringTokenizer tkz(strPath, wxT("&;")); ! while ( tkz.HasMoreTokens() ) ! { ! wxString token = tkz.GetNextToken(); ! m_strDataPath.Insert(token, 0); ! } } *************** *** 174,178 **** void Config::AddFeaturesPath(wxString strPath) { ! m_strFeaturesPath.Insert(strPath, 0); } --- 180,189 ---- void Config::AddFeaturesPath(wxString strPath) { ! wxStringTokenizer tkz(strPath, wxT("&;")); ! while ( tkz.HasMoreTokens() ) ! { ! wxString token = tkz.GetNextToken(); ! m_strFeaturesPath.Insert(token, 0); ! } } *************** *** 180,184 **** void Config::AddPluginsPath(wxString strPath) { ! m_strPluginsPath.Insert(strPath, 0); } --- 191,200 ---- void Config::AddPluginsPath(wxString strPath) { ! wxStringTokenizer tkz(strPath, wxT("&;")); ! while ( tkz.HasMoreTokens() ) ! { ! wxString token = tkz.GetNextToken(); ! m_strPluginsPath.Insert(token, 0); ! } } *************** *** 186,190 **** void Config::AddGlobalConfPath(wxString strPath) { ! m_strConfPath.Insert(strPath, 0); } --- 202,211 ---- void Config::AddGlobalConfPath(wxString strPath) { ! wxStringTokenizer tkz(strPath, wxT("&;")); ! while ( tkz.HasMoreTokens() ) ! { ! wxString token = tkz.GetNextToken(); ! m_strConfPath.Insert(token, 0); ! } } *************** *** 192,196 **** void Config::AddUserConfPath(wxString strPath) { ! m_strUserConfPath.Insert(strPath, 0); } --- 213,222 ---- void Config::AddUserConfPath(wxString strPath) { ! wxStringTokenizer tkz(strPath, wxT("&;")); ! while ( tkz.HasMoreTokens() ) ! { ! wxString token = tkz.GetNextToken(); ! m_strUserConfPath.Insert(token, 0); ! } } Index: Plugin.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/Plugin.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Plugin.cpp 15 Sep 2005 16:11:47 -0000 1.11 --- Plugin.cpp 11 Oct 2005 19:54:24 -0000 1.12 *************** *** 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; *************** *** 62,67 **** ) ! // Charge le module. ! bool ModuleRefData::Load(wxString strLongName) { wxString strFileName; --- 62,67 ---- ) ! // Charge le dynlib. ! 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,120 **** } m_flagState = Error; ! wxLogDebug(wxT("Module %s not found"), strLongName.GetData()); return false; } ! // Décharge le module. ! bool ModuleRefData::Unload() { return false; } ! // 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++) --- 102,120 ---- } m_flagState = Error; ! wxLogDebug(wxT("Dynlib %s not found"), strLongName.GetData()); return false; } ! // Décharge le dynlib. ! bool DynLibRefData::Unload() { return false; } ! // Initialise le contenu du dynlib. ! bool DynLibRefData::Initialize() { ! wxLogDebug("DynlibRefData::Initialize : %d", m_Elements.GetCount()); bool bOK = true; for(long l=0; l<(long)m_Elements.GetCount(); l++) *************** *** 131,136 **** } ! // Finalise le contenu du module. ! bool ModuleRefData::Finalize() { /** @todo Finalize all dependant elements.*/ --- 131,136 ---- } ! // Finalise le contenu du dynlib. ! 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,181 **** // 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; } ! // Teste si le module est initialisé. ! bool Module::IsInitialized()const { ! if(GetModuleRef()!=NULL) ! return GetModuleRef()->IsInitialized(); else return false; --- 154,191 ---- // Débugage : Dump du contenu. wxDEBUG_CODE( ! wxString DynLib::Dump() { ! DynLibRefData* pModRef = GetDynLibRef(); if(pModRef!=NULL) return pModRef->Dump(); else ! return wxT("Null dynlib"); } ) ! // Retourne le nom de la dynlib. ! wxString DynLib::GetName() { ! if(GetDynLibRef()!=NULL) ! return GetDynLibRef()->m_strPath.AfterLast(wxT('/')); ! else ! return wxT(""); ! } ! ! ! // Teste si le dynlib est chargé. ! bool DynLib::IsLoaded()const ! { ! if(GetDynLibRef()!=NULL) ! return GetDynLibRef()->IsLoaded(); else return false; } ! // Teste si le dynlib est initialisé. ! bool DynLib::IsInitialized()const { ! if(GetDynLibRef()!=NULL) ! return GetDynLibRef()->IsInitialized(); else return false; *************** *** 183,210 **** ! // 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; } ! // Initialise le contenu du module. ! bool Module::Initialize() { ! if(GetModuleRef()!=NULL) ! return GetModuleRef()->Initialize(); else return false; } ! // Finalise le contenu du module. ! bool Module::Finalize() { return false; --- 193,220 ---- ! // Charge le dynlib et enregistre son contenu. ! bool DynLib::Load(wxString strPath) { AllocExclusive(); ! return GetDynLibRef()->Load(strPath); } ! // Décharge le dynlib. ! bool DynLib::Unload() { return false; } ! // Initialise le contenu du dynlib. ! bool DynLib::Initialize() { ! if(GetDynLibRef()!=NULL) ! return GetDynLibRef()->Initialize(); else return false; } ! // Finalise le contenu du dynlib. ! 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; --- 249,255 ---- 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"); } return str; *************** *** 282,286 **** m_strNotes = File.GetNotes(); m_strURL = File.GetURL(); ! File.FillModuleArray(m_arrstrModules); File.FillDependantPluginArray(m_arrstrPlugins); m_Status |= PreLoaded; --- 292,296 ---- m_strNotes = File.GetNotes(); m_strURL = File.GetURL(); ! File.FillDynLibArray(m_arrstrDynLibs); File.FillDependantPluginArray(m_arrstrPlugins); m_Status |= PreLoaded; *************** *** 305,311 **** bOk &= m_pLoader->LoadPlugin(m_arrstrPlugins[l])!=NULL; ! // 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); --- 315,321 ---- 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; m_Status |= Loaded | (bOk?0:Partial); *************** *** 478,487 **** IMPLEMENT_CLASS(PluginLoader, wxObject) PluginLoader::PluginLoader(): wxObject(), m_FeatureMap(), m_PluginMap(), ! m_ModuleMap() { } --- 488,577 ---- IMPLEMENT_CLASS(PluginLoader, wxObject) + PluginLoader PluginLoader::s_PluginManager; + PluginLoader::PluginLoader(): wxObject(), m_FeatureMap(), m_PluginMap(), ! m_DynLibMap() ! { ! } ! ! // Accesseur sur une feature. ! Feature* PluginLoader::GetFeature(long l) ! { ! FeatureMap::iterator it = m_FeatureMap.begin(); ! l++; ! while(it!=m_FeatureMap.end() && l>0) ! { ! it++; ! l--; ! } ! if(it!=m_FeatureMap.end()) ! return &(it->second); ! else ! return NULL; ! } ! ! // Accesseur sur un plugin. ! Plugin* PluginLoader::GetPlugin(long l) ! { ! PluginMap::iterator it = m_PluginMap.begin(); ! l++; ! while(it!=m_PluginMap.end() && l>0) ! { ! it++; ! l--; ! } ! if(it!=m_PluginMap.end()) ! return &(it->second); ! else ! return NULL; ! } ! ! // Accesseur sur une dynlib. ! DynLib* PluginLoader::GetDynLib(long l) ! { ! DynLibMap::iterator it = m_DynLibMap.begin(); ! l++; ! while(it!=m_DynLibMap.end() && l>0) ! { ! it++; ! l--; ! } ! if(it!=m_DynLibMap.end()) ! return &(it->second); ! else ! return NULL; ! } ! ! // Accesseur sur une feature. ! Feature* PluginLoader::GetFeature(wxString strFeature) { + FeatureMap::iterator it = m_FeatureMap.find(strFeature); + if(it==m_FeatureMap.end()) + return NULL; + else + return &(it->second); + } + + // Accesseur sur un plugin. + Plugin* PluginLoader::GetPlugin(wxString strPlugin) + { + PluginMap::iterator it = m_PluginMap.find(strPlugin); + if(it==m_PluginMap.end()) + return NULL; + else + return &(it->second); + } + + // Accesseur sur une dynlib. + DynLib* PluginLoader::GetDynLib(wxString strDynLib) + { + DynLibMap::iterator it = m_DynLibMap.find(strDynLib); + if(it==m_DynLibMap.end()) + return NULL; + else + return &(it->second); } *************** *** 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"); --- 679,685 ---- } ! 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"); *************** *** 602,615 **** ! // 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; ! else if(module.Load(strPath)) ! return &module; else return NULL; --- 692,705 ---- ! // 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::InitializeModule(wxString strName) { ! wxLogDebug(wxT("Initializing module %s"), strName.GetData()); ! Module& module = m_ModuleMap[strName]; ! if(module.IsInitialized()) return true; else ! return module.Initialize(); } --- 758,771 ---- } ! // 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,705 **** InitializePlugin(it2->first); ! wxLogDebug("Initialize module :"); ! ModuleMap::iterator it3; ! for( it3 = m_ModuleMap.begin(); it3 != m_ModuleMap.end(); ++it3 ) ! InitializeModule(it3->first); } --- 788,795 ---- InitializePlugin(it2->first); ! wxLogDebug("Initialize dynlib :"); ! DynLibMap::iterator it3; ! for( it3 = m_DynLibMap.begin(); it3 != m_DynLibMap.end(); ++it3 ) ! InitializeDynLib(it3->first); } *************** *** 863,868 **** 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_arrstrModules.Add(pDep->GetPropVal(wxT("name"), wxT(""))); pDep = pDep->GetNext(); --- 953,958 ---- 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(""))); 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()) --- 964,970 ---- // 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()) *************** *** 892,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]); } --- 982,991 ---- } ! // Remplit une liste des chemins relatifs des dynlibs à charger. ! void PluginDescriptionFile::FillDynLibArray(wxArrayString& array) { unsigned long l; ! for(l=0; l<m_arrstrDynLibs.GetCount(); l++) ! array.Add(m_arrstrDynLibs[l]); } Index: FileSystemTreeCtrl.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/FileSystemTreeCtrl.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** FileSystemTreeCtrl.cpp 15 Sep 2005 09:54:25 -0000 1.3 --- FileSystemTreeCtrl.cpp 11 Oct 2005 19:54:24 -0000 1.4 *************** *** 91,94 **** --- 91,111 ---- } + // Ouvre l'arbre à la base du système de fichiers. + void FileSystemTreeCtrl::OpenRoot(unsigned int nMode) + { + wxTreeItemId Id; + wxString str; + + DeleteAllItems(); + m_strRootPath = m_pFileSystem->GetRootPath(); + m_nMode = nMode; + Id = AddRoot(m_pFileSystem->GetRoot(), m_pFileSystem->GetFileType(m_pFileSystem->GetRootPath()), -1, new FileSystemTreeItemData(m_pFileSystem->GetRootDescription())); + AppendItem(Id, WXDC_FSTC_EXPAND_MARKER); + + Expand(GetRootItem()); + SelectItem(GetRootItem()); + } + + // Interception de l'évènement de déroulement d'une branche. void FileSystemTreeCtrl::OnTreeItemExpanding(wxTreeEvent &event) *************** *** 106,120 **** wxString str; DeleteChildren(idItem); // Insertion des répertoires if(m_nMode&WXDC_FSTC_MODE_DIR) { ! str = ((FileSystemTreeItemData*)GetItemData(idItem))->GetFilePath(); ! FP = m_pFileSystem->FindFirst( str, wxDIR_DIRS); ! while(FP!="") { pItemData = new FileSystemTreeItemData(m_pFileSystem->GetCurrentFileDescription()); NewId = AppendItem(idItem, FP, pItemData->GetType(), -1, pItemData); AppendItem(NewId, WXDC_FSTC_EXPAND_MARKER); FP = m_pFileSystem->FindNext(); --- 123,147 ---- wxString str; + FileSystemTreeItemData *pParentItemData = (FileSystemTreeItemData*)GetItemData(idItem); + wxString strPath = pParentItemData->GetFilePath(); + + wxLogDebug("RefreshContent : %s (%s)", GetItemText(idItem).GetData(), strPath.GetData()); + DeleteChildren(idItem); + // Insertion des répertoires if(m_nMode&WXDC_FSTC_MODE_DIR) { ! FP = m_pFileSystem->FindFirst(strPath, wxDIR_DIRS); ! while(!FP.IsEmpty()) { pItemData = new FileSystemTreeItemData(m_pFileSystem->GetCurrentFileDescription()); NewId = AppendItem(idItem, FP, pItemData->GetType(), -1, pItemData); + wxLogDebug("Append dir : %s (%s)", FP.GetData(), pItemData->GetFilePath().GetData()); + + pItemData = (FileSystemTreeItemData*) GetItemData(NewId); + wxLogDebug("Test : %s ", pItemData->GetFilePath().GetData()); + AppendItem(NewId, WXDC_FSTC_EXPAND_MARKER); FP = m_pFileSystem->FindNext(); *************** *** 125,134 **** if(m_nMode&WXDC_FSTC_MODE_FILE) { ! str = ((FileSystemTreeItemData*)GetItemData(idItem))->GetFilePath(); ! FP = m_pFileSystem->FindFirst( str, wxDIR_FILES); ! while(FP!="") { pItemData = new FileSystemTreeItemData(m_pFileSystem->GetCurrentFileDescription()); NewId = AppendItem(idItem, FP, pItemData->GetType(), -1, pItemData); FP = m_pFileSystem->FindNext(); } --- 152,161 ---- if(m_nMode&WXDC_FSTC_MODE_FILE) { ! FP = m_pFileSystem->FindFirst(strPath, wxDIR_FILES); ! while(!FP.IsEmpty()) { pItemData = new FileSystemTreeItemData(m_pFileSystem->GetCurrentFileDescription()); NewId = AppendItem(idItem, FP, pItemData->GetType(), -1, pItemData); + wxLogDebug("Append file : %s (%s)", FP.GetData(), pItemData->GetFilePath().GetData()); FP = m_pFileSystem->FindNext(); } Index: Frame.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/Frame.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Frame.cpp 15 Sep 2005 10:15:05 -0000 1.12 --- Frame.cpp 11 Oct 2005 19:54:24 -0000 1.13 *************** *** 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,83 ---- ////////////////////////////////////////////////////////////////////// ! IMPLEMENT_ABSTRACT_CLASS(TopFrame, wxFrame) ! BEGIN_EVENT_TABLE(TopFrame, wxFrame) END_EVENT_TABLE() ! TopFrame::TopFrame(): ! Element(), ! 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); } *************** *** 80,83 **** --- 86,122 ---- } + bool TopFrame::Initialize() + { + Element::Initialize(); + return true; + } + + void TopFrame::Finalize() + { + Element::Finalize(); + } + + bool TopFrame::Destroy(bool bForce) + { + // Do not call Element::Finalize because use of wxFrame::Destroy() + + bool bClose = Application::GetApp().GetDocManager().CloseAllDocuments(); + + if(bForce || bClose) + { + WorkBarManager::GetManager().UnregisterFrame(this); + Element::Destroy(bForce); + return wxFrame::Destroy(); + } + else + return false; + } + + bool TopFrame::CanDestroy() + { + Element::CanDestroy(); + return Application::GetApp().GetDocManager().CloseAllDocuments(); + } + // Surcharge le procédé d'exécution des évènements. *************** *** 101,111 **** - // Surcharge du processus de destruction. - bool TopFrame::Destroy() - { - WorkBarManager::GetManager().UnregisterFrame(this); - return wxFrame::Destroy(); - } - // Retourne le layout attaché à la fenetre. wxDevCenter::Layout TopFrame::GetLayout() --- 140,143 ---- *************** *** 116,119 **** --- 148,162 ---- ////////////////////////////////////////////////////////////////////// + // TopFrameManager + ////////////////////////////////////////////////////////////////////// + + TopFrameManager TopFrameManager::s_TopFrameManager; + + TopFrameTemplate::TopFrameTemplate(wxClassInfo* pClassInfo):ObjectTemplate<TopFrame>(pClassInfo, wxT("Test"), wxT("")) + { + TopFrameManager::GetManager().RegisterTemplate(this); + } + + ////////////////////////////////////////////////////////////////////// // ViewFrame ////////////////////////////////////////////////////////////////////// Index: DocManager.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/DocManager.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** DocManager.cpp 14 Sep 2005 20:01:53 -0000 1.13 --- DocManager.cpp 11 Oct 2005 19:54:24 -0000 1.14 *************** *** 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> *************** *** 299,303 **** pView->OnCreate(); ! Application::GetApp().GetMainFrame().AddView(pView); pView->OnInitialUpdate(); --- 298,302 ---- pView->OnCreate(); ! Application::GetApp().GetTopFrame().AddView(pView); pView->OnInitialUpdate(); Index: MDIFrame.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/MDIFrame.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** MDIFrame.cpp 14 Sep 2005 14:19:11 -0000 1.8 --- MDIFrame.cpp 11 Oct 2005 19:54:24 -0000 1.9 *************** *** 23,27 **** ! #include <wxDevCenter.h> #include <wxDevCenter/MDIFrame.h> --- 23,27 ---- ! #include <wxDevCenterPlugin.h> #include <wxDevCenter/MDIFrame.h> Index: Application.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/Application.cpp,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** Application.cpp 15 Sep 2005 16:11:47 -0000 1.37 --- Application.cpp 11 Oct 2005 19:54:24 -0000 1.38 *************** *** 26,42 **** #include <wxDevCenter/AboutBox.h> #include <wxDevCenter/Config.h> #include <wxDevCenter/FileSystem.h> #include <wxDevCenter/FileSystemStandard.h> #include <wxDevCenter/FileSystemCtrl.h> - #include <wxDevCenter/Frame.h> - #include <wxDevCenter/MainFrame.h> - #include <wxDevCenter/DocView.h> #include <wxDevCenter/FileTools.h> #include <wxDevCenter/Project.h> - #include <wxDevCenter/ArtProvider.h> - #include <wxDevCenter/Command.h> #include <wxDevCenter/WorkBar.h> #include <wx/dynlib.h> #include <wx/sysopt.h> --- 26,44 ---- #include <wxDevCenter/AboutBox.h> + #include <wxDevCenter/ArtProvider.h> + #include <wxDevCenter/Command.h> #include <wxDevCenter/Config.h> + #include <wxDevCenter/DocView.h> #include <wxDevCenter/FileSystem.h> #include <wxDevCenter/FileSystemStandard.h> #include <wxDevCenter/FileSystemCtrl.h> #include <wxDevCenter/FileTools.h> + #include <wxDevCenter/Frame.h> + #include <wxDevCenter/Plugin.h> #include <wxDevCenter/Project.h> #include <wxDevCenter/WorkBar.h> + + #include <wx/dir.h> #include <wx/dynlib.h> #include <wx/sysopt.h> *************** *** 81,93 **** wxArtProvider::PushProvider(new ArtProvider); // Initialise les gestionnaires m_DocManager.Initialize(); m_ProjectManager.Initialize(); WorkBarManager::GetManager().Initialize(); // Charge les plugins : phase de tests ! m_PluginLoader.Load(); ! wxLogDebug(m_PluginLoader.Dump()); ! m_PluginLoader.Initialize(); // Crée la config utilisateur. --- 83,98 ---- wxArtProvider::PushProvider(new ArtProvider); + // Initialise les gestionnaires m_DocManager.Initialize(); m_ProjectManager.Initialize(); WorkBarManager::GetManager().Initialize(); + TopFrameManager::GetManager().Initialize(); // Charge les plugins : phase de tests ! plugins::PluginLoader::GetManager().Load(); ! wxLogDebug(plugins::PluginLoader::GetManager().Dump()); ! plugins::PluginLoader::GetManager().Initialize(); ! // Crée la config utilisateur. *************** *** 98,103 **** // Initialise le gestionnaire de systèmes de fichiers ! m_pStandardFileSystem = new FileSystemStandard; ! FileSystemManager::GetManager().Register(m_pStandardFileSystem, true); // Initialise les menus par défaut. --- 103,108 ---- // Initialise le gestionnaire de systèmes de fichiers ! // m_pStandardFileSystem = FileSystemStandard::CreateFileSystemStandard(); ! // FileSystemManager::GetManager().Register(m_pStandardFileSystem, true); // Initialise les menus par défaut. *************** *** 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. --- 110,134 ---- // Crée la fenetre principale ! m_pTopFrame = (TopFrame*) TopFrameManager::GetManager().CreateTopFrame(); ! if(m_pTopFrame==NULL) ! { ! wxLogError(wxT("No top frame implementation")); ! return false; ! } ! 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(); --- 348,352 ---- } ! m_pTopFrame->AddView(pView); pView->OnInitialUpdate(); Index: FileSystemStandard.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/FileSystemStandard.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** FileSystemStandard.cpp 14 Sep 2005 20:17:00 -0000 1.19 --- FileSystemStandard.cpp 11 Oct 2005 19:54:24 -0000 1.20 *************** *** 36,41 **** ////////////////////////////////////////////////////////////////////// // Standard file system ! bool FileSystemStandardBase::CreateDirectory(FilePath strDir) { strDir.RemoveProtocol(); --- 36,56 ---- ////////////////////////////////////////////////////////////////////// // Standard file system + IMPLEMENT_ABSTRACT_CLASS(FileSystemStandard, FileSystem) ! bool FileSystemStandard::Initialize() ! { ! if(FileSystem::Initialize()) ! return FileSystemManager::GetManager().Register(this, true); ! else ! return false; ! } ! ! void FileSystemStandard::Finalize() ! { ! FileSystemManager::GetManager().Unregister(this); ! FileSystem::Finalize(); ! } ! ! bool FileSystemStandard::CreateDirectory(FilePath strDir) { strDir.RemoveProtocol(); *************** *** 43,47 **** } ! bool FileSystemStandardBase::RemoveDirectory(FilePath strDir) { strDir.RemoveProtocol(); --- 58,62 ---- } ! bool FileSystemStandard::RemoveDirectory(FilePath strDir) { strDir.RemoveProtocol(); *************** *** 49,53 **** } ! bool FileSystemStandardBase::RemoveFile(FilePath strFilePath) { strFilePath.RemoveProtocol(); --- 64,68 ---- } ! bool FileSystemStandard::RemoveFile(FilePath strFilePath) { strFilePath.RemoveProtocol(); *************** *** 55,59 **** } ! int FileSystemStandardBase::GetFileType(const FilePath& strPath) { long type; --- 70,74 ---- } ! 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()); --- 88,92 ---- } ! 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)); --- 111,120 ---- } ! wxInputStream* FileSystemStandard::GetInputStream(FilePath strPath) { return new wxFileInputStream(GetPhysicalFilePath(strPath)); } ! wxOutputStream* FileSystemStandard::GetOutputStream(FilePath strPath) { return new wxFileOutputStream(GetPhysicalFilePath(strPath)); |
|
From: Emilien K. <cur...@us...> - 2005-10-11 19:54:33
|
Update of /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29659/include/wxDevCenter Modified Files: language.h Element.h FileSystem.h Frame.h Application.h Plugin.h Manager.h AboutBox.h FileSystemTreeCtrl.h Config.h MainFrame.h MDIFrame.h FileSystemStandard.h Added Files: PluginFileSystem.h Module.h Log Message: Move bakefiles to /build/bakefiles. Modularize frames. Create PluginFileSystem and show it in AboutBox. Index: Config.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/Config.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Config.h 15 Sep 2005 16:11:47 -0000 1.11 --- Config.h 11 Oct 2005 19:54:24 -0000 1.12 *************** *** 160,166 **** */ virtual wxString GetInstallPath(); ! /** Retourne le chemin racine des données (images, icones, etc). * @param lStackIndex Indice dans la liste des chemins. ! * @return Chemin racine de stockage des données. */ virtual wxString GetDataPath(long lStackIndex=0); --- 160,166 ---- */ 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 GetDataPath(long lStackIndex=0); *************** *** 265,270 **** #define WXDC_CONF_KEYNAME_USERCONFDIR wxT("UserConfDir") - - } --- 265,268 ---- *************** *** 276,280 **** #endif - - #endif --- 274,276 ---- --- NEW FILE: Module.h --- (This appears to be a binary file; contents omitted.) Index: MainFrame.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/MainFrame.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** MainFrame.h 2 Aug 2005 17:13:01 -0000 1.12 --- MainFrame.h 11 Oct 2005 19:54:24 -0000 1.13 *************** *** 28,37 **** #define __WXDEVCENTER_MAINFRAME ! #include <wx/dnd.h> ! #include "Frame.h" ! #include <wxDevCenter/FileSystemCtrl.h> ! class wxTreeEvent; ! class wxSashWindow; class wxLayoutManager; --- 28,34 ---- #define __WXDEVCENTER_MAINFRAME ! #include <wxDevCenter/Frame.h> ! #include <wx/dnd.h> class wxLayoutManager; *************** *** 39,60 **** namespace wxDevCenter { - class MDIFrame; class StatusEvent; ! /** Fenêtre cadre principal. * 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 { ! 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; --- 36,52 ---- namespace wxDevCenter { class StatusEvent; ! class MDIFrame; /** Fenêtre cadre principal. * Fenêtre cadre contenant toutes les autres fenêtres et notament le conteneur de vues et les contrôles d'arborescence. */ ! class WXDC_DLL_PLUGIN 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.*/ wxLayoutManager* m_pLayoutManager; *************** *** 156,159 **** --- 148,157 ---- // 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.*/ --- 160,164 ---- * @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.15 diff -C2 -d -r1.14 -r1.15 *** FileSystemStandard.h 17 Aug 2005 16:33:17 -0000 1.14 --- FileSystemStandard.h 11 Oct 2005 19:54:24 -0000 1.15 *************** *** 31,34 **** --- 31,35 ---- #include <wxDevCenter/FileSystem.h> + #include <wxDevCenter/Plugin.h> *************** *** 57,63 **** * 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;} virtual wxString GetIconName()const{return wxT("desktop");} --- 58,70 ---- * Implémentation partielle commune aux systèmes de fichiers réels (physiques) comme ceux de Windows ou Unix. */ ! class FileSystemStandard : public FileSystem { + DECLARE_ABSTRACT_CLASS(FileSystemStandard) public: + FileSystemStandard():FileSystem(){} + + virtual bool Initialize(); + virtual void Finalize(); + virtual wxString GetFileSystemName()const{return WXDC_SYSTEM_STDFS_NAME;} virtual wxString GetIconName()const{return wxT("desktop");} *************** *** 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 --- 98,100 ---- Index: Application.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/Application.h,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** Application.h 15 Sep 2005 16:11:47 -0000 1.20 --- Application.h 11 Oct 2005 19:54:24 -0000 1.21 *************** *** 26,30 **** #define __WXDEVCENTER_APPLICATION - #include <wxDevCenter/Plugin.h> #include <wxDevCenter/Project.h> #include <wxDevCenter/DocView.h> --- 26,29 ---- *************** *** 38,42 **** class FilePath; class Document; ! class MainFrame; class FileSystem; class DocManager; --- 37,41 ---- class FilePath; class Document; ! class TopFrame; class FileSystem; class DocManager; *************** *** 57,63 **** static Application* ms_pTheApp; protected : - /** Chargeur de plugins.*/ - plugins::PluginLoader m_PluginLoader; - /** Gestionnaire de projets.*/ ProjectManager m_ProjectManager; --- 56,59 ---- *************** *** 69,73 **** /** Fenêtre cadre principale.*/ ! MainFrame *m_pMainFrame; /** Données de configuration de la mise en pages.*/ --- 65,69 ---- /** 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. --- 94,98 ---- void AboutBox(int nPage=0); /** Fenêtre principale.*/ ! TopFrame& GetTopFrame(){return *m_pTopFrame;} /** Acces sur l'application. *************** *** 175,185 **** /** @}*/ - /** @name Plugins - * Gestion des plugins. - * @{*/ - /** Retourne le chargeur de plugins.*/ - plugins::PluginLoader& GetPluginLoader(){return m_PluginLoader;} - /** @}*/ - /** @name Print * @{*/ --- 171,174 ---- Index: Frame.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/Frame.h,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Frame.h 14 Sep 2005 15:37:06 -0000 1.13 --- Frame.h 11 Oct 2005 19:54:24 -0000 1.14 *************** *** 33,36 **** --- 33,38 ---- #include <wxDevCenter/Layout.h> + #include <wxDevCenter/Plugin.h> + namespace wxDevCenter *************** *** 134,142 **** * ainsi que la barre de status et les barres d'outils génériques. */ ! class WXDC_DLL_BASE TopFrame : public wxFrame { - DECLARE_CLASS(TopFrame); DECLARE_EVENT_TABLE() ! friend class MenuBar; protected: /** Fenetre cadre fille contenant les vues.*/ --- 136,143 ---- * ainsi que la barre de status et les barres d'outils génériques. */ ! class WXDC_DLL_BASE TopFrame : virtual public Element, public wxFrame { DECLARE_EVENT_TABLE() ! DECLARE_ABSTRACT_CLASS(TopFrame) protected: /** Fenetre cadre fille contenant les vues.*/ *************** *** 145,161 **** /** Surcharge le procédé d'exécution des évènements.*/ virtual bool ProcessEvent(wxEvent& event); - 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. --- 146,181 ---- /** Surcharge le procédé d'exécution des évènements.*/ virtual bool ProcessEvent(wxEvent& event); 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 Fonctions d'interface d'élément. ! * @{ */ ! virtual bool Initialize(); ! virtual void Finalize(); ! virtual bool Destroy(bool bForce=true); ! virtual bool CanDestroy(); ! /** @ */ ! ! ! /** @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. --- 187,190 ---- *************** *** 173,177 **** --- 192,198 ---- * @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. *************** *** 179,185 **** virtual wxDevCenter::Layout GetLayout(); ! /** Surcharge du processus de destruction. ! * Utilisé pour vider le cadre de ses WorkBar et la désenregistrer du WorkBarManager.*/ ! virtual bool Destroy(); }; --- 200,222 ---- virtual wxDevCenter::Layout GetLayout(); ! }; ! ! /** Top frame template.*/ ! class WXDC_DLL_BASE TopFrameTemplate : public ObjectTemplate<TopFrame> ! { ! public: ! TopFrameTemplate(wxClassInfo* pClassInfo); ! ! }; ! ! /** Top frame manager.*/ ! class WXDC_DLL_BASE TopFrameManager : public MultiObjectTemplateManager<TopFrame, TopFrameTemplate> ! { ! protected: ! static TopFrameManager s_TopFrameManager; ! public: ! static TopFrameManager& GetManager(){return s_TopFrameManager;} ! ! TopFrame* CreateTopFrame(){return CreateObject(0);} }; Index: Plugin.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/Plugin.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Plugin.h 12 Aug 2005 09:25:19 -0000 1.5 --- Plugin.h 11 Oct 2005 19:54:24 -0000 1.6 *************** *** 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. */ *************** *** 213,216 **** --- 213,219 ---- bool IsInitialized()const; + /** Retourne le nom de la dynlib.*/ + wxString GetName(); + /** Charge le module et enregistre son contenu. * @param strLongName Nom long du module. *************** *** 271,275 **** wxString m_strURL; /** Liste des modules du plugin.*/ ! wxArrayString m_arrstrModules; /** Liste des plugins dépendants.*/ wxArrayString m_arrstrPlugins; --- 274,278 ---- wxString m_strURL; /** Liste des modules du plugin.*/ ! wxArrayString m_arrstrDynLibs; /** Liste des plugins dépendants.*/ wxArrayString m_arrstrPlugins; *************** *** 317,320 **** --- 320,326 ---- /** Finalise le plugin.*/ bool Finalize(); + + /** Retourne le nom d'une dynlib attachée.*/ + wxString GetDynlib(unsigned long l){if(l<m_arrstrDynLibs.GetCount())return m_arrstrDynLibs[l];else return wxT("");} }; *************** *** 410,413 **** --- 416,421 ---- wxString GetDescriptorFilePath()const{return m_strDescriptFilePath;} + /** Retourne le nom d'un plugin attaché.*/ + wxString GetPlugin(unsigned long l){if(l<m_arrstrPlugins.GetCount())return m_arrstrPlugins[l];else return wxT("");} /** Retourne une image représentant le logo du plugin. *************** *** 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); --- 431,435 ---- 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,443 **** 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: /** Constructeur.*/ PluginLoader(); /** Charge tous les plugins.*/ bool Load(); --- 442,467 ---- 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.*/ + static PluginLoader s_PluginManager; public: + static PluginLoader& GetManager(){return s_PluginManager;} /** Constructeur.*/ PluginLoader(); + /** Accesseur sur une feature.*/ + Feature* GetFeature(long l); + /** Accesseur sur un plugin.*/ + Plugin* GetPlugin(long l); + /** Accesseur sur une dynlib.*/ + DynLib* GetDynLib(long l); + + /** Accesseur sur une feature.*/ + Feature* GetFeature(wxString strFeature); + /** Accesseur sur un plugin.*/ + Plugin* GetPlugin(wxString strPlugin); + /** Accesseur sur une dynlib.*/ + DynLib* GetDynLib(wxString strDynLib); + /** Charge tous les plugins.*/ bool Load(); *************** *** 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.*/ --- 470,474 ---- * @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é. --- 517,521 ---- * @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. --- 593,597 ---- 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); }; --- 627,631 ---- void FillDependantPluginArray(wxArrayString& array); /** Remplit une liste des chemins relatifs des modules à charger.*/ ! void FillDynLibArray(wxArrayString& array); }; Index: MDIFrame.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/MDIFrame.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** MDIFrame.h 14 Sep 2005 14:19:10 -0000 1.7 --- MDIFrame.h 11 Oct 2005 19:54:24 -0000 1.8 *************** *** 28,32 **** #define __WXDEVCENTER_MDIFRAME ! #include "Frame.h" #include <wx/notebook.h> --- 28,32 ---- #define __WXDEVCENTER_MDIFRAME ! #include <wxDevCenter/Frame.h> #include <wx/notebook.h> *************** *** 36,40 **** class View; ! class MDIFrame : public wxNotebook, public ViewFrame { friend class DocManager; --- 36,40 ---- class View; ! class WXDC_DLL_PLUGIN 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.11 diff -C2 -d -r1.10 -r1.11 *** language.h 26 Aug 2005 08:35:58 -0000 1.10 --- language.h 11 Oct 2005 19:54:24 -0000 1.11 *************** *** 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") Index: FileSystem.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/FileSystem.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** FileSystem.h 15 Sep 2005 09:54:25 -0000 1.12 --- FileSystem.h 11 Oct 2005 19:54:24 -0000 1.13 *************** *** 124,127 **** --- 124,129 ---- DECLARE_EVENT_TABLE() public: + FileSystem():wxEvtHandler(), Element(){} + /** @name Propriétés générales. * @{ */ Index: FileSystemTreeCtrl.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/FileSystemTreeCtrl.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** FileSystemTreeCtrl.h 15 Sep 2005 09:54:25 -0000 1.3 --- FileSystemTreeCtrl.h 11 Oct 2005 19:54:24 -0000 1.4 *************** *** 92,96 **** * @param nMode Mode d'ouverture. */ ! void OpenRoot(unsigned int nMode=WXDC_FSTC_MODE_NORMAL){Open(m_pFileSystem->GetRootPath(), nMode);} /** Etend l'arbre pour afficher le fichier/répertoire demandé. --- 92,96 ---- * @param nMode Mode d'ouverture. */ ! void OpenRoot(unsigned int nMode=WXDC_FSTC_MODE_NORMAL); /** Etend l'arbre pour afficher le fichier/répertoire demandé. Index: Manager.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/Manager.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Manager.h 12 Aug 2005 15:50:00 -0000 1.7 --- Manager.h 11 Oct 2005 19:54:24 -0000 1.8 *************** *** 72,76 **** #include <wxDevCenter/Element.h> - #include <wxDevCenter/Plugin.h> namespace wxDevCenter --- 72,75 ---- *************** *** 132,135 **** --- 131,144 ---- m_lNbItem -= number; } + /** Supprime tous les éléments.*/ + void RemoveAll() + { + if(m_pItemArray!=NULL) + { + delete [] m_pItemArray; + m_pItemArray = NULL; + } + m_lNbItem = 0; + } /** Acces sur un élément.*/ ItemType& Item(unsigned long index){return m_pItemArray[index];} Index: Element.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/Element.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Element.h 3 Aug 2005 19:21:22 -0000 1.3 --- Element.h 11 Oct 2005 19:54:24 -0000 1.4 *************** *** 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: --- NEW FILE: PluginFileSystem.h --- (This appears to be a binary file; contents omitted.) Index: AboutBox.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/AboutBox.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** AboutBox.h 7 Mar 2005 15:23:02 -0000 1.3 --- AboutBox.h 11 Oct 2005 19:54:24 -0000 1.4 *************** *** 26,32 **** --- 26,35 ---- #include <wx/listbook.h> + #include <wxDevCenter/PluginFileSystem.h> namespace wxDevCenter { + + class FileSystemTreeCtrl; /** Boite de dialogue "A propos de ". *************** *** 62,69 **** /** Pages des plugins. */ ! class AboutBoxPluginPage : public wxListbook { public: AboutBoxPluginPage(wxWindow* parent, wxWindowID id=-1); }; --- 65,78 ---- /** Pages des plugins. */ ! class AboutBoxPluginPage : public wxPanel { + DECLARE_EVENT_TABLE(); + protected: + plugins::PluginFileSystem m_PluginFileSystem; + FileSystemTreeCtrl* m_pFileSystemTreeCtrl; public: AboutBoxPluginPage(wxWindow* parent, wxWindowID id=-1); + protected: + void OnActivateItem(wxTreeEvent& event); }; |
|
From: Emilien K. <cur...@us...> - 2005-10-11 19:54:33
|
Update of /cvsroot/wxdevcenter/wxDevCenter/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29659/data Removed Files: wxdevcenterd.desktop Log Message: Move bakefiles to /build/bakefiles. Modularize frames. Create PluginFileSystem and show it in AboutBox. --- wxdevcenterd.desktop DELETED --- |
|
From: Emilien K. <cur...@us...> - 2005-10-11 19:54:33
|
Update of /cvsroot/wxdevcenter/wxDevCenter/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29659/include Modified Files: wxDevCenter.h Log Message: Move bakefiles to /build/bakefiles. Modularize frames. Create PluginFileSystem and show it in AboutBox. Index: wxDevCenter.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** wxDevCenter.h 2 Aug 2005 12:50:54 -0000 1.4 --- wxDevCenter.h 11 Oct 2005 19:54:24 -0000 1.5 *************** *** 65,69 **** // Entete globale de l'application. - #include <wxDevCenter/Element.h> #include <wxDevCenter/Application.h> --- 65,68 ---- |
|
From: Emilien K. <cur...@us...> - 2005-10-11 19:54:32
|
Update of /cvsroot/wxdevcenter/wxDevCenter/plugins/wxdc.ui.frames In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29659/plugins/wxdc.ui.frames Added Files: plugin.xml Log Message: Move bakefiles to /build/bakefiles. Modularize frames. Create PluginFileSystem and show it in AboutBox. --- NEW FILE: plugin.xml --- <?xml version="1.0" encoding="UTF-8"?> <plugin id="wxdc.ui.frames" version="0.3.0" label="wxdc.ui.frames" provider-name="Arcallians"> <description>wxDevCenter base plugin for TopFrame implementation.</description> <copyright>Notes</copyright> <license>Licence</license> <requires> <dynlib name="wxdc_ui_frames-0.3.0" /> </requires> </plugin> |
|
From: Emilien K. <cur...@us...> - 2005-10-11 19:54:32
|
Update of /cvsroot/wxdevcenter/wxDevCenter/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29659/build/bakefiles Added Files: wxDevCenter.bkl install.bkl wxDevCenter-unix.bkl wxDockIt.bkl wx.bkl wxDevCenter-msw.bkl Log Message: Move bakefiles to /build/bakefiles. Modularize frames. Create PluginFileSystem and show it in AboutBox. --- NEW FILE: wxDevCenter-unix.bkl --- <?xml version="1.0" ?> <makefile> <using module="datafiles" /> <dll id="wxdc.fs.unix" template="wxDLL" cond="PLATFORM_UNIX=='1'"> <dllname>wxdc_fs_unix-$(WXDEVCENTER-VERSION)</dllname> <libname>wxdc_fs_unix-$(WXDEVCENTER-VERSION)</libname> <depends>wxDevCenterLib</depends> <include>include</include> <sources> src/unix/FileSystemStandard-unix.cpp </sources> <wxlib /> <wxlib-base>xml</wxlib-base> <wxlib-gui>adv</wxlib-gui> <sys-lib>wxDevCenterLib</sys-lib> <lib-path>./lib</lib-path> <dirname>./plugins/wxdc.fs.unix</dirname> <install-to>$(LIBDIR)/wxDevCenter/plugins/wxdc.fs.unix</install-to> </dll> <dll id="wxdc.ui.frames" template="wxDLL" cond="PLATFORM_UNIX=='1'"> <dllname>wxdc_ui_frames-$(WXDEVCENTER-VERSION)</dllname> <libname>wxdc_ui_frames-$(WXDEVCENTER-VERSION)</libname> <depends>wxDevCenterLib</depends> <include>include</include> <sources> src/MainFrame.cpp src/MDIFrame.cpp </sources> <wxlib /> <wxlib-base>xml</wxlib-base> <wxlib-gui>adv</wxlib-gui> <wxDockItLib /> <sys-lib>wxDevCenterLib</sys-lib> <lib-path>./lib</lib-path> <dirname>./plugins/wxdc.ui.frames</dirname> <install-to>$(LIBDIR)/wxDevCenter/plugins/wxdc.ui.frames</install-to> </dll> <!-- Install plugin descriptors. --> <data-files-tree > <srcdir>plugins</srcdir> <install-to>$(DATADIR)/wxDevCenter/plugins</install-to> <files> wxdc.fs.msw/plugin.xml wxdc.fs.unix/plugin.xml wxdc.ui.frames/plugin.xml </files> </data-files-tree> </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> <set var="WXDEVCENTER-VERSION">0.3.0</set> <!-- Determine what plateform is used. --> <set var="DIRSPEC"> <if cond="PLATFORM_WIN32=='1'">msw</if> <if cond="PLATFORM_UNIX=='1'">unix</if> </set> <!-- wxDockIt. --> <include file="wxDockIt.bkl" /> <!-- Set the build directory. --> <set var="BUILDDIR">.$(DIRSEP)build$(DIRSEP)$(BUILD)</set> <dll id="wxDevCenterLib" template="wxDLL"> <dllname>wxDevCenterLib</dllname> <libname>wxDevCenterLib</libname> <version>$(WXDEVCENTER-VERSION)</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/Plugin.cpp src/PluginFileSystem.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> <wxDockItLib /> <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</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/Plugin.h wxDevCenter/PluginFileSystem.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 feature descriptor. --> <data-files-tree > <srcdir>features</srcdir> <install-to>$(DATADIR)/wxDevCenter/features</install-to> <files> wxdc/feature.xml </files> </data-files-tree> <data-files id="freedesktop_menu"> <srcdir>data</srcdir> <install-to>$(DATADIR)/applications</install-to> <files>$wxdevcenter.desktop</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-10-11 19:54:32
|
Update of /cvsroot/wxdevcenter/wxDevCenter/src/unix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29659/src/unix Added Files: FileSystemStandard-unix.cpp Config-unix.cpp Removed Files: Config.cpp FileSystemStandard.cpp Log Message: Move bakefiles to /build/bakefiles. Modularize frames. Create PluginFileSystem and show it in AboutBox. --- Config.cpp DELETED --- --- NEW FILE: FileSystemStandard-unix.cpp --- (This appears to be a binary file; contents omitted.) --- FileSystemStandard.cpp DELETED --- --- NEW FILE: Config-unix.cpp --- (This appears to be a binary file; contents omitted.) |
|
From: Emilien K. <cur...@us...> - 2005-10-11 19:54:31
|
Update of /cvsroot/wxdevcenter/wxDevCenter/src/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29659/src/msw Added Files: FileSystemStandard-msw.cpp Config-msw.cpp Removed Files: Config.cpp FileSystemStandard.cpp Log Message: Move bakefiles to /build/bakefiles. Modularize frames. Create PluginFileSystem and show it in AboutBox. --- NEW FILE: FileSystemStandard-msw.cpp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: Config-msw.cpp --- (This appears to be a binary file; contents omitted.) --- FileSystemStandard.cpp DELETED --- --- Config.cpp DELETED --- |
|
From: Emilien K. <cur...@us...> - 2005-10-11 19:54:26
|
Update of /cvsroot/wxdevcenter/wxDevCenter/features/wxDC In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29628/features/wxDC Log Message: Directory /cvsroot/wxdevcenter/wxDevCenter/features/wxDC added to the repository |
Update of /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12756/include/wxDevCenter Modified Files: Tag: modularisation MainFrame.h FileSystem.h MDIFrame.h Frame.h FileSystemStandard.h Config.h Log Message: Clean all corrupted files. Index: Config.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/Config.h,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.h 22 Sep 2005 17:06:44 -0000 1.11.2.1 --- Config.h 30 Sep 2005 04:57:43 -0000 1.11.2.2 *************** *** 163,171 **** * @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. - * @return Chemin racine de stockage des données. */ virtual wxString GetDataPath(long lStackIndex=0); --- 163,166 ---- *************** *** 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. --- 186,189 ---- *************** *** 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; --- 245,248 ---- *************** *** 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") --- 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") *************** *** 277,282 **** #define WXDC_CONF_KEYNAME_USERCONFDIR wxT("UserConfDir") - - } --- 265,268 ---- *************** *** 288,292 **** #endif - - #endif --- 274,276 ---- Index: MainFrame.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/MainFrame.h,v retrieving revision 1.12.2.3 retrieving revision 1.12.2.4 diff -C2 -d -r1.12.2.3 -r1.12.2.4 *** MainFrame.h 24 Sep 2005 12:45:44 -0000 1.12.2.3 --- MainFrame.h 30 Sep 2005 04:57:43 -0000 1.12.2.4 *************** *** 29,57 **** #include <wxDevCenter/Frame.h> - #include <wxDevCenter/Module.h> - #include <wxDevCenter/FileSystemCtrl.h> #include <wx/dnd.h> - class wxTreeEvent; - class wxSashWindow; - class wxLayoutManager; namespace wxDevCenter { - class MDIFrame; class StatusEvent; ! /** Fenêtre cadre principal. * 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.*/ ! WXDC_DECLARE_MODULE_CLASS(MainFrame) protected: /** LayoutManager.*/ --- 29,51 ---- #include <wxDevCenter/Frame.h> #include <wx/dnd.h> class wxLayoutManager; namespace wxDevCenter { class StatusEvent; ! class MDIFrame; /** Fenêtre cadre principal. * Fenêtre cadre contenant toutes les autres fenêtres et notament le conteneur de vues et les contrôles d'arborescence. */ ! class WXDC_DLL_PLUGIN 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.3 retrieving revision 1.14.2.4 diff -C2 -d -r1.14.2.3 -r1.14.2.4 *** FileSystemStandard.h 24 Sep 2005 12:45:44 -0000 1.14.2.3 --- FileSystemStandard.h 30 Sep 2005 04:57:43 -0000 1.14.2.4 *************** *** 31,34 **** --- 31,35 ---- #include <wxDevCenter/FileSystem.h> + #include <wxDevCenter/Plugin.h> *************** *** 59,67 **** class FileSystemStandard : public FileSystem { ! 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");} --- 60,70 ---- class FileSystemStandard : public FileSystem { ! DECLARE_ABSTRACT_CLASS(FileSystemStandard) public: FileSystemStandard():FileSystem(){} + virtual bool Initialize(); + virtual void Finalize(); + 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.3 retrieving revision 1.13.2.4 diff -C2 -d -r1.13.2.3 -r1.13.2.4 *** Frame.h 24 Sep 2005 12:45:44 -0000 1.13.2.3 --- Frame.h 30 Sep 2005 04:57:43 -0000 1.13.2.4 *************** *** 33,37 **** #include <wxDevCenter/Layout.h> ! #include <wxDevCenter/Module.h> --- 33,37 ---- #include <wxDevCenter/Layout.h> ! #include <wxDevCenter/Plugin.h> *************** *** 136,143 **** * ainsi que la barre de status et les barres d'outils génériques. */ ! class WXDC_DLL_BASE TopFrame : public wxFrame { DECLARE_EVENT_TABLE() ! WXDC_DECLARE_MODULE_BASE_CLASS(TopFrame) protected: /** Fenetre cadre fille contenant les vues.*/ --- 136,143 ---- * ainsi que la barre de status et les barres d'outils génériques. */ ! class WXDC_DLL_BASE TopFrame : virtual public Element, public wxFrame { DECLARE_EVENT_TABLE() ! DECLARE_ABSTRACT_CLASS(TopFrame) protected: /** Fenetre cadre fille contenant les vues.*/ *************** *** 146,156 **** /** Surcharge le procédé d'exécution des évènements.*/ virtual bool ProcessEvent(wxEvent& event); - public: - static TopFrame* CreateTopFrame() - { - return CreateModuleObject(); - } - /** Constructeur.*/ TopFrame(); --- 146,150 ---- *************** *** 160,163 **** --- 154,166 ---- ~TopFrame(void); + /** @name Fonctions d'interface d'élément. + * @{ */ + virtual bool Initialize(); + virtual void Finalize(); + virtual bool Destroy(bool bForce=true); + virtual bool CanDestroy(); + /** @ */ + + /** @name View. * @{ */ *************** *** 197,203 **** virtual wxDevCenter::Layout GetLayout(); ! /** Surcharge du processus de destruction. ! * Utilisé pour vider le cadre de ses WorkBar et la désenregistrer du WorkBarManager.*/ ! virtual bool Destroy(); }; --- 200,222 ---- virtual wxDevCenter::Layout GetLayout(); ! }; ! ! /** Top frame template.*/ ! class WXDC_DLL_BASE TopFrameTemplate : public ObjectTemplate<TopFrame> ! { ! public: ! TopFrameTemplate(wxClassInfo* pClassInfo); ! ! }; ! ! /** Top frame manager.*/ ! class WXDC_DLL_BASE TopFrameManager : public MultiObjectTemplateManager<TopFrame, TopFrameTemplate> ! { ! protected: ! static TopFrameManager s_TopFrameManager; ! public: ! static TopFrameManager& GetManager(){return s_TopFrameManager;} ! ! TopFrame* CreateTopFrame(){return CreateObject(0);} }; Index: MDIFrame.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/MDIFrame.h,v retrieving revision 1.7.2.1 retrieving revision 1.7.2.2 diff -C2 -d -r1.7.2.1 -r1.7.2.2 *** MDIFrame.h 24 Sep 2005 11:44:20 -0000 1.7.2.1 --- MDIFrame.h 30 Sep 2005 04:57:43 -0000 1.7.2.2 *************** *** 28,32 **** #define __WXDEVCENTER_MDIFRAME ! #include "Frame.h" #include <wx/notebook.h> --- 28,32 ---- #define __WXDEVCENTER_MDIFRAME ! #include <wxDevCenter/Frame.h> #include <wx/notebook.h> *************** *** 36,40 **** class View; ! class WXDC_DLL_MODULE MDIFrame : public wxNotebook, public ViewFrame { friend class DocManager; --- 36,40 ---- class View; ! class WXDC_DLL_PLUGIN MDIFrame : public wxNotebook, public ViewFrame { friend class DocManager; Index: FileSystem.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/FileSystem.h,v retrieving revision 1.12 retrieving revision 1.12.2.1 diff -C2 -d -r1.12 -r1.12.2.1 *** FileSystem.h 15 Sep 2005 09:54:25 -0000 1.12 --- FileSystem.h 30 Sep 2005 04:57:43 -0000 1.12.2.1 *************** *** 124,127 **** --- 124,129 ---- DECLARE_EVENT_TABLE() public: + FileSystem():wxEvtHandler(), Element(){} + /** @name Propriétés générales. * @{ */ |
|
From: Emilien K. <cur...@us...> - 2005-09-30 04:57:51
|
Update of /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/unix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12756/include/wxDevCenter/unix Modified Files: Tag: modularisation FileSystemStandard.h Log Message: Clean all corrupted files. Index: FileSystemStandard.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/unix/FileSystemStandard.h,v retrieving revision 1.3.2.2 retrieving revision 1.3.2.3 diff -C2 -d -r1.3.2.2 -r1.3.2.3 *** FileSystemStandard.h 24 Sep 2005 11:44:21 -0000 1.3.2.2 --- FileSystemStandard.h 30 Sep 2005 04:57:43 -0000 1.3.2.3 *************** *** 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; --- 43,49 ---- * Valables pour les systèmes UNIX, Linux, MacOS. */ ! class WXDC_DLL_PLUGIN FileSystemStandardUnix : public FileSystemStandard { ! DECLARE_DYNAMIC_CLASS(FileSystemStandardUnix) protected: FilePath m_strFindPath; |
|
From: Emilien K. <cur...@us...> - 2005-09-29 17:05:27
|
Update of /cvsroot/wxdevcenter/wxDevCenter/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22512/build/bakefiles Modified Files: Tag: modularisation wxDevCenter.bkl wxDevCenter-unix.bkl install.bkl Removed Files: Tag: modularisation wxdc-plugins.bkl wxdc-modules.bkl Log Message: Change module to plugin. Index: wxDevCenter-unix.bkl =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/build/bakefiles/Attic/wxDevCenter-unix.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-unix.bkl 21 Sep 2005 15:00:38 -0000 1.1.2.1 --- wxDevCenter-unix.bkl 29 Sep 2005 17:05:00 -0000 1.1.2.2 *************** *** 2,19 **** <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 --- 2,37 ---- <makefile> ! <using module="datafiles" /> ! <dll id="wxdc.fs.unix" template="wxDLL" cond="PLATFORM_UNIX=='1'"> ! <dllname>wxdc_fs_unix-$(WXDEVCENTER-VERSION)</dllname> ! <libname>wxdc_fs_unix-$(WXDEVCENTER-VERSION)</libname> ! <depends>wxDevCenterLib</depends> ! ! <include>include</include> ! <sources> ! src/unix/FileSystemStandard-unix.cpp ! </sources> ! ! <wxlib /> ! <wxlib-base>xml</wxlib-base> ! <wxlib-gui>adv</wxlib-gui> ! <sys-lib>wxDevCenterLib</sys-lib> ! <lib-path>./lib</lib-path> ! ! <dirname>./plugins/wxdc.fs.unix</dirname> ! <install-to>$(LIBDIR)/wxDevCenter/plugins/wxdc.fs.unix</install-to> ! </dll> ! ! ! <dll id="wxdc.ui.frames" template="wxDLL" cond="PLATFORM_UNIX=='1'"> ! <dllname>wxdc_ui_frames-$(WXDEVCENTER-VERSION)</dllname> ! <libname>wxdc_ui_frames-$(WXDEVCENTER-VERSION)</libname> ! <depends>wxDevCenterLib</depends> ! <include>include</include> <sources> src/MainFrame.cpp src/MDIFrame.cpp *************** *** 24,29 **** <wxlib-gui>adv</wxlib-gui> <wxDockItLib /> - </module> - </makefile> --- 42,64 ---- <wxlib-gui>adv</wxlib-gui> <wxDockItLib /> + <sys-lib>wxDevCenterLib</sys-lib> + <lib-path>./lib</lib-path> + + <dirname>./plugins/wxdc.ui.frames</dirname> + <install-to>$(LIBDIR)/wxDevCenter/plugins/wxdc.ui.frames</install-to> + </dll> + + + <!-- Install plugin descriptors. --> + <data-files-tree > + <srcdir>plugins</srcdir> + <install-to>$(DATADIR)/wxDevCenter/plugins</install-to> + <files> + wxdc.fs.msw/plugin.xml + wxdc.fs.unix/plugin.xml + wxdc.ui.frames/plugin.xml + </files> + </data-files-tree> + </makefile> Index: install.bkl =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/build/bakefiles/Attic/install.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 *** install.bkl 21 Sep 2005 15:00:38 -0000 1.1.2.1 --- install.bkl 29 Sep 2005 17:05:00 -0000 1.1.2.2 *************** *** 27,31 **** wxDevCenter/Layout.h wxDevCenter/Manager.h - wxDevCenter/Module.h wxDevCenter/Plugin.h wxDevCenter/Project.h --- 27,30 ---- *************** *** 66,78 **** </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> --- 65,81 ---- </data-files-tree> ! <!-- Install feature descriptor. --> ! <data-files-tree > ! <srcdir>features</srcdir> ! <install-to>$(DATADIR)/wxDevCenter/features</install-to> ! <files> ! wxdc/feature.xml ! </files> ! </data-files-tree> ! ! <data-files id="freedesktop_menu"> <srcdir>data</srcdir> <install-to>$(DATADIR)/applications</install-to> ! <files>$wxdevcenter.desktop</files> </data-files> --- wxdc-modules.bkl DELETED --- --- wxdc-plugins.bkl DELETED --- Index: wxDevCenter.bkl =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/build/bakefiles/Attic/wxDevCenter.bkl,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** wxDevCenter.bkl 24 Sep 2005 12:45:44 -0000 1.1.2.2 --- wxDevCenter.bkl 29 Sep 2005 17:05:00 -0000 1.1.2.3 *************** *** 2,5 **** --- 2,7 ---- <makefile> + <set var="WXDEVCENTER-VERSION">0.3.0</set> + <!-- Determine what plateform is used. --> <set var="DIRSPEC"> *************** *** 9,13 **** <!-- wxDockIt. --> ! <include file="wxDockIt.bkl" /> <!-- Set the build directory. --> --- 11,15 ---- <!-- wxDockIt. --> ! <include file="wxDockIt.bkl" /> <!-- Set the build directory. --> *************** *** 17,21 **** <dllname>wxDevCenterLib</dllname> <libname>wxDevCenterLib</libname> ! <version>0.3.0</version> <dirname>lib</dirname> --- 19,23 ---- <dllname>wxDevCenterLib</dllname> <libname>wxDevCenterLib</libname> ! <version>$(WXDEVCENTER-VERSION)</version> <dirname>lib</dirname> *************** *** 41,53 **** 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 src/Plugin.cpp src/Project.cpp --- 43,51 ---- *************** *** 71,75 **** <exe id="wxDevCenter" template="wxEXE"> <app-type>gui</app-type> ! <exename>wxDevCenter$(SUFFIX)</exename> <dirname>./bin</dirname> --- 69,73 ---- <exe id="wxDevCenter" template="wxEXE"> <app-type>gui</app-type> ! <exename>wxDevCenter</exename> <dirname>./bin</dirname> |
|
From: Emilien K. <cur...@us...> - 2005-09-29 17:05:26
|
Update of /cvsroot/wxdevcenter/wxDevCenter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22512 Modified Files: Tag: modularisation wxDevCenter.bkl GNUmakefile Log Message: Change module to plugin. Index: GNUmakefile =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/GNUmakefile,v retrieving revision 1.11.2.3 retrieving revision 1.11.2.4 diff -C2 -d -r1.11.2.3 -r1.11.2.4 *** GNUmakefile 24 Sep 2005 12:45:44 -0000 1.11.2.3 --- GNUmakefile 29 Sep 2005 17:05:01 -0000 1.11.2.4 *************** *** 76,88 **** ./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 \ ./build/$(BUILD)/wxDevCenterLib_Plugin.o \ ./build/$(BUILD)/wxDevCenterLib_Project.o \ --- 76,84 ---- *************** *** 95,105 **** WXDEVCENTER_OBJECTS = \ ./build/$(BUILD)/wxDevCenter_AppImpl.o ### Conditionally set variables: ### ifeq ($(BUILD),debug) - SUFFIX = D - endif - ifeq ($(BUILD),debug) ifeq ($(UNICODE),1) WXLIBPOSTFIX = ud --- 91,111 ---- WXDEVCENTER_OBJECTS = \ ./build/$(BUILD)/wxDevCenter_AppImpl.o + WXDC.FS.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.FS.UNIX_OBJECTS = \ + ./build/$(BUILD)/wxdc.fs.unix_FileSystemStandard_unix.o + WXDC.UI.FRAMES_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.UI.FRAMES_OBJECTS = \ + ./build/$(BUILD)/wxdc.ui.frames_MainFrame.o \ + ./build/$(BUILD)/wxdc.ui.frames_MDIFrame.o ### Conditionally set variables: ### ifeq ($(BUILD),debug) ifeq ($(UNICODE),1) WXLIBPOSTFIX = ud *************** *** 126,135 **** endif ifeq ($(BUILD),debug) - FREEDESKTOP_MENU_FILE = wxdevcenterd.desktop - endif - ifeq ($(BUILD),release) - FREEDESKTOP_MENU_FILE = wxdevcenter.desktop - endif - ifeq ($(BUILD),debug) __WARNINGS = -W -Wall endif --- 132,135 ---- *************** *** 166,174 **** ### 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 \ if test ! -d $(prefix)/include/`dirname $$f` ; then \ $(INSTALL) -d $(prefix)/include/`dirname $$f`; \ --- 166,181 ---- ### Targets: ### ! all: lib/libwxDevCenterLib.so ./bin/wxDevCenter ./plugins/wxdc.fs.unix/libwxdc_fs_unix-0.3.0.so ./plugins/wxdc.ui.frames/libwxdc_ui_frames-0.3.0.so ! install: all install_wxDevCenterLib install_wxDevCenter install_wxdc.fs.unix install_wxdc.ui.frames ! $(INSTALL) -d $(prefix)/share/wxDevCenter/plugins ! for f in wxdc.fs.msw/plugin.xml wxdc.fs.unix/plugin.xml wxdc.ui.frames/plugin.xml; do \ ! if test ! -d $(prefix)/share/wxDevCenter/plugins/`dirname $$f` ; then \ ! $(INSTALL) -d $(prefix)/share/wxDevCenter/plugins/`dirname $$f`; \ ! fi; \ ! $(INSTALL) -m 644 plugins//$$f $(prefix)/share/wxDevCenter/plugins/$$f; \ ! done $(INSTALL) -d $(prefix)/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/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`; \ *************** *** 183,188 **** $(INSTALL) -m 644 data//$$f $(prefix)/share/wxDevCenter/data/$$f; \ done $(INSTALL) -d $(prefix)/share/applications ! (cd data/ ; $(INSTALL) -m 644 $(FREEDESKTOP_MENU_FILE) $(prefix)/share/applications) $(INSTALL) -d $(prefix)/share/pixmaps (cd data/icons/ ; $(INSTALL) -m 644 wxDevCenter.png $(prefix)/share/pixmaps) --- 190,202 ---- $(INSTALL) -m 644 data//$$f $(prefix)/share/wxDevCenter/data/$$f; \ done + $(INSTALL) -d $(prefix)/share/wxDevCenter/features + for f in wxdc/feature.xml; do \ + if test ! -d $(prefix)/share/wxDevCenter/features/`dirname $$f` ; then \ + $(INSTALL) -d $(prefix)/share/wxDevCenter/features/`dirname $$f`; \ + fi; \ + $(INSTALL) -m 644 features//$$f $(prefix)/share/wxDevCenter/features/$$f; \ + done $(INSTALL) -d $(prefix)/share/applications ! (cd data/ ; $(INSTALL) -m 644 $wxdevcenter.desktop $(prefix)/share/applications) $(INSTALL) -d $(prefix)/share/pixmaps (cd data/icons/ ; $(INSTALL) -m 644 wxDevCenter.png $(prefix)/share/pixmaps) *************** *** 195,199 **** rm -f lib/libwxDevCenterLib.so rm -f lib/libwxDevCenterLib.so ! rm -f ./bin/wxDevCenter$(SUFFIX) lib/libwxDevCenterLib.so: $(WXDEVCENTERLIB_OBJECTS) --- 209,217 ---- rm -f lib/libwxDevCenterLib.so rm -f lib/libwxDevCenterLib.so ! rm -f ./bin/wxDevCenter ! rm -f ./plugins/wxdc.fs.unix/libwxdc_fs_unix-0.3.0.so ! rm -f ./plugins/wxdc.fs.unix/libwxdc_fs_unix-0.3.0.so ! rm -f ./plugins/wxdc.ui.frames/libwxdc_ui_frames-0.3.0.so ! rm -f ./plugins/wxdc.ui.frames/libwxdc_ui_frames-0.3.0.so lib/libwxDevCenterLib.so: $(WXDEVCENTERLIB_OBJECTS) *************** *** 205,214 **** install -c lib/libwxDevCenterLib.so $(prefix)/lib ! ./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: $(INSTALL) -d $(prefix)/bin ! install -c ./bin/wxDevCenter$(SUFFIX) $(prefix)/bin ./build/$(BUILD)/wxDevCenterLib_AboutBox.o: ./src/AboutBox.cpp --- 223,248 ---- install -c lib/libwxDevCenterLib.so $(prefix)/lib ! ./bin/wxDevCenter: $(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: $(INSTALL) -d $(prefix)/bin ! install -c ./bin/wxDevCenter $(prefix)/bin ! ! ./plugins/wxdc.fs.unix/libwxdc_fs_unix-0.3.0.so: $(WXDC.FS.UNIX_OBJECTS) lib/libwxDevCenterLib.so ! $(CXX) -shared -fPIC -o $@ $(WXDC.FS.UNIX_OBJECTS) $(LDFLAGS) -pthread $(__DEBUGINFO) `wx-config --libs` -L./lib -lwx_base$(WXLIBPOSTFIX)-$(WXVERSIONTAG) -lwx_base$(WXLIBPOSTFIX)_xml-$(WXVERSIONTAG) -lwx_$(WXPORTNAME)$(WXLIBPOSTFIX)_adv-$(WXVERSIONTAG) -lwxDevCenterLib ! ! install_wxdc.fs.unix: ! $(INSTALL) -d $(prefix)/lib/wxDevCenter/plugins/wxdc.fs.unix ! $(INSTALL) -m 644 ./plugins/wxdc.fs.unix/libwxdc_fs_unix-0.3.0.so $(prefix)/lib/wxDevCenter/plugins/wxdc.fs.unix ! install -c ./plugins/wxdc.fs.unix/libwxdc_fs_unix-0.3.0.so $(prefix)/lib/wxDevCenter/plugins/wxdc.fs.unix ! ! ./plugins/wxdc.ui.frames/libwxdc_ui_frames-0.3.0.so: $(WXDC.UI.FRAMES_OBJECTS) lib/libwxDevCenterLib.so ! $(CXX) -shared -fPIC -o $@ $(WXDC.UI.FRAMES_OBJECTS) $(LDFLAGS) -pthread $(__DEBUGINFO) `wx-config --libs` -L./lib -lwx_base$(WXLIBPOSTFIX)-$(WXVERSIONTAG) -lwx_base$(WXLIBPOSTFIX)_xml-$(WXVERSIONTAG) -lwx_$(WXPORTNAME)$(WXLIBPOSTFIX)_adv-$(WXVERSIONTAG) -lwxdockit-$(WXDOCKIT_VERSION) -lwxDevCenterLib ! ! install_wxdc.ui.frames: ! $(INSTALL) -d $(prefix)/lib/wxDevCenter/plugins/wxdc.ui.frames ! $(INSTALL) -m 644 ./plugins/wxdc.ui.frames/libwxdc_ui_frames-0.3.0.so $(prefix)/lib/wxDevCenter/plugins/wxdc.ui.frames ! install -c ./plugins/wxdc.ui.frames/libwxdc_ui_frames-0.3.0.so $(prefix)/lib/wxDevCenter/plugins/wxdc.ui.frames ./build/$(BUILD)/wxDevCenterLib_AboutBox.o: ./src/AboutBox.cpp *************** *** 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) $< --- 291,294 ---- *************** *** 269,287 **** $(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) $< - ./build/$(BUILD)/wxDevCenterLib_Module.o: ./src/Module.cpp - $(CXX) -c -o $@ $(WXDEVCENTERLIB_CXXFLAGS) $(CPPDEPS) $< - ./build/$(BUILD)/wxDevCenterLib_Plugin.o: ./src/Plugin.cpp $(CXX) -c -o $@ $(WXDEVCENTERLIB_CXXFLAGS) $(CPPDEPS) $< --- 300,309 ---- *************** *** 302,306 **** $(CXX) -c -o $@ $(WXDEVCENTER_CXXFLAGS) $(CPPDEPS) $< ! .PHONY: all install uninstall clean install_wxDevCenterLib install_wxDevCenter --- 324,337 ---- $(CXX) -c -o $@ $(WXDEVCENTER_CXXFLAGS) $(CPPDEPS) $< ! ./build/$(BUILD)/wxdc.fs.unix_FileSystemStandard_unix.o: ./src/unix/FileSystemStandard-unix.cpp ! $(CXX) -c -o $@ $(WXDC.FS.UNIX_CXXFLAGS) $(CPPDEPS) $< ! ! ./build/$(BUILD)/wxdc.ui.frames_MainFrame.o: ./src/MainFrame.cpp ! $(CXX) -c -o $@ $(WXDC.UI.FRAMES_CXXFLAGS) $(CPPDEPS) $< ! ! ./build/$(BUILD)/wxdc.ui.frames_MDIFrame.o: ./src/MDIFrame.cpp ! $(CXX) -c -o $@ $(WXDC.UI.FRAMES_CXXFLAGS) $(CPPDEPS) $< ! ! .PHONY: all install uninstall clean install_wxDevCenterLib install_wxDevCenter install_wxdc.fs.unix install_wxdc.ui.frames Index: wxDevCenter.bkl =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/wxDevCenter.bkl,v retrieving revision 1.11.2.2 retrieving revision 1.11.2.3 diff -C2 -d -r1.11.2.2 -r1.11.2.3 *** wxDevCenter.bkl 24 Sep 2005 12:45:44 -0000 1.11.2.2 --- wxDevCenter.bkl 29 Sep 2005 17:05:01 -0000 1.11.2.3 *************** *** 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-29 17:05:14
|
Update of /cvsroot/wxdevcenter/wxDevCenter/src/unix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22512/src/unix Modified Files: Tag: modularisation Config-unix.cpp FileSystemStandard-unix.cpp Log Message: Change module to plugin. Index: FileSystemStandard-unix.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/unix/Attic/FileSystemStandard-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 *** FileSystemStandard-unix.cpp 24 Sep 2005 12:45:44 -0000 1.1.2.1 --- FileSystemStandard-unix.cpp 29 Sep 2005 17:05:01 -0000 1.1.2.2 *************** *** 22,26 **** // 02111-1307, USA. ! #include <wxDevCenterModule.h> #include <wxDevCenter/FileSystemStandard.h> #include <wxDevCenter/unix/FileSystemStandard.h> --- 22,26 ---- // 02111-1307, USA. ! #include <wxDevCenterPlugin.h> #include <wxDevCenter/FileSystemStandard.h> #include <wxDevCenter/unix/FileSystemStandard.h> *************** *** 37,41 **** ////////////////////////////////////////////////////////////////////// ! WXDC_IMPLEMENT_MODULE_CLASS(FileSystemStandardUnix, FileSystemStandard, FileSystemStandard) FileSystemStandardUnix::FileSystemStandardUnix(): --- 37,43 ---- ////////////////////////////////////////////////////////////////////// ! FileSystemStandardUnix g_FileSystemStdUnix; ! ! IMPLEMENT_DYNAMIC_CLASS(FileSystemStandardUnix, FileSystemStandard) FileSystemStandardUnix::FileSystemStandardUnix(): Index: Config-unix.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/unix/Attic/Config-unix.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 *** Config-unix.cpp 22 Sep 2005 17:06:43 -0000 1.1.2.2 --- Config-unix.cpp 29 Sep 2005 17:05:01 -0000 1.1.2.3 *************** *** 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"))); --- 58,61 ---- |
|
From: Emilien K. <cur...@us...> - 2005-09-29 17:05:12
|
Update of /cvsroot/wxdevcenter/wxDevCenter/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22512/src Modified Files: Tag: modularisation MDIFrame.cpp FileSystemStandard.cpp Config.cpp MainFrame.cpp Frame.cpp Application.cpp Removed Files: Tag: modularisation Module.cpp Log Message: Change module to plugin. --- Module.cpp DELETED --- Index: MainFrame.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/MainFrame.cpp,v retrieving revision 1.22.2.3 retrieving revision 1.22.2.4 diff -C2 -d -r1.22.2.3 -r1.22.2.4 *** MainFrame.cpp 24 Sep 2005 12:45:44 -0000 1.22.2.3 --- MainFrame.cpp 29 Sep 2005 17:05:00 -0000 1.22.2.4 *************** *** 23,27 **** ! #include <wxDevCenterModule.h> #include <wxDevCenter/MainFrame.h> --- 23,27 ---- ! #include <wxDevCenterPlugin.h> #include <wxDevCenter/MainFrame.h> *************** *** 34,38 **** #include <wxDevCenter/Layout.h> #include <wxDevCenter/ArtProvider.h> - #include <wxDevCenter/Module.h> --- 34,37 ---- *************** *** 52,57 **** #define WXDC_VIEWMENU_INSERT_AFTER 1 ! WXDC_IMPLEMENT_MODULE_CLASS(MainFrame, TopFrame, TopFrame) BEGIN_EVENT_TABLE(MainFrame, TopFrame) --- 51,57 ---- #define WXDC_VIEWMENU_INSERT_AFTER 1 + TopFrameTemplate MainFrameTemplate(CLASSINFO(MainFrame)); ! IMPLEMENT_DYNAMIC_CLASS(MainFrame, TopFrame) BEGIN_EVENT_TABLE(MainFrame, TopFrame) *************** *** 148,155 **** void MainFrame::OnClose(wxCloseEvent &event) { ! if(!Application::GetApp().GetDocManager().CloseAllDocuments()) event.Veto(); - else - Destroy(); } --- 148,153 ---- void MainFrame::OnClose(wxCloseEvent &event) { ! if(!Destroy(false)) event.Veto(); } Index: Config.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/Config.cpp,v retrieving revision 1.11.2.2 retrieving revision 1.11.2.3 diff -C2 -d -r1.11.2.2 -r1.11.2.3 *** Config.cpp 24 Sep 2005 11:44:20 -0000 1.11.2.2 --- Config.cpp 29 Sep 2005 17:05:00 -0000 1.11.2.3 *************** *** 27,30 **** --- 27,31 ---- #include <wx/fileconf.h> #include <wx/filefn.h> + #include <wx/tokenzr.h> using namespace wxDevCenter; *************** *** 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) --- 121,124 ---- *************** *** 174,187 **** } - // 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) { ! m_strDataPath.Insert(strPath, 0); } --- 166,178 ---- } // Ajoute un chemin sur la pile des chemins de stockage de données. void Config::AddDataPath(wxString strPath) { ! wxStringTokenizer tkz(strPath, wxT("&;")); ! while ( tkz.HasMoreTokens() ) ! { ! wxString token = tkz.GetNextToken(); ! m_strDataPath.Insert(token, 0); ! } } *************** *** 189,193 **** void Config::AddFeaturesPath(wxString strPath) { ! m_strFeaturesPath.Insert(strPath, 0); } --- 180,189 ---- void Config::AddFeaturesPath(wxString strPath) { ! wxStringTokenizer tkz(strPath, wxT("&;")); ! while ( tkz.HasMoreTokens() ) ! { ! wxString token = tkz.GetNextToken(); ! m_strFeaturesPath.Insert(token, 0); ! } } *************** *** 195,199 **** void Config::AddPluginsPath(wxString strPath) { ! m_strPluginsPath.Insert(strPath, 0); } --- 191,200 ---- void Config::AddPluginsPath(wxString strPath) { ! wxStringTokenizer tkz(strPath, wxT("&;")); ! while ( tkz.HasMoreTokens() ) ! { ! wxString token = tkz.GetNextToken(); ! m_strPluginsPath.Insert(token, 0); ! } } *************** *** 201,205 **** void Config::AddGlobalConfPath(wxString strPath) { ! m_strConfPath.Insert(strPath, 0); } --- 202,211 ---- void Config::AddGlobalConfPath(wxString strPath) { ! wxStringTokenizer tkz(strPath, wxT("&;")); ! while ( tkz.HasMoreTokens() ) ! { ! wxString token = tkz.GetNextToken(); ! m_strConfPath.Insert(token, 0); ! } } *************** *** 207,211 **** void Config::AddUserConfPath(wxString strPath) { ! m_strUserConfPath.Insert(strPath, 0); } --- 213,222 ---- void Config::AddUserConfPath(wxString strPath) { ! wxStringTokenizer tkz(strPath, wxT("&;")); ! while ( tkz.HasMoreTokens() ) ! { ! wxString token = tkz.GetNextToken(); ! m_strUserConfPath.Insert(token, 0); ! } } *************** *** 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; --- 231,234 ---- Index: Frame.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/Frame.cpp,v retrieving revision 1.12.2.3 retrieving revision 1.12.2.4 diff -C2 -d -r1.12.2.3 -r1.12.2.4 *** Frame.cpp 24 Sep 2005 12:45:44 -0000 1.12.2.3 --- Frame.cpp 29 Sep 2005 17:05:01 -0000 1.12.2.4 *************** *** 65,74 **** ////////////////////////////////////////////////////////////////////// ! WXDC_IMPLEMENT_MODULE_BASE_CLASS(TopFrame, wxFrame) ! BEGIN_EVENT_TABLE(wxDevCenter::TopFrame, wxFrame) END_EVENT_TABLE() TopFrame::TopFrame(): wxFrame(), m_pViewFrame(NULL) --- 65,75 ---- ////////////////////////////////////////////////////////////////////// ! IMPLEMENT_ABSTRACT_CLASS(TopFrame, wxFrame) ! BEGIN_EVENT_TABLE(TopFrame, wxFrame) END_EVENT_TABLE() TopFrame::TopFrame(): + Element(), wxFrame(), m_pViewFrame(NULL) *************** *** 85,88 **** --- 86,122 ---- } + bool TopFrame::Initialize() + { + Element::Initialize(); + return true; + } + + void TopFrame::Finalize() + { + Element::Finalize(); + } + + bool TopFrame::Destroy(bool bForce) + { + // Do not call Element::Finalize because use of wxFrame::Destroy() + + bool bClose = Application::GetApp().GetDocManager().CloseAllDocuments(); + + if(bForce || bClose) + { + WorkBarManager::GetManager().UnregisterFrame(this); + Element::Destroy(bForce); + return wxFrame::Destroy(); + } + else + return false; + } + + bool TopFrame::CanDestroy() + { + Element::CanDestroy(); + return Application::GetApp().GetDocManager().CloseAllDocuments(); + } + // Surcharge le procédé d'exécution des évènements. *************** *** 106,116 **** - // Surcharge du processus de destruction. - bool TopFrame::Destroy() - { - WorkBarManager::GetManager().UnregisterFrame(this); - return wxFrame::Destroy(); - } - // Retourne le layout attaché à la fenetre. wxDevCenter::Layout TopFrame::GetLayout() --- 140,143 ---- *************** *** 121,124 **** --- 148,162 ---- ////////////////////////////////////////////////////////////////////// + // TopFrameManager + ////////////////////////////////////////////////////////////////////// + + TopFrameManager TopFrameManager::s_TopFrameManager; + + TopFrameTemplate::TopFrameTemplate(wxClassInfo* pClassInfo):ObjectTemplate<TopFrame>(pClassInfo, wxT("Test"), wxT("")) + { + TopFrameManager::GetManager().RegisterTemplate(this); + } + + ////////////////////////////////////////////////////////////////////// // ViewFrame ////////////////////////////////////////////////////////////////////// Index: Application.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/Application.cpp,v retrieving revision 1.37.2.3 retrieving revision 1.37.2.4 diff -C2 -d -r1.37.2.3 -r1.37.2.4 *** Application.cpp 24 Sep 2005 12:45:44 -0000 1.37.2.3 --- Application.cpp 29 Sep 2005 17:05:01 -0000 1.37.2.4 *************** *** 27,31 **** #include <wxDevCenter/AboutBox.h> #include <wxDevCenter/Config.h> - #include <wxDevCenter/Module.h> #include <wxDevCenter/FileSystem.h> #include <wxDevCenter/FileSystemStandard.h> --- 27,30 ---- *************** *** 39,42 **** --- 38,42 ---- #include <wxDevCenter/WorkBar.h> + #include <wx/dir.h> #include <wx/dynlib.h> *************** *** 82,87 **** wxArtProvider::PushProvider(new ArtProvider); - // Charge les modules. - // Module::LoadModules(); // Initialise les gestionnaires --- 82,85 ---- *************** *** 89,92 **** --- 87,91 ---- m_ProjectManager.Initialize(); WorkBarManager::GetManager().Initialize(); + TopFrameManager::GetManager().Initialize(); // Charge les plugins : phase de tests *************** *** 95,98 **** --- 94,98 ---- m_PluginLoader.Initialize(); + // Crée la config utilisateur. Config::GetConfig().CreateUserProfile(); *************** *** 102,116 **** // Initialise le gestionnaire de systèmes de fichiers ! m_pStandardFileSystem = FileSystemStandard::CreateFileSystemStandard(); ! 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) { --- 102,113 ---- // Initialise le gestionnaire de systèmes de fichiers ! // m_pStandardFileSystem = FileSystemStandard::CreateFileSystemStandard(); ! // FileSystemManager::GetManager().Register(m_pStandardFileSystem, true); // Initialise les menus par défaut. InitCommandGroups(); // Crée la fenetre principale ! m_pTopFrame = (TopFrame*) TopFrameManager::GetManager().CreateTopFrame(); if(m_pTopFrame==NULL) { *************** *** 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); --- 431,434 ---- *************** *** 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); --- 445,448 ---- Index: MDIFrame.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/MDIFrame.cpp,v retrieving revision 1.8.2.1 retrieving revision 1.8.2.2 diff -C2 -d -r1.8.2.1 -r1.8.2.2 *** MDIFrame.cpp 24 Sep 2005 11:44:20 -0000 1.8.2.1 --- MDIFrame.cpp 29 Sep 2005 17:05:00 -0000 1.8.2.2 *************** *** 23,27 **** ! #include <wxDevCenterModule.h> #include <wxDevCenter/MDIFrame.h> --- 23,27 ---- ! #include <wxDevCenterPlugin.h> #include <wxDevCenter/MDIFrame.h> Index: FileSystemStandard.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/FileSystemStandard.cpp,v retrieving revision 1.19.2.2 retrieving revision 1.19.2.3 diff -C2 -d -r1.19.2.2 -r1.19.2.3 *** FileSystemStandard.cpp 24 Sep 2005 11:44:20 -0000 1.19.2.2 --- FileSystemStandard.cpp 29 Sep 2005 17:05:00 -0000 1.19.2.3 *************** *** 36,41 **** ////////////////////////////////////////////////////////////////////// // Standard file system ! WXDC_IMPLEMENT_MODULE_BASE_CLASS(FileSystemStandard, FileSystem) bool FileSystemStandard::CreateDirectory(FilePath strDir) --- 36,54 ---- ////////////////////////////////////////////////////////////////////// // Standard file system ! IMPLEMENT_ABSTRACT_CLASS(FileSystemStandard, FileSystem) + bool FileSystemStandard::Initialize() + { + if(FileSystem::Initialize()) + return FileSystemManager::GetManager().Register(this, true); + else + return false; + } + + void FileSystemStandard::Finalize() + { + FileSystemManager::GetManager().Unregister(this); + FileSystem::Finalize(); + } bool FileSystemStandard::CreateDirectory(FilePath strDir) |
|
From: Emilien K. <cur...@us...> - 2005-09-29 17:05:12
|
Update of /cvsroot/wxdevcenter/wxDevCenter/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22512/include Removed Files: Tag: modularisation wxDevCenterModule.h Log Message: Change module to plugin. --- wxDevCenterModule.h DELETED --- |
|
From: Emilien K. <cur...@us...> - 2005-09-29 17:05:11
|
Update of /cvsroot/wxdevcenter/wxDevCenter/plugins/wxdc.fs.msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22512/plugins/wxdc.fs.msw Added Files: Tag: modularisation plugin.xml Log Message: Change module to plugin. --- NEW FILE: plugin.xml --- <?xml version="1.0" encoding="UTF-8"?> <plugin id="wxdc.fs.msw" version="0.3.0" label="wxDC.FS.MSW" provider-name="Arcallians"> <description>wxDevCenter base plugin for MS Windows FileSystem</description> <copyright>Notes</copyright> <license>Licence</license> <requires> <dynlib name="wxdc_fs_msw-0.3.0" /> </requires> </plugin> |
|
From: Emilien K. <cur...@us...> - 2005-09-29 17:05:11
|
Update of /cvsroot/wxdevcenter/wxDevCenter/plugins/wxdc.ui.frames In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22512/plugins/wxdc.ui.frames Added Files: Tag: modularisation plugin.xml Log Message: Change module to plugin. --- NEW FILE: plugin.xml --- <?xml version="1.0" encoding="UTF-8"?> <plugin id="wxdc.ui.frames" version="0.3.0" label="wxDC.UI.Frames" provider-name="Arcallians"> <description>wxDevCenter base plugin for TopFrame implementation.</description> <copyright>Notes</copyright> <license>Licence</license> <requires> <dynlib name="wxdc_ui_frames-0.3.0" /> </requires> </plugin> |
|
From: Emilien K. <cur...@us...> - 2005-09-29 17:05:10
|
Update of /cvsroot/wxdevcenter/wxDevCenter/features/wxdc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22512/features/wxdc Added Files: Tag: modularisation feature.xml Log Message: Change module to plugin. --- NEW FILE: feature.xml --- <?xml version="1.0" encoding="UTF-8"?> <feature id="wxdc" version="0.3.0" label="wxDC" provider-name="Arcallians"> <description>wxDevCenter base features.</description> <copyright>Notes</copyright> <license>Licence</license> <requires> <plugin name="wxdc.fs.msw" /> <plugin name="wxdc.fs.unix" /> <plugin name="wxdc.ui.frames" /> </requires> </feature> |
|
From: Emilien K. <cur...@us...> - 2005-09-29 17:05:09
|
Update of /cvsroot/wxdevcenter/wxDevCenter/plugins/wxdc.fs.unix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22512/plugins/wxdc.fs.unix Added Files: Tag: modularisation plugin.xml Log Message: Change module to plugin. --- NEW FILE: plugin.xml --- <?xml version="1.0" encoding="UTF-8"?> <plugin id="wxdc.fs.unix" version="0.3.0" label="wxDC.FS.Unix" provider-name="Arcallians"> <description>wxDevCenter base plugin for unix FileSystem</description> <copyright>Notes</copyright> <license>Licence</license> <requires> <dynlib name="wxdc_fs_unix-0.3.0" /> </requires> </plugin> |
|
From: Emilien K. <cur...@us...> - 2005-09-29 17:05:09
|
Update of /cvsroot/wxdevcenter/wxDevCenter/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22512/data Removed Files: Tag: modularisation wxdevcenterd.desktop Log Message: Change module to plugin. --- wxdevcenterd.desktop DELETED --- |
|
From: Emilien K. <cur...@us...> - 2005-09-29 17:05:06
|
Update of /cvsroot/wxdevcenter/wxDevCenter/plugins In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22462/plugins Log Message: Directory /cvsroot/wxdevcenter/wxDevCenter/plugins added to the repository --> Using per-directory sticky tag `modularisation' |
|
From: Emilien K. <cur...@us...> - 2005-09-29 17:05:05
|
Update of /cvsroot/wxdevcenter/wxDevCenter/plugins/wxdc.fs.msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22462/plugins/wxdc.fs.msw Log Message: Directory /cvsroot/wxdevcenter/wxDevCenter/plugins/wxdc.fs.msw added to the repository |
