Alexandre Julliard : winex11: Moved the MapNotify handler to event.c.
Alexandre Julliard
julliard at winehq.org
Thu Apr 17 14:43:39 CDT 2008
Module: wine
Branch: master
Commit: 64e812840998ad0cb1a90f805063a4e52dd3023e
URL: http://source.winehq.org/git/wine.git/?a=commit;h=64e812840998ad0cb1a90f805063a4e52dd3023e
Author: Alexandre Julliard <julliard at winehq.org>
Date: Thu Apr 17 16:13:12 2008 +0200
winex11: Moved the MapNotify handler to event.c.
---
dlls/winex11.drv/event.c | 19 +++++++++++++++++++
dlls/winex11.drv/winpos.c | 18 ------------------
dlls/winex11.drv/x11drv.h | 1 -
3 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c
index fc126c2..adbf585 100644
--- a/dlls/winex11.drv/event.c
+++ b/dlls/winex11.drv/event.c
@@ -76,6 +76,7 @@ extern BOOL ximInComposeMode;
static void X11DRV_FocusIn( HWND hwnd, XEvent *event );
static void X11DRV_FocusOut( HWND hwnd, XEvent *event );
static void X11DRV_Expose( HWND hwnd, XEvent *event );
+static void X11DRV_MapNotify( HWND hwnd, XEvent *event );
static void X11DRV_PropertyNotify( HWND hwnd, XEvent *event );
static void X11DRV_ClientMessage( HWND hwnd, XEvent *event );
@@ -711,6 +712,24 @@ static void X11DRV_Expose( HWND hwnd, XEvent *xev )
}
+/**********************************************************************
+ * X11DRV_MapNotify
+ */
+static void X11DRV_MapNotify( HWND hwnd, XEvent *event )
+{
+ struct x11drv_win_data *data;
+
+ if (!(data = X11DRV_get_win_data( hwnd ))) return;
+ if (!data->mapped) return;
+
+ if (!data->managed)
+ {
+ HWND hwndFocus = GetFocus();
+ if (hwndFocus && IsChild( hwnd, hwndFocus )) X11DRV_SetFocus(hwndFocus); /* FIXME */
+ }
+}
+
+
/***********************************************************************
* get_window_wm_state
*/
diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c
index 8c904ad..43d388a 100644
--- a/dlls/winex11.drv/winpos.c
+++ b/dlls/winex11.drv/winpos.c
@@ -478,24 +478,6 @@ void X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, UINT swp_flags,
}
-/**********************************************************************
- * X11DRV_MapNotify
- */
-void X11DRV_MapNotify( HWND hwnd, XEvent *event )
-{
- struct x11drv_win_data *data;
-
- if (!(data = X11DRV_get_win_data( hwnd ))) return;
- if (!data->mapped) return;
-
- if (!data->managed)
- {
- HWND hwndFocus = GetFocus();
- if (hwndFocus && IsChild( hwnd, hwndFocus )) X11DRV_SetFocus(hwndFocus); /* FIXME */
- }
-}
-
-
struct desktop_resize_data
{
RECT old_screen_rect;
diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
index b040e05..30b339e 100644
--- a/dlls/winex11.drv/x11drv.h
+++ b/dlls/winex11.drv/x11drv.h
@@ -642,7 +642,6 @@ extern void X11DRV_EnterNotify( HWND hwnd, XEvent *event );
extern void X11DRV_KeyEvent( HWND hwnd, XEvent *event );
extern void X11DRV_KeymapNotify( HWND hwnd, XEvent *event );
extern void X11DRV_DestroyNotify( HWND hwnd, XEvent *event );
-extern void X11DRV_MapNotify( HWND hwnd, XEvent *event );
extern void X11DRV_ConfigureNotify( HWND hwnd, XEvent *event );
extern void X11DRV_SelectionRequest( HWND hWnd, XEvent *event );
extern void X11DRV_SelectionClear( HWND hWnd, XEvent *event );
More information about the wine-cvs
mailing list