gtk/win32: fix usage of deprecated function
authorMarc-André Lureau <marcandre.lureau@redhat.com>
Tue, 25 Apr 2023 12:27:40 +0000 (16:27 +0400)
committerMarc-André Lureau <marcandre.lureau@redhat.com>
Tue, 25 Apr 2023 12:37:58 +0000 (16:37 +0400)
[106/939] Compiling C object gtk/libgtk.a.p/gtkimcontextime.c.obj
../gtk/gtkimcontextime.c: In function 'gtk_im_context_ime_set_preedit_font':
../gtk/gtkimcontextime.c:780:3: warning: 'gtk_widget_get_style_context' is deprecated [-Wdeprecated-declarations]
  780 |   font_desc = gtk_css_style_get_pango_font (gtk_style_context_lookup_style (gtk_widget_get_style_context (context_ime->client_widget)));

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
gtk/gtkimcontextime.c

index 5db869feacb54f1906694415859c13a409a1a852..801ce4d9ee73a091f39e748c66e40e6a2143017a 100644 (file)
@@ -38,7 +38,7 @@
 #include "gdk/win32/gdkwin32.h"
 #include "gtk/gtkimmodule.h"
 #include "gtk/deprecated/gtkstylecontextprivate.h"
-#include "gtk/gtkcssstyleprivate.h"
+#include "gtkwidgetprivate.h"
 
 /* avoid warning */
 #ifdef STRICT
@@ -728,6 +728,7 @@ gtk_im_context_ime_set_preedit_font (GtkIMContext *context)
   PangoFont *font;
   LOGFONT *logfont;
   PangoFontDescription *font_desc;
+  GtkCssStyle *style;
 
   g_return_if_fail (GTK_IS_IM_CONTEXT_IME (context));
 
@@ -777,7 +778,8 @@ gtk_im_context_ime_set_preedit_font (GtkIMContext *context)
       lang = ""; break;
     }
 
-  font_desc = gtk_css_style_get_pango_font (gtk_style_context_lookup_style (gtk_widget_get_style_context (context_ime->client_widget)));
+  style = gtk_css_node_get_style (gtk_widget_get_css_node (context_ime->client_widget));
+  font_desc = gtk_css_style_get_pango_font (style);
 
   if (lang[0])
     {