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

Timestamp:

Jan 9, 2000, 3:38:30 PM (26 years ago)

Author:

sandervl

Message:

Several updates/bug fixes

File:

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

trunk/src/user32/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.57 2000-01-08 14:15:06 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.58 2000-01-09 14:37:09 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -175 +175 @@
   else
   {
-    if((dwStyle & WS_CAPTION_W) == WS_DLGFRAME_W)
+    if((dwStyle & WS_CAPTION_W) == WS_DLGFRAME_W) {
         *OSFrameStyle |= FCF_DLGBORDER;
+        *borderHeight = *borderWidth = 2; //TODO: Correct?
+    }
     else
     {
-        if((dwStyle & WS_CAPTION_W) == WS_CAPTION_W)
+        if((dwStyle & WS_CAPTION_W) == WS_CAPTION_W) {
             *OSFrameStyle |= (FCF_TITLEBAR | FCF_BORDER);
+            *borderHeight = *borderWidth = 1;
+        }
         else
-        if(dwStyle & WS_BORDER_W)
+        if(dwStyle & WS_BORDER_W) {
             *OSFrameStyle |= FCF_BORDER;
+            *borderHeight = *borderWidth = 1;
+        }
     }
 
@@ -191 +197 @@
           *OSFrameStyle |= FCF_HORZSCROLL;
 
-    if(dwStyle & WS_SYSMENU_W)
-          *OSFrameStyle |= FCF_SYSMENU;
     if(dwStyle & WS_THICKFRAME_W)
           *OSFrameStyle |= FCF_SIZEBORDER;        //??
@@ -198 +202 @@
     //SvL: We subclass the titlebar control when win32 look is selected
     if(fOS2Look) {
+        if(dwStyle & WS_SYSMENU_W)
+          *OSFrameStyle |= FCF_SYSMENU;
         if(dwStyle & WS_MINIMIZEBOX_W)
           *OSFrameStyle |= FCF_MINBUTTON;
@@ -1165 +1171 @@
 //******************************************************************************
 //******************************************************************************
+HWND OSLibWinGetFrameControlHandle(HWND hwndFrame, int framecontrol, RECT *lpRect)
+{
+    switch(framecontrol) {
+    case OSLIB_FID_TITLEBAR:
+        framecontrol = FID_TITLEBAR;
+        break;
+    case OSLIB_FID_SYSMENU:
+        framecontrol = FID_SYSMENU;
+        break;
+    case OSLIB_FID_MENU:
+        framecontrol = FID_MENU;
+        break;
+    default:
+        return 0;
+    }
+    return WinWindowFromID(hwndFrame, framecontrol);
+}
+//******************************************************************************
+//******************************************************************************