summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorhobbs <hobbs>1999-09-21 06:42:16 (GMT)
committerhobbs <hobbs>1999-09-21 06:42:16 (GMT)
commitf29a5be23f295f3e213d950ffbbea8ccbc06c8b5 (patch)
treecbe860d1508f98a6d812f3f3090568a2d2f0bdbe /win
parentc0f23beb65e9af4511e5e455ca71039be233300b (diff)
downloadtk-f29a5be23f295f3e213d950ffbbea8ccbc06c8b5.zip
tk-f29a5be23f295f3e213d950ffbbea8ccbc06c8b5.tar.gz
tk-f29a5be23f295f3e213d950ffbbea8ccbc06c8b5.tar.bz2
1999-09-16 Jeff Hobbs <hobbs@scriptics.com>
* generic/tkFont.c: fixed processing of font options and error returned [Bug: 2075] * win/tkWinWm.c: fixed bug in 'wm deiconify' that raised the wrong toplevel, and changed it to not set focus on overridden toplevels 1999-09-15 Jeff Hobbs <hobbs@scriptics.com> * unix/aclocal.m4: added fix for FreeBSD-[1-2] recognition [Bug: 2070] and fix to AIX-* to get ldAix right [Bug: 2624], fixed AIX version check (readjust from 8-21 fix) and several other config fixes for AIX * mac/tkMacMenubutton.c: * unix/tkUnixMenubu.c: fixed permanently stippled menubutton image * win/tkWinButton.c: fixed possible pointer smash [Bug: 2733] 1999-09-14 Jeff Hobbs <hobbs@scriptics.com> * win/tkWinMenu.c: fix for stack overrun in GetTextFace [Bug: 909]
Diffstat (limited to 'win')
-rw-r--r--win/tkWinButton.c10
-rw-r--r--win/tkWinClipboard.c4
-rw-r--r--win/tkWinWm.c11
3 files changed, 18 insertions, 7 deletions
diff --git a/win/tkWinButton.c b/win/tkWinButton.c
index 6f2602c..77135fb 100644
--- a/win/tkWinButton.c
+++ b/win/tkWinButton.c
@@ -9,7 +9,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkWinButton.c,v 1.5 1999/04/21 21:53:32 rjohnson Exp $
+ * RCS: @(#) $Id: tkWinButton.c,v 1.6 1999/09/21 06:43:06 hobbs Exp $
*/
#define OEMRESOURCE
@@ -789,6 +789,14 @@ ButtonProc(hwnd, message, wParam, lParam)
BeginPaint(hwnd, &ps);
EndPaint(hwnd, &ps);
TkpDisplayButton((ClientData)butPtr);
+
+ /*
+ * Special note: must cancel any existing idle handler
+ * for TkpDisplayButton; it's no longer needed, and
+ * TkpDisplayButton cleared the REDRAW_PENDING flag.
+ */
+
+ Tcl_CancelIdleCall(TkpDisplayButton, (ClientData)butPtr);
return 0;
}
case BN_CLICKED: {
diff --git a/win/tkWinClipboard.c b/win/tkWinClipboard.c
index 18fb1f1..c5a6cd8 100644
--- a/win/tkWinClipboard.c
+++ b/win/tkWinClipboard.c
@@ -8,7 +8,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkWinClipboard.c,v 1.5 1999/05/22 02:05:31 stanton Exp $
+ * RCS: @(#) $Id: tkWinClipboard.c,v 1.6 1999/09/21 06:43:06 hobbs Exp $
*/
#include "tkWinInt.h"
@@ -384,7 +384,7 @@ UpdateClipboard(hwnd)
EmptyClipboard();
/*
- * CF_UNICODETEXT is only supported on NT, but it it is preffered
+ * CF_UNICODETEXT is only supported on NT, but it it is prefered
* when possible.
*/
diff --git a/win/tkWinWm.c b/win/tkWinWm.c
index 822735e..09f497a 100644
--- a/win/tkWinWm.c
+++ b/win/tkWinWm.c
@@ -12,7 +12,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkWinWm.c,v 1.10 1999/08/10 16:58:52 hobbs Exp $
+ * RCS: @(#) $Id: tkWinWm.c,v 1.11 1999/09/21 06:43:06 hobbs Exp $
*/
#include "tkWinInt.h"
@@ -1392,10 +1392,13 @@ Tk_WmCmd(clientData, interp, argc, argv)
TkpWmSetState(winPtr, NormalState);
/*
* Follow Windows-like style here:
- * raise the window to the top and force the focus on it
+ * raise the window to the top, and if it isn't overridden,
+ * then force the focus on it
*/
- Tk_RestackWindow(tkwin, Above, NULL);
- TkSetFocusWin(winPtr, 1);
+ TkWmRestackToplevel(winPtr, Above, NULL);
+ if (!(Tk_Attributes((Tk_Window) winPtr)->override_redirect)) {
+ TkSetFocusWin(winPtr, 1);
+ }
} else if ((c == 'f') && (strncmp(argv[1], "focusmodel", length) == 0)
&& (length >= 2)) {
if ((argc != 3) && (argc != 4)) {