From 88ebef6dbcd4897c6fa8c15ff3752395bc850458 Mon Sep 17 00:00:00 2001
From: Allan Rae <rae@lyx.org>
Date: Thu, 10 Aug 2000 04:54:00 +0000
Subject: [PATCH] Signal3 now supported

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@963 a592a061-630c-0410-9148-cb99ea01b6c8
---
 ChangeLog                        | 8 ++++++++
 development/tools/makeLyXsigc.sh | 8 ++++----
 sigc++/macros/basic_signal.h.m4  | 1 +
 sigc++/macros/bind.h.m4          | 2 ++
 sigc++/macros/class_slot.h.m4    | 1 +
 sigc++/macros/convert.h.m4       | 1 +
 sigc++/macros/func_slot.h.m4     | 1 +
 sigc++/macros/object_slot.h.m4   | 1 +
 sigc++/macros/retbind.h.m4       | 1 +
 sigc++/macros/rettype.h.m4       | 1 +
 sigc++/macros/slot.h.m4          | 1 +
 11 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4061a99c2e..8d41e3d2ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2000-08-10  Allan Rae  <rae@lyx.org>
+
+	* development/tools/makeLyXsigc.sh: Updated to allow Signal3.  Note
+	that there are two functions that have to been taken out of line by
+	hand and aren't taken care of in the script.  (Just a reminder note)
+
+	* sigc++/macros/*.h.m4: Updated as above.
+
 2000-08-09  Juergen Vigna  <jug@sad.it>
 
 	* src/insets/insettext.C (draw): small fix for clearing rectangle.
diff --git a/development/tools/makeLyXsigc.sh b/development/tools/makeLyXsigc.sh
index 33b9a82d37..84b436ab44 100644
--- a/development/tools/makeLyXsigc.sh
+++ b/development/tools/makeLyXsigc.sh
@@ -72,8 +72,8 @@ EOF
 )
 
 
-echo "Limiting to Signal2"
-# we only need up to Signal2
+echo "Limiting to Signal3"
+# we only need up to Signal3
 # NOTE: sigc++ needs 2 slots higher than the number of signals (see bind.h)
 # Anyone feeling keen?
 # How would you like to make this a parameter-controlled stripping of
@@ -83,11 +83,11 @@ for i in `ls $package/sigc++/macros/*.h.m4`; do
   case $i in
     $package/sigc++/macros/slot.h.m4)
         sed < $i > $i.tmp \
-		-e '/.*ARGS(P,[56789]).*/d'
+		-e '/.*ARGS(P,[6789]).*/d'
         ;;
     *)
         sed < $i > $i.tmp \
-		-e '/.*ARGS(P,[3456789]).*/d'
+		-e '/.*ARGS(P,[456789]).*/d'
         ;;
   esac
   rm -f $i
diff --git a/sigc++/macros/basic_signal.h.m4 b/sigc++/macros/basic_signal.h.m4
index a8e15f2ab9..3dfddad94e 100644
--- a/sigc++/macros/basic_signal.h.m4
+++ b/sigc++/macros/basic_signal.h.m4
@@ -216,6 +216,7 @@ void [Signal]NUM($1)<LIST(void,1,ARG_TYPE($1),[$1],Marsh,1)>::
 BASIC_SIGNAL(ARGS(P,0))
 BASIC_SIGNAL(ARGS(P,1))
 BASIC_SIGNAL(ARGS(P,2))
+BASIC_SIGNAL(ARGS(P,3))
 
 #ifdef SIGC_CXX_NAMESPACES
 } // namespace
diff --git a/sigc++/macros/bind.h.m4 b/sigc++/macros/bind.h.m4
index 3202d35c9b..50bd5db677 100644
--- a/sigc++/macros/bind.h.m4
+++ b/sigc++/macros/bind.h.m4
@@ -166,10 +166,12 @@ struct [AdaptorBindSlot]NUM($2)[_]NUM($3): public AdaptorSlot_
 ADAPTOR_BIND_SLOT(ARGS(P,0),ARGS(C,1),ARGS(A,1))
 ADAPTOR_BIND_SLOT(ARGS(P,1),ARGS(C,1),ARGS(A,1))
 ADAPTOR_BIND_SLOT(ARGS(P,2),ARGS(C,1),ARGS(A,1))
+ADAPTOR_BIND_SLOT(ARGS(P,3),ARGS(C,1),ARGS(A,1))
 
 ADAPTOR_BIND_SLOT(ARGS(P,0),ARGS(C,2),ARGS(A,2))
 ADAPTOR_BIND_SLOT(ARGS(P,1),ARGS(C,2),ARGS(A,2))
 ADAPTOR_BIND_SLOT(ARGS(P,2),ARGS(C,2),ARGS(A,2))
+ADAPTOR_BIND_SLOT(ARGS(P,3),ARGS(C,2),ARGS(A,2))
 
 #ifdef SIGC_CXX_NAMESPACES
 } // namespace
