Changeset 13237

Timestamp:

Feb 5, 2000, 3:08:54 PM (25 years ago)

Author:

sandervl

Message:

set style + mdi child creation fixes

Location:

tags/trunk/src/user32

Files:

• Makefile (modified) (2 diffs)
• oslibwin.cpp (modified) (4 diffs)
• oslibwin.h (modified) (2 diffs)
• win32wbase.cpp (modified) (5 diffs)
• win32wbase.h (modified) (3 diffs)
• win32wmdichild.cpp (modified) (2 diffs)

tags/trunk/src/user32/Makefile ¶

@@ -1 @@
-# $Id: Makefile,v 1.61 2000-02-05 02:12:20 sandervl Exp $
+# $Id: Makefile,v 1.62 2000-02-05 14:08:52 sandervl Exp $
 
 #
@@ -23 +23 @@
 CXXFLAGS = $(CXXFLAGS) -DDEBUG_ENABLELOG_LEVEL2
 !endif
-
-RC = $(PDWIN32_TOOLS)\wrc
-RCFLAGS = -s -I. -I$(CPPMAIN)\include -I$(PDWIN32_INCLUDE) -I$(PDWIN32_INCLUDE)\win
 
 TARGET = user32

tags/trunk/src/user32/oslibwin.cpp ¶

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.65 2000-01-29 20:46:52 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.66 2000-02-05 14:08:53 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -102 +102 @@
 //******************************************************************************
 //******************************************************************************
-BOOL OSLibWinConvertStyle(ULONG dwStyle, ULONG *dwExStyle, ULONG *OSWinStyle, ULONG *OSFrameStyle, ULONG *borderWidth, ULONG *borderHeight)
+BOOL OSLibWinConvertStyle(ULONG dwStyle, ULONG *dwExStyle, ULONG *OSWinStyle)
 {
   *OSWinStyle   = 0;
-  *OSFrameStyle = 0;
-  *borderWidth  = 0;
-  *borderHeight = 0;
 
   /* Window styles */
@@ -130 +127 @@
         *OSWinStyle |= WS_TABSTOP;
 
-  if(dwStyle & WS_CHILD_W && !((dwStyle & WS_CAPTION_W) == WS_CAPTION_W))
-  {
-//SvL: Causes crash in VPBuddy if enabled -> find bug
-#if 0
-    if (!HAS_3DFRAME(*dwExStyle) && (dwStyle & (WS_DLGFRAME_W | WS_THICKFRAME_W))) *dwExStyle |= WS_EX_DLGMODALFRAME_W;
-#endif
-
-    if (*dwExStyle & WS_EX_CLIENTEDGE_W)
-    {
-      *OSFrameStyle |= FCF_SIZEBORDER;
-      *borderHeight = *borderWidth = 2;
-    }
-    else
-    if (*dwExStyle & WS_EX_DLGMODALFRAME_W)
-    {
-      *OSFrameStyle |= FCF_SIZEBORDER;
-      *borderHeight = *borderWidth = 3;
-    }
-    else
-    if (*dwExStyle & WS_EX_STATICEDGE_W)
-    {
-      *OSFrameStyle |= FCF_SIZEBORDER;
-      *borderHeight = *borderWidth = 2;
-    }
-    else
-    if(dwStyle & WS_BORDER_W)
-    {
-      *OSFrameStyle |= FCF_BORDER;
-      *borderHeight = *borderWidth = 1;
-    }
-    else if (*dwExStyle & WS_EX_WINDOWEDGE_W); //no border
-
-    if(dwStyle & WS_VSCROLL_W)
-          *OSFrameStyle |= FCF_VERTSCROLL;
-    if(dwStyle & WS_HSCROLL_W)
-          *OSFrameStyle |= FCF_HORZSCROLL;
-  }
-  else
-  {
-    if((dwStyle & WS_CAPTION_W) == WS_DLGFRAME_W)
-        *OSFrameStyle |= FCF_DLGBORDER;
-    else
-    {
-        if((dwStyle & WS_CAPTION_W) == WS_CAPTION_W)
-            *OSFrameStyle |= (FCF_TITLEBAR | FCF_BORDER);
-        else
-        if(dwStyle & WS_BORDER_W)
-            *OSFrameStyle |= FCF_BORDER;
-    }
-
-    if(dwStyle & WS_VSCROLL_W)
-          *OSFrameStyle |= FCF_VERTSCROLL;
-    if(dwStyle & WS_HSCROLL_W)
-          *OSFrameStyle |= FCF_HORZSCROLL;
-
-    if(dwStyle & WS_SYSMENU_W)
-          *OSFrameStyle |= FCF_SYSMENU;
-    if(dwStyle & WS_THICKFRAME_W)
-          *OSFrameStyle |= FCF_SIZEBORDER;        //??
-    if(dwStyle & WS_MINIMIZEBOX_W)
-          *OSFrameStyle |= FCF_MINBUTTON;
-    if(dwStyle & WS_MAXIMIZEBOX_W)
-          *OSFrameStyle |= FCF_MAXBUTTON;
-
-    if(*dwExStyle & WS_EX_DLGMODALFRAME_W)
-          *OSFrameStyle |= FCF_DLGBORDER;
-  }
-
-  //Clear certain frame bits when the window doesn't have a titlebar
-  if(!(*OSFrameStyle & FCF_TITLEBAR)) {
-        *OSFrameStyle &= ~(FCF_MINBUTTON|FCF_MAXBUTTON|FCF_SYSMENU);
-  }
   return TRUE;
 }
