From 02e336a3fe60cf9e3cc1d90d2d2d3fa98e1a3a5a Mon Sep 17 00:00:00 2001 From: dkf Date: Thu, 12 Jul 2012 12:29:42 +0000 Subject: Type correctness fix, to stop compiler complaint. --- generic/tkInt.h | 2 +- unix/tkUnixRFont.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/generic/tkInt.h b/generic/tkInt.h index a95adf8..c30eceb 100644 --- a/generic/tkInt.h +++ b/generic/tkInt.h @@ -1187,7 +1187,7 @@ MODULE_SCOPE Status TkParseColor (Display * display, XColor * colorPtr); #endif #ifdef HAVE_XFT -MODULE_SCOPE void TkUnixSetXftClipRegion(Region clipRegion); +MODULE_SCOPE void TkUnixSetXftClipRegion(TkRegion clipRegion); #endif /* diff --git a/unix/tkUnixRFont.c b/unix/tkUnixRFont.c index deecceb..c3ece5e 100644 --- a/unix/tkUnixRFont.c +++ b/unix/tkUnixRFont.c @@ -810,10 +810,10 @@ Tk_DrawChars( void TkUnixSetXftClipRegion( - Region clipRegion) /* The clipping region to install. */ + TkRegion clipRegion) /* The clipping region to install. */ { ThreadSpecificData *tsdPtr = (ThreadSpecificData *) Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData)); - tsdPtr->clipRegion = clipRegion; + tsdPtr->clipRegion = (Region) clipRegion; } -- cgit v0.12 From 78d66d5a3c3804ab79bdea5bd12ee198918da2f8 Mon Sep 17 00:00:00 2001 From: dgp Date: Mon, 16 Jul 2012 19:36:54 +0000 Subject: Update changes for Tk 8.5.12 release. --- ChangeLog | 45 +++++++++++++++++++++++++++++---------------- changes | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index ef8f53e..c7ca123 100644 --- a/ChangeLog +++ b/ChangeLog @@ -69,7 +69,8 @@ 2012-06-07 Jan Nijtmans * generic/tkInt.decls: Change XChangeWindowAttributes signature and - * generic/tkIntXlibDeclsDecls.h: many others to match Xorg, needed for Cygwin. + * generic/tkIntXlibDeclsDecls.h: many others to match Xorg, needed for + Cygwin. 2012-06-06 Jan Nijtmans @@ -86,22 +87,22 @@ 2012-05-30 Jan Nijtmans - * generic/tkWindow.c: Simpify determination whether we are running on cygwin. - * generic/tkStubInit.c: Export Tk_GetHINSTANCE, TkSetPixmapColormap and - * generic/tkInt.decls: TkpPrintWindowId on the Cygwin dll, sync stub table - with Tk 8.6 win32 version. + * generic/tkWindow.c: Simplify determination whether we are running + * generic/tkStubInit.c: on cygwin. Export Tk_GetHINSTANCE, + * generic/tkInt.decls: TkSetPixmapColormap and TkpPrintWindowId on the + Cygwin dll, sync stub table with Tk 8.6 win32 version. * generic/tk*Decls.h: re-generated - * win/Makefile.in: Fix "make genstubs" when cross-compiling on UNIX + * win/Makefile.in: "make genstubs" when cross-compiling on UNIX 2012-05-28 Francois Vogel - * doc/text.n: [Bug 1630251]: Documentation for -endline option was wrong + * doc/text.n: [Bug 1630251]: Doc for -endline option was wrong 2012-05-28 Francois Vogel - * generic/tkTextDisp.c: [Bug 1630254]: missing scrolling of text widget - when from a -startline == -endline initial state it is configured to display - a non-empty part of it + * generic/tkTextDisp.c: [Bug 1630254]: missing scrolling of text widget + when from a -startline == -endline initial state it is configured to + display a non-empty part of it 2012-05-24 Jan Nijtmans @@ -121,15 +122,16 @@ 2012-05-05 Jan Nijtmans * xlib/xcolors.c: Single "const" addition - * generic/tkWindow.c: If tk.dll loaded in cygwin, don't use the win32 file dialogs + * generic/tkWindow.c: If tk.dll loaded in cygwin, don't use the + win32 file dialogs 2012-05-04 Jan Nijtmans - * library/menu.tcl: [Bug 2768586]: Menu posting problem on dual monitors + * library/menu.tcl: [Bug 2768586]: Menu posting on dual monitors 2012-05-02 Jan Nijtmans - * library/tk.tcl: [Bug 533519]: Window placement with multiple screens + * library/tk.tcl: [Bug 533519]: Window placement with multiple screens * generic/tkBind.c: * generic/tkFocus.c: * generic/tkMenuDraw.c: @@ -142,12 +144,13 @@ 2012-04-26 Jan Nijtmans - * generic/tk.decls: [Bug 3508771]: Implement TkClipBox, Tk*Region and - * generic/tkInt.decls: Tk_GetHINSTANCE for Cygwin + * generic/tk.decls: [Bug 3508771]: Implement TkClipBox, Tk*Region + * generic/tkInt.decls: and Tk_GetHINSTANCE for Cygwin * generic/tkPlatDecls.h: * generic/tkintDecls.h: * generic/tkStubInit.c: - * unix/Makefile.in: [Bug 3519917]: Snow Leopard unix/Makefile `make test` fail + * unix/Makefile.in: [Bug 3519917]: Snow Leopard unix/Makefile + `make test` fail 2012-04-22 Donal K. Fellows @@ -238,6 +241,11 @@ Tkinter's handling of multiple filename results. Issue was reported via StackOverflow: http://stackoverflow.com/q/9227859/301832 +2012-01-30 Joe English + + * library/ttk/combobox.tcl: [Bug 2925561] Don't take focus in + disabled state. + 2012-01-29 Jan Nijtmans * win/tkImgPhoto.c: [Bug 3480634]: PNG Images missing in menus on Mac @@ -281,6 +289,11 @@ * generic/tkText.c: [Bug-3021557]: Moving the cursor in * tests/text.test: elided text freezes Tk +2011-12-22 Don Porter + + * win/tkWinMenu.c: [Bug 3235256] Keep menu entry IDs out of system + values. Thanks Colin McDonald. + 2011-11-22 Jan Nijtmans * doc/wish.1: Use the same shebang comment everywhere. diff --git a/changes b/changes index e3a96be..9f82083 100644 --- a/changes +++ b/changes @@ -6795,3 +6795,49 @@ and -to (porter) 2011-11-02 (performance)[3431491] improved "pixels" shimmer logic (fellows) --- Released 8.5.11, November 4, 2011 --- See ChangeLog for details --- + +2011-11-17 (bug fix)[3437816] return code of [canvas lower] (hirner,ferrieux) + +2011-12-22 (bug fix)[3235256] correct menu failure on Windows (mcdonald) + +2012-01-19 (bug fix)[3021557] cursor freeze in elided text (vogel) + +2012-01-22 (bug fix)[3476698] hang in [text mark prev/next] (vogel) + +2012-01-25 (bug fix)[3475627] Stop text-31.11 failure (vogel) + +2012-01-25 (bug fix)[1630271] hang/crash on mark before -startline (vogel) + +2012-01-26 (bug fix)[1754043,2321450] -blockcursor appearance (vogel) + +2012-01-27 (bug fix)[3480471] crash in [tk_getOpenFile] (nijtmans) + +2012-01-29 (bug fix)[3480634] PNG image in menus (nijtmans) + +2012-01-30 (bug fix)[2925561] disabled combobox don't take focus (english) + +2012-02-10 (bug fix) win dialog avoid shimmer that confuses Python (fellows) + +2012-02-15 (bug fix)[3486474] Correct color scaling (goth,nijtmans) + +2012-02-28 (bug fix)[1630262,1615425] [text] crash tags & -*line (vogel) + +2012-03-07 (bug fix)[3497848] consistent pixel rounding (fassel,fellows) + +2012-03-18 (enhancement)[3503317] XParseColor speedup (nijtmans) + +2012-04-07 (bug fix)[3176239] control-Mousewheel crash (couch,nijtmans) + +2012-04-22 (bug fix)[3520202] %k,%K,%N for Python (deily,fellows) + +2012-05-02 (bug fix)[533519] multiscreen window placement (nijtmans) + +2012-05-04 (bug fix)[2768586] multiscreen menu posting (nijtmans) + +2012-05-28 (bug fix)[1630254] text peer update on -startline reset (baker,vogel) + +2012-06-11 (bug fix)[3294450] ttk text element clipping (oehlmann,fellows) + +Many revisions to better support a Cygwin environment (nijtmans) + +--- Released 8.5.12, July 20, 2012 --- See ChangeLog for details --- -- cgit v0.12