[Wxdevcenter-cvs] wxDevCenter/include/wxDevCenter DocView.h,1.16,1.17 Element.h,1.2,1.3 Manager.h,1.5,1.6 Plugin.h,1.3,1.4

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

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

Modified Files:
	DocView.h Element.h Manager.h Plugin.h 
Log Message:
Fix number of bugs and warnings for gcc compilation.

Index: Manager.h
===================================================================
RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/Manager.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Manager.h	2 Aug 2005 12:50:54 -0000	1.5
--- Manager.h	3 Aug 2005 19:21:22 -0000	1.6
***************
*** 198,202 ****
          if(pos!=-1)
          {
!             Remove(pos);
              return true;
          }
--- 198,202 ----
          if(pos!=-1)
          {
!             Vector<ItemType*>::Remove(pos);
              return true;
          }
***************
*** 205,209 ****
      /** Désenregistrement d'un objet.
       * @param Index Index de l'objet à supprimer.*/
!     void Unregister(unsigned int Index){Remove(Index);}
      /** @} */
  };
--- 205,209 ----
      /** Désenregistrement d'un objet.
       * @param Index Index de l'objet à supprimer.*/
!     void Unregister(unsigned int Index){Vector<ItemType*>::Remove(Index);}
      /** @} */
  };
***************
*** 424,428 ****
      {
          for(unsigned int n=0; n<m_ObjectManager.GetCount(); n++)
!             if(m_ObjectManager.Item(n).GetClassInfo()==&(GetTemplate(nIndex).GetClassInfo()))
                  return true;
          return false;
--- 424,428 ----
      {
          for(unsigned int n=0; n<m_ObjectManager.GetCount(); n++)
!             if(m_ObjectManager.Item(n).GetClassInfo()==&(TemplateManager<ObjectType, Template>::GetTemplate(nIndex).GetClassInfo()))
                  return true;
          return false;
***************
*** 433,437 ****
      {
          for(unsigned int n=0; n<m_ObjectManager.GetCount(); n++)
!             if(m_ObjectManager.Item(n).GetClassInfo()==&(GetTemplate(nIndex).GetClassInfo()))
                  return &(m_ObjectManager.Item(n));
          return false;
--- 433,437 ----
      {
          for(unsigned int n=0; n<m_ObjectManager.GetCount(); n++)
!             if(m_ObjectManager.Item(n).GetClassInfo()==&(TemplateManager<ObjectType, Template>::GetTemplate(nIndex).GetClassInfo()))
                  return &(m_ObjectManager.Item(n));
          return false;
***************
*** 442,446 ****
      {
          for(unsigned int n=0; n<m_ObjectManager.GetCount(); n++)
!             if(m_ObjectManager.Item(n).GetClassInfo()==&(GetTemplate(nIndex).GetClassInfo()))
                  return &(m_ObjectManager.Item(n));
          return false;
--- 442,446 ----
      {
          for(unsigned int n=0; n<m_ObjectManager.GetCount(); n++)
!             if(m_ObjectManager.Item(n).GetClassInfo()==&(TemplateManager<ObjectType, Template>::GetTemplate(nIndex).GetClassInfo()))
                  return &(m_ObjectManager.Item(n));
          return false;
***************
*** 457,462 ****
          if(pObj==NULL)
          {
!             pObj = TemplateManager<ObjectType, Template>::CreateObjectFromTemplate(Index);
!             m_ObjectManager.Register(pObject);
          }
          return pObj;
--- 457,462 ----
          if(pObj==NULL)
          {
!             pObj = TemplateManager<ObjectType, Template>::CreateObjectFromTemplate(nIndex);
!             m_ObjectManager.Register(pObj);
          }
          return pObj;

Index: Element.h
===================================================================
RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/Element.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Element.h	2 Aug 2005 12:50:54 -0000	1.2
--- Element.h	3 Aug 2005 19:21:22 -0000	1.3
***************
*** 88,96 ****
  {
  
! class WXDC_DLL_BASE Element;
! class WXDC_DLL_BASE BaseElementManager;
  namespace plugins
  {
! class WXDC_DLL_BASE ModuleRefData;
  }
  
--- 88,96 ----
  {
  
! class Element;
! class BaseElementManager;
  namespace plugins
  {
! class ModuleRefData;
  }
  

Index: DocView.h
===================================================================
RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/DocView.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** DocView.h	2 Aug 2005 12:50:54 -0000	1.16
--- DocView.h	3 Aug 2005 19:21:22 -0000	1.17
***************
*** 106,110 ****
   * Classe interface de vue pour la représentation visuelle des données des documents.
   */
! class WXDC_DLL_BASE View : public wxPanel, virtual public Element
  {
      friend class Application;
--- 106,110 ----
   * Classe interface de vue pour la représentation visuelle des données des documents.
   */
! class WXDC_DLL_BASE View : virtual public Element, public wxPanel
  {
      friend class Application;
***************
*** 487,493 ****
      /** Constructeur.*/
      ViewTemplate(wxClassInfo* pInfo, wxString strName, wxString strDescript, wxString strIcon):
!         ObjectTemplate<View>(pInfo, strName, strDescript), strIcons(strIcon),
!         ObjectManager<View>(){}
! 
  };
  
--- 487,493 ----
      /** Constructeur.*/
      ViewTemplate(wxClassInfo* pInfo, wxString strName, wxString strDescript, wxString strIcon):
!         ObjectTemplate<View>(pInfo, strName, strDescript),
!         ObjectManager<View>(),
!         strIcons(strIcon){}
  };
  

Index: Plugin.h
===================================================================
RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/Plugin.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Plugin.h	14 May 2005 12:15:55 -0000	1.3
--- Plugin.h	3 Aug 2005 19:21:22 -0000	1.4
***************
*** 51,63 ****
  
  // Prédéclaration des classes :
! struct WXDC_DLL_BASE Version;
! class WXDC_DLL_BASE ModuleRefData;
! class WXDC_DLL_BASE Module;
! class WXDC_DLL_BASE Plugin;
! class WXDC_DLL_BASE Feature;
! class WXDC_DLL_BASE PluginLoader;
  
! class WXDC_DLL_BASE FeatureDescriptionFile;
! class WXDC_DLL_BASE PluginDescriptionFile;
  
  typedef ObjectManager<PluginItem> PluginItemManager;
--- 51,63 ----
  
  // Prédéclaration des classes :
! struct Version;
! class ModuleRefData;
! class Module;
! class Plugin;
! class Feature;
! class PluginLoader;
  
! class FeatureDescriptionFile;
! class PluginDescriptionFile;
  
  typedef ObjectManager<PluginItem> PluginItemManager;
***************
*** 122,131 ****
      wxString operator()(wxString)
      {
!         return wxString::Format("%hu.%hd.%d.%d", major, minor, patch, release);
      }
  
      wxString ToString()const
      {
!         return wxString::Format("%hu.%hd.%d.%d", major, minor, patch, release);
      }
  };
--- 122,131 ----
      wxString operator()(wxString)
      {
!         return wxString::Format(wxT("%hu.%hd.%ld.%ld"), major, minor, patch, release);
      }
  
      wxString ToString()const
      {
!         return wxString::Format(wxT("%hu.%hd.%ld.%ld"), major, minor, patch, release);
      }
  };
***************
*** 203,207 ****
      Module();
      /** Constructeur.*/
!     Module(const Module& module){Ref(module);}
  
      /** Débugage : Dump du contenu. */
--- 203,207 ----
      Module();
      /** Constructeur.*/
!     Module(const Module& module):wxObject(){Ref(module);}
  
      /** Débugage : Dump du contenu. */