Changeset 9598 for trunk/src/user32/win32wbasenonclient.cpp

Timestamp:

Jan 3, 2003, 5:35:58 PM (23 years ago)

Author:

sandervl

Message:

Merged Rewind menu control

File:

• trunk/src/user32/win32wbasenonclient.cpp (modified) (2 diffs)

trunk/src/user32/win32wbasenonclient.cpp

@@ -1 @@
-/* $Id: win32wbasenonclient.cpp,v 1.46 2003-01-01 14:29:45 sandervl Exp $ */
+/* $Id: win32wbasenonclient.cpp,v 1.47 2003-01-03 16:35:57 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2 (non-client methods)
@@ -1554 +1554 @@
   return DrawCaptionTemp(hwnd,hdc,rect,hFont,hIcon,(LPWSTR)str,uFlags,TRUE);
 }
-#if 0
-//Control helpers
-/***********************************************************************
- *           NC_GetSysPopupPos
- */
-void NC_GetSysPopupPos( HWND hwnd, RECT* rect )
-{
-    if (IsIconic(hwnd)) GetWindowRect( hwnd, rect );
-    else
-    {
-#ifdef __WIN32OS2__
-        Win32BaseWindow *win32wnd = Win32BaseWindow::GetWindowFromHandle(hwnd);
-        if (!win32wnd) return;
-
-        win32wnd->GetSysPopupPos(rect);
-
-        RELEASE_WNDOBJ(win32wnd);
-#else
-        WND *wndPtr = WIN_FindWndPtr( hwnd );
-        if (!wndPtr) return;
-
-        NC_GetInsideRect( hwnd, rect );
-        OffsetRect( rect, wndPtr->rectWindow.left, wndPtr->rectWindow.top);
-        if (wndPtr->dwStyle & WS_CHILD)
-            ClientToScreen( GetParent(hwnd), (POINT *)rect );
-        if (TWEAK_WineLook == WIN31_LOOK) {
-            rect->right = rect->left + GetSystemMetrics(SM_CXSIZE);
-            rect->bottom = rect->top + GetSystemMetrics(SM_CYSIZE);
-        }
-        else {
-            rect->right = rect->left + GetSystemMetrics(SM_CYCAPTION) - 1;
-            rect->bottom = rect->top + GetSystemMetrics(SM_CYCAPTION) - 1;
-        }
-        WIN_ReleaseWndPtr( wndPtr );
-#endif
-    }
-}
-//*****************************************************************************
-//*****************************************************************************
-BOOL NC_DrawSysButton95 (HWND hwnd, HDC hdc, BOOL down)
-{
-    BOOL ret;
-
-    Win32BaseWindow *win32wnd = Win32BaseWindow::GetWindowFromHandle(hwnd);
-    if (!win32wnd) return FALSE;
-
-    ret = win32wnd->DrawSysButton(hwnd, hdc);
-
-    RELEASE_WNDOBJ(win32wnd);
-
-    return ret;
-}
-#endif
+