[paragui-cvs] CVS: paragui/src/widgets pgdropdown.cpp,1.7,1.8 pgmenubar.cpp,1.2,1.3 pgmessagebox.cpp,1.6,1.7 pgnotebook.cpp,1.6,1.7 pgradiobutton.cpp,1.6,1.7 pgscrollbar.cpp,1.5,1.6 pgslider.cpp,1.5,1.6 pgspinnerbox.cpp,1.5,1.6 pgtabbar.cpp,1.4,1.5 pgwidget.cpp,1.12,1.13 pgwidgetlist.cpp,1.10,1.11 pgwindow.cpp,1.9,1.10

[Alexander Pipelka <address@hidden>]

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

Modified Files:
        pgdropdown.cpp pgmenubar.cpp pgmessagebox.cpp pgnotebook.cpp 
        pgradiobutton.cpp pgscrollbar.cpp pgslider.cpp 
        pgspinnerbox.cpp pgtabbar.cpp pgwidget.cpp pgwidgetlist.cpp 
        pgwindow.cpp 
Log Message:
switched to libsigc++ 1.1



Index: pgdropdown.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgdropdown.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** pgdropdown.cpp      6 May 2002 06:24:29 -0000       1.7
--- pgdropdown.cpp      6 May 2002 10:40:50 -0000       1.8
***************
*** 41,49 ****
        PG_Rect rbutton(abs(r.my_width - r.my_height), 0, r.my_height, 
r.my_height);
        my_DropButton = new PG_Button(this, PG_IDDROPDOWN_BOX, rbutton, NULL, 
style);
!       my_DropButton->sigButtonClick.connect(slot(this, 
&PG_DropDown::handleButtonClick));
        
        PG_Rect rlist(r.my_xpos, r.my_ypos + r.my_height +1, r.my_width, 
r.my_height * 5);
        my_DropList = new PG_ListBox(NULL, rlist, style);
!       my_DropList->sigSelectItem.connect(slot(this, 
&PG_DropDown::handleSelectItem));
  
        //LoadThemeStyle(style);
--- 41,49 ----
        PG_Rect rbutton(abs(r.my_width - r.my_height), 0, r.my_height, 
r.my_height);
        my_DropButton = new PG_Button(this, PG_IDDROPDOWN_BOX, rbutton, NULL, 
style);
!       my_DropButton->sigButtonClick.connect(slot(*this, 
&PG_DropDown::handleButtonClick));
        
        PG_Rect rlist(r.my_xpos, r.my_ypos + r.my_height +1, r.my_width, 
r.my_height * 5);
        my_DropList = new PG_ListBox(NULL, rlist, style);
!       my_DropList->sigSelectItem.connect(slot(*this, 
&PG_DropDown::handleSelectItem));
  
        //LoadThemeStyle(style);

Index: pgmenubar.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgmenubar.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** pgmenubar.cpp       27 Apr 2002 11:57:23 -0000      1.2
--- pgmenubar.cpp       6 May 2002 10:40:50 -0000       1.3
***************
*** 46,50 ****
        last->button->SetFontSize(GetFontSize());
  
!       last->button->sigButtonClick.connect(slot(this, 
&PG_MenuBar::handleButtonClick), last);
  
        last->popupmenu = menu;
--- 46,50 ----
        last->button->SetFontSize(GetFontSize());
  
!       last->button->sigButtonClick.connect(slot(*this, 
&PG_MenuBar::handleButtonClick), last);
  
        last->popupmenu = menu;

Index: pgmessagebox.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgmessagebox.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** pgmessagebox.cpp    2 May 2002 09:50:40 -0000       1.6
--- pgmessagebox.cpp    6 May 2002 10:40:50 -0000       1.7
***************
*** 35,42 ****
  
        my_btnok = new PG_Button(this, 1, btn1, btn1text);
