diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-05-10 13:57:17 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-05-10 13:57:17 (GMT) |
| commit | e3436210ba311af1d4f9777c791773e3448f183e (patch) | |
| tree | 17a5a98c496cc5dc105e3d8d405f7c82affd5e2c /win | |
| parent | c36bb3a4ce583083ed0aac309ec563c5f0a37bdf (diff) | |
| parent | dac0d44e8ac09f7ff824c1ff952201122b60245e (diff) | |
| download | tk-e3436210ba311af1d4f9777c791773e3448f183e.zip tk-e3436210ba311af1d4f9777c791773e3448f183e.tar.gz tk-e3436210ba311af1d4f9777c791773e3448f183e.tar.bz2 | |
4 more Tk_GetPixelsFromObj() usage: for highlightThickness, shiftrelief and sashthickness
Diffstat (limited to 'win')
| -rw-r--r-- | win/tkWinTest.c | 9 | ||||
| -rw-r--r-- | win/ttkWinTheme.c | 11 | ||||
| -rw-r--r-- | win/ttkWinXPTheme.c | 2 |
3 files changed, 7 insertions, 15 deletions
diff --git a/win/tkWinTest.c b/win/tkWinTest.c index 693d1c3..6f5551a 100644 --- a/win/tkWinTest.c +++ b/win/tkWinTest.c @@ -383,9 +383,8 @@ TestwineventObjCmd( Tcl_ObjPrintf("Could not find control with id %d", id)); return TCL_ERROR; } - Tcl_DStringInit(&ds); - LPARAM lparam = (LPARAM)Tcl_UtfToExternalDString(NULL, Tcl_GetString(objv[4]), TCL_INDEX_NONE, &ds); - result = SendMessageA(control, WM_SETTEXT, 0, lparam); + Tcl_UtfToExternalDString(NULL, Tcl_GetString(objv[4]), -1, &ds); + result = SendMessageA(control, WM_SETTEXT, 0, (LPARAM)Tcl_DStringValue(&ds)); Tcl_DStringFree(&ds); if (result == 0) { Tcl_SetObjResult(interp, Tcl_NewStringObj("failed to send text to dialog: ", TCL_INDEX_NONE)); @@ -536,7 +535,7 @@ TestgetwindowinfoObjCmd( dictObj = Tcl_NewDictObj(); Tcl_DictObjPut(interp, dictObj, Tcl_NewStringObj("class", 5), classObj); Tcl_DictObjPut(interp, dictObj, Tcl_NewStringObj("id", 2), - Tcl_NewWideIntObj(GetWindowLongPtr((HWND)(size_t)hwnd, GWL_ID))); + Tcl_NewWideIntObj(GetWindowLongPtr((HWND)(size_t)hwnd, GWL_ID))); cch = GetWindowTextW((HWND)INT2PTR(hwnd), buf, cchBuf); Tcl_DStringInit(&ds); @@ -546,7 +545,7 @@ TestgetwindowinfoObjCmd( Tcl_DictObjPut(interp, dictObj, Tcl_NewStringObj("text", 4), textObj); Tcl_DictObjPut(interp, dictObj, Tcl_NewStringObj("parent", 6), - Tcl_NewWideIntObj(PTR2INT(GetParent((HWND)(size_t)hwnd)))); + Tcl_NewWideIntObj(PTR2INT(GetParent((HWND)(size_t)hwnd)))); childrenObj = Tcl_NewListObj(0, NULL); EnumChildWindows((HWND)(size_t)hwnd, EnumChildrenProc, (LPARAM)childrenObj); diff --git a/win/ttkWinTheme.c b/win/ttkWinTheme.c index d749c09..b78a81c 100644 --- a/win/ttkWinTheme.c +++ b/win/ttkWinTheme.c @@ -732,7 +732,7 @@ typedef struct { static const Ttk_ElementOptionSpec TabElementOptions[] = { { "-borderwidth", TK_OPTION_PIXELS, - offsetof(TabElement,borderWidthObj), "1" }, + ofsetof(TabElement,borderWidthObj), "1" }, { "-background", TK_OPTION_BORDER, offsetof(TabElement,backgroundObj), DEFAULT_BACKGROUND }, {0,TK_OPTION_BOOLEAN,0,0} @@ -953,13 +953,8 @@ TTK_END_LAYOUT_TABLE /* ---------------------------------------------------------------------- */ -MODULE_SCOPE -int TtkWinTheme_Init( - Tcl_Interp *interp, - TCL_UNUSED(HWND)); - -MODULE_SCOPE -int TtkWinTheme_Init( +MODULE_SCOPE int +TtkWinTheme_Init( Tcl_Interp *interp, TCL_UNUSED(HWND)) { diff --git a/win/ttkWinXPTheme.c b/win/ttkWinXPTheme.c index 484dfa1..1dc3ba2 100644 --- a/win/ttkWinXPTheme.c +++ b/win/ttkWinXPTheme.c @@ -1391,8 +1391,6 @@ retErr: * +++ Initialization routine: */ -MODULE_SCOPE int TtkXPTheme_Init(Tcl_Interp *interp, HWND hwnd); - MODULE_SCOPE int TtkXPTheme_Init(Tcl_Interp *interp, HWND hwnd) { XPThemeData *themeData; |