[paragui-cvs] CVS: paragui/include pgsignals.h,1.5,1.6 pgwidget.h,1.12,1.13

[Alexander Pipelka <address@hidden>]

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

Modified Files:
        pgsignals.h pgwidget.h 
Log Message:
switched to libsigc++ 1.1



Index: pgsignals.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgsignals.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** pgsignals.h 6 May 2002 06:24:29 -0000       1.5
--- pgsignals.h 6 May 2002 10:40:49 -0000       1.6
***************
*** 31,39 ****
  
  #include "SDL.h"
! #include <sigc++/signal_system.h>
! #include <sigc++/convert.h>
! #include <sigc++/bind.h>
! #include <iostream>
! #include <map>
  
  class PG_Widget;
--- 31,35 ----
  
  #include "SDL.h"
! #include <sigc++/sigc++.h>
  
  class PG_Widget;
***************
*** 57,61 ****
  typedef void PG_Pointer;
  
- 
  class PG_Signal0 : public Signal0<bool> {
  public:
--- 53,56 ----
***************
*** 71,80 ****
  {
  
!       static bool sig_convert_widget(Callback1<bool, PG_Widget*> *s, P1 p1) {
                return s->call(p1);
!       }
  
!       static bool sig_convert0(Callback0<bool> *s, P1 p1) {
!               return s->call();
        }
  
--- 66,75 ----
  {
  
! /*    static bool sig_convert_widget(Callback1<bool, PG_Widget*> *s, P1 p1) {
                return s->call(p1);
!       }*/
  
!       static bool sig_convert0(Slot0<bool>& s, P1 p1) {
!               return s();
        }
  
***************
*** 97,172 ****
        }
  
! };
! 
  
! template<class P1, class P2>
! class PG_Signal2 : 
! public Signal3<bool, P1, P2, PG_Pointer*>,
! public Signal2<bool, P1, P2>,
! public Signal1<bool, P2>,
  
- public Signal2<bool, P1, PG_Pointer*>,
- public Signal1<bool, P1>
- {
- public:
  
!       virtual ~PG_Signal2() {};
!       
!       virtual bool operator()(P1 p1, P2 p2, PG_Pointer* data) {
!               return
!                       Signal3<bool, P1, P2, PG_Pointer*>::emit(p1, p2, data) |
!                       Signal2<bool, P1, P2>::emit(p1, p2) |
!                       Signal1<bool, P2>::emit(p2) |
! 
!                       Signal2<bool, P1, PG_Pointer*>::emit(p1, data) |
!                       Signal1<bool, P1>::emit(p1);
!       }
! 
!       virtual bool operator()(P1 p1, P2 p2) {
!               return
!                       Signal3<bool, P1, P2, PG_Pointer*>::emit(p1, p2, data) |
!                       Signal2<bool, P1, P2>::emit(p1, p2) |
!                       Signal1<bool, P2>::emit(p2) |
  
!                       Signal2<bool, P1, PG_Pointer*>::emit(p1, data) |
!                       Signal1<bool, P1>::emit(p1);
!       }
!       
!       virtual bool operator()(P1 p1, PG_Pointer* data) {
!               return
!                       Signal2<bool, P1, PG_Pointer*>::emit(p1, data) |
!                       Signal1<bool, P1>::emit(p1);
        }
  
!       virtual bool operator()(P1 p1) {
!               return
!                       Signal2<bool, P1, PG_Pointer*>::emit(p1, data) |
!                       Signal1<bool, P1>::emit(p1);
        }
!       
!       virtual Connection connect(const Slot3<bool, P1, P2, PG_Pointer*>& s, 
PG_Pointer* _data) {
!               data = _data;
!               return Signal3<bool, P1, P2, PG_Pointer*>::connect(s);
        }
  
!       virtual Connection connect(const Slot2<bool, P1, P2>& s) {
                return Signal2<bool, P1, P2>::connect(s);
        }
  
!       virtual Connection connect(const Slot1<bool, P2>& s) {
!               return Signal1<bool, P2>::connect(s);
        }
  
!       virtual Connection connect(const Slot2<bool, P1, PG_Pointer*>& s, 
PG_Pointer* _data) {
!               data = _data;
!               return Signal2<bool, P1, PG_Pointer*>::connect(s);
!       };
! 
!       virtual Connection connect(const Slot1<bool, P1>& s) {
!               return Signal1<bool, P1>::connect(s);
        }
  
! private:
!       PG_Pointer* data;
  };
  
--- 92,133 ----
        }
  
!       Connection connect(const Slot1<bool, PG_Pointer*>& s, PG_Pointer* data) 
{
!               return connect(bind(s, data));
!       }
  
! };
  
  
! template<class P1, class P2> class PG_Signal2 : public Signal2<bool, P1, P2> {
  
!       static bool sig_convert_p2(Slot1<bool, P2>& s, P1 p1, P2 p2) {
!               return s(p2);
        }
  
!       static bool sig_convert_p1(Slot1<bool, P1>& s, P1 p1, P2 p2) {
!               return s(p1);
        }
! 
! public:
! 
!       Connection connect(const Slot3<bool, P1, P2, PG_Pointer*>& s, 
PG_Pointer* data) {
!               return Signal2<bool, P1, P2>::connect(bind(s, data));
        }
  
!       Connection connect(const Slot2<bool, P1, P2>& s) {
                return Signal2<bool, P1, P2>::connect(s);
        }
  
!       Connection connect(const Slot1<bool, P2>& s) {
!               return Signal2<bool, P1, P2>::connect(convert(s, 
sig_convert_p2));
        }
  
!       Connection connect(const Slot1<bool, P1>& s) {
!               return Signal2<bool, P1, P2>::connect(convert(s, 
sig_convert_p2));
        }
  
!       Connection connect(const Slot2<bool, P1, PG_Pointer*>& s, PG_Pointer* 
data) {
!               return Signal2<bool, P1, P2>::connect(bind(s, data));
!       };
  };
  

Index: pgwidget.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgwidget.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** pgwidget.h  6 May 2002 06:24:29 -0000       1.12
--- pgwidget.h  6 May 2002 10:40:49 -0000       1.13
***************
*** 695,699 ****
        Quit modal mode
        */
!       bool QuitModal(PG_Widget* sender = NULL);
  
        /**
--- 695,699 ----
        Quit modal mode
        */
!       bool QuitModal();
  
        /**