Fixed bug where if the style included wxFRAME_NO_TASKBAR, not all the extended flags...

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

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index 10ecf1553a9917a58e62fd4ca4fe363c59bf0bef..2292c1c508d21534e23d1a6435bb1367db8f9eac 100644 (file)
--- 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;