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

Timestamp:

Oct 2, 1999, 6:09:13 AM (26 years ago)

Author:

sandervl

Message:

EB's window style fixes

File:

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

trunk/src/user32/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.10 1999-09-29 08:27:15 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.11 1999-10-02 04:09:12 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -57 +57 @@
   }
 
-  if(dwFrameStyle) {
+  if(dwFrameStyle || hwndParent == HWND_DESKTOP) {
         ULONG dwClientStyle;
 
         dwClientStyle = dwWinStyle & ~(WS_TABSTOP | WS_GROUP);
-        if(pszName)
-                dwFrameStyle |= FCF_TITLEBAR;
+//        if(pszName)
+//                dwFrameStyle |= FCF_TITLEBAR;
 
         dwFrameStyle |= FCF_TASKLIST | FCF_NOMOVEWITHOWNER | FCF_NOBYTEALIGN;
@@ -96 +96 @@
         *OSWinStyle |= WS_MINIMIZED;
 //Done explicitely in CreateWindowExA
-#if 0
+#if 1
   if(dwStyle & WS_VISIBLE_W)
         *OSWinStyle |= WS_VISIBLE;
@@ -785 +785 @@
                             MPFROM2SHORT(pagesize, totalsize),
                             0);
-}
-//******************************************************************************
-//******************************************************************************
-void OSLibWinChangeScrollStyle(HWND hwndParent, int scrollBar, int Reserved)
-{
- HWND hwndScroll;
-
-   if(scrollBar == OSLIB_VSCROLL) {
-        hwndScroll = WinWindowFromID(hwndParent, FID_VERTSCROLL);
-   }
-   else hwndScroll = WinWindowFromID(hwndParent, FID_HORZSCROLL);
-
-   if(hwndScroll == NULL)
-        return;
-
-   WinSetWindowULong(hwndScroll, QWL_STYLE,
-                     WinQueryWindowULong(hwndScroll, QWL_STYLE) |
-                     SBS_AUTOTRACK | SBS_AUTOSIZE);
 }
 //******************************************************************************
@@ -837 +819 @@
 //******************************************************************************
 //******************************************************************************
+void OSLibSetWindowStyle(HWND hwnd, ULONG dwStyle)
+{
+  ULONG OSWinStyle, OSFrameStyle;
+
+  OSLibWinConvertStyle(dwStyle, 0, &OSWinStyle, &OSFrameStyle);
+
+  WinSetWindowULong(hwnd, QWL_STYLE,
+                    (WinQueryWindowULong(hwnd, QWL_STYLE) & ~0xffff0000) |
+                    OSWinStyle);
+}
+//******************************************************************************
+//******************************************************************************