ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winex11: Get rid of the __wine_x11_managed property.

This commit is contained in:
Alexandre Julliard 2012-10-15 16:19:09 +02:00
parent 49a5db3869
commit 0f71ff281f
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dlls/winex11.drv/window.c
View File

@ -83,7 +83,6 @@ static Window user_time_window;
static const char foreign_window_prop[] = "__wine_x11_foreign_window"; static const char foreign_window_prop[] = "__wine_x11_foreign_window";
static const char whole_window_prop[] = "__wine_x11_whole_window"; static const char whole_window_prop[] = "__wine_x11_whole_window";
static const char clip_window_prop[] = "__wine_x11_clip_window"; static const char clip_window_prop[] = "__wine_x11_clip_window";
static const char managed_prop[] = "__wine_x11_managed";
static CRITICAL_SECTION win_data_section; static CRITICAL_SECTION win_data_section;
static CRITICAL_SECTION_DEBUG critsect_debug = static CRITICAL_SECTION_DEBUG critsect_debug =
@ -1135,7 +1134,6 @@ void make_window_embedded( struct x11drv_win_data *data )
} }
data->embedded = TRUE; data->embedded = TRUE;
data->managed = TRUE; data->managed = TRUE;
SetPropA( data->hwnd, managed_prop, (HANDLE)1 );
sync_window_style( data ); sync_window_style( data );
set_xembed_flags( data, data->mapped ? XEMBED_MAPPED : 0 ); set_xembed_flags( data, data->mapped ? XEMBED_MAPPED : 0 );
} }
@ -1353,7 +1351,6 @@ static void create_whole_window( struct x11drv_win_data *data )
{ {
TRACE( "making win %p/%lx managed\n", data->hwnd, data->whole_window ); TRACE( "making win %p/%lx managed\n", data->hwnd, data->whole_window );
data->managed = TRUE; data->managed = TRUE;
SetPropA( data->hwnd, managed_prop, (HANDLE)1 );
} }
if ((win_rgn = CreateRectRgn( 0, 0, 0, 0 )) && GetWindowRgn( data->hwnd, win_rgn ) == ERROR) if ((win_rgn = CreateRectRgn( 0, 0, 0, 0 )) && GetWindowRgn( data->hwnd, win_rgn ) == ERROR)
@ -1577,7 +1574,6 @@ static BOOL create_desktop_win_data( Display *display, HWND hwnd )
if (!(data = alloc_win_data( display, hwnd ))) return FALSE; if (!(data = alloc_win_data( display, hwnd ))) return FALSE;
data->whole_window = root_window; data->whole_window = root_window;
data->managed = TRUE; data->managed = TRUE;
SetPropA( data->hwnd, managed_prop, (HANDLE)1 );
SetPropA( data->hwnd, whole_window_prop, (HANDLE)root_window ); SetPropA( data->hwnd, whole_window_prop, (HANDLE)root_window );
set_initial_wm_hints( display, root_window ); set_initial_wm_hints( display, root_window );
release_win_data( data ); release_win_data( data );
@ -1989,11 +1985,7 @@ void CDECL X11DRV_SetParent( HWND hwnd, HWND parent, HWND old_parent )
{ {
/* destroy the old X windows */ /* destroy the old X windows */
destroy_whole_window( data, FALSE ); destroy_whole_window( data, FALSE );
if (data->managed)
{
data->managed = FALSE; data->managed = FALSE;
RemovePropA( data->hwnd, managed_prop );
}
} }
} }
else /* new top level window */ else /* new top level window */
@ -2044,7 +2036,6 @@ void CDECL X11DRV_WindowPosChanging( HWND hwnd, HWND insert_after, UINT swp_flag
unmap_window( hwnd ); unmap_window( hwnd );
if (!(data = get_win_data( hwnd ))) return; if (!(data = get_win_data( hwnd ))) return;
data->managed = TRUE; data->managed = TRUE;
SetPropA( hwnd, managed_prop, (HANDLE)1 );
} }
*visible_rect = *window_rect; *visible_rect = *window_rect;