diff options
| author | Tor Lillqvist <tml@novell.com> | 2005-03-18 10:21:51 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2005-03-18 10:21:51 +0000 |
| commit | e4515f4dba768f1f4bfe59420ae0779a0b15fd21 (patch) | |
| tree | 8ce80936124bec4eb01715e563dced1721b661aa /gdk/win32 | |
| parent | 368f15ca59c2383346c5aa2e67142c6b5ced0766 (diff) | |
| download | gdk-pixbuf-e4515f4dba768f1f4bfe59420ae0779a0b15fd21.tar.gz | |
On WM_MOUSEMOVE, don't check if this process owns the active window. This
2005-03-18 Tor Lillqvist <tml@novell.com>
* gdk/win32/gdkevents-win32.c (gdk_event_translate): On
WM_MOUSEMOVE, don't check if this process owns the active
window. This makes cross-application widget embedding work better.
On WM_MOVE, don't bother checking for window visibility.
* gdk/win32/gdkim-win32.c: Remove bogus empty doc comment. Remove
unused variables. Add some casts to silence gcc.
Diffstat (limited to 'gdk/win32')
| -rw-r--r-- | gdk/win32/gdkevents-win32.c | 11 | ||||
| -rw-r--r-- | gdk/win32/gdkim-win32.c | 19 |
2 files changed, 3 insertions, 27 deletions
diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c index 95fcb1fba..ed214cb89 100644 --- a/gdk/win32/gdkevents-win32.c +++ b/gdk/win32/gdkevents-win32.c @@ -2138,8 +2138,6 @@ gdk_event_translate (GdkDisplay *display, MSG *msg, gint *ret_valp) { - DWORD pidActWin; - DWORD pidThis; RECT rect, *drag, orig_drag; POINT point; MINMAXINFO *mmi; @@ -2705,12 +2703,6 @@ gdk_event_translate (GdkDisplay *display, msg->wParam, GET_X_LPARAM (msg->lParam), GET_Y_LPARAM (msg->lParam))); - /* HB: only process mouse move messages if we own the active window. */ - GetWindowThreadProcessId (GetActiveWindow (), &pidActWin); - GetWindowThreadProcessId (msg->hwnd, &pidThis); - if (pidActWin != pidThis) - break; - assign_object (&window, find_window_for_mouse_event (window, msg)); if (p_grab_window != NULL) @@ -3295,8 +3287,7 @@ gdk_event_translate (GdkDisplay *display, GET_X_LPARAM (msg->lParam), GET_Y_LPARAM (msg->lParam))); if (GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD && - !IsIconic (msg->hwnd) && - IsWindowVisible (msg->hwnd)) + !IsIconic (msg->hwnd)) { if (!GDK_WINDOW_DESTROYED (window)) handle_configure_event (msg, window); diff --git a/gdk/win32/gdkim-win32.c b/gdk/win32/gdkim-win32.c index aeb29bf7d..b709653fd 100644 --- a/gdk/win32/gdkim-win32.c +++ b/gdk/win32/gdkim-win32.c @@ -36,19 +36,6 @@ #include "gdki18n.h" #include "gdkwin32.h" -/* - *-------------------------------------------------------------- - * gdk_set_locale - * - * Arguments: - * - * Results: - * - * Side effects: - * - *-------------------------------------------------------------- - */ - gchar* gdk_set_locale (void) { @@ -61,12 +48,10 @@ gdk_set_locale (void) gchar * gdk_wcstombs (const GdkWChar *src) { - gchar *utf8; - gchar *retval; const gchar *charset; g_get_charset (&charset); - return g_convert (src, -1, charset, "UCS-4LE", NULL, NULL, NULL); + return g_convert ((char *) src, -1, charset, "UCS-4LE", NULL, NULL, NULL); } gint @@ -81,7 +66,7 @@ gdk_mbstowcs (GdkWChar *dest, const gchar *charset; g_get_charset (&charset); - ucs4 = g_convert (src, -1, "UCS-4LE", charset, NULL, &nwritten, NULL); + ucs4 = (gunichar *) g_convert (src, -1, "UCS-4LE", charset, NULL, &nwritten, NULL); n_ucs4 = nwritten * sizeof (GdkWChar); retval = MIN (dest_max, n_ucs4); |