!       my_btnok->sigButtonClick.connect(slot(this, 
&PG_MessageBox::handleButtonClick));
        
        my_btncancel = new PG_Button(this, 2, btn2, btn2text);
!       my_btncancel->sigButtonClick.connect(slot(this, 
&PG_MessageBox::handleButtonClick));
  
        Init(windowtext, textalign, style);
--- 35,42 ----
  
        my_btnok = new PG_Button(this, 1, btn1, btn1text);
!       my_btnok->sigButtonClick.connect(slot(*this, 
&PG_MessageBox::handleButtonClick));
        
        my_btncancel = new PG_Button(this, 2, btn2, btn2text);
!       my_btncancel->sigButtonClick.connect(slot(*this, 
&PG_MessageBox::handleButtonClick));
  
        Init(windowtext, textalign, style);
***************
*** 47,51 ****
  
        my_btnok = new PG_Button(this, 1, btn1, btn1text);
!       my_btnok->sigButtonClick.connect(slot(this, 
&PG_MessageBox::handleButtonClick));
        my_btncancel = NULL;
  
--- 47,51 ----
  
        my_btnok = new PG_Button(this, 1, btn1, btn1text);
!       my_btnok->sigButtonClick.connect(slot(*this, 
&PG_MessageBox::handleButtonClick));
        my_btncancel = NULL;
  

Index: pgnotebook.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgnotebook.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** pgnotebook.cpp      28 Apr 2002 16:35:30 -0000      1.6
--- pgnotebook.cpp      6 May 2002 10:40:50 -0000       1.7
***************
*** 4,8 ****
        my_barPos = pos;
        my_tabBar = new PG_TabBar(this, PG_Rect(0,0,r.w,BarHeight), style);
!       my_tabBar->sigTabSelect.connect(slot(this, 
&PG_NoteBook::handleTabSelect));
        
        my_clientRect.SetRect(0, my_tabBar->h, r.w, r.h-my_tabBar->h);
--- 4,8 ----
        my_barPos = pos;
        my_tabBar = new PG_TabBar(this, PG_Rect(0,0,r.w,BarHeight), style);
!       my_tabBar->sigTabSelect.connect(slot(*this, 
&PG_NoteBook::handleTabSelect));
        
        my_clientRect.SetRect(0, my_tabBar->h, r.w, r.h-my_tabBar->h);
***************
*** 35,39 ****
        my_slotMap[page] = slot;
        if(my_pageMap.size() == 1) {
!               slot.call(page);
        }
  }
--- 35,39 ----
        my_slotMap[page] = slot;
        if(my_pageMap.size() == 1) {
!               slot(page);
        }
  }
***************
*** 68,72 ****
        my_activePage->Show();
        sigPageSelect(this, page);
!       my_slotMap[page].call(page);
        
        return true;
--- 68,72 ----
        my_activePage->Show();
        sigPageSelect(this, page);
!       my_slotMap[page](page);
        
        return true;

Index: pgradiobutton.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgradiobutton.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** pgradiobutton.cpp   2 May 2002 09:50:40 -0000       1.6
--- pgradiobutton.cpp   6 May 2002 10:40:50 -0000       1.7
***************
*** 53,57 ****
        my_widgetButton->SetToggle(true);
        my_widgetButton->EnableReceiver(false);
!       my_widgetButton->sigButtonClick.connect(slot(this, 
&PG_RadioButton::handleButtonClick));
        
        rectLabel.SetRect(rectButton.my_width, 0, r.my_width - 
rectButton.my_width, r.my_height);
--- 53,57 ----
        my_widgetButton->SetToggle(true);
        my_widgetButton->EnableReceiver(false);
!       my_widgetButton->sigButtonClick.connect(slot(*this, 
&PG_RadioButton::handleButtonClick));
        
        rectLabel.SetRect(rectButton.my_width, 0, r.my_width - 
rectButton.my_width, r.my_height);

