summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhobbs <hobbs>2004-09-10 20:49:42 (GMT)
committerhobbs <hobbs>2004-09-10 20:49:42 (GMT)
commitc010c7e29d9be187e473c15114004bd79faabd82 (patch)
treedfdb6a3a876a8b14e8b17ce8640b964df5082562
parente535b4a6abd8efbd2a684aa35c64ce84a7fb1cec (diff)
downloadtk-c010c7e29d9be187e473c15114004bd79faabd82.zip
tk-c010c7e29d9be187e473c15114004bd79faabd82.tar.gz
tk-c010c7e29d9be187e473c15114004bd79faabd82.tar.bz2
(UpdateWrapper): update to 2004-06-12 Kovalenko to account for
whether the override window has a transient parent, and apply WS_POPUP in the correct case. The makes splash screens pop up as well as making dropdowns not grab focus away from the parent.
-rw-r--r--ChangeLog4
-rw-r--r--win/tkWinWm.c30
2 files changed, 20 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index f135db2..0f074c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,10 @@
* win/tkWinWm.c (ActivateWindow): SetFocus to grab window when
clicking outside the grab window hierarchy. [Bug 220908]
+ (UpdateWrapper): update to 2004-06-12 Kovalenko to account for
+ whether the override window has a transient parent, and apply
+ WS_POPUP in the correct case. The makes splash screens pop up as
+ well as making dropdowns not grab focus away from the parent.
2004-09-10 Vince Darley <vincentdarley@users.sourceforge.net>
diff --git a/win/tkWinWm.c b/win/tkWinWm.c
index 80240a8..e7499c1 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.66 2004/09/10 18:45:23 hobbs Exp $
+ * RCS: @(#) $Id: tkWinWm.c,v 1.67 2004/09/10 20:49:42 hobbs Exp $
*/
#include "tkWinInt.h"
@@ -315,7 +315,7 @@ typedef struct TkWmInfo {
* Window styles for various types of toplevel windows.
*/
-#define WM_OVERRIDE_STYLE (WS_CHILD|WS_CLIPCHILDREN|WS_CLIPSIBLINGS|CS_DBLCLKS)
+#define WM_OVERRIDE_STYLE (WS_CLIPCHILDREN|WS_CLIPSIBLINGS|CS_DBLCLKS)
#define EX_OVERRIDE_STYLE (WS_EX_TOOLWINDOW)
#define WM_TOPLEVEL_STYLE (WS_OVERLAPPEDWINDOW|WS_CLIPCHILDREN|CS_DBLCLKS)
@@ -1934,17 +1934,26 @@ UpdateWrapper(winPtr)
} else {
/*
* Pick the decorative frame style. Override redirect windows get
- * created as undecorated popups. Transient windows get a modal
- * dialog frame. Neither override, nor transient windows appear in
- * the Windows taskbar. Note that a transient window does not resize
- * by default, so we need to explicitly add the WS_THICKFRAME style
- * if we want it to be resizeable.
+ * created as undecorated popups if they have no transient parent,
+ * otherwise they are children. This allows splash screens to operate
+ * as an independent window, while having dropdows (like for a
+ * combobox) not grab focus away from their parent. Transient windows
+ * get a modal dialog frame. Neither override, nor transient windows
+ * appear in the Windows taskbar. Note that a transient window does
+ * not resize by default, so we need to explicitly add the
+ * WS_THICKFRAME style if we want it to be resizeable.
*/
if (winPtr->atts.override_redirect) {
wmPtr->style = WM_OVERRIDE_STYLE;
wmPtr->exStyle = EX_OVERRIDE_STYLE;
+ /* parent must be desktop even if we have a transient parent */
parentHWND = GetDesktopWindow();
+ if (wmPtr->masterPtr) {
+ wmPtr->style |= WS_CHILD;
+ } else {
+ wmPtr->style |= WS_POPUP;
+ }
} else if (wmPtr->masterPtr) {
wmPtr->style = WM_TRANSIENT_STYLE;
wmPtr->exStyle = EX_TRANSIENT_STYLE;
@@ -2153,13 +2162,6 @@ UpdateWrapper(winPtr)
}
/*
- * To keep the standard Tk behavior, we must raise override_redirected
- * window manually
- */
- if (winPtr->atts.override_redirect) {
- TkWinSetWindowPos(wmPtr->wrapper, NULL, Above);
- }
- /*
* If this is the first window created by the application, then
* we should activate the initial window.
*/