summaryrefslogtreecommitdiffstats
path: root/generic/tkInt.h
diff options
context:
space:
mode:
Diffstat (limited to 'generic/tkInt.h')
-rw-r--r--generic/tkInt.h15
1 files changed, 7 insertions, 8 deletions
diff --git a/generic/tkInt.h b/generic/tkInt.h
index cc9dd88..d5888da 100644
--- a/generic/tkInt.h
+++ b/generic/tkInt.h
@@ -699,9 +699,9 @@ typedef struct TkMainInfo {
* down, in case it's a Tcl_ObjCmdProc2 */
#endif
unsigned int ttkNbTabsStickBit;
- /* Information used by ttk::notebook. */
+ /* Information used by ttk::notebook. */
int troughInnerX, troughInnerY, troughInnerWidth, troughInnerHeight;
- /* Information used by ttk::scale. */
+ /* Information used by ttk::scale. */
} TkMainInfo;
/*
@@ -714,7 +714,7 @@ typedef struct {
const void *source; /* Bits for bitmap. */
int width, height; /* Dimensions of bitmap. */
int native; /* 0 means generic (X style) bitmap, 1 means
- * native style bitmap. */
+ * native style bitmap. */
} TkPredefBitmap;
/*
@@ -1070,10 +1070,6 @@ typedef struct {
size_t version;
} TkObjType;
-#ifndef TCL_OBJTYPE_V0
-# define TCL_OBJTYPE_V0 /* just empty */
-#endif
-
MODULE_SCOPE const TkObjType tkBorderObjType;
MODULE_SCOPE const TkObjType tkBitmapObjType;
MODULE_SCOPE const TkObjType tkColorObjType;
@@ -1265,6 +1261,7 @@ MODULE_SCOPE void TkpDrawFrameEx(Tk_Window tkwin, Drawable drawable,
int borderWidth, int relief);
MODULE_SCOPE void TkpShowBusyWindow(TkBusy busy);
MODULE_SCOPE void TkpHideBusyWindow(TkBusy busy);
+MODULE_SCOPE Tcl_Size TkLengthOne(Tcl_Obj *);
MODULE_SCOPE void TkpMakeTransparentWindowExist(Tk_Window tkwin,
Window parent);
MODULE_SCOPE void TkpCreateBusy(Tk_FakeWin *winPtr, Tk_Window tkRef,
@@ -1272,6 +1269,8 @@ MODULE_SCOPE void TkpCreateBusy(Tk_FakeWin *winPtr, Tk_Window tkRef,
TkBusy busy);
MODULE_SCOPE int TkBackgroundEvalObjv(Tcl_Interp *interp,
Tcl_Size objc, Tcl_Obj *const *objv, int flags);
+MODULE_SCOPE void TkDrawDottedRect(Display *disp, Drawable d, GC gc,
+ int x, int y, int width, int height);
MODULE_SCOPE Tcl_Command TkMakeEnsemble(Tcl_Interp *interp,
const char *nsname, const char *name,
void *clientData, const TkEnsemble *map);
@@ -1332,7 +1331,7 @@ MODULE_SCOPE void TkpCopyRegion(TkRegion dst, TkRegion src);
# define c_class class
#endif
-#if defined(_WIN32) && !defined(STATIC_BUILD) && TCL_MAJOR_VERSION < 9
+#if defined(_WIN32) && !defined(STATIC_BUILD) && (TCL_MAJOR_VERSION < 9) && defined(TCL_MINOR_VERSION)
# define tcl_CreateFileHandler reserved9
#endif