From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 27 Oct 2001 00:07:29 +0000 (+0000)
Subject: don't make the dialogs appear in the taskbar
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/35bf863b1c31c0f1679b214c1b9a742eba918c5e

don't make the dialogs appear in the taskbar


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12176 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index 96cdd42600..b5da266564 100644
--- a/src/msw/toplevel.cpp
+++ b/src/msw/toplevel.cpp
@@ -152,16 +152,19 @@ long wxTopLevelWindowMSW::MSWGetCreateWindowFlags(long *exflags) const
     {
         *exflags = MakeExtendedStyle(style);
 
-        // make all frames appear in the win9x shell taskbar unless
-        // wxFRAME_TOOL_WINDOW or wxFRAME_NO_TASKBAR is given - without giving
-        // them WS_EX_APPWINDOW style, the child (i.e. owned) frames wouldn't
-        // appear in it
 #if !defined(__WIN16__) && !defined(__SC__)
-        if ( (style & wxFRAME_TOOL_WINDOW) || (style & wxFRAME_NO_TASKBAR) )
-            *exflags |= WS_EX_TOOLWINDOW;
-        else if ( !(style & wxFRAME_NO_TASKBAR) )
-            *exflags |= WS_EX_APPWINDOW;
-#endif
+        if ( !(GetExtraStyle() & wxTOPLEVEL_EX_DIALOG) )
+        {
+            // make all frames appear in the win9x shell taskbar unless
+            // wxFRAME_TOOL_WINDOW or wxFRAME_NO_TASKBAR is given - without
+            // giving them WS_EX_APPWINDOW style, the child (i.e. owned) frames
+            // wouldn't appear in it
+            if ( (style & wxFRAME_TOOL_WINDOW) || (style & wxFRAME_NO_TASKBAR) )
+                *exflags |= WS_EX_TOOLWINDOW;
+            else if ( !(style & wxFRAME_NO_TASKBAR) )
+                *exflags |= WS_EX_APPWINDOW;
+        }
+#endif // !Win16
 
         if ( style & wxSTAY_ON_TOP )
             *exflags |= WS_EX_TOPMOST;