Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'matthiasc/for-master' into 'master'

Browse Source 
Matthiasc/for master

Closes #3676 and #3675

See merge request GNOME/gtk!3215
This commit is contained in:
Matthias Clasen
2021-02-17 20:49:41 +00:00
parent 7390e2490c 41abda9f03
commit 38da88908d
4 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gsk/gskrendernode.h
View File

@@ -494,6 +494,7 @@ GskRenderNode * gsk_text_node_new (PangoFont
const graphene_point_t *offset);
GDK_AVAILABLE_IN_ALL
PangoFont * gsk_text_node_get_font (const GskRenderNode *node) G_GNUC_PURE;
GDK_AVAILABLE_IN_ALL
gboolean gsk_text_node_has_color_glyphs (const GskRenderNode *node) G_GNUC_PURE;
GDK_AVAILABLE_IN_ALL
guint gsk_text_node_get_num_glyphs (const GskRenderNode *node) G_GNUC_PURE;

2
gtk/gtkimmodule.h
View File

@@ -22,8 +22,6 @@
G_BEGIN_DECLS
void gtk_im_modules_init (void);
#define GTK_IM_MODULE_EXTENSION_POINT_NAME "gtk-im-module"
G_END_DECLS

2
gtk/gtkimmoduleprivate.h
View File

@@ -24,6 +24,8 @@
G_BEGIN_DECLS
void gtk_im_modules_init (void);
void gtk_im_module_ensure_extension_point (void);
GtkIMContext * _gtk_im_module_create (const char *context_id);
const char * _gtk_im_module_get_default_context_id (GdkDisplay *display);

2
gtk/gtkmain.c
View File

@@ -129,7 +129,7 @@
#include "gtkwindowprivate.h"
#include "gtkwindowgroup.h"
#include "gtkprintbackendprivate.h"
#include "gtkimmodule.h"
#include "gtkimmoduleprivate.h"
#include "gtkroot.h"
#include "gtknative.h"
#include "gtkpopcountprivate.h"