summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Bruno <lucabru@src.gnome.org>2011-10-04 21:39:00 +0200
committerJürg Billeter <j@bitron.ch>2011-11-30 14:19:56 +0100
commit5143263701818f09e9aa429cc2a66b12ecd6f986 (patch)
treea2f7e91b36cf8f005c1b92fc9c56357533524f8c
parent02ed7a68cf87ba51afb26017bad356b6c2d1cac0 (diff)
downloadvala-5143263701818f09e9aa429cc2a66b12ecd6f986.tar.gz
mx-1.0: Fix regression about Draggable and Droppable virtual methods
The regression was introduced by the mx-1.0 switch to GIR. Fixes bug 633902.
-rw-r--r--vapi/metadata/Mx-1.0.metadata7
-rw-r--r--vapi/mx-1.0.vapi10
2 files changed, 12 insertions, 5 deletions
diff --git a/vapi/metadata/Mx-1.0.metadata b/vapi/metadata/Mx-1.0.metadata
index 3ea193829..0e44bd3a3 100644
--- a/vapi/metadata/Mx-1.0.metadata
+++ b/vapi/metadata/Mx-1.0.metadata
@@ -2,6 +2,13 @@ Application.new.argv unowned
BoxLayout
.add_actor name="add_child"
.add_actor_with_properties skip=false
+Draggable
+ .disable#virtual_method virtual
+ .enable#virtual_method virtual
+Droppable
+ .accept_drop#virtual_method virtual
+ .disable#virtual_method virtual
+ .enable#virtual_method virtual
Padding struct
Style.* skip=false
Stylable.get skip=false
diff --git a/vapi/mx-1.0.vapi b/vapi/mx-1.0.vapi
index d4f8a73cd..9565d1da1 100644
--- a/vapi/mx-1.0.vapi
+++ b/vapi/mx-1.0.vapi
@@ -1089,8 +1089,8 @@ namespace Mx {
}
[CCode (cheader_filename = "mx/mx.h", type_id = "mx_draggable_get_type ()")]
public interface Draggable : Clutter.Actor {
- public abstract void disable ();
- public abstract void enable ();
+ public virtual void disable ();
+ public virtual void enable ();
public Mx.DragAxis get_axis ();
public unowned Clutter.Actor get_drag_actor ();
public uint get_drag_threshold ();
@@ -1112,9 +1112,9 @@ namespace Mx {
}
[CCode (cheader_filename = "mx/mx.h", type_id = "mx_droppable_get_type ()")]
public interface Droppable : Clutter.Actor {
- public abstract bool accept_drop (Mx.Draggable draggable);
- public abstract void disable ();
- public abstract void enable ();
+ public virtual bool accept_drop (Mx.Draggable draggable);
+ public virtual void disable ();
+ public virtual void enable ();
public bool is_enabled ();
[NoAccessorMethod]
public abstract bool drop_enabled { get; set; }