diff options
| author | Tor Lillqvist <tml@iki.fi> | 2004-10-01 19:53:55 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2004-10-01 19:53:55 +0000 |
| commit | 8439956a9caa505b280eba27eb75c2f93ec5d0e3 (patch) | |
| tree | 65d4d443b738a4eda185452344779b950e54dd52 /gdk | |
| parent | 49174ac1bea2f26430d9176982b4adf4f0b3dfbc (diff) | |
| download | gdk-pixbuf-8439956a9caa505b280eba27eb75c2f93ec5d0e3.tar.gz | |
Set _gdk_input_ignore_wintab to FALSE, thus enabling tablet input by
2004-10-01 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkglobals-win32.c: Set _gdk_input_ignore_wintab to
FALSE, thus enabling tablet input by default.
* gdk/win32/gdkmain-win32.c (_gdk_windowing_args): Accept the
--use-wintab option again (but without effect, as this is now the
default, see above). (#153788)
* modules/input/gtkimcontextime.c: Numerous changes.
Remove the ifdef UNICODE conditionals. Always use the
wide-character Imm* API. It is present also in Windows 98 and
Me. (Not Windows 95, but I think we don't care about that.) Using
the multibyte API wouldn't work anyway on systems where the system
codepage doesn't support the language the user uses an IME for, so
for instance I wouldn't be able to test this module on my English
Windows 2000 although I do have C, J and K IMEs available.
Guard against IMM not being active, always check ImmGetContext()
returning NULL. Work to some extent even without any IME. Fixes
#153800 at least partially.
* modules/input/imime.c (ime_info): Rename to "ime" to match the
naming pattern of other input modules. Make it default for
ja:ko:zh only.
Diffstat (limited to 'gdk')
| -rw-r--r-- | gdk/win32/gdkglobals-win32.c | 2 | ||||
| -rw-r--r-- | gdk/win32/gdkmain-win32.c | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/gdk/win32/gdkglobals-win32.c b/gdk/win32/gdkglobals-win32.c index aeb6ec526..8a0c7d483 100644 --- a/gdk/win32/gdkglobals-win32.c +++ b/gdk/win32/gdkglobals-win32.c @@ -64,7 +64,7 @@ GdkAtom _wm_transient_for; DWORD _windows_version; -gint _gdk_input_ignore_wintab = TRUE; +gint _gdk_input_ignore_wintab = FALSE; gint _gdk_max_colors = 0; gboolean _sizemove_in_progress = FALSE; diff --git a/gdk/win32/gdkmain-win32.c b/gdk/win32/gdkmain-win32.c index 4edf9bf78..49bbe61b9 100644 --- a/gdk/win32/gdkmain-win32.c +++ b/gdk/win32/gdkmain-win32.c @@ -53,16 +53,17 @@ static gboolean gdk_synchronize = FALSE; +static gboolean dummy; + GOptionEntry _gdk_windowing_args[] = { { "sync", 0, 0, G_OPTION_ARG_NONE, &gdk_synchronize, /* Description of --sync in --help output */ N_("Don't batch GDI requests"), NULL }, { "no-wintab", 0, 0, G_OPTION_ARG_NONE, &_gdk_input_ignore_wintab, - /* Description of --no-wintab in --help output */ N_("Don't use the Wintab API for tablet support [default]"), NULL }, + /* Description of --no-wintab in --help output */ N_("Don't use the Wintab API for tablet support"), NULL }, { "ignore-wintab", 0, 0, G_OPTION_ARG_NONE, &_gdk_input_ignore_wintab, /* Description of --ignore-wintab in --help output */ N_("Same as --no-wintab"), NULL }, -#if 0 - { "use-wintab", 0, 0, G_OPTION_ARG_NONE, &_gdk_input_ignore_wintab, NULL, NULL }, -#endif + { "use-wintab", 0, 0, G_OPTION_ARG_NONE, &dummy, + /* Description of --use-wintab in --help output */ N_("Do use the Wintab API [default]"), NULL }, { "max-colors", 0, 0, G_OPTION_ARG_INT, &_gdk_max_colors, /* Description of --max-colors=COLORS in --help output */ N_("Size of the palette in 8 bit mode"), /* Placeholder in --max-colors=COLORS in --help output */ N_("COLORS") }, |