diff --git a/sigc++/macros/class_slot.h.m4 b/sigc++/macros/class_slot.h.m4
index 222f026c6f..17f52c4cd8 100644
--- a/sigc++/macros/class_slot.h.m4
+++ b/sigc++/macros/class_slot.h.m4
@@ -99,6 +99,7 @@ __SLOT__(R,[$1])
 CLASS_SLOT(ARGS(P,0))
 CLASS_SLOT(ARGS(P,1))
 CLASS_SLOT(ARGS(P,2))
+CLASS_SLOT(ARGS(P,3))
 
 #ifdef SIGC_CXX_NAMESPACES
 } // namespace
diff --git a/sigc++/macros/convert.h.m4 b/sigc++/macros/convert.h.m4
index 4d9d3d7fa8..368ba0c76c 100644
--- a/sigc++/macros/convert.h.m4
+++ b/sigc++/macros/convert.h.m4
@@ -125,6 +125,7 @@ struct [AdaptorConvertSlot]NUM($2)[_]NUM($3): public AdaptorSlot_
 
 ADAPTOR_CONVERT_SLOT(ARGS(P,1),ARGS(Q,1))
 ADAPTOR_CONVERT_SLOT(ARGS(P,2),ARGS(Q,2))
+ADAPTOR_CONVERT_SLOT(ARGS(P,3),ARGS(Q,3))
 
 #ifdef SIGC_CXX_NAMESPACES
 } // namespace
diff --git a/sigc++/macros/func_slot.h.m4 b/sigc++/macros/func_slot.h.m4
index 56e32fce7c..327b986841 100644
--- a/sigc++/macros/func_slot.h.m4
+++ b/sigc++/macros/func_slot.h.m4
@@ -114,6 +114,7 @@ ifelse($1,void,[dnl
 FUNCTION_SLOT(ARGS(P,0))
 FUNCTION_SLOT(ARGS(P,1))
 FUNCTION_SLOT(ARGS(P,2))
+FUNCTION_SLOT(ARGS(P,3))
 
 #ifdef SIGC_CXX_NAMESPACES
 } // namespace
diff --git a/sigc++/macros/object_slot.h.m4 b/sigc++/macros/object_slot.h.m4
index bfefffe285..51f390d3da 100644
--- a/sigc++/macros/object_slot.h.m4
+++ b/sigc++/macros/object_slot.h.m4
@@ -136,6 +136,7 @@ struct [ObjectSlot]NUM($2)_
 OBJECT_SLOT(ARGS(P,0))
 OBJECT_SLOT(ARGS(P,1))
 OBJECT_SLOT(ARGS(P,2))
+OBJECT_SLOT(ARGS(P,3))
 
 #ifdef SIGC_CXX_NAMESPACES
 } // namespace
diff --git a/sigc++/macros/retbind.h.m4 b/sigc++/macros/retbind.h.m4
index d48744a77c..b0ce29769b 100644
--- a/sigc++/macros/retbind.h.m4
+++ b/sigc++/macros/retbind.h.m4
@@ -148,6 +148,7 @@ struct [AdaptorRetBindSlot]NUM($2): public AdaptorSlot_
 ADAPTOR_RETBIND_SLOT(ARGS(P,0))
 ADAPTOR_RETBIND_SLOT(ARGS(P,1))
 ADAPTOR_RETBIND_SLOT(ARGS(P,2))
+ADAPTOR_RETBIND_SLOT(ARGS(P,3))
 
 #ifdef SIGC_CXX_NAMESPACES
 } // namespace
diff --git a/sigc++/macros/rettype.h.m4 b/sigc++/macros/rettype.h.m4
index 9b2d078650..d758ef397a 100644
--- a/sigc++/macros/rettype.h.m4
+++ b/sigc++/macros/rettype.h.m4
@@ -136,6 +136,7 @@ ifelse($1,void,[dnl
 ADAPTOR_RETTYPE_SLOT(ARGS(P,0))
 ADAPTOR_RETTYPE_SLOT(ARGS(P,1))
 ADAPTOR_RETTYPE_SLOT(ARGS(P,2))
+ADAPTOR_RETTYPE_SLOT(ARGS(P,3))
 
 #ifdef SIGC_CXX_NAMESPACES
 } // namespace
diff --git a/sigc++/macros/slot.h.m4 b/sigc++/macros/slot.h.m4
index e878f7705c..2170abf436 100644
--- a/sigc++/macros/slot.h.m4
+++ b/sigc++/macros/slot.h.m4
@@ -361,6 +361,7 @@ SLOT(ARGS(P,1))
 SLOT(ARGS(P,2))
 SLOT(ARGS(P,3))
 SLOT(ARGS(P,4))
+SLOT(ARGS(P,5))
 
 #ifdef SIGC_CXX_NAMESPACES
 } // namespace
-- 
2.39.2