diff options
| author | Tor Lillqvist <tml@novell.com> | 2007-01-19 01:55:52 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2007-01-19 01:55:52 +0000 |
| commit | f6b4585c98c2cf2588926be0065d4a1e9b909d3e (patch) | |
| tree | 6db15cdcfa73f9e23e81d61c582394abc02961af /gdk/win32/gdkmain-win32.c | |
| parent | f1ce05caa9d04fe67e0872c7b09e35be25c7fc1b (diff) | |
| download | gtk+-f6b4585c98c2cf2588926be0065d4a1e9b909d3e.tar.gz | |
Build Wintab support always on Windows. Don't require the Wintab SDK.
2007-01-19 Tor Lillqvist <tml@novell.com>
Build Wintab support always on Windows. Don't require the Wintab
SDK.
* configure.in: Drop the --with-wintab option. Drop the
HAVE_WINTAB feature test macro and Automake variable.
* acconfig.h
* config.h.win32.in: Drop HAVE_WINTAB.
* gdk/win32/gdkevents-win32.c
* gdk/win32/gdkinput.c
* gdk/win32/gdkinput-win32.h
* gdk/win32/gdkinput-win32.c
* gdk/win32/gdkmain-win32.c: Make HAVE_WINTAB ifdef blocks
unconditional.
* gdk/win32/gdkinput-win32.c (_gdk_input_wintab_init_check): Try
to load wintab32.dll dynamically here. If it is found look up the
handful Wintab functions we use.
(rest of file): Use these function pointers instead of calling the
functions from wntab32x.lib. The code in wntab32x.lib did the same
thing anyway: tried to load wintab32.dll, and looked up the
addresses of the actual functions from it.
* gdk/Makefile.am
* gdk/win32/Makefile.am: Drop the libwntab32x hacks.
* gdk/win32/wintab.h
* gdk/win32/pktdef.h: New files. Copied from the Wintab
SDK. Copyright blurb says: "The text and information contained in
this file may be freely used, copied, or distributed without
compensation or licensing restrictions."
* README.win32: Update a bit. Remove the text about the Wintab
SDK.
svn path=/trunk/; revision=17186
Diffstat (limited to 'gdk/win32/gdkmain-win32.c')
| -rw-r--r-- | gdk/win32/gdkmain-win32.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/gdk/win32/gdkmain-win32.c b/gdk/win32/gdkmain-win32.c index d38db8c1a5..b4fb0e317c 100644 --- a/gdk/win32/gdkmain-win32.c +++ b/gdk/win32/gdkmain-win32.c @@ -79,12 +79,10 @@ _gdk_windowing_init (void) { gchar buf[10]; -#ifdef HAVE_WINTAB if (getenv ("GDK_IGNORE_WINTAB") != NULL) _gdk_input_ignore_wintab = TRUE; else if (getenv ("GDK_USE_WINTAB") != NULL) _gdk_input_ignore_wintab = FALSE; -#endif if (gdk_synchronize) GdiSetBatchLimit (1); @@ -862,11 +860,9 @@ _gdk_win32_message_to_string (UINT msg) CASE (WM_PENWINFIRST); CASE (WM_PENWINLAST); CASE (WM_APP); -#ifdef HAVE_WINTAB CASE (WT_PACKET); CASE (WT_CSRCHANGE); CASE (WT_PROXIMITY); -#endif #undef CASE default: if (msg >= WM_HANDHELDFIRST && msg <= WM_HANDHELDLAST) |