diff options
| author | joye <joye> | 2014-03-13 17:11:07 (GMT) |
|---|---|---|
| committer | joye <joye> | 2014-03-13 17:11:07 (GMT) |
| commit | 84f58e8150c0a587fea4de8b79121053fa910701 (patch) | |
| tree | 0b0868933113fc4b66b4a5e9549d8e22fa38b282 /src | |
| parent | 1c74800eaffa4932f9593e2a611208a8692cde09 (diff) | |
| download | blt-84f58e8150c0a587fea4de8b79121053fa910701.zip blt-84f58e8150c0a587fea4de8b79121053fa910701.tar.gz blt-84f58e8150c0a587fea4de8b79121053fa910701.tar.bz2 | |
*** empty log message ***
Diffstat (limited to 'src')
| -rw-r--r-- | src/bltGrMarker.C | 7 | ||||
| -rw-r--r-- | src/bltGrMarkerText.C | 12 | ||||
| -rw-r--r-- | src/bltGrMarkerText.h | 2 |
3 files changed, 9 insertions, 12 deletions
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 |