[paragui-cvs] CVS: paragui/include pgapplication.h,1.11.2.4,1.11.2.5 pgfactory.h,1.7.2.2,1.7.2.3

[Alexander Pipelka <address@hidden>]

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

Modified Files:
      Tag: devel-opengl
        pgapplication.h pgfactory.h 
Log Message:
- some PG_ListBox fixes



Index: pgapplication.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgapplication.h,v
retrieving revision 1.11.2.4
retrieving revision 1.11.2.5
diff -C2 -r1.11.2.4 -r1.11.2.5
*** pgapplication.h     30 Oct 2002 09:16:28 -0000      1.11.2.4
--- pgapplication.h     4 Nov 2002 23:04:34 -0000       1.11.2.5
***************
*** 370,378 ****
        @return   pointer to the requested widget or null if failed
        */
!       static PG_Widget *GetWidgetByName(const char *Name);
  
        template<class T>
!       static T* GetWidgetByName(const char* Name) {
!               return static_cast<T*>(GetWidgetByName(Name));
        }
        
--- 370,378 ----
        @return   pointer to the requested widget or null if failed
        */
!       static PG_Widget *GetWidget(const char *Name);
  
        template<class T>
!       static T* GetWidget(const char* Name) {
!               return static_cast<T*>(GetWidget(Name));
        }
        
***************
*** 384,388 ****
         @return pointer to the requested widget or 0 if failed
        */
!       static PG_Widget *GetWidgetById(int id);
      
        /**
--- 384,388 ----
         @return pointer to the requested widget or 0 if failed
        */
!       static PG_Widget *GetWidget(int id);
      
        /**

Index: pgfactory.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgfactory.h,v
retrieving revision 1.7.2.2
retrieving revision 1.7.2.3
diff -C2 -r1.7.2.2 -r1.7.2.3
*** pgfactory.h 31 Aug 2002 04:01:22 -0000      1.7.2.2
--- pgfactory.h 4 Nov 2002 23:04:34 -0000       1.7.2.3
***************
*** 18,25 ****
  template<class H>
  class PG_FactoryHolder : public PG_Singleton< PG_FactoryHolder<H> > {
! public:
        
        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);
--- 18,27 ----
  template<class H>
  class PG_FactoryHolder : public PG_Singleton< PG_FactoryHolder<H> > {
! protected:
        
        typedef PG_Widget* (*CREATEFN)(PG_Widget* parent);
        
+ public:
+       
        template< class T, class PT > static void RegisterClass(const H& 
classname) {
                GetInstance().RegisterCreateFn(classname, 
(CREATEFN)&PG_FactoryObject<T, PT>::CreateObject);
***************
*** 34,37 ****
--- 36,43 ----
                
                return create(parent);
+       }
+       
+       template< class R > static R* CreateObject(const H& classname, 
PG_Widget* parent = NULL) {
+               return static_cast<R*>(CreateObject(classname, parent));
        }