diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-04-02 18:18:31 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-04-02 18:18:31 (GMT) |
commit | 6d61d799f483c98a1e0aeb624fa001a7fce24af0 (patch) | |
tree | a67b9ccfa323ad24c93a2fc2f7011cfa8ee0ba63 /win/ttkWinXPTheme.c | |
parent | 8d2dbe96066152901e507e44cf7dec9b00f2bee3 (diff) | |
download | tk-6d61d799f483c98a1e0aeb624fa001a7fce24af0.zip tk-6d61d799f483c98a1e0aeb624fa001a7fce24af0.tar.gz tk-6d61d799f483c98a1e0aeb624fa001a7fce24af0.tar.bz2 |
More use of Tcl_NewWideIntObj(), and more internal use of (size_t), for bigger ranges.
Diffstat (limited to 'win/ttkWinXPTheme.c')
-rw-r--r-- | win/ttkWinXPTheme.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/win/ttkWinXPTheme.c b/win/ttkWinXPTheme.c index fd6571f..29f2829 100644 --- a/win/ttkWinXPTheme.c +++ b/win/ttkWinXPTheme.c @@ -826,13 +826,13 @@ static void TextElementSize( RECT rc = {0, 0}; HRESULT hr = S_OK; const char *src; - int len; + size_t len; Tcl_DString ds; if (!InitElementData(elementData, tkwin, 0)) return; - src = Tcl_GetStringFromObj(element->textObj, &len); + src = TkGetStringFromObj(element->textObj, &len); Tcl_WinUtfToTChar(src, len, &ds); hr = elementData->procs->GetThemeTextExtent( elementData->hTheme, @@ -865,13 +865,13 @@ static void TextElementDraw( RECT rc = BoxToRect(b); HRESULT hr = S_OK; const char *src; - int len; + size_t len; Tcl_DString ds; if (!InitElementData(elementData, tkwin, d)) return; - src = Tcl_GetStringFromObj(element->textObj, &len); + src = TkGetStringFromObj(element->textObj, &len); Tcl_WinUtfToTChar(src, len, &ds); hr = elementData->procs->DrawThemeText( elementData->hTheme, @@ -1116,7 +1116,7 @@ Ttk_CreateVsapiElement( Ttk_StateTable *stateTable; Ttk_Padding pad = {0, 0, 0, 0}; int flags = 0; - int length = 0; + size_t length = 0; char *name; LPWSTR wname; Ttk_ElementSpec *elementSpec = &GenericElementSpec; @@ -1138,7 +1138,7 @@ Ttk_CreateVsapiElement( if (Tcl_GetIntFromObj(interp, objv[1], &partId) != TCL_OK) { return TCL_ERROR; } - name = Tcl_GetStringFromObj(objv[0], &length); + name = TkGetStringFromObj(objv[0], &length); className = (WCHAR *) Tcl_WinUtfToTChar(name, length, &classBuf); /* flags or padding */ |