adapt to current Vala SVN regenerated

2007-03-17  Jürg Billeter  <j@bitron.ch>

	* vapigen/valagidlparser.vala: adapt to current Vala SVN
	* packages/atk/atk.gidl, packages/gtk+-2.0/gtk+-2.0.gidl,
	  packages/pango/pango.gidl: regenerated

svn path=/trunk/; revision=241

diff --git a/vapigen/ChangeLog b/vapigen/ChangeLog
index 11ed35f..88ca135 100644 (file)
--- a/vapigen/ChangeLog
+++ b/vapigen/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-17  Jürg Billeter  <j@bitron.ch>
+
+       * vapigen/valagidlparser.vala: adapt to current Vala SVN
+       * packages/atk/atk.gidl, packages/gtk+-2.0/gtk+-2.0.gidl,
+         packages/pango/pango.gidl: regenerated
+
 2007-02-28  Jürg Billeter  <j@bitron.ch>
 
        * vapigen/valagidlparser.vala: support uchar[]

diff --git a/vapigen/packages/atk/atk.gidl b/vapigen/packages/atk/atk.gidl
index c710115..33dad94 100644 (file)
--- a/vapigen/packages/atk/atk.gidl
+++ b/vapigen/packages/atk/atk.gidl
@@ -2223,6 +2223,9 @@
       <method name="get_instance" symbol="atk_misc_get_instance">
         <return-type type="const-AtkMisc*"/>
       </method>
+      <method name="get_type" symbol="atk_misc_get_type">
+        <return-type type="GType"/>
+      </method>
       <method name="threads_enter" symbol="atk_misc_threads_enter">
         <return-type type="void"/>
         <parameters>

diff --git a/vapigen/packages/gtk+-2.0/gtk+-2.0.gidl b/vapigen/packages/gtk+-2.0/gtk+-2.0.gidl
index 97c2e24..2eb2308 100644 (file)
--- a/vapigen/packages/gtk+-2.0/gtk+-2.0.gidl
+++ b/vapigen/packages/gtk+-2.0/gtk+-2.0.gidl
@@ -621,9 +621,9 @@
       <member name="GTK_TARGET_SAME_WIDGET" value=""/>
     </enum>
     <enum get-type="gtk_text_buffer_target_info_get_type" name="GtkTextBufferTargetInfo" type="enum" type-name="GtkTextBufferTargetInfo">
-      <member name="GTK_TEXT_BUFFER_TARGET_INFO_BUFFER_CONTENTS" value="G_MAXUINT - 0"/>
-      <member name="GTK_TEXT_BUFFER_TARGET_INFO_RICH_TEXT" value="G_MAXUINT - 1"/>
-      <member name="GTK_TEXT_BUFFER_TARGET_INFO_TEXT" value="G_MAXUINT - 2"/>
+      <member name="GTK_TEXT_BUFFER_TARGET_INFO_BUFFER_CONTENTS" value="- 1"/>
+      <member name="GTK_TEXT_BUFFER_TARGET_INFO_RICH_TEXT" value="- 2"/>
+      <member name="GTK_TEXT_BUFFER_TARGET_INFO_TEXT" value="- 3"/>
     </enum>
     <enum get-type="gtk_text_direction_get_type" name="GtkTextDirection" type="enum" type-name="GtkTextDirection">
       <member name="GTK_TEXT_DIR_NONE" value=""/>

diff --git a/vapigen/packages/pango/pango.gidl b/vapigen/packages/pango/pango.gidl
index 25716ba..3e35093 100644 (file)
--- a/vapigen/packages/pango/pango.gidl
+++ b/vapigen/packages/pango/pango.gidl
@@ -2319,7 +2319,14 @@
         <return-type type="HFONT"/>
         <parameters>
           <parameter name="cache" type="PangoWin32FontCache*"/>
-          <parameter name="logfont" type="const-LOGFONT*"/>
+          <parameter name="logfont" type="const-LOGFONTA*"/>
+        </parameters>
+      </method>
+      <method name="loadw" symbol="pango_win32_font_cache_loadw">
+        <return-type type="HFONT"/>
+        <parameters>
+          <parameter name="cache" type="PangoWin32FontCache*"/>
+          <parameter name="logfont" type="const-LOGFONTW*"/>
         </parameters>
       </method>
       <method name="new" symbol="pango_win32_font_cache_new">

diff --git a/vapigen/vapigen/valagidlparser.vala b/vapigen/vapigen/valagidlparser.vala
index b2c534b..086022e 100644 (file)
--- a/vapigen/vapigen/valagidlparser.vala
+++ b/vapigen/vapigen/valagidlparser.vala
@@ -383,7 +383,7 @@ public class Vala.GIdlParser : CodeVisitor {
                foreach (string prereq_name in node.prerequisites) {
                        var prereq = new TypeReference ();
                        parse_type_string (prereq, prereq_name);
-                       iface.add_base_type (prereq);
+                       iface.add_prerequisite (prereq);
                }
 
                current_data_type = iface;
@@ -526,7 +526,7 @@ public class Vala.GIdlParser : CodeVisitor {
        private void parse_type_string (TypeReference! type, string! n) {
                // Generated GIDL misses explicit namespace specifier,
                // so try to guess namespace
-               if (n.has_prefix ("H") || n.has_suffix ("Class") || n == "va_list" || n == "LOGFONT") {
+               if (n.has_prefix ("H") || n.has_suffix ("Class") || n == "va_list" || n.has_prefix ("LOGFONT")) {
                        // unsupported
                        type.type_name = "pointer";
                } else if (n.has_prefix ("cairo")) {
@@ -610,7 +610,17 @@ public class Vala.GIdlParser : CodeVisitor {
                        return_type = parse_param (f.result);
                }
                
-               var m = new Method (node.name, return_type, current_source_reference);
+               Method m;
+               if (f.is_constructor || node.name.has_prefix ("new")) {
+                       m = new CreationMethod (node.name, current_source_reference);
+                       if (m.name == "new") {
+                               m.name = null;
+                       } else if (m.name.has_prefix ("new_")) {
+                               m.name = m.name.offset ("new_".len ());
+                       }
+               } else {
+                       m = new Method (node.name, return_type, current_source_reference);
+               }
                m.access = MemberAccessibility.PUBLIC;
                
                m.is_virtual = is_virtual;
@@ -652,15 +662,6 @@ public class Vala.GIdlParser : CodeVisitor {
                        }
                }
                
-               if (f.is_constructor || m.name.has_prefix ("new")) {
-                       m.construction = true;
-                       if (m.name == "new") {
-                               m.name = null;
-                       } else if (m.name.has_prefix ("new_")) {
-                               m.name = m.name.offset ("new_".len ());
-                       }
-               }
-               
                m.set_cname (f.symbol);
                
                bool first = true;