Index: pgscrollbar.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgscrollbar.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** pgscrollbar.cpp     2 May 2002 09:50:40 -0000       1.5
--- pgscrollbar.cpp     6 May 2002 10:40:50 -0000       1.6
***************
*** 94,98 ****
                              (direction == PG_SB_VERTICAL) ? PG_IDSCROLLBAR_UP 
: PG_IDSCROLLBAR_LEFT,
                              position[0]);
!       
scrollbutton[0]->sigButtonClick.connect(slot(this,&PG_ScrollBar::handleButtonClick));
        
        scrollbutton[1] = new PG_Button(
--- 94,98 ----
                              (direction == PG_SB_VERTICAL) ? PG_IDSCROLLBAR_UP 
: PG_IDSCROLLBAR_LEFT,
                              position[0]);
!       
scrollbutton[0]->sigButtonClick.connect(slot(*this,&PG_ScrollBar::handleButtonClick));
        
        scrollbutton[1] = new PG_Button(
***************
*** 100,104 ****
                              (direction == PG_SB_VERTICAL) ? 
PG_IDSCROLLBAR_DOWN : PG_IDSCROLLBAR_RIGHT,
                              position[1]);
!       
scrollbutton[1]->sigButtonClick.connect(slot(this,&PG_ScrollBar::handleButtonClick));
  
        dragbutton = new ScrollButton(this, PG_IDSCROLLBAR_DRAG, position[3]);
--- 100,104 ----
                              (direction == PG_SB_VERTICAL) ? 
PG_IDSCROLLBAR_DOWN : PG_IDSCROLLBAR_RIGHT,
                              position[1]);
!       
scrollbutton[1]->sigButtonClick.connect(slot(*this,&PG_ScrollBar::handleButtonClick));
  
        dragbutton = new ScrollButton(this, PG_IDSCROLLBAR_DRAG, position[3]);

Index: pgslider.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgslider.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** pgslider.cpp        27 Apr 2002 15:36:55 -0000      1.5
--- pgslider.cpp        6 May 2002 10:40:50 -0000       1.6
***************
*** 68,72 ****
                SetPosition(scroll_min);
        }
!       sigScrollTrack.connect(slot(this, &PG_Slider::handleTrack));
  }
  
--- 68,72 ----
                SetPosition(scroll_min);
        }
!       sigScrollTrack.connect(slot(*this, &PG_Slider::handleTrack));
  }
  

Index: pgspinnerbox.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgspinnerbox.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** pgspinnerbox.cpp    2 May 2002 09:50:40 -0000       1.5
--- pgspinnerbox.cpp    6 May 2002 10:40:50 -0000       1.6
***************
*** 49,63 ****
  
        m_pEditBox = new PG_MaskEdit( this, box_rect, style );
!       m_pEditBox->sigEditEnd.connect(slot(this, 
&PG_SpinnerBox::handleEditEnd));
  
        m_pButtonUp = new PG_Button( this, PG_IDSPINNERBOX_UP, up_rect, "" );
        // load a specific style
        m_pButtonUp->LoadThemeStyle(style, "ButtonUp");
!       m_pButtonUp->sigButtonClick.connect(slot(this, 
&PG_SpinnerBox::handleButtonClick));
  
        m_pButtonDown = new PG_Button( this, PG_IDSPINNERBOX_DOWN, down_rect, 
"" );
        // load a specific style
        m_pButtonDown->LoadThemeStyle(style, "ButtonDown");
!       m_pButtonDown->sigButtonClick.connect(slot(this, 
&PG_SpinnerBox::handleButtonClick));
  
        m_iMinValue = 0;
--- 49,63 ----
  
        m_pEditBox = new PG_MaskEdit( this, box_rect, style );
!       m_pEditBox->sigEditEnd.connect(slot(*this, 
&PG_SpinnerBox::handleEditEnd));
  
        m_pButtonUp = new PG_Button( this, PG_IDSPINNERBOX_UP, up_rect, "" );
        // load a specific style
        m_pButtonUp->LoadThemeStyle(style, "ButtonUp");
