From 4b9fc37a48b4e9d4742e49859589883a20706e6d Mon Sep 17 00:00:00 2001 From: George Tasker Date: Wed, 20 Dec 2000 15:18:52 +0000 Subject: [PATCH] Fixed bug where if the style included wxFRAME_NO_TASKBAR, not all the extended flags were set that were needed to prevent it from showing up on the taskbar were set (specifically WS_EX_TOOLWINDOW), and the frame still showed on the taskbar git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8963 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/frame.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp index 10ecf1553a..2292c1c508 100644 --- a/src/msw/frame.cpp +++ b/src/msw/frame.cpp @@ -669,7 +669,8 @@ bool wxFrame::MSWCreate(int id, wxWindow *parent, const wxChar *wclass, wxWindow // 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 ) + if ( (style & wxFRAME_TOOL_WINDOW) || + (style & wxFRAME_NO_TASKBAR) ) extendedStyle |= WS_EX_TOOLWINDOW; else if ( !(style & wxFRAME_NO_TASKBAR) ) extendedStyle |= WS_EX_APPWINDOW; -- 2.50.0