From 1826640f0e1684fd811b628792ef81b487359ad4 Mon Sep 17 00:00:00 2001
From: joye <joye>
Date: Tue, 15 Apr 2014 18:14:31 +0000
Subject: *** empty log message ***

---
 src/bltGrAxis.C    | 23 +++++++++++++++++++++--
 src/bltGrAxis.h    |  1 +
 src/bltGrHairs.C   |  1 +
 src/bltGrMisc.C    | 21 ---------------------
 src/bltGrMisc.h    |  2 ++
 src/bltGrPenLine.C |  1 +
 src/bltGrText.h    |  2 ++
 7 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/src/bltGrAxis.C b/src/bltGrAxis.C
index 6403858..8b163db 100644
--- a/src/bltGrAxis.C
+++ b/src/bltGrAxis.C
@@ -571,7 +571,7 @@ void Axis::draw(Drawable drawable)
 	min_ = EXP10(min_);
 	max_ = EXP10(max_);
       }
-      Blt_UpdateScrollbar(graphPtr_->interp, ops->scrollCmdObjPtr,
+      updateScrollbar(graphPtr_->interp, ops->scrollCmdObjPtr,
 			  viewMin, viewMax, worldWidth);
     }
     else {
@@ -583,7 +583,7 @@ void Axis::draw(Drawable drawable)
 	min_ = EXP10(min_);
 	max_ = EXP10(max_);
       }
-      Blt_UpdateScrollbar(graphPtr_->interp, ops->scrollCmdObjPtr,
+      updateScrollbar(graphPtr_->interp, ops->scrollCmdObjPtr,
 			  viewMax, viewMin, worldWidth);
     }
   }
@@ -1640,3 +1640,22 @@ void Axis::print(Blt_Ps ps)
   }
 }
 
+void Axis::updateScrollbar(Tcl_Interp* interp, Tcl_Obj *scrollCmdObjPtr,
+			   int first, int last, int width)
+{
+  double firstFract =0.0;
+  double lastFract = 1.0;
+  if (width > 0) {
+    firstFract = (double)first / (double)width;
+    lastFract = (double)last / (double)width;
+  }
+  Tcl_Obj *cmdObjPtr = Tcl_DuplicateObj(scrollCmdObjPtr);
+  Tcl_ListObjAppendElement(interp, cmdObjPtr, Tcl_NewDoubleObj(firstFract));
+  Tcl_ListObjAppendElement(interp, cmdObjPtr, Tcl_NewDoubleObj(lastFract));
+  Tcl_IncrRefCount(cmdObjPtr);
+  if (Tcl_EvalObjEx(interp, cmdObjPtr, TCL_EVAL_GLOBAL) != TCL_OK) {
+    Tcl_BackgroundError(interp);
+  }
+  Tcl_DecrRefCount(cmdObjPtr);
+}
+
diff --git a/src/bltGrAxis.h b/src/bltGrAxis.h
index f788c02..6e7a657 100644
--- a/src/bltGrAxis.h
+++ b/src/bltGrAxis.h
@@ -206,6 +206,7 @@ class Axis {
   void makeLine(int, Segment2d*);
   void makeTick(double, int, int, Segment2d*);
   void offsets(int, int, AxisInfo*);
+  void updateScrollbar(Tcl_Interp*, Tcl_Obj*, int, int, int);
 
  public:
   Axis(Graph*, const char*, int, Tcl_HashEntry*);
diff --git a/src/bltGrHairs.C b/src/bltGrHairs.C
index 8648688..87401a1 100644
--- a/src/bltGrHairs.C
+++ b/src/bltGrHairs.C
@@ -35,6 +35,7 @@ extern "C" {
 }
 
 #include "bltGrHairs.h"
+#include "bltGrMisc.h"
 
 #define PointInGraph(g,x,y) (((x) <= (g)->right) && ((x) >= (g)->left) && ((y) <= (g)->bottom) && ((y) >= (g)->top))
 
diff --git a/src/bltGrMisc.C b/src/bltGrMisc.C
index 2851e38..244352e 100644
--- a/src/bltGrMisc.C
+++ b/src/bltGrMisc.C
@@ -384,27 +384,6 @@ Point2d Blt_GetProjection(int x, int y, Point2d *p, Point2d *q)
  * 	valid.
  *---------------------------------------------------------------------------
  */
-void Blt_UpdateScrollbar(Tcl_Interp* interp, Tcl_Obj *scrollCmdObjPtr,
-			 int first, int last, int width)
-{
-  Tcl_Obj *cmdObjPtr;
-  double firstFract, lastFract;
-
-  firstFract = 0.0, lastFract = 1.0;
-  if (width > 0) {
-    firstFract = (double)first / (double)width;
-    lastFract = (double)last / (double)width;
-  }
-  cmdObjPtr = Tcl_DuplicateObj(scrollCmdObjPtr);
-  Tcl_ListObjAppendElement(interp, cmdObjPtr, Tcl_NewDoubleObj(firstFract));
-  Tcl_ListObjAppendElement(interp, cmdObjPtr, Tcl_NewDoubleObj(lastFract));
-  Tcl_IncrRefCount(cmdObjPtr);
-  if (Tcl_EvalObjEx(interp, cmdObjPtr, TCL_EVAL_GLOBAL) != TCL_OK) {
-    Tcl_BackgroundError(interp);
-  }
-  Tcl_DecrRefCount(cmdObjPtr);
-}
-
 /*
  *---------------------------------------------------------------------------
  *      Like Tk_GetGC, but doesn't share the GC with any other widget.  This
diff --git a/src/bltGrMisc.h b/src/bltGrMisc.h
index 3d9ac14..eddf0a5 100644
--- a/src/bltGrMisc.h
+++ b/src/bltGrMisc.h
@@ -43,5 +43,7 @@ extern GC Blt_GetPrivateGC(Tk_Window tkwin, unsigned long gcMask,
 	XGCValues *valuePtr);
 extern void Blt_FreePrivateGC(Display *display, GC gc);
 extern Point2d Blt_GetProjection (int x, int y, Point2d *p, Point2d *q);
+extern long Blt_MaxRequestSize (Display *display, size_t elemSize);
+
 
 #endif
diff --git a/src/bltGrPenLine.C b/src/bltGrPenLine.C
index ddc11b6..f907d52 100644
--- a/src/bltGrPenLine.C
+++ b/src/bltGrPenLine.C
@@ -28,6 +28,7 @@
  */
 
 #include "bltGrPenLine.h"
+#include "bltGrMisc.h"
 
 typedef struct {
   const char* name;
diff --git a/src/bltGrText.h b/src/bltGrText.h
index b1e8418..f3e597a 100644
--- a/src/bltGrText.h
+++ b/src/bltGrText.h
@@ -68,6 +68,8 @@ extern void Blt_Ts_DrawText(Tk_Window tkwin, Drawable drawable,
 			    int x, int y);
 extern void Blt_GetBoundingBox (int width, int height, float angle, 
 	double *widthPtr, double *heightPtr, Point2d *points);
+extern Point2d Blt_AnchorPoint (double x, double y, double width, 
+	double height, Tk_Anchor anchor);
 
 #define Blt_Ts_InitStyle(ts)			\
   ((ts).anchor = TK_ANCHOR_NW,			\
-- 
cgit v0.12