@@ -983 +908 @@
 //******************************************************************************
 //******************************************************************************
+void OSLibSetWindowStyle(HWND hwnd, ULONG dwStyle, ULONG dwExStyle, BOOL saveBits)
+{
+  ULONG dwWinStyle;
+
+  OSLibWinConvertStyle(dwStyle, &dwExStyle, &dwWinStyle);
+
+  dwWinStyle = dwWinStyle & ~(WS_TABSTOP | WS_GROUP | WS_CLIPCHILDREN);
+  if(saveBits) dwWinStyle |= WS_SAVEBITS;
+  if(dwStyle & WS_VISIBLE_W)
+        dwWinStyle |= WS_VISIBLE;
+
+  WinSetWindowULong(hwnd, QWL_STYLE,
+                    (WinQueryWindowULong(hwnd, QWL_STYLE) & ~0xffff0000) |
+                     dwWinStyle);
+}
+//******************************************************************************
+//******************************************************************************

tags/trunk/src/user32/oslibwin.h ¶

@@ -1 @@
-/* $Id: oslibwin.h,v 1.36 2000-01-31 22:30:52 sandervl Exp $ */
+/* $Id: oslibwin.h,v 1.37 2000-02-05 14:08:53 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -42 +42 @@
                            HWND *hwndFrame, ULONG id, BOOL fTaskList,BOOL saveBits);
 
-BOOL  OSLibWinConvertStyle(ULONG dwStyle, ULONG *dwExStyle, ULONG *OSWinStyle, ULONG *OSFrameStyle, ULONG *borderWidth, ULONG *borderHeight);
-void  OSLibSetWindowStyle(HWND hwnd, ULONG dwStyle, BOOL fTaskList);
+BOOL  OSLibWinConvertStyle(ULONG dwStyle, ULONG *dwExStyle, ULONG *OSWinStyle);
+void  OSLibSetWindowStyle(HWND hwnd, ULONG dwStyle, ULONG dwExStyle, BOOL saveBits);
 
 #define OSLIB_QWL_USER -4

tags/trunk/src/user32/win32wbase.cpp ¶

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.151 2000-02-04 17:17:56 cbratschi Exp $ */
+/* $Id: win32wbase.cpp,v 1.152 2000-02-05 14:08:53 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -126 +126 @@
 
   pOldFrameProc = NULL;
-  borderWidth   = 0;
-  borderHeight  = 0;
 
   hwndLinkAfter    = HWND_BOTTOM;
@@ -483 +481 @@
   }
 
-  DWORD dwOSWinStyle, dwOSFrameStyle;
-
-  OSLibWinConvertStyle(dwStyle, &dwExStyle, &dwOSWinStyle, &dwOSFrameStyle, &borderWidth, &borderHeight);
+  DWORD dwOSWinStyle;
+
+  OSLibWinConvertStyle(dwStyle, &dwExStyle, &dwOSWinStyle);
 
   if(HIWORD(cs->lpszName))
@@ -2733 +2731 @@
                 setStyle(ss.styleNew);
                 SendInternalMessageA(WM_STYLECHANGED,GWL_STYLE,(LPARAM)&ss);
+                OSLibSetWindowStyle(getOS2FrameWindowHandle(), getStyle(), getExStyle(),
+                                    windowClass->getStyle() & CS_SAVEBITS);
 #ifdef DEBUG
                 PrintWindowStyle(ss.styleNew, 0);
@@ -2740 +2740 @@
         case GWL_WNDPROC:
                 oldval = (LONG)WINPROC_GetProc(win32wndproc, (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A);
-                //WINPROC_SetProc((HWINDOWPROC *)&win32wndproc, (WNDPROC)value, (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A, WIN_PROC_WINDOW);
                 WINPROC_SetProc((HWINDOWPROC *)&win32wndproc, (WNDPROC)value, WINPROC_GetProcType(win32wndproc), WIN_PROC_WINDOW);
                 return oldval;
+
         case GWL_HINSTANCE:
                 oldval = hInstance;
                 hInstance = value;
                 return oldval;
+
         case GWL_HWNDPARENT:
                 return SetParent((HWND)value);
+
         case GWL_ID:
                 oldval = getWindowId();
                 setWindowId(value);
                 return oldval;
+
         case GWL_USERDATA:
                 oldval = userData;
                 userData = value;
                 return oldval;
+
         default:
                 if(index >= 0 && index/4 < nrUserWindowLong)

tags/trunk/src/user32/win32wbase.h ¶

@@ -1 @@
-/* $Id: win32wbase.h,v 1.78 2000-02-03 17:13:02 cbratschi Exp $ */
+/* $Id: win32wbase.h,v 1.79 2000-02-05 14:08:54 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -289 +289 @@
        PVOID getOldFrameProc() { return pOldFrameProc; };
        VOID  setOldFrameProc(PVOID aOldFrameProc) { pOldFrameProc = aOldFrameProc; };
-       ULONG getBorderWidth() { return borderWidth; };
-       ULONG getBorderHeight() { return borderHeight; };
 
        PVOID getOldWndProc() { return pOldWndProc; }
@@ -347 +345 @@
         DWORD   dwProcessId;            //id of process that created this window
         PVOID   pOldFrameProc;
-        ULONG   borderWidth;
-        ULONG   borderHeight;
 
         PVOID   pOldWndProc;

tags/trunk/src/user32/win32wmdichild.cpp ¶

@@ -1 @@
-/* $Id: win32wmdichild.cpp,v 1.20 2000-01-27 21:50:03 sandervl Exp $ */
+/* $Id: win32wmdichild.cpp,v 1.21 2000-02-05 14:08:54 sandervl Exp $ */
 /*
  * Win32 MDI Child Window Class for OS/2
@@ -361 +361 @@
              * the SWP_SHOWWINDOW command.
              */
-//SvL: Not here. This causes problems in OS/2
-//            newchild->SetWindowLongA(GWL_STYLE, showflag & ~WS_VISIBLE);
+            newchild->SetWindowLongA(GWL_STYLE, newchild->getStyle() & ~WS_VISIBLE);
             if(showflag){
                 newchild->SetWindowPos(0, 0, 0, 0, 0, SWP_SHOWWINDOW | SWP_NOSIZE | SWP_NOMOVE );