Changeset 321 for trunk/src/user32/new/win32wnd.cpp

Timestamp:

Jul 17, 1999, 1:56:51 PM (26 years ago)

Author:

sandervl

Message:

* empty log message *

File:

• trunk/src/user32/new/win32wnd.cpp (modified) (8 diffs)

trunk/src/user32/new/win32wnd.cpp

@@ -1 @@
-/* $Id: win32wnd.cpp,v 1.5 1999-07-17 09:17:58 sandervl Exp $ */
+/* $Id: win32wnd.cpp,v 1.6 1999-07-17 11:52:23 sandervl Exp $ */
 /*
  * Win32 Window Code for OS/2
@@ -123 +123 @@
   if (cs->hwndParent)
   {
+        Win32Window *window = GetWindowFromHandle(cs->hwndParent);
+        if(!window) {
+                dprintf(("Bad parent %04x\n", cs->hwndParent ));
+                SetLastError(ERROR_INVALID_PARAMETER);
+                return FALSE;
+        }
         /* Make sure parent is valid */
-        if (!IsWindow( cs->hwndParent ))
+        if (!window->IsWindow() )
         {
                 dprintf(("Bad parent %04x\n", cs->hwndParent ));
@@ -345 +351 @@
         return FALSE;
   }
-
+  if(OS2Hwnd != OS2HwndFrame) {
+        if(OSLibWinSetWindowULong(OS2HwndFrame, OFFSET_WIN32WNDPTR, (ULONG)this) == FALSE) {
+                dprintf(("WM_CREATE: WinSetWindowULong %X failed!!", OS2HwndFrame));
+                return FALSE;
+        }
+        if(OSLibWinSetWindowULong(OS2HwndFrame, OFFSET_WIN32PM_MAGIC, WIN32PM_MAGIC) == FALSE) {
+                dprintf(("WM_CREATE: WinSetWindowULong2 %X failed!!", OS2HwndFrame));
+                return FALSE;
+        }
+  }
   /* Set the window menu */
   if ((dwStyle & (WS_CAPTION | WS_CHILD)) == WS_CAPTION )
@@ -415 +430 @@
 
                 NotifyParent(WM_CREATE, 0, 0);
-                if( !IsWindow(Win32Hwnd) )
+                if( !IsWindow() )
                 {
                     return FALSE;
@@ -975 +990 @@
   switch(hwndInsertAfter) {
         case HWND_BOTTOM:
+                hwndInsertAfter = HWNDOS_BOTTOM;
+                break;
+        case HWND_TOPMOST: //TODO:
+        case HWND_NOTOPMOST: //TODO:
         case HWND_TOP:
-        case HWND_TOPMOST:
-        case HWND_NOTOPMOST:
+                hwndInsertAfter = HWNDOS_TOP;
                 break;
         default:
@@ -1023 +1041 @@
 }
 //******************************************************************************
-//TODO:
-//******************************************************************************
-HWND Win32Window::SetActiveWindow()
-{
-  return O32_SetActiveWindow(OS2Hwnd);
-}
-//******************************************************************************
 //******************************************************************************
 HWND Win32Window::GetParent()
@@ -1078 +1089 @@
 HWND Win32Window::GetTopWindow()
 {
- HWND topchild;
-
-  topchild = OSLibWinQueryTopMostChildWindow(OS2HwndFrame);
-  if(topchild)
-  {
-        return topchild;
-  }
-  else  return 0;
+  return GetWindow(GW_CHILD);
 }
 //******************************************************************************
@@ -1107 +1111 @@
 {
   return OSLibWinIsIconic(OS2HwndFrame);
+}
+//******************************************************************************
+//TODO: not complete nor correct (distinction between top-level, top-most & child windows)
+//******************************************************************************
+HWND Win32Window::GetWindow(UINT uCmd)
+{
+ Win32Window  *win32wnd;
+ ULONG         magic;
+ ULONG         getcmd = 0;
+ HWND          hwndRelated;
+
+  dprintf(("GetWindow %x %d NOT COMPLETE", getWindowHandle(), uCmd));
+  switch(uCmd)
+  {
+        case GW_CHILD:
+                getcmd = QWOS_TOP;
+                break;
+        case GW_HWNDFIRST:
+                if(getParent()) {
+                        getcmd = QWOS_TOP; //top of child windows
+                }
+                else    getcmd = QWOS_TOP; //TODO
+                break;
+        case GW_HWNDLAST:
+                if(getParent()) {
+                        getcmd = QWOS_BOTTOM; //bottom of child windows
+                }
+                else    getcmd = QWOS_BOTTOM; //TODO
+                break;
+        case GW_HWNDNEXT:
+                getcmd = QWOS_NEXT;
+                break;
+        case GW_HWNDPREV:
+                getcmd = QWOS_PREV;
+                break;
+        case GW_OWNER:
+                if(owner) {
+                        return owner->getWindowHandle();
+                }
+                else    return 0;
+  }
+  hwndRelated = OSLibWinQueryWindow(OS2HwndFrame, getcmd);
+  if(hwndRelated) 
+  {
+        win32wnd = (Win32Window *)OSLibWinGetWindowULong(hwndRelated, OFFSET_WIN32WNDPTR);
+        magic    = OSLibWinGetWindowULong(hwndRelated, OFFSET_WIN32PM_MAGIC);
+        if(CheckMagicDword(magic) && win32wnd)
+        {
+                return win32wnd->getWindowHandle();
+        }
+  }
+  return 0;
+}
+//******************************************************************************
+//******************************************************************************
+HWND Win32Window::SetActiveWindow()
+{
+  return OSLibWinSetActiveWindow(OS2HwndFrame);
+}
+//******************************************************************************
+//WM_ENABLE is sent to hwnd, but not to it's children (as it should be)
+//******************************************************************************
+BOOL Win32Window::EnableWindow(BOOL fEnable)
+{
+  return OSLibWinEnableWindow(OS2HwndFrame, fEnable);
+}
+//******************************************************************************
+//******************************************************************************
+BOOL Win32Window::BringWindowToTop()
+{
+  return SetWindowPos(HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE );
+}
+//******************************************************************************
+//******************************************************************************
+HWND Win32Window::GetActiveWindow()
+{
+ HWND          hwndActive;
+ Win32Window  *win32wnd;
+ ULONG         magic;
+
+  hwndActive = OSLibWinQueryActiveWindow();
+
+  win32wnd = (Win32Window *)OSLibWinGetWindowULong(hwndActive, OFFSET_WIN32WNDPTR);
+  magic    = OSLibWinGetWindowULong(hwndActive, OFFSET_WIN32PM_MAGIC);
+  if(CheckMagicDword(magic) && win32wnd)
+  {
+        return win32wnd->getWindowHandle();
+  }
+  return hwndActive;
+}
+//******************************************************************************
+//******************************************************************************
+BOOL Win32Window::IsWindow()
+{
+  return TRUE;
+}
+//******************************************************************************
+//******************************************************************************
+BOOL Win32Window::IsWindowEnabled()
+{
+  return OSLibWinIsWindowEnabled(OS2Hwnd);
+}
+//******************************************************************************
+//******************************************************************************
+BOOL Win32Window::IsWindowVisible()
+{
+  return OSLibWinIsWindowVisible(OS2Hwnd);
 }
 //******************************************************************************