X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4204da658ac4ec4998b790865964a8700c097ca4..f0c5ebdc0d881e5478f166bab335265460409ec9:/src/msw/frame.cpp

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index a76e556e13..2292c1c508 100644
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -147,13 +147,6 @@ bool wxFrame::Create(wxWindow *parent,
 
   m_iconized = FALSE;
 
-  // we pass NULL as parent to MSWCreate because frames with parents behave
-  // very strangely under Win95 shell
-  // Alteration by JACS: keep normal Windows behaviour (float on top of parent)
-  // with this style.
-  if ((m_windowStyle & wxFRAME_FLOAT_ON_PARENT) == 0)
-    parent = NULL;
-
   wxTopLevelWindows.Append(this);
 
   MSWCreate(m_windowId, parent, wxFrameClassName, this, title,
@@ -672,9 +665,15 @@ bool wxFrame::MSWCreate(int id, wxWindow *parent, const wxChar *wclass, wxWindow
 
   WXDWORD extendedStyle = 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)
-    extendedStyle |= WS_EX_TOOLWINDOW;
+  if ( (style & wxFRAME_TOOL_WINDOW) ||
+       (style & wxFRAME_NO_TASKBAR) )
+      extendedStyle |= WS_EX_TOOLWINDOW;
+  else if ( !(style & wxFRAME_NO_TASKBAR) )
+      extendedStyle |= WS_EX_APPWINDOW;
 #endif
 
   if (style & wxSTAY_ON_TOP)
@@ -809,7 +808,7 @@ void wxFrame::IconizeChildFrames(bool bIconize)
         // the child MDI frames are a special case and should not be touched by
         // the parent frame - instead, they are managed by the user
         wxFrame *frame = wxDynamicCast(win, wxFrame);
-        if ( frame && !wxDynamicCast(frame, wxMDIChildFrame) )
+        if ( frame && !frame->IsMDIChild() )
         {
             frame->Iconize(bIconize);
         }