[paragui-cvs] CVS: paragui/include pgsignals.h,1.7.2.2,1.7.2.3

[Teunis Peters <address@hidden>]

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

Modified Files:
      Tag: devel-opengl
        pgsignals.h 
Log Message:
first operational opengl version - tag "gotta start somewhere"
also removed -most- of debug code - or at least commented it out.


Index: pgsignals.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgsignals.h,v
retrieving revision 1.7.2.2
retrieving revision 1.7.2.3
diff -C2 -r1.7.2.2 -r1.7.2.3
*** pgsignals.h 26 Jun 2002 03:25:03 -0000      1.7.2.2
--- pgsignals.h 12 Sep 2002 06:38:49 -0000      1.7.2.3
***************
*** 32,35 ****
--- 32,37 ----
  #include "SDL.h"
  #include <sigc++/sigc++.h>
+ #include <sigcx/convert.h>
+ /* #include "tools/sigc-convert.hh" */
  
  class PG_Widget;
***************
*** 50,53 ****
--- 52,56 ----
  
  using namespace SigC;
+ using namespace SigCX;
  
  typedef void PG_Pointer;
***************
*** 70,76 ****
--- 73,94 ----
        }*/
  
+ #if 1 /* old */
        static bool sig_convert0(Slot0<bool>& s, P1 p1) {
                return s();
        }
+ #else
+       template <class P21,class P22,class Marsh=Marshal<P21> >
+       class c0 : public Signal1<P21,P22,Marsh>
+         {
+           Slot0<P21>* s;
+         public:
+           c0(const Slot0<P21>& s0) /*: s(s0)*/ { s = (Slot0<P21>*)(&s0);};
+ 
+           P21 convert(P1 p1) const {
+             // return dynamic_cast<Slot0<bool>&>(s)();
+             return (*s)();
+           }
+         };
+ #endif
  
  public:
***************
*** 89,93 ****
--- 107,116 ----
  
        Connection connect(const Slot0<bool>& s) {
+ #if 1 /* old */
                return Signal1<bool, P1>::connect(convert(s, sig_convert0));
+ #else
+               c0<bool,P1> nn(s);
+               return Signal1<bool, P1>::connect(nn.slot(&nn), 
&c0<bool,P1>::convert);
+ #endif
        }