[Wxdevcenter-cvs] wxDevCenter/include/wxDevCenter FileSystemStandard.h,1.14.2.2,1.14.2.3 Frame.h,1.13.2.2,1.13.2.3 MainFrame.h,1.12.2.2,1.12.2.3 Module.h,1.1.2.3,1.1.2.4

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

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

Modified Files:
      Tag: modularisation
	FileSystemStandard.h Frame.h MainFrame.h Module.h 
Log Message:
Return to a monobloc structure.

Index: Module.h
===================================================================
RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/Attic/Module.h,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** Module.h	24 Sep 2005 11:44:20 -0000	1.1.2.3
--- Module.h	24 Sep 2005 12:45:44 -0000	1.1.2.4
***************
*** 35,47 ****
  {
  	DECLARE_DYNAMIC_CLASS(Module)
- protected:
- 	wxClassInfo* m_pClassInfo;
- 	
- 	static Module* s_pFirst;
- 	Module* m_pNext;
  public:
  	Module();
! 
! 	virtual void Initialize(){}
  
  	static void LoadModules();
--- 35,41 ----
  {
  	DECLARE_DYNAMIC_CLASS(Module)
  public:
  	Module();
! 	Module(wxClassInfo* pCI, wxClassInfo** ppBaseCI);
  
  	static void LoadModules();
***************
*** 51,67 ****
  /** Macro to declare a module base class.*/
  #define WXDC_DECLARE_MODULE_BASE_CLASS(CLASS)\
! 	DECLARE_ABSTRACT_CLASS(CLASS)
  
  /** Macro to implement module class.*/
  #define WXDC_IMPLEMENT_MODULE_BASE_CLASS(CLASS, BASECLASS) \
! IMPLEMENT_ABSTRACT_CLASS(CLASS, BASECLASS)
  
  /** Macro to declare module class.*/
  #define WXDC_DECLARE_MODULE_CLASS(CLASS) \
! 	DECLARE_DYNAMIC_CLASS(CLASS)
  
  /** Macro to implement module class.*/
  #define WXDC_IMPLEMENT_MODULE_CLASS(CLASS, BASECLASS, INTERFACECLASS) \
! 	IMPLEMENT_DYNAMIC_CLASS(CLASS, BASECLASS)
  
  }
--- 45,72 ----
  /** Macro to declare a module base class.*/
  #define WXDC_DECLARE_MODULE_BASE_CLASS(CLASS)\
! 	DECLARE_ABSTRACT_CLASS(CLASS)\
! 	static wxClassInfo* s_pClassInfo;\
! 	static CLASS* CreateModuleObject()\
! 	{\
! 		if(s_pClassInfo==NULL)return NULL;\
! 		return (CLASS*)s_pClassInfo->CreateObject();\
! 	}
! 		
  
  /** Macro to implement module class.*/
  #define WXDC_IMPLEMENT_MODULE_BASE_CLASS(CLASS, BASECLASS) \
! 	IMPLEMENT_ABSTRACT_CLASS(CLASS, BASECLASS)\
! 	wxClassInfo* CLASS::s_pClassInfo=NULL;
  
  /** Macro to declare module class.*/
  #define WXDC_DECLARE_MODULE_CLASS(CLASS) \
! 	DECLARE_DYNAMIC_CLASS(CLASS)\
! 	static Module s_##CLASS##Module;
  
  /** Macro to implement module class.*/
  #define WXDC_IMPLEMENT_MODULE_CLASS(CLASS, BASECLASS, INTERFACECLASS) \
! 	IMPLEMENT_DYNAMIC_CLASS(CLASS, BASECLASS)\
! 	Module CLASS::s_##CLASS##Module(CLASSINFO(CLASS), &(INTERFACECLASS::s_pClassInfo));
! 	
  
  }

Index: MainFrame.h
===================================================================
RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/MainFrame.h,v
retrieving revision 1.12.2.2
retrieving revision 1.12.2.3
diff -C2 -d -r1.12.2.2 -r1.12.2.3
*** MainFrame.h	24 Sep 2005 11:44:20 -0000	1.12.2.2
--- MainFrame.h	24 Sep 2005 12:45:44 -0000	1.12.2.3
***************
*** 53,57 ****
  	DECLARE_EVENT_TABLE()
  	/** Déclare la classe comme implémentation d'interface de module.*/
! 	DECLARE_DYNAMIC_CLASS(MainFrame)
  protected:
      /** LayoutManager.*/
--- 53,57 ----
  	DECLARE_EVENT_TABLE()
  	/** Déclare la classe comme implémentation d'interface de module.*/
! 	WXDC_DECLARE_MODULE_CLASS(MainFrame)
  protected:
      /** LayoutManager.*/

Index: FileSystemStandard.h
===================================================================
RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/FileSystemStandard.h,v
retrieving revision 1.14.2.2
retrieving revision 1.14.2.3
diff -C2 -d -r1.14.2.2 -r1.14.2.3
*** FileSystemStandard.h	24 Sep 2005 11:44:20 -0000	1.14.2.2
--- FileSystemStandard.h	24 Sep 2005 12:45:44 -0000	1.14.2.3
***************
*** 61,65 ****
  	WXDC_DECLARE_MODULE_BASE_CLASS(FileSystemStandard)
  public:
! 
      virtual wxString GetFileSystemName()const{return WXDC_SYSTEM_STDFS_NAME;}
      virtual wxString GetIconName()const{return wxT("desktop");}
--- 61,67 ----
  	WXDC_DECLARE_MODULE_BASE_CLASS(FileSystemStandard)
  public:
! 	static FileSystemStandard* CreateFileSystemStandard(){return CreateModuleObject();}
! 	FileSystemStandard():FileSystem(){}
! 	
      virtual wxString GetFileSystemName()const{return WXDC_SYSTEM_STDFS_NAME;}
      virtual wxString GetIconName()const{return wxT("desktop");}

Index: Frame.h
===================================================================
RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/Frame.h,v
retrieving revision 1.13.2.2
retrieving revision 1.13.2.3
diff -C2 -d -r1.13.2.2 -r1.13.2.3
*** Frame.h	24 Sep 2005 11:44:20 -0000	1.13.2.2
--- Frame.h	24 Sep 2005 12:45:44 -0000	1.13.2.3
***************
*** 139,143 ****
  {
      DECLARE_EVENT_TABLE()
! 	DECLARE_DYNAMIC_CLASS(TopFrame)
  protected:
      /** Fenetre cadre fille contenant les vues.*/
--- 139,143 ----
  {
      DECLARE_EVENT_TABLE()
! 	WXDC_DECLARE_MODULE_BASE_CLASS(TopFrame)
  protected:
      /** Fenetre cadre fille contenant les vues.*/
***************
*** 148,157 ****
  
  public:
- 	static wxClassInfo* s_pClassInfo;
  	static TopFrame* CreateTopFrame()
  	{
! 		if(s_pClassInfo==NULL)
! 			return NULL;
! 		return (TopFrame*) s_pClassInfo->CreateObject();
  	}
  
--- 148,154 ----
  
  public:
  	static TopFrame* CreateTopFrame()
  	{
! 		return CreateModuleObject();
  	}