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

Timestamp:

Feb 2, 2001, 8:04:03 PM (25 years ago)

Author:

sandervl

Message:

class, dialog control size & drawedge fixes

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.230 2001-01-19 23:03:45 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.231 2001-02-02 19:04:03 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -2221 +2221 @@
    RECT oldClientRect = rectClient;
 
-    if(getWindowHandle() == 0x68000010) {
-        hParent = 0;
-    }
     if (fuFlags &
        ~(SWP_NOSIZE     | SWP_NOMOVE     | SWP_NOZORDER     |
@@ -2397 +2394 @@
     }
 
-    if(rectClient.left != oldClientRect->left || 
+    if(rectClient.left != oldClientRect->left ||
        rectClient.top != oldClientRect->top)
     {
@@ -3231 +3228 @@
 
                 if(dwExStyle == value) {
-            oldval = value;
+                    oldval = value;
                     break;
-        }
+                }
                 ss.styleOld = dwExStyle;
                 ss.styleNew = value;
@@ -3241 +3238 @@
                 SendInternalMessageA(WM_STYLECHANGED,GWL_EXSTYLE,(LPARAM)&ss);
                 oldval = ss.styleOld;
-        break;
+                break;
         }
         case GWL_STYLE:
@@ -3250 +3247 @@
 
                 if(dwStyle == value) {
-            oldval = value;
+                    oldval = value;
                     break;
                 }
@@ -3270 +3267 @@
         case GWL_WNDPROC:
         {
-        //Note: Type of SetWindowLong determines new window proc type
+                //Note: Type of SetWindowLong determines new window proc type
                 //      UNLESS the new window proc has already been registered
                 //      (use the old type in that case)
                 //      (VERIFIED in NT 4, SP6)
                 WINDOWPROCTYPE type = WINPROC_GetProcType((HWINDOWPROC)value);
-        if(type == WIN_PROC_INVALID) {
-            type = (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A;
-        }
-            oldval = (LONG)WINPROC_GetProc(win32wndproc, (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A);
+                if(type == WIN_PROC_INVALID) {
+                    type = (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A;
+                }
+                oldval = (LONG)WINPROC_GetProc(win32wndproc, (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A);
                 WINPROC_SetProc((HWINDOWPROC *)&win32wndproc, (WNDPROC)value, type, WIN_PROC_WINDOW);
                 break;
@@ -3304 +3301 @@
                 if(index >= 0 && index/4 < nrUserWindowLong)
                 {
-                        oldval = userWindowLong[index/4];
-                        userWindowLong[index/4] = value;
+                    oldval = userWindowLong[index/4];
+                    userWindowLong[index/4] = value;
                     break;
                 }
-            dprintf(("WARNING: SetWindowLong%c %x %d %x returned %x INVALID index!", (fUnicode) ? 'W' : 'A', getWindowHandle(), index, value));
+                dprintf(("WARNING: SetWindowLong%c %x %d %x returned %x INVALID index!", (fUnicode) ? 'W' : 'A', getWindowHandle(), index, value));
                 SetLastError(ERROR_INVALID_PARAMETER);
                 return 0;
@@ -3336 +3333 @@
         break;
     case GWL_HWNDPARENT:
-    value = GetParent();
+        value = GetParent();
         break;
     case GWL_ID:
@@ -3362 +3359 @@
  WORD oldval;
 
-   if(index >= 0 && index/4 < nrUserWindowLong)
-   {
+    if(index >= 0 && index/4 < nrUserWindowLong)
+    {
         oldval = ((WORD *)userWindowLong)[index/2];
         ((WORD *)userWindowLong)[index/2] = value;
         return oldval;
-   }
-   SetLastError(ERROR_INVALID_PARAMETER);
-   return 0;
-}
-//******************************************************************************
-//******************************************************************************
-WORD Win32BaseWindow::GetWindowWord(int index)
-{
-    if(index >= 0 && index/4 < nrUserWindowLong)
-    {
-        return ((WORD *)userWindowLong)[index/2];
     }
     SetLastError(ERROR_INVALID_PARAMETER);
@@ -3384 +3370 @@
 //******************************************************************************
 //******************************************************************************
+WORD Win32BaseWindow::GetWindowWord(int index)
+{
+    if(index >= 0 && index/4 < nrUserWindowLong)
+    {
+        return ((WORD *)userWindowLong)[index/2];
+    }
+    SetLastError(ERROR_INVALID_PARAMETER);
+    return 0;
+}
+//******************************************************************************
+//******************************************************************************
 void Win32BaseWindow::setWindowId(DWORD id)
 {
@@ -3407 +3404 @@
  DWORD        magic;
 
-  if(hwnd == OSLIB_HWND_DESKTOP)
-  {
-    return windowDesktop;
-  }
-
-  win32wnd = (Win32BaseWindow *)OSLibWinGetWindowULong(hwnd, OFFSET_WIN32WNDPTR);
-  magic    = OSLibWinGetWindowULong(hwnd, OFFSET_WIN32PM_MAGIC);
-
-  if(win32wnd && CheckMagicDword(magic)) {
+    if(hwnd == OSLIB_HWND_DESKTOP)
+    {
+        return windowDesktop;
+    }
+
+    win32wnd = (Win32BaseWindow *)OSLibWinGetWindowULong(hwnd, OFFSET_WIN32WNDPTR);
+    magic    = OSLibWinGetWindowULong(hwnd, OFFSET_WIN32PM_MAGIC);
+
+    if(win32wnd && CheckMagicDword(magic)) {
         return win32wnd;
-  }
+    }
 //  dprintf2(("Win32BaseWindow::GetWindowFromOS2Handle: not an Odin os2 window %x", hwnd));
-  return 0;
+    return 0;
 }
 //******************************************************************************