summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2019-12-23 09:44:35 -0500
committerMatthias Clasen <mclasen@redhat.com>2020-10-01 14:51:04 -0400
commit75b7fb78dae71ed0da54386686974b977ad1caae (patch)
treefa6719b3eaadff7682e77bdf9696a8b478c9c6d7
parentbbc5a01e95de0242c10fbabe81cb78a39f04d7be (diff)
downloadgtk-doc-75b7fb78dae71ed0da54386686974b977ad1caae.tar.gz
Recognize the GTK variants of G_DECLARE_
GTK 4 added its own variant of G_DECLARE_ under the name of GDK_DECLARE_INTERNAL_TYPE. Recognize it.
-rw-r--r--gtkdoc/scan.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/gtkdoc/scan.py b/gtkdoc/scan.py
index 6c6534a..4b5b8a9 100644
--- a/gtkdoc/scan.py
+++ b/gtkdoc/scan.py
@@ -111,8 +111,8 @@ CLINE_MATCHER = [
\s*\=""" % VAR_TYPE_MODIFIER, re.VERBOSE),
# 17: G_DECLARE_*
re.compile(
- r""".*G_DECLARE_
- (FINAL_TYPE|DERIVABLE_TYPE|INTERFACE) # 1: variant
+ r""".*(G_DECLARE_|GDK_DECLARE_)
+ (FINAL_TYPE|DERIVABLE_TYPE|INTERNAL_TYPE|INTERFACE) # 1: variant
\s*\(""", re.VERBOSE),
# 18-21: FUNCTIONS
None, # in InitScanner()
@@ -733,7 +733,7 @@ def ScanHeaderContent(input_lines, decl_list, get_types, options):
elif cm[17]:
in_declaration = 'g-declare'
- symbol = 'G_DECLARE_' + cm[17].group(1)
+ symbol = cm[17].group(1) + cm[17].group(2)
decl = line[cm[17].end():]
# FUNCTIONS