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

Timestamp:

Mar 20, 2003, 2:20:46 PM (22 years ago)

Author:

sandervl

Message:

Changes for fake windows. Moved them into a seperate C++ class and overload some methods to correct the behaviour

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.361 2003-02-28 09:56:00 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.362 2003-03-20 13:20:45 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -92 +92 @@
 //******************************************************************************
 //******************************************************************************
-Win32BaseWindow::Win32BaseWindow(HWND hwndOS2, ATOM classAtom)
-                     : GenericObject(&windows, &critsect), ChildWindow(&critsect)
-{
-    Init();
-    OS2Hwnd = OS2HwndFrame = hwndOS2;
-
-    /* Find the window class */
-    windowClass = Win32WndClass::FindClass(NULL, (LPSTR)classAtom);
-    if (!windowClass)
-    {
-        char buffer[32];
-        GlobalGetAtomNameA( classAtom, buffer, sizeof(buffer) );
-        dprintf(("Bad class '%s'", buffer ));
-        DebugInt3();
-    }
-
-    //Allocate window words
-    nrUserWindowBytes = windowClass->getExtraWndBytes();
-    if(nrUserWindowBytes) {
-        userWindowBytes = (char *)_smalloc(nrUserWindowBytes);
-        memset(userWindowBytes, 0, nrUserWindowBytes);
-    }
-
-    WINPROC_SetProc((HWINDOWPROC *)&win32wndproc, windowClass->getWindowProc((isUnicode) ? WNDPROC_UNICODE : WNDPROC_ASCII), WINPROC_GetProcType(windowClass->getWindowProc((isUnicode) ? WNDPROC_UNICODE : WNDPROC_ASCII)), WIN_PROC_WINDOW);
-    hInstance  = NULL;
-    dwStyle    = WS_VISIBLE;
-    dwOldStyle = dwStyle;
-    dwExStyle  = 0;
-
-    //We pretend this window has no parent and won't change size
-    //(dangerous assumption!!)
-    OSLibWinQueryWindowClientRect(OS2Hwnd, &rectClient);
-    OSLibQueryWindowRectAbsolute (OS2Hwnd, &rectWindow);
-
-    fFakeWindow = TRUE;
-}
-//******************************************************************************
-//******************************************************************************
 Win32BaseWindow::Win32BaseWindow(CREATESTRUCTA *lpCreateStructA, ATOM classAtom, BOOL isUnicode)
                      : GenericObject(&windows, &critsect), ChildWindow(&critsect)
@@ -156 +118 @@
   fVisibleRegionChanged = FALSE;
   fEraseBkgndFlag  = TRUE;
-  fFakeWindow      = FALSE;
   fIsDragDropActive= FALSE;
 
@@ -232 +193 @@
   lpVisRgnNotifyProc  = NULL;
   dwVisRgnNotifyParam = NULL;
+
+  pfnOldPMWndProc     = NULL;
 }
 //******************************************************************************
@@ -3509 +3472 @@
     dprintf(("GetWindow %x %d returned %x", getWindowHandle(), uCmd, hwndRelated));
     return hwndRelated;
+}
+//******************************************************************************
+//******************************************************************************
+PRECT Win32BaseWindow::getWindowRect()
+{ 
+    return &rectWindow; 
 }
 //******************************************************************************