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

Timestamp:

Oct 17, 2001, 3:26:57 PM (24 years ago)

Author:

phaller

Message:

Minor optimization for micro functions

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.289 2001-10-09 05:18:03 phaller Exp $ */
+/* $Id: win32wbase.cpp,v 1.290 2001-10-17 13:26:57 phaller Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -2904 +2904 @@
 BOOL Win32BaseWindow::IsChild(HWND hwndParent)
 {
-    if(getParent()) {
-         if(getParent()->getWindowHandle() == hwndParent)
-             return TRUE;
-
-         return getParent()->IsChild(hwndParent);
-    }
-    else return 0;
+  // PH: Optimizer won't unroll calls to getParent() even
+  // in release build.
+  Win32BaseWindow *_parent = getParent();
+    
+  if(_parent) 
+  {
+    if(_parent->getWindowHandle() == hwndParent)
+      return TRUE;
+
+    return _parent->IsChild(hwndParent);
+  }
+  else 
+    return 0;
 }
 //******************************************************************************
@@ -3196 +3202 @@
     {
     case GW_HWNDFIRST:
-        if(getParent())
-        {
-            window = (Win32BaseWindow *)getParent();
+        window = (Win32BaseWindow *)getParent();
+        if(window)
+        {
             hwndRelated = OSLibWinQueryWindow(window->getOS2WindowHandle(), QWOS_TOP);
             window = GetWindowFromOS2FrameHandle(hwndRelated);
@@ -3214 +3220 @@
 
     case GW_HWNDLAST:
-        if(getParent()) {
-            window = (Win32BaseWindow *)getParent();
+        window = (Win32BaseWindow *)getParent();
+        if(window) {
             hwndRelated = OSLibWinQueryWindow(window->getOS2WindowHandle(), QWOS_BOTTOM);
             dprintf(("os2 handle %x", hwndRelated));
@@ -3264 +3270 @@
 
     case GW_OWNER:
-        if(getOwner()) {
-            hwndRelated = getOwner()->getWindowHandle();
+      {
+        Win32BaseWindow *owner = getOwner();
+        if(owner) {
+            hwndRelated = owner->getWindowHandle();
         }
         break;
+      }
 
     case GW_CHILD: