Alexandre Julliard : winex11: Get rid of the __wine_x11_managed property.

Alexandre Julliard julliard at winehq.org
Mon Oct 15 14:29:07 CDT 2012


Module: wine
Branch: master
Commit: 0f71ff281fa7422cf8d133fdd8f18c422f7672cd
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=0f71ff281fa7422cf8d133fdd8f18c422f7672cd

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Mon Oct 15 16:19:09 2012 +0200

winex11: Get rid of the __wine_x11_managed property.

---

 dlls/winex11.drv/window.c |   11 +----------
 1 files changed, 1 insertions(+), 10 deletions(-)

diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c
index 8b76441..59957a4 100644
--- a/dlls/winex11.drv/window.c
+++ b/dlls/winex11.drv/window.c
@@ -83,7 +83,6 @@ static Window user_time_window;
 static const char foreign_window_prop[] = "__wine_x11_foreign_window";
 static const char whole_window_prop[] = "__wine_x11_whole_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_DEBUG critsect_debug =
@@ -1135,7 +1134,6 @@ void make_window_embedded( struct x11drv_win_data *data )
     }
     data->embedded = TRUE;
     data->managed = TRUE;
-    SetPropA( data->hwnd, managed_prop, (HANDLE)1 );
     sync_window_style( data );
     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 );
         data->managed = TRUE;
-        SetPropA( data->hwnd, managed_prop, (HANDLE)1 );
     }
 
     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;
     data->whole_window = root_window;
     data->managed = TRUE;
-    SetPropA( data->hwnd, managed_prop, (HANDLE)1 );
     SetPropA( data->hwnd, whole_window_prop, (HANDLE)root_window );
     set_initial_wm_hints( display, root_window );
     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_whole_window( data, FALSE );
-            if (data->managed)
-            {
-                data->managed = FALSE;
-                RemovePropA( data->hwnd, managed_prop );
-            }
+            data->managed = FALSE;
         }
     }
     else  /* new top level window */
@@ -2044,7 +2036,6 @@ void CDECL X11DRV_WindowPosChanging( HWND hwnd, HWND insert_after, UINT swp_flag
         unmap_window( hwnd );
         if (!(data = get_win_data( hwnd ))) return;
         data->managed = TRUE;
-        SetPropA( hwnd, managed_prop, (HANDLE)1 );
     }
 
     *visible_rect = *window_rect;




More information about the wine-cvs mailing list