[paragui-cvs] CVS: paragui/include pgfactory.h,1.7,1.8 pglabel.h,1.5,1.6 pgxmllayoutloader.h,1.3,1.4 pgxmltag.h,1.1,1.2

[Alexander Pipelka <address@hidden>]

Update of /cvsroot/paragui/paragui/include
In directory subversions:/tmp/cvs-serv11008/include

Modified Files:
        pgfactory.h pglabel.h pgxmllayoutloader.h pgxmltag.h 
Log Message:
more work on the new XML layout loader



Index: pgfactory.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgfactory.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** pgfactory.h 26 Jun 2002 13:21:42 -0000      1.7
--- pgfactory.h 28 Jun 2002 09:29:56 -0000      1.8
***************
*** 9,15 ****
  class PG_Widget;
  
! template<class T> class PG_FactoryObject {
  public:
!       static T* CreateObject(PG_Widget* parent) {
                return new T(parent);
        }
--- 9,15 ----
  class PG_Widget;
  
! template< class T, class PT = PG_Widget > class PG_FactoryObject {
  public:
!       static T* CreateObject(PT* parent) {
                return new T(parent);
        }
***************
*** 22,27 ****
        typedef PG_Widget* (*CREATEFN)(PG_Widget* parent);
        
!       template<class T> static void RegisterClass(const H& classname) {
!               GetInstance().RegisterCreateFn(classname, 
(CREATEFN)&PG_FactoryObject<T>::CreateObject);
        }
                
--- 22,27 ----
        typedef PG_Widget* (*CREATEFN)(PG_Widget* parent);
        
!       template< class T, class PT > static void RegisterClass(const H& 
classname) {
!               GetInstance().RegisterCreateFn(classname, 
(CREATEFN)&PG_FactoryObject<T, PT>::CreateObject);
        }
                

Index: pglabel.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pglabel.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** pglabel.h   26 Jun 2002 11:45:07 -0000      1.5
--- pglabel.h   28 Jun 2002 09:29:56 -0000      1.6
***************
*** 77,80 ****
--- 77,82 ----
        void SetIndent(int indent);
  
+       void ParseXMLAttributes(PG_XMLTag& xmltag);
+       
  protected:
  

Index: pgxmllayoutloader.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgxmllayoutloader.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** pgxmllayoutloader.h 27 Jun 2002 16:37:06 -0000      1.3
--- pgxmllayoutloader.h 28 Jun 2002 09:29:56 -0000      1.4
***************
*** 6,10 ****
  #include "pgxmltag.h"
  
! class PG_XMLLayoutLoaderBase {
  public:
        bool Load(PG_Widget* parent, const char* filename);
--- 6,10 ----
  #include "pgxmltag.h"
  
! class PG_XMLLayoutLoader {
  public:
        bool Load(PG_Widget* parent, const char* filename);
***************
*** 18,47 ****
        
        static void XMLEndDoc(void *userData, const char *name);
- };
- 
- 
- template<class H>
- class PG_XMLLayoutLoaderHolder : public PG_XMLLayoutLoaderBase {
- private:
-       H executor;
-       
- public:
-       
-       PG_XMLLayoutLoaderHolder() {
-               sigStartTag.connect(slot(executor, &H::handleStartTag));
-               sigEndTag.connect(slot(executor, &H::handleEndTag));
-       }
- };
- 
- 
- class PG_XMLBasicExecutor : public SigC::Object {
- public:
-       
-       bool handleStartTag(PG_XMLTag& tag);
-       
-       bool handleEndTag(PG_XMLTag& tag);
- };
- 
- class PG_XMLLayoutLoader : public 
PG_XMLLayoutLoaderHolder<PG_XMLBasicExecutor> {
  };
  
--- 18,21 ----

Index: pgxmltag.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgxmltag.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** pgxmltag.h  28 Jun 2002 08:40:02 -0000      1.1
--- pgxmltag.h  28 Jun 2002 09:29:56 -0000      1.2
***************
*** 13,17 ****
        LAYOUT,
        HEAD,
!       BODY
  } PG_XML_SECTION;
  
--- 13,18 ----
        LAYOUT,
        HEAD,
!       BODY,
!       WIDGET
  } PG_XML_SECTION;