[paragui-cvs] CVS: paragui/src/widgets pgpopupmenu.cpp,1.6,1.7

[Alexander Pipelka <address@hidden>]

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

Modified Files:
        pgpopupmenu.cpp 
Log Message:
minor signal update



Index: pgpopupmenu.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgpopupmenu.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** pgpopupmenu.cpp     6 May 2002 11:18:03 -0000       1.6
--- pgpopupmenu.cpp     7 May 2002 12:47:48 -0000       1.7
***************
*** 256,265 ****
  PG_PopupMenu& PG_PopupMenu::addMenuItem(char *caption,
                                          int ID,
!                                         PG_MenuItemSlot slot,
                                          PG_Pointer* data,
                                          PG_MenuItem::MI_FLAGS flags) {
  
        PG_MenuItem* item = new PG_MenuItem(this, caption, ID, flags);
!       item->data = data;
        appendItem(item);
  
--- 256,277 ----
  PG_PopupMenu& PG_PopupMenu::addMenuItem(char *caption,
                                          int ID,
!                                         PG_MenuItemSlotData slot,
                                          PG_Pointer* data,
                                          PG_MenuItem::MI_FLAGS flags) {
  
        PG_MenuItem* item = new PG_MenuItem(this, caption, ID, flags);
!       appendItem(item);
! 
!       item->sigMenuItemSelect.connect(slot, data);
! 
!       return *this;
! }
! 
! PG_PopupMenu& PG_PopupMenu::addMenuItem(char *caption,
!                                         int ID,
!                                         PG_MenuItemSlot slot,
!                                         PG_MenuItem::MI_FLAGS flags) {
! 
!       PG_MenuItem* item = new PG_MenuItem(this, caption, ID, flags);
        appendItem(item);
  
***************
*** 407,413 ****
                        if (!selected->isMute()) {
                                // call item's callback
!                               selected->sigMenuItemSelect(selected, 
selected->data);
                                // call general callback (PG_PopupMenu)
!                               sigMenuItemSelect(selected, selected->data);
                        }
                }
--- 419,425 ----
                        if (!selected->isMute()) {
                                // call item's callback
!                               selected->sigMenuItemSelect(selected/*, 
selected->data*/);
                                // call general callback (PG_PopupMenu)
!                               sigMenuItemSelect(selected/*, selected->data*/);
                        }
                }
***************
*** 681,687 ****
                                if (/*actions[selected->getId()] &&*/ 
!selected->isDisabled()) {
                                        // call item's callback
!                                       selected->sigMenuItemSelect(selected, 
selected->data);
                                        // call general callback (PG_PopupMenu)
!                                       sigMenuItemSelect(selected, 
selected->data);
                                }
  
--- 693,699 ----
                                if (/*actions[selected->getId()] &&*/ 
!selected->isDisabled()) {
                                        // call item's callback
!                                       selected->sigMenuItemSelect(selected/*, 
selected->data*/);
                                        // call general callback (PG_PopupMenu)
!                                       sigMenuItemSelect(selected/*, 
selected->data*/);
                                }