Attachment "tkFocus.704212" to
ticket [704212ff]
added by
hobbs
2003-05-11 08:15:38.
Index: generic/tkFocus.c
===================================================================
RCS file: /cvsroot/tktoolkit/tk/generic/tkFocus.c,v
retrieving revision 1.10
diff -u -r1.10 tkFocus.c
--- generic/tkFocus.c 8 Oct 2002 19:57:59 -0000 1.10
+++ generic/tkFocus.c 11 May 2003 01:14:09 -0000
@@ -663,8 +663,12 @@
* set up a serial number marker so we discard focus events
* that are triggered by the ChangeFocus.
*/
+ TkWindow *focusToplevelPtr = TkpGetWrapperWindow(topLevelPtr);
- serial = TkpChangeFocus(TkpGetWrapperWindow(topLevelPtr), force);
+ if (focusToplevelPtr == NULL) {
+ focusToplevelPtr = topLevelPtr;
+ }
+ serial = TkpChangeFocus(focusToplevelPtr, force);
if (serial != 0) {
displayFocusPtr->focusSerial = serial;
}
