fixed fl makefiles that Julian didn't fix correctly

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

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index 40ef1321873b68c954d02db89235497efdeed1d1..b1b4e12a8f33eed69283fb9621ac9176613a08c1 100644 (file)
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -64,7 +64,6 @@
 // ----------------------------------------------------------------------------
 
 extern wxWindowList wxModelessWindows;
-extern wxList WXDLLEXPORT wxPendingDelete;
 extern const wxChar *wxFrameClassName;
 
 #if wxUSE_MENUS_NATIVE
@@ -156,17 +155,12 @@ bool wxFrameMSW::Create(wxWindow *parent,
 
   m_iconized = FALSE;
 
-  // the frame must have NULL parent HWND or it would be always on top of its
-  // parent which is not what we usually want (in fact, we only want it for
-  // frames with the special wxFRAME_FLOAT_ON_PARENT style)
-  if ( !(m_windowStyle & wxFRAME_FLOAT_ON_PARENT) )
-  {
-    parent = NULL;
-  }
-
   wxTopLevelWindows.Append(this);
 
-  MSWCreate(m_windowId, parent, wxFrameClassName, this, title,
+  // the frame must have NULL parent HWND or it would be always on top of its
+  // parent which is not what we usually want (in fact, we only want it for
+  // frames with the special wxFRAME_TOOL_WINDOW style handled elsewhere)
+  MSWCreate(m_windowId, NULL, wxFrameClassName, this, title,
             x, y, width, height, style);
 
   wxModelessWindows.Append(this);