summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bltGrMarkerBitmap.C3
-rw-r--r--src/bltGrAxis.C2
-rw-r--r--src/bltGrAxis.h5
-rw-r--r--src/bltGrAxisOp.C1
-rw-r--r--src/bltGrAxisOption.C1
-rw-r--r--src/bltGrElem.h5
-rw-r--r--src/bltGrElemBar.h5
-rw-r--r--src/bltGrHairs.C2
-rw-r--r--src/bltGrHairs.h5
-rw-r--r--src/bltGrLegd.h5
-rw-r--r--src/bltGrMarker.C1
-rw-r--r--src/bltGrMarker.h5
-rw-r--r--src/bltGrMarkerLine.C1
-rw-r--r--src/bltGrMarkerOption.C2
-rw-r--r--src/bltGrMarkerPolygon.C2
-rw-r--r--src/bltGrMarkerText.C1
-rw-r--r--src/bltGrPenBar.h5
-rw-r--r--src/bltGrPenLine.h5
-rw-r--r--src/bltGrXAxisOp.C2
-rw-r--r--src/bltGraph.C9
-rw-r--r--src/bltSwitch.C9
21 files changed, 34 insertions, 42 deletions
diff --git a/bltGrMarkerBitmap.C b/bltGrMarkerBitmap.C
index f3a8634..1794394 100644
--- a/bltGrMarkerBitmap.C
+++ b/bltGrMarkerBitmap.C
@@ -27,6 +27,9 @@
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
+#include <stdlib.h>
+#include <string.h>
+
#include "bltGraph.h"
#include "bltGrMarkerBitmap.h"
#include "bltGrMarkerOption.h"
diff --git a/src/bltGrAxis.C b/src/bltGrAxis.C
index d2ee6f8..5dadb9e 100644
--- a/src/bltGrAxis.C
+++ b/src/bltGrAxis.C
@@ -29,6 +29,8 @@
#include <math.h>
#include <float.h>
+#include <stdlib.h>
+#include <string.h>
extern "C" {
#include "bltInt.h"
diff --git a/src/bltGrAxis.h b/src/bltGrAxis.h
index c0090cd..8ecf325 100644
--- a/src/bltGrAxis.h
+++ b/src/bltGrAxis.h
@@ -33,11 +33,6 @@
#ifndef ___Blt_GrAxis_h__
#define ___Blt_GrAxis_h__
-#include <iostream>
-#include <sstream>
-#include <iomanip>
-using namespace std;
-
#include <tk.h>
extern "C" {
diff --git a/src/bltGrAxisOp.C b/src/bltGrAxisOp.C
index aa82f01..de86cc2 100644
--- a/src/bltGrAxisOp.C
+++ b/src/bltGrAxisOp.C
@@ -28,6 +28,7 @@
*/
#include <math.h>
+#include <string.h>
extern "C" {
#include "bltBind.h"
diff --git a/src/bltGrAxisOption.C b/src/bltGrAxisOption.C
index f07b1b8..602138c 100644
--- a/src/bltGrAxisOption.C
+++ b/src/bltGrAxisOption.C
@@ -28,6 +28,7 @@
*/
#include <math.h>
+#include <stdlib.h>
#include "bltGraph.h"
#include "bltGrAxis.h"
diff --git a/src/bltGrElem.h b/src/bltGrElem.h
index 8f42caf..e829e12 100644
--- a/src/bltGrElem.h
+++ b/src/bltGrElem.h
@@ -30,11 +30,6 @@
#ifndef __BltGrElem_h__
#define __BltGrElem_h__
-#include <iostream>
-#include <sstream>
-#include <iomanip>
-using namespace std;
-
#include <tk.h>
extern "C" {
diff --git a/src/bltGrElemBar.h b/src/bltGrElemBar.h
index c5f609d..302dc58 100644
--- a/src/bltGrElemBar.h
+++ b/src/bltGrElemBar.h
@@ -30,11 +30,6 @@
#ifndef __BltGrElemBar_h__
#define __BltGrElemBar_h__
-#include <iostream>
-#include <sstream>
-#include <iomanip>
-using namespace std;
-
#include <tk.h>
#ifdef USE_TK_STUBS
#include <tkInt.h>
diff --git a/src/bltGrHairs.C b/src/bltGrHairs.C
index 5621bbf..17a8ef2 100644
--- a/src/bltGrHairs.C
+++ b/src/bltGrHairs.C
@@ -30,6 +30,8 @@
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
+#include <stdlib.h>
+
#include "bltGraph.h"
#include "bltGrHairs.h"
#include "bltGrMisc.h"
diff --git a/src/bltGrHairs.h b/src/bltGrHairs.h
index 4d2101b..88b659f 100644
--- a/src/bltGrHairs.h
+++ b/src/bltGrHairs.h
@@ -33,11 +33,6 @@
#ifndef __BltGrHairs_h__
#define __BltGrHairs_h__
-#include <iostream>
-#include <sstream>
-#include <iomanip>
-using namespace std;
-
#include <tk.h>
#include "bltGrMisc.h"
diff --git a/src/bltGrLegd.h b/src/bltGrLegd.h
index 0a7a4bd..63e3d86 100644
--- a/src/bltGrLegd.h
+++ b/src/bltGrLegd.h
@@ -33,11 +33,6 @@
#ifndef __BltGrLegend_h__
#define __BltGrLegend_h__
-#include <iostream>
-#include <sstream>
-#include <iomanip>
-using namespace std;
-
#include <tk.h>
#include "bltGrMisc.h"
diff --git a/src/bltGrMarker.C b/src/bltGrMarker.C
index 722056d..5931abb 100644
--- a/src/bltGrMarker.C
+++ b/src/bltGrMarker.C
@@ -27,6 +27,7 @@
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
+#include <stdlib.h>
#include <math.h>
#include <float.h>
diff --git a/src/bltGrMarker.h b/src/bltGrMarker.h
index 8a59239..ddd2401 100644
--- a/src/bltGrMarker.h
+++ b/src/bltGrMarker.h
@@ -30,11 +30,6 @@
#ifndef __BltGrMarker_h__
#define __BltGrMarker_h__
-#include <iostream>
-#include <sstream>
-#include <iomanip>
-using namespace std;
-
#include <tk.h>
extern "C" {
diff --git a/src/bltGrMarkerLine.C b/src/bltGrMarkerLine.C
index 660d110..ed9ac7a 100644
--- a/src/bltGrMarkerLine.C
+++ b/src/bltGrMarkerLine.C
@@ -29,6 +29,7 @@
#include <math.h>
#include <float.h>
+#include <stdlib.h>
#include "bltGraph.h"
#include "bltGrMarkerLine.h"
diff --git a/src/bltGrMarkerOption.C b/src/bltGrMarkerOption.C
index f6bd34c..326636f 100644
--- a/src/bltGrMarkerOption.C
+++ b/src/bltGrMarkerOption.C
@@ -27,6 +27,8 @@
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
+#include <stdlib.h>
+#include <string.h>
#include <float.h>
#include "bltGrMarker.h"
diff --git a/src/bltGrMarkerPolygon.C b/src/bltGrMarkerPolygon.C
index 50339d4..1dbb3ce 100644
--- a/src/bltGrMarkerPolygon.C
+++ b/src/bltGrMarkerPolygon.C
@@ -27,6 +27,8 @@
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
+#include <stdlib.h>
+
#include "bltGraph.h"
#include "bltGrMarkerPolygon.h"
#include "bltGrMarkerOption.h"
diff --git a/src/bltGrMarkerText.C b/src/bltGrMarkerText.C
index 7d85837..62f20df 100644
--- a/src/bltGrMarkerText.C
+++ b/src/bltGrMarkerText.C
@@ -28,6 +28,7 @@
*/
#include <math.h>
+#include <stdlib.h>
#include "bltGraph.h"
#include "bltGrMarkerText.h"
diff --git a/src/bltGrPenBar.h b/src/bltGrPenBar.h
index f97b67e..5d45b14 100644
--- a/src/bltGrPenBar.h
+++ b/src/bltGrPenBar.h
@@ -30,11 +30,6 @@
#ifndef __BltGrPenBar_h__
#define __BltGrPenBar_h__
-#include <iostream>
-#include <sstream>
-#include <iomanip>
-using namespace std;
-
#include <tk.h>
#include "bltGrPen.h"
diff --git a/src/bltGrPenLine.h b/src/bltGrPenLine.h
index 0a2d2fd..b584083 100644
--- a/src/bltGrPenLine.h
+++ b/src/bltGrPenLine.h
@@ -30,11 +30,6 @@
#ifndef __BltGrPenLine_h__
#define __BltGrPenLine_h__
-#include <iostream>
-#include <sstream>
-#include <iomanip>
-using namespace std;
-
#include "bltGrPen.h"
typedef enum {
diff --git a/src/bltGrXAxisOp.C b/src/bltGrXAxisOp.C
index 00c5061..61be165 100644
--- a/src/bltGrXAxisOp.C
+++ b/src/bltGrXAxisOp.C
@@ -27,6 +27,8 @@
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
+#include <string.h>
+
#include "bltGraph.h"
#include "bltGrXAxisOp.h"
#include "bltGrAxis.h"
diff --git a/src/bltGraph.C b/src/bltGraph.C
index a4735f2..a63f6e0 100644
--- a/src/bltGraph.C
+++ b/src/bltGraph.C
@@ -29,6 +29,11 @@
#include <float.h>
+#include <iostream>
+#include <sstream>
+#include <iomanip>
+using namespace std;
+
extern "C" {
#include "bltInt.h"
#include "bltList.h"
@@ -642,7 +647,9 @@ void Graph::updateMarginTraces()
else
size = marginPtr->height;
- Tcl_SetVar(interp_, marginPtr->varName, Blt_Itoa(size),
+ ostringstream str;
+ str << size << ends;
+ Tcl_SetVar(interp_, marginPtr->varName, str.str().c_str(),
TCL_GLOBAL_ONLY);
}
}
diff --git a/src/bltSwitch.C b/src/bltSwitch.C
index a786708..22619a1 100644
--- a/src/bltSwitch.C
+++ b/src/bltSwitch.C
@@ -31,6 +31,11 @@
#include <stdarg.h>
#include <stdlib.h>
+#include <iostream>
+#include <sstream>
+#include <iomanip>
+using namespace std;
+
#include <tcl.h>
extern "C" {
@@ -283,8 +288,10 @@ static int DoSwitch(Tcl_Interp* interp, Blt_SwitchSpec *sp,
break;
default:
+ ostringstream str;
+ str << sp->type << ends;
Tcl_AppendResult(interp, "bad switch table: unknown type \"",
- Blt_Itoa(sp->type), "\"", (char *)NULL);
+ str.str().c_str(), "\"", NULL);
return TCL_ERROR;
}
sp++;
generated by cgit v0.12 at 2024-11-20 09:32:43 (GMT)