Changeset 2408 for trunk/src

Timestamp:

Jan 11, 2000, 2:52:19 PM (26 years ago)

Author:

sandervl

Message:

Use WIN32_INNERFRAME frame class for top level windows again + preliminary code for menu key translation

Location:

trunk/src/user32/new

Files:

• oslibwin.cpp (modified) (2 diffs)
• pmwindow.cpp (modified) (4 diffs)
• pmwindow.h (modified) (2 diffs)
• user32.cpp (modified) (2 diffs)
• win32wbase.cpp (modified) (3 diffs)

trunk/src/user32/new/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.34 2000-01-11 13:06:25 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.35 2000-01-11 13:52:18 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -89 +89 @@
 
   *hwndFrame = WinCreateWindow (hwndParent,
-                                WC_FRAME,
+                                TopLevel ? WC_FRAME : WIN32_INNERFRAME,
                                 pszName, dwWinStyle, 0, 0, 0, 0,
                                 hwndParent, HWND_TOP,

trunk/src/user32/new/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.34 2000-01-10 23:29:13 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.35 2000-01-11 13:52:18 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -54 +54 @@
 BOOL InitPM()
 {
+  CLASSINFO FrameClassInfo;
+
   hab = WinInitialize(0);
   dprintf(("Winitialize returned %x", hab));
@@ -105 +107 @@
         return(FALSE);
    }
-/* //CB: perhaps reuse it for own frame
    if (!WinQueryClassInfo (hab, WC_FRAME, &FrameClassInfo)) {
      dprintf (("WinQueryClassInfo WC_FRAME failed"));
@@ -119 +120 @@
      return (FALSE);
    }
-*/
+
    WinQueryWindowRect(HWND_DESKTOP, &desktopRectl);
    ScreenWidth  = desktopRectl.xRight;

trunk/src/user32/new/pmwindow.h

@@ -1 @@
-/* $Id: pmwindow.h,v 1.4 2000-01-01 17:07:42 cbratschi Exp $ */
+/* $Id: pmwindow.h,v 1.5 2000-01-11 13:52:18 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -11 +11 @@
 #define WIN32_STDCLASS   "Win32WindowClass"
 #define WIN32_STDCLASS2  "Win32WindowClass2"
+#define WIN32_INNERFRAME "Win32InnerFrameClass"
 
 BOOL InitPM();

trunk/src/user32/new/user32.cpp

@@ -1 @@
-/* $Id: user32.cpp,v 1.25 2000-01-11 10:38:33 sandervl Exp $ */
+/* $Id: user32.cpp,v 1.26 2000-01-11 13:52:19 sandervl Exp $ */
 
 /*
@@ -1658 +1658 @@
 int WIN32API FillRect(HDC hDC, const RECT * lprc, HBRUSH hbr)
 {
-#ifdef DEBUG
-    WriteLog("USER32:  FillRect (%d,%d)(%d,%d) brush %X\n", lprc->left, lprc->top, lprc->right, lprc->bottom, hbr);
-#endif
+    dprintf2(("USER32:  FillRect (%d,%d)(%d,%d) brush %X\n", lprc->left, lprc->top, lprc->right, lprc->bottom, hbr));
     return O32_FillRect(hDC,lprc,hbr);
 }

trunk/src/user32/new/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.32 2000-01-11 13:06:26 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.33 2000-01-11 13:52:19 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -1608 +1608 @@
         return 0;
 
+    case WM_SYSCHAR:
+    {
+            int iMenuSysKey = 0;
+            if (wParam == VK_RETURN && (getStyle() & WS_MINIMIZE))
+        {
+                PostMessageA(getWindowHandle(), WM_SYSCOMMAND,
+                         (WPARAM)SC_RESTORE, 0L );
+                break;
+        }
+            if ((HIWORD(lParam) & KEYDATA_ALT) && wParam)
+        {
+                if (wParam == VK_TAB || wParam == VK_ESCAPE) break;
+                if (wParam == VK_SPACE && (getStyle() & WS_CHILD))
+                getParent()->SendMessageA(Msg, wParam, lParam );
+                else
+                SendMessageA(WM_SYSCOMMAND, (WPARAM)SC_KEYMENU, (LPARAM)(DWORD)wParam );
+        }
+            else /* check for Ctrl-Esc */
+            if (wParam != VK_ESCAPE) MessageBeep(0);
+            break;
+    }
+
     case WM_SHOWWINDOW:
         if (!lParam) return 0; /* sent from ShowWindow */
@@ -1675 +1697 @@
         return 0;
     }
+    return 0;
 }
 //******************************************************************************