*** empty log message ***

12 files changed, 6 insertions, 29 deletions

diff --git a/src/bltConfig.C b/src/bltConfig.C
index e73c222..f9e3c85 100644
--- a/src/bltConfig.C
+++ b/src/bltConfig.C
@@ -36,7 +36,6 @@
  *	SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/src/bltGrAxis.C b/src/bltGrAxis.C
index 5a839ec..25f6baa 100644
--- a/src/bltGrAxis.C
+++ b/src/bltGrAxis.C
@@ -37,10 +37,6 @@
 #include <iomanip>
 using namespace std;
 
-extern "C" {
-#include "bltInt.h"
-};
-
 #include "bltGraph.h"
 #include "bltGrAxis.h"
 #include "bltGrAxisOption.h"
diff --git a/src/bltGrElemBar.C b/src/bltGrElemBar.C
index d688b6b..fde7b18 100644
--- a/src/bltGrElemBar.C
+++ b/src/bltGrElemBar.C
@@ -29,10 +29,6 @@
 
 #include <float.h>
 
-extern "C" {
-#include "bltInt.h"
-};
-
 #include "bltGraphBar.h"
 #include "bltGrElemBar.h"
 #include "bltGrElemOption.h"
diff --git a/src/bltGrElemLine.C b/src/bltGrElemLine.C
index 67c612d..2728918 100644
--- a/src/bltGrElemLine.C
+++ b/src/bltGrElemLine.C
@@ -32,10 +32,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-extern "C" {
-#include "bltInt.h"
-};
-
 #include "bltGraph.h"
 #include "bltSpline.h"
 #include "bltGrElemLine.h"
diff --git a/src/bltGrMarkerOp.C b/src/bltGrMarkerOp.C
index b02c421..870f510 100644
--- a/src/bltGrMarkerOp.C
+++ b/src/bltGrMarkerOp.C
@@ -33,7 +33,6 @@
 using namespace std;
 
 extern "C" {
-#include "bltInt.h"
 #include "bltBind.h"
 };
 
diff --git a/src/bltGraph.C b/src/bltGraph.C
index 4410d87..8a55ab2 100644
--- a/src/bltGraph.C
+++ b/src/bltGraph.C
@@ -358,8 +358,8 @@ void Graph::drawPlot(Drawable drawable)
 		     right_-left_+1+2*ops->plotBW,bottom_-top_+1+2*ops->plotBW, 
 		     ops->plotBW, ops->plotRelief);
   
-  drawAxes(drawable);
   drawAxesGrids(drawable);
+  drawAxes(drawable);
   drawAxesLimits(drawable);
   drawMarkers(drawable, MARKER_UNDER);
 
@@ -439,8 +439,8 @@ int Graph::print(const char *ident, Blt_Ps ps)
     break;
   }
 
-  printAxes(ps);
   printAxesGrids(ps);
+  printAxes(ps);
   printAxesLimits(ps);
 
   if (!legend_->isRaised()) {
diff --git a/src/bltInt.C b/src/bltInt.C
index 4a73026..2c69ed5 100644
--- a/src/bltInt.C
+++ b/src/bltInt.C
@@ -30,7 +30,6 @@
 #include <tk.h>
 
 extern "C" {
-#include "bltInt.h"
 Tcl_AppInitProc Tkblt_Init;
 Tcl_AppInitProc Tkblt_SafeInit;
 Tcl_AppInitProc Blt_VectorCmdInitProc;
diff --git a/src/bltParse.C b/src/bltParse.C
index f0860dc..2f0a03c 100644
--- a/src/bltParse.C
+++ b/src/bltParse.C
@@ -35,7 +35,6 @@ using namespace std;
 
 extern "C" {
 #include "bltParse.h"
-#include "bltInt.h"
 };
 
 /*
diff --git a/src/bltSwitch.C b/src/bltSwitch.C
index 0db5213..489568f 100644
--- a/src/bltSwitch.C
+++ b/src/bltSwitch.C
@@ -28,7 +28,6 @@
  */
 
 #include <string.h>
-#include <stdarg.h>
 #include <stdlib.h>
 
 #include <iostream>
@@ -39,7 +38,6 @@ using namespace std;
 #include <tcl.h>
 
 extern "C" {
-#include "bltInt.h"
 #include "bltSwitch.h"
 };
 
@@ -364,11 +362,9 @@ int Blt_ParseSwitches(Tcl_Interp* interp, Blt_SwitchSpec *specs,
 	return -1;
       }
       if (DoSwitch(interp, sp, objv[count], record) != TCL_OK) {
-	char msg[200];
-
-	snprintf(msg, 200, "\n    (processing \"%.40s\" switch)", 
-		  sp->switchName);
-	Tcl_AddErrorInfo(interp, msg);
+	ostringstream str;
+	str << "\n    (processing \"" << sp->switchName << "\" switch)" << ends;
+	Tcl_AddErrorInfo(interp, str.str().c_str());
 	return -1;
       }
     }
diff --git a/src/bltVecCmd.C b/src/bltVecCmd.C
index bfecd7c..e615ec2 100644
--- a/src/bltVecCmd.C
+++ b/src/bltVecCmd.C
@@ -52,7 +52,6 @@
 #include <stdlib.h>
 #include <ctype.h>
 
-#include "bltInt.h"
 #include "bltVecInt.h"
 #include "bltOp.h"
 #include "bltNsUtil.h"
diff --git a/src/bltVecInt.h b/src/bltVecInt.h
index 3076b75..6a5a353 100644
--- a/src/bltVecInt.h
+++ b/src/bltVecInt.h
@@ -28,7 +28,6 @@
  */
 
 
-#include "bltInt.h"
 #include "bltChain.h"
 #include "bltVector.h"
 
@@ -85,7 +84,7 @@ typedef struct {
 
     /*
      * If you change these fields, make sure you change the definition of
-     * Blt_Vector in bltInt.h and blt.h too.
+     * Blt_Vector in blt.h too.
      */
 
     double *valueArr;		/* Array of values (malloc-ed) */
diff --git a/src/bltVecMath.C b/src/bltVecMath.C
index bb09906..efe6a27 100644
--- a/src/bltVecMath.C
+++ b/src/bltVecMath.C
@@ -36,7 +36,6 @@
 #include <errno.h>
 #include <ctype.h>
 
-#include "bltInt.h"
 #include "bltVecInt.h"
 #include "bltNsUtil.h"
 #include "bltParse.h"