diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-07-12 16:24:02 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-07-12 16:24:02 (GMT) |
| commit | ed381a36648ee0c9050e7bcd0a44e92f295d21ff (patch) | |
| tree | 9cddd75f916e2f3bd37d2904e0d7b74f30f66b44 /win | |
| parent | 47a7d357fcba6b6d2898e876f9e9a5403ff4e22f (diff) | |
| parent | 405cd1740e12c6b84187670afbaf7f835310c288 (diff) | |
| download | tk-ed381a36648ee0c9050e7bcd0a44e92f295d21ff.zip tk-ed381a36648ee0c9050e7bcd0a44e92f295d21ff.tar.gz tk-ed381a36648ee0c9050e7bcd0a44e92f295d21ff.tar.bz2 | |
Merge 8.7. Fix indenting
Diffstat (limited to 'win')
| -rw-r--r-- | win/ttkWinMonitor.c | 12 | ||||
| -rw-r--r-- | win/ttkWinTheme.c | 2 | ||||
| -rw-r--r-- | win/ttkWinXPTheme.c | 10 |
3 files changed, 12 insertions, 12 deletions
diff --git a/win/ttkWinMonitor.c b/win/ttkWinMonitor.c index 0fb362b..32d2a07 100644 --- a/win/ttkWinMonitor.c +++ b/win/ttkWinMonitor.c @@ -122,12 +122,12 @@ WndProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) case WM_THEMECHANGED: /* - * Reset the application theme. - * On windows, it is possible to sign in as a second user, change - * the theme to 'winnative' (by setting the ui to 'best performance'), - * which is a machine-wide change, and then sign back on to the original user. - * Ttk_UseTheme needs to be executed again in order to process the fallback - * from vista/xpnative to winnative. + * Reset the application theme. + * On windows, it is possible to sign in as a second user, change + * the theme to 'winnative' (by setting the ui to 'best performance'), + * which is a machine-wide change, and then sign back on to the original user. + * Ttk_UseTheme needs to be executed again in order to process the fallback + * from vista/xpnative to winnative. */ theme = Ttk_GetCurrentTheme(interp); diff --git a/win/ttkWinTheme.c b/win/ttkWinTheme.c index 690c30b..8e67b4d 100644 --- a/win/ttkWinTheme.c +++ b/win/ttkWinTheme.c @@ -964,7 +964,7 @@ TtkWinTheme_Init( parentPtr = Ttk_GetTheme(interp, "alt"); themePtr = Ttk_CreateTheme(interp, "winnative", parentPtr); if (!themePtr) { - return TCL_ERROR; + return TCL_ERROR; } Ttk_RegisterElementSpec(themePtr, "border", &BorderElementSpec, NULL); diff --git a/win/ttkWinXPTheme.c b/win/ttkWinXPTheme.c index 51b236a..4b868aa 100644 --- a/win/ttkWinXPTheme.c +++ b/win/ttkWinXPTheme.c @@ -25,8 +25,8 @@ typedef HTHEME (STDAPICALLTYPE OpenThemeDataProc)(HWND hwnd, LPCWSTR pszClassList); typedef HRESULT (STDAPICALLTYPE CloseThemeDataProc)(HTHEME hTheme); typedef HRESULT (STDAPICALLTYPE DrawThemeBackgroundProc)(HTHEME hTheme, - HDC hdc, int iPartId, int iStateId, const RECT *pRect, - OPTIONAL const RECT *pClipRect); + HDC hdc, int iPartId, int iStateId, const RECT *pRect, + OPTIONAL const RECT *pClipRect); typedef HRESULT (STDAPICALLTYPE DrawThemeEdgeProc)(HTHEME hTheme, HDC hdc, int iPartId, int iStateId, const RECT *pDestRect, unsigned int uEdge, unsigned int uFlags, @@ -892,7 +892,7 @@ static void TreeIndicatorElementDraw( Drawable d, Ttk_Box b, Ttk_State state) { if (!(state & TTK_STATE_LEAF)) { - GenericElementDraw(clientData,elementRecord,tkwin,d,b,state); + GenericElementDraw(clientData,elementRecord,tkwin,d,b,state); } } @@ -1031,7 +1031,7 @@ TTK_LAYOUT("TMenubutton", TTK_NODE("Menubutton.dropdown", TTK_PACK_RIGHT|TTK_FILL_Y) TTK_GROUP("Menubutton.button", TTK_FILL_BOTH, TTK_GROUP("Menubutton.padding", TTK_FILL_X, - TTK_NODE("Menubutton.label", 0)))) + TTK_NODE("Menubutton.label", 0)))) TTK_LAYOUT("Horizontal.TScrollbar", TTK_GROUP("Horizontal.Scrollbar.trough", TTK_FILL_X, @@ -1409,7 +1409,7 @@ TtkXPTheme_Init(Tcl_Interp *interp, HWND hwnd) themePtr = Ttk_CreateTheme(interp, "xpnative", parentPtr); if (!themePtr) - return TCL_ERROR; + return TCL_ERROR; /* * Set theme data and cleanup proc |