Changeset 1333 for trunk/src/user32/oslibwin.cpp

Timestamp:

Oct 17, 1999, 2:17:46 PM (26 years ago)

Author:

cbratschi

Message:

added WINE scrollbars to frame, fixed pmframe, WM_ENTERIDLE

File:

• trunk/src/user32/oslibwin.cpp (modified) (10 diffs)

trunk/src/user32/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.29 1999-10-14 19:31:30 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.30 1999-10-17 12:17:43 cbratschi Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -73 +73 @@
 
         dwFrameStyle |= FCF_NOBYTEALIGN;
-        if (hwndParent == HWND_DESKTOP && dwFrameStyle & FCF_TITLEBAR) 
-                dwFrameStyle |= FCF_TASKLIST | FCF_NOMOVEWITHOWNER;
+        if (hwndParent == HWND_DESKTOP && dwFrameStyle & FCF_TITLEBAR)
+                dwFrameStyle |= FCF_TASKLIST | FCF_NOMOVEWITHOWNER;
 
         dwWinStyle   &= ~WS_CLIPCHILDREN;
@@ -147 +147 @@
       *OSFrameStyle |= FCF_SIZEBORDER;
       *borderHeight = *borderWidth = 2;
-    } 
+    }
     else
     if(dwStyle & WS_BORDER_W)
@@ -160 +160 @@
     if(dwStyle & WS_HSCROLL_W)
           *OSFrameStyle |= FCF_HORZSCROLL;
-  } 
+  }
   else
   {
@@ -191 +191 @@
   //Clear certain frame bits when the window doesn't have a titlebar
   if(!(*OSFrameStyle & FCF_TITLEBAR)) {
-        *OSFrameStyle &= ~(FCF_MINBUTTON|FCF_MAXBUTTON|FCF_SYSMENU);
+        *OSFrameStyle &= ~(FCF_MINBUTTON|FCF_MAXBUTTON|FCF_SYSMENU);
   }
   return TRUE;
@@ -642 +642 @@
          }
       }
- 
+
       if (flags & SWP_SIZE)
       {
@@ -654 +654 @@
       }
       y  = parentHeight - y - cy;
-      
+
 
        if ((pswpOld->x == x) && (pswpOld->y == y))
@@ -678 +678 @@
 {
  BOOL rc;
- 
+
    WinMapWindowPoints(hwndFrame, HWND_DESKTOP, (PPOINTL)pRect, 2);
 
@@ -764 +764 @@
 //******************************************************************************
 //******************************************************************************
-BOOL OSLibWinShowScrollBar(HWND hwndParent, HWND hwndScroll, int scrollBar, 
+BOOL OSLibWinShowScrollBar(HWND hwndParent, HWND hwndScroll, int scrollBar,
                            BOOL fShow, BOOL fForceChange)
 {
@@ -956 +956 @@
 //******************************************************************************
 //******************************************************************************
+PVOID OSLibWinSubclassWindow(HWND hwnd,PVOID newWndProc)
+{
+  return WinSubclassWindow(hwnd,(PFNWP)newWndProc);
+}
+//******************************************************************************
+//******************************************************************************
+