mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-11-06 16:50:11 +00:00
gtk: Avoid GdkDrawable usage, including needless casts
This commit is contained in:
parent
63808f90a2
commit
a7e6d6c4b4
@ -692,7 +692,7 @@ check_hex (GtkIMContextSimple *context_simple,
|
|||||||
static void
|
static void
|
||||||
beep_window (GdkWindow *window)
|
beep_window (GdkWindow *window)
|
||||||
{
|
{
|
||||||
GdkScreen *screen = gdk_window_get_screen (GDK_DRAWABLE (window));
|
GdkScreen *screen = gdk_window_get_screen (window);
|
||||||
gboolean beep;
|
gboolean beep;
|
||||||
|
|
||||||
g_object_get (gtk_settings_get_for_screen (screen),
|
g_object_get (gtk_settings_get_for_screen (screen),
|
||||||
|
@ -681,9 +681,9 @@ _gtk_im_module_get_default_context_id (GdkWindow *client_window)
|
|||||||
|
|
||||||
/* Check if the certain immodule is set in XSETTINGS.
|
/* Check if the certain immodule is set in XSETTINGS.
|
||||||
*/
|
*/
|
||||||
if (GDK_IS_DRAWABLE (client_window))
|
if (GDK_IS_WINDOW (client_window))
|
||||||
{
|
{
|
||||||
screen = gdk_window_get_screen (GDK_DRAWABLE (client_window));
|
screen = gdk_window_get_screen (client_window);
|
||||||
settings = gtk_settings_get_for_screen (screen);
|
settings = gtk_settings_get_for_screen (screen);
|
||||||
g_object_get (G_OBJECT (settings), "gtk-im-module", &tmp, NULL);
|
g_object_get (G_OBJECT (settings), "gtk-im-module", &tmp, NULL);
|
||||||
if (tmp)
|
if (tmp)
|
||||||
|
@ -297,7 +297,7 @@ gtk_im_multicontext_set_client_window (GtkIMContext *context,
|
|||||||
|
|
||||||
if (window)
|
if (window)
|
||||||
{
|
{
|
||||||
screen = gdk_window_get_screen (GDK_DRAWABLE (window));
|
screen = gdk_window_get_screen (window);
|
||||||
settings = gtk_settings_get_for_screen (screen);
|
settings = gtk_settings_get_for_screen (screen);
|
||||||
|
|
||||||
connected = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (settings),
|
connected = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (settings),
|
||||||
|
Loading…
Reference in New Issue
Block a user