Changeset 1572 for trunk/src/user32/win32wbase.cpp

Timestamp:

Nov 3, 1999, 7:00:29 PM (26 years ago)

Author:

cbratschi

Message:

modal dialog fixes

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.72 1999-11-02 17:07:25 cbratschi Exp $ */
+/* $Id: win32wbase.cpp,v 1.73 1999-11-03 18:00:27 cbratschi Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -135 +135 @@
   fFirstShow       = TRUE;
   fIsDialog        = FALSE;
+  fIsModalDialogOwner = FALSE;
+  OS2HwndModalDialog  = 0;
   fInternalMsg     = FALSE;
   fNoSizeMsg       = FALSE;
@@ -213 +215 @@
         }
     }
-    else 
+    else
     if(fDestroyAll) {
-        dprintf(("Destroying window %x %s", getWindowHandle(), windowNameA));
+        dprintf(("Destroying window %x %s", getWindowHandle(), windowNameA));
         setParent(NULL);  //or else we'll crash in the dtor of the ChildWindow class
     }
@@ -433 +435 @@
   if(WIDGETS_IsControl(this, BUTTON_CONTROL) && ((dwStyle & 0x0f) == BS_GROUPBOX))
   {
-        hwndLinkAfter = HWND_BOTTOM;
-        dwStyle |= WS_CLIPSIBLINGS;
-  }
-  else 
+        hwndLinkAfter = HWND_BOTTOM;
+        dwStyle |= WS_CLIPSIBLINGS;
+  }
+  else
   if(WIDGETS_IsControl(this, STATIC_CONTROL) && !(dwStyle & WS_GROUP)) {
-        dwStyle |= WS_CLIPSIBLINGS;
+        dwStyle |= WS_CLIPSIBLINGS;
   }
 
@@ -1992 +1994 @@
     /* We can't activate a child window (WINE) */
     if(getStyle() & WS_CHILD)
-        showstate &= ~SWPOS_ACTIVATE;
+        showstate &= ~SWPOS_ACTIVATE;
 
     if(showstate & SWPOS_SHOW) {