diff options
Diffstat (limited to 'win')
| -rw-r--r-- | win/tkWinCursor.c | 4 | ||||
| -rw-r--r-- | win/tkWinDialog.c | 10 | ||||
| -rw-r--r-- | win/tkWinEmbed.c | 15 | ||||
| -rw-r--r-- | win/tkWinFont.c | 145 | ||||
| -rw-r--r-- | win/tkWinKey.c | 35 | ||||
| -rw-r--r-- | win/tkWinMenu.c | 78 | ||||
| -rw-r--r-- | win/tkWinSend.c | 58 | ||||
| -rw-r--r-- | win/tkWinWm.c | 34 | ||||
| -rw-r--r-- | win/ttkWinMonitor.c | 25 | ||||
| -rw-r--r-- | win/ttkWinTheme.c | 24 |
10 files changed, 225 insertions, 203 deletions
diff --git a/win/tkWinCursor.c b/win/tkWinCursor.c index 653fbbe..825340c 100644 --- a/win/tkWinCursor.c +++ b/win/tkWinCursor.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: tkWinCursor.c,v 1.13 2005/12/02 00:19:04 dkf Exp $ + * RCS: @(#) $Id: tkWinCursor.c,v 1.14 2007/09/08 16:13:45 dkf Exp $ */ #include "tkWinInt.h" @@ -222,7 +222,7 @@ void TkpFreeCursor( TkCursor *cursorPtr) { - TkWinCursor *winCursorPtr = (TkWinCursor *) cursorPtr; + /* TkWinCursor *winCursorPtr = (TkWinCursor *) cursorPtr; */ } /* diff --git a/win/tkWinDialog.c b/win/tkWinDialog.c index 9cab235..2e85cb6 100644 --- a/win/tkWinDialog.c +++ b/win/tkWinDialog.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: tkWinDialog.c,v 1.45 2007/08/01 09:02:54 patthoyts Exp $ + * RCS: @(#) $Id: tkWinDialog.c,v 1.46 2007/09/08 16:13:45 dkf Exp $ * */ @@ -2011,7 +2011,6 @@ Tk_MessageBoxObjCmd( int defaultBtn, icon, type; int i, oldMode, winCode; UINT flags; - Tcl_Encoding unicodeEncoding = TkWinGetUnicodeEncoding(); static CONST char *optionStrings[] = { "-default", "-detail", "-icon", "-message", "-parent", "-title", "-type", NULL @@ -2023,6 +2022,7 @@ Tk_MessageBoxObjCmd( ThreadSpecificData *tsdPtr = (ThreadSpecificData *) Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData)); + (void) TkWinGetUnicodeEncoding(); tkwin = (Tk_Window) clientData; defaultBtn = -1; @@ -2101,9 +2101,8 @@ Tk_MessageBoxObjCmd( flags = 0; if (defaultBtn >= 0) { - int defaultBtnIdx; + int defaultBtnIdx = -1; - defaultBtnIdx = -1; for (i = 0; i < NUM_TYPES; i++) { if (type == allowedTypes[i].type) { int j; @@ -2128,7 +2127,8 @@ Tk_MessageBoxObjCmd( flags |= icon | type | MB_SYSTEMMODAL; - tmpObj = messageObj ? Tcl_DuplicateObj(messageObj) : Tcl_NewUnicodeObj(NULL, 0); + tmpObj = messageObj ? Tcl_DuplicateObj(messageObj) + : Tcl_NewUnicodeObj(NULL, 0); Tcl_IncrRefCount(tmpObj); if (detailObj) { Tcl_AppendUnicodeToObj(tmpObj, L"\n\n", 2); diff --git a/win/tkWinEmbed.c b/win/tkWinEmbed.c index b8b0b1e..7322c7c 100644 --- a/win/tkWinEmbed.c +++ b/win/tkWinEmbed.c @@ -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: tkWinEmbed.c,v 1.31 2006/05/29 22:21:40 hobbs Exp $ + * RCS: @(#) $Id: tkWinEmbed.c,v 1.32 2007/09/08 16:13:45 dkf Exp $ */ #include "tkWinInt.h" @@ -240,12 +240,15 @@ TkpUseWindow( TkWindow *winPtr = (TkWindow *) tkwin; int id; HWND hwnd; +/* ThreadSpecificData *tsdPtr = (ThreadSpecificData *) Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData)); +*/ /* if (winPtr->window != None) { - Tcl_AppendResult(interp, "can't modify container after widget is created", NULL); + Tcl_AppendResult(interp, + "can't modify container after widget is created", NULL); return TCL_ERROR; } */ @@ -315,15 +318,15 @@ TkpUseWindow( winPtr->privatePtr = (struct TkWindowPrivate*) hwnd; winPtr->flags |= TK_EMBEDDED; - winPtr->flags &= (~(TK_MAPPED)); + winPtr->flags &= ~(TK_MAPPED); /* * Preserve the winPtr and create an idle handler to map the embedded * window. */ - Tcl_Preserve((ClientData)winPtr); - Tcl_DoWhenIdle(Tk_MapEmbeddedWindow,(ClientData)winPtr); + Tcl_Preserve((ClientData) winPtr); + Tcl_DoWhenIdle((Tcl_IdleProc*) Tk_MapEmbeddedWindow, (ClientData) winPtr); return TCL_OK; } @@ -386,6 +389,7 @@ TkpMakeContainer( ContainerEventProc, (ClientData) containerPtr); } +#if 0 /* *---------------------------------------------------------------------- * @@ -416,6 +420,7 @@ EmbeddedEventProc( EmbedWindowDeleted(winPtr); } } +#endif /* *---------------------------------------------------------------------- diff --git a/win/tkWinFont.c b/win/tkWinFont.c index 5021955..69ae9f9 100644 --- a/win/tkWinFont.c +++ b/win/tkWinFont.c @@ -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: tkWinFont.c,v 1.32 2007/05/04 21:29:22 patthoyts Exp $ + * RCS: @(#) $Id: tkWinFont.c,v 1.33 2007/09/08 16:13:45 dkf Exp $ */ #include "tkWinInt.h" @@ -279,7 +279,6 @@ TkpFontPkgInit( * Map a platform-specific native font name to a TkFont. * * Results: - * The return value is a pointer to a TkFont that represents the native * font. If a native font by the given name could not be found, the * return value is NULL. @@ -500,10 +499,10 @@ TkpGetFontFromAttributes( char ***fontFallbacks; Tk_Uid faceName, fallback, actualName; - tkwin = (Tk_Window) ((TkWindow *) tkwin)->mainPtr->winPtr; - window = Tk_WindowId(tkwin); - hwnd = (window == None) ? NULL : TkWinGetHWND(window); - hdc = GetDC(hwnd); + tkwin = (Tk_Window) ((TkWindow *) tkwin)->mainPtr->winPtr; + window = Tk_WindowId(tkwin); + hwnd = (window == None) ? NULL : TkWinGetHWND(window); + hdc = GetDC(hwnd); /* * Algorithm to get the closest font name to the one requested. @@ -613,9 +612,9 @@ TkpGetFontFamilies( HWND hwnd; Window window; - window = Tk_WindowId(tkwin); - hwnd = (window == None) ? NULL : TkWinGetHWND(window); - hdc = GetDC(hwnd); + window = Tk_WindowId(tkwin); + hwnd = (window == None) ? NULL : TkWinGetHWND(window); + hdc = GetDC(hwnd); /* * On any version NT, there may fonts with international names. Use the @@ -706,8 +705,8 @@ TkpGetSubFonts( * * TkpGetFontAttrsForChar -- * - * Retrieve the font attributes of the actual font used to render - * a given character. + * Retrieve the font attributes of the actual font used to render a given + * character. * * Results: * None. @@ -741,8 +740,9 @@ TkpGetFontAttrsForChar( HFONT oldfont; /* Saved font from the device context */ TEXTMETRIC tm; /* Font metrics of the selected subfont */ - - /* Get the font attributes */ + /* + * Get the font attributes. + */ oldfont = SelectObject(hdc, thisSubFontPtr->hFont); GetTextMetrics(hdc, &tm); @@ -750,7 +750,7 @@ TkpGetFontAttrsForChar( ReleaseDC(fontPtr->hwnd, hdc); faPtr->family = familyPtr->faceName; faPtr->size = TkFontGetPoints(tkwin, - tm.tmInternalLeading - tm.tmHeight); + tm.tmInternalLeading - tm.tmHeight); faPtr->weight = (tm.tmWeight > FW_MEDIUM) ? TK_FW_BOLD : TK_FW_NORMAL; faPtr->slant = tm.tmItalic ? TK_FS_ITALIC : TK_FS_ROMAN; faPtr->underline = (tm.tmUnderlined != 0); @@ -805,14 +805,12 @@ Tk_MeasureChars( HDC hdc; HFONT oldFont; WinFont *fontPtr; - int curX; + int curX, moretomeasure; Tcl_UniChar ch; SIZE size; - int moretomeasure; FontFamily *familyPtr; Tcl_DString runString; - SubFont *thisSubFontPtr; - SubFont *lastSubFontPtr; + SubFont *thisSubFontPtr, *lastSubFontPtr; CONST char *p, *end, *next = NULL, *start; if (numBytes == 0) { @@ -987,19 +985,18 @@ Tk_MeasureChars( * TkpMeasureCharsInContext -- * * Determine the number of bytes from the string that will fit in the - * given horizontal span. The measurement is done under the assumption + * given horizontal span. The measurement is done under the assumption * that TkpDrawCharsInContext() will be used to actually display the * characters. * * This one is almost the same as Tk_MeasureChars(), but with access to - * all the characters on the line for context. On Windows this context + * all the characters on the line for context. On Windows this context * isn't consulted, so we just call Tk_MeasureChars(). * * Results: - * The return value is the number of bytes from source that - * fit into the span that extends from 0 to maxLength. *lengthPtr is - * filled with the x-coordinate of the right edge of the last - * character that did fit. + * The return value is the number of bytes from source that fit into the + * span that extends from 0 to maxLength. *lengthPtr is filled with the + * x-coordinate of the right edge of the last character that did fit. * * Side effects: * None. @@ -1009,30 +1006,30 @@ Tk_MeasureChars( int TkpMeasureCharsInContext( - Tk_Font tkfont, /* Font in which characters will be drawn. */ - CONST char * source, /* UTF-8 string to be displayed. Need not be - * '\0' terminated. */ - int numBytes, /* Maximum number of bytes to consider from - * source string in all. */ - int rangeStart, /* Index of first byte to measure. */ - int rangeLength, /* Length of range to measure in bytes. */ - int maxLength, /* If >= 0, maxLength specifies the longest - * permissible line length; don't consider any - * character that would cross this x-position. - * If < 0, then line length is unbounded and the - * flags argument is ignored. */ - int flags, /* Various flag bits OR-ed together: - * TK_PARTIAL_OK means include the last char - * which only partially fit on this line. - * TK_WHOLE_WORDS means stop on a word boundary, - * if possible. TK_AT_LEAST_ONE means return at - * least one character even if no characters fit. - * TK_ISOLATE_END means that the last character - * should not be considered in context with the - * rest of the string (used for breaking - * lines). */ - int * lengthPtr) /* Filled with x-location just after the - * terminating character. */ + Tk_Font tkfont, /* Font in which characters will be drawn. */ + CONST char *source, /* UTF-8 string to be displayed. Need not be + * '\0' terminated. */ + int numBytes, /* Maximum number of bytes to consider from + * source string in all. */ + int rangeStart, /* Index of first byte to measure. */ + int rangeLength, /* Length of range to measure in bytes. */ + int maxLength, /* If >= 0, maxLength specifies the longest + * permissible line length; don't consider any + * character that would cross this x-position. + * If < 0, then line length is unbounded and + * the flags argument is ignored. */ + int flags, /* Various flag bits OR-ed together: + * TK_PARTIAL_OK means include the last char + * which only partially fit on this line. + * TK_WHOLE_WORDS means stop on a word + * boundary, if possible. TK_AT_LEAST_ONE + * means return at least one character even if + * no characters fit. TK_ISOLATE_END means + * that the last character should not be + * considered in context with the rest of the + * string (used for breaking lines). */ + int *lengthPtr) /* Filled with x-location just after the + * terminating character. */ { (void) numBytes; /*unused*/ return Tk_MeasureChars(tkfont, source + rangeStart, rangeLength, @@ -1207,8 +1204,8 @@ Tk_DrawChars( * TkpDrawCharsInContext -- * * Draw a string of characters on the screen like Tk_DrawChars(), but - * with access to all the characters on the line for context. On - * Windows this context isn't consulted, so we just call Tk_DrawChars(). + * with access to all the characters on the line for context. On Windows + * this context isn't consulted, so we just call Tk_DrawChars(). * * Results: * None. @@ -1221,24 +1218,24 @@ Tk_DrawChars( void TkpDrawCharsInContext( - Display * display, /* Display on which to draw. */ - Drawable drawable, /* Window or pixmap in which to draw. */ - GC gc, /* Graphics context for drawing characters. */ - Tk_Font tkfont, /* Font in which characters will be drawn; must - * be the same as font used in GC. */ - CONST char * source, /* UTF-8 string to be displayed. Need not be - * '\0' terminated. All Tk meta-characters - * (tabs, control characters, and newlines) - * should be stripped out of the string that is - * passed to this function. If they are not - * stripped out, they will be displayed as - * regular printing characters. */ - int numBytes, /* Number of bytes in string. */ - int rangeStart, /* Index of first byte to draw. */ - int rangeLength, /* Length of range to draw in bytes. */ - int x, int y) /* Coordinates at which to place origin of the - * whole (not just the range) string when - * drawing. */ + Display *display, /* Display on which to draw. */ + Drawable drawable, /* Window or pixmap in which to draw. */ + GC gc, /* Graphics context for drawing characters. */ + Tk_Font tkfont, /* Font in which characters will be drawn; + * must be the same as font used in GC. */ + CONST char *source, /* UTF-8 string to be displayed. Need not be + * '\0' terminated. All Tk meta-characters + * (tabs, control characters, and newlines) + * should be stripped out of the string that + * is passed to this function. If they are not + * stripped out, they will be displayed as + * regular printing characters. */ + int numBytes, /* Number of bytes in string. */ + int rangeStart, /* Index of first byte to draw. */ + int rangeLength, /* Length of range to draw in bytes. */ + int x, int y) /* Coordinates at which to place origin of the + * whole (not just the range) string when + * drawing. */ { (void) numBytes; /*unused*/ Tk_DrawChars(display, drawable, gc, tkfont, @@ -1371,9 +1368,9 @@ InitFont( TkFontAttributes *faPtr; char buf[LF_FACESIZE * sizeof(WCHAR)]; - window = Tk_WindowId(tkwin); - hwnd = (window == None) ? NULL : TkWinGetHWND(window); - hdc = GetDC(hwnd); + window = Tk_WindowId(tkwin); + hwnd = (window == None) ? NULL : TkWinGetHWND(window); + hdc = GetDC(hwnd); oldFont = SelectObject(hdc, hFont); GetTextMetrics(hdc, &tm); @@ -1530,9 +1527,9 @@ ReleaseSubFont( * * AllocFontFamily -- * - * Find the FontFamily structure associated with the given font name. - * The information should be stored by the caller in a SubFont and used - * when determining if that SubFont supports a character. + * Find the FontFamily structure associated with the given font name. The + * information should be stored by the caller in a SubFont and used when + * determining if that SubFont supports a character. * * Cannot use the string name used to construct the font as the key, * because the capitalization may not be canonical. Therefore use the diff --git a/win/tkWinKey.c b/win/tkWinKey.c index 7df78e1..f748a15 100644 --- a/win/tkWinKey.c +++ b/win/tkWinKey.c @@ -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: tkWinKey.c,v 1.17 2006/08/30 21:55:51 hobbs Exp $ + * RCS: @(#) $Id: tkWinKey.c,v 1.18 2007/09/08 16:13:45 dkf Exp $ */ #include "tkWinInt.h" @@ -89,47 +89,46 @@ TkpGetString( Tcl_DString *dsPtr) /* Uninitialized or empty string to hold * result. */ { - KeySym keysym; - XKeyEvent* keyEv = &eventPtr->xkey; + XKeyEvent *keyEv = &eventPtr->xkey; Tcl_DStringInit(dsPtr); - if (eventPtr->xkey.send_event == -1) { - if (eventPtr->xkey.nbytes > 0) { + if (keyEv->send_event == -1) { + if (keyEv->nbytes > 0) { Tcl_ExternalToUtfDString(TkWinGetKeyInputEncoding(), - eventPtr->xkey.trans_chars, eventPtr->xkey.nbytes, dsPtr); + keyEv->trans_chars, keyEv->nbytes, dsPtr); } - } else if (eventPtr->xkey.send_event == -2) { + } else if (keyEv->send_event == -2) { /* - * Special case for win2000 multi-lingal IME input. - * xkey.trans_chars[] already contains a UNICODE char. + * Special case for win2000 multi-lingal IME input. xkey.trans_chars[] + * already contains a UNICODE char. */ int unichar; char buf[TCL_UTF_MAX]; int len; - unichar = (eventPtr->xkey.trans_chars[1] & 0xff); + unichar = keyEv->trans_chars[1] & 0xff; unichar <<= 8; - unichar |= (eventPtr->xkey.trans_chars[0] & 0xff); + unichar |= keyEv->trans_chars[0] & 0xff; len = Tcl_UniCharToUtf((Tcl_UniChar) unichar, buf); Tcl_DStringAppend(dsPtr, buf, len); - } else if (eventPtr->xkey.send_event == -3) { + } else if (keyEv->send_event == -3) { /* - * Special case for WM_UNICHAR. - * xkey.trans_chars[] already contains a UTF-8 char. + * Special case for WM_UNICHAR. xkey.trans_chars[] already contains a + * UTF-8 char. */ - Tcl_DStringAppend(dsPtr, eventPtr->xkey.trans_chars, - eventPtr->xkey.nbytes); + + Tcl_DStringAppend(dsPtr, keyEv->trans_chars, keyEv->nbytes); } else { /* * This is an event generated from generic code. It has no nchars or * trans_chars members. */ - keysym = KeycodeToKeysym(eventPtr->xkey.keycode, - eventPtr->xkey.state, 0); + KeySym keysym = KeycodeToKeysym(keyEv->keycode, keyEv->state, 0); + if (((keysym != NoSymbol) && (keysym > 0) && (keysym < 256)) || (keysym == XK_Return) || (keysym == XK_Tab)) { char buf[TCL_UTF_MAX]; diff --git a/win/tkWinMenu.c b/win/tkWinMenu.c index ee7b9c6..8ca2be4 100644 --- a/win/tkWinMenu.c +++ b/win/tkWinMenu.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkWinMenu.c,v 1.57 2007/06/09 23:53:05 hobbs Exp $ + * RCS: @(#) $Id: tkWinMenu.c,v 1.58 2007/09/08 16:13:45 dkf Exp $ */ #define OEMRESOURCE @@ -93,7 +93,7 @@ static Tcl_DString menuFontDString; static void DrawMenuEntryAccelerator(TkMenu *menuPtr, TkMenuEntry *mePtr, Drawable d, GC gc, - Tk_Font tkfont, CONST Tk_FontMetrics *fmPtr, + Tk_Font tkfont, const Tk_FontMetrics *fmPtr, Tk_3DBorder activeBorder, int x, int y, int width, int height); static void DrawMenuEntryArrow(TkMenu *menuPtr, TkMenuEntry *mePtr, @@ -106,52 +106,52 @@ static void DrawMenuEntryBackground(TkMenu *menuPtr, static void DrawMenuEntryIndicator(TkMenu *menuPtr, TkMenuEntry *mePtr, Drawable d, GC gc, GC indicatorGC, Tk_Font tkfont, - CONST Tk_FontMetrics *fmPtr, int x, int y, + const Tk_FontMetrics *fmPtr, int x, int y, int width, int height); static void DrawMenuEntryLabel(TkMenu *menuPtr, TkMenuEntry *mePtr, Drawable d, GC gc, Tk_Font tkfont, - CONST Tk_FontMetrics *fmPtr, int x, int y, + const Tk_FontMetrics *fmPtr, int x, int y, int width, int height); static void DrawMenuSeparator(TkMenu *menuPtr, TkMenuEntry *mePtr, Drawable d, GC gc, Tk_Font tkfont, - CONST Tk_FontMetrics *fmPtr, + const Tk_FontMetrics *fmPtr, int x, int y, int width, int height); -static void DrawTearoffEntry(TkMenu *menuPtr, - TkMenuEntry *mePtr, Drawable d, GC gc, - Tk_Font tkfont, CONST Tk_FontMetrics *fmPtr, - int x, int y, int width, int height); -static void DrawMenuUnderline(TkMenu *menuPtr, - TkMenuEntry *mePtr, Drawable d, GC gc, - Tk_Font tkfont, CONST Tk_FontMetrics *fmPtr, int x, - int y, int width, int height); +static void DrawTearoffEntry(TkMenu *menuPtr, TkMenuEntry *mePtr, + Drawable d, GC gc, Tk_Font tkfont, + const Tk_FontMetrics *fmPtr, int x, int y, + int width, int height); +static void DrawMenuUnderline(TkMenu *menuPtr, TkMenuEntry *mePtr, + Drawable d, GC gc, Tk_Font tkfont, + const Tk_FontMetrics *fmPtr, int x, int y, + int width, int height); static void DrawWindowsSystemBitmap(Display *display, - Drawable drawable, GC gc, CONST RECT *rectPtr, + Drawable drawable, GC gc, const RECT *rectPtr, int bitmapID, int alignFlags); static void FreeID(WORD commandID); static TCHAR * GetEntryText(TkMenuEntry *mePtr); static void GetMenuAccelGeometry(TkMenu *menuPtr, TkMenuEntry *mePtr, Tk_Font tkfont, - CONST Tk_FontMetrics *fmPtr, int *widthPtr, + const Tk_FontMetrics *fmPtr, int *widthPtr, int *heightPtr); static void GetMenuLabelGeometry(TkMenuEntry *mePtr, - Tk_Font tkfont, CONST Tk_FontMetrics *fmPtr, + Tk_Font tkfont, const Tk_FontMetrics *fmPtr, int *widthPtr, int *heightPtr); static void GetMenuIndicatorGeometry(TkMenu *menuPtr, TkMenuEntry *mePtr, Tk_Font tkfont, - CONST Tk_FontMetrics *fmPtr, + const Tk_FontMetrics *fmPtr, int *widthPtr, int *heightPtr); static void GetMenuSeparatorGeometry(TkMenu *menuPtr, TkMenuEntry *mePtr, Tk_Font tkfont, - CONST Tk_FontMetrics *fmPtr, + const Tk_FontMetrics *fmPtr, int *widthPtr, int *heightPtr); static void GetTearoffEntryGeometry(TkMenu *menuPtr, TkMenuEntry *mePtr, Tk_Font tkfont, - CONST Tk_FontMetrics *fmPtr, int *widthPtr, + const Tk_FontMetrics *fmPtr, int *widthPtr, int *heightPtr); static int GetNewID(TkMenuEntry *mePtr, WORD *menuIDPtr); static int TkWinMenuKeyObjCmd(ClientData clientData, Tcl_Interp *interp, int objc, - Tcl_Obj *CONST objv[]); + Tcl_Obj *const objv[]); static void MenuSelectEvent(TkMenu *menuPtr); static void ReconfigureWindowsMenu(ClientData clientData); static void RecursivelyClearActiveMenu(TkMenu *menuPtr); @@ -456,7 +456,7 @@ GetEntryText( : Tcl_GetString(mePtr->labelPtr); char *accel = (mePtr->accelPtr == NULL) ? "" : Tcl_GetString(mePtr->accelPtr); - CONST char *p, *next; + const char *p, *next; Tcl_DString itemString; /* @@ -1418,7 +1418,7 @@ GetMenuIndicatorGeometry( TkMenu *menuPtr, /* The menu we are measuring */ TkMenuEntry *mePtr, /* The entry we are measuring */ Tk_Font tkfont, /* Precalculated font */ - CONST Tk_FontMetrics *fmPtr,/* Precalculated font metrics */ + const Tk_FontMetrics *fmPtr,/* Precalculated font metrics */ int *widthPtr, /* The resulting width */ int *heightPtr) /* The resulting height */ { @@ -1455,7 +1455,7 @@ GetMenuAccelGeometry( TkMenu *menuPtr, /* The menu we are measuring */ TkMenuEntry *mePtr, /* The entry we are measuring */ Tk_Font tkfont, /* The precalculated font */ - CONST Tk_FontMetrics *fmPtr,/* The precalculated font metrics */ + const Tk_FontMetrics *fmPtr,/* The precalculated font metrics */ int *widthPtr, /* The resulting width */ int *heightPtr) /* The resulting height */ { @@ -1492,7 +1492,7 @@ GetTearoffEntryGeometry( TkMenu *menuPtr, /* The menu we are measuring */ TkMenuEntry *mePtr, /* The entry we are measuring */ Tk_Font tkfont, /* The precalculated font */ - CONST Tk_FontMetrics *fmPtr,/* The precalculated font metrics */ + const Tk_FontMetrics *fmPtr,/* The precalculated font metrics */ int *widthPtr, /* The resulting width */ int *heightPtr) /* The resulting height */ { @@ -1525,7 +1525,7 @@ GetMenuSeparatorGeometry( TkMenu *menuPtr, /* The menu we are measuring */ TkMenuEntry *mePtr, /* The entry we are measuring */ Tk_Font tkfont, /* The precalculated font */ - CONST Tk_FontMetrics *fmPtr,/* The precalcualted font metrics */ + const Tk_FontMetrics *fmPtr,/* The precalcualted font metrics */ int *widthPtr, /* The resulting width */ int *heightPtr) /* The resulting height */ { @@ -1557,7 +1557,7 @@ DrawWindowsSystemBitmap( Display *display, /* The display we are drawing into */ Drawable drawable, /* The drawable we are working with */ GC gc, /* The GC to draw with */ - CONST RECT *rectPtr, /* The rectangle to draw into */ + const RECT *rectPtr, /* The rectangle to draw into */ int bitmapID, /* The windows id of the system bitmap to * draw. */ int alignFlags) /* How to align the bitmap inside the @@ -1636,7 +1636,7 @@ DrawMenuEntryIndicator( GC gc, /* The gc we are drawing with */ GC indicatorGC, /* The gc for indicator objects */ Tk_Font tkfont, /* The precalculated font */ - CONST Tk_FontMetrics *fmPtr,/* The precalculated font metrics */ + const Tk_FontMetrics *fmPtr,/* The precalculated font metrics */ int x, /* Left edge */ int y, /* Top edge */ int width, @@ -1712,7 +1712,7 @@ DrawMenuEntryAccelerator( Drawable d, /* What we are drawing into */ GC gc, /* The gc we are drawing with */ Tk_Font tkfont, /* The precalculated font */ - CONST Tk_FontMetrics *fmPtr,/* The precalculated font metrics */ + const Tk_FontMetrics *fmPtr,/* The precalculated font metrics */ Tk_3DBorder activeBorder, /* The border when an item is active */ int x, /* left edge */ int y, /* top edge */ @@ -1849,7 +1849,7 @@ DrawMenuSeparator( Drawable d, /* What we are drawing into */ GC gc, /* The gc we are drawing with */ Tk_Font tkfont, /* The precalculated font */ - CONST Tk_FontMetrics *fmPtr,/* The precalculated font metrics */ + const Tk_FontMetrics *fmPtr,/* The precalculated font metrics */ int x, /* left edge */ int y, /* top edge */ int width, /* width of item */ @@ -1890,7 +1890,7 @@ DrawMenuUnderline( Drawable d, /* What we are drawing into */ GC gc, /* The gc to draw into */ Tk_Font tkfont, /* The precalculated font */ - CONST Tk_FontMetrics *fmPtr,/* The precalculated font metrics */ + const Tk_FontMetrics *fmPtr,/* The precalculated font metrics */ int x, /* Left Edge */ int y, /* Top Edge */ int width, /* Width of entry */ @@ -1902,7 +1902,7 @@ DrawMenuUnderline( /* do the unicode call just to prevent overruns */ Tcl_GetUnicodeFromObj(mePtr->labelPtr, &len); if (mePtr->underline < len) { - CONST char *label, *start, *end; + const char *label, *start, *end; label = Tcl_GetStringFromObj(mePtr->labelPtr, NULL); start = Tcl_UtfAtIndex(label, mePtr->underline); @@ -1939,7 +1939,7 @@ TkWinMenuKeyObjCmd( ClientData clientData, /* Unused. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ - Tcl_Obj *CONST objv[]) /* Argument objects. */ + Tcl_Obj *const objv[]) /* Argument objects. */ { UINT scanCode; UINT virtualKey; @@ -2131,7 +2131,7 @@ DrawMenuEntryLabel( Drawable d, /* What we are drawing into */ GC gc, /* The gc we are drawing into */ Tk_Font tkfont, /* The precalculated font */ - CONST Tk_FontMetrics *fmPtr,/* The precalculated font metrics */ + const Tk_FontMetrics *fmPtr,/* The precalculated font metrics */ int x, /* left edge */ int y, /* right edge */ int width, /* width of entry */ @@ -2347,7 +2347,7 @@ DrawTearoffEntry( Drawable d, /* The drawable we are drawing into */ GC gc, /* The gc we are drawing with */ Tk_Font tkfont, /* The font we are drawing with */ - CONST Tk_FontMetrics *fmPtr,/* The metrics we are drawing with */ + const Tk_FontMetrics *fmPtr,/* The metrics we are drawing with */ int x, int y, int width, int height) { @@ -2431,7 +2431,7 @@ TkpDrawMenuEntry( TkMenuEntry *mePtr, /* The entry to draw */ Drawable d, /* What to draw into */ Tk_Font tkfont, /* Precalculated font for menu */ - CONST Tk_FontMetrics *menuMetricsPtr, + const Tk_FontMetrics *menuMetricsPtr, /* Precalculated metrics for menu */ int x, /* X-coordinate of topleft of entry */ int y, /* Y-coordinate of topleft of entry */ @@ -2445,7 +2445,7 @@ TkpDrawMenuEntry( GC gc, indicatorGC; TkMenu *menuPtr = mePtr->menuPtr; Tk_3DBorder bgBorder, activeBorder; - CONST Tk_FontMetrics *fmPtr; + const Tk_FontMetrics *fmPtr; Tk_FontMetrics entryMetrics; int padY = (menuPtr->menuType == MENUBAR) ? 3 : 0; int adjustedY = y + padY; @@ -2564,7 +2564,7 @@ static void GetMenuLabelGeometry( TkMenuEntry *mePtr, /* The entry we are computing */ Tk_Font tkfont, /* The precalculated font */ - CONST Tk_FontMetrics *fmPtr,/* The precalculated metrics */ + const Tk_FontMetrics *fmPtr,/* The precalculated metrics */ int *widthPtr, /* The resulting width of the label portion */ int *heightPtr) /* The resulting height of the label * portion */ @@ -3056,8 +3056,8 @@ MenuThreadExitHandler( Tcl_Obj * TkWinGetMenuSystemDefault( Tk_Window tkwin, /* A window to use. */ - CONST char *dbName, /* The option database name. */ - CONST char *className) /* The name of the option class. */ + const char *dbName, /* The option database name. */ + const char *className) /* The name of the option class. */ { Tcl_Obj *valuePtr = NULL; diff --git a/win/tkWinSend.c b/win/tkWinSend.c index 1991e47..0901d07 100644 --- a/win/tkWinSend.c +++ b/win/tkWinSend.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkWinSend.c,v 1.13 2007/09/07 00:34:58 dgp Exp $ + * RCS: @(#) $Id: tkWinSend.c,v 1.14 2007/09/08 16:13:45 dkf Exp $ */ #include "tkInt.h" @@ -67,14 +67,14 @@ static void CmdDeleteProc(ClientData clientData); static void InterpDeleteProc(ClientData clientData, Tcl_Interp *interp); static void RevokeObjectRegistration(RegisteredInterp *riPtr); -static HRESULT BuildMoniker(CONST char *name, LPMONIKER *pmk); -static HRESULT RegisterInterp(CONST char *name, +static HRESULT BuildMoniker(const char *name, LPMONIKER *pmk); +static HRESULT RegisterInterp(const char *name, RegisteredInterp *riPtr); static int FindInterpreterObject(Tcl_Interp *interp, - CONST char *name, LPDISPATCH *ppdisp); + const char *name, LPDISPATCH *ppdisp); static int Send(LPDISPATCH pdispInterp, Tcl_Interp *interp, int async, ClientData clientData, int objc, - Tcl_Obj *CONST objv[]); + Tcl_Obj *const objv[]); static Tcl_Obj * Win32ErrorObj(HRESULT hrError); static void SendTrace(const char *format, ...); static Tcl_EventProc SendEventProc; @@ -110,12 +110,12 @@ static Tcl_EventProc SendEventProc; *-------------------------------------------------------------- */ -CONST char * +const char * Tk_SetAppName( Tk_Window tkwin, /* Token for any window in the application to * be named: it is just used to identify the * application and the display. */ - CONST char *name) /* The name that will be used to refer to the + const char *name) /* The name that will be used to refer to the * interpreter in later "send" commands. Must * be globally unique. */ { @@ -128,7 +128,7 @@ Tk_SetAppName( #else /* TK_SEND_ENABLED_ON_WINDOWS */ ThreadSpecificData *tsdPtr = NULL; - TkWindow *winPtr = (TkWindow *)tkwin; + TkWindow *winPtr = (TkWindow *) tkwin; RegisteredInterp *riPtr = NULL; Tcl_Interp *interp; HRESULT hr = S_OK; @@ -161,26 +161,28 @@ Tk_SetAppName( riPtr = Tcl_GetAssocData(interp, "tkWinSend::ri", NULL); if (riPtr == NULL) { + LPUNKNOWN *objPtr; - riPtr = (RegisteredInterp *)ckalloc(sizeof(RegisteredInterp)); + riPtr = (RegisteredInterp *) ckalloc(sizeof(RegisteredInterp)); memset(riPtr, 0, sizeof(RegisteredInterp)); riPtr->interp = interp; + objPtr = &riPtr->obj; hr = TkWinSendCom_CreateInstance(interp, &IID_IUnknown, - (void **)&riPtr->obj); + (void **) objPtr); - Tcl_CreateObjCommand(interp, "send", Tk_SendObjCmd, - (ClientData)riPtr, CmdDeleteProc); + Tcl_CreateObjCommand(interp, "send", Tk_SendObjCmd, riPtr, + CmdDeleteProc); if (Tcl_IsSafe(interp)) { Tcl_HideCommand(interp, "send", "send"); } - Tcl_SetAssocData(interp, "tkWinSend::ri", NULL, (ClientData)riPtr); + Tcl_SetAssocData(interp, "tkWinSend::ri", NULL, riPtr); } else { RevokeObjectRegistration(riPtr); } RegisterInterp(name, riPtr); - return (CONST char *) riPtr->name; + return (const char *) riPtr->name; #endif /* TK_SEND_ENABLED_ON_WINDOWS */ } @@ -313,12 +315,12 @@ Tk_SendObjCmd( * field is used). */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ - Tcl_Obj *CONST objv[]) /* Argument strings. */ + Tcl_Obj *const objv[]) /* Argument strings. */ { enum { SEND_ASYNC, SEND_DISPLAYOF, SEND_LAST }; - static CONST char *sendOptions[] = { + static const char *sendOptions[] = { "-async", "-displayof", "--", NULL }; int result = TCL_OK; @@ -405,7 +407,7 @@ Tk_SendObjCmd( static int FindInterpreterObject( Tcl_Interp *interp, - CONST char *name, + const char *name, LPDISPATCH *ppdisp) { LPRUNNINGOBJECTTABLE pROT = NULL; @@ -421,15 +423,15 @@ FindInterpreterObject( hr = BuildMoniker(name, &pmk); if (SUCCEEDED(hr)) { - IUnknown* punkInterp = NULL; + IUnknown *pUnkInterp = NULL, **ppUnkInterp = &pUnkInterp; hr = pROT->lpVtbl->IsRunning(pROT, pmk); hr = pmk->lpVtbl->BindToObject(pmk, pBindCtx, NULL, - &IID_IUnknown, (void**)&punkInterp); + &IID_IUnknown, (void **) ppUnkInterp); if (SUCCEEDED(hr)) { - hr = punkInterp->lpVtbl->QueryInterface(punkInterp, - &IID_IDispatch, (void**)ppdisp); - punkInterp->lpVtbl->Release(punkInterp); + hr = pUnkInterp->lpVtbl->QueryInterface(pUnkInterp, + &IID_IDispatch, (void **) ppdisp); + pUnkInterp->lpVtbl->Release(pUnkInterp); } else { Tcl_ResetResult(interp); @@ -594,7 +596,7 @@ InterpDeleteProc( static HRESULT BuildMoniker( - CONST char *name, + const char *name, LPMONIKER *ppmk) { LPMONIKER pmkClass = NULL; @@ -638,14 +640,14 @@ BuildMoniker( static HRESULT RegisterInterp( - CONST char *name, + const char *name, RegisteredInterp *riPtr) { HRESULT hr = S_OK; LPRUNNINGOBJECTTABLE pROT = NULL; LPMONIKER pmk = NULL; int i, offset; - CONST char *actualName = name; + const char *actualName = name; Tcl_DString dString; Tcl_DStringInit(&dString); @@ -720,7 +722,7 @@ Send( ClientData clientData, /* The RegisteredInterp structure for this * interp. */ int objc, /* Number of arguments to be sent. */ - Tcl_Obj *CONST objv[]) /* The arguments to be sent. */ + Tcl_Obj *const objv[]) /* The arguments to be sent. */ { VARIANT vCmd, vResult; DISPPARAMS dp; @@ -878,7 +880,7 @@ SetExcepInfo( if (pExcepInfo) { Tcl_Obj *opError, *opErrorInfo, *opErrorCode; ICreateErrorInfo *pCEI; - IErrorInfo *pEI; + IErrorInfo *pEI, **ppEI = &pEI; HRESULT hr; opError = Tcl_GetObjResult(interp); @@ -905,7 +907,7 @@ SetExcepInfo( pExcepInfo->bstrDescription); hr = pCEI->lpVtbl->SetSource(pCEI, pExcepInfo->bstrSource); hr = pCEI->lpVtbl->QueryInterface(pCEI, &IID_IErrorInfo, - (void**) &pEI); + (void**) ppEI); if (SUCCEEDED(hr)) { SetErrorInfo(0, pEI); pEI->lpVtbl->Release(pEI); diff --git a/win/tkWinWm.c b/win/tkWinWm.c index 4018958..a26e0db 100644 --- a/win/tkWinWm.c +++ b/win/tkWinWm.c @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkWinWm.c,v 1.117 2007/06/10 00:15:52 hobbs Exp $ + * RCS: @(#) $Id: tkWinWm.c,v 1.118 2007/09/08 16:13:45 dkf Exp $ */ #include "tkWinInt.h" @@ -1095,23 +1095,25 @@ WinSetIcon( } } else { ThreadSpecificData *tsdPtr; + /* * Don't check return result of SetClassLong() or - * SetClassLongPtr() since they return the previously - * set value which is zero on the initial call or in - * an error case. The MSDN documentation does not - * indicate that the result needs to be checked. + * SetClassLongPtr() since they return the previously set value + * which is zero on the initial call or in an error case. The MSDN + * documentation does not indicate that the result needs to be + * checked. */ + #ifdef _WIN64 SetClassLongPtr(hwnd, GCLP_HICONSM, - (LPARAM)GetIcon(titlebaricon, ICON_SMALL)); + (LPARAM) GetIcon(titlebaricon, ICON_SMALL)); SetClassLongPtr(hwnd, GCLP_HICON, - (LPARAM)GetIcon(titlebaricon, ICON_BIG)); + (LPARAM) GetIcon(titlebaricon, ICON_BIG)); #else SetClassLong(hwnd, GCL_HICONSM, - (LPARAM)GetIcon(titlebaricon, ICON_SMALL)); + (LPARAM) GetIcon(titlebaricon, ICON_SMALL)); SetClassLong(hwnd, GCL_HICON, - (LPARAM)GetIcon(titlebaricon, ICON_BIG)); + (LPARAM) GetIcon(titlebaricon, ICON_BIG)); #endif tsdPtr = (ThreadSpecificData *) Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData)); @@ -2580,8 +2582,8 @@ TkWmUnmapWindow( void TkpWmSetState( - TkWindow *winPtr, /* Toplevel window to operate on. */ - int state) /* One of IconicState, ZoomState, NormalState, + TkWindow *winPtr, /* Toplevel window to operate on. */ + int state) /* One of IconicState, ZoomState, NormalState, * or WithdrawnState. */ { WmInfo *wmPtr = winPtr->wmInfoPtr; @@ -2627,8 +2629,8 @@ TkpWmSetState( static void TkpWmSetFullScreen( - TkWindow *winPtr, /* Toplevel window to operate on. */ - int full_screen_state) /* True if window should be full screen */ + TkWindow *winPtr, /* Toplevel window to operate on. */ + int full_screen_state) /* True if window should be full screen */ { int changed = 0; int full_screen = False; @@ -2737,7 +2739,7 @@ TkWmDeadWindow( } else { register WmInfo *prevPtr; for (prevPtr = winPtr->dispPtr->firstWmPtr; ; - prevPtr = prevPtr->nextPtr) { + prevPtr = prevPtr->nextPtr) { if (prevPtr == NULL) { Tcl_Panic("couldn't unlink window in TkWmDeadWindow"); } @@ -3207,7 +3209,7 @@ WmAttributesCmd( styleBit = WS_DISABLED; } else if ((strncmp(string, "-alpha", (unsigned) length) == 0) || ((length > 2) && (strncmp(string, "-transparentcolor", - (unsigned) length) == 0))) { + (unsigned) length) == 0))) { stylePtr = &exStyle; styleBit = WS_EX_LAYERED; } else if (strncmp(string, "-fullscreen", (unsigned) length) == 0) { @@ -4864,7 +4866,7 @@ WmProtocolCmd( */ for (protPtr = wmPtr->protPtr; protPtr != NULL; - protPtr = protPtr->nextPtr) { + protPtr = protPtr->nextPtr) { Tcl_AppendElement(interp, Tk_GetAtomName((Tk_Window) winPtr, protPtr->protocol)); } diff --git a/win/ttkWinMonitor.c b/win/ttkWinMonitor.c index 181db97..2c9229f 100644 --- a/win/ttkWinMonitor.c +++ b/win/ttkWinMonitor.c @@ -1,4 +1,4 @@ -/* $Id: ttkWinMonitor.c,v 1.11 2007/09/07 00:34:58 dgp Exp $ +/* $Id: ttkWinMonitor.c,v 1.12 2007/09/08 16:13:45 dkf Exp $ */ #ifdef _MSC_VER @@ -17,8 +17,8 @@ static LRESULT WINAPI WndProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp); /* * RegisterSystemColors -- - * Register all known Windows system colors (as per GetSysColor) - * as Tk named colors. + * Register all known Windows system colors (as per GetSysColor) as Tk + * named colors. */ typedef struct { @@ -72,7 +72,7 @@ RegisterSystemColors( Ttk_RegisterNamedColor(cache, sysColor->name, &colorSpec); } } - + static HWND CreateThemeMonitorWindow( HINSTANCE hinst, @@ -95,7 +95,7 @@ CreateThemeMonitorWindow( wc.hbrBackground = (HBRUSH)COLOR_WINDOW; wc.lpszMenuName = name; wc.lpszClassName = name; - + if (RegisterClassEx(&wc)) { hwnd = CreateWindow(name, title, WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, @@ -119,7 +119,7 @@ DestroyThemeMonitorWindow( DestroyWindow(hwnd); } - + static LRESULT WINAPI WndProc( HWND hwnd, @@ -147,6 +147,7 @@ WndProc( * Reset the application theme to 'xpnative' if present, which will in * turn fall back to 'winnative' if XP theming is disabled. */ + theme = Ttk_GetTheme(interp, "xpnative"); if (theme) { Ttk_UseTheme(interp, theme); @@ -156,7 +157,7 @@ WndProc( } return DefWindowProc(hwnd, msg, wp, lp); } - + /* * Windows-specific platform initialization: */ @@ -169,7 +170,7 @@ Ttk_WinPlatformInit( Tcl_Interp *interp) { HWND hwnd; - + hwnd = CreateThemeMonitorWindow(Tk_GetHINSTANCE(), interp); Ttk_RegisterCleanup(interp, (ClientData)hwnd, DestroyThemeMonitorWindow); @@ -178,3 +179,11 @@ Ttk_WinPlatformInit( return TCL_OK; } + +/* + * Local Variables: + * mode: c + * c-basic-offset: 4 + * fill-column: 78 + * End: + */ diff --git a/win/ttkWinTheme.c b/win/ttkWinTheme.c index e05f08c..a05c0de 100644 --- a/win/ttkWinTheme.c +++ b/win/ttkWinTheme.c @@ -1,6 +1,6 @@ /* winTheme.c - Copyright (C) 2004 Pat Thoyts <patthoyts@users.sf.net> * - * $Id: ttkWinTheme.c,v 1.6 2007/09/07 00:34:58 dgp Exp $ + * $Id: ttkWinTheme.c,v 1.7 2007/09/08 16:13:45 dkf Exp $ */ #ifdef _MSC_VER @@ -66,7 +66,7 @@ ReliefToEdge( return BDR_RAISEDOUTER; } } - + /* ---------------------------------------------------------------------- */ static Ttk_StateTable checkbutton_statemap[] = { @@ -115,10 +115,10 @@ static FrameControlElementData FrameControlElements[] = { { "uparrow", DFC_SCROLL, DFCS_SCROLLUP, SM_CXVSCROLL, SM_CYVSCROLL, arrow_statemap, {0,0,0,0} }, - { "downarrow", + { "downarrow", DFC_SCROLL, DFCS_SCROLLDOWN, SM_CXVSCROLL, SM_CYVSCROLL, arrow_statemap, {0,0,0,0} }, - { "leftarrow", + { "leftarrow", DFC_SCROLL, DFCS_SCROLLLEFT, SM_CXHSCROLL, SM_CYHSCROLL, arrow_statemap, {0,0,0,0} }, { "rightarrow", @@ -312,7 +312,7 @@ static Ttk_ElementOptionSpec ButtonBorderElementOptions[] = { Tk_Offset(ButtonBorderElement,reliefObj), "flat" }, { "-highlightcolor",TK_OPTION_COLOR, Tk_Offset(ButtonBorderElement,highlightColorObj), "black" }, - { "-default", TK_OPTION_ANY, + { "-default", TK_OPTION_ANY, Tk_Offset(ButtonBorderElement,defaultStateObj), "disabled" }, {NULL} }; @@ -448,7 +448,7 @@ static Ttk_ElementSpec FocusElementSpec = { FocusElementGeometry, FocusElementDraw }; - + /* FillFocusElement -- * Draws a focus ring filled with the selection color */ @@ -488,7 +488,7 @@ FillFocusElementDraw( TkWinReleaseDrawableDC(d, hdc, &dcState); } } - + /* * ComboboxFocusElement -- * Read-only comboboxes have a filled focus ring, editable ones do not. @@ -781,7 +781,7 @@ TTK_BEGIN_LAYOUT(ComboboxLayout) TTK_GROUP("Combobox.field", TTK_FILL_BOTH, TTK_NODE("Combobox.downarrow", TTK_PACK_RIGHT|TTK_FILL_Y) TTK_GROUP("Combobox.padding", TTK_PACK_LEFT|TTK_EXPAND|TTK_FILL_BOTH, - TTK_GROUP("Combobox.focus", TTK_PACK_LEFT|TTK_EXPAND|TTK_FILL_BOTH, + TTK_GROUP("Combobox.focus", TTK_PACK_LEFT|TTK_EXPAND|TTK_FILL_BOTH, TTK_NODE("Combobox.textarea", TTK_FILL_BOTH)))) TTK_END_LAYOUT @@ -826,3 +826,11 @@ TtkWinTheme_Init( Tcl_PkgProvide(interp, "ttk::theme::winnative", TTK_VERSION); return TCL_OK; } + +/* + * Local Variables: + * mode: c + * c-basic-offset: 4 + * fill-column: 78 + * End: + */ |