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

Timestamp:

Oct 8, 1999, 2:10:27 PM (26 years ago)

Author:

cbratschi

Message:

resource and other fixes

File:

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

trunk/src/user32/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.14 1999-10-07 23:21:30 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.15 1999-10-08 12:10:27 cbratschi Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -26 +26 @@
 #include "oslibgdi.h"
 #include "pmwindow.h"
+
+#define HAS_3DFRAME(exStyle) \
+    ((exStyle & WS_EX_CLIENTEDGE_W) || (exStyle & WS_EX_STATICEDGE_W) || (exStyle & WS_EX_WINDOWEDGE_W))
 
 //******************************************************************************
@@ -115 +118 @@
   if (dwStyle & WS_CHILD_W)
   {
+    if (dwStyle & WS_BORDER_W ||
+        dwStyle & WS_DLGFRAME_W ||
+        dwStyle & WS_THICKFRAME_W)
+          if (!HAS_3DFRAME(*OSFrameStyle)) *OSFrameStyle |= WS_EX_WINDOWEDGE_W;
+
     if (dwExStyle & WS_EX_CLIENTEDGE_W ||
         dwExStyle & WS_EX_STATICEDGE_W ||
@@ -688 +696 @@
 
    if(scrollBar == OSLIB_VSCROLL) {
-        hwndScroll = WinWindowFromID(hwndParent, FID_VERTSCROLL);
+        hwndScroll = WinWindowFromID(hwndParent, FID_VERTSCROLL);
    }
    else hwndScroll = WinWindowFromID(hwndParent, FID_HORZSCROLL);
 
    if(hwndScroll == NULL)
-        return FALSE;
+        return FALSE;
 
    return WinEnableWindow(hwndScroll, fEnable);
@@ -702 +710 @@
 {
    if(hwndScroll == NULL) {
-        dprintf(("OSLibWinShowScrollBar: scrollbar %d (parent %x) not found!", scrollBar, hwndParent));
-        return FALSE;
+        dprintf(("OSLibWinShowScrollBar: scrollbar %d (parent %x) not found!", scrollBar, hwndParent));
+        return FALSE;
    }
 
-   if(fShow != WinIsWindowVisible(hwndScroll)) 
+   if(fShow != WinIsWindowVisible(hwndScroll))
    {
          WinSetParent(hwndScroll, fShow ? hwndParent : HWND_OBJECT, FALSE);
          WinSendMsg(hwndParent, WM_UPDATEFRAME,
-                    MPFROMLONG( ( scrollBar == OSLIB_VSCROLL ) ? FCF_VERTSCROLL 
-                                                               : FCF_HORZSCROLL),
+                    MPFROMLONG( ( scrollBar == OSLIB_VSCROLL ) ? FCF_VERTSCROLL
+                                                               : FCF_HORZSCROLL),
                     MPVOID );
 
-         WinShowWindow(hwndScroll, fShow);
+         WinShowWindow(hwndScroll, fShow);
    }
-   return TRUE;   
+   return TRUE;
 }
 //******************************************************************************
@@ -723 +731 @@
 {
    if(scrollBar == OSLIB_VSCROLL) {
-        return WinWindowFromID(hwndParent, FID_VERTSCROLL);
+        return WinWindowFromID(hwndParent, FID_VERTSCROLL);
    }
    else return WinWindowFromID(hwndParent, FID_HORZSCROLL);
@@ -732 +740 @@
 {
    if(hwndScroll == NULL)
-        return 0;
+        return 0;
 
    return (ULONG)WinSendMsg(hwndScroll, SBM_QUERYPOS, 0, 0);
@@ -743 +751 @@
 
    if(hwndScroll == NULL)
-        return 0;
+        return 0;
 
    oldPos = (ULONG)WinSendMsg(hwndScroll, SBM_QUERYPOS, 0, 0);
 
    if(WinSendMsg(hwndScroll, SBM_SETPOS, MPFROMSHORT(pos), MPFROMLONG(fRedraw)) == FALSE)
-        return 0;
+        return 0;
 
    return oldPos;
@@ -754 +762 @@
 //******************************************************************************
 //******************************************************************************
-BOOL OSLibWinSetScrollRange(HWND hwndParent, HWND hwndScroll, int minpos, 
+BOOL OSLibWinSetScrollRange(HWND hwndParent, HWND hwndScroll, int minpos,
                             int maxpos, int fRedraw)
 {
    if(hwndScroll == NULL)
-        return 0;
+        return 0;
 
    return (BOOL)WinSendMsg( hwndScroll, SBM_SETSCROLLBAR,
@@ -766 +774 @@
 //******************************************************************************
 //******************************************************************************
-BOOL OSLibWinSetScrollPageSize(HWND hwndParent, HWND hwndScroll, int pagesize, 
+BOOL OSLibWinSetScrollPageSize(HWND hwndParent, HWND hwndScroll, int pagesize,
                                int totalsize, int fRedraw)
 {
    if(hwndScroll == NULL)
-        return 0;
+        return 0;
 
    return (BOOL)WinSendMsg( hwndScroll, SBM_SETTHUMBSIZE,