summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhobbs <hobbs>2003-10-13 03:30:04 (GMT)
committerhobbs <hobbs>2003-10-13 03:30:04 (GMT)
commit36942822bfe420c414a9d44a6cfd15358ab5475b (patch)
tree7bee99d61ffbebd57a9d253ec34910cc39a59afd
parentf7654c43f895fd31af766c4c55b0ce763d2f7aba (diff)
downloadtk-36942822bfe420c414a9d44a6cfd15358ab5475b.zip
tk-36942822bfe420c414a9d44a6cfd15358ab5475b.tar.gz
tk-36942822bfe420c414a9d44a6cfd15358ab5475b.tar.bz2
* generic/tkInt.h: move TkGetOptionSpec to stubs intDecls
* generic/tkIntDecls.h: * generic/tkInt.decls: * generic/tkStubInit.c:
-rw-r--r--ChangeLog5
-rw-r--r--generic/tkInt.decls7
-rw-r--r--generic/tkInt.h5
-rw-r--r--generic/tkIntDecls.h10
-rw-r--r--generic/tkStubInit.c3
5 files changed, 23 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 117d309..bcf143b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2003-10-12 Jeff Hobbs <jeffh@ActiveState.com>
+ * generic/tkInt.h: move TkGetOptionSpec to stubs intDecls
+ * generic/tkIntDecls.h:
+ * generic/tkInt.decls:
+ * generic/tkStubInit.c:
+
* tests/listbox.test (13.3): correct result size
(4.7): correct test for possible window drift [Bug #701931] (dgp)
diff --git a/generic/tkInt.decls b/generic/tkInt.decls
index 951bb45..eb1d607 100644
--- a/generic/tkInt.decls
+++ b/generic/tkInt.decls
@@ -9,7 +9,7 @@
# See the file "license.terms" for information on usage and redistribution
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
#
-# RCS: @(#) $Id: tkInt.decls,v 1.33 2003/01/22 14:32:59 dkf Exp $
+# RCS: @(#) $Id: tkInt.decls,v 1.33.2.1 2003/10/13 03:30:04 hobbs Exp $
library tk
@@ -673,6 +673,11 @@ declare 148 generic {
CONST char *cmdName)
}
+declare 149 generic {
+ CONST Tk_OptionSpec * TkGetOptionSpec (CONST char *name,
+ Tk_OptionTable optionTable)
+}
+
##############################################################################
# Define the platform specific internal Tcl interface. These functions are
diff --git a/generic/tkInt.h b/generic/tkInt.h
index 2723d41..4cf39d5 100644
--- a/generic/tkInt.h
+++ b/generic/tkInt.h
@@ -11,7 +11,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: $Id: tkInt.h,v 1.56 2003/02/18 06:22:44 mdejong Exp $
+ * RCS: $Id: tkInt.h,v 1.56.2.1 2003/10/13 03:30:05 hobbs Exp $
*/
#ifndef _TKINT
@@ -1113,9 +1113,6 @@ EXTERN char * TkCanvasDashPrintProc _ANSI_ARGS_((
EXTERN int TkGetDoublePixels _ANSI_ARGS_((Tcl_Interp *interp,
Tk_Window tkwin, CONST char *string,
double *doublePtr));
-EXTERN CONST Tk_OptionSpec *
- TkGetOptionSpec _ANSI_ARGS_((CONST char *name,
- Tk_OptionTable optionTable));
EXTERN int TkOffsetParseProc _ANSI_ARGS_((
ClientData clientData, Tcl_Interp *interp,
Tk_Window tkwin, CONST char *value, char *widgRec,
diff --git a/generic/tkIntDecls.h b/generic/tkIntDecls.h
index d50dab4..ac3093e 100644
--- a/generic/tkIntDecls.h
+++ b/generic/tkIntDecls.h
@@ -11,7 +11,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkIntDecls.h,v 1.22 2003/01/22 14:33:00 dkf Exp $
+ * RCS: @(#) $Id: tkIntDecls.h,v 1.22.2.1 2003/10/13 03:30:05 hobbs Exp $
*/
#ifndef _TKINTDECLS
@@ -559,6 +559,9 @@ EXTERN void TkStylePkgFree _ANSI_ARGS_((TkMainInfo * mainPtr));
/* 148 */
EXTERN Tk_Window TkToplevelWindowForCommand _ANSI_ARGS_((
Tcl_Interp * interp, CONST char * cmdName));
+/* 149 */
+EXTERN CONST Tk_OptionSpec * TkGetOptionSpec _ANSI_ARGS_((CONST char * name,
+ Tk_OptionTable optionTable));
typedef struct TkIntStubs {
int magic;
@@ -834,6 +837,7 @@ typedef struct TkIntStubs {
void (*tkStylePkgInit) _ANSI_ARGS_((TkMainInfo * mainPtr)); /* 146 */
void (*tkStylePkgFree) _ANSI_ARGS_((TkMainInfo * mainPtr)); /* 147 */
Tk_Window (*tkToplevelWindowForCommand) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * cmdName)); /* 148 */
+ CONST Tk_OptionSpec * (*tkGetOptionSpec) _ANSI_ARGS_((CONST char * name, Tk_OptionTable optionTable)); /* 149 */
} TkIntStubs;
#ifdef __cplusplus
@@ -1543,6 +1547,10 @@ extern TkIntStubs *tkIntStubsPtr;
#define TkToplevelWindowForCommand \
(tkIntStubsPtr->tkToplevelWindowForCommand) /* 148 */
#endif
+#ifndef TkGetOptionSpec
+#define TkGetOptionSpec \
+ (tkIntStubsPtr->tkGetOptionSpec) /* 149 */
+#endif
#endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c
index 259baf3..335dee7 100644
--- a/generic/tkStubInit.c
+++ b/generic/tkStubInit.c
@@ -8,7 +8,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkStubInit.c,v 1.41 2003/01/22 14:33:00 dkf Exp $
+ * RCS: @(#) $Id: tkStubInit.c,v 1.41.2.1 2003/10/13 03:30:05 hobbs Exp $
*/
#include "tkInt.h"
@@ -329,6 +329,7 @@ TkIntStubs tkIntStubs = {
TkStylePkgInit, /* 146 */
TkStylePkgFree, /* 147 */
TkToplevelWindowForCommand, /* 148 */
+ TkGetOptionSpec, /* 149 */
};
TkIntPlatStubs tkIntPlatStubs = {