diff options
| author | Tor Lillqvist <tml@iki.fi> | 2000-10-09 19:49:42 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2000-10-09 19:49:42 +0000 |
| commit | 658b4b1da879a76328b779676b34c0c15b41596d (patch) | |
| tree | c585422c20b397cb79411b2d7e1ab34566118691 /gdk/win32/gdkinput-win32.c | |
| parent | ea708d50f289d7c1494c557596e8dd28b916187e (diff) | |
| download | gtk+-658b4b1da879a76328b779676b34c0c15b41596d.tar.gz | |
Update.
2000-10-09 Tor Lillqvist <tml@iki.fi>
* README.win32: Update.
* gdk/win32/gdkgeometry-win32.c (gdk_window_clip_changed): Add two
lines that had been deleted by mistake (?).
* gdk/win32/gdkcursor-win32.c (gdk_cursor_new_from_pixmap): Handle
also the case fg==white and bg==black (but still not randomly
coloured cursors). Thanks to Wolfgang Sourdeau.
* gdk/win32/*.c: Silence gcc -Wall.
* gtk/gtk.def: Add missing entry points.
Fixes by Hans Breuer:
* gdk/makefile.msc
* gdk/win32/makefile.msc: Update.
* gdk/testgdk.c: If compiling with debugging (with _DEBUG defined,
some MSVC thing, presumably), cause breakpoint on failures. Add
GDK_NOR case. Call g_log_set_always_fatal.
* gdk/win32/gdkwin32id.c (gdk_win32_handle_table_insert): Handle
should be pased by reference.
* gdk/win32/gdkprivate-win32.h: Correct declaration accordingly.
* gdk/win32/*.c: Correct calls to gdk_win32_handle_table_insert.
* gdk/win32/gdkevents-win32.c
* gdk/win32/gdkwindow-win32.c: Handle WM_CREATE.
* gdk/win32/gdkgc-win32.c: Fix mixups of drawable and
implementation object.
* gdk/win32/gdkimage-win32.c (gdk_image_get): Handle drawables,
not just windows.
* gdk/win32/gdkpixmap-win32.c (gdk_pixmap_impl_win32_finalize):
Use the wrapper object.
Diffstat (limited to 'gdk/win32/gdkinput-win32.c')
| -rw-r--r-- | gdk/win32/gdkinput-win32.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/gdk/win32/gdkinput-win32.c b/gdk/win32/gdkinput-win32.c index c1256e4fa5..c6e0c9fed5 100644 --- a/gdk/win32/gdkinput-win32.c +++ b/gdk/win32/gdkinput-win32.c @@ -31,6 +31,7 @@ #include <stdio.h> #include <math.h> +#include "gdk.h" #include "gdkinput.h" #include "gdkinternals.h" #include "gdkprivate-win32.h" @@ -84,9 +85,6 @@ gdk_device_get_history (GdkDevice *device, GdkTimeCoord ***events, gint *n_events) { - GdkTimeCoord **coords; - int i; - g_return_val_if_fail (window != NULL, FALSE); g_return_val_if_fail (GDK_IS_WINDOW (window), FALSE); g_return_val_if_fail (events != NULL, FALSE); @@ -720,7 +718,9 @@ _gdk_input_other_event (GdkEvent *event, GdkWindow *window) { #ifdef HAVE_WINTAB +#if !USE_SYSCONTEXT GdkWindow *current_window; +#endif GdkWindowObject *obj; GdkWindowImplWin32 *impl; GdkInputWindow *input_window; @@ -729,7 +729,6 @@ _gdk_input_other_event (GdkEvent *event, POINT pt; PACKET packet; - gint return_val; gint k; gint x, y; @@ -892,7 +891,7 @@ _gdk_input_other_event (GdkEvent *event, & (GDK_BUTTON1_MASK | GDK_BUTTON2_MASK | GDK_BUTTON3_MASK | GDK_BUTTON4_MASK | GDK_BUTTON5_MASK)); - GDK_NOTE (EVENTS, g_print ("WINTAB button %s:%d %g,%g %g %g,%g\n", + GDK_NOTE (EVENTS, g_print ("WINTAB button %s:%d %g,%g\n", (event->button.type == GDK_BUTTON_PRESS ? "press" : "release"), event->button.button, |