summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjoye <joye>2013-09-06 19:25:32 (GMT)
committerjoye <joye>2013-09-06 19:25:32 (GMT)
commit9cd3184302d2169ca08d32688b17720762c0bab5 (patch)
tree23d341b27a0b4ef65b3a50d93baa07dc5d1a8a60
parentdef50d0fd837a27651f69506743fa8b78d4a7b0b (diff)
downloadblt-9cd3184302d2169ca08d32688b17720762c0bab5.zip
blt-9cd3184302d2169ca08d32688b17720762c0bab5.tar.gz
blt-9cd3184302d2169ca08d32688b17720762c0bab5.tar.bz2
*** empty log message ***
-rw-r--r--src/bltConfig.C4
-rw-r--r--src/bltGrAxis.C3
-rw-r--r--src/bltGrElemOp.C3
-rw-r--r--src/bltGrMarker.C3
-rw-r--r--src/bltGrMisc.C4
-rw-r--r--src/bltGraph.C5
6 files changed, 13 insertions, 9 deletions
diff --git a/src/bltConfig.C b/src/bltConfig.C
index bec7b29..fcd547e 100644
--- a/src/bltConfig.C
+++ b/src/bltConfig.C
@@ -81,6 +81,10 @@
#include "bltPicture.h"
#include "bltBgStyle.h"
+#define PIXELS_NNEG 0
+#define PIXELS_POS 1
+#define PIXELS_ANY 2
+
/*
*---------------------------------------------------------------------------
*
diff --git a/src/bltGrAxis.C b/src/bltGrAxis.C
index 57821ee..9d4dda8 100644
--- a/src/bltGrAxis.C
+++ b/src/bltGrAxis.C
@@ -2053,8 +2053,7 @@ DestroyAxis(Axis *axisPtr)
axisPtr = NULL;
}
-static void
-FreeAxis(DestroyData data)
+static void FreeAxis(char* data)
{
Axis *axisPtr = (Axis *)data;
DestroyAxis(axisPtr);
diff --git a/src/bltGrElemOp.C b/src/bltGrElemOp.C
index 458d13d..70d7c30 100644
--- a/src/bltGrElemOp.C
+++ b/src/bltGrElemOp.C
@@ -1277,8 +1277,7 @@ DestroyElement(Element *elemPtr)
free(elemPtr);
}
-static void
-FreeElement(DestroyData data)
+static void FreeElement(char* data)
{
Element *elemPtr = (Element *)data;
DestroyElement(elemPtr);
diff --git a/src/bltGrMarker.C b/src/bltGrMarker.C
index 3970d43..0dfff22 100644
--- a/src/bltGrMarker.C
+++ b/src/bltGrMarker.C
@@ -1814,8 +1814,7 @@ DestroyMarker(Marker *markerPtr)
free(markerPtr);
}
-static void
-FreeMarker(DestroyData dataPtr)
+static void FreeMarker(char* dataPtr)
{
Marker *markerPtr = (Marker *)dataPtr;
DestroyMarker(markerPtr);
diff --git a/src/bltGrMisc.C b/src/bltGrMisc.C
index c8b5c21..0f4ca9c 100644
--- a/src/bltGrMisc.C
+++ b/src/bltGrMisc.C
@@ -36,6 +36,10 @@
#include <bltAlloc.h>
#include <bltOp.h>
+#define BLT_SCROLL_MODE_CANVAS (1<<0)
+#define BLT_SCROLL_MODE_LISTBOX (1<<1)
+#define BLT_SCROLL_MODE_HIERBOX (1<<2)
+
static Blt_OptionParseProc ObjToPoint;
static Blt_OptionPrintProc PointToObj;
Blt_CustomOption bltPointOption =
diff --git a/src/bltGraph.C b/src/bltGraph.C
index ae7b4cc..55ef7e9 100644
--- a/src/bltGraph.C
+++ b/src/bltGraph.C
@@ -775,8 +775,7 @@ ConfigureGraph(Graph *graphPtr)
*
*---------------------------------------------------------------------------
*/
-static void
-DestroyGraph(DestroyData dataPtr)
+static void DestroyGraph(char* dataPtr)
{
Graph *graphPtr = (Graph *)dataPtr;
@@ -930,7 +929,7 @@ CreateGraph(Tcl_Interp *interp, int objc, Tcl_Obj *const *objv, ClassId classId)
return graphPtr;
error:
- DestroyGraph((DestroyData)graphPtr);
+ DestroyGraph((char*)graphPtr);
return NULL;
}