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

Timestamp:

Oct 17, 1999, 2:17:46 PM (26 years ago)

Author:

cbratschi

Message:

added WINE scrollbars to frame, fixed pmframe, WM_ENTERIDLE

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.47 1999-10-16 14:51:42 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.48 1999-10-17 12:17:45 cbratschi Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -40 +40 @@
 #include "pmframe.h"
 #include "win32wdesktop.h"
+#include "pmwindow.h"
 #include <wprocess.h>
 
@@ -85 +86 @@
 //******************************************************************************
 //******************************************************************************
+Win32BaseWindow::Win32BaseWindow(HWND os2Handle,VOID* win32WndProc) : GenericObject(&windows,OBJTYPE_WINDOW)
+{
+  Init();
+  OS2Hwnd = OS2HwndFrame = os2Handle;
+  dwStyle = WS_VISIBLE;
+  setWindowProc((WNDPROC)win32WndProc);
+  fIsSubclassedOS2Wnd = TRUE;
+  fFirstShow = FALSE;
+
+  //CB: replace by a secure method
+
+  if(OSLibWinSetWindowULong(OS2Hwnd, OFFSET_WIN32WNDPTR, (ULONG)this) == FALSE) {
+        dprintf(("WM_CREATE: WinSetWindowULong %X failed!!", OS2Hwnd));
+        SetLastError(ERROR_OUTOFMEMORY); //TODO: Better error
+        return;
+  }
+  if(OSLibWinSetWindowULong(OS2Hwnd, OFFSET_WIN32PM_MAGIC, WIN32PM_MAGIC) == FALSE) {
+        dprintf(("WM_CREATE: WinSetWindowULong2 %X failed!!", OS2Hwnd));
+        SetLastError(ERROR_OUTOFMEMORY); //TODO: Better error
+        return;
+  }
+
+  OSLibWinQueryWindowRect(OS2Hwnd,&rectWindow);
+  rectClient = rectWindow;
+  rectClient.bottom -= rectClient.top;
+  rectClient.top = 0;
+  rectClient.right -= rectClient.left;
+  rectClient.left = 0;
+
+  setOldWndProc(SubclassWithDefHandler(OS2Hwnd));
+}
+//******************************************************************************
+//******************************************************************************
 Win32BaseWindow::Win32BaseWindow(CREATESTRUCTA *lpCreateStructA, ATOM classAtom, BOOL isUnicode)
                         : GenericObject(&windows, OBJTYPE_WINDOW), ChildWindow()
@@ -97 +131 @@
 {
   isUnicode        = FALSE;
+  fIsSubclassedOS2Wnd = FALSE;
   fFirstShow       = TRUE;
   fIsDialog        = FALSE;
@@ -200 +235 @@
         horzScrollInfo = NULL;
     }
-  //TODO: Destroy windows if they're not associated with our window anymore (showwindow false)?
-//  hwndHorzScroll
-//  hwndVertScroll
-
 }
 //******************************************************************************
@@ -584 +615 @@
   }
 
+  //CB: switch off -> OS/2 scrollbars
+  subclassScrollBars(dwStyle & WS_HSCROLL,dwStyle & WS_VSCROLL);
+
   fakeWinBase.hwndThis     = OS2Hwnd;
   fakeWinBase.pWindowClass = windowClass;
@@ -690 +724 @@
  Win32BaseWindow *child;
 
+    if (isSubclassedOS2Wnd) OSLibWinSubclassWindow(OS2Hwnd,pOldWndProc);
+
     //According to the SDK, WM_PARENTNOTIFY messages are sent to the parent (this window)
     //before any window destruction has begun
@@ -699 +735 @@
     }
     SendInternalMessageA(WM_DESTROY, 0, 0);
+
+    if (hwndHorzScroll && OSLibWinQueryWindow(hwndHorzScroll,QWOS_PARENT) == OSLIB_HWND_OBJECT) OSLibWinDestroyWindow(hwndHorzScroll);
+    if (hwndVertScroll && OSLibWinQueryWindow(hwndVertScroll,QWOS_PARENT) == OSLIB_HWND_OBJECT) OSLibWinDestroyWindow(hwndVertScroll);
 
     fIsDestroyed = TRUE;
@@ -1007 +1046 @@
                 break;
         case BUTTON_LEFTDBLCLICK:
-                if (windowClass->getClassLongA(GCL_STYLE) & CS_DBLCLKS)
+                if (windowClass && windowClass->getClassLongA(GCL_STYLE) & CS_DBLCLKS)
                 {
                   win32msg = WM_LBUTTONDBLCLK;
@@ -1026 +1065 @@
                 break;
         case BUTTON_RIGHTDBLCLICK:
-                if (windowClass->getClassLongA(GCL_STYLE) & CS_DBLCLKS)
+                if (windowClass && windowClass->getClassLongA(GCL_STYLE) & CS_DBLCLKS)
                 {
                   win32msg = WM_RBUTTONDBLCLK;
@@ -1045 +1084 @@
                 break;
         case BUTTON_MIDDLEDBLCLICK:
-                if (windowClass->getClassLongA(GCL_STYLE) & CS_DBLCLKS)
+                if (windowClass && windowClass->getClassLongA(GCL_STYLE) & CS_DBLCLKS)
                 {
                   win32msg = WM_MBUTTONDBLCLK;
@@ -1186 +1225 @@
     case SB_HORZ:
         if(horzScrollInfo) {
-            horzScrollInfo->CurVal = OSLibWinGetScrollPos(OS2HwndFrame, hwndHorzScroll);
+            //CB:horzScrollInfo->CurVal = OSLibWinGetScrollPos(OS2HwndFrame, hwndHorzScroll);
             return horzScrollInfo;
         }
@@ -1192 +1231 @@
     case SB_VERT:
         if(vertScrollInfo) {
-            vertScrollInfo->CurVal = OSLibWinGetScrollPos(OS2HwndFrame, hwndVertScroll);
+            //CB:vertScrollInfo->CurVal = OSLibWinGetScrollPos(OS2HwndFrame, hwndVertScroll);
             return vertScrollInfo;
         }
@@ -1208 +1247 @@
   ULONG           scrollType;
   int             new_flags;
+
+//CB: handled internally
+return 0;
 
     switch(nBar) {
@@ -1327 +1369 @@
     return infoPtr->CurVal;
 }
+/***********************************************************************/
+/***********************************************************************/
+VOID Win32BaseWindow::subclassScrollBars(BOOL subHorz,BOOL subVert)
+{
+  SCROLL_SubclassScrollBars(subHorz ? hwndHorzScroll:0,subVert ? hwndVertScroll:0);
+}
 /***********************************************************************
  *           NC_HandleSysCommand
@@ -1567 +1615 @@
       int rc;
 
-        if (!windowClass->getBackgroundBrush()) return 0;
+        if (!windowClass || !windowClass->getBackgroundBrush()) return 0;
 
         rc = GetClipBox( (HDC)wParam, &rect );
@@ -1625 +1673 @@
     {
             LRESULT result = 0;
+            if (!windowClass) return result;
             int index = GCL_HICON;