Changeset 741 for trunk/src/user32/new/pmwindow.cpp

Timestamp:

Aug 30, 1999, 2:00:12 PM (26 years ago)

Author:

sandervl

Message:

Redesign; base class for all window types

File:

• trunk/src/user32/new/pmwindow.cpp (modified) (10 diffs)

trunk/src/user32/new/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.25 1999-08-29 20:05:07 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.26 1999-08-30 11:59:53 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -20 +20 @@
 #include <wprocess.h>
 #include <misc.h>
-#include <win32wnd.h>
+#include <win32wbase.h>
 #include <win32dlg.h>
 #include "pmwindow.h"
@@ -78 +78 @@
      CS_SIZEREDRAW | CS_HITTEST,
      NROF_WIN32WNDBYTES)) {
-        dprintf(("WinRegisterClass Win32Window failed"));
+        dprintf(("WinRegisterClass Win32BaseWindow failed"));
         return(FALSE);
    }
@@ -96 +96 @@
  POSTMSG_PACKET *postmsg;
  OSLIBPOINT      point, ClientPoint;
- Win32Window    *win32wnd;
+ Win32BaseWindow    *win32wnd;
  APIRET          rc;
 
@@ -102 +102 @@
   SetWin32TIB();
 
-  win32wnd = Win32Window::GetWindowFromOS2Handle(hwnd);
+  win32wnd = Win32BaseWindow::GetWindowFromOS2Handle(hwnd);
 
   if(msg != WM_CREATE && win32wnd == NULL) {
@@ -109 +109 @@
   }
   if(msg > WIN32APP_USERMSGBASE) {
-        //win32 app user message
-        dprintf(("PMWINDOW: Message %x (%x,%x) posted to window %x", (ULONG)msg-WIN32APP_USERMSGBASE, mp1, mp2, hwnd));
+    //win32 app user message
+    dprintf(("PMWINDOW: Message %x (%x,%x) posted to window %x", (ULONG)msg-WIN32APP_USERMSGBASE, mp1, mp2, hwnd));
         win32wnd->SendMessageA((ULONG)msg-WIN32APP_USERMSGBASE, (ULONG)mp1, (ULONG)mp2);
   }
@@ -182 +182 @@
         if ((pswp->fl & SWP_ZORDER) && (pswp->hwndInsertBehind > HWND_BOTTOM))
         {
-           Win32Window *wndAfter = Win32Window::GetWindowFromOS2Handle(pswp->hwndInsertBehind);
+           Win32BaseWindow *wndAfter = Win32BaseWindow::GetWindowFromOS2Handle(pswp->hwndInsertBehind);
            if(wndAfter) wp.hwndInsertAfter = wndAfter->getWindowHandle();
         }
@@ -217 +217 @@
         if ((pswp->fl & SWP_ZORDER) && (pswp->hwndInsertBehind > HWND_BOTTOM))
         {
-           Win32Window *wndAfter = Win32Window::GetWindowFromOS2Handle(pswp->hwndInsertBehind);
+           Win32BaseWindow *wndAfter = Win32BaseWindow::GetWindowFromOS2Handle(pswp->hwndInsertBehind);
            wp.hwndInsertAfter = wndAfter->getWindowHandle();
         }
@@ -434 +434 @@
     case WM_MOUSEMOVE:
     {
-        //Only send this message when the mouse isn't captured
+    //Only send this message when the mouse isn't captured
         if(WinQueryCapture(HWND_DESKTOP) != NULLHANDLE) {
                 goto RunDefWndProc;
-        }
+    }
         ULONG keystate = 0;
         if(WinGetKeyState(HWND_DESKTOP, VK_BUTTON1))
@@ -593 +593 @@
 
     case WM_HITTEST:
-        // Only send this message if the window is enabled
-        if (WinIsWindowEnabled(hwnd)) 
-        {
-                if(win32wnd->MsgHitTest((*(POINTS *)&mp1).x, MapOS2ToWin32Y(OSLIB_HWND_DESKTOP, hwnd, (*(POINTS *)&mp1).y))) {
-                        goto RunDefWndProc;
-                }
+    // Only send this message if the window is enabled
+        if (WinIsWindowEnabled(hwnd))
+    {
+            if(win32wnd->MsgHitTest((*(POINTS *)&mp1).x, MapOS2ToWin32Y(OSLIB_HWND_DESKTOP, hwnd, (*(POINTS *)&mp1).y))) {
+                    goto RunDefWndProc;
+        }
         }
         else    goto RunDefWndProc;