Changeset 2076 for trunk/src/user32/win32wbase.cpp

Timestamp:

Dec 14, 1999, 8:13:20 PM (26 years ago)

Author:

sandervl

Message:

MDI changes + WM_INITMENU support added + disabled experimental support for CS_PARENTDC style

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.109 1999-12-09 10:59:04 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.110 1999-12-14 19:13:19 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -147 +147 @@
   fCreated         = FALSE;
   fTaskList        = FALSE;
+  fParentDC        = FALSE;
 
   windowNameA      = NULL;
@@ -270 +271 @@
 BOOL Win32BaseWindow::IsWindowUnicode()
 {
+//    dprintf2(("IsWindowUnicode %x %d", getWindowHandle(), WINPROC_GetProcType(getWindowProc()) == WIN_PROC_32W));
     return (WINPROC_GetProcType(getWindowProc()) == WIN_PROC_32W);
 }
@@ -440 +442 @@
   }
 
-  WINPROC_SetProc((HWINDOWPROC *)&win32wndproc, windowClass->getWindowProc(), (isUnicode) ? WIN_PROC_32W : WIN_PROC_32A, WIN_PROC_WINDOW);
+  WINPROC_SetProc((HWINDOWPROC *)&win32wndproc, windowClass->getWindowProc(), WINPROC_GetProcType(windowClass->getWindowProc()), WIN_PROC_WINDOW);
   hInstance = cs->hInstance;
   dwStyle   = cs->style & ~WS_VISIBLE;
@@ -634 +636 @@
   if(windowClass->getStyle() & CS_OWNDC) {
     dprintf(("Class with CS_OWNDC style"));
-//  ownDC = GetWindowDC(getWindowHandle());
+//    ownDC = GetWindowDC(getWindowHandle());
   }
   else
   if (windowClass->getStyle() & CS_PARENTDC)  {
     dprintf(("ERROR: Class with CS_PARENTDC style -> NOT IMPLEMENTED!"));
+    fParentDC = TRUE;
     ownDC = 0;
   }
@@ -1221 +1224 @@
 }
 //******************************************************************************
+//TODO: Depending on menu type, we should send WM_INITMENU or WM_INITPOPUPMENU
+//TODO: PM sends it for each submenu that gets activated; Windows only for the first
+//      submenu; once the menu bar is active, moving the cursor doesn't generate other
+//      WM_INITMENU msgs. Not really a problem, but might need to fix this later on.
+//******************************************************************************
+void Win32BaseWindow::MsgInitMenu(HWND hMenu)
+{
+    SendInternalMessageA(WM_INITMENU, (WPARAM)hMenu, 0);
+}
+//******************************************************************************
 //******************************************************************************
 ULONG Win32BaseWindow::MsgPaint(ULONG tmp1, BOOL select)
@@ -2223 +2236 @@
                 if(parentwindow) {
                         if(Msg == WM_CREATE || Msg == WM_DESTROY) {
-                                parentwindow->SendMessageA(WM_PARENTNOTIFY, MAKEWPARAM(Msg, window->getWindowId()), (LPARAM)window->getWindowHandle());
+                                parentwindow->SendMessageA(WM_PARENTNOTIFY, MAKEWPARAM(Msg, getWindowId()), (LPARAM)getWindowHandle());
                         }
-                        else    parentwindow->SendMessageA(WM_PARENTNOTIFY, MAKEWPARAM(Msg, window->getWindowId()), lParam );
+                        else    parentwindow->SendMessageA(WM_PARENTNOTIFY, MAKEWPARAM(Msg, getWindowId()), lParam );
                 }
         }
@@ -2974 +2987 @@
  LONG oldval;
 
-    dprintf2(("SetWindowLongA %x %d %x", getWindowHandle(), index, value));
+    dprintf2(("SetWindowLong%c %x %d %x", (fUnicode) ? 'W' : 'A', getWindowHandle(), index, value));
     switch(index) {
         case GWL_EXSTYLE: