summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjoye <joye>2014-05-23 21:42:37 (GMT)
committerjoye <joye>2014-05-23 21:42:37 (GMT)
commit0833faf8f9228ddba4c683e40db9485578beea57 (patch)
tree73cad2b3ad786b9b24566340f2033076b054838d
parent8a551d6070da75e42d76713a62a91d52ad02c3b5 (diff)
downloadblt-0833faf8f9228ddba4c683e40db9485578beea57.zip
blt-0833faf8f9228ddba4c683e40db9485578beea57.tar.gz
blt-0833faf8f9228ddba4c683e40db9485578beea57.tar.bz2
*** empty log message ***
-rwxr-xr-xconfigure1
-rwxr-xr-xconfigure.in1
-rw-r--r--src/bltGrAxis.h2
-rw-r--r--src/bltGrAxisOp.C3
-rw-r--r--src/bltGrBind.C2
-rw-r--r--src/bltGrBind.h8
-rw-r--r--src/bltGrElemOp.C3
-rw-r--r--src/bltGrLegd.C3
-rw-r--r--src/bltGrLegdOp.C3
-rw-r--r--src/bltGrMarker.C3
-rw-r--r--src/bltGrMarkerOp.C3
-rw-r--r--src/bltGraph.C3
-rw-r--r--src/bltGraph.h2
-rw-r--r--src/bltGraphOp.C4
14 files changed, 4 insertions, 37 deletions
diff --git a/configure b/configure
index 66b3bed..1cd11d5 100755
--- a/configure
+++ b/configure
@@ -5564,7 +5564,6 @@ done
bltGraphOp.C
bltGraphSup.C
bltInt.C
- bltList.C
bltNsUtil.c
bltParse.C
bltPs.C
diff --git a/configure.in b/configure.in
index a9f91c4..0934cf9 100755
--- a/configure.in
+++ b/configure.in
@@ -109,7 +109,6 @@ TEA_ADD_SOURCES([
bltGraphOp.C
bltGraphSup.C
bltInt.C
- bltList.C
bltNsUtil.c
bltParse.C
bltPs.C
diff --git a/src/bltGrAxis.h b/src/bltGrAxis.h
index a98a936..02276ae 100644
--- a/src/bltGrAxis.h
+++ b/src/bltGrAxis.h
@@ -36,13 +36,13 @@
#include <tk.h>
extern "C" {
-#include "bltBind.h"
#include "bltChain.h"
};
class Graph;
class PageSetup;
+#include "bltBind.h"
#include "bltGrMisc.h"
#include "bltGrText.h"
#include "bltPs.h"
diff --git a/src/bltGrAxisOp.C b/src/bltGrAxisOp.C
index 2ed7aef..0006ae1 100644
--- a/src/bltGrAxisOp.C
+++ b/src/bltGrAxisOp.C
@@ -30,10 +30,7 @@
#include <math.h>
#include <string.h>
-extern "C" {
#include "bltBind.h"
-};
-
#include "bltGraph.h"
#include "bltGrAxis.h"
#include "bltGrAxisOp.h"
diff --git a/src/bltGrBind.C b/src/bltGrBind.C
index ad4c09e..5499e63 100644
--- a/src/bltGrBind.C
+++ b/src/bltGrBind.C
@@ -34,9 +34,7 @@
#include <iomanip>
using namespace std;
-extern "C" {
#include "bltBind.h"
-};
#define MAX_STATIC_TAGS 64
diff --git a/src/bltGrBind.h b/src/bltGrBind.h
index abfb27a..22a320c 100644
--- a/src/bltGrBind.h
+++ b/src/bltGrBind.h
@@ -32,15 +32,11 @@
#include <tk.h>
-#include <bltList.h>
-
typedef struct _Blt_BindTable *Blt_BindTable;
-typedef ClientData (Blt_BindPickProc)(ClientData clientData, int x, int y,
- ClientData *contextPtr);
+typedef ClientData (Blt_BindPickProc)(ClientData clientData, int x, int y, ClientData *contextPtr);
-typedef void (Blt_BindTagProc)(Blt_BindTable bindTable, ClientData object,
- ClientData context, Blt_List list);
+typedef const char** (Blt_BindTagProc)(Blt_BindTable bindTable, ClientData object, ClientData context, int*);
struct _Blt_BindTable {
unsigned int flags;
diff --git a/src/bltGrElemOp.C b/src/bltGrElemOp.C
index b9b6160..a5d2344 100644
--- a/src/bltGrElemOp.C
+++ b/src/bltGrElemOp.C
@@ -27,10 +27,7 @@
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-extern "C" {
#include "bltBind.h"
-};
-
#include "bltGraph.h"
#include "bltGrAxis.h"
#include "bltGrElem.h"
diff --git a/src/bltGrLegd.C b/src/bltGrLegd.C
index e6955d8..659b9df 100644
--- a/src/bltGrLegd.C
+++ b/src/bltGrLegd.C
@@ -32,10 +32,7 @@
#include <tkInt.h>
#endif
-extern "C" {
#include "bltBind.h"
-};
-
#include "bltGraph.h"
#include "bltGrLegd.h"
#include "bltGrElem.h"
diff --git a/src/bltGrLegdOp.C b/src/bltGrLegdOp.C
index ea31ae8..d167c0b 100644
--- a/src/bltGrLegdOp.C
+++ b/src/bltGrLegdOp.C
@@ -32,10 +32,7 @@
#include <tkInt.h>
#endif
-extern "C" {
#include "bltBind.h"
-};
-
#include "bltGraph.h"
#include "bltGrLegd.h"
#include "bltGrLegdOp.h"
diff --git a/src/bltGrMarker.C b/src/bltGrMarker.C
index 42de466..ccf5ec1 100644
--- a/src/bltGrMarker.C
+++ b/src/bltGrMarker.C
@@ -31,10 +31,7 @@
#include <math.h>
#include <float.h>
-extern "C" {
#include "bltBind.h"
-};
-
#include "bltGraph.h"
#include "bltGrMarker.h"
#include "bltGrAxis.h"
diff --git a/src/bltGrMarkerOp.C b/src/bltGrMarkerOp.C
index 88bd8a9..2b0684a 100644
--- a/src/bltGrMarkerOp.C
+++ b/src/bltGrMarkerOp.C
@@ -29,10 +29,7 @@
#include <string.h>
-extern "C" {
#include "bltBind.h"
-};
-
#include "bltGraph.h"
#include "bltGrElem.h"
#include "bltGrMarkerOp.h"
diff --git a/src/bltGraph.C b/src/bltGraph.C
index b54291e..30c8d05 100644
--- a/src/bltGraph.C
+++ b/src/bltGraph.C
@@ -29,10 +29,7 @@
#include <float.h>
-extern "C" {
#include "bltBind.h"
-};
-
#include "bltGraph.h"
#include "bltGraphOp.h"
diff --git a/src/bltGraph.h b/src/bltGraph.h
index d77cf75..247f9b2 100644
--- a/src/bltGraph.h
+++ b/src/bltGraph.h
@@ -34,9 +34,9 @@
extern "C" {
#include "bltChain.h"
-#include "bltBind.h"
};
+#include "bltBind.h"
#include "bltGrMisc.h"
#include "bltGrText.h"
diff --git a/src/bltGraphOp.C b/src/bltGraphOp.C
index dd630af..105f08e 100644
--- a/src/bltGraphOp.C
+++ b/src/bltGraphOp.C
@@ -29,10 +29,6 @@
#include <string.h>
-extern "C" {
-#include "bltList.h"
-};
-
#include "bltGraph.h"
#include "bltGraphLine.h"
#include "bltGraphBar.h"