Changeset 2437 for trunk/src/user32/new/oslibwin.cpp

Timestamp:

Jan 14, 2000, 3:45:18 PM (26 years ago)

Author:

sandervl

Message:

MsgFormat bugfix

File:

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

trunk/src/user32/new/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.36 2000-01-11 17:34:43 cbratschi Exp $ */
+/* $Id: oslibwin.cpp,v 1.37 2000-01-14 14:45:16 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -905 +905 @@
 //******************************************************************************
 //******************************************************************************
-BOOL OSLibWinEnableScrollBar(HWND hwndParent, int scrollBar, BOOL fEnable)
-{
- HWND hwndScroll;
-
-   if(scrollBar == OSLIB_VSCROLL) {
-        hwndScroll = WinWindowFromID(hwndParent, FID_VERTSCROLL);
-   }
-   else hwndScroll = WinWindowFromID(hwndParent, FID_HORZSCROLL);
-
-   if(hwndScroll == NULL)
-        return FALSE;
-
-   return WinEnableWindow(hwndScroll, fEnable);
-}
-//******************************************************************************
-//******************************************************************************
 HWND OSLibWinQueryObjectWindow(VOID)
 {
   return WinQueryObjectWindow(HWND_DESKTOP);
-}
-//******************************************************************************
-//******************************************************************************
-ULONG OSLibWinGetScrollPos(HWND hwndParent, HWND hwndScroll)
-{
-   if(hwndScroll == NULL)
-        return 0;
-
-   return (ULONG)WinSendMsg(hwndScroll, SBM_QUERYPOS, 0, 0);
-}
-//******************************************************************************
-//******************************************************************************
-ULONG OSLibWinSetScrollPos(HWND hwndParent, HWND hwndScroll, int pos, int fRedraw)
-{
- ULONG oldPos;
-
-   if(hwndScroll == NULL)
-        return 0;
-
-   oldPos = (ULONG)WinSendMsg(hwndScroll, SBM_QUERYPOS, 0, 0);
-
-   if(WinSendMsg(hwndScroll, SBM_SETPOS, MPFROMSHORT(pos), MPFROMLONG(fRedraw)) == FALSE)
-        return 0;
-
-   return oldPos;
-}
-//******************************************************************************
-//******************************************************************************
-BOOL OSLibWinSetScrollRange(HWND hwndParent, HWND hwndScroll, int minpos,
-                            int maxpos, int fRedraw)
-{
-   if(hwndScroll == NULL)
-        return 0;
-
-   return (BOOL)WinSendMsg( hwndScroll, SBM_SETSCROLLBAR,
-                            MPFROMLONG(WinSendMsg(hwndScroll, SBM_QUERYPOS, 0, 0)),
-                            MPFROM2SHORT( minpos ,maxpos ) );
-}
-//******************************************************************************
-//******************************************************************************
-BOOL OSLibWinSetScrollPageSize(HWND hwndParent, HWND hwndScroll, int pagesize,
-                               int totalsize, int fRedraw)
-{
-   if(hwndScroll == NULL)
-        return 0;
-
-   return (BOOL)WinSendMsg( hwndScroll, SBM_SETTHUMBSIZE,
-                            MPFROM2SHORT(pagesize, totalsize),
-                            0);
-}
-//******************************************************************************
-//******************************************************************************
-void OSLibTranslateScrollCmdAndMsg(ULONG *msg, ULONG *scrollcmd)
-{
-    switch(*scrollcmd)
-    {
-        case SB_LINEUP:
-               *scrollcmd = SB_LINEUP_W;
-               break;
-        case SB_LINEDOWN:
-               *scrollcmd = SB_LINEDOWN_W;
-               break;
-        case SB_PAGEUP:
-               *scrollcmd = SB_PAGEUP_W;
-               break;
-        case SB_PAGEDOWN:
-               *scrollcmd = SB_PAGEDOWN_W;
-               break;
-        case SB_SLIDERTRACK:
-               *scrollcmd = SB_THUMBTRACK_W;
-               break;
-        case SB_SLIDERPOSITION:
-               *scrollcmd = SB_THUMBPOSITION_W;
-               break;
-        case SB_ENDSCROLL:
-               *scrollcmd = SB_ENDSCROLL_W;
-               break;
-    }
-    *msg = (*msg == WM_HSCROLL) ? WM_HSCROLL_W : WM_VSCROLL_W;
-    return;
-}
-//******************************************************************************
-//******************************************************************************
-void OSLibSetWindowStyle(HWND hwnd, ULONG dwStyle, BOOL fTaskList)
-{
-  ULONG OSWinStyle, OSFrameStyle, borderWidth, borderHeight,dwExStyle;
-
-  OSLibWinConvertStyle(dwStyle, &dwExStyle, &OSWinStyle, &OSFrameStyle, &borderWidth, &borderHeight);
-
-  if(fTaskList)
-  {
-    OSFrameStyle |= FCF_TASKLIST | FCF_NOMOVEWITHOWNER;
-  }
-
-//  OSWinStyle = OSWinStyle & ~(WS_TABSTOP | WS_GROUP | WS_CLIPCHILDREN | WS_CLIPSIBLINGS);
-  OSWinStyle = OSWinStyle & ~(WS_TABSTOP | WS_GROUP | WS_CLIPCHILDREN);
-
-  WinSetWindowULong(hwnd, QWL_STYLE,
-                    (WinQueryWindowULong(hwnd, QWL_STYLE) & ~0xffff0000) |
-                    OSWinStyle);
-
-  if(OSFrameStyle & FCF_TITLEBAR)
-  {
-      WinSetParent(OSLibWinObjectWindowFromID(hwnd, FID_TITLEBAR), hwnd, FALSE);
-      WinSetParent(OSLibWinObjectWindowFromID(hwnd, FID_MENU), hwnd, FALSE);
-  }
-  else
-  {
-      WinSetParent(WinWindowFromID(hwnd, FID_TITLEBAR), HWND_OBJECT, FALSE);
-      WinSetParent(WinWindowFromID(hwnd, FID_MENU), HWND_OBJECT, FALSE);
-  }
-  if(OSFrameStyle & FCF_SYSMENU)
-      WinSetParent(OSLibWinObjectWindowFromID(hwnd, FID_SYSMENU), hwnd, FALSE);
-  else
-      WinSetParent(WinWindowFromID(hwnd, FID_SYSMENU), HWND_OBJECT, FALSE);
-
-  if((OSFrameStyle & FCF_MINBUTTON) || (OSFrameStyle & FCF_MAXBUTTON))
-      WinSetParent(OSLibWinObjectWindowFromID(hwnd, FID_MINMAX), hwnd, FALSE);
-  else
-      WinSetParent(WinWindowFromID(hwnd, FID_MINMAX), HWND_OBJECT, FALSE);
-
-  if(OSFrameStyle & FCF_VERTSCROLL)
-      WinSetParent(OSLibWinObjectWindowFromID(hwnd, FID_VERTSCROLL), hwnd, FALSE);
-  else
-      WinSetParent(WinWindowFromID(hwnd, FID_VERTSCROLL), HWND_OBJECT, FALSE);
-
-  if(OSFrameStyle & FCF_HORZSCROLL)
-      WinSetParent(OSLibWinObjectWindowFromID(hwnd, FID_HORZSCROLL), hwnd, FALSE);
-  else
-      WinSetParent(WinWindowFromID(hwnd, FID_HORZSCROLL), HWND_OBJECT, FALSE);
-
-#if 0
-  WNDPARAMS wndparam = {0};
-  FRAMECDATA framecdata = {0};
-
-  framecdata.cb = sizeof(FRAMECDATA);
-
-  wndparam.fsStatus  = WPM_CTLDATA;
-  wndparam.cbCtlData = framecdata.cb;
-  wndparam.pCtlData  = (PVOID)&framecdata;
-  WinSendMsg(hwnd, WM_QUERYWINDOWPARAMS, &wndparam, 0);
-
-  wndparam.fsStatus = WPM_CTLDATA;
-  wndparam.pCtlData = (PVOID)&framecdata;
-  framecdata.flCreateFlags = OSFrameStyle;
-  WinSendMsg(hwnd, WM_SETWINDOWPARAMS, &wndparam, 0);
-#endif
-
-  WinSendMsg(hwnd, WM_UPDATEFRAME,
-             MPFROMLONG(FCF_TITLEBAR | FCF_SYSMENU | FCF_MINMAX |
-                        FCF_MENU | FCF_VERTSCROLL | FCF_HORZSCROLL),
-             MPVOID);
 }
 //******************************************************************************