Removed direct references to CLASS internals.

This commit is contained in:
Patrik Stridvall 1999-06-12 14:52:15 +00:00 committed by Alexandre Julliard
parent cd3278be3f
commit 4bf335497d
12 changed files with 13 additions and 18 deletions

View File

@ -135,7 +135,7 @@ static BOOL ICONTITLE_Paint( WND* wnd, HDC hDC, BOOL bActive )
{
if( wnd->dwStyle & WS_CHILD )
{
hBrush = wnd->parent->class->hbrBackground;
hBrush = (HBRUSH) GetClassLongA(wnd->hwndSelf, GCL_HBRBACKGROUND);
if( hBrush )
{
INT level;

View File

@ -2053,7 +2053,7 @@ static HMENU MENU_ShowSubPopup( HWND hwndOwner, HMENU hmenu,
if (IS_SYSTEM_MENU(menu))
{
MENU_InitSysMenuPopup(item->hSubMenu, wndPtr->dwStyle, wndPtr->class->style);
MENU_InitSysMenuPopup(item->hSubMenu, wndPtr->dwStyle, GetClassLongA(wndPtr->hwndSelf, GCL_STYLE));
NC_GetSysPopupPos( wndPtr, &rect );
rect.top = rect.bottom;

View File

@ -115,5 +115,5 @@ BOOL WIDGETS_Init(void)
BOOL WIDGETS_IsControl( WND* pWnd, BUILTIN_CLASS32 cls )
{
assert( cls < BIC32_NB_CLASSES );
return (pWnd->class->atomName == bicAtomTable[cls]);
return (GetClassWord(pWnd->hwndSelf, GCW_ATOM) == bicAtomTable[cls]);
}

View File

@ -19,7 +19,6 @@
#endif
#include "winbase.h"
#include "class.h"
#include "module.h"
#include "task.h"
#include "options.h"
@ -290,7 +289,7 @@ break_command:
info_command:
tINFO tBREAK tEOL { DEBUG_InfoBreakpoints(); }
| tINFO tCLASS expr_value tEOL { CLASS_DumpClass( (CLASS *)$3 );
| tINFO tCLASS expr_value tEOL { CLASS_DumpClass( (struct tagCLASS *)$3 );
DEBUG_FreeExprMem(); }
| tINFO tSHARE tEOL { DEBUG_InfoShare(); }
| tINFO tMODULE expr_value tEOL { NE_DumpModule( $3 );

View File

@ -11,7 +11,7 @@
#include "toolhelp.h"
#include "module.h"
#include "debugger.h"
#include "class.h"
#include "win.h"
#include "debugger.h"
#include "peexe.h"
@ -51,7 +51,7 @@ int PROFILE_GetWineIniString( const char *section, const char *key_name,
}
void CLASS_DumpClass( CLASS *class )
void CLASS_DumpClass( struct tagCLASS *class )
{
exit(0);
}

View File

@ -14,7 +14,6 @@
#include "wine/winbase16.h"
#include "windef.h"
#include "winerror.h"
#include "class.h"
#include "file.h"
#include "global.h"
#include "heap.h"

View File

@ -647,7 +647,7 @@ const char *SPY_GetWndName( HWND hwnd )
INT len;
*(p++)='{';
GlobalGetAtomNameA( pWnd->class->atomName, p, n + 1);
GlobalGetAtomNameA((ATOM) GetClassWord(pWnd->hwndSelf, GCW_ATOM), p, n + 1);
src = p += (len = lstrlenA(p));
if( len >= n ) src = wnd_buffer; /* something nonzero */
postfix = '}';

View File

@ -180,7 +180,7 @@ static DWORD MSG_TranslateMouseMsg( HWND hTopWnd, DWORD first, DWORD last,
* note that ...MOUSEMOVEs can slip in between
* ...BUTTONDOWN and ...BUTTONDBLCLK messages */
if( pWnd->class->style & CS_DBLCLKS || ht != HTCLIENT )
if(GetClassLongA(hWnd, GCL_STYLE) & CS_DBLCLKS || ht != HTCLIENT )
{
if ((message == clk_message) && (hWnd == clk_hwnd) &&
(msg->time - dblclk_time_limit < doubleClickSpeed) &&
@ -1091,7 +1091,7 @@ static BOOL MSG_PeekMessage( LPMSG msg, HWND hwnd, DWORD first, DWORD last,
if ((wndPtr = WIN_FindWndPtr(msg->hwnd)))
{
if( wndPtr->dwStyle & WS_MINIMIZE &&
wndPtr->class->hIcon )
(HICON) GetClassLongA(wndPtr->hwndSelf, GCL_HICON) )
{
msg->message = WM_PAINTICON;
msg->wParam = 1;

View File

@ -170,7 +170,7 @@ HDC16 WINAPI BeginPaint16( HWND16 hwnd, LPPAINTSTRUCT16 lps )
WND *wndPtr = WIN_FindWndPtr( hwnd );
if (!wndPtr) return 0;
bIcon = (wndPtr->dwStyle & WS_MINIMIZE && wndPtr->class->hIcon);
bIcon = (wndPtr->dwStyle & WS_MINIMIZE && GetClassWord(wndPtr->hwndSelf, GCW_HICON));
wndPtr->flags &= ~WIN_NEEDS_BEGINPAINT;
@ -187,7 +187,7 @@ HDC16 WINAPI BeginPaint16( HWND16 hwnd, LPPAINTSTRUCT16 lps )
TRACE_(win)("hrgnUpdate = %04x, \n", hrgnUpdate);
if (wndPtr->class->style & CS_PARENTDC)
if (GetClassWord16(wndPtr->hwndSelf, GCW_STYLE) & CS_PARENTDC)
{
/* Don't clip the output to the update region for CS_PARENTDC window */
if( hrgnUpdate )
@ -545,7 +545,7 @@ static HRGN RDW_Paint( WND* wndPtr, HRGN hrgn, UINT flags, UINT ex )
*/
HDC hDC;
HWND hWnd = wndPtr->hwndSelf;
BOOL bIcon = ((wndPtr->dwStyle & WS_MINIMIZE) && wndPtr->class->hIcon);
BOOL bIcon = ((wndPtr->dwStyle & WS_MINIMIZE) && GetClassWord(wndPtr->hwndSelf, GCW_HICON));
/* Erase/update the window itself ... */
@ -913,7 +913,7 @@ BOOL WINAPI GetUpdateRect( HWND hwnd, LPRECT rect, BOOL erase )
}
GetRgnBox( hrgn, rect );
DeleteObject( hrgn );
if (wndPtr->class->style & CS_OWNDC)
if (GetClassLongA(wndPtr->hwndSelf, GCL_STYLE) & CS_OWNDC)
{
if (GetMapMode(wndPtr->dce->hDC) != MM_TEXT)
{

View File

@ -10,7 +10,6 @@
#include <stdlib.h>
#include "winuser.h"
#include "class.h"
#include "dc.h"
#include "win.h"
#include "gdi.h"

View File

@ -25,7 +25,6 @@
#include "shell.h"
#include "callback.h"
#include "local.h"
#include "class.h"
#include "desktop.h"
#include "process.h"
#include "debugtools.h"

View File

@ -17,7 +17,6 @@
#include <assert.h>
#include <string.h>
#include "callback.h"
#include "class.h"
#include "clipboard.h"
#include "dce.h"
#include "dde_proc.h"