mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-12-25 05:01:09 +00:00
Remove support for Windows 9x/ME. GTK+ hasn't worked on Win9x since 2.6 or
2006-08-29 Tor Lillqvist <tml@novell.com> Remove support for Windows 9x/ME. GTK+ hasn't worked on Win9x since 2.6 or 2.8. It's pointless to keep the Win9x code in here as it isn't being maintained anyway. If somebody is interested, it can always be found in older GTK+ versions, and in CVS. * configure.in * acconfig.h * gdk/Makefile.am * gdk/win32/Makefile.am * gdk/win32/libie55uid.la * gdk/win32/gdkevents-win32.c: Remove the --with-ie55 configure switch and associated stuff. Active IMM and the <dimm.h> header was used for IM support on NT4 and Win9x. Win2k and later have IM support built-in. * gdk/win32/gdkevents-win32.c: Remove the G_WIN32_IS_NT_BASED() and G_WIN32_HAVE_WIDECHAR_API() tests and their false (Win9x) branches, and any variables or static functions used only by the Win9x branches.
This commit is contained in:
Tor Lillqvist
Tor Lillqvist
parent
b7d3f4e4a0
commit
019fece724
41
ChangeLog
41
ChangeLog
@ -1,3 +1,44 @@
|
||||
2006-08-29 Tor Lillqvist <tml@novell.com>
|
||||
|
||||
Remove support for Windows 9x/ME. GTK+ hasn't worked on Win9x
|
||||
since 2.6 or 2.8. It's pointless to keep the Win9x code in here as
|
||||
it isn't being maintained anyway. If somebody is interested, it
|
||||
can always be found in older GTK+ versions, and in CVS.
|
||||
|
||||
* configure.in
|
||||
* acconfig.h
|
||||
* gdk/Makefile.am
|
||||
* gdk/win32/Makefile.am
|
||||
* gdk/win32/libie55uid.la
|
||||
* gdk/win32/gdkevents-win32.c: Remove the --with-ie55 configure
|
||||
switch and associated stuff. Active IMM and the <dimm.h> header
|
||||
was used for IM support on NT4 and Win9x. Win2k and later have IM
|
||||
support built-in.
|
||||
|
||||
* gdk/win32/gdkcursor-win32.c
|
||||
* gdk/win32/gdkdnd-win32.c
|
||||
* gdk/win32/gdkdrawable-win32.c
|
||||
* gdk/win32/gdkevents-win32.c
|
||||
* gdk/win32/gdkgc-win32.c
|
||||
* gdk/win32/gdkglobals-win32.c
|
||||
* gdk/win32/gdkkeys-win32.c
|
||||
* gdk/win32/gdkmain-win32.c
|
||||
* gdk/win32/gdkproperty-win32.c
|
||||
* gdk/win32/gdkselection-win32.c: Remove the G_WIN32_IS_NT_BASED()
|
||||
and G_WIN32_HAVE_WIDECHAR_API() tests and their false (Win9x)
|
||||
branches, and any variables or static functions used only by the
|
||||
Win9x branches.
|
||||
|
||||
* gdk/win32/gdkprivate-win32.h: Remove backup definitions for
|
||||
constants that aren't missing from current mingw and MSVC6
|
||||
headers.
|
||||
|
||||
* gdk/win32/gdkmain-win32.c
|
||||
* gdk/win32/gdkprivate-win32.h: Remove the _gdk_win32_gdi_failed()
|
||||
function. On NT-based Windows GetLastError() returns error codes
|
||||
also for failed GDI calls, so we can use _gdk_win32_api_failed()
|
||||
always.
|
||||
|
||||
2006-08-29 Emmanuele Bassi <ebassi@gnome.org>
|
||||
|
||||
* gtk/gtkrecentchoosermenu.c
|
||||
|
||||
@ -19,7 +19,6 @@
|
||||
#undef GTK_COMPILED_WITH_DEBUGGING
|
||||
|
||||
#undef HAVE_CATGETS
|
||||
#undef HAVE_DIMM_H
|
||||
#undef HAVE_GETTEXT
|
||||
#undef HAVE_IPC_H
|
||||
#undef HAVE_LC_MESSAGES
|
||||
|
||||
43
configure.in
43
configure.in
@ -214,10 +214,6 @@ AC_ARG_WITH(xinput,
|
||||
AC_ARG_WITH(wintab,
|
||||
[AC_HELP_STRING([--with-wintab=DIRECTORY],
|
||||
[use Wintab API with win32 backend])])
|
||||
AC_ARG_WITH(ie55,
|
||||
[AC_HELP_STRING([--with-ie55=DIRECTORY],
|
||||
[IE5.5 libs and headers (for Active IMM)])])
|
||||
|
||||
if test "$platform_win32" = yes; then
|
||||
gdktarget=win32
|
||||
else
|
||||
@ -571,45 +567,6 @@ AC_CHECK_HEADERS(pwd.h, AC_DEFINE(HAVE_PWD_H))
|
||||
AC_CHECK_HEADERS(sys/time.h, AC_DEFINE(HAVE_SYS_TIME_H))
|
||||
AC_CHECK_HEADERS(unistd.h, AC_DEFINE(HAVE_UNISTD_H))
|
||||
|
||||
if test "${with_ie55+set}" = set && test $with_ie55 != no; then
|
||||
AC_MSG_CHECKING([for dimm.h])
|
||||
saved_CFLAGS="$CFLAGS"
|
||||
CFLAGS="$CFLAGS -idirafter $with_ie55/Include"
|
||||
AC_TRY_COMPILE([/* The w32api imm.h clashes a bit with the IE5.5 dimm.h */
|
||||
#ifdef __GNUC__
|
||||
#define IMEMENUITEMINFOA hidden_IMEMENUITEMINFOA
|
||||
#define IMEMENUITEMINFOW hidden_IMEMENUITEMINFOW
|
||||
#endif
|
||||
#include <windows.h>
|
||||
#include <objbase.h>
|
||||
#include <imm.h>
|
||||
#ifdef __GNUC__
|
||||
#undef IMEMENUITEMINFOA
|
||||
#undef IMEMENUITEMINFOW
|
||||
#endif
|
||||
#include <dimm.h>
|
||||
],
|
||||
[],
|
||||
[AC_MSG_RESULT(yes)
|
||||
AC_MSG_CHECKING([for IE55 uuid.lib])
|
||||
if test -f $with_ie55/Lib/uuid.lib ; then
|
||||
AC_MSG_RESULT(yes)
|
||||
have_ie55=yes
|
||||
AC_DEFINE(HAVE_DIMM_H)
|
||||
IE55_UUID_LIB="$with_ie55/Lib/uuid.lib"
|
||||
AC_SUBST(IE55_UUID_LIB)
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
CFLAGS="$saved_CFLAGS"
|
||||
have_ie55=no
|
||||
fi
|
||||
],
|
||||
[AC_MSG_RESULT(no)
|
||||
CFLAGS="$saved_CFLAGS"
|
||||
have_ie55=no])
|
||||
fi
|
||||
AM_CONDITIONAL(HAVE_IE55, test x$have_ie55 = xyes)
|
||||
|
||||
if test "${with_wintab+set}" = set && test $with_wintab != no; then
|
||||
AC_MSG_CHECKING([for wintab.h])
|
||||
saved_CFLAGS="$CFLAGS"
|
||||
|
||||
@ -162,9 +162,6 @@ libgdk_win32_2_0_la_LDFLAGS = -Wl,win32/rc/gdk-win32-res.o -export-symbols gdk.d
|
||||
if HAVE_WINTAB
|
||||
libgdk_win32_2_0_la_LIBADD += -Lwin32 -lwntab32x
|
||||
endif
|
||||
if HAVE_IE55
|
||||
libgdk_win32_2_0_la_LIBADD += -Lwin32 -lie55uuid
|
||||
endif
|
||||
|
||||
if OS_WIN32
|
||||
install-def-file: gdk.def
|
||||
|
||||
@ -22,14 +22,7 @@ libwntab32x_a = .libs/libwntab32x.a
|
||||
cp $< $@
|
||||
endif
|
||||
|
||||
if HAVE_IE55
|
||||
libie55uuid_a = .libs/libie55uuid.a
|
||||
|
||||
.libs/libie55uuid.a: $(IE55_UUID_LIB)
|
||||
cp $< $@
|
||||
endif
|
||||
|
||||
noinst_DATA = $(libwntab32x_a) $(libie55uuid_a)
|
||||
noinst_DATA = $(libwntab32x_a)
|
||||
|
||||
noinst_LTLIBRARIES = libgdk-win32.la
|
||||
|
||||
@ -38,7 +31,6 @@ SUBDIRS=rc
|
||||
EXTRA_DIST = \
|
||||
bdfcursor.c \
|
||||
makefile.msc \
|
||||
libie55uuid.la \
|
||||
libwntab32x.la
|
||||
|
||||
libgdk_win32_la_SOURCES = \
|
||||
|
||||
@ -43,12 +43,6 @@
|
||||
|
||||
#include <glib/gprintf.h>
|
||||
|
||||
#if defined (__GNUC__) && defined (HAVE_DIMM_H)
|
||||
/* The w32api imm.h clashes a bit with the IE5.5 dimm.h */
|
||||
# define IMEMENUITEMINFOA hidden_IMEMENUITEMINFOA
|
||||
# define IMEMENUITEMINFOW hidden_IMEMENUITEMINFOW
|
||||
#endif
|
||||
|
||||
#include "gdk.h"
|
||||
#include "gdkprivate-win32.h"
|
||||
#include "gdkinput-win32.h"
|
||||
@ -65,15 +59,6 @@
|
||||
|
||||
#include <imm.h>
|
||||
|
||||
#if defined (__GNUC__) && defined (HAVE_DIMM_H)
|
||||
# undef IMEMENUITEMINFOA
|
||||
# undef IMEMENUITEMINFOW
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_DIMM_H
|
||||
#include <dimm.h>
|
||||
#endif
|
||||
|
||||
#ifndef XBUTTON1
|
||||
#define XBUTTON1 1
|
||||
#define XBUTTON2 2
|
||||
@ -147,11 +132,6 @@ static UINT client_message;
|
||||
static UINT got_gdk_events_message;
|
||||
static HWND modal_win32_dialog = NULL;
|
||||
|
||||
#ifdef HAVE_DIMM_H
|
||||
static IActiveIMMApp *active_imm_app = NULL;
|
||||
static IActiveIMMMessagePumpOwner *active_imm_msgpump_owner = NULL;
|
||||
#endif
|
||||
|
||||
#if 0
|
||||
static HKL latin_locale = NULL;
|
||||
#endif
|
||||
@ -265,9 +245,6 @@ inner_window_procedure (HWND hwnd,
|
||||
{
|
||||
MSG msg;
|
||||
DWORD pos;
|
||||
#ifdef HAVE_DIMM_H
|
||||
LRESULT lres;
|
||||
#endif
|
||||
gint ret_val = 0;
|
||||
|
||||
msg.hwnd = hwnd;
|
||||
@ -293,15 +270,7 @@ inner_window_procedure (HWND hwnd,
|
||||
{
|
||||
/* Otherwise call DefWindowProc(). */
|
||||
GDK_NOTE (EVENTS, g_print (" DefWindowProc"));
|
||||
#ifndef HAVE_DIMM_H
|
||||
return DefWindowProc (hwnd, message, wparam, lparam);
|
||||
#else
|
||||
if (active_imm_app == NULL ||
|
||||
(*active_imm_app->lpVtbl->OnDefWindowProc) (active_imm_app, hwnd, message, wparam, lparam, &lres) == S_FALSE)
|
||||
return DefWindowProc (hwnd, message, wparam, lparam);
|
||||
else
|
||||
return lres;
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
@ -331,9 +300,6 @@ void
|
||||
_gdk_events_init (void)
|
||||
{
|
||||
GSource *source;
|
||||
#ifdef HAVE_DIMM_H
|
||||
HRESULT hres;
|
||||
#endif
|
||||
|
||||
#if 0
|
||||
int i, j, n;
|
||||
@ -443,26 +409,6 @@ _gdk_events_init (void)
|
||||
g_source_add_poll (source, &event_poll_fd);
|
||||
g_source_set_can_recurse (source, TRUE);
|
||||
g_source_attach (source, NULL);
|
||||
|
||||
#ifdef HAVE_DIMM_H
|
||||
hres = CoCreateInstance (&CLSID_CActiveIMM,
|
||||
NULL,
|
||||
CLSCTX_ALL,
|
||||
&IID_IActiveIMMApp,
|
||||
(LPVOID *) &active_imm_app);
|
||||
|
||||
if (hres == S_OK)
|
||||
{
|
||||
GDK_NOTE (EVENTS, g_print ("IActiveIMMApp created %p\n",
|
||||
active_imm_app));
|
||||
(*active_imm_app->lpVtbl->Activate) (active_imm_app, TRUE);
|
||||
|
||||
hres = (*active_imm_app->lpVtbl->QueryInterface) (active_imm_app, &IID_IActiveIMMMessagePumpOwner, (void **) &active_imm_msgpump_owner);
|
||||
GDK_NOTE (EVENTS, g_print ("IActiveIMMMessagePumpOwner created %p\n",
|
||||
active_imm_msgpump_owner));
|
||||
(active_imm_msgpump_owner->lpVtbl->Start) (active_imm_msgpump_owner);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
gboolean
|
||||
@ -902,21 +848,6 @@ build_key_event_state (GdkEvent *event,
|
||||
if (key_state[VK_XBUTTON2] & 0x80)
|
||||
event->key.state |= GDK_BUTTON5_MASK;
|
||||
|
||||
/* Win9x doesn't distinguish between left and right Control and Alt
|
||||
* in the keyboard state as returned by GetKeyboardState(), so we
|
||||
* have to punt, and accept either Control + either Alt to be AltGr.
|
||||
*
|
||||
* Alternatively, we could have some state saved when the Control
|
||||
* and Alt keys messages come in, as the KF_EXTENDED bit in lParam
|
||||
* does indicate correctly whether it is the right Control or Alt
|
||||
* key. But that would be a bit messy.
|
||||
*/
|
||||
if (!G_WIN32_IS_NT_BASED () &&
|
||||
_gdk_keyboard_has_altgr &&
|
||||
key_state[VK_CONTROL] & 0x80 &&
|
||||
key_state[VK_MENU] & 0x80)
|
||||
key_state[VK_LCONTROL] = key_state[VK_RMENU] = 0x80;
|
||||
|
||||
if (_gdk_keyboard_has_altgr &&
|
||||
(key_state[VK_LCONTROL] & 0x80) &&
|
||||
(key_state[VK_RMENU] & 0x80))
|
||||
|
||||
@ -1,31 +0,0 @@
|
||||
# libie55uuid.la - a libtool library file
|
||||
# Generated by hand, compatible with libtool
|
||||
# Just a wrapper for libie55uuid.a, which is just a copy of the IE55 toolkit's
|
||||
# uuid.lib
|
||||
#
|
||||
# The name that we can dlopen(3).
|
||||
dlname=''
|
||||
|
||||
# Names of this library.
|
||||
library_names=''
|
||||
|
||||
# The name of the static archive.
|
||||
old_library='libie55uuid.a'
|
||||
|
||||
# Libraries that this one depends upon.
|
||||
dependency_libs=''
|
||||
|
||||
# Version information
|
||||
current=0
|
||||
age=0
|
||||
revision=0
|
||||
|
||||
# Is this an already installed library?
|
||||
installed=no
|
||||
|
||||
# Files to dlopen/dlpreopen
|
||||
dlopen=''
|
||||
dlpreopen=''
|
||||
|
||||
# Directory that this library needs to be installed in:
|
||||
libdir=''
|
||||
Loading…
Reference in New Issue
Block a user