1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
|
From 3e51778fdba36c81204b9eca81e67624c6401972 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Thu, 1 Dec 2011 17:28:38 +0100
Subject: [PATCH] BINDINS/vala: update genlist/gengrid callbacks
s/label_get/text_get/g
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
BINDINGS/vala/examples/elementary/genlist.vala | 2 +-
BINDINGS/vala/vapi/elementary.vapi | 16 ++++++++--------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/examples/elementary/genlist.vala b/examples/elementary/genlist.vala
index b9fb42b..3a4a3b1 100644
--- a/examples/elementary/genlist.vala
+++ b/examples/elementary/genlist.vala
@@ -53,7 +53,7 @@ public class T.Genlist : T.Abstract
public static string getText( Elm.Object obj, string part )
{
int number = (int)obj;
- debug( "label_get: %p", obj );
+ debug( "text_get: %p", obj );
return "This is list item #%d".printf( number );
}
public static Elm.Object? getContent( Elm.Object obj, string part )
diff --git a/vapi/elementary.vapi b/vapi/elementary.vapi
index 8a6cc17..90b50f5c7 100644
--- a/vapi/elementary.vapi
+++ b/vapi/elementary.vapi
@@ -842,7 +842,7 @@ public class MenuItem
public Elm.Object object_get();
public void label_set( string label );
//public void del_cb_set( ... );
- public unowned string label_get();
+ public unowned string text_get();
public void icon_set( Elm.Object icon );
public void disabled_set( bool disabled );
public void* item_data_get();
@@ -908,7 +908,7 @@ public class Slider : Elm.Object
public Slider( Elm.Object? parent );
public void label_set( string label );
- public unowned string label_get();
+ public unowned string text_get();
public void icon_set( Elm.Object icon );
public Elm.Object icon_get();
public void span_size_set( Evas.Coord size );
@@ -931,8 +931,8 @@ public enum GenlistItemFlags
SUBITEMS,
}
-[CCode (cname = "Elm_Gen_Item_Label_Get_Cb", has_target = false)]
-public delegate string GenlistItemLabelGetFunc( Elm.Object obj, string part );
+[CCode (cname = "Elm_Gen_Item_Text_Get_Cb", has_target = false)]
+public delegate string GenlistItemTextGetFunc( Elm.Object obj, string part );
[CCode (cname = "Elm_Gen_Item_Content_Get_Cb", has_target = false)]
public delegate Elm.Object? GenlistItemContentGetFunc( Elm.Object obj, string part );
[CCode (cname = "Elm_Gen_Item_State_Get_Cb", has_target = false)]
@@ -944,7 +944,7 @@ public delegate void GenlistItemDelFunc( Elm.Object obj );
[CCode (cname = "Elm_Gen_Item_Class_Func", destroy_function = "")]
public struct GenlistItemClassFunc
{
- public GenlistItemLabelGetFunc text_get;
+ public GenlistItemTextGetFunc text_get;
public GenlistItemContentGetFunc content_get;
public GenlistItemStateGetFunc state_get;
public GenlistItemDelFunc del;
@@ -1027,7 +1027,7 @@ public class Check : Elm.Object
public Check( Elm.Object? parent );
public void label_set( string label );
- public unowned string label_get();
+ public unowned string text_get();
public void icon_set( Elm.Object icon );
public Elm.Object icon_get();
public void state_set( bool state );
@@ -1044,7 +1044,7 @@ public class Radio : Elm.Object
public Radio( Elm.Object? parent );
public void label_set( string label );
- public unowned string label_get();
+ public unowned string text_get();
public void icon_set( Elm.Object icon );
public Elm.Object icon_get();
public void group_add( Elm.Object group );
@@ -1256,7 +1256,7 @@ public class ListItem
public void selected_set( bool selected );
public void show();
public void* data_get();
- public unowned string label_get();
+ public unowned string text_get();
public void label_set( string label );
public Elm.Object icon_get();
public void icon_set( Elm.Object icon );
--
1.7.8.rc4
|