!       m_pButtonUp->sigButtonClick.connect(slot(*this, 
&PG_SpinnerBox::handleButtonClick));
  
        m_pButtonDown = new PG_Button( this, PG_IDSPINNERBOX_DOWN, down_rect, 
"" );
        // load a specific style
        m_pButtonDown->LoadThemeStyle(style, "ButtonDown");
!       m_pButtonDown->sigButtonClick.connect(slot(*this, 
&PG_SpinnerBox::handleButtonClick));
  
        m_iMinValue = 0;

Index: pgtabbar.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgtabbar.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** pgtabbar.cpp        28 Apr 2002 16:35:30 -0000      1.4
--- pgtabbar.cpp        6 May 2002 10:40:50 -0000       1.5
***************
*** 13,22 ****
        my_btnPrev = new PG_Button(this, -1, PG_Rect(0,r.w-50,25,h), "<");
        my_btnPrev->LoadThemeStyle(style, "ButtonPrev");
!       my_btnPrev->sigButtonClick.connect(slot(this, 
&PG_TabBar::handleTabNav));
        my_btnPrev->Hide();
        
        my_btnNext = new PG_Button(this, -1, PG_Rect(0,r.w-25,25,h), ">");
        my_btnNext->LoadThemeStyle(style, "ButtonNext");
!       my_btnNext->sigButtonClick.connect(slot(this, 
&PG_TabBar::handleTabNav));
        my_btnNext->Hide();
        
--- 13,22 ----
        my_btnPrev = new PG_Button(this, -1, PG_Rect(0,r.w-50,25,h), "<");
        my_btnPrev->LoadThemeStyle(style, "ButtonPrev");
!       my_btnPrev->sigButtonClick.connect(slot(*this, 
&PG_TabBar::handleTabNav));
        my_btnPrev->Hide();
        
        my_btnNext = new PG_Button(this, -1, PG_Rect(0,r.w-25,25,h), ">");
        my_btnNext->LoadThemeStyle(style, "ButtonNext");
!       my_btnNext->sigButtonClick.connect(slot(*this, 
&PG_TabBar::handleTabNav));
        my_btnNext->Hide();
        
***************
*** 38,42 ****
        PG_Button* b = new PG_Button(NULL, id, 
PG_Rect(my_tabList->GetListWidth(), 0, width, my_height), text, 
my_style.c_str());
        b->SetToggle(true);
!       b->sigButtonClick.connect(slot(this, &PG_TabBar::handleTabClick));
        
        my_tabList->AddWidget(b);
--- 38,42 ----
        PG_Button* b = new PG_Button(NULL, id, 
PG_Rect(my_tabList->GetListWidth(), 0, width, my_height), text, 
my_style.c_str());
        b->SetToggle(true);
!       b->sigButtonClick.connect(slot(*this, &PG_TabBar::handleTabClick));
        
        my_tabList->AddWidget(b);

Index: pgwidget.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgwidget.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** pgwidget.cpp        6 May 2002 06:24:29 -0000       1.12
--- pgwidget.cpp        6 May 2002 10:40:50 -0000       1.13
***************
*** 1485,1489 ****
  }
  
! bool PG_Widget::QuitModal(PG_Widget* sender) {
        my_internaldata->quitModalLoop = true;
        return true;
--- 1485,1489 ----
  }
  
