Changeset 9076 for trunk/src

Timestamp:

Aug 21, 2002, 5:40:28 PM (23 years ago)

Author:

sandervl

Message:

PF: Fixed OSLibWinSetSysValue; fixed OSLibSetWindowStyle; delete frame controls if required; YD: OSLibWinChangeTaskList & OSLibWinAddToTaskList bugfixes;wrong CharToOemBuffA call

Location:

trunk/src/user32

Files:

• oslibwin.cpp (modified) (8 diffs)
• oslibwin.h (modified) (2 diffs)

trunk/src/user32/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.123 2002-08-21 12:32:40 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.124 2002-08-21 15:40:28 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -16 +16 @@
 #include <os2wrap.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
 
@@ -280 +281 @@
 //******************************************************************************
 //******************************************************************************
-HWND OSLibWinControlWindow(HWND hwndWindow, INT controlID, HWND controlHWND)
-{
- HWND hwnd = NULL, hwndParent = NULL; 
-
- if (controlHWND)
- {
-   WinSetParent(controlHWND, hwndWindow, TRUE);
-   return NULL; // this is done to minimize assignments
- }
- else
- {
-   hwnd = WinWindowFromID(hwndWindow, controlID);
-   if (hwnd)
-   {
-    WinSetParent(hwnd, HWND_OBJECT, TRUE);
-    return hwnd;   
-   }
- }
- return NULL;
-}
-//******************************************************************************
-//******************************************************************************
 HWND OSLibWinWindowFromID(HWND hwndParent,ULONG id)
 {
@@ -1038 +1017 @@
     if(fOS2Look) {
         ULONG OSFrameStyle = 0;
-        if((dwStyle & WS_CAPTION_W) == WS_CAPTION_W) {
+        if((dwStyle & WS_CAPTION_W) == WS_CAPTION_W)
+        {
             if(WinWindowFromID(hwndFrame, FID_TITLEBAR) == 0) {
                 OSFrameStyle = FCF_TITLEBAR;
             }
+            
             if((dwStyle & WS_SYSMENU_W) && !(dwExStyle & WS_EX_TOOLWINDOW_W))
             {
@@ -1048 +1029 @@
                 }
             }
+
             if((dwStyle & WS_MINIMIZEBOX_W) || (dwStyle & WS_MAXIMIZEBOX_W)) {
-                if(WinWindowFromID(hwndFrame, FID_MINMAX) == 0) {
-                    OSFrameStyle |= FCF_MINMAX;
+                if(dwStyle & WS_MINIMIZEBOX_W) 
+                    if(WinWindowFromID(hwndFrame, FID_MINMAX) == 0) {
+                         OSFrameStyle |= FCF_MINBUTTON;
+                }
+
+                if(dwStyle & WS_MAXIMIZEBOX_W) 
+                    if(WinWindowFromID(hwndFrame, FID_MINMAX) == 0) {
+                         OSFrameStyle |= FCF_MAXBUTTON;
                 }
             }
@@ -1059 +1047 @@
                 }
             }
-        }
-        if(OSFrameStyle) {
+       }
+       // no caption, delete all controls if they exist
+       else 
+       {
+          if (WinWindowFromID(hwndFrame, FID_TITLEBAR)) 
+              WinDestroyWindow(WinWindowFromID(hwndFrame, FID_TITLEBAR));
+          if (WinWindowFromID(hwndFrame, FID_SYSMENU)) 
+              WinDestroyWindow(WinWindowFromID(hwndFrame, FID_SYSMENU));
+          if (WinWindowFromID(hwndFrame, FID_MINMAX)) 
+              WinDestroyWindow(WinWindowFromID(hwndFrame, FID_MINMAX));
+       }
+       
+       if(OSFrameStyle) {
             FRAMECDATA FCData = {sizeof (FRAMECDATA), 0, 0, 0};
-
+            char buffer[255];
             FCData.flCreateFlags = OSFrameStyle;
-            WinCreateFrameControls(hwndFrame, &FCData, NULL);
-        }
-    }
+
+            GetWindowTextA(OS2ToWin32Handle(hwndClient), buffer, sizeof(buffer));
+            WinCreateFrameControls(hwndFrame, &FCData, buffer );
+
+            if (WinQueryActiveWindow(HWND_DESKTOP) == hwndFrame)
+              WinSendMsg(WinWindowFromID(hwndFrame, FID_TITLEBAR), TBM_SETHILITE, (MPARAM)1, 0);
+       }
+   } // os2look
 }
 //******************************************************************************
@@ -1114 +1118 @@
     swctrl.bProgType     = PROG_PM;
     if(title) {
-//        strncpy(swctrl.szSwtitle, title, MAXNAMEL+4);
-        CharToOemBuffA( title, swctrl.szSwtitle, MAXNAMEL+4 );
+        CharToOemBuffA( title, swctrl.szSwtitle, min(strlen(title),MAXNAMEL+4) );
         swctrl.szSwtitle[MAXNAMEL+4-1] = 0;
     }
@@ -1140 +1143 @@
     swctrl.bProgType     = PROG_PM;
     if(title) {
-//        strncpy(swctrl.szSwtitle, title, MAXNAMEL+4);
-        CharToOemBuffA( title, swctrl.szSwtitle, MAXNAMEL+4 );
+        CharToOemBuffA( title, swctrl.szSwtitle, min(strlen(title),MAXNAMEL+4) );
         swctrl.szSwtitle[MAXNAMEL+4-1] = 0;
     }

trunk/src/user32/oslibwin.h

@@ -1 @@
-/* $Id: oslibwin.h,v 1.66 2002-08-21 12:32:41 sandervl Exp $ */
+/* $Id: oslibwin.h,v 1.67 2002-08-21 15:40:28 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -259 +259 @@
 
 HWND  OSLibWinQueryWindow(HWND hwnd, ULONG lCode);
-HWND  OSLibWinControlWindow(HWND hwndWindow, INT controlID, HWND hwndControl);
 
 LONG  OSLibWinQueryWindowTextLength(HWND hwnd);