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

Timestamp:

Jul 20, 1999, 9:42:36 AM (26 years ago)

Author:

sandervl

Message:

Accelerator support (not working) + bugfixes

File:

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

trunk/src/user32/new/win32wnd.cpp

@@ -1 @@
-/* $Id: win32wnd.cpp,v 1.16 1999-07-19 18:40:44 sandervl Exp $ */
+/* $Id: win32wnd.cpp,v 1.17 1999-07-20 07:42:36 sandervl Exp $ */
 /*
  * Win32 Window Code for OS/2
@@ -99 +99 @@
   owner            = NULL;
   windowClass      = 0;
+
+  acceltableResource = NULL;
+  menuResource       = NULL;
 }
 //******************************************************************************
@@ -115 +118 @@
 //******************************************************************************
 //******************************************************************************
+BOOL Win32Window::isChild()
+{
+    return (dwStyle & WS_CHILD) != 0;
+}
+//******************************************************************************
+//******************************************************************************
 BOOL Win32Window::CreateWindowExA(CREATESTRUCTA *cs, ATOM classAtom)
 {
@@ -121 +130 @@
  POINT maxSize, maxPos, minTrack, maxTrack;
 
-  SetLastError(0);
-
-  /* Find the parent window */
-  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 (!window->IsWindow() )
-        {
-                dprintf(("Bad parent %04x\n", cs->hwndParent ));
-                SetLastError(ERROR_INVALID_PARAMETER);
-                return FALSE;
-        }
-  }
-  else
-  if ((cs->style & WS_CHILD) && !(cs->style & WS_POPUP)) {
-        dprintf(("No parent for child window\n" ));
-        SetLastError(ERROR_INVALID_PARAMETER);
-        return FALSE;  /* WS_CHILD needs a parent, but WS_POPUP doesn't */
-  }
+    SetLastError(0);
+
+    /* Find the parent window */
+    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 (!window->IsWindow() )
+            {
+                    dprintf(("Bad parent %04x\n", cs->hwndParent ));
+                    SetLastError(ERROR_INVALID_PARAMETER);
+                    return FALSE;
+            }
+    }
+    else
+    if ((cs->style & WS_CHILD) && !(cs->style & WS_POPUP)) {
+            dprintf(("No parent for child window\n" ));
+            SetLastError(ERROR_INVALID_PARAMETER);
+            return FALSE;  /* WS_CHILD needs a parent, but WS_POPUP doesn't */
+    }
 
   /* Find the window class */
@@ -666 +675 @@
 //******************************************************************************
 //******************************************************************************
-ULONG Win32Window::MsgMove(ULONG xParent, ULONG yParent)
-{
-  return SendInternalMessageA(WM_MOVE, 0, MAKELONG((USHORT)xParent, (USHORT)yParent));
+ULONG Win32Window::MsgMove(ULONG x, ULONG y)
+{
+  dprintf(("MsgMove to (%d,%d)", x, y));
+  return SendInternalMessageA(WM_MOVE, 0, MAKELONG((USHORT)x, (USHORT)y));
 }
 //******************************************************************************
@@ -680 +690 @@
         return 0; //todo
     case CMD_ACCELERATOR:
+        dprintf(("accelerator command"));
         return 0; //todo
   }
@@ -733 +744 @@
  ULONG win32ncmsg;
 
+  dprintf(("MsgButton to (%d,%d)", x, y));
   switch(msg) {
         case BUTTON_LEFTDOWN:
@@ -1049 +1061 @@
  Win32Resource *winres = (Win32Resource *)hMenu;
 
-#if 1
-    if(winres == NULL) {
+    if(HIWORD(winres) == 0) {
         dprintf(("Win32Window:: Win32Resource *winres == 0"));
+    SetLastError(ERROR_INVALID_PARAMETER);
         return FALSE;
     }
@@ -1065 +1077 @@
         return FALSE;
     }
+    menuResource = winres;
     return TRUE;
-#else
-   if(HMHandleTranslateToOS2(hMenu, (PULONG)&menutemplate) == NO_ERROR)
-   {
-    OS2HwndMenu = OSLibWinCreateMenu(OS2HwndFrame, menutemplate);
-    if(OS2HwndMenu == 0) {
-        dprintf(("Win32Window::SetMenu OS2HwndMenu == 0"));
-        return FALSE;
-    }
-   }
-   dprintf(("Win32Window::SetMenu unknown hMenu (%x)", hMenu));
-   return FALSE;
-#endif
+}
+//******************************************************************************
+//******************************************************************************
+BOOL Win32Window::SetAccelTable(ULONG hAccel)
+{
+ Win32Resource *winres = (Win32Resource *)hAccel;
+
+    if(HIWORD(hAccel) == 0) {
+        dprintf(("SetAccelTable: hAccel %x invalid", hAccel));
+            SetLastError(ERROR_INVALID_PARAMETER);
+            return FALSE;
+    }
+    acceltableResource = winres;
+        return OSLibWinSetAccelTable(OS2HwndFrame, winres->lockOS2Resource());
 }
 //******************************************************************************