Changeset 2292 for trunk/src/user32/new/win32wbase.cpp

Timestamp:

Jan 2, 2000, 8:30:47 PM (26 years ago)

Author:

cbratschi

Message:

* empty log message *

File:

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

trunk/src/user32/new/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.18 2000-01-01 14:57:28 cbratschi Exp $ */
+/* $Id: win32wbase.cpp,v 1.19 2000-01-02 19:30:44 cbratschi Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -76 +76 @@
     !(style & (WS_CHILD | WS_POPUP))
 
+#define HAS_MENU(w) (!((w)->getStyle() & WS_CHILD) && ((w)->getWindowId() != 0))
+
 /* bits in the dwKeyData */
 #define KEYDATA_ALT         0x2000
@@ -85 +87 @@
 //For quick lookup of current process id
 static ULONG currentProcessId = -1;
+
+static HBITMAP hbitmapClose = 0;
+static HBITMAP hbitmapCloseD = 0;
+static HBITMAP hbitmapMinimize = 0;
+static HBITMAP hbitmapMinimizeD = 0;
+static HBITMAP hbitmapMaximize = 0;
+static HBITMAP hbitmapMaximizeD = 0;
+static HBITMAP hbitmapRestore = 0;
+static HBITMAP hbitmapRestoreD = 0;
+
+BYTE lpGrayMask[] = { 0xAA, 0xA0,
+                      0x55, 0x50,
+                      0xAA, 0xA0,
+                      0x55, 0x50,
+                      0xAA, 0xA0,
+                      0x55, 0x50,
+                      0xAA, 0xA0,
+                      0x55, 0x50,
+                      0xAA, 0xA0,
+                      0x55, 0x50};
 
 //******************************************************************************
@@ -102 +124 @@
   fIsSubclassedOS2Wnd = TRUE;
   fFirstShow = FALSE;
+  fCreated = TRUE;
 
   SetLastError(0);
@@ -456 +479 @@
 
   hwndLinkAfter = HWND_TOP;
-  if(WIDGETS_IsControl(this, BUTTON_CONTROL) && ((dwStyle & 0x0f) == BS_GROUPBOX))
+  if(CONTROLS_IsControl(this, BUTTON_CONTROL) && ((dwStyle & 0x0f) == BS_GROUPBOX))
   {
         hwndLinkAfter = HWND_BOTTOM;
@@ -462 +485 @@
   }
   else
-  if(WIDGETS_IsControl(this, STATIC_CONTROL) && !(dwStyle & WS_GROUP)) {
+  if(CONTROLS_IsControl(this, STATIC_CONTROL) && !(dwStyle & WS_GROUP)) {
         dwStyle |= WS_CLIPSIBLINGS;
   }
@@ -512 +535 @@
         vertScrollInfo->flags  = ESB_ENABLE_BOTH;
   }
-
+#if 0 //CB: PM frame not yet created!
   /* Send the WM_GETMINMAXINFO message and fix the size if needed */
   if ((cs->style & WS_THICKFRAME) || !(cs->style & (WS_POPUP | WS_CHILD)))
@@ -522 +545 @@
         if (cs->cy < minTrack.y ) cs->cy = minTrack.y;
   }
