Changeset 2529 for trunk/src/user32/win32wbasenonclient.cpp

Timestamp:

Jan 27, 2000, 6:21:10 PM (26 years ago)

Author:

cbratschi

Message:

WINE code clean-up

File:

• trunk/src/user32/win32wbasenonclient.cpp (modified) (5 diffs)

trunk/src/user32/win32wbasenonclient.cpp

@@ -1 @@
-/* $Id: win32wbasenonclient.cpp,v 1.5 2000-01-26 18:02:37 cbratschi Exp $ */
+/* $Id: win32wbasenonclient.cpp,v 1.6 2000-01-27 17:21:09 cbratschi Exp $ */
 /*
  * Win32 Window Base Class for OS/2 (non-client methods)
@@ -74 +74 @@
   WORD wStateChange;
 
-  //CB: only caption is changed on activation
-  if (!(dwStyle & WS_CAPTION)) return TRUE;
-
   if( wParam ) wStateChange = !(flags & WIN_NCACTIVATED);
   else wStateChange = flags & WIN_NCACTIVATED;
@@ -84 +81 @@
     if (wParam) flags |= WIN_NCACTIVATED;
     else flags &= ~WIN_NCACTIVATED;
+
+    if (!(dwStyle & WS_CAPTION)) return TRUE;
 
     if(!(dwStyle & WS_MINIMIZE))
@@ -303 +302 @@
 //******************************************************************************
 //******************************************************************************
-BOOL Win32BaseWindow::WindowNeedsWMBorder()
-{
-  if (!(dwStyle & WS_CHILD) &&
-      //Options.managed  && //CB: to check
-      !(dwExStyle & WS_EX_TOOLWINDOW) &&
-      ( ((dwStyle & WS_CAPTION) == WS_CAPTION) ||
-        (dwStyle & WS_THICKFRAME)))
-      return TRUE;
-  if (dwExStyle & WS_EX_TRAYWINDOW)
-    return TRUE;
-  return FALSE;
-}
-//******************************************************************************
-//******************************************************************************
 VOID Win32BaseWindow::AdjustMaximizedRect(LPRECT rect)
 {
-  /* Decide if the window will be managed (see CreateWindowEx) */
-  //if (!WindowNeedsWMBorder()) //CB: check Options.managed
-  {
-    if (HAS_THICKFRAME(dwStyle,dwExStyle ))
-      InflateRect( rect, GetSystemMetrics(SM_CXFRAME), GetSystemMetrics(SM_CYFRAME) );
+  if (HAS_THICKFRAME(dwStyle,dwExStyle ))
+    InflateRect( rect, GetSystemMetrics(SM_CXFRAME), GetSystemMetrics(SM_CYFRAME) );
+  else
+    if (HAS_DLGFRAME( dwStyle, dwExStyle ))
+      InflateRect(rect, GetSystemMetrics(SM_CXDLGFRAME), GetSystemMetrics(SM_CYDLGFRAME) );
     else
-      if (HAS_DLGFRAME( dwStyle, dwExStyle ))
-        InflateRect(rect, GetSystemMetrics(SM_CXDLGFRAME), GetSystemMetrics(SM_CYDLGFRAME) );
-      else
-        if (HAS_THINFRAME( dwStyle ))
-          InflateRect( rect, GetSystemMetrics(SM_CXBORDER), GetSystemMetrics(SM_CYBORDER));
-  }
+      if (HAS_THINFRAME( dwStyle ))
+        InflateRect( rect, GetSystemMetrics(SM_CXBORDER), GetSystemMetrics(SM_CYBORDER));
 }
 //******************************************************************************
@@ -345 +326 @@
   if(dwStyle & WS_ICONIC) return;
 
-  /* Decide if the window will be managed (see CreateWindowEx) */
-  //if (!WindowNeedsWMBorder()) //CB: check Options.managed
-  {
-    if (HAS_THICKFRAME(dwStyle,dwExStyle ))
-      InflateRect( rect, GetSystemMetrics(SM_CXFRAME), GetSystemMetrics(SM_CYFRAME) );
+  if (HAS_THICKFRAME(dwStyle,dwExStyle ))
+    InflateRect( rect, GetSystemMetrics(SM_CXFRAME), GetSystemMetrics(SM_CYFRAME) );
+  else
+    if (HAS_DLGFRAME( dwStyle, dwExStyle ))
+      InflateRect(rect, GetSystemMetrics(SM_CXDLGFRAME), GetSystemMetrics(SM_CYDLGFRAME) );
     else
-      if (HAS_DLGFRAME( dwStyle, dwExStyle ))
-        InflateRect(rect, GetSystemMetrics(SM_CXDLGFRAME), GetSystemMetrics(SM_CYDLGFRAME) );
-      else
-        if (HAS_THINFRAME( dwStyle ))
-          InflateRect( rect, GetSystemMetrics(SM_CXBORDER), GetSystemMetrics(SM_CYBORDER));
-
-    if ((dwStyle & WS_CAPTION) == WS_CAPTION)
-    {
-      if (dwExStyle & WS_EX_TOOLWINDOW)
-        rect->top -= GetSystemMetrics(SM_CYSMCAPTION);
-      else
-        rect->top -= GetSystemMetrics(SM_CYCAPTION);
-    }
+      if (HAS_THINFRAME( dwStyle ))
+        InflateRect( rect, GetSystemMetrics(SM_CXBORDER), GetSystemMetrics(SM_CYBORDER));
+
+  if ((dwStyle & WS_CAPTION) == WS_CAPTION)
+  {
+    if (dwExStyle & WS_EX_TOOLWINDOW)
+      rect->top -= GetSystemMetrics(SM_CYSMCAPTION);
+    else
+      rect->top -= GetSystemMetrics(SM_CYCAPTION);
   }