From 84f58e8150c0a587fea4de8b79121053fa910701 Mon Sep 17 00:00:00 2001
From: joye <joye>
Date: Thu, 13 Mar 2014 17:11:07 +0000
Subject: *** empty log message ***

---
 configure             |  4 ++--
 configure.in          |  4 ++--
 src/bltGrMarker.C     |  7 ++-----
 src/bltGrMarkerText.C | 12 +++++++-----
 src/bltGrMarkerText.h |  2 --
 5 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/configure b/configure
index d179228..d7e87a1 100755
--- a/configure
+++ b/configure
@@ -5540,8 +5540,8 @@ done
 	bltGrMarkerBitmap.C
 	bltGrMarkerLine.C
 	bltGrMarkerPolygon.C
-	bltGrMarkerText.c
-	bltGrMarkerWindow.c
+	bltGrMarkerText.C
+	bltGrMarkerWindow.C
 	bltGrMisc.c
 	bltGrPen.c
 	bltGrPs.c
diff --git a/configure.in b/configure.in
index 9e3f2ca..a6c3a1e 100755
--- a/configure.in
+++ b/configure.in
@@ -85,8 +85,8 @@ TEA_ADD_SOURCES([
 	bltGrMarkerBitmap.C
 	bltGrMarkerLine.C
 	bltGrMarkerPolygon.C
-	bltGrMarkerText.c
-	bltGrMarkerWindow.c
+	bltGrMarkerText.C
+	bltGrMarkerWindow.C
 	bltGrMisc.c
 	bltGrPen.c
 	bltGrPs.c
diff --git a/src/bltGrMarker.C b/src/bltGrMarker.C
index 4d28c21..70c7421 100644
--- a/src/bltGrMarker.C
+++ b/src/bltGrMarker.C
@@ -37,14 +37,11 @@ extern "C" {
 
 #include "bltGrMarker.h"
 
-extern "C" {
-#include "bltGrMarkerText.h"
-#include "bltGrMarkerWindow.h"
-};
-
 extern MarkerCreateProc Blt_CreateBitmapProc;
 extern MarkerCreateProc Blt_CreateLineProc;
 extern MarkerCreateProc Blt_CreatePolygonProc;
+extern MarkerCreateProc Blt_CreateTextProc;
+extern MarkerCreateProc Blt_CreateWindowProc;
 
 #define NORMALIZE(A,x) 	(((x) - (A)->axisRange.min) * (A)->axisRange.scale)
 
diff --git a/src/bltGrMarkerText.C b/src/bltGrMarkerText.C
index 137a181..b96203c 100644
--- a/src/bltGrMarkerText.C
+++ b/src/bltGrMarkerText.C
@@ -27,13 +27,15 @@
  *	WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
+extern "C" {
 #include "bltGraph.h"
-#include "bltGrMarkerText.h"
 #include "bltMath.h"
+Point2d Blt_MapPoint(Point2d *pointPtr, Axis2d *axesPtr);
+int Blt_BoxesDontOverlap(Graph* graphPtr, Region2d *extsPtr);
+void Blt_FreeMarker(char*);
+};
 
-extern Point2d Blt_MapPoint(Point2d *pointPtr, Axis2d *axesPtr);
-extern int Blt_BoxesDontOverlap(Graph* graphPtr, Region2d *extsPtr);
-extern void Blt_FreeMarker(char*);
+#include "bltGrMarkerText.h"
 
 static Tk_OptionSpec optionSpecs[] = {
   {TK_OPTION_ANCHOR, "-anchor", "anchor", "Anchor", 
@@ -106,7 +108,7 @@ static MarkerClass textMarkerClass = {
 
 Marker* Blt_CreateTextProc(Graph* graphPtr)
 {
-  TextMarker* tmPtr = calloc(1, sizeof(TextMarker));
+  TextMarker* tmPtr = (TextMarker*)calloc(1, sizeof(TextMarker));
   tmPtr->classPtr = &textMarkerClass;
   Blt_Ts_InitStyle(tmPtr->style);
   tmPtr->style.anchor = TK_ANCHOR_NW;
diff --git a/src/bltGrMarkerText.h b/src/bltGrMarkerText.h
index c826a21..d4cd1c3 100644
--- a/src/bltGrMarkerText.h
+++ b/src/bltGrMarkerText.h
@@ -75,6 +75,4 @@ typedef struct {
   GC fillGC;
 } TextMarker;
 
-extern MarkerCreateProc Blt_CreateTextProc;
-
 #endif
-- 
cgit v0.12