From 1ed97aa4d994ee8d11159e147e648e8440d7e574 Mon Sep 17 00:00:00 2001 From: joye Date: Tue, 22 Apr 2014 15:40:27 +0000 Subject: *** empty log message *** --- src/bltConfig.C | 2 ++ src/bltGrAxis.C | 2 ++ src/bltGrAxis.h | 5 +++-- src/bltGrAxisOp.C | 7 +++++-- src/bltGrAxisOption.C | 2 ++ src/bltGrElem.C | 2 ++ src/bltGrElem.h | 2 +- src/bltGrElemBar.C | 4 +++- src/bltGrElemLine.C | 5 ++--- src/bltGrElemLineSpline.C | 3 ++- src/bltGrElemOp.C | 5 ++++- src/bltGrElemOption.C | 2 ++ src/bltGrHairs.C | 5 ++--- src/bltGrHairs.h | 2 -- src/bltGrHairsOp.C | 4 +++- src/bltGrLegd.C | 5 ++++- src/bltGrLegd.h | 2 -- src/bltGrLegdOp.C | 5 ++++- src/bltGrMarker.C | 4 ++++ src/bltGrMarker.h | 2 -- src/bltGrMarkerLine.C | 4 ++-- src/bltGrMarkerOp.C | 3 ++- src/bltGrMisc.C | 7 ++++--- src/bltGrMisc.h | 3 +++ src/bltGrPSOutput.C | 2 ++ src/bltGrPen.C | 2 ++ src/bltGrPen.h | 2 -- src/bltGrPenBar.C | 2 ++ src/bltGrPenLine.C | 2 ++ src/bltGrPenOp.C | 4 +++- src/bltGrPenOption.C | 2 ++ src/bltGrPostscript.C | 5 ++--- src/bltGrPostscriptOp.C | 4 +++- src/bltGrText.C | 7 ++----- src/bltGrXAxisOp.C | 7 +++++-- src/bltGraph.C | 4 +++- src/bltGraph.h | 1 + src/bltGraphBar.C | 3 --- src/bltGraphBar.h | 2 -- src/bltGraphLine.C | 3 --- src/bltGraphLine.h | 2 -- src/bltGraphOp.C | 4 ++-- src/bltGraphSup.C | 5 ++--- src/bltOp.C | 2 ++ src/bltOp.h | 7 ------- src/bltVector.h | 2 ++ 46 files changed, 95 insertions(+), 66 deletions(-) diff --git a/src/bltConfig.C b/src/bltConfig.C index 8cb5666..e93c08e 100644 --- a/src/bltConfig.C +++ b/src/bltConfig.C @@ -45,6 +45,8 @@ extern "C" { #include "bltConfig.h" #include "bltGrMisc.h" +using namespace Blt; + void RestoreProc(ClientData clientData, Tk_Window tkwin, char *ptr, char *savePtr) { diff --git a/src/bltGrAxis.C b/src/bltGrAxis.C index 03bb746..207fe01 100644 --- a/src/bltGrAxis.C +++ b/src/bltGrAxis.C @@ -40,6 +40,8 @@ extern "C" { #include "bltConfig.h" #include "bltPs.h" +using namespace Blt; + #define AXIS_PAD_TITLE 2 #define UROUND(x,u) (Round((x)/(u))*(u)) diff --git a/src/bltGrAxis.h b/src/bltGrAxis.h index 85d3e6b..f0c3d84 100644 --- a/src/bltGrAxis.h +++ b/src/bltGrAxis.h @@ -39,9 +39,10 @@ using namespace std; extern "C" { -#include "bltGraph.h" -} +#include "bltBind.h" +}; +#include "bltGraph.h" #include "bltGrMisc.h" typedef struct { diff --git a/src/bltGrAxisOp.C b/src/bltGrAxisOp.C index 5e83f56..17f6040 100644 --- a/src/bltGrAxisOp.C +++ b/src/bltGrAxisOp.C @@ -31,14 +31,17 @@ extern "C" { #include "bltInt.h" -#include "bltGraph.h" #include "bltOp.h" -} +#include "bltBind.h" +}; +#include "bltGraph.h" #include "bltGrAxis.h" #include "bltGrAxisOp.h" #include "bltGrMisc.h" +using namespace Blt; + static int GetAxisScrollInfo(Tcl_Interp* interp, int objc, Tcl_Obj* const objv[], double *offsetPtr, double windowSize, diff --git a/src/bltGrAxisOption.C b/src/bltGrAxisOption.C index 9a82ccf..ea6f537 100644 --- a/src/bltGrAxisOption.C +++ b/src/bltGrAxisOption.C @@ -35,6 +35,8 @@ extern "C" { #include "bltGrAxisOption.h" #include "bltConfig.h" +using namespace Blt; + static Tk_CustomOptionSetProc AxisSetProc; static Tk_CustomOptionGetProc AxisGetProc; static Tk_CustomOptionFreeProc AxisFreeProc; diff --git a/src/bltGrElem.C b/src/bltGrElem.C index d5c417b..d57f13f 100644 --- a/src/bltGrElem.C +++ b/src/bltGrElem.C @@ -31,6 +31,8 @@ #include "bltGrElemOp.h" #include "bltGrPenOp.h" +using namespace Blt; + Element::Element(Graph* graphPtr, const char* name, Tcl_HashEntry* hPtr) { graphPtr_ = graphPtr; diff --git a/src/bltGrElem.h b/src/bltGrElem.h index 214e427..4e509f4 100644 --- a/src/bltGrElem.h +++ b/src/bltGrElem.h @@ -36,10 +36,10 @@ using namespace std; extern "C" { -#include "bltGraph.h" #include "bltVector.h" }; +#include "bltGraph.h" #include "bltGrPen.h" #define SHOW_NONE 0 diff --git a/src/bltGrElemBar.C b/src/bltGrElemBar.C index fc4e490..bb66837 100644 --- a/src/bltGrElemBar.C +++ b/src/bltGrElemBar.C @@ -31,9 +31,9 @@ extern "C" { #include "bltInt.h" -#include "bltGraphBar.h" }; +#include "bltGraphBar.h" #include "bltGrElemBar.h" #include "bltGrElemOption.h" #include "bltGrPenOp.h" @@ -44,6 +44,8 @@ extern "C" { #include "bltConfig.h" #include "bltPs.h" +using namespace Blt; + #define CLAMP(x,l,h) ((x) = (((x)<(l))? (l) : ((x)>(h)) ? (h) : (x))) #define PointInRectangle(r,x0,y0) \ diff --git a/src/bltGrElemLine.C b/src/bltGrElemLine.C index f6224ce..6dac4ca 100644 --- a/src/bltGrElemLine.C +++ b/src/bltGrElemLine.C @@ -29,10 +29,7 @@ #include "bltMath.h" -extern "C" { #include "bltSpline.h" -} - #include "bltGrElemLine.h" #include "bltGrElemOption.h" #include "bltGrPenOp.h" @@ -43,6 +40,8 @@ extern "C" { #include "bltConfig.h" #include "bltPs.h" +using namespace Blt; + #define SEARCH_X 0 #define SEARCH_Y 1 #define SEARCH_BOTH 2 diff --git a/src/bltGrElemLineSpline.C b/src/bltGrElemLineSpline.C index 982ca89..5b9f365 100644 --- a/src/bltGrElemLineSpline.C +++ b/src/bltGrElemLineSpline.C @@ -35,10 +35,11 @@ extern "C" { #include "bltInt.h" -#include "bltSpline.h" #include "bltOp.h" }; +#include "bltSpline.h" + typedef int (SplineProc)(Point2d origPts[], int nOrigPts, Point2d intpPts[], int nIntpPts); diff --git a/src/bltGrElemOp.C b/src/bltGrElemOp.C index 89c2e57..aa6f4b5 100644 --- a/src/bltGrElemOp.C +++ b/src/bltGrElemOp.C @@ -29,10 +29,11 @@ extern "C" { #include "bltInt.h" -#include "bltGraph.h" #include "bltOp.h" +#include "bltBind.h" }; +#include "bltGraph.h" #include "bltGrAxis.h" #include "bltGrAxisOp.h" #include "bltGrElem.h" @@ -41,6 +42,8 @@ extern "C" { #include "bltGrElemOp.h" #include "bltGrLegd.h" +using namespace Blt; + // Defs static Tcl_Obj *DisplayListObj(Graph* graphPtr); diff --git a/src/bltGrElemOption.C b/src/bltGrElemOption.C index e906f09..b8f0518 100644 --- a/src/bltGrElemOption.C +++ b/src/bltGrElemOption.C @@ -37,6 +37,8 @@ extern "C" { #include "bltGrPenOp.h" #include "bltConfig.h" +using namespace Blt; + #define ELEM_SOURCE_VALUES 0 #define ELEM_SOURCE_VECTOR 1 diff --git a/src/bltGrHairs.C b/src/bltGrHairs.C index eff028d..5621bbf 100644 --- a/src/bltGrHairs.C +++ b/src/bltGrHairs.C @@ -30,14 +30,13 @@ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -extern "C" { #include "bltGraph.h" -} - #include "bltGrHairs.h" #include "bltGrMisc.h" #include "bltConfig.h" +using namespace Blt; + #define PointInGraph(g,x,y) (((x) <= (g)->right_) && ((x) >= (g)->left_) && ((y) <= (g)->bottom_) && ((y) >= (g)->top_)) static Tk_OptionSpec optionSpecs[] = { diff --git a/src/bltGrHairs.h b/src/bltGrHairs.h index 7b782c2..8da875d 100644 --- a/src/bltGrHairs.h +++ b/src/bltGrHairs.h @@ -38,9 +38,7 @@ #include using namespace std; -extern "C" { #include "bltGraph.h" -}; typedef struct { XColor* colorPtr; diff --git a/src/bltGrHairsOp.C b/src/bltGrHairsOp.C index 6327f83..7666ad2 100644 --- a/src/bltGrHairsOp.C +++ b/src/bltGrHairsOp.C @@ -31,12 +31,14 @@ */ extern "C" { -#include "bltGraph.h" #include "bltOp.h" } +#include "bltGraph.h" #include "bltGrHairs.h" +using namespace Blt; + static int CrosshairsObjConfigure(Tcl_Interp* interp, Graph* graphPtr, int objc, Tcl_Obj* const objv[]) { diff --git a/src/bltGrLegd.C b/src/bltGrLegd.C index 2f5c5ff..1402eea 100644 --- a/src/bltGrLegd.C +++ b/src/bltGrLegd.C @@ -28,9 +28,10 @@ */ extern "C" { -#include "bltGraph.h" +#include "bltBind.h" }; +#include "bltGraph.h" #include "bltGrLegd.h" #include "bltGrElem.h" #include "bltGrElemOp.h" @@ -42,6 +43,8 @@ extern "C" { #include "bltConfig.h" #include "bltPs.h" +using namespace Blt; + static void SelectCmdProc(ClientData); static Tcl_IdleProc DisplayProc; static Tk_SelectionProc SelectionProc; diff --git a/src/bltGrLegd.h b/src/bltGrLegd.h index d47cdac..453f131 100644 --- a/src/bltGrLegd.h +++ b/src/bltGrLegd.h @@ -38,9 +38,7 @@ #include using namespace std; -extern "C" { #include "bltGraph.h" -}; /* * Selection related flags: diff --git a/src/bltGrLegdOp.C b/src/bltGrLegdOp.C index cd70ed6..f80cda7 100644 --- a/src/bltGrLegdOp.C +++ b/src/bltGrLegdOp.C @@ -28,13 +28,16 @@ */ extern "C" { -#include "bltGraph.h" #include "bltOp.h" +#include "bltBind.h" }; +#include "bltGraph.h" #include "bltGrLegd.h" #include "bltGrElem.h" +using namespace Blt; + static Tk_LostSelProc LostSelectionProc; static int SelectionOp(Graph* graphPtr, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]); diff --git a/src/bltGrMarker.C b/src/bltGrMarker.C index 03309d6..57845d3 100644 --- a/src/bltGrMarker.C +++ b/src/bltGrMarker.C @@ -27,6 +27,10 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +extern "C" { +#include "bltBind.h" +}; + #include "bltGrMarker.h" #include "bltGrAxis.h" #include "bltGrMisc.h" diff --git a/src/bltGrMarker.h b/src/bltGrMarker.h index f22a5aa..c83338f 100644 --- a/src/bltGrMarker.h +++ b/src/bltGrMarker.h @@ -35,9 +35,7 @@ #include using namespace std; -extern "C" { #include "bltGraph.h" -}; namespace Blt { diff --git a/src/bltGrMarkerLine.C b/src/bltGrMarkerLine.C index b3e2bc6..91906fb 100644 --- a/src/bltGrMarkerLine.C +++ b/src/bltGrMarkerLine.C @@ -34,10 +34,10 @@ #include "bltConfig.h" #include "bltPs.h" -#define BOUND(x, lo, hi) (((x) > (hi)) ? (hi) : ((x) < (lo)) ? (lo) : (x)) - using namespace Blt; +#define BOUND(x, lo, hi) (((x) > (hi)) ? (hi) : ((x) < (lo)) ? (lo) : (x)) + static Tk_OptionSpec optionSpecs[] = { {TK_OPTION_CUSTOM, "-bindtags", "bindTags", "BindTags", "Line all", -1, Tk_Offset(LineMarkerOptions, tags), diff --git a/src/bltGrMarkerOp.C b/src/bltGrMarkerOp.C index 2b80e94..4079330 100644 --- a/src/bltGrMarkerOp.C +++ b/src/bltGrMarkerOp.C @@ -29,10 +29,11 @@ extern "C" { #include "bltInt.h" -#include "bltGraph.h" #include "bltOp.h" +#include "bltBind.h" }; +#include "bltGraph.h" #include "bltGrElem.h" #include "bltGrMarkerOp.h" #include "bltGrMarker.h" diff --git a/src/bltGrMisc.C b/src/bltGrMisc.C index 5f3a5fc..c9ac657 100644 --- a/src/bltGrMisc.C +++ b/src/bltGrMisc.C @@ -27,11 +27,12 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -extern "C" { #include "bltGraph.h" -}; +#include "bltGrMisc.h" -char* dupstr(const char* str) +using namespace Blt; + +char* Blt::dupstr(const char* str) { char* copy =NULL; if (str) { diff --git a/src/bltGrMisc.h b/src/bltGrMisc.h index 3611d58..8f23646 100644 --- a/src/bltGrMisc.h +++ b/src/bltGrMisc.h @@ -167,7 +167,9 @@ typedef struct { #define LineIsDashed(d) ((d).values[0] != 0) +namespace Blt { extern char* dupstr(const char*); +}; extern void Blt_SetDashes (Display *display, GC gc, Blt_Dashes *dashesPtr); @@ -187,4 +189,5 @@ extern Point2d Blt_GetProjection (int x, int y, Point2d *p, Point2d *q); extern long Blt_MaxRequestSize (Display *display, size_t elemSize); extern Graph *Blt_GetGraphFromWindowData(Tk_Window tkwin); + #endif diff --git a/src/bltGrPSOutput.C b/src/bltGrPSOutput.C index 405fc05..613b905 100644 --- a/src/bltGrPSOutput.C +++ b/src/bltGrPSOutput.C @@ -38,6 +38,8 @@ extern "C" { #include "bltGrPageSetup.h" #include "bltPs.h" +using namespace Blt; + #ifdef TCL_UTF_MAX # define HAVE_UTF 1 #else diff --git a/src/bltGrPen.C b/src/bltGrPen.C index 1d4d039..5477ae8 100644 --- a/src/bltGrPen.C +++ b/src/bltGrPen.C @@ -29,6 +29,8 @@ #include "bltGrPen.h" +using namespace Blt; + Pen::Pen(Graph* graphPtr, const char* name, Tcl_HashEntry* hPtr) { optionTable_ = NULL; diff --git a/src/bltGrPen.h b/src/bltGrPen.h index 5766149..e5db6fe 100644 --- a/src/bltGrPen.h +++ b/src/bltGrPen.h @@ -35,9 +35,7 @@ #include using namespace std; -extern "C" { #include "bltGraph.h" -}; typedef struct { int errorBarShow; diff --git a/src/bltGrPenBar.C b/src/bltGrPenBar.C index 180a1a1..85f1fcf 100644 --- a/src/bltGrPenBar.C +++ b/src/bltGrPenBar.C @@ -31,6 +31,8 @@ #include "bltGrDef.h" #include "bltConfig.h" +using namespace Blt; + static Tk_OptionSpec barPenOptionSpecs[] = { {TK_OPTION_BORDER, "-background", "background", "Background", STD_NORMAL_FOREGROUND, -1, Tk_Offset(BarPenOptions, fill), diff --git a/src/bltGrPenLine.C b/src/bltGrPenLine.C index 7d37548..436e965 100644 --- a/src/bltGrPenLine.C +++ b/src/bltGrPenLine.C @@ -32,6 +32,8 @@ #include "bltGrDef.h" #include "bltConfig.h" +using namespace Blt; + typedef struct { const char* name; unsigned int minChars; diff --git a/src/bltGrPenOp.C b/src/bltGrPenOp.C index 1b2885a..890eed2 100644 --- a/src/bltGrPenOp.C +++ b/src/bltGrPenOp.C @@ -28,15 +28,17 @@ */ extern "C" { -#include "bltGraph.h" #include "bltOp.h" }; +#include "bltGraph.h" #include "bltGrPen.h" #include "bltGrPenOp.h" #include "bltGrPenLine.h" #include "bltGrPenBar.h" +using namespace Blt; + int PenObjConfigure(Tcl_Interp* interp, Graph* graphPtr, Pen* penPtr, int objc, Tcl_Obj* const objv[]) { diff --git a/src/bltGrPenOption.C b/src/bltGrPenOption.C index 0633a88..469c1d8 100644 --- a/src/bltGrPenOption.C +++ b/src/bltGrPenOption.C @@ -31,6 +31,8 @@ #include "bltGrPenOp.h" #include "bltConfig.h" +using namespace Blt; + static Tk_CustomOptionSetProc PenSetProc; static Tk_CustomOptionGetProc PenGetProc; static Tk_CustomOptionFreeProc PenFreeProc; diff --git a/src/bltGrPostscript.C b/src/bltGrPostscript.C index 39254c7..f287aee 100644 --- a/src/bltGrPostscript.C +++ b/src/bltGrPostscript.C @@ -27,13 +27,12 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -extern "C" { #include "bltGraph.h" -}; - #include "bltGrPageSetup.h" #include "bltConfig.h" +using namespace Blt; + static Tk_OptionSpec optionSpecs[] = { {TK_OPTION_BOOLEAN, "-center", "center", "Center", "yes", -1, Tk_Offset(PageSetupOptions, center), 0, NULL, 0}, diff --git a/src/bltGrPostscriptOp.C b/src/bltGrPostscriptOp.C index ba81d46..2e07548 100644 --- a/src/bltGrPostscriptOp.C +++ b/src/bltGrPostscriptOp.C @@ -28,13 +28,15 @@ */ extern "C" { -#include "bltGraph.h" #include "bltOp.h" }; +#include "bltGraph.h" #include "bltGrPageSetupOp.h" #include "bltPs.h" +using namespace Blt; + int PageSetupObjConfigure(Tcl_Interp* interp, Graph* graphPtr, int objc, Tcl_Obj* const objv[]) { diff --git a/src/bltGrText.C b/src/bltGrText.C index 9c484fe..ecc5ea6 100644 --- a/src/bltGrText.C +++ b/src/bltGrText.C @@ -27,10 +27,6 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include -#include - -#include "bltC.h" #include "bltMath.h" extern "C" { @@ -39,9 +35,10 @@ extern "C" { #include #include "bltInt.h" -#include "bltText.h" }; +#include "bltText.h" + #define ROTATE_0 0 #define ROTATE_90 1 #define ROTATE_180 2 diff --git a/src/bltGrXAxisOp.C b/src/bltGrXAxisOp.C index 385b455..0bb573c 100644 --- a/src/bltGrXAxisOp.C +++ b/src/bltGrXAxisOp.C @@ -28,13 +28,16 @@ */ extern "C" { -#include "bltGraph.h" #include "bltOp.h" -} +#include "bltBind.h" +}; +#include "bltGraph.h" #include "bltGrAxis.h" #include "bltGrAxisOp.h" +using namespace Blt; + extern int AxisCgetOp(Tcl_Interp* interp, Axis* axisPtr, int objc, Tcl_Obj* const objv[]); extern int AxisConfigureOp(Tcl_Interp* interp, Axis* axisPtr, diff --git a/src/bltGraph.C b/src/bltGraph.C index e57cccd..e97b713 100644 --- a/src/bltGraph.C +++ b/src/bltGraph.C @@ -29,9 +29,11 @@ extern "C" { #include "bltInt.h" -#include "bltGraph.h" +#include "bltList.h" +#include "bltBind.h" } +#include "bltGraph.h" #include "bltGraphOp.h" #include "bltGrAxis.h" diff --git a/src/bltGraph.h b/src/bltGraph.h index ebd229e..16af69f 100644 --- a/src/bltGraph.h +++ b/src/bltGraph.h @@ -45,6 +45,7 @@ class Axis; class Element; class Legend; class Pen; +class PageSetup; typedef struct _Blt_Ps *Blt_Ps; diff --git a/src/bltGraphBar.C b/src/bltGraphBar.C index 9713a0f..43bc286 100644 --- a/src/bltGraphBar.C +++ b/src/bltGraphBar.C @@ -27,10 +27,7 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -extern "C" { #include "bltGraphBar.h" -} - #include "bltGraphOp.h" #include "bltGrAxis.h" diff --git a/src/bltGraphBar.h b/src/bltGraphBar.h index 6b34184..7c0ebb0 100644 --- a/src/bltGraphBar.h +++ b/src/bltGraphBar.h @@ -30,9 +30,7 @@ #ifndef __BltGraphBar_h__ #define __BltGraphBar_h__ -extern "C" { #include "bltGraph.h" -}; typedef struct { int nSegments; diff --git a/src/bltGraphLine.C b/src/bltGraphLine.C index edcd33c..744186d 100644 --- a/src/bltGraphLine.C +++ b/src/bltGraphLine.C @@ -27,10 +27,7 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -extern "C" { #include "bltGraphLine.h" -} - #include "bltGraphOp.h" #include "bltGrAxis.h" diff --git a/src/bltGraphLine.h b/src/bltGraphLine.h index 595a10e..57b2e19 100644 --- a/src/bltGraphLine.h +++ b/src/bltGraphLine.h @@ -30,9 +30,7 @@ #ifndef __BltGraphLine_h__ #define __BltGraphLine_h__ -extern "C" { #include "bltGraph.h" -}; typedef struct { double aspect; diff --git a/src/bltGraphOp.C b/src/bltGraphOp.C index 2229da8..46efd32 100644 --- a/src/bltGraphOp.C +++ b/src/bltGraphOp.C @@ -32,11 +32,11 @@ extern "C" { #include "bltInt.h" #include "bltList.h" -#include "bltGraphLine.h" -#include "bltGraphBar.h" #include "bltOp.h" } +#include "bltGraphLine.h" +#include "bltGraphBar.h" #include "bltGraphOp.h" #include "bltGrAxis.h" diff --git a/src/bltGraphSup.C b/src/bltGraphSup.C index ac207f3..26702e9 100644 --- a/src/bltGraphSup.C +++ b/src/bltGraphSup.C @@ -29,15 +29,14 @@ #include "bltMath.h" -extern "C" { #include "bltGraph.h" -} - #include "bltGrAxis.h" #include "bltGrElem.h" #include "bltGrLegd.h" #include "bltGrMisc.h" +using namespace Blt; + #define AXIS_PAD_TITLE 2 /* diff --git a/src/bltOp.C b/src/bltOp.C index 2ef61c7..429e8f9 100644 --- a/src/bltOp.C +++ b/src/bltOp.C @@ -27,6 +27,8 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include + extern "C" { #include "bltOp.h" }; diff --git a/src/bltOp.h b/src/bltOp.h index 04c584f..41dfdba 100644 --- a/src/bltOp.h +++ b/src/bltOp.h @@ -31,14 +31,7 @@ */ #include -#ifdef USE_TCL_STUBS -#include -#endif - #include -#ifdef USE_TK_STUBS -#include -#endif typedef struct { const char *name; /* Name of operation */ diff --git a/src/bltVector.h b/src/bltVector.h index fed6360..6712a42 100644 --- a/src/bltVector.h +++ b/src/bltVector.h @@ -33,6 +33,8 @@ #ifndef _BLT_VECTOR_H #define _BLT_VECTOR_H +#include + typedef enum { BLT_VECTOR_NOTIFY_UPDATE = 1, /* The vector's values has been updated */ BLT_VECTOR_NOTIFY_DESTROY /* The vector has been destroyed and the client -- cgit v0.12