-
+#endif
   if(cs->style & WS_CHILD)
   {
@@ -583 +606 @@
 
   OS2Hwnd = OSLibWinCreateWindow((getParent()) ? getParent()->getOS2WindowHandle() : OSLIB_HWND_DESKTOP,
-                                 dwOSWinStyle, dwOSFrameStyle, (char *)windowNameA,
+                                 dwOSWinStyle,(char *)windowNameA,
                                  (owner) ? owner->getOS2WindowHandle() : OSLIB_HWND_DESKTOP,
                                  (hwndLinkAfter == HWND_BOTTOM) ? TRUE : FALSE,
@@ -619 +642 @@
         return FALSE;
   }
-#if 0
-  if(OS2Hwnd != OS2HwndFrame) {
-    if(OSLibWinSetWindowULong(OS2HwndFrame, OFFSET_WIN32WNDPTR, (ULONG)this) == FALSE) {
-            dprintf(("WM_CREATE: WinSetWindowULong %X failed!!", OS2HwndFrame));
-            SetLastError(ERROR_OUTOFMEMORY); //TODO: Better error
-            return FALSE;
-    }
-    if(OSLibWinSetWindowULong(OS2HwndFrame, OFFSET_WIN32PM_MAGIC, WIN32PM_MAGIC) == FALSE) {
-            dprintf(("WM_CREATE: WinSetWindowULong2 %X failed!!", OS2HwndFrame));
-            SetLastError(ERROR_OUTOFMEMORY); //TODO: Better error
-            return FALSE;
-    }
-  }
-#endif
 
   OSLibWinSetOwner(OS2Hwnd, OS2HwndFrame);
 
-  FrameGetScrollBarHandles(this,dwStyle & WS_HSCROLL,dwStyle & WS_VSCROLL);
-  subclassScrollBars(dwStyle & WS_HSCROLL,dwStyle & WS_VSCROLL);
+  //FrameGetScrollBarHandles(this,dwStyle & WS_HSCROLL,dwStyle & WS_VSCROLL);
+  //subclassScrollBars(dwStyle & WS_HSCROLL,dwStyle & WS_VSCROLL);
 
   fakeWinBase.hwndThis     = OS2Hwnd;
@@ -645 +654 @@
   if(windowClass->getIcon())
         SetIcon(windowClass->getIcon());
-
   /* Get class or window DC if needed */
   if(windowClass->getStyle() & CS_OWNDC) {
@@ -682 +690 @@
   // Subclass frame
   pOldFrameProc = FrameSubclassFrameWindow(this);
-  if (isChild()) FrameSetBorderSize(this,TRUE);
-
+  //if (isChild()) FrameSetBorderSize(this,TRUE);
+
+  //preset rects
+  rectWindow.left = cs->x;
+  rectWindow.right = cs->x+cs->cx;
+  rectWindow.top = cs->y;
+  rectWindow.bottom = cs->y+cs->cy;
+  rectClient = rectWindow;
+  if (getParent()) MapWindowPoints(getParent()->getWindowHandle(),0,(PPOINT)&rectWindow,2);
   /* Send the WM_CREATE message
    * Perhaps we shouldn't allow width/height changes as well.
@@ -690 +705 @@
   maxPos.x = rectWindow.left; maxPos.y = rectWindow.top;
 
-  SetWindowPos(hwndLinkAfter,cs->x,cs->y,cs->cx,cs->cy,SWP_NOACTIVATE | SWP_NOREDRAW);
+  //SetWindowPos(hwndLinkAfter,cs->x,cs->y,cs->cx,cs->cy,SWP_NOACTIVATE | SWP_NOREDRAW);
 
   //Note: Solitaire crashes when receiving WM_SIZE messages before WM_CREATE
   fNoSizeMsg = FALSE;
+  fCreated = TRUE;
 
   if(SendInternalMessageA(WM_NCCREATE, 0, (LPARAM)cs) )
   {
-        fCreated = TRUE;
-
+        RECT rect;
+
+        //update rect
+        rectWindow.left = cs->x;
+        rectWindow.right = cs->x+cs->cx;
+        rectWindow.top = cs->y;
+        rectWindow.bottom = cs->y+cs->cy;
+        rectClient = rectWindow;
+        if (getParent()) MapWindowPoints(getParent()->getWindowHandle(),0,(PPOINT)&rectWindow,2);
         SendNCCalcSize(FALSE, &rectWindow, NULL, NULL, 0, &rectClient );
-//        OffsetRect(&rectWindow, maxPos.x - rectWindow.left, maxPos.y - rectWindow.top);
+        OffsetRect(&rectWindow, maxPos.x - rectWindow.left, maxPos.y - rectWindow.top);
+        //set the window size and update the client
+        rect = rectWindow;
+        if (getParent()) MapWindowPoints(0,getParent()->getWindowHandle(),(PPOINT)&rect,2);
+        SetWindowPos(hwndLinkAfter,rect.left,rect.top,rect.right-rect.left,rect.bottom-rect.top,SWP_NOACTIVATE | SWP_NOREDRAW | SWP_FRAMECHANGED);
         if( (SendInternalMessageA(WM_CREATE, 0, (LPARAM)cs )) != -1 )
         {
@@ -1076 +1103 @@
 ULONG Win32BaseWindow::MsgNCPaint()
 {
-    return SendInternalMessageA(WM_PAINT, 0, 0);
+  HRGN hrgn;
+
+  hrgn = 0; //CB: todo: set to frame update region
+  return SendInternalMessageA(WM_NCPAINT,hrgn,0);
 }
 //******************************************************************************
@@ -1227 +1257 @@
   return rc;
 }
-/***********************************************************************
- *           NC_HandleNCLButtonDown
- *
- * Handle a WM_NCLBUTTONDOWN message. Called from DefWindowProc().
- */
+//******************************************************************************
+//******************************************************************************
+LONG Win32BaseWindow::HandleNCActivate(WPARAM wParam)
+{
+  WORD wStateChange;
+
+  if( wParam ) wStateChange = !(flags & WIN_NCACTIVATED);
+  else wStateChange = flags & WIN_NCACTIVATED;
+
+  if( wStateChange )
+  {
+    if (wParam) flags |= WIN_NCACTIVATED;
+    else flags &= ~WIN_NCACTIVATED;
+
+    if(!(dwStyle & WS_MINIMIZE))
+      DoNCPaint((HRGN)1,FALSE);
+  }
+
+  return TRUE;
+}
+//******************************************************************************
+//******************************************************************************
+VOID Win32BaseWindow::TrackMinMaxBox(WORD wParam)
+{
+  MSG msg;
+  HDC hdc;
+  BOOL pressed = TRUE;
+  UINT state;
+
+  if (wParam == HTMINBUTTON)
+  {
+    /* If the style is not present, do nothing */
+    if (!(dwStyle & WS_MINIMIZEBOX))
+      return;
+    /* Check if the sysmenu item for minimize is there  */
+#if 0 //CB: todo
+    state = GetMenuState(hSysMenu,SC_MINIMIZE,MF_BYCOMMAND);
+#endif
+  } else
+  {
+    /* If the style is not present, do nothing */
+    if (!(dwStyle & WS_MAXIMIZEBOX))
+      return;
+    /* Check if the sysmenu item for maximize is there  */
+#if 0 //CB: todo
+    state = GetMenuState(hSysMenu, SC_MAXIMIZE, MF_BYCOMMAND);
+#endif
+  }
+  SetCapture(Win32Hwnd);
+  hdc = GetWindowDC(Win32Hwnd);
+  if (wParam == HTMINBUTTON)
+    DrawMinButton(hdc,TRUE,FALSE);
+  else
+    DrawMaxButton(hdc,TRUE,FALSE);
+  do
+  {
+    BOOL oldstate = pressed;
+
+    GetMessageA(&msg,Win32Hwnd,0,0);
+    pressed = (HandleNCHitTest(msg.pt) == wParam);
+    if (pressed != oldstate)
+    {
+      if (wParam == HTMINBUTTON)
+        DrawMinButton(hdc,pressed,FALSE);
+      else
+        DrawMaxButton(hdc,pressed,FALSE);
+    }
+  } while (msg.message != WM_LBUTTONUP);
+  if (wParam == HTMINBUTTON)
+    DrawMinButton(hdc,FALSE,FALSE);
+  else
+    DrawMaxButton(hdc,FALSE,FALSE);
+  ReleaseCapture();
+  ReleaseDC(Win32Hwnd,hdc);
+  /* If the item minimize or maximize of the sysmenu are not there */
+  /* or if the style is not present, do nothing */
+  if ((!pressed) || (state == 0xFFFFFFFF))
+    return;
+  if (wParam == HTMINBUTTON)
+    SendInternalMessageA(WM_SYSCOMMAND,SC_MINIMIZE,*(LPARAM*)&msg.pt);
+  else
+    SendInternalMessageA(WM_SYSCOMMAND,IsZoomed(Win32Hwnd) ? SC_RESTORE:SC_MAXIMIZE,*(LPARAM*)&msg.pt);
+}
+//******************************************************************************
+//******************************************************************************
+VOID Win32BaseWindow::TrackCloseButton(WORD wParam)
+{
+  MSG msg;
+  HDC hdc;
+  BOOL pressed = TRUE;
+  UINT state;
+
+#if 0 //CB: todo
+  if (hSysMenu == 0)
+    return;
+  state = GetMenuState(hSysMenu, SC_CLOSE, MF_BYCOMMAND);
+#endif  
+  /* If the item close of the sysmenu is disabled or not there do nothing */
+  if((state & MF_DISABLED) || (state & MF_GRAYED) || (state == 0xFFFFFFFF))
+    return;
+  hdc = GetWindowDC(Win32Hwnd);
+  SetCapture(Win32Hwnd);
+  DrawCloseButton(hdc,TRUE,FALSE);
+  do
+  {
+    BOOL oldstate = pressed;
+
+    GetMessageA(&msg,Win32Hwnd,0,0);
+    pressed = (HandleNCHitTest(msg.pt) == wParam);
+    if (pressed != oldstate)
+      DrawCloseButton(hdc, pressed, FALSE);
+  } while (msg.message != WM_LBUTTONUP);
+  DrawCloseButton(hdc, FALSE, FALSE);
+  ReleaseCapture();
+  ReleaseDC(Win32Hwnd, hdc );
+  if (!pressed) return;
+  SendInternalMessageA(WM_SYSCOMMAND,SC_CLOSE,*(LPARAM*)&msg.pt);
+}
+//******************************************************************************
+//******************************************************************************
 LONG Win32BaseWindow::HandleNCLButtonDown(WPARAM wParam,LPARAM lParam)
 {
@@ -1237 +1382 @@
   {
     case HTCAPTION:
-      SendInternalMessageA(WM_SYSCOMMAND,SC_MOVE+HTCAPTION,lParam);
+      SetActiveWindow();
+      if (GetActiveWindow() == Win32Hwnd)
+        SendInternalMessageA(WM_SYSCOMMAND,SC_MOVE+HTCAPTION,lParam);
       break;
 
     case HTSYSMENU:
-      SendInternalMessageA(WM_SYSCOMMAND,SC_MOUSEMENU+HTSYSMENU,lParam);
+      if(dwStyle & WS_SYSMENU )
+      {
+        if( !(dwStyle & WS_MINIMIZE) )
+        {
+          HDC hDC = GetWindowDC(Win32Hwnd);
+          DrawSysButton(hDC,TRUE);
+          ReleaseDC(Win32Hwnd,hDC);
+        }
+        SendInternalMessageA(WM_SYSCOMMAND,SC_MOUSEMENU+HTSYSMENU,lParam);
+      }
       break;
 
@@ -1254 +1410 @@
     case HTVSCROLL:
       SendInternalMessageA(WM_SYSCOMMAND,SC_VSCROLL+HTVSCROLL,lParam);
+      break;
+
+    case HTMINBUTTON:
+    case HTMAXBUTTON:
+      TrackMinMaxBox(wParam);   
+      break;
+
+    case HTCLOSE:
+      TrackCloseButton(wParam);
       break;
 
@@ -1294 +1459 @@
   return 0;
 }
+//******************************************************************************
+//******************************************************************************
+BOOL Win32BaseWindow::WindowNeedsWMBorder()
+{
+  if (!(dwStyle & WS_CHILD) &&
+      //Options.managed  && //CB: to check
+      !(dwExStyle & WS_EX_TOOLWINDOW) &&
+      ( ((dwStyle & WS_CAPTION) == WS_CAPTION) ||
+        (dwStyle & WS_THICKFRAME)))
+      return TRUE;
+  if (dwExStyle & WS_EX_TRAYWINDOW)
+    return TRUE;
+  return FALSE;
+}
+//******************************************************************************
+//******************************************************************************
+VOID Win32BaseWindow::AdjustRectOuter(LPRECT rect,BOOL menu)
+{
+  if(dwStyle & WS_ICONIC) return;
+
+  /* Decide if the window will be managed (see CreateWindowEx) */
+  if (!WindowNeedsWMBorder())
+  {
+    if (HAS_THICKFRAME(dwStyle,dwExStyle ))
+      InflateRect( rect, GetSystemMetrics(SM_CXFRAME), GetSystemMetrics(SM_CYFRAME) );
+    else
+      if (HAS_DLGFRAME( dwStyle, dwExStyle ))
+        InflateRect(rect, GetSystemMetrics(SM_CXDLGFRAME), GetSystemMetrics(SM_CYDLGFRAME) );
+      else
+        if (HAS_THINFRAME( dwStyle ))
+          InflateRect( rect, GetSystemMetrics(SM_CXBORDER), GetSystemMetrics(SM_CYBORDER));
+
+    if ((dwStyle & WS_CAPTION) == WS_CAPTION)
+    {
+      if (dwExStyle & WS_EX_TOOLWINDOW)
+        rect->top -= GetSystemMetrics(SM_CYSMCAPTION);
+      else
+        rect->top -= GetSystemMetrics(SM_CYCAPTION);
+    }
+  }
+
+  if (menu)
+    rect->top -= GetSystemMetrics(SM_CYMENU);
+}
+//******************************************************************************
+//******************************************************************************
+VOID Win32BaseWindow::AdjustRectInner(LPRECT rect)
+{
+  if(dwStyle & WS_ICONIC) return;
+
+  if (dwExStyle & WS_EX_CLIENTEDGE)
+    InflateRect (rect, GetSystemMetrics(SM_CXEDGE), GetSystemMetrics(SM_CYEDGE));
+
+  if (dwExStyle & WS_EX_STATICEDGE)
+    InflateRect (rect, GetSystemMetrics(SM_CXBORDER), GetSystemMetrics(SM_CYBORDER));
+
+  if (dwStyle & WS_VSCROLL) rect->right  += GetSystemMetrics(SM_CXVSCROLL);
+  if (dwStyle & WS_HSCROLL) rect->bottom += GetSystemMetrics(SM_CYHSCROLL);
+}
+//******************************************************************************
+//******************************************************************************
+LONG Win32BaseWindow::HandleNCCalcSize(RECT *winRect)
+{
+  RECT tmpRect = { 0, 0, 0, 0 };
+  LONG result = 0;
+  UINT style = (UINT) GetClassLongA(Win32Hwnd,GCL_STYLE);
+
+  if (style & CS_VREDRAW) result |= WVR_VREDRAW;
+  if (style & CS_HREDRAW) result |= WVR_HREDRAW;
+
+  if( !( dwStyle & WS_MINIMIZE ) )
+  {
+    AdjustRectOuter(&tmpRect,FALSE);
+
+    winRect->left   -= tmpRect.left;
+    winRect->top    -= tmpRect.top;
+    winRect->right  -= tmpRect.right;
+    winRect->bottom -= tmpRect.bottom;
+
+    if (HAS_MENU(this))
+    {
+#if 0 //CB: todo
+      winRect->top +=
+                MENU_GetMenuBarHeight(Win32Hwnd,
+                                       winRect->right - winRect->left,
+                                       -tmpRect.left, -tmpRect.top ) + 1;
+#endif
+    }
+
+    SetRect (&tmpRect, 0, 0, 0, 0);
+    AdjustRectInner(&tmpRect);
+    winRect->left   -= tmpRect.left;
+    winRect->top    -= tmpRect.top;
+    winRect->right  -= tmpRect.right;
+    winRect->bottom -= tmpRect.bottom;
+  }
+
+  return result;
+}
+//******************************************************************************
+//******************************************************************************
+LONG Win32BaseWindow::HandleNCHitTest(POINT pt)
+{
+  RECT rect = rectWindow;
+
+  if (!PtInRect(&rect,pt)) return HTNOWHERE;
+
+  if (dwStyle & WS_MINIMIZE) return HTCAPTION;
+
+  if (!(flags & WIN_MANAGED))
+  {
+    /* Check borders */
+    if (HAS_THICKFRAME(dwStyle,dwExStyle))
+    {
+      InflateRect( &rect, -GetSystemMetrics(SM_CXFRAME), -GetSystemMetrics(SM_CYFRAME) );
+      if (!PtInRect( &rect, pt ))
+      {
+        /* Check top sizing border */
+        if (pt.y < rect.top)
+        {
+          if (pt.x < rect.left+GetSystemMetrics(SM_CXSIZE)) return HTTOPLEFT;
+          if (pt.x >= rect.right-GetSystemMetrics(SM_CXSIZE)) return HTTOPRIGHT;
+          return HTTOP;
+        }
+        /* Check bottom sizing border */
+        if (pt.y >= rect.bottom)
+        {
+          if (pt.x < rect.left+GetSystemMetrics(SM_CXSIZE)) return HTBOTTOMLEFT;
+          if (pt.x >= rect.right-GetSystemMetrics(SM_CXSIZE)) return HTBOTTOMRIGHT;
+          return HTBOTTOM;
+        }
+        /* Check left sizing border */
+        if (pt.x < rect.left)
+        {
+          if (pt.y < rect.top+GetSystemMetrics(SM_CYSIZE)) return HTTOPLEFT;
+          if (pt.y >= rect.bottom-GetSystemMetrics(SM_CYSIZE)) return HTBOTTOMLEFT;
+          return HTLEFT;
+        }
+        /* Check right sizing border */
+        if (pt.x >= rect.right)
+        {
+          if (pt.y < rect.top+GetSystemMetrics(SM_CYSIZE)) return HTTOPRIGHT;
+          if (pt.y >= rect.bottom-GetSystemMetrics(SM_CYSIZE)) return HTBOTTOMRIGHT;
+          return HTRIGHT;
+        }
+      }
+    }
+    else  /* No thick frame */
+    {
+      if (HAS_DLGFRAME(dwStyle,dwExStyle))
+        InflateRect(&rect, -GetSystemMetrics(SM_CXDLGFRAME), -GetSystemMetrics(SM_CYDLGFRAME));
+      else if (HAS_THINFRAME(dwStyle ))
+        InflateRect(&rect, -GetSystemMetrics(SM_CXBORDER), -GetSystemMetrics(SM_CYBORDER));
+      if (!PtInRect( &rect, pt )) return HTBORDER;
+    }
+
+    /* Check caption */
+
+    if ((dwStyle & WS_CAPTION) == WS_CAPTION)
+    {
+      if (dwExStyle & WS_EX_TOOLWINDOW)
+        rect.top += GetSystemMetrics(SM_CYSMCAPTION) - 1;
+      else
+        rect.top += GetSystemMetrics(SM_CYCAPTION) - 1;
+      if (!PtInRect( &rect, pt ))
+      {
+        /* Check system menu */
+        if(dwStyle & WS_SYSMENU)
+        {
+          /* Check if there is an user icon */
+          HICON hIcon = (HICON) GetClassLongA(Win32Hwnd, GCL_HICONSM);
+          if(!hIcon) hIcon = (HICON) GetClassLongA(Win32Hwnd, GCL_HICON);
+
+          /* If there is an icon associated with the window OR              */
+          /* If there is no hIcon specified and this is not a modal dialog, */
+          /* there is a system menu icon.                                   */
+          if((hIcon != 0) || (!(dwStyle & DS_MODALFRAME)))
+          rect.left += GetSystemMetrics(SM_CYCAPTION) - 1;
+        }
+        if (pt.x < rect.left) return HTSYSMENU;
+
+        /* Check close button */
+        if (dwStyle & WS_SYSMENU)
+        rect.right -= GetSystemMetrics(SM_CYCAPTION) - 1;
+        if (pt.x > rect.right) return HTCLOSE;
+
+        /* Check maximize box */
+        /* In win95 there is automatically a Maximize button when there is a minimize one*/
+        if ((dwStyle & WS_MAXIMIZEBOX)|| (dwStyle & WS_MINIMIZEBOX))
+        rect.right -= GetSystemMetrics(SM_CXSIZE) + 1;
+        if (pt.x > rect.right) return HTMAXBUTTON;
+
+        /* Check minimize box */
+        /* In win95 there is automatically a Maximize button when there is a Maximize one*/
+        if ((dwStyle & WS_MINIMIZEBOX)||(dwStyle & WS_MAXIMIZEBOX))
+        rect.right -= GetSystemMetrics(SM_CXSIZE) + 1;
+
+        if (pt.x > rect.right) return HTMINBUTTON;
+        return HTCAPTION;
+      }
+    }
+  }
+
+  /* Check client area */
+
+  ScreenToClient(Win32Hwnd,&pt);
+  rect = rectClient;
+  if (PtInRect(&rect,pt)) return HTCLIENT;
+
+  /* Check vertical scroll bar */
+
+  if (dwStyle & WS_VSCROLL)
+  {
+    rect.right += GetSystemMetrics(SM_CXVSCROLL);
+    if (PtInRect( &rect, pt )) return HTVSCROLL;
+  }
+
+  /* Check horizontal scroll bar */
+
+  if (dwStyle & WS_HSCROLL)
+  {
+    rect.bottom += GetSystemMetrics(SM_CYHSCROLL);
+    if (PtInRect( &rect, pt ))
+    {
+      /* Check size box */
+      if ((dwStyle & WS_VSCROLL) &&
+          (pt.x >= rect.right - GetSystemMetrics(SM_CXVSCROLL)))
+        return HTSIZE;
+      return HTHSCROLL;
+    }
+  }
+
+  /* Check menu bar */
+
+  if (HAS_MENU(this))
+  {
+    if ((pt.y < 0) && (pt.x >= 0) && (pt.x < rect.right))
+      return HTMENU;
+  }
+
+  /* Should never get here */
+  return HTERROR;
+}
+
+//******************************************************************************
+//******************************************************************************
+VOID Win32BaseWindow::GetInsideRect(RECT *rect)
+{
+  rect->top    = rect->left = 0;
+  rect->right  = rectWindow.right - rectWindow.left;
+  rect->bottom = rectWindow.bottom - rectWindow.top;
+
+  if ((dwStyle & WS_ICONIC) || (flags & WIN_MANAGED)) return;
+
+  /* Remove frame from rectangle */
+  if (HAS_THICKFRAME(dwStyle,dwExStyle))
+  {
+    InflateRect( rect, -GetSystemMetrics(SM_CXSIZEFRAME), -GetSystemMetrics(SM_CYSIZEFRAME) );
+  }
+  else if (HAS_DLGFRAME(dwStyle,dwExStyle ))
+  {
+    InflateRect( rect, -GetSystemMetrics(SM_CXFIXEDFRAME), -GetSystemMetrics(SM_CYFIXEDFRAME));
+  }
+  else if (HAS_THINFRAME(dwStyle))
+  {
+    InflateRect( rect, -GetSystemMetrics(SM_CXBORDER), -GetSystemMetrics(SM_CYBORDER) );
+  }
+
+  /* We have additional border information if the window
+   * is a child (but not an MDI child) */
+  if ( (dwStyle & WS_CHILD)  &&
+       ( (dwExStyle & WS_EX_MDICHILD) == 0 ) )
+  {
+    if (dwExStyle & WS_EX_CLIENTEDGE)
+      InflateRect (rect, -GetSystemMetrics(SM_CXEDGE), -GetSystemMetrics(SM_CYEDGE));
+
+    if (dwExStyle & WS_EX_STATICEDGE)
+      InflateRect (rect, -GetSystemMetrics(SM_CXBORDER), -GetSystemMetrics(SM_CYBORDER));
+  }
+}
+//******************************************************************************
+//******************************************************************************
+VOID Win32BaseWindow::DrawFrame(HDC hdc,RECT *rect,BOOL dlgFrame,BOOL active)
+{
+  INT width, height;
+
+  if (dlgFrame)
+  {
+    width = GetSystemMetrics(SM_CXDLGFRAME) - GetSystemMetrics(SM_CXEDGE);
+    height = GetSystemMetrics(SM_CYDLGFRAME) - GetSystemMetrics(SM_CYEDGE);
+  } else
+  {
+    width = GetSystemMetrics(SM_CXFRAME) - GetSystemMetrics(SM_CXEDGE);
+    height = GetSystemMetrics(SM_CYFRAME) - GetSystemMetrics(SM_CYEDGE);
+  }
+
+  SelectObject( hdc, GetSysColorBrush(active ? COLOR_ACTIVEBORDER :
+                COLOR_INACTIVEBORDER) );
+
+  /* Draw frame */
+  PatBlt( hdc, rect->left, rect->top,
+            rect->right - rect->left, height, PATCOPY );
+  PatBlt( hdc, rect->left, rect->top,
+            width, rect->bottom - rect->top, PATCOPY );
+  PatBlt( hdc, rect->left, rect->bottom - 1,
+            rect->right - rect->left, -height, PATCOPY );
+  PatBlt( hdc, rect->right - 1, rect->top,
+            -width, rect->bottom - rect->top, PATCOPY );
+
+  InflateRect( rect, -width, -height );
+}
+//******************************************************************************
+//******************************************************************************
+BOOL Win32BaseWindow::DrawSysButton(HDC hdc,BOOL down)
+{
+  if(!(flags & WIN_MANAGED))
+  {
+    HICON  hIcon;
+    RECT rect;
+
+    GetInsideRect(&rect);
+
+    hIcon = (HICON) GetClassLongA(Win32Hwnd, GCL_HICONSM);
+    if(!hIcon) hIcon = (HICON) GetClassLongA(Win32Hwnd, GCL_HICON);
+
+    /* If there is no hIcon specified or this is not a modal dialog, */
+    /* get the default one.                                          */
+    if(hIcon == 0)
+      if (!(dwStyle & DS_MODALFRAME))
+        hIcon = LoadImageA(0, MAKEINTRESOURCEA(OIC_WINEICON), IMAGE_ICON, 0, 0, LR_DEFAULTCOLOR);
+
+    if (hIcon)
+      DrawIconEx (hdc, rect.left + 2, rect.top + 2, hIcon,
+                  GetSystemMetrics(SM_CXSMICON),
+                  GetSystemMetrics(SM_CYSMICON),
+                  0, 0, DI_NORMAL);
+
+    return (hIcon != 0);
+  }
+  return FALSE;
+}
+//******************************************************************************
+//******************************************************************************
+BOOL Win32BaseWindow::DrawGrayButton(HDC hdc,int x,int y)
+{
+  HBITMAP hMaskBmp;
+  HDC hdcMask = CreateCompatibleDC (0);
+  HBRUSH hOldBrush;
+  hMaskBmp = CreateBitmap (12, 10, 1, 1, lpGrayMask);
+
+  if(hMaskBmp == 0)
+    return FALSE;
+
+  SelectObject (hdcMask, hMaskBmp);
+
+  /* Draw the grayed bitmap using the mask */
+  hOldBrush = SelectObject (hdc, RGB(128, 128, 128));
+  BitBlt (hdc, x, y, 12, 10,
+          hdcMask, 0, 0, 0xB8074A);
+
+  /* Clean up */
+  SelectObject (hdc, hOldBrush);
+  DeleteObject(hMaskBmp);
+  DeleteDC (hdcMask);
+
+  return TRUE;
+}
+//******************************************************************************
+//******************************************************************************
+VOID Win32BaseWindow::DrawCloseButton(HDC hdc,BOOL down,BOOL bGrayed)
+{
+  RECT rect;
+  HDC hdcMem;
+
+  if( !(flags & WIN_MANAGED) )
+  {
+    BITMAP bmp;
+    HBITMAP hBmp, hOldBmp;
+
+    GetInsideRect(&rect);
+
+    hdcMem = CreateCompatibleDC( hdc );
+    hBmp = down ? hbitmapCloseD : hbitmapClose;
+    hOldBmp = SelectObject (hdcMem, hBmp);
+    GetObjectA (hBmp, sizeof(BITMAP), &bmp);
+
+    BitBlt (hdc, rect.right - (GetSystemMetrics(SM_CYCAPTION) + 1 + bmp.bmWidth) / 2,
+            rect.top + (GetSystemMetrics(SM_CYCAPTION) - 1 - bmp.bmHeight) / 2,
+            bmp.bmWidth, bmp.bmHeight, hdcMem, 0, 0, SRCCOPY);
+
+    if(bGrayed)
+      DrawGrayButton(hdc,rect.right - (GetSystemMetrics(SM_CYCAPTION) + 1 + bmp.bmWidth) / 2 + 2,
+                     rect.top + (GetSystemMetrics(SM_CYCAPTION) - 1 - bmp.bmHeight) / 2 + 2);
+
+    SelectObject (hdcMem, hOldBmp);
+    DeleteDC (hdcMem);
+  }
+}
+//******************************************************************************
+//******************************************************************************
+VOID Win32BaseWindow::DrawMaxButton(HDC hdc,BOOL down,BOOL bGrayed)
+{
+  RECT rect;
+  HDC hdcMem;
+
+  if( !(flags & WIN_MANAGED))
+  {
+    BITMAP  bmp;
+    HBITMAP  hBmp,hOldBmp;
+
+    GetInsideRect(&rect);
+    hdcMem = CreateCompatibleDC( hdc );
+    hBmp = IsZoomed(Win32Hwnd) ?
+            (down ? hbitmapRestoreD : hbitmapRestore ) :
+            (down ? hbitmapMaximizeD: hbitmapMaximize);
+    hOldBmp=SelectObject( hdcMem, hBmp );
+    GetObjectA (hBmp, sizeof(BITMAP), &bmp);
+
+    if (dwStyle & WS_SYSMENU)
+      rect.right -= GetSystemMetrics(SM_CYCAPTION) + 1;
+
+    BitBlt( hdc, rect.right - (GetSystemMetrics(SM_CXSIZE) + bmp.bmWidth) / 2,
+          rect.top + (GetSystemMetrics(SM_CYCAPTION) - 1 - bmp.bmHeight) / 2,
+          bmp.bmWidth, bmp.bmHeight, hdcMem, 0, 0, SRCCOPY );
+
+    if(bGrayed)
+      DrawGrayButton(hdc, rect.right - (GetSystemMetrics(SM_CXSIZE) + bmp.bmWidth) / 2 + 2,
+                      rect.top + (GetSystemMetrics(SM_CYCAPTION) - 1 - bmp.bmHeight) / 2 + 2);
+
+
+    SelectObject (hdcMem, hOldBmp);
+    DeleteDC( hdcMem );
+  }
+}
+//******************************************************************************
+//******************************************************************************
+VOID Win32BaseWindow::DrawMinButton(HDC hdc,BOOL down,BOOL bGrayed)
+{
+  RECT rect;
+  HDC hdcMem;
+
+  if( !(flags & WIN_MANAGED))
+
+  {
+    BITMAP  bmp;
+    HBITMAP  hBmp,hOldBmp;
+
+    GetInsideRect(&rect);
+
+    hdcMem = CreateCompatibleDC( hdc );
+    hBmp = down ? hbitmapMinimizeD : hbitmapMinimize;
+    hOldBmp= SelectObject( hdcMem, hBmp );
+    GetObjectA (hBmp, sizeof(BITMAP), &bmp);
+
+    if (dwStyle & WS_SYSMENU)
+      rect.right -= GetSystemMetrics(SM_CYCAPTION) + 1;
+
+    /* In win 95 there is always a Maximize box when there is a Minimize one */
+    if ((dwStyle & WS_MAXIMIZEBOX) || (dwStyle & WS_MINIMIZEBOX))
+      rect.right += -1 - (GetSystemMetrics(SM_CXSIZE) + bmp.bmWidth) / 2;
+
+    BitBlt( hdc, rect.right - (GetSystemMetrics(SM_CXSIZE) + bmp.bmWidth) / 2,
+          rect.top + (GetSystemMetrics(SM_CYCAPTION) - 1 - bmp.bmHeight) / 2,
+          bmp.bmWidth, bmp.bmHeight, hdcMem, 0, 0, SRCCOPY );
+
+    if(bGrayed)
+      DrawGrayButton(hdc, rect.right - (GetSystemMetrics(SM_CXSIZE) + bmp.bmWidth) / 2 + 2,
+                      rect.top + (GetSystemMetrics(SM_CYCAPTION) - 1 - bmp.bmHeight) / 2 + 2);
+
+
+    SelectObject (hdcMem, hOldBmp);
+    DeleteDC( hdcMem );
+  }
+}
+//******************************************************************************
+//******************************************************************************
+VOID Win32BaseWindow::DrawCaption(HDC hdc,RECT *rect,BOOL active)
+{
+  RECT  r = *rect;
+  char    buffer[256];
+  HPEN  hPrevPen;
+  HMENU hSysMenu;
+
+  if (flags & WIN_MANAGED) return;
+
+  hPrevPen = SelectObject( hdc, GetSysColorPen(COLOR_3DFACE) );
+  MoveToEx( hdc, r.left, r.bottom - 1, NULL );
+  LineTo( hdc, r.right, r.bottom - 1 );
+  SelectObject( hdc, hPrevPen );
+  r.bottom--;
+
+  FillRect( hdc, &r, GetSysColorBrush(active ? COLOR_ACTIVECAPTION : COLOR_INACTIVECAPTION) );
+
+  if (!hbitmapClose)
+  {
+    if (!(hbitmapClose = LoadBitmapA(0,MAKEINTRESOURCEA(OBM_CLOSE)))) return;
+    hbitmapCloseD    = LoadBitmapA(0,MAKEINTRESOURCEA(OBM_CLOSED));
+    hbitmapMinimize  = LoadBitmapA(0,MAKEINTRESOURCEA(OBM_REDUCE));
+    hbitmapMinimizeD = LoadBitmapA(0,MAKEINTRESOURCEA(OBM_REDUCED));
+    hbitmapMaximize  = LoadBitmapA(0,MAKEINTRESOURCEA(OBM_ZOOM));
+    hbitmapMaximizeD = LoadBitmapA(0,MAKEINTRESOURCEA(OBM_ZOOMD));
+    hbitmapRestore   = LoadBitmapA(0,MAKEINTRESOURCEA(OBM_RESTORE));
+    hbitmapRestoreD  = LoadBitmapA(0,MAKEINTRESOURCEA(OBM_RESTORED));
+  }
+
+  if ((dwStyle & WS_SYSMENU) && !(dwExStyle & WS_EX_TOOLWINDOW))
+  {
+    if (DrawSysButton(hdc,FALSE))
+      r.left += GetSystemMetrics(SM_CYCAPTION) - 1;
+  }
+
+  if (dwStyle & WS_SYSMENU)
+  {
+    UINT state;
+#if 0 //CB: todo
+    /* Go get the sysmenu */
+    state = GetMenuState(hSysMenu, SC_CLOSE, MF_BYCOMMAND);
+#endif
+    /* Draw a grayed close button if disabled and a normal one if SC_CLOSE is not there */
+    DrawCloseButton(hdc, FALSE,
+                    ((((state & MF_DISABLED) || (state & MF_GRAYED))) && (state != 0xFFFFFFFF)));
+    r.right -= GetSystemMetrics(SM_CYCAPTION) - 1;
+
+    if ((dwStyle & WS_MAXIMIZEBOX) || (dwStyle & WS_MINIMIZEBOX))
+    {
+      /* In win95 the two buttons are always there */
+      /* But if the menu item is not in the menu they're disabled*/
+
+      DrawMaxButton(hdc, FALSE, (!(dwStyle & WS_MAXIMIZEBOX)));
+      r.right -= GetSystemMetrics(SM_CXSIZE) + 1;
+
+      DrawMinButton(hdc, FALSE,  (!(dwStyle & WS_MINIMIZEBOX)));
+            r.right -= GetSystemMetrics(SM_CXSIZE) + 1;
+    }
+  }
+
+  if (GetWindowTextA(buffer, sizeof(buffer) ))
+  {
+    NONCLIENTMETRICSA nclm;
+    HFONT hFont, hOldFont;
+    nclm.cbSize = sizeof(NONCLIENTMETRICSA);
+    SystemParametersInfoA (SPI_GETNONCLIENTMETRICS, 0, &nclm, 0);
+    if (dwExStyle & WS_EX_TOOLWINDOW)
+      hFont = CreateFontIndirectA (&nclm.lfSmCaptionFont);
+    else
+      hFont = CreateFontIndirectA (&nclm.lfCaptionFont);
+    hOldFont = SelectObject (hdc, hFont);
+    if (active) SetTextColor( hdc, GetSysColor( COLOR_CAPTIONTEXT ) );
+    else SetTextColor( hdc, GetSysColor( COLOR_INACTIVECAPTIONTEXT ) );
+    SetBkMode( hdc, TRANSPARENT );
+    r.left += 2;
+    DrawTextA( hdc, buffer, -1, &r,
+             DT_SINGLELINE | DT_VCENTER | DT_NOPREFIX | DT_LEFT );
+    DeleteObject (SelectObject (hdc, hOldFont));
+  }
+}
+//******************************************************************************
+//******************************************************************************
+VOID Win32BaseWindow::DoNCPaint(HRGN clip,BOOL suppress_menupaint)
+{
+  BOOL active  = flags & WIN_NCACTIVATED;
+  HDC hdc;
+  RECT rect,rectClip,rfuzz;
+
+  /* MSDN docs are pretty idiotic here, they say app CAN use clipRgn in
+     the call to GetDCEx implying that it is allowed not to use it either.
+     However, the suggested GetDCEx(    , DCX_WINDOW | DCX_INTERSECTRGN)
+     will cause clipRgn to be deleted after ReleaseDC().
+     Now, how is the "system" supposed to tell what happened?
+   */
+
+  if (!(hdc = GetDCEx( Win32Hwnd, (clip > 1) ? clip : 0, DCX_USESTYLE | DCX_WINDOW |
+                      ((clip > 1) ?(DCX_INTERSECTRGN /*| DCX_KEEPCLIPRGN*/) : 0) ))) return;
+
+
+  rect.top = rect.left = 0;
+  rect.right  = rectWindow.right - rectWindow.left;
+  rect.bottom = rectWindow.bottom - rectWindow.top;
+
+  if( clip > 1 )
+    GetRgnBox( clip, &rectClip );
+  else
+  {
+    clip = 0;
+    rectClip = rect;
+  }
+
+  SelectObject( hdc, GetSysColorPen(COLOR_WINDOWFRAME) );
+
+  if(!(flags & WIN_MANAGED))
+  {
+    if (HAS_BIGFRAME( dwStyle, dwExStyle))
+    {
+      DrawEdge (hdc, &rect, EDGE_RAISED, BF_RECT | BF_ADJUST);
+    }
+    if (HAS_THICKFRAME( dwStyle, dwExStyle ))
+      DrawFrame(hdc, &rect, FALSE, active );
+    else if (HAS_DLGFRAME( dwStyle, dwExStyle ))
+      DrawFrame( hdc, &rect, TRUE, active );
+    else if (HAS_THINFRAME( dwStyle ))
+    {
+      SelectObject( hdc, GetStockObject(NULL_BRUSH) );
+      Rectangle( hdc, 0, 0, rect.right, rect.bottom );
+    }
+
+    if ((dwStyle & WS_CAPTION) == WS_CAPTION)
+    {
+      RECT  r = rect;
+      if (dwExStyle & WS_EX_TOOLWINDOW)
+      {
+        r.bottom = rect.top + GetSystemMetrics(SM_CYSMCAPTION);
+        rect.top += GetSystemMetrics(SM_CYSMCAPTION);
+      }
+      else
+      {
+        r.bottom = rect.top + GetSystemMetrics(SM_CYCAPTION);
+        rect.top += GetSystemMetrics(SM_CYCAPTION);
+      }
+      if( !clip || IntersectRect( &rfuzz, &r, &rectClip ) )
+        DrawCaption(hdc, &r, active);
+    }
+  }
+#if 0 //CB: todo
+  if (HAS_MENU(wndPtr))
+  {
+    RECT r = rect;
+    r.bottom = rect.top + GetSystemMetrics(SM_CYMENU);
+
+    rect.top += MENU_DrawMenuBar( hdc, &r, hwnd, suppress_menupaint ) + 1;
+  }
+#endif
+
+  if (dwExStyle & WS_EX_CLIENTEDGE)
+    DrawEdge (hdc, &rect, EDGE_SUNKEN, BF_RECT | BF_ADJUST);
+
+  if (dwExStyle & WS_EX_STATICEDGE)
+    DrawEdge (hdc, &rect, BDR_SUNKENOUTER, BF_RECT | BF_ADJUST);
+
+  /* Draw the scroll-bars */
+#if 0 //CB: todo
+  if (dwStyle & WS_VSCROLL)
+    SCROLL_DrawScrollBar( hwnd, hdc, SB_VERT, TRUE, TRUE );
+  if (wndPtr->dwStyle & WS_HSCROLL)
+    SCROLL_DrawScrollBar( hwnd, hdc, SB_HORZ, TRUE, TRUE );
+#endif
+  /* Draw the "size-box" */
+  if ((dwStyle & WS_VSCROLL) && (dwStyle & WS_HSCROLL))
+  {
+    RECT r = rect;
+    r.left = r.right - GetSystemMetrics(SM_CXVSCROLL) + 1;
+    r.top  = r.bottom - GetSystemMetrics(SM_CYHSCROLL) + 1;
+    FillRect( hdc, &r,  GetSysColorBrush(COLOR_SCROLLBAR) );
+  }
+
+  ReleaseDC(Win32Hwnd,hdc);
+}
+//******************************************************************************
+//******************************************************************************
+LONG Win32BaseWindow::HandleNCPaint(HRGN clip)
+{
+  if (!(dwStyle & WS_VISIBLE)) return 0;
+
+  if (dwStyle & WS_MINIMIZE) return 0;  //CB: to check
+
+  DoNCPaint(clip,FALSE);
+
+  return 0;
+}
 /***********************************************************************
  *           NC_HandleNCLButtonDblClk
@@ -1605 +2438 @@
 
     case WM_NCPAINT:
-        return 0;
+         return HandleNCPaint((HRGN)wParam);
 
     case WM_NCACTIVATE:
+        return HandleNCActivate(wParam);
         return TRUE;
 
@@ -1617 +2451 @@
 
     case WM_NCCALCSIZE:
-        return NCHandleCalcSize(wParam, (NCCALCSIZE_PARAMS *)lParam);
+        return HandleNCCalcSize((RECT*)lParam);
 
     case WM_CTLCOLORMSGBOX:
@@ -1669 +2503 @@
           HCURSOR hCursor;
 
-          switch(lastHitTestVal)
+          switch(LOWORD(lParam))
           {
             case HTLEFT:
@@ -1806 +2640 @@
       point.y = (SHORT)HIWORD(lParam);
 
-      return FrameHitTest(this,point.x,point.y);
+      return HandleNCHitTest(point);
     }