Changeset 1118 for trunk/src/user32

Timestamp:

Oct 4, 1999, 11:56:04 AM (26 years ago)

Author:

sandervl

Message:

Lots of changes by several people (see changelog for 4 October

Location:

trunk/src/user32

Files:

• oslibwin.cpp (modified) (3 diffs)
• oslibwin.h (modified) (2 diffs)
• win32dlg.cpp (modified) (3 diffs)
• win32wbase.cpp (modified) (2 diffs)
• windlg.cpp (modified) (7 diffs)

trunk/src/user32/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.11 1999-10-02 04:09:12 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.12 1999-10-04 09:56:00 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -126 +126 @@
   } else
   {
-    if(dwStyle & WS_CAPTION_W)
+    if((dwStyle & WS_CAPTION_W) == WS_CAPTION_W)
           *OSFrameStyle |= FCF_TITLEBAR;
     if(dwStyle & WS_DLGFRAME_W)
@@ -828 +828 @@
                     (WinQueryWindowULong(hwnd, QWL_STYLE) & ~0xffff0000) |
                     OSWinStyle);
-}
-//******************************************************************************
-//******************************************************************************
+
+  if(OSFrameStyle != 0)  // maybe WinQueryClassName == WC_FRAME is better
+  {
+    if(OSFrameStyle & FCF_TITLEBAR)
+    {
+      WinSetParent(OSLibWinObjectWindowFromID(hwnd, FID_TITLEBAR), hwnd, FALSE);
+      WinSetParent(OSLibWinObjectWindowFromID(hwnd, FID_MENU), hwnd, FALSE);
+    }
+    else
+    {
+      WinSetParent(WinWindowFromID(hwnd, FID_TITLEBAR), HWND_OBJECT, FALSE);
+      WinSetParent(WinWindowFromID(hwnd, FID_MENU), HWND_OBJECT, FALSE);
+    }
+    if(OSFrameStyle & FCF_SYSMENU)
+      WinSetParent(OSLibWinObjectWindowFromID(hwnd, FID_SYSMENU), hwnd, FALSE);
+    else
+      WinSetParent(WinWindowFromID(hwnd, FID_SYSMENU), HWND_OBJECT, FALSE);
+
+    if(OSFrameStyle & FCF_MINBUTTON | OSFrameStyle & FCF_MAXBUTTON)
+      WinSetParent(OSLibWinObjectWindowFromID(hwnd, FID_MINMAX), hwnd, FALSE);
+    else
+      WinSetParent(WinWindowFromID(hwnd, FID_MINMAX), HWND_OBJECT, FALSE);
+
+    if(OSFrameStyle & FCF_VERTSCROLL)
+      WinSetParent(OSLibWinObjectWindowFromID(hwnd, FID_VERTSCROLL), hwnd, FALSE);
+    else
+      WinSetParent(WinWindowFromID(hwnd, FID_VERTSCROLL), HWND_OBJECT, FALSE);
+
+    if(OSFrameStyle & FCF_HORZSCROLL)
+      WinSetParent(OSLibWinObjectWindowFromID(hwnd, FID_HORZSCROLL), hwnd, FALSE);
+    else
+      WinSetParent(WinWindowFromID(hwnd, FID_HORZSCROLL), HWND_OBJECT, FALSE);
+
+    WinSendMsg(hwnd, WM_UPDATEFRAME,
+               MPFROMLONG(FCF_TITLEBAR | FCF_SYSMENU | FCF_MINMAX |
+                          FCF_MENU | FCF_VERTSCROLL | FCF_HORZSCROLL),
+               MPVOID);
+  }
+}
+//******************************************************************************
+//******************************************************************************
+HWND OSLibWinObjectWindowFromID(HWND hwndOwner, ULONG ID)
+{
+  HWND   hwndNext, hwndFound=0;
+  HENUM  henum;
+
+  henum = WinBeginEnumWindows(HWND_OBJECT);
+  while ((hwndNext = WinGetNextWindow(henum)) != 0)
+  {
+    if(WinQueryWindow(hwndNext, QW_OWNER) == hwndOwner &&
+       WinQueryWindowUShort(hwndNext, QWS_ID) == ID)
+    {
+       hwndFound = hwndNext;
+       break;
+    }
+  }
+  WinEndEnumWindows(henum);
+  return hwndFound;
+}
+//******************************************************************************
+//******************************************************************************

trunk/src/user32/oslibwin.h

