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

Timestamp:

Mar 18, 2000, 5:13:41 PM (25 years ago)

Author:

cbratschi

Message:

merged with Corel 20000317, small icon

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.173 2000-03-17 17:12:08 cbratschi Exp $ */
+/* $Id: win32wbase.cpp,v 1.174 2000-03-18 16:13:38 cbratschi Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -253 +253 @@
                     return FALSE;
             }
+            /* Windows does this for overlapped windows
+             * (I don't know about other styles.) */
+            if (cs->hwndParent == GetDesktopWindow() && (!(cs->style & WS_CHILD) || (cs->style & WS_POPUP)))
+            {
+                    cs->hwndParent = 0;
+            }
     }
     else
@@ -927 +933 @@
     if(fClick)
     {
-     HWND hwndTop;
+      HWND hwndTop;
 
         /* Activate the window if needed */
@@ -945 +951 @@
                    && (hwndTop != GetForegroundWindow()) )
                 {
+                    Win32BaseWindow *win32top = Win32BaseWindow::GetWindowFromHandle(hwndTop);
+
                     //SvL: Calling OSLibSetActiveWindow(hwndTop); causes focus problems
-                    OSLibWinSetFocus(getOS2FrameWindowHandle());
+                    if (win32top) OSLibWinSetFocus(win32top->getOS2FrameWindowHandle());
                 }
         }
@@ -1659 +1667 @@
         {
           LRESULT result = 0;
-          if (!windowClass) return result;
+
           /* Set the appropriate icon members in the window structure. */
           if (wParam == ICON_SMALL)
@@ -1673 +1681 @@
             {
               hIcon = (HICON)lParam;
-              OSLibWinSetIcon(OS2HwndFrame,hIcon);
+              if ((dwStyle & WS_CAPTION) == WS_CAPTION)
+                OSLibWinSetIcon(OS2HwndFrame,hIcon);
             }
           }
+          if ((Msg == WM_SETICON) && ((dwStyle & WS_CAPTION) == WS_CAPTION))
+            HandleNCPaint((HRGN)1);
+
           return result;
         }
@@ -1950 +1962 @@
         window = parentwindow;
    }
+}
+//******************************************************************************
+// Returns the big or small icon for the window, falling back to the
+// class as windows does.
+//******************************************************************************
+HICON Win32BaseWindow::IconForWindow(WPARAM fType)
+{
+  HICON hWndIcon;
+
+  if (fType == ICON_BIG)
+  {
+    if (hIcon) hWndIcon = hIcon;
+    else if (windowClass && windowClass->getIcon()) hWndIcon = windowClass->getIcon();
+    else if (!(dwStyle & DS_MODALFRAME))
+      hWndIcon = LoadImageA(0,MAKEINTRESOURCEA(OIC_ODINICON),IMAGE_ICON,0,0,LR_DEFAULTCOLOR);
+    else hWndIcon = 0;
+  } else
+  {
+    if (hIconSm) hWndIcon = hIconSm;
+    else if (hIcon) hWndIcon = hIcon;
+    else if (windowClass && windowClass->getIconSm()) hWndIcon = windowClass->getIconSm();
+    else if (windowClass && windowClass->getIcon()) hWndIcon = windowClass->getIcon();
+    else if (!(dwStyle & DS_MODALFRAME))
+      hWndIcon = LoadImageA(0,MAKEINTRESOURCEA(OIC_ODINICON),IMAGE_ICON,0,0,LR_DEFAULTCOLOR);
+    else hWndIcon = 0;
+  }
+
+  return hWndIcon;
 }
 //******************************************************************************
@@ -2700 +2740 @@
                     return value;
 
-                value &= ~(WS_VISIBLE | WS_CHILD);      /* Some bits can't be changed this way (WINE) */
+                value &= ~WS_CHILD;      /* Some bits can't be changed this way (WINE) */
                 ss.styleOld = getStyle();
-                ss.styleNew = value | (ss.styleOld & (WS_VISIBLE | WS_CHILD));
+                ss.styleNew = value | (ss.styleOld & WS_CHILD);
                 dprintf(("SetWindowLong GWL_STYLE %x old %x new style %x", getWindowHandle(), ss.styleOld, ss.styleNew));
                 SendInternalMessageA(WM_STYLECHANGING,GWL_STYLE,(LPARAM)&ss);