[Wxdevcenter-cvs] wxDevCenter/include/wxDevCenter WorkBar.h,1.8,1.9 Application.h,1.18,1.19

[Emilien K. <cur...@us...>]

Update of /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22034/include/wxDevCenter

Modified Files:
	WorkBar.h Application.h 
Log Message:
Modularize WorkBarManager.
Use WorkBarManager::GetManager to retreive the unique manager object.

Index: WorkBar.h
===================================================================
RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/WorkBar.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** WorkBar.h	2 Aug 2005 17:13:01 -0000	1.8
--- WorkBar.h	15 Sep 2005 10:15:05 -0000	1.9
***************
*** 128,132 ****
--- 128,138 ----
      /** Gestionnaire des fenêtres cadres attachants des barres.*/
      ObjectManager<TopFrame> m_FrameManager;
+ protected:
+ 	/** The unique WorkBarManager object.*/
+ 	static WorkBarManager s_WorkBarManager;
  public:
+ 	/** Accessor to the unique workbar manager.*/
+ 	static WorkBarManager& GetManager(){return s_WorkBarManager;}
+ 
      /** Constructeur.*/
      WorkBarManager();

Index: Application.h
===================================================================
RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/Application.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** Application.h	15 Sep 2005 09:54:25 -0000	1.18
--- Application.h	15 Sep 2005 10:15:05 -0000	1.19
***************
*** 29,33 ****
  #include <wxDevCenter/Project.h>
  #include <wxDevCenter/DocView.h>
- #include <wxDevCenter/WorkBar.h>
  #include <wxDevCenter/Config.h>
  
--- 29,32 ----
***************
*** 71,77 ****
  	DocManager	        m_DocManager;
  
-     /** Gestionnaire de barres de travail.*/
-     WorkBarManager      m_WorkBarManager;
- 
      /** Système de fichier standard (lecture/écritures sur les réels).*/
      FileSystem *m_pStandardFileSystem;
--- 70,73 ----
***************
*** 211,220 ****
      /** @}*/
  
-     /** @name WorkBar
-      * @{ */
-     /** Acces au gestionnaire de Barres de travail.*/
-     WorkBarManager& GetWorkBarManager(){return m_WorkBarManager;}
-     /** @} */
-     
      /** @name Print
       * @{*/
--- 207,210 ----