diff options
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkEntry.c | 8 | ||||
| -rw-r--r-- | generic/tkInt.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/generic/tkEntry.c b/generic/tkEntry.c index cccc6d6..9ae3a03 100644 --- a/generic/tkEntry.c +++ b/generic/tkEntry.c @@ -197,15 +197,15 @@ static const Tk_OptionSpec sbOptSpec[] = { NULL, 0, -1, 0, "-background", 0}, {TK_OPTION_PIXELS, "-borderwidth", "borderWidth", "BorderWidth", DEF_ENTRY_BORDER_WIDTH, -1, offsetof(Entry, borderWidth), 0, 0, 0}, - {TK_OPTION_BORDER, "-buttonbackground", "Button.background", "Background", + {TK_OPTION_BORDER, "-buttonbackground", "buttonBackground", "Background", DEF_BUTTON_BG_COLOR, -1, offsetof(Spinbox, buttonBorder), 0, DEF_BUTTON_BG_MONO, 0}, - {TK_OPTION_CURSOR, "-buttoncursor", "Button.cursor", "Cursor", + {TK_OPTION_CURSOR, "-buttoncursor", "buttonCursor", "Cursor", DEF_BUTTON_CURSOR, -1, offsetof(Spinbox, bCursor), TK_OPTION_NULL_OK, 0, 0}, - {TK_OPTION_RELIEF, "-buttondownrelief", "Button.relief", "Relief", + {TK_OPTION_RELIEF, "-buttondownrelief", "buttonDownRelief", "Relief", DEF_BUTTON_RELIEF, -1, offsetof(Spinbox, bdRelief), 0, 0, 0}, - {TK_OPTION_RELIEF, "-buttonuprelief", "Button.relief", "Relief", + {TK_OPTION_RELIEF, "-buttonuprelief", "buttonUpRelief", "Relief", DEF_BUTTON_RELIEF, -1, offsetof(Spinbox, buRelief), 0, 0, 0}, {TK_OPTION_STRING, "-command", "command", "Command", DEF_SPINBOX_CMD, -1, offsetof(Spinbox, command), diff --git a/generic/tkInt.h b/generic/tkInt.h index 7ef7862..f916b97 100644 --- a/generic/tkInt.h +++ b/generic/tkInt.h @@ -67,8 +67,8 @@ #endif #if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION < 7) -# define Tcl_WCharToUtfDString Tcl_UniCharToUtfDString -# define Tcl_UtfToWCharDString Tcl_UtfToUniCharDString +# define Tcl_WCharToUtfDString ((char * (*)(const WCHAR *, int len, Tcl_DString *))Tcl_UniCharToUtfDString) +# define Tcl_UtfToWCharDString ((WCHAR * (*)(const char *, int len, Tcl_DString *))Tcl_UtfToUniCharDString) # define Tcl_Char16ToUtfDString Tcl_UniCharToUtfDString # define Tcl_UtfToChar16DString Tcl_UtfToUniCharDString #endif |