@@ -1 @@
-/* $Id: oslibwin.h,v 1.7 1999-10-02 04:09:13 sandervl Exp $ */
+/* $Id: oslibwin.h,v 1.8 1999-10-04 09:56:00 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -243 +243 @@
 BOOL  OSLibWinMapWindowPoints (HWND hwndFrom, HWND hwndTo, OSLIBPOINT *pptl, ULONG num);
 
+HWND  OSLibWinObjectWindowFromID(HWND hwndOwner, ULONG ID);
+
 #define OSLIB_HSCROLL   0
 #define OSLIB_VSCROLL   1

trunk/src/user32/win32dlg.cpp

@@ -1 @@
-/* $Id: win32dlg.cpp,v 1.5 1999-09-26 14:44:58 sandervl Exp $ */
+/* $Id: win32dlg.cpp,v 1.6 1999-10-04 09:56:01 sandervl Exp $ */
 /*
  * Win32 Dialog Code for OS/2
@@ -19 +19 @@
 #include <win32dlg.h>
 #include "oslibmsg.h"
+#include "win32wdesktop.h"
 
 #define DEFAULT_DLGFONT "9.WarpSans"
@@ -229 +230 @@
     /* Owner must be a top-level window */
     if(getOwner() == NULL) {
-        dprintf(("Dialog box has no owner!!!"));
-        return -1;
-    }
-    topOwner = getOwner()->getTopParent();
+         topOwner = windowDesktop;
+    }
+    else topOwner = getOwner()->getTopParent();
+
     if(topOwner == NULL) {
         dprintf(("Dialog box has no top owner!!!"));

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.21 1999-10-02 04:09:13 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.22 1999-10-04 09:56:02 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -1152 +1152 @@
     //WM_NC*BUTTON* is posted when the cursor is in a non-client area of the window
     if(lastHitTestVal != HTCLIENT) {
-            SendInternalMessageA(win32ncmsg, lastHitTestVal, MAKELONG(ncx, ncy)); //TODO:
+            return SendInternalMessageA(win32ncmsg, lastHitTestVal, MAKELONG(ncx, ncy)); //TODO:
     }
     return  SendInternalMessageA(win32msg, 0, MAKELONG(clx, cly));

trunk/src/user32/windlg.cpp

@@ -1 @@
-/* $Id: windlg.cpp,v 1.2 1999-09-26 14:44:58 sandervl Exp $ */
+/* $Id: windlg.cpp,v 1.3 1999-10-04 09:56:03 sandervl Exp $ */
 /*
  * Win32 dialog apis for OS/2
@@ -39 +39 @@
         return 0;
 
-    return CreateDialogIndirectParamA(hInst, (DLGTEMPLATE*)LoadResource(hInst, hrsrc),
+    return CreateDialogIndirectParamA(hInst, (LPCDLGTEMPLATEA)LoadResource(hInst, hrsrc),
                                       hwndOwner, dlgproc, lParamInit);
 }
@@ -53 +53 @@
         return 0;
 
-    return CreateDialogIndirectParamW(hInst, (DLGTEMPLATE*)LoadResource(hInst, hrsrc),
+    return CreateDialogIndirectParamW(hInst, (LPCDLGTEMPLATEW)LoadResource(hInst, hrsrc),
                                       hwndOwner, dlgproc, lParamInit);
 }
@@ -59 +59 @@
 //******************************************************************************
 HWND WIN32API CreateDialogIndirectParamA(HINSTANCE hInst,
-                         DLGTEMPLATE *dlgtemplate,
+                         LPCDLGTEMPLATEA dlgtemplate,
                          HWND hwndParent, DLGPROC dlgproc,
                          LPARAM lParamInit)
@@ -87 +87 @@
 //******************************************************************************
 HWND WIN32API CreateDialogIndirectParamW(HINSTANCE hInst,
-                         DLGTEMPLATE *dlgtemplate,
+                         LPCDLGTEMPLATEW dlgtemplate,
                          HWND hwndParent, DLGPROC dlgproc,
                          LPARAM lParamInit)
@@ -115 +115 @@
 //******************************************************************************
 INT  WIN32API DialogBoxIndirectParamA(HINSTANCE hInst,
-                      DLGTEMPLATE *dlgtemplate,
+                      LPCDLGTEMPLATEA dlgtemplate,
                       HWND hwndParent, DLGPROC dlgproc,
                       LPARAM lParamInit)
@@ -136 +136 @@
 //******************************************************************************
 //******************************************************************************
-INT  WIN32API DialogBoxIndirectParamW(HINSTANCE hInst, DLGTEMPLATE *dlgtemplate,
+INT  WIN32API DialogBoxIndirectParamW(HINSTANCE hInst, LPCDLGTEMPLATEW dlgtemplate,
                                       HWND hwndParent, DLGPROC dlgproc,
                                       LPARAM lParamInit)