[gtk-doc/gtk-doc-for-gtk4: 21/23] Recognize the GTK variants of G_DECLARE_



commit d6e3260e26f66c1bd0270eeebd1d998cd645c6e3
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Dec 23 09:44:35 2019 -0500

    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.

 gtkdoc/scan.py | 6 +++---
 1 file 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


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]