[paragui-cvs] CVS: paragui/include pgpopupmenu.h,1.6,1.7 pgsignals.h,1.6,1.7

[Alexander Pipelka <address@hidden>]

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

Modified Files:
        pgpopupmenu.h pgsignals.h 
Log Message:
minor signal update



Index: pgpopupmenu.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgpopupmenu.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** pgpopupmenu.h       27 Apr 2002 19:08:11 -0000      1.6
--- pgpopupmenu.h       7 May 2002 12:47:43 -0000       1.7
***************
*** 211,216 ****
        PG_PopupMenu& addMenuItem(char *caption,
                                  int ID,
!                                                         PG_MenuItemSlot slot,
                                  PG_Pointer* data = NULL,
                                  PG_MenuItem::MI_FLAGS flags = 
PG_MenuItem::MIF_NONE);
  
--- 211,221 ----
        PG_PopupMenu& addMenuItem(char *caption,
                                  int ID,
!                                                         PG_MenuItemSlotData 
slot,
                                  PG_Pointer* data = NULL,
+                                 PG_MenuItem::MI_FLAGS flags = 
PG_MenuItem::MIF_NONE);
+ 
+       PG_PopupMenu& addMenuItem(char *caption,
+                                 int ID,
+                                                         PG_MenuItemSlot slot,
                                  PG_MenuItem::MI_FLAGS flags = 
PG_MenuItem::MIF_NONE);
  

Index: pgsignals.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgsignals.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** pgsignals.h 6 May 2002 10:40:49 -0000       1.6
--- pgsignals.h 7 May 2002 12:47:43 -0000       1.7
***************
*** 80,84 ****
        }
  
!       Connection connect(const Slot2<bool, P1, PG_Pointer*>& s, PG_Pointer* 
data) {
                return Signal1<bool, P1>::connect(bind(s, data));
        };
--- 80,84 ----
        }
  
!       Connection connect(const Slot2<bool, P1, PG_Pointer*>& s, PG_Pointer* 
data = NULL) {
                return Signal1<bool, P1>::connect(bind(s, data));
        };
***************
*** 111,115 ****
  public:
  
!       Connection connect(const Slot3<bool, P1, P2, PG_Pointer*>& s, 
PG_Pointer* data) {
                return Signal2<bool, P1, P2>::connect(bind(s, data));
        }
--- 111,115 ----
  public:
  
!       Connection connect(const Slot3<bool, P1, P2, PG_Pointer*>& s, 
PG_Pointer* data = NULL) {
                return Signal2<bool, P1, P2>::connect(bind(s, data));
        }
***************
*** 127,131 ****
        }
  
!       Connection connect(const Slot2<bool, P1, PG_Pointer*>& s, PG_Pointer* 
data) {
                return Signal2<bool, P1, P2>::connect(bind(s, data));
        };
--- 127,131 ----
        }
  
!       Connection connect(const Slot2<bool, P1, PG_Pointer*>& s, PG_Pointer* 
data = NULL) {
                return Signal2<bool, P1, P2>::connect(bind(s, data));
        };
***************
*** 155,161 ****
  typedef PG_Signal1<PG_LineEdit*> PG_SignalEditReturn;
  
! typedef Signal2<bool, PG_MenuItem*, PG_Pointer*> PG_SignalMenuItemSelected;
  
! typedef Slot2<bool, PG_MenuItem*, PG_Pointer*> PG_MenuItemSlot;
  
  typedef PG_Signal1<PG_Window*> PG_SignalWindowClose;
--- 155,163 ----
  typedef PG_Signal1<PG_LineEdit*> PG_SignalEditReturn;
  
! typedef PG_Signal1<PG_MenuItem*> PG_SignalMenuItemSelected;
  
! typedef Slot1<bool, PG_MenuItem*> PG_MenuItemSlot;
! 
! typedef Slot2<bool, PG_MenuItem*, PG_Pointer*> PG_MenuItemSlotData;
  
  typedef PG_Signal1<PG_Window*> PG_SignalWindowClose;