AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'remove-xim' into 'master'

Browse Source 
Remove the XIM input method

See merge request GNOME/gtk!1195
This commit is contained in:
Matthias Clasen 2020-01-03 17:56:26 +00:00
commit 1be9c6aa3f
4 changed files with 0 additions and 1755 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1696
gtk/gtkimcontextxim.c
View File

File diff suppressed because it is too large Load Diff

47
gtk/gtkimcontextxim.h
View File

@ -1,47 +0,0 @@
/* GTK - The GIMP Toolkit
* Copyright (C) 2000 Red Hat Software
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __GTK_IM_CONTEXT_XIM_H__
#define __GTK_IM_CONTEXT_XIM_H__
#include <gtk/gtk.h>
#include "x11/gdkx.h"
G_BEGIN_DECLS
#define GTK_TYPE_IM_CONTEXT_XIM (gtk_im_context_xim_get_type ())
#define GTK_IM_CONTEXT_XIM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_IM_CONTEXT_XIM, GtkIMContextXIM))
#define GTK_IM_CONTEXT_XIM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_IM_CONTEXT_XIM, GtkIMContextXIMClass))
#define GTK_IS_IM_CONTEXT_XIM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_IM_CONTEXT_XIM))
#define GTK_IS_IM_CONTEXT_XIM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_IM_CONTEXT_XIM))
#define GTK_IM_CONTEXT_XIM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_IM_CONTEXT_XIM, GtkIMContextXIMClass))
typedef struct _GtkIMContextXIM GtkIMContextXIM;
typedef struct _GtkIMContextXIMClass GtkIMContextXIMClass;
struct _GtkIMContextXIMClass
{
GtkIMContextClass parent_class;
};
GType gtk_im_context_xim_get_type (void) G_GNUC_CONST;
void gtk_im_context_xim_shutdown (void);
G_END_DECLS
#endif /* __GTK_IM_CONTEXT_XIM_H__ */

11
gtk/gtkimmodule.c
View File

@ -42,7 +42,6 @@
#ifdef GDK_WINDOWING_X11
#include "x11/gdkx.h"
#include "gtkimcontextxim.h"
#endif
#ifdef GDK_WINDOWING_WAYLAND
@ -126,13 +125,6 @@ match_backend (GdkDisplay *display,
return FALSE;
#endif
if (g_strcmp0 (context_id, "xim") == 0)
#ifdef GDK_WINDOWING_X11
return GDK_IS_X11_DISPLAY (display);
#else
return FALSE;
#endif
if (g_strcmp0 (context_id, "ime") == 0)
#ifdef GDK_WINDOWING_WIN32
return GDK_IS_WIN32_DISPLAY (display);
@ -270,9 +262,6 @@ gtk_im_modules_init (void)
gtk_im_module_ensure_extension_point ();
g_type_ensure (gtk_im_context_simple_get_type ());
#ifdef GDK_WINDOWING_X11
g_type_ensure (gtk_im_context_xim_get_type ());
#endif
#ifdef GDK_WINDOWING_WAYLAND
g_type_ensure (gtk_im_context_wayland_get_type ());
#endif

1
gtk/meson.build
View File

@ -735,7 +735,6 @@ endif
if x11_enabled
gtk_sources += ['gtkapplication-x11.c', 'gtkmountoperation-x11.c']
gtk_sources += ['gtkimcontextxim.c']
endif
if wayland_enabled