Fixed bug that was giving the wrong size of wxCustomDataObjects to the receiver.

[wxWidgets.git] / src / msw / frame.cpp

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index 501b0fe8b698bdc775a0201b0b4b253c63dd7550..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;
@@ -807,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);
         }