! bool PG_Widget::QuitModal() {
        my_internaldata->quitModalLoop = true;
        return true;

Index: pgwidgetlist.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgwidgetlist.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** pgwidgetlist.cpp    30 Apr 2002 10:18:39 -0000      1.10
--- pgwidgetlist.cpp    6 May 2002 10:40:50 -0000       1.11
***************
*** 75,80 ****
        my_objVerticalScrollbar->MoveWidget(r.my_width - my_widthScrollbar, 0);
        my_objVerticalScrollbar->SizeWidget(my_widthScrollbar, r.my_height);
!       my_objVerticalScrollbar->sigScrollPos.connect(slot(this, 
&PG_WidgetList::handleScrollPos));
!       my_objVerticalScrollbar->sigScrollTrack.connect(slot(this, 
&PG_WidgetList::handleScrollTrack));
        my_objVerticalScrollbar->Hide();
        
--- 75,80 ----
        my_objVerticalScrollbar->MoveWidget(r.my_width - my_widthScrollbar, 0);
        my_objVerticalScrollbar->SizeWidget(my_widthScrollbar, r.my_height);
!       my_objVerticalScrollbar->sigScrollPos.connect(slot(*this, 
&PG_WidgetList::handleScrollPos));
!       my_objVerticalScrollbar->sigScrollTrack.connect(slot(*this, 
&PG_WidgetList::handleScrollTrack));
        my_objVerticalScrollbar->Hide();
        
***************
*** 84,89 ****
        my_objHorizontalScrollbar->MoveWidget(0, r.my_height - 
my_heightHorizontalScrollbar);
        my_objHorizontalScrollbar->SizeWidget(r.my_width, 
my_heightHorizontalScrollbar);
!       my_objHorizontalScrollbar->sigScrollPos.connect(slot(this, 
&PG_WidgetList::handleScrollPos));
!       my_objHorizontalScrollbar->sigScrollTrack.connect(slot(this, 
&PG_WidgetList::handleScrollTrack));
        my_objHorizontalScrollbar->Hide();
  
--- 84,89 ----
        my_objHorizontalScrollbar->MoveWidget(0, r.my_height - 
my_heightHorizontalScrollbar);
        my_objHorizontalScrollbar->SizeWidget(r.my_width, 
my_heightHorizontalScrollbar);
!       my_objHorizontalScrollbar->sigScrollPos.connect(slot(*this, 
&PG_WidgetList::handleScrollPos));
!       my_objHorizontalScrollbar->sigScrollTrack.connect(slot(*this, 
&PG_WidgetList::handleScrollTrack));
        my_objHorizontalScrollbar->Hide();
  

Index: pgwindow.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgwindow.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** pgwindow.cpp        6 May 2002 06:24:29 -0000       1.9
--- pgwindow.cpp        6 May 2002 10:40:50 -0000       1.10
***************
*** 47,54 ****
  
        my_buttonClose = new PG_Button(this, PG_WINDOW_CLOSE, rb, NULL);
!       my_buttonClose->sigButtonClick.connect(slot(this, 
&PG_Window::handleButtonClick));
        
        my_buttonMinimize = new PG_Button(this, PG_WINDOW_MINIMIZE, rb, NULL);
!       my_buttonMinimize->sigButtonClick.connect(slot(this, 
&PG_Window::handleButtonClick));
  
        LoadThemeStyle(style);
--- 47,54 ----
  
        my_buttonClose = new PG_Button(this, PG_WINDOW_CLOSE, rb, NULL);
!       my_buttonClose->sigButtonClick.connect(slot(*this, 
&PG_Window::handleButtonClick));
        
        my_buttonMinimize = new PG_Button(this, PG_WINDOW_MINIMIZE, rb, NULL);
!       my_buttonMinimize->sigButtonClick.connect(slot(*this, 
&PG_Window::handleButtonClick));
  
        LoadThemeStyle(style);
***************
*** 244,248 ****
  
  int PG_Window::RunModal() {
!       Connection c = 
sigWindowClose.connect(PG_SignalWindowClose::convert_slot(slot(this, 
&PG_Widget::QuitModal)));
        int rc = PG_Widget::RunModal();
        c.disconnect();
--- 244,248 ----
  
  int PG_Window::RunModal() {
!       Connection c = sigWindowClose.connect(slot(*this, 
&PG_Widget::QuitModal));
        int rc = PG_Widget::RunModal();
        c.disconnect();