Made all 16<->32 HWND conversions use explicit functions instead of
implicit type casts.
Moved a lot of 16-bit functions to the new wnd16.c file.
Changed DIALOGINFO structure handling to support 32-bit handles.
diff --git a/controls/button.c b/controls/button.c
index 20ac815..12c6188 100644
--- a/controls/button.c
+++ b/controls/button.c
@@ -218,7 +218,8 @@
btn_type == BS_OWNERDRAW)
{
SendMessageW( GetParent(hWnd), WM_COMMAND,
- MAKEWPARAM( GetWindowLongA(hWnd,GWL_ID), BN_DOUBLECLICKED ), hWnd);
+ MAKEWPARAM( GetWindowLongA(hWnd,GWL_ID), BN_DOUBLECLICKED ),
+ (LPARAM)hWnd);
break;
}
/* fall through */
@@ -263,7 +264,7 @@
break;
}
SendMessageW( GetParent(hWnd), WM_COMMAND,
- MAKEWPARAM( GetWindowLongA(hWnd,GWL_ID), BN_CLICKED ), hWnd);
+ MAKEWPARAM( GetWindowLongA(hWnd,GWL_ID), BN_CLICKED ), (LPARAM)hWnd);
}
break;
@@ -308,7 +309,7 @@
if (btn_type == BS_AUTORADIOBUTTON)
SendMessageW( hWnd, BM_SETCHECK, BUTTON_CHECKED, 0 );
SendMessageW( GetParent(hWnd), WM_COMMAND,
- MAKEWPARAM( GetWindowLongA(hWnd,GWL_ID), BN_CLICKED ), hWnd);
+ MAKEWPARAM( GetWindowLongA(hWnd,GWL_ID), BN_CLICKED ), (LPARAM)hWnd);
}
set_button_state( hWnd, get_button_state(hWnd) | BUTTON_HASFOCUS );
paint_button( hWnd, btn_type, ODA_FOCUS );
@@ -677,7 +678,7 @@
/* Send WM_CTLCOLOR to allow changing the font (the colors are fixed) */
if ((hFont = get_button_font( hwnd ))) SelectObject( hDC, hFont );
- SendMessageW( GetParent(hwnd), WM_CTLCOLORBTN, hDC, hwnd );
+ SendMessageW( GetParent(hwnd), WM_CTLCOLORBTN, hDC, (LPARAM)hwnd );
hOldPen = (HPEN)SelectObject(hDC, GetSysColorPen(COLOR_WINDOWFRAME));
hOldBrush =(HBRUSH)SelectObject(hDC,GetSysColorBrush(COLOR_BTNFACE));
oldBkMode = SetBkMode(hDC, TRANSPARENT);
@@ -802,10 +803,9 @@
if ((hFont = get_button_font( hwnd ))) SelectObject( hDC, hFont );
- /* GetControlBrush16 sends WM_CTLCOLORBTN, plus it returns default brush
- * if parent didn't return valid one. So we kill two hares at once
- */
- hBrush = GetControlBrush16( hwnd, hDC, CTLCOLOR_BTN );
+ hBrush = SendMessageW( GetParent(hwnd), WM_CTLCOLORBTN, hDC, (LPARAM)hwnd );
+ if (!hBrush) /* did the app forget to call defwindowproc ? */
+ hBrush = DefWindowProcW( GetParent(hwnd), WM_CTLCOLORBTN, hDC, (LPARAM)hwnd );
if (style & BS_LEFTTEXT)
{
@@ -951,7 +951,9 @@
if ((hFont = get_button_font( hwnd ))) SelectObject( hDC, hFont );
/* GroupBox acts like static control, so it sends CTLCOLORSTATIC */
- hbr = GetControlBrush16( hwnd, hDC, CTLCOLOR_STATIC );
+ hbr = SendMessageW( GetParent(hwnd), WM_CTLCOLORSTATIC, hDC, (LPARAM)hwnd );
+ if (!hbr) /* did the app forget to call defwindowproc ? */
+ hbr = DefWindowProcW( GetParent(hwnd), WM_CTLCOLORSTATIC, hDC, (LPARAM)hwnd );
GetClientRect( hwnd, &rc);
if (TWEAK_WineLook == WIN31_LOOK) {
@@ -1008,7 +1010,10 @@
GetClientRect( hwnd, &rc);
if ((hFont = get_button_font( hwnd ))) SelectObject( hDC, hFont );
- hBrush = GetControlBrush16( hwnd, hDC, CTLCOLOR_BTN );
+
+ hBrush = SendMessageW( GetParent(hwnd), WM_CTLCOLORBTN, hDC, (LPARAM)hwnd );
+ if (!hBrush) /* did the app forget to call defwindowproc ? */
+ hBrush = DefWindowProcW( GetParent(hwnd), WM_CTLCOLORBTN, hDC, (LPARAM)hwnd );
FillRect( hDC, &rc, hBrush );
if ((action == ODA_FOCUS) ||
diff --git a/controls/combo.c b/controls/combo.c
index 92dddb2..8d41c6d 100644
--- a/controls/combo.c
+++ b/controls/combo.c
@@ -31,8 +31,8 @@
*/
#define CB_NOTIFY( lphc, code ) \
- (SendMessageW((lphc)->owner, WM_COMMAND, \
- MAKEWPARAM(GetWindowLongA((lphc)->self,GWL_ID), (code)), (lphc)->self))
+ (SendMessageW((lphc)->owner, WM_COMMAND, \
+ MAKEWPARAM(GetWindowLongA((lphc)->self,GWL_ID), (code)), (LPARAM)(lphc)->self))
#define CB_DISABLED( lphc ) (!IsWindowEnabled((lphc)->self))
#define CB_OWNERDRAWN( lphc ) ((lphc)->dwStyle & (CBS_OWNERDRAWFIXED | CBS_OWNERDRAWVARIABLE))
@@ -626,7 +626,7 @@
}
TRACE("init done\n");
- return hwnd;
+ return 0;
}
ERR("edit control failure.\n");
} else ERR("listbox failure.\n");
@@ -898,7 +898,7 @@
*/
if (CB_DISABLED(lphc))
{
- hBkgBrush = SendMessageW(lphc->owner, WM_CTLCOLORSTATIC, hDC, lphc->self );
+ hBkgBrush = SendMessageW(lphc->owner, WM_CTLCOLORSTATIC, hDC, (LPARAM)lphc->self );
/*
* We have to change the text color since WM_CTLCOLORSTATIC will
@@ -911,11 +911,11 @@
{
if (lphc->wState & CBF_EDIT)
{
- hBkgBrush = SendMessageW(lphc->owner, WM_CTLCOLOREDIT, hDC, lphc->self );
+ hBkgBrush = SendMessageW(lphc->owner, WM_CTLCOLOREDIT, hDC, (LPARAM)lphc->self );
}
else
{
- hBkgBrush = SendMessageW(lphc->owner, WM_CTLCOLORLISTBOX, hDC, lphc->self );
+ hBkgBrush = SendMessageW(lphc->owner, WM_CTLCOLORLISTBOX, hDC, (LPARAM)lphc->self );
}
}
diff --git a/controls/icontitle.c b/controls/icontitle.c
index 03bb6da..85bcd42 100644
--- a/controls/icontitle.c
+++ b/controls/icontitle.c
@@ -123,6 +123,7 @@
*/
static BOOL ICONTITLE_Paint( HWND hwnd, HWND owner, HDC hDC, BOOL bActive )
{
+ RECT rect;
HFONT hPrevFont;
HBRUSH hBrush = 0;
COLORREF textColor = 0;
@@ -158,18 +159,16 @@
}
}
- FillWindow16( GetParent(hwnd), hwnd, hDC, hBrush );
+ GetClientRect( hwnd, &rect );
+ DPtoLP( hDC, (LPPOINT)&rect, 2 );
+ FillRect( hDC, &rect, hBrush );
hPrevFont = SelectObject( hDC, hIconTitleFont );
if( hPrevFont )
{
- RECT rect;
- INT length;
WCHAR buffer[80];
- GetClientRect( hwnd, &rect );
-
- length = GetWindowTextW( owner, buffer, 80 );
+ INT length = GetWindowTextW( owner, buffer, sizeof(buffer) );
SetTextColor( hDC, textColor );
SetBkMode( hDC, TRANSPARENT );
@@ -178,7 +177,7 @@
SelectObject( hDC, hPrevFont );
}
- return ( hPrevFont ) ? TRUE : FALSE;
+ return (hPrevFont != 0);
}
/***********************************************************************
@@ -187,12 +186,9 @@
LRESULT WINAPI IconTitleWndProc( HWND hWnd, UINT msg,
WPARAM wParam, LPARAM lParam )
{
- LRESULT retvalue;
HWND owner = GetWindow( hWnd, GW_OWNER );
- WND *wnd = WIN_FindWndPtr( hWnd );
- if( !wnd )
- return 0;
+ if (!IsWindow(hWnd)) return 0;
switch( msg )
{
@@ -204,44 +200,30 @@
SystemParametersInfoA( SPI_GETICONTITLEWRAP, 0, &bMultiLineTitle, 0 );
hIconTitleFont = CreateFontIndirectA( &logFont );
}
- retvalue = (hIconTitleFont) ? 0 : -1;
- goto END;
+ return (hIconTitleFont ? 0 : -1);
case WM_NCHITTEST:
- retvalue = HTCAPTION;
- goto END;
+ return HTCAPTION;
case WM_NCMOUSEMOVE:
case WM_NCLBUTTONDBLCLK:
- retvalue = SendMessageW( owner, msg, wParam, lParam );
- goto END;
+ return SendMessageW( owner, msg, wParam, lParam );
case WM_ACTIVATE:
if( wParam ) SetActiveWindow( owner );
- /* fall through */
-
+ return 0;
case WM_CLOSE:
- retvalue = 0;
- goto END;
+ return 0;
case WM_SHOWWINDOW:
- if( wnd && wParam ) ICONTITLE_SetTitlePos( hWnd, owner );
- retvalue = 0;
- goto END;
+ if (wParam) ICONTITLE_SetTitlePos( hWnd, owner );
+ return 0;
case WM_ERASEBKGND:
- if( wnd )
- {
- if( GetWindowLongA( owner, GWL_STYLE ) & WS_CHILD )
- lParam = SendMessageA( owner, WM_ISACTIVEICON, 0, 0 );
- else
- lParam = (owner == GetActiveWindow());
- if( ICONTITLE_Paint( hWnd, owner, (HDC)wParam, (BOOL)lParam ) )
- ValidateRect( hWnd, NULL );
- retvalue = 1;
- goto END;
- }
+ if( GetWindowLongA( owner, GWL_STYLE ) & WS_CHILD )
+ lParam = SendMessageA( owner, WM_ISACTIVEICON, 0, 0 );
+ else
+ lParam = (owner == GetActiveWindow());
+ if( ICONTITLE_Paint( hWnd, owner, (HDC)wParam, (BOOL)lParam ) )
+ ValidateRect( hWnd, NULL );
+ return 1;
}
-
- retvalue = DefWindowProcW( hWnd, msg, wParam, lParam );
-END:
- WIN_ReleaseWndPtr(wnd);
- return retvalue;
+ return DefWindowProcW( hWnd, msg, wParam, lParam );
}
diff --git a/controls/menu.c b/controls/menu.c
index 675026d..f15adea 100644
--- a/controls/menu.c
+++ b/controls/menu.c
@@ -1068,7 +1068,7 @@
if (lpitem->fState & MF_GRAYED) dis.itemState |= ODS_GRAYED;
if (lpitem->fState & MF_HILITE) dis.itemState |= ODS_SELECTED;
dis.itemAction = odaction; /* ODA_DRAWENTIRE | ODA_SELECT | ODA_FOCUS; */
- dis.hwndItem = hmenu;
+ dis.hwndItem = (HWND)hmenu;
dis.hDC = hdc;
dis.rcItem = lpitem->rect;
TRACE("Ownerdraw: owner=%04x itemID=%d, itemState=%d, itemAction=%d, "
@@ -2901,7 +2901,7 @@
if (!(wFlags & TPM_NONOTIFY))
SendMessageA( hWnd, WM_ENTERMENULOOP, bPopup, 0 );
- SendMessageA( hWnd, WM_SETCURSOR, hWnd, HTCAPTION );
+ SendMessageA( hWnd, WM_SETCURSOR, (WPARAM)hWnd, HTCAPTION );
if (!(wFlags & TPM_NONOTIFY))
{
@@ -3007,20 +3007,6 @@
/**********************************************************************
- * TrackPopupMenu (USER.416)
- */
-BOOL16 WINAPI TrackPopupMenu16( HMENU16 hMenu, UINT16 wFlags, INT16 x, INT16 y,
- INT16 nReserved, HWND16 hWnd, const RECT16 *lpRect )
-{
- RECT r;
- if (lpRect)
- CONV_RECT16TO32( lpRect, &r );
- return TrackPopupMenu( hMenu, wFlags, x, y, nReserved, hWnd,
- lpRect ? &r : NULL );
-}
-
-
-/**********************************************************************
* TrackPopupMenu (USER32.@)
*
* Like the win32 API, the function return the command ID only if the
@@ -3350,16 +3336,6 @@
/**********************************************************************
- * HiliteMenuItem (USER.162)
- */
-BOOL16 WINAPI HiliteMenuItem16( HWND16 hWnd, HMENU16 hMenu, UINT16 wItemID,
- UINT16 wHilite )
-{
- return HiliteMenuItem( hWnd, hMenu, wItemID, wHilite );
-}
-
-
-/**********************************************************************
* HiliteMenuItem (USER32.@)
*/
BOOL WINAPI HiliteMenuItem( HWND hWnd, HMENU hMenu, UINT wItemID,
@@ -3836,15 +3812,6 @@
/**********************************************************************
- * GetSystemMenu (USER.156)
- */
-HMENU16 WINAPI GetSystemMenu16( HWND16 hWnd, BOOL16 bRevert )
-{
- return GetSystemMenu( hWnd, bRevert );
-}
-
-
-/**********************************************************************
* GetSystemMenu (USER32.@)
*/
HMENU WINAPI GetSystemMenu( HWND hWnd, BOOL bRevert )
@@ -3899,15 +3866,6 @@
/*******************************************************************
- * SetSystemMenu (USER.280)
- */
-BOOL16 WINAPI SetSystemMenu16( HWND16 hwnd, HMENU16 hMenu )
-{
- return SetSystemMenu( hwnd, hMenu );
-}
-
-
-/*******************************************************************
* SetSystemMenu (USER32.@)
*/
BOOL WINAPI SetSystemMenu( HWND hwnd, HMENU hMenu )
@@ -3926,15 +3884,6 @@
/**********************************************************************
- * GetMenu (USER.157)
- */
-HMENU16 WINAPI GetMenu16( HWND16 hWnd )
-{
- return (HMENU16)GetMenu(hWnd);
-}
-
-
-/**********************************************************************
* GetMenu (USER32.@)
*/
HMENU WINAPI GetMenu( HWND hWnd )
@@ -3946,15 +3895,6 @@
/**********************************************************************
- * SetMenu (USER.158)
- */
-BOOL16 WINAPI SetMenu16( HWND16 hWnd, HMENU16 hMenu )
-{
- return SetMenu( hWnd, hMenu );
-}
-
-
-/**********************************************************************
* SetMenu (USER32.@)
*/
BOOL WINAPI SetMenu( HWND hWnd, HMENU hMenu )
@@ -4013,15 +3953,6 @@
/**********************************************************************
- * DrawMenuBar (USER.160)
- */
-void WINAPI DrawMenuBar16( HWND16 hWnd )
-{
- DrawMenuBar( hWnd );
-}
-
-
-/**********************************************************************
* DrawMenuBar (USER32.@)
*/
BOOL WINAPI DrawMenuBar( HWND hWnd )
@@ -4702,21 +4633,6 @@
return TRUE;
}
-/**********************************************************************
- * GetMenuItemRect (USER.665)
- */
-
-BOOL16 WINAPI GetMenuItemRect16 (HWND16 hwnd, HMENU16 hMenu, UINT16 uItem,
- LPRECT16 rect)
-{
- RECT r32;
- BOOL res;
-
- if (!rect) return FALSE;
- res = GetMenuItemRect (hwnd, hMenu, uItem, &r32);
- CONV_RECT32TO16 (&r32, rect);
- return res;
-}
/**********************************************************************
* SetMenuInfo (USER32.@)
@@ -5037,43 +4953,3 @@
WARN_(accel)("couldn't translate accelerator key\n");
return 0;
}
-
-
-/**********************************************************************
- * TranslateAccelerator (USER.178)
- */
-INT16 WINAPI TranslateAccelerator16( HWND16 hWnd, HACCEL16 hAccel, LPMSG16 msg )
-{
- LPACCEL16 lpAccelTbl;
- int i;
-
- if (msg == NULL)
- {
- WARN_(accel)("msg null; should hang here to be win compatible\n");
- return 0;
- }
- if (!hAccel || !(lpAccelTbl = (LPACCEL16) LockResource16(hAccel)))
- {
- WARN_(accel)("invalid accel handle=%x\n", hAccel);
- return 0;
- }
- if ((msg->message != WM_KEYDOWN &&
- msg->message != WM_KEYUP &&
- msg->message != WM_SYSKEYDOWN &&
- msg->message != WM_SYSKEYUP &&
- msg->message != WM_CHAR)) return 0;
-
- TRACE_(accel)("TranslateAccelerators hAccel=%04x, hWnd=%04x,"
- "msg->hwnd=%04x, msg->message=%04x, wParam=%04x, lParam=%lx\n",
- hAccel,hWnd,msg->hwnd,msg->message,msg->wParam,msg->lParam);
-
- i = 0;
- do
- {
- if (translate_accelerator( hWnd, msg->message, msg->wParam, msg->lParam,
- lpAccelTbl[i].fVirt, lpAccelTbl[i].key, lpAccelTbl[i].cmd ))
- return 1;
- } while ((lpAccelTbl[i++].fVirt & 0x80) == 0);
- WARN_(accel)("couldn't translate accelerator key\n");
- return 0;
-}
diff --git a/controls/scroll.c b/controls/scroll.c
index f5a4fc0..f2b5e4d 100644
--- a/controls/scroll.c
+++ b/controls/scroll.c
@@ -883,7 +883,7 @@
}
SendMessageW( GetParent(hwnd),
(GetWindowLongA( hwnd, GWL_STYLE ) & SBS_VERT) ? WM_VSCROLL : WM_HSCROLL,
- msg, hwnd );
+ msg, (LPARAM)hwnd );
}
@@ -974,7 +974,7 @@
if ((msg == WM_LBUTTONDOWN) || (msg == WM_SYSTIMER))
{
SendMessageA( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL,
- SB_LINEUP, hwndCtl );
+ SB_LINEUP, (LPARAM)hwndCtl );
}
SetSystemTimer( hwnd, SCROLL_TIMER, (msg == WM_LBUTTONDOWN) ?
@@ -993,7 +993,7 @@
if ((msg == WM_LBUTTONDOWN) || (msg == WM_SYSTIMER))
{
SendMessageA( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL,
- SB_PAGEUP, hwndCtl );
+ SB_PAGEUP, (LPARAM)hwndCtl );
}
SetSystemTimer( hwnd, SCROLL_TIMER, (msg == WM_LBUTTONDOWN) ?
SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY,
@@ -1042,7 +1042,7 @@
SCROLL_TrackingPos );
SendMessageA( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL,
MAKEWPARAM( SB_THUMBTRACK, SCROLL_TrackingVal),
- hwndCtl );
+ (LPARAM)hwndCtl );
if (!SCROLL_MovingThumb)
SCROLL_DrawMovingThumb( hdc, &rect, vertical,
arrowSize, thumbSize );
@@ -1059,7 +1059,7 @@
if ((msg == WM_LBUTTONDOWN) || (msg == WM_SYSTIMER))
{
SendMessageA( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL,
- SB_PAGEDOWN, hwndCtl );
+ SB_PAGEDOWN, (LPARAM)hwndCtl );
}
SetSystemTimer( hwnd, SCROLL_TIMER, (msg == WM_LBUTTONDOWN) ?
SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY,
@@ -1076,7 +1076,7 @@
if ((msg == WM_LBUTTONDOWN) || (msg == WM_SYSTIMER))
{
SendMessageA( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL,
- SB_LINEDOWN, hwndCtl );
+ SB_LINEDOWN, (LPARAM)hwndCtl );
}
SetSystemTimer( hwnd, SCROLL_TIMER, (msg == WM_LBUTTONDOWN) ?
@@ -1097,11 +1097,11 @@
UINT val = SCROLL_GetThumbVal( infoPtr, &rect, vertical,
trackThumbPos + lastMousePos - lastClickPos );
SendMessageA( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL,
- MAKEWPARAM( SB_THUMBPOSITION, val ), hwndCtl );
+ MAKEWPARAM( SB_THUMBPOSITION, val ), (LPARAM)hwndCtl );
}
else
SendMessageA( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL,
- SB_ENDSCROLL, hwndCtl );
+ SB_ENDSCROLL, (LPARAM)hwndCtl );
}
ReleaseDC( hwnd, hdc );
@@ -1302,16 +1302,6 @@
/*************************************************************************
- * SetScrollInfo (USER.475)
- */
-INT16 WINAPI SetScrollInfo16( HWND16 hwnd, INT16 nBar, const SCROLLINFO *info,
- BOOL16 bRedraw )
-{
- return (INT16)SetScrollInfo( hwnd, nBar, info, bRedraw );
-}
-
-
-/*************************************************************************
* SetScrollInfo (USER32.@)
* SetScrollInfo can be used to set the position, upper bound,
* lower bound, and page size of a scrollbar control.
@@ -1487,15 +1477,6 @@
/*************************************************************************
- * GetScrollInfo (USER.476)
- */
-BOOL16 WINAPI GetScrollInfo16( HWND16 hwnd, INT16 nBar, LPSCROLLINFO info )
-{
- return GetScrollInfo( hwnd, nBar, info );
-}
-
-
-/*************************************************************************
* GetScrollInfo (USER32.@)
* GetScrollInfo can be used to retrieve the position, upper bound,
* lower bound, and page size of a scrollbar control.
@@ -1528,16 +1509,6 @@
/*************************************************************************
- * SetScrollPos (USER.62)
- */
-INT16 WINAPI SetScrollPos16( HWND16 hwnd, INT16 nBar, INT16 nPos,
- BOOL16 bRedraw )
-{
- return (INT16)SetScrollPos( hwnd, nBar, nPos, bRedraw );
-}
-
-
-/*************************************************************************
* SetScrollPos (USER32.@)
*
* RETURNS
@@ -1569,15 +1540,6 @@
/*************************************************************************
- * GetScrollPos (USER.63)
- */
-INT16 WINAPI GetScrollPos16( HWND16 hwnd, INT16 nBar )
-{
- return (INT16)GetScrollPos( hwnd, nBar );
-}
-
-
-/*************************************************************************
* GetScrollPos (USER32.@)
*
* RETURNS
@@ -1600,18 +1562,6 @@
/*************************************************************************
- * SetScrollRange (USER.64)
- */
-void WINAPI SetScrollRange16( HWND16 hwnd, INT16 nBar,
- INT16 MinVal, INT16 MaxVal, BOOL16 bRedraw )
-{
- /* Invalid range -> range is set to (0,0) */
- if ((INT)MaxVal - (INT)MinVal > 0x7fff) MinVal = MaxVal = 0;
- SetScrollRange( hwnd, nBar, MinVal, MaxVal, bRedraw );
-}
-
-
-/*************************************************************************
* SetScrollRange (USER32.@)
*
* RETURNS STD
@@ -1672,20 +1622,6 @@
/*************************************************************************
- * GetScrollRange (USER.65)
- */
-BOOL16 WINAPI GetScrollRange16( HWND16 hwnd, INT16 nBar,
- LPINT16 lpMin, LPINT16 lpMax)
-{
- INT min, max;
- BOOL16 ret = GetScrollRange( hwnd, nBar, &min, &max );
- if (lpMin) *lpMin = min;
- if (lpMax) *lpMax = max;
- return ret;
-}
-
-
-/*************************************************************************
* GetScrollRange (USER32.@)
*
* RETURNS STD
@@ -1786,16 +1722,6 @@
/*************************************************************************
- * ShowScrollBar (USER.267)
- */
-void WINAPI ShowScrollBar16( HWND16 hwnd, INT16 nBar, BOOL16 fShow )
-{
- SCROLL_ShowScrollBar( hwnd, nBar, (nBar == SB_VERT) ? 0 : fShow,
- (nBar == SB_HORZ) ? 0 : fShow );
-}
-
-
-/*************************************************************************
* ShowScrollBar (USER32.@)
*
* RETURNS STD
@@ -1812,15 +1738,6 @@
/*************************************************************************
- * EnableScrollBar (USER.482)
- */
-BOOL16 WINAPI EnableScrollBar16( HWND16 hwnd, INT16 nBar, UINT16 flags )
-{
- return EnableScrollBar( hwnd, nBar, flags );
-}
-
-
-/*************************************************************************
* EnableScrollBar (USER32.@)
*/
BOOL WINAPI EnableScrollBar( HWND hwnd, INT nBar, UINT flags )
