Import Tk 8.6.12
This commit is contained in:
@@ -104,8 +104,13 @@ static const Tk_OptionSpec labelOptionSpecs[] = {
|
||||
NULL, 0, -1, 0, "-foreground", 0},
|
||||
{TK_OPTION_FONT, "-font", "font", "Font",
|
||||
DEF_BUTTON_FONT, -1, Tk_Offset(TkButton, tkfont), 0, 0, 0},
|
||||
#ifdef DEF_LABEL_FG
|
||||
{TK_OPTION_COLOR, "-foreground", "foreground", "Foreground",
|
||||
DEF_LABEL_FG, -1, Tk_Offset(TkButton, normalFg), 0, 0, 0},
|
||||
#else
|
||||
{TK_OPTION_COLOR, "-foreground", "foreground", "Foreground",
|
||||
DEF_BUTTON_FG, -1, Tk_Offset(TkButton, normalFg), 0, 0, 0},
|
||||
#endif
|
||||
{TK_OPTION_STRING, "-height", "height", "Height",
|
||||
DEF_BUTTON_HEIGHT, Tk_Offset(TkButton, heightPtr), -1, 0, 0, 0},
|
||||
{TK_OPTION_BORDER, "-highlightbackground", "highlightBackground",
|
||||
@@ -1036,7 +1041,7 @@ DestroyButton(
|
||||
static int
|
||||
ConfigureButton(
|
||||
Tcl_Interp *interp, /* Used for error reporting. */
|
||||
register TkButton *butPtr, /* Information about widget; may or may
|
||||
TkButton *butPtr, /* Information about widget; may or may
|
||||
* not already have values for some fields. */
|
||||
int objc, /* Number of arguments. */
|
||||
Tcl_Obj *const objv[]) /* Argument values. */
|
||||
@@ -1612,7 +1617,7 @@ ButtonVarProc(
|
||||
const char *name2, /* Second part of variable name. */
|
||||
int flags) /* Information about what happened. */
|
||||
{
|
||||
register TkButton *butPtr = clientData;
|
||||
TkButton *butPtr = clientData;
|
||||
const char *value;
|
||||
Tcl_Obj *valuePtr;
|
||||
|
||||
@@ -1817,7 +1822,7 @@ ButtonImageProc(
|
||||
* <= 0). */
|
||||
int imgWidth, int imgHeight)/* New dimensions of image. */
|
||||
{
|
||||
register TkButton *butPtr = clientData;
|
||||
TkButton *butPtr = clientData;
|
||||
|
||||
if (butPtr->tkwin != NULL) {
|
||||
TkpComputeButtonGeometry(butPtr);
|
||||
@@ -1855,7 +1860,7 @@ ButtonSelectImageProc(
|
||||
* <= 0). */
|
||||
int imgWidth, int imgHeight)/* New dimensions of image. */
|
||||
{
|
||||
register TkButton *butPtr = clientData;
|
||||
TkButton *butPtr = clientData;
|
||||
|
||||
#ifdef MAC_OSX_TK
|
||||
if (butPtr->tkwin != NULL) {
|
||||
@@ -1902,7 +1907,7 @@ ButtonTristateImageProc(
|
||||
* <= 0). */
|
||||
int imgWidth, int imgHeight)/* New dimensions of image. */
|
||||
{
|
||||
register TkButton *butPtr = clientData;
|
||||
TkButton *butPtr = clientData;
|
||||
|
||||
#ifdef MAC_OSX_TK
|
||||
if (butPtr->tkwin != NULL) {
|
||||
|
||||
Reference in New Issue
Block a user