From 4170dadb2c17a28bfbe04fcdba16d8e1038616df Mon Sep 17 00:00:00 2001 From: stwo Date: Thu, 9 Aug 2012 16:38:57 +0000 Subject: Remove useless (void *) casts introduced in checkin [81e50c85ed]. The warnings were false flags from a faulty OpenBSD C compiler. --- ChangeLog | 7 +++++++ generic/tkEvent.c | 6 +++--- unix/tkUnixEvent.c | 2 +- unix/tkUnixKey.c | 4 ++-- unix/tkUnixRFont.c | 2 +- 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0a98897..7d331d6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2012-08-09 Stuart Cassoff + + * generic/tkEvent.c: Remove useless (void *) casts + * unix/tkUnixEvent.c: introduced in checkin [81e50c85ed]. + * unix/tkUnixKey.c: The warnings were false flags from a + * unix/tkUnixRFont.c: faulty OpenBSD C compiler. + 2012-07-31 Donal K. Fellows * unix/tkUnixKey.c (TkpSetKeycodeAndState, TkpInitKeymapInfo) diff --git a/generic/tkEvent.c b/generic/tkEvent.c index dfa46ff..1fbf1dd 100644 --- a/generic/tkEvent.c +++ b/generic/tkEvent.c @@ -337,7 +337,7 @@ CreateXIC( preedit_attlist = XVaCreateNestedList(0, XNSpotLocation, &spot, XNFontSet, dispPtr->inputXfs, - (void *) NULL); + NULL); } winPtr->inputContext = XCreateIC(dispPtr->inputMethod, @@ -345,7 +345,7 @@ CreateXIC( XNClientWindow, winPtr->window, XNFocusWindow, winPtr->window, preedit_attname, preedit_attlist, - (void *) NULL); + NULL); if (preedit_attlist) { XFree(preedit_attlist); @@ -360,7 +360,7 @@ CreateXIC( /* * Adjust the window's event mask if the IM requires it. */ - XGetICValues(winPtr->inputContext, XNFilterEvents, &im_event_mask, (void *) NULL); + XGetICValues(winPtr->inputContext, XNFilterEvents, &im_event_mask, NULL); if ((winPtr->atts.event_mask & im_event_mask) != im_event_mask) { winPtr->atts.event_mask |= im_event_mask; XSelectInput(winPtr->display, winPtr->window, winPtr->atts.event_mask); diff --git a/unix/tkUnixEvent.c b/unix/tkUnixEvent.c index 0987129..4d0ccfa 100644 --- a/unix/tkUnixEvent.c +++ b/unix/tkUnixEvent.c @@ -646,7 +646,7 @@ OpenIM( } if ((XGetIMValues(dispPtr->inputMethod, XNQueryInputStyle, &stylePtr, - (void *) NULL) != NULL) || (stylePtr == NULL)) { + NULL) != NULL) || (stylePtr == NULL)) { goto error; } diff --git a/unix/tkUnixKey.c b/unix/tkUnixKey.c index f13adf7..d07f13a 100644 --- a/unix/tkUnixKey.c +++ b/unix/tkUnixKey.c @@ -64,9 +64,9 @@ Tk_SetCaretPos( spot.x = dispPtr->caret.x; spot.y = dispPtr->caret.y + dispPtr->caret.height; - preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, (void *) NULL); + preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL); XSetICValues(winPtr->inputContext, XNPreeditAttributes, preedit_attr, - (void *) NULL); + NULL); XFree(preedit_attr); } #endif diff --git a/unix/tkUnixRFont.c b/unix/tkUnixRFont.c index 50642ad..ab2ed4a 100644 --- a/unix/tkUnixRFont.c +++ b/unix/tkUnixRFont.c @@ -123,7 +123,7 @@ GetFont( FC_FAMILY, FcTypeString, "sans", FC_SIZE, FcTypeDouble, 12.0, FC_MATRIX, FcTypeMatrix, &mat, - (void *) NULL); + NULL); } if (!ftFont) { /* -- cgit v0.12 From b883e880976a068be12cf29c379b97be348ea79c Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Fri, 10 Aug 2012 11:28:09 +0000 Subject: Shift-Control -> Control-Shift, for consisancy everywhere --- doc/ttk_notebook.n | 2 +- library/listbox.tcl | 4 ++-- library/text.tcl | 4 ++-- library/tk.tcl | 8 ++++---- library/ttk/notebook.tcl | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/doc/ttk_notebook.n b/doc/ttk_notebook.n index 6b4b2bc..fe89994 100644 --- a/doc/ttk_notebook.n +++ b/doc/ttk_notebook.n @@ -184,7 +184,7 @@ containing the notebook as follows: .IP \(bu \fBControl-Tab\fR selects the tab following the currently selected one. .IP \(bu -\fBShift-Control-Tab\fR selects the tab preceding the currently selected one. +\fBControl-Shift-Tab\fR selects the tab preceding the currently selected one. .IP \(bu \fBAlt-\fIK\fR, where \fIK\fR is the mnemonic (underlined) character of any tab, will select that tab. diff --git a/library/listbox.tcl b/library/listbox.tcl index 99047f4..c7dd32e 100644 --- a/library/listbox.tcl +++ b/library/listbox.tcl @@ -120,7 +120,7 @@ bind Listbox { %W selection set 0 event generate %W <> } -bind Listbox { +bind Listbox { tk::ListboxDataExtend %W 0 } bind Listbox { @@ -130,7 +130,7 @@ bind Listbox { %W selection set end event generate %W <> } -bind Listbox { +bind Listbox { tk::ListboxDataExtend %W [%W index end] } bind Listbox <> { diff --git a/library/text.tcl b/library/text.tcl index 331d1b4..8a72152 100644 --- a/library/text.tcl +++ b/library/text.tcl @@ -128,10 +128,10 @@ bind Text <> { bind Text <> { tk::TextKeySelect %W [tk::TextNextWord %W insert] } -bind Text { +bind Text { tk::TextKeySelect %W [tk::TextPrevPara %W insert] } -bind Text { +bind Text { tk::TextKeySelect %W [tk::TextNextPara %W insert] } bind Text { diff --git a/library/tk.tcl b/library/tk.tcl index 928fc2e..2520d12 100644 --- a/library/tk.tcl +++ b/library/tk.tcl @@ -374,9 +374,9 @@ switch -exact -- [tk windowingsystem] { event add <> event add <> event add <> - event add <> + event add <> event add <> - event add <> + event add <> event add <> event add <> event add <> @@ -415,9 +415,9 @@ switch -exact -- [tk windowingsystem] { event add <> event add <> event add <> - event add <> + event add <> event add <> - event add <> + event add <> event add <> event add <> event add <> diff --git a/library/ttk/notebook.tcl b/library/ttk/notebook.tcl index d424b6c..72b85e6 100644 --- a/library/ttk/notebook.tcl +++ b/library/ttk/notebook.tcl @@ -108,7 +108,7 @@ proc ttk::notebook::enableTraversal {nb} { bind $top {+ttk::notebook::TLCycleTab %W 1} bind $top {+ttk::notebook::TLCycleTab %W -1} bind $top {+ttk::notebook::TLCycleTab %W 1} - bind $top {+ttk::notebook::TLCycleTab %W -1} + bind $top {+ttk::notebook::TLCycleTab %W -1} catch { bind $top {+ttk::notebook::TLCycleTab %W -1} } @@ -170,7 +170,7 @@ proc ttk::notebook::EnclosingNotebook {w} { } # TLCycleTab -- -# toplevel binding procedure for Control-Tab / Shift-Control-Tab +# toplevel binding procedure for Control-Tab / Control-Shift-Tab # Select the next/previous tab in the nearest ancestor notebook. # proc ttk::notebook::TLCycleTab {w dir} { -- cgit v0.12