[paragui-cvs] CVS: paragui/test paratest.cpp,1.7,1.8

[Alexander Pipelka <address@hidden>]

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

Modified Files:
        paratest.cpp 
Log Message:
switched to libsigc++ 1.1



Index: paratest.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/test/paratest.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** paratest.cpp        2 May 2002 09:50:40 -0000       1.7
--- paratest.cpp        6 May 2002 10:40:50 -0000       1.8
***************
*** 117,124 ****
                
        PG_Button* add = new PG_Button(this, 100, PG_Rect(260,130,110,30), "<< 
ADD");
!       add->sigButtonClick.connect(slot(this, &TestWindow::handleButton));
        
        PG_Button* remove = new PG_Button(this, 101, PG_Rect(260,165,110,30), 
">> REMOVE");
!       remove->sigButtonClick.connect(slot(this, &TestWindow::handleButton));
        
        PG_Button* b = new PG_Button(NULL, BTN_ID_YES, PG_Rect(0,0, 400,50), 
"YES");
--- 117,124 ----
                
        PG_Button* add = new PG_Button(this, 100, PG_Rect(260,130,110,30), "<< 
ADD");
!       add->sigButtonClick.connect(slot(*this, &TestWindow::handleButton));
        
        PG_Button* remove = new PG_Button(this, 101, PG_Rect(260,165,110,30), 
">> REMOVE");
!       remove->sigButtonClick.connect(slot(*this, &TestWindow::handleButton));
        
        PG_Button* b = new PG_Button(NULL, BTN_ID_YES, PG_Rect(0,0, 400,50), 
"YES");
***************
*** 132,136 ****
        s->SetPosition(50);
  
!       s->sigSlide.connect(slot(this, &TestWindow::handle_slide_btntrans), &b);
  
        WidgetList->AddWidget(s);
--- 132,136 ----
        s->SetPosition(50);
  
!       s->sigSlide.connect(slot(*this, &TestWindow::handle_slide_btntrans), 
&b);
  
        WidgetList->AddWidget(s);
***************
*** 149,159 ****
        PG_ScrollBar* scroll = new PG_ScrollBar(this, 1, 
PG_Rect(415,90,20,150));
        scroll->SetRange(0, 100);
!       scroll->sigScrollTrack.connect(slot(this, 
&TestWindow::handleScrollTrack));
!       scroll->sigScrollPos.connect(slot(this, &TestWindow::handleScrollPos));
  
        PG_ScrollBar* scroll1 = new PG_ScrollBar(this, 2, 
PG_Rect(435,90,20,150));
        scroll1->SetRange(0, 255);
!       scroll1->sigScrollTrack.connect(slot(this, 
&TestWindow::handleScrollTrack));
!       scroll1->sigScrollPos.connect(slot(this, &TestWindow::handleScrollPos));
  
        PG_DropDown* drop = new PG_DropDown(this, 15, PG_Rect(260, 60, 200,25));
--- 149,159 ----
        PG_ScrollBar* scroll = new PG_ScrollBar(this, 1, 
PG_Rect(415,90,20,150));
        scroll->SetRange(0, 100);
!       scroll->sigScrollTrack.connect(slot(*this, 
&TestWindow::handleScrollTrack));
!       scroll->sigScrollPos.connect(slot(*this, &TestWindow::handleScrollPos));
  
        PG_ScrollBar* scroll1 = new PG_ScrollBar(this, 2, 
PG_Rect(435,90,20,150));
        scroll1->SetRange(0, 255);
!       scroll1->sigScrollTrack.connect(slot(*this, 
&TestWindow::handleScrollTrack));
!       scroll1->sigScrollPos.connect(slot(*this, 
&TestWindow::handleScrollPos));
  
        PG_DropDown* drop = new PG_DropDown(this, 15, PG_Rect(260, 60, 200,25));
***************
*** 433,437 ****
  
        // connect the "MSG_SLIDE" event with "handler_slider" of slider_label 
(see macro above, just for testing)
!       slider.sigSlide.connect(slot(&slider_label, 
&MySliderLabel::handle_slide));
        
        slider.Show();
--- 433,437 ----
  
        // connect the "MSG_SLIDE" event with "handler_slider" of slider_label 
(see macro above, just for testing)
!       slider.sigSlide.connect(slot(slider_label, 
&MySliderLabel::handle_slide));
        
        slider.Show();
***************
*** 464,468 ****
  
        PG_Button show_wnd(NULL, BTN_ID_APPLY, PG_Rect(500,450,100,30), 
"Window");
!       show_wnd.sigButtonClick.connect(slot(&wnd, 
&TestWindow::handle_show_window));
      
        show_wnd.Show();
--- 464,468 ----
  
        PG_Button show_wnd(NULL, BTN_ID_APPLY, PG_Rect(500,450,100,30), 
"Window");
!       show_wnd.sigButtonClick.connect(slot(wnd, 
&TestWindow::handle_show_window));
      
        show_wnd.Show();