|
From: Emilien K. <cur...@us...> - 2005-09-15 10:15:13
|
Update of /cvsroot/wxdevcenter/wxDevCenter/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22034/src Modified Files: Frame.cpp WorkBar.cpp Application.cpp FileSystem.cpp Log Message: Modularize WorkBarManager. Use WorkBarManager::GetManager to retreive the unique manager object. Index: Application.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/Application.cpp,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** Application.cpp 15 Sep 2005 09:54:25 -0000 1.35 --- Application.cpp 15 Sep 2005 10:15:05 -0000 1.36 *************** *** 36,39 **** --- 36,40 ---- #include <wxDevCenter/ArtProvider.h> #include <wxDevCenter/Command.h> + #include <wxDevCenter/WorkBar.h> #include <wx/dynlib.h> *************** *** 82,86 **** m_DocManager.Initialize(); m_ProjectManager.Initialize(); ! m_WorkBarManager.Initialize(); // Charge les plugins : phase de tests --- 83,87 ---- m_DocManager.Initialize(); m_ProjectManager.Initialize(); ! WorkBarManager::GetManager().Initialize(); // Charge les plugins : phase de tests *************** *** 113,117 **** // Enregistre la fenêtre principale dans le WorkBarManager ! Application::GetApp().GetWorkBarManager().RegisterFrame(m_pMainFrame); // Lance l'application. --- 114,118 ---- // Enregistre la fenêtre principale dans le WorkBarManager ! WorkBarManager::GetManager().RegisterFrame(m_pMainFrame); // Lance l'application. Index: Frame.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/Frame.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Frame.cpp 14 Sep 2005 15:37:06 -0000 1.11 --- Frame.cpp 15 Sep 2005 10:15:05 -0000 1.12 *************** *** 25,28 **** --- 25,29 ---- #include <wxDevCenter/Frame.h> #include <wxDevCenter/DocView.h> + #include <wxDevCenter/WorkBar.h> #include <wx/recguard.h> *************** *** 103,107 **** bool TopFrame::Destroy() { ! Application::GetApp().GetWorkBarManager().UnregisterFrame(this); return wxFrame::Destroy(); } --- 104,108 ---- bool TopFrame::Destroy() { ! WorkBarManager::GetManager().UnregisterFrame(this); return wxFrame::Destroy(); } Index: WorkBar.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/WorkBar.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** WorkBar.cpp 8 Aug 2005 19:16:42 -0000 1.8 --- WorkBar.cpp 15 Sep 2005 10:15:05 -0000 1.9 *************** *** 77,81 **** if(!WorkBarTemplate::Initialize()) return false; ! Application::GetApp().GetWorkBarManager().RegisterWorkBar(this); return true; } --- 77,81 ---- if(!WorkBarTemplate::Initialize()) return false; ! WorkBarManager::GetManager().RegisterWorkBar(this); return true; } *************** *** 100,103 **** --- 100,105 ---- */ + WorkBarManager WorkBarManager::s_WorkBarManager; + // Constructeur. WorkBarManager::WorkBarManager(): Index: FileSystem.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/FileSystem.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** FileSystem.cpp 15 Sep 2005 09:54:25 -0000 1.9 --- FileSystem.cpp 15 Sep 2005 10:15:05 -0000 1.10 *************** *** 25,28 **** --- 25,29 ---- #include <wxDevCenter/FileSystem.h> #include <wxDevCenter/FileSystemCtrl.h> + #include <wxDevCenter/WorkBar.h> #include <wx/tokenzr.h> *************** *** 203,207 **** return false; if(bMountWorkBar) ! Application::GetApp().GetWorkBarManager().RegisterWorkBar(CLASSINFO(FileSystemTreeWorkBar), pFileSystem->GetFileSystemName(), pFileSystem->GetProtocoleName(), pFileSystem); return true; } --- 204,208 ---- return false; if(bMountWorkBar) ! WorkBarManager::GetManager().RegisterWorkBar(CLASSINFO(FileSystemTreeWorkBar), pFileSystem->GetFileSystemName(), pFileSystem->GetProtocoleName(), pFileSystem); return true; } *************** *** 210,214 **** bool FileSystemManager::Unregister(FileSystem* pFileSystem) { ! Application::GetApp().GetWorkBarManager().UnregisterWorkBar(CLASSINFO(FileSystemTreeWorkBar), pFileSystem); return ObjectManager<FileSystem>::Unregister(pFileSystem); } --- 211,215 ---- bool FileSystemManager::Unregister(FileSystem* pFileSystem) { ! WorkBarManager::GetManager().UnregisterWorkBar(CLASSINFO(FileSystemTreeWorkBar), pFileSystem); return ObjectManager<FileSystem>::Unregister(pFileSystem); } |