* Changed "true" to "TRUE" in some file: "true" doesn't exist in BC++ 5

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

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index ce0c0b0edf81a7d0c3763be09c067d1d1d54adc4..2e00ecfccb9f171eff02016cb35e85e1327d32aa 100644 (file)
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -552,13 +552,11 @@ void wxFrame::MSWCreate(const int id, wxWindow *parent, const char *wclass, wxWi
   // If child windows aren't properly drawn initially, WS_CLIPCHILDREN
   // could be the culprit. But without it, you can get a lot of flicker.
 
-//   DWORD msflags = WS_POPUP | WS_CLIPCHILDREN ;
-
   DWORD msflags = 0;
   if ((style & wxCAPTION) == wxCAPTION)
-    msflags = WS_OVERLAPPED | WS_CLIPCHILDREN ; // WS_POPUP | WS_CLIPCHILDREN ;
+    msflags = WS_OVERLAPPED;
   else
-    msflags = WS_POPUP | WS_CLIPCHILDREN ;
+    msflags = WS_POPUP;
 
   if (style & wxMINIMIZE_BOX)
     msflags |= WS_MINIMIZEBOX;
@@ -574,6 +572,8 @@ void wxFrame::MSWCreate(const int id, wxWindow *parent, const char *wclass, wxWi
     msflags |= WS_MAXIMIZE;
   if (style & wxCAPTION)
     msflags |= WS_CAPTION;
+  if (style & wxCLIP_CHILDREN)
+    msflags |= WS_CLIPCHILDREN;
 
   // Keep this in wxFrame because it saves recoding this function
   // in wxTinyFrame
@@ -642,12 +642,9 @@ bool wxFrame::MSWOnPaint(void)
 
       EndPaint((HWND) GetHWND(), &ps);
     }
-
-    if (!m_iconized)
+    else
     {
-//      m_paintHDC = (WXHDC) cdc;
       GetEventHandler()->OldOnPaint();
-//      m_paintHDC = NULL;
     }
     return 0;
   }