gtk2 0.90.7 → 0.90.8
Sign up to get free protection for your applications and to get access to all the features.
- data/ChangeLog +62 -0
- data/ext/gtk2/extconf.rb +2 -2
- data/ext/gtk2/rbgdk.c +30 -61
- data/ext/gtk2/rbgdkatom.c +6 -14
- data/ext/gtk2/rbgdkcairo.c +4 -8
- data/ext/gtk2/rbgdkcolor.c +11 -27
- data/ext/gtk2/rbgdkcolormap.c +8 -16
- data/ext/gtk2/rbgdkcursor.c +5 -12
- data/ext/gtk2/rbgdkdevice.c +16 -32
- data/ext/gtk2/rbgdkdisplay.c +49 -100
- data/ext/gtk2/rbgdkdisplaymanager.c +3 -6
- data/ext/gtk2/rbgdkdragcontext.c +21 -48
- data/ext/gtk2/rbgdkdraw.c +27 -60
- data/ext/gtk2/rbgdkevent.c +51 -113
- data/ext/gtk2/rbgdkgc.c +35 -70
- data/ext/gtk2/rbgdkgeometry.c +24 -50
- data/ext/gtk2/rbgdkimage.c +14 -28
- data/ext/gtk2/rbgdkinput.c +3 -8
- data/ext/gtk2/rbgdkkeymap.c +7 -14
- data/ext/gtk2/rbgdkkeyval.c +9 -18
- data/ext/gtk2/rbgdkpango.c +8 -18
- data/ext/gtk2/rbgdkpangorenderer.c +7 -18
- data/ext/gtk2/rbgdkpixbuf.c +5 -20
- data/ext/gtk2/rbgdkpixmap.c +9 -24
- data/ext/gtk2/rbgdkproperty.c +8 -28
- data/ext/gtk2/rbgdkrectangle.c +12 -24
- data/ext/gtk2/rbgdkregion.c +15 -33
- data/ext/gtk2/rbgdkrgb.c +11 -26
- data/ext/gtk2/rbgdkscreen.c +37 -78
- data/ext/gtk2/rbgdkselection.c +5 -16
- data/ext/gtk2/rbgdkthreads.c +4 -8
- data/ext/gtk2/rbgdktimecoord.c +5 -10
- data/ext/gtk2/rbgdkvisual.c +25 -50
- data/ext/gtk2/rbgdkwindow.c +102 -211
- data/ext/gtk2/rbgdkwindowattr.c +16 -32
- data/ext/gtk2/rbgdkx11.c +5 -12
- data/ext/gtk2/rbgtk.c +9 -10
- data/ext/gtk2/rbgtkaboutdialog.c +5 -12
- data/ext/gtk2/rbgtkaccelerator.c +6 -12
- data/ext/gtk2/rbgtkaccelgroup.c +14 -32
- data/ext/gtk2/rbgtkaccelgroupentry.c +4 -8
- data/ext/gtk2/rbgtkaccelkey.c +7 -14
- data/ext/gtk2/rbgtkaccellabel.c +3 -6
- data/ext/gtk2/rbgtkaccelmap.c +12 -28
- data/ext/gtk2/rbgtkaccessible.c +1 -2
- data/ext/gtk2/rbgtkaction.c +20 -42
- data/ext/gtk2/rbgtkactiongroup.c +15 -39
- data/ext/gtk2/rbgtkadjustment.c +14 -28
- data/ext/gtk2/rbgtkalignment.c +4 -8
- data/ext/gtk2/rbgtkallocation.c +13 -26
- data/ext/gtk2/rbgtkarrow.c +2 -4
- data/ext/gtk2/rbgtkaspectframe.c +2 -4
- data/ext/gtk2/rbgtkassistant.c +23 -47
- data/ext/gtk2/rbgtkbbox.c +2 -4
- data/ext/gtk2/rbgtkbin.c +1 -2
- data/ext/gtk2/rbgtkbindingset.c +8 -18
- data/ext/gtk2/rbgtkborder.c +4 -8
- data/ext/gtk2/rbgtkbox.c +8 -23
- data/ext/gtk2/rbgtkbutton.c +8 -18
- data/ext/gtk2/rbgtkcalendar.c +11 -24
- data/ext/gtk2/rbgtkcelleditable.c +3 -6
- data/ext/gtk2/rbgtkcelllayout.c +9 -22
- data/ext/gtk2/rbgtkcellrenderer.c +8 -19
- data/ext/gtk2/rbgtkcellrendereraccel.c +1 -2
- data/ext/gtk2/rbgtkcellrenderercombo.c +1 -2
- data/ext/gtk2/rbgtkcellrendererpixbuf.c +1 -2
- data/ext/gtk2/rbgtkcellrendererprogress.c +1 -2
- data/ext/gtk2/rbgtkcellrendererspin.c +1 -2
- data/ext/gtk2/rbgtkcellrendererspinner.c +35 -0
- data/ext/gtk2/rbgtkcellrenderertext.c +2 -4
- data/ext/gtk2/rbgtkcellrenderertoggle.c +1 -2
- data/ext/gtk2/rbgtkcellview.c +6 -14
- data/ext/gtk2/rbgtkcheckbutton.c +1 -4
- data/ext/gtk2/rbgtkcheckmenuitem.c +2 -6
- data/ext/gtk2/rbgtkclipboard.c +30 -75
- data/ext/gtk2/rbgtkcolorbutton.c +1 -4
- data/ext/gtk2/rbgtkcolorsel.c +10 -24
- data/ext/gtk2/rbgtkcolorselectiondialog.c +5 -12
- data/ext/gtk2/rbgtkcombo.c +7 -16
- data/ext/gtk2/rbgtkcombobox.c +14 -32
- data/ext/gtk2/rbgtkcomboboxentry.c +1 -4
- data/ext/gtk2/rbgtkcontainer.c +27 -70
- data/ext/gtk2/rbgtkcurve.c +6 -12
- data/ext/gtk2/rbgtkdialog.c +14 -32
- data/ext/gtk2/rbgtkdrag.c +31 -68
- data/ext/gtk2/rbgtkdrawingarea.c +1 -2
- data/ext/gtk2/rbgtkeditable.c +13 -26
- data/ext/gtk2/rbgtkentry.c +7 -14
- data/ext/gtk2/rbgtkentrycompletion.c +10 -23
- data/ext/gtk2/rbgtkeventbox.c +1 -2
- data/ext/gtk2/rbgtkexpander.c +1 -4
- data/ext/gtk2/rbgtkfilechooser.c +30 -60
- data/ext/gtk2/rbgtkfilechooserbutton.c +1 -4
- data/ext/gtk2/rbgtkfilechooserdialog.c +1 -4
- data/ext/gtk2/rbgtkfilechooserwidget.c +1 -4
- data/ext/gtk2/rbgtkfilefilter.c +10 -21
- data/ext/gtk2/rbgtkfilesel.c +14 -30
- data/ext/gtk2/rbgtkfixed.c +5 -10
- data/ext/gtk2/rbgtkfontbutton.c +1 -4
- data/ext/gtk2/rbgtkfontselection.c +1 -2
- data/ext/gtk2/rbgtkfontselectiondialog.c +9 -20
- data/ext/gtk2/rbgtkframe.c +3 -8
- data/ext/gtk2/rbgtkgamma.c +3 -6
- data/ext/gtk2/rbgtkhandlebox.c +2 -4
- data/ext/gtk2/rbgtkhbbox.c +1 -2
- data/ext/gtk2/rbgtkhbox.c +1 -4
- data/ext/gtk2/rbgtkhpaned.c +1 -2
- data/ext/gtk2/rbgtkhruler.c +1 -2
- data/ext/gtk2/rbgtkhscale.c +1 -4
- data/ext/gtk2/rbgtkhscrollbar.c +1 -4
- data/ext/gtk2/rbgtkhseparator.c +1 -2
- data/ext/gtk2/rbgtkiconfactory.c +6 -12
- data/ext/gtk2/rbgtkiconinfo.c +8 -16
- data/ext/gtk2/rbgtkiconset.c +4 -12
- data/ext/gtk2/rbgtkiconsize.c +6 -12
- data/ext/gtk2/rbgtkiconsource.c +17 -34
- data/ext/gtk2/rbgtkicontheme.c +16 -32
- data/ext/gtk2/rbgtkiconview.c +23 -50
- data/ext/gtk2/rbgtkimage.c +3 -10
- data/ext/gtk2/rbgtkimagemenuitem.c +1 -4
- data/ext/gtk2/rbgtkimcontext.c +11 -22
- data/ext/gtk2/rbgtkimcontextsimple.c +2 -4
- data/ext/gtk2/rbgtkimmulticontext.c +2 -4
- data/ext/gtk2/rbgtkinputdialog.c +1 -2
- data/ext/gtk2/rbgtkinvisible.c +3 -8
- data/ext/gtk2/rbgtkitem.c +3 -6
- data/ext/gtk2/rbgtkitemfactory.c +13 -34
- data/ext/gtk2/rbgtklabel.c +10 -26
- data/ext/gtk2/rbgtklayout.c +6 -14
- data/ext/gtk2/rbgtklinkbutton.c +3 -10
- data/ext/gtk2/rbgtkliststore.c +15 -36
- data/ext/gtk2/rbgtkmain.c +32 -68
- data/ext/gtk2/rbgtkmenu.c +21 -46
- data/ext/gtk2/rbgtkmenubar.c +1 -2
- data/ext/gtk2/rbgtkmenuitem.c +12 -26
- data/ext/gtk2/rbgtkmenushell.c +9 -18
- data/ext/gtk2/rbgtkmenutoolbutton.c +2 -8
- data/ext/gtk2/rbgtkmessagedialog.c +4 -10
- data/ext/gtk2/rbgtkmisc.c +4 -8
- data/ext/gtk2/rbgtknotebook.c +53 -79
- data/ext/gtk2/rbgtkobject.c +7 -14
- data/ext/gtk2/rbgtkoptionmenu.c +4 -8
- data/ext/gtk2/rbgtkpaned.c +10 -20
- data/ext/gtk2/rbgtkplug.c +3 -8
- data/ext/gtk2/rbgtkprintsettings.c +1 -4
- data/ext/gtk2/rbgtkprogressbar.c +2 -4
- data/ext/gtk2/rbgtkradioaction.c +4 -8
- data/ext/gtk2/rbgtkradiobutton.c +3 -8
- data/ext/gtk2/rbgtkradiomenuitem.c +4 -10
- data/ext/gtk2/rbgtkradiotoolbutton.c +3 -8
- data/ext/gtk2/rbgtkrange.c +4 -8
- data/ext/gtk2/rbgtkrc.c +16 -34
- data/ext/gtk2/rbgtkrcstyle.c +13 -26
- data/ext/gtk2/rbgtkrecentaction.c +1 -4
- data/ext/gtk2/rbgtkrecentchooser.c +18 -38
- data/ext/gtk2/rbgtkrecentchooserdialog.c +1 -4
- data/ext/gtk2/rbgtkrecentchoosermenu.c +1 -4
- data/ext/gtk2/rbgtkrecentchooserwidget.c +1 -4
- data/ext/gtk2/rbgtkrecentdata.c +7 -14
- data/ext/gtk2/rbgtkrecentfilter.c +14 -29
- data/ext/gtk2/rbgtkrecentfilterinfo.c +11 -22
- data/ext/gtk2/rbgtkrecentinfo.c +21 -42
- data/ext/gtk2/rbgtkrecentmanager.c +11 -24
- data/ext/gtk2/rbgtkruler.c +6 -12
- data/ext/gtk2/rbgtkscale.c +2 -4
- data/ext/gtk2/rbgtkscalebutton.c +6 -14
- data/ext/gtk2/rbgtkscrolledwindow.c +9 -20
- data/ext/gtk2/rbgtkselection.c +10 -22
- data/ext/gtk2/rbgtkselectiondata.c +19 -41
- data/ext/gtk2/rbgtkseparatormenuitem.c +1 -2
- data/ext/gtk2/rbgtkseparatortoolitem.c +1 -2
- data/ext/gtk2/rbgtksettings.c +10 -22
- data/ext/gtk2/rbgtksizegroup.c +4 -8
- data/ext/gtk2/rbgtksocket.c +4 -8
- data/ext/gtk2/rbgtkspinbutton.c +9 -20
- data/ext/gtk2/rbgtkspinner.c +51 -0
- data/ext/gtk2/rbgtkstatusbar.c +7 -14
- data/ext/gtk2/rbgtkstatusicon.c +5 -10
- data/ext/gtk2/rbgtkstock.c +5 -13
- data/ext/gtk2/rbgtkstyle.c +51 -139
- data/ext/gtk2/rbgtktable.c +14 -33
- data/ext/gtk2/rbgtktargetlist.c +9 -18
- data/ext/gtk2/rbgtktearoffmenuitem.c +1 -2
- data/ext/gtk2/rbgtktextappearance.c +11 -22
- data/ext/gtk2/rbgtktextattributes.c +16 -32
- data/ext/gtk2/rbgtktextbuffer.c +69 -162
- data/ext/gtk2/rbgtktextchild.c +3 -8
- data/ext/gtk2/rbgtktextiter.c +34 -81
- data/ext/gtk2/rbgtktextmark.c +7 -14
- data/ext/gtk2/rbgtktexttag.c +4 -10
- data/ext/gtk2/rbgtktexttagtable.c +7 -15
- data/ext/gtk2/rbgtktextview.c +30 -62
- data/ext/gtk2/rbgtktoggleaction.c +4 -8
- data/ext/gtk2/rbgtktogglebutton.c +4 -10
- data/ext/gtk2/rbgtktoggletoolbutton.c +3 -8
- data/ext/gtk2/rbgtktoolbar.c +20 -46
- data/ext/gtk2/rbgtktoolbutton.c +1 -4
- data/ext/gtk2/rbgtktoolitem.c +16 -34
- data/ext/gtk2/rbgtktooltip.c +5 -10
- data/ext/gtk2/rbgtktooltips.c +7 -14
- data/ext/gtk2/rbgtktreeiter.c +14 -29
- data/ext/gtk2/rbgtktreemodel.c +16 -37
- data/ext/gtk2/rbgtktreemodelfilter.c +13 -36
- data/ext/gtk2/rbgtktreemodelsort.c +8 -16
- data/ext/gtk2/rbgtktreepath.c +13 -28
- data/ext/gtk2/rbgtktreerowreference.c +9 -20
- data/ext/gtk2/rbgtktreeselection.c +20 -47
- data/ext/gtk2/rbgtktreesortable.c +7 -18
- data/ext/gtk2/rbgtktreestore.c +17 -40
- data/ext/gtk2/rbgtktreeview.c +58 -138
- data/ext/gtk2/rbgtktreeviewcolumn.c +20 -46
- data/ext/gtk2/rbgtkuimanager.c +12 -26
- data/ext/gtk2/rbgtkvbbox.c +1 -2
- data/ext/gtk2/rbgtkvbox.c +1 -4
- data/ext/gtk2/rbgtkviewport.c +1 -2
- data/ext/gtk2/rbgtkvolumebutton.c +1 -2
- data/ext/gtk2/rbgtkvpaned.c +1 -2
- data/ext/gtk2/rbgtkvruler.c +1 -2
- data/ext/gtk2/rbgtkvscale.c +1 -4
- data/ext/gtk2/rbgtkvscrollbar.c +1 -4
- data/ext/gtk2/rbgtkvseparator.c +1 -2
- data/ext/gtk2/rbgtkwidget.c +126 -264
- data/ext/gtk2/rbgtkwindow.c +69 -142
- data/ext/gtk2/rbgtkwindowgroup.c +3 -6
- data/lib/gtk2/base.rb +1 -2
- data/sample/gtk-demo/main.rb +2 -0
- data/sample/gtk-demo/textview.rb +1 -0
- metadata +15 -17
- data/ext/gtk2/Makefile +0 -169
- data/ext/gtk2/rbgdkkeysyms.h +0 -2174
- data/ext/gtk2/rbgtkinits.c +0 -473
- data/ext/gtk2/ruby-gtk2.pc +0 -3
@@ -15,16 +15,14 @@
|
|
15
15
|
#define _SELF(s) (GTK_TREE_SORTABLE(RVAL2GOBJ(s)))
|
16
16
|
|
17
17
|
static VALUE
|
18
|
-
treesortable_sort_column_changed(self)
|
19
|
-
VALUE self;
|
18
|
+
treesortable_sort_column_changed(VALUE self)
|
20
19
|
{
|
21
20
|
gtk_tree_sortable_sort_column_changed(_SELF(self));
|
22
21
|
return self;
|
23
22
|
}
|
24
23
|
|
25
24
|
static VALUE
|
26
|
-
treesortable_get_sort_column_id(self)
|
27
|
-
VALUE self;
|
25
|
+
treesortable_get_sort_column_id(VALUE self)
|
28
26
|
{
|
29
27
|
gint sort_column_id;
|
30
28
|
GtkSortType order;
|
@@ -43,10 +41,7 @@ treesortable_get_sort_column_id(self)
|
|
43
41
|
}
|
44
42
|
|
45
43
|
static VALUE
|
46
|
-
treesortable_set_sort_column_id(argc, argv, self)
|
47
|
-
int argc;
|
48
|
-
VALUE *argv;
|
49
|
-
VALUE self;
|
44
|
+
treesortable_set_sort_column_id(int argc, VALUE *argv, VALUE self)
|
50
45
|
{
|
51
46
|
gint sort_column_id;
|
52
47
|
GtkSortType order;
|
@@ -64,10 +59,7 @@ treesortable_set_sort_column_id(argc, argv, self)
|
|
64
59
|
}
|
65
60
|
|
66
61
|
static gint
|
67
|
-
sort_func(model, a, b, func)
|
68
|
-
GtkTreeModel *model;
|
69
|
-
GtkTreeIter *a, *b;
|
70
|
-
gpointer func;
|
62
|
+
sort_func(GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer func)
|
71
63
|
{
|
72
64
|
a->user_data3 = model;
|
73
65
|
b->user_data3 = model;
|
@@ -76,8 +68,7 @@ sort_func(model, a, b, func)
|
|
76
68
|
}
|
77
69
|
|
78
70
|
static VALUE
|
79
|
-
treesortable_set_sort_func(self, sort_column_id)
|
80
|
-
VALUE self, sort_column_id;
|
71
|
+
treesortable_set_sort_func(VALUE self, VALUE sort_column_id)
|
81
72
|
{
|
82
73
|
volatile VALUE func = rb_block_proc();
|
83
74
|
G_RELATIVE(self, func);
|
@@ -88,8 +79,7 @@ treesortable_set_sort_func(self, sort_column_id)
|
|
88
79
|
}
|
89
80
|
|
90
81
|
static VALUE
|
91
|
-
treesortable_set_default_sort_func(self)
|
92
|
-
VALUE self;
|
82
|
+
treesortable_set_default_sort_func(VALUE self)
|
93
83
|
{
|
94
84
|
volatile VALUE func = rb_block_proc();
|
95
85
|
G_RELATIVE(self, func);
|
@@ -100,8 +90,7 @@ treesortable_set_default_sort_func(self)
|
|
100
90
|
}
|
101
91
|
|
102
92
|
static VALUE
|
103
|
-
treesortable_has_default_sort_func(self)
|
104
|
-
VALUE self;
|
93
|
+
treesortable_has_default_sort_func(VALUE self)
|
105
94
|
{
|
106
95
|
return RVAL2CBOOL(gtk_tree_sortable_has_default_sort_func(_SELF(self)));
|
107
96
|
}
|
data/ext/gtk2/rbgtktreestore.c
CHANGED
@@ -14,10 +14,7 @@
|
|
14
14
|
#define _SELF(s) (GTK_TREE_STORE(RVAL2GOBJ(s)))
|
15
15
|
|
16
16
|
static VALUE
|
17
|
-
tstore_initialize(argc, argv, self)
|
18
|
-
int argc;
|
19
|
-
VALUE* argv;
|
20
|
-
VALUE self;
|
17
|
+
tstore_initialize(int argc, VALUE *argv, VALUE self)
|
21
18
|
{
|
22
19
|
gint cnt;
|
23
20
|
GtkTreeStore* store;
|
@@ -38,10 +35,7 @@ tstore_initialize(argc, argv, self)
|
|
38
35
|
}
|
39
36
|
|
40
37
|
static VALUE
|
41
|
-
tstore_set_column_types(argc, argv, self)
|
42
|
-
int argc;
|
43
|
-
VALUE* argv;
|
44
|
-
VALUE self;
|
38
|
+
tstore_set_column_types(int argc, VALUE *argv, VALUE self)
|
45
39
|
{
|
46
40
|
gint cnt;
|
47
41
|
GType* buf;
|
@@ -58,8 +52,7 @@ tstore_set_column_types(argc, argv, self)
|
|
58
52
|
}
|
59
53
|
|
60
54
|
static VALUE
|
61
|
-
tstore_set_value(self, iter, column, value)
|
62
|
-
VALUE self, iter, column, value;
|
55
|
+
tstore_set_value(VALUE self, VALUE iter, VALUE column, VALUE value)
|
63
56
|
{
|
64
57
|
GType gtype = gtk_tree_model_get_column_type(GTK_TREE_MODEL(RVAL2GOBJ(self)), NUM2INT(column));
|
65
58
|
GValue gval = {0,};
|
@@ -87,8 +80,7 @@ tstore_set_value(self, iter, column, value)
|
|
87
80
|
*/
|
88
81
|
|
89
82
|
static VALUE
|
90
|
-
tstore_remove(self, iter)
|
91
|
-
VALUE self, iter;
|
83
|
+
tstore_remove(VALUE self, VALUE iter)
|
92
84
|
{
|
93
85
|
G_CHILD_REMOVE(self, iter);
|
94
86
|
#if GTK_CHECK_VERSION(2,2,0)
|
@@ -100,10 +92,7 @@ tstore_remove(self, iter)
|
|
100
92
|
}
|
101
93
|
|
102
94
|
static VALUE
|
103
|
-
tstore_insert(argc, argv, self)
|
104
|
-
int argc;
|
105
|
-
VALUE* argv;
|
106
|
-
VALUE self;
|
95
|
+
tstore_insert(int argc, VALUE *argv, VALUE self)
|
107
96
|
{
|
108
97
|
VALUE parent, position, values, ret;
|
109
98
|
GtkTreeIter iter;
|
@@ -189,8 +178,7 @@ tstore_insert(argc, argv, self)
|
|
189
178
|
|
190
179
|
|
191
180
|
static VALUE
|
192
|
-
tstore_insert_before(self, parent, sibling)
|
193
|
-
VALUE self, parent, sibling;
|
181
|
+
tstore_insert_before(VALUE self, VALUE parent, VALUE sibling)
|
194
182
|
{
|
195
183
|
VALUE ret;
|
196
184
|
GtkTreeIter iter;
|
@@ -205,8 +193,7 @@ tstore_insert_before(self, parent, sibling)
|
|
205
193
|
}
|
206
194
|
|
207
195
|
static VALUE
|
208
|
-
tstore_insert_after(self, parent, sibling)
|
209
|
-
VALUE self, parent, sibling;
|
196
|
+
tstore_insert_after(VALUE self, VALUE parent, VALUE sibling)
|
210
197
|
{
|
211
198
|
VALUE ret;
|
212
199
|
GtkTreeIter iter;
|
@@ -243,8 +230,7 @@ void gtk_tree_store_insert_with_valuesv
|
|
243
230
|
*/
|
244
231
|
|
245
232
|
static VALUE
|
246
|
-
tstore_prepend(self, parent)
|
247
|
-
VALUE self, parent;
|
233
|
+
tstore_prepend(VALUE self, VALUE parent)
|
248
234
|
{
|
249
235
|
VALUE ret;
|
250
236
|
GtkTreeIter iter;
|
@@ -259,8 +245,7 @@ tstore_prepend(self, parent)
|
|
259
245
|
}
|
260
246
|
|
261
247
|
static VALUE
|
262
|
-
tstore_append(self, parent)
|
263
|
-
VALUE self, parent;
|
248
|
+
tstore_append(VALUE self, VALUE parent)
|
264
249
|
{
|
265
250
|
VALUE ret;
|
266
251
|
GtkTreeIter iter;
|
@@ -275,23 +260,20 @@ tstore_append(self, parent)
|
|
275
260
|
}
|
276
261
|
|
277
262
|
static VALUE
|
278
|
-
tstore_is_ancestor(self, iter, descendant)
|
279
|
-
VALUE self, iter, descendant;
|
263
|
+
tstore_is_ancestor(VALUE self, VALUE iter, VALUE descendant)
|
280
264
|
{
|
281
265
|
return gtk_tree_store_is_ancestor(_SELF(self), RVAL2GTKTREEITER(iter),
|
282
266
|
RVAL2GTKTREEITER(descendant));
|
283
267
|
}
|
284
268
|
|
285
269
|
static VALUE
|
286
|
-
tstore_iter_depth(self, iter)
|
287
|
-
VALUE self, iter;
|
270
|
+
tstore_iter_depth(VALUE self, VALUE iter)
|
288
271
|
{
|
289
272
|
return INT2NUM(gtk_tree_store_iter_depth(_SELF(self), RVAL2GTKTREEITER(iter)));
|
290
273
|
}
|
291
274
|
|
292
275
|
static VALUE
|
293
|
-
tstore_clear(self)
|
294
|
-
VALUE self;
|
276
|
+
tstore_clear(VALUE self)
|
295
277
|
{
|
296
278
|
G_CHILD_REMOVE_ALL(self);
|
297
279
|
gtk_tree_store_clear(_SELF(self));
|
@@ -299,15 +281,13 @@ tstore_clear(self)
|
|
299
281
|
}
|
300
282
|
#if GTK_CHECK_VERSION(2,2,0)
|
301
283
|
static VALUE
|
302
|
-
tstore_iter_is_valid(self, iter)
|
303
|
-
VALUE self, iter;
|
284
|
+
tstore_iter_is_valid(VALUE self, VALUE iter)
|
304
285
|
{
|
305
286
|
return (NIL_P(iter)) ? Qfalse :
|
306
287
|
CBOOL2RVAL(gtk_tree_store_iter_is_valid(_SELF(self), RVAL2GTKTREEITER(iter)));
|
307
288
|
}
|
308
289
|
static VALUE
|
309
|
-
tstore_reorder(self, parent, new_order)
|
310
|
-
VALUE self, parent, new_order;
|
290
|
+
tstore_reorder(VALUE self, VALUE parent, VALUE new_order)
|
311
291
|
{
|
312
292
|
gint i;
|
313
293
|
gint len = RARRAY_LEN(new_order);
|
@@ -322,23 +302,20 @@ tstore_reorder(self, parent, new_order)
|
|
322
302
|
return self;
|
323
303
|
}
|
324
304
|
static VALUE
|
325
|
-
tstore_swap(self, iter1, iter2)
|
326
|
-
VALUE self, iter1, iter2;
|
305
|
+
tstore_swap(VALUE self, VALUE iter1, VALUE iter2)
|
327
306
|
{
|
328
307
|
gtk_tree_store_swap(_SELF(self), RVAL2GTKTREEITER(iter1), RVAL2GTKTREEITER(iter2));
|
329
308
|
return self;
|
330
309
|
}
|
331
310
|
static VALUE
|
332
|
-
tstore_move_before(self, iter, position)
|
333
|
-
VALUE self, iter, position;
|
311
|
+
tstore_move_before(VALUE self, VALUE iter, VALUE position)
|
334
312
|
{
|
335
313
|
gtk_tree_store_move_before(_SELF(self), RVAL2GTKTREEITER(iter),
|
336
314
|
NIL_P(position) ? NULL : RVAL2GTKTREEITER(position));
|
337
315
|
return self;
|
338
316
|
}
|
339
317
|
static VALUE
|
340
|
-
tstore_move_after(self, iter, position)
|
341
|
-
VALUE self, iter, position;
|
318
|
+
tstore_move_after(VALUE self, VALUE iter, VALUE position)
|
342
319
|
{
|
343
320
|
gtk_tree_store_move_after(_SELF(self), RVAL2GTKTREEITER(iter),
|
344
321
|
NIL_P(position) ? NULL : RVAL2GTKTREEITER(position));
|
data/ext/gtk2/rbgtktreeview.c
CHANGED
@@ -19,10 +19,7 @@ static ID id_model;
|
|
19
19
|
static ID id_selection;
|
20
20
|
|
21
21
|
static VALUE
|
22
|
-
treeview_initialize(argc, argv, self)
|
23
|
-
int argc;
|
24
|
-
VALUE *argv;
|
25
|
-
VALUE self;
|
22
|
+
treeview_initialize(int argc, VALUE *argv, VALUE self)
|
26
23
|
{
|
27
24
|
VALUE model;
|
28
25
|
GtkWidget *widget;
|
@@ -40,8 +37,7 @@ treeview_initialize(argc, argv, self)
|
|
40
37
|
}
|
41
38
|
|
42
39
|
static VALUE
|
43
|
-
treeview_get_selection(self)
|
44
|
-
VALUE self;
|
40
|
+
treeview_get_selection(VALUE self)
|
45
41
|
{
|
46
42
|
VALUE ret = GOBJ2RVAL(gtk_tree_view_get_selection(_SELF(self)));
|
47
43
|
G_CHILD_SET(self, id_selection, ret);
|
@@ -49,16 +45,14 @@ treeview_get_selection(self)
|
|
49
45
|
}
|
50
46
|
|
51
47
|
static VALUE
|
52
|
-
treeview_columns_autosize(self)
|
53
|
-
VALUE self;
|
48
|
+
treeview_columns_autosize(VALUE self)
|
54
49
|
{
|
55
50
|
gtk_tree_view_columns_autosize(_SELF(self));
|
56
51
|
return self;
|
57
52
|
}
|
58
53
|
|
59
54
|
static VALUE
|
60
|
-
treeview_append_column(self, column)
|
61
|
-
VALUE self, column;
|
55
|
+
treeview_append_column(VALUE self, VALUE column)
|
62
56
|
{
|
63
57
|
G_CHILD_ADD(self, column);
|
64
58
|
return INT2NUM(gtk_tree_view_append_column(_SELF(self),
|
@@ -66,8 +60,7 @@ treeview_append_column(self, column)
|
|
66
60
|
}
|
67
61
|
|
68
62
|
static VALUE
|
69
|
-
treeview_remove_column(self, column)
|
70
|
-
VALUE self, column;
|
63
|
+
treeview_remove_column(VALUE self, VALUE column)
|
71
64
|
{
|
72
65
|
G_CHILD_REMOVE(self, column);
|
73
66
|
return INT2NUM(gtk_tree_view_remove_column(_SELF(self),
|
@@ -75,12 +68,7 @@ treeview_remove_column(self, column)
|
|
75
68
|
}
|
76
69
|
|
77
70
|
static void
|
78
|
-
cell_data_func(column, cell, model, iter, func)
|
79
|
-
GtkTreeViewColumn* column;
|
80
|
-
GtkCellRenderer* cell;
|
81
|
-
GtkTreeModel* model;
|
82
|
-
GtkTreeIter* iter;
|
83
|
-
gpointer func;
|
71
|
+
cell_data_func(GtkTreeViewColumn *column, GtkCellRenderer *cell, GtkTreeModel *model, GtkTreeIter *iter, gpointer func)
|
84
72
|
{
|
85
73
|
iter->user_data3 = model;
|
86
74
|
rb_funcall((VALUE)func, id_call, 4, GOBJ2RVAL(column),
|
@@ -89,10 +77,7 @@ cell_data_func(column, cell, model, iter, func)
|
|
89
77
|
}
|
90
78
|
|
91
79
|
static VALUE
|
92
|
-
treeview_insert_column(argc, argv, self)
|
93
|
-
int argc;
|
94
|
-
VALUE* argv;
|
95
|
-
VALUE self;
|
80
|
+
treeview_insert_column(int argc, VALUE *argv, VALUE self)
|
96
81
|
{
|
97
82
|
VALUE args[4];
|
98
83
|
|
@@ -161,22 +146,19 @@ treeview_insert_column(argc, argv, self)
|
|
161
146
|
}
|
162
147
|
|
163
148
|
static VALUE
|
164
|
-
treeview_get_column(self, num)
|
165
|
-
VALUE self, num;
|
149
|
+
treeview_get_column(VALUE self, VALUE num)
|
166
150
|
{
|
167
151
|
return GOBJ2RVAL(gtk_tree_view_get_column(_SELF(self), NUM2INT(num)));
|
168
152
|
}
|
169
153
|
|
170
154
|
static VALUE
|
171
|
-
treeview_get_columns(self)
|
172
|
-
VALUE self;
|
155
|
+
treeview_get_columns(VALUE self)
|
173
156
|
{
|
174
157
|
return GLIST2ARYF(gtk_tree_view_get_columns(_SELF(self)));
|
175
158
|
}
|
176
159
|
|
177
160
|
static VALUE
|
178
|
-
treeview_move_column_after(self, column, base_column)
|
179
|
-
VALUE self, column, base_column;
|
161
|
+
treeview_move_column_after(VALUE self, VALUE column, VALUE base_column)
|
180
162
|
{
|
181
163
|
gtk_tree_view_move_column_after(_SELF(self), TREEVIEW_COL(column),
|
182
164
|
NIL_P(base_column) ? NULL : TREEVIEW_COL(base_column));
|
@@ -184,12 +166,7 @@ treeview_move_column_after(self, column, base_column)
|
|
184
166
|
}
|
185
167
|
|
186
168
|
static gboolean
|
187
|
-
column_drop_func(treeview, column, prev_column, next_column, func)
|
188
|
-
GtkTreeView* treeview;
|
189
|
-
GtkTreeViewColumn* column;
|
190
|
-
GtkTreeViewColumn* prev_column;
|
191
|
-
GtkTreeViewColumn* next_column;
|
192
|
-
gpointer func;
|
169
|
+
column_drop_func(GtkTreeView *treeview, GtkTreeViewColumn *column, GtkTreeViewColumn *prev_column, GtkTreeViewColumn *next_column, gpointer func)
|
193
170
|
{
|
194
171
|
return RVAL2CBOOL(rb_funcall((VALUE)func, id_call, 4, GOBJ2RVAL(treeview),
|
195
172
|
GOBJ2RVAL(column), GOBJ2RVAL(prev_column),
|
@@ -197,8 +174,7 @@ column_drop_func(treeview, column, prev_column, next_column, func)
|
|
197
174
|
}
|
198
175
|
|
199
176
|
static VALUE
|
200
|
-
treeview_set_column_drag_function(self)
|
201
|
-
VALUE self;
|
177
|
+
treeview_set_column_drag_function(VALUE self)
|
202
178
|
{
|
203
179
|
VALUE func = rb_block_proc();
|
204
180
|
G_RELATIVE(self, func);
|
@@ -209,16 +185,14 @@ treeview_set_column_drag_function(self)
|
|
209
185
|
}
|
210
186
|
|
211
187
|
static VALUE
|
212
|
-
treeview_scroll_to_point(self, x, y)
|
213
|
-
VALUE self, x, y;
|
188
|
+
treeview_scroll_to_point(VALUE self, VALUE x, VALUE y)
|
214
189
|
{
|
215
190
|
gtk_tree_view_scroll_to_point(_SELF(self), NUM2INT(x), NUM2INT(y));
|
216
191
|
return self;
|
217
192
|
}
|
218
193
|
|
219
194
|
static VALUE
|
220
|
-
treeview_scroll_to_cell(self, path, column, use_align, row_align, col_align)
|
221
|
-
VALUE self, path, column, use_align, row_align, col_align;
|
195
|
+
treeview_scroll_to_cell(VALUE self, VALUE path, VALUE column, VALUE use_align, VALUE row_align, VALUE col_align)
|
222
196
|
{
|
223
197
|
gtk_tree_view_scroll_to_cell(_SELF(self),
|
224
198
|
NIL_P(path) ? NULL : RVAL2GTKTREEPATH(path),
|
@@ -229,8 +203,7 @@ treeview_scroll_to_cell(self, path, column, use_align, row_align, col_align)
|
|
229
203
|
}
|
230
204
|
|
231
205
|
static VALUE
|
232
|
-
treeview_set_cursor(self, path, focus_column, start_editing)
|
233
|
-
VALUE self, path, focus_column, start_editing;
|
206
|
+
treeview_set_cursor(VALUE self, VALUE path, VALUE focus_column, VALUE start_editing)
|
234
207
|
{
|
235
208
|
gtk_tree_view_set_cursor(_SELF(self), RVAL2GTKTREEPATH(path),
|
236
209
|
NIL_P(focus_column) ? NULL : TREEVIEW_COL(focus_column),
|
@@ -239,8 +212,7 @@ treeview_set_cursor(self, path, focus_column, start_editing)
|
|
239
212
|
}
|
240
213
|
|
241
214
|
static VALUE
|
242
|
-
treeview_get_cursor(self)
|
243
|
-
VALUE self;
|
215
|
+
treeview_get_cursor(VALUE self)
|
244
216
|
{
|
245
217
|
GtkTreePath* path;
|
246
218
|
GtkTreeViewColumn* focus_column;
|
@@ -251,8 +223,7 @@ treeview_get_cursor(self)
|
|
251
223
|
}
|
252
224
|
|
253
225
|
static VALUE
|
254
|
-
treeview_row_activated(self, path, column)
|
255
|
-
VALUE self, path, column;
|
226
|
+
treeview_row_activated(VALUE self, VALUE path, VALUE column)
|
256
227
|
{
|
257
228
|
gtk_tree_view_row_activated(_SELF(self), RVAL2GTKTREEPATH(path),
|
258
229
|
TREEVIEW_COL(column));
|
@@ -260,24 +231,21 @@ treeview_row_activated(self, path, column)
|
|
260
231
|
}
|
261
232
|
|
262
233
|
static VALUE
|
263
|
-
treeview_expand_all(self)
|
264
|
-
VALUE self;
|
234
|
+
treeview_expand_all(VALUE self)
|
265
235
|
{
|
266
236
|
gtk_tree_view_expand_all(_SELF(self));
|
267
237
|
return self;
|
268
238
|
}
|
269
239
|
|
270
240
|
static VALUE
|
271
|
-
treeview_collapse_all(self)
|
272
|
-
VALUE self;
|
241
|
+
treeview_collapse_all(VALUE self)
|
273
242
|
{
|
274
243
|
gtk_tree_view_collapse_all(_SELF(self));
|
275
244
|
return self;
|
276
245
|
}
|
277
246
|
|
278
247
|
static VALUE
|
279
|
-
treeview_expand_row(self, path, open_all)
|
280
|
-
VALUE self, path, open_all;
|
248
|
+
treeview_expand_row(VALUE self, VALUE path, VALUE open_all)
|
281
249
|
{
|
282
250
|
return CBOOL2RVAL(gtk_tree_view_expand_row(_SELF(self),
|
283
251
|
RVAL2GTKTREEPATH(path),
|
@@ -286,8 +254,7 @@ treeview_expand_row(self, path, open_all)
|
|
286
254
|
|
287
255
|
#if GTK_CHECK_VERSION(2,2,0)
|
288
256
|
static VALUE
|
289
|
-
treeview_expand_to_path(self, path)
|
290
|
-
VALUE self, path;
|
257
|
+
treeview_expand_to_path(VALUE self, VALUE path)
|
291
258
|
{
|
292
259
|
gtk_tree_view_expand_to_path(_SELF(self), RVAL2GTKTREEPATH(path));
|
293
260
|
return self;
|
@@ -295,26 +262,21 @@ treeview_expand_to_path(self, path)
|
|
295
262
|
#endif
|
296
263
|
|
297
264
|
static VALUE
|
298
|
-
treeview_collapse_row(self, path)
|
299
|
-
VALUE self, path;
|
265
|
+
treeview_collapse_row(VALUE self, VALUE path)
|
300
266
|
{
|
301
267
|
return CBOOL2RVAL(gtk_tree_view_collapse_row(_SELF(self),
|
302
268
|
RVAL2GTKTREEPATH(path)));
|
303
269
|
}
|
304
270
|
|
305
271
|
static void
|
306
|
-
mapping_func(treeview, path, func)
|
307
|
-
GtkTreeView* treeview;
|
308
|
-
GtkTreePath* path;
|
309
|
-
gpointer func;
|
272
|
+
mapping_func(GtkTreeView *treeview, GtkTreePath *path, gpointer func)
|
310
273
|
{
|
311
274
|
rb_funcall((VALUE)func, id_call, 2, GOBJ2RVAL(treeview),
|
312
275
|
GTKTREEPATH2RVAL(path));
|
313
276
|
}
|
314
277
|
|
315
278
|
static VALUE
|
316
|
-
treeview_map_expanded_rows(self)
|
317
|
-
VALUE self;
|
279
|
+
treeview_map_expanded_rows(VALUE self)
|
318
280
|
{
|
319
281
|
VALUE func = rb_block_proc();
|
320
282
|
G_RELATIVE(self, func);
|
@@ -325,16 +287,14 @@ treeview_map_expanded_rows(self)
|
|
325
287
|
}
|
326
288
|
|
327
289
|
static VALUE
|
328
|
-
treeview_row_expanded(self, path)
|
329
|
-
VALUE self, path;
|
290
|
+
treeview_row_expanded(VALUE self, VALUE path)
|
330
291
|
{
|
331
292
|
return CBOOL2RVAL(gtk_tree_view_row_expanded(_SELF(self),
|
332
293
|
RVAL2GTKTREEPATH(path)));
|
333
294
|
}
|
334
295
|
|
335
296
|
static VALUE
|
336
|
-
treeview_get_path_at_pos(self, x, y)
|
337
|
-
VALUE self, x, y;
|
297
|
+
treeview_get_path_at_pos(VALUE self, VALUE x, VALUE y)
|
338
298
|
{
|
339
299
|
GtkTreePath* path;
|
340
300
|
GtkTreeViewColumn* column;
|
@@ -351,8 +311,7 @@ treeview_get_path_at_pos(self, x, y)
|
|
351
311
|
}
|
352
312
|
|
353
313
|
static VALUE
|
354
|
-
treeview_get_cell_area(self, path, column)
|
355
|
-
VALUE self, path, column;
|
314
|
+
treeview_get_cell_area(VALUE self, VALUE path, VALUE column)
|
356
315
|
{
|
357
316
|
GdkRectangle rect;
|
358
317
|
gtk_tree_view_get_cell_area(_SELF(self),
|
@@ -363,8 +322,7 @@ treeview_get_cell_area(self, path, column)
|
|
363
322
|
}
|
364
323
|
|
365
324
|
static VALUE
|
366
|
-
treeview_get_background_area(self, path, column)
|
367
|
-
VALUE self, path, column;
|
325
|
+
treeview_get_background_area(VALUE self, VALUE path, VALUE column)
|
368
326
|
{
|
369
327
|
GdkRectangle rect;
|
370
328
|
gtk_tree_view_get_background_area(_SELF(self),
|
@@ -375,8 +333,7 @@ treeview_get_background_area(self, path, column)
|
|
375
333
|
}
|
376
334
|
|
377
335
|
static VALUE
|
378
|
-
treeview_get_visible_rect(self)
|
379
|
-
VALUE self;
|
336
|
+
treeview_get_visible_rect(VALUE self)
|
380
337
|
{
|
381
338
|
GdkRectangle rect;
|
382
339
|
gtk_tree_view_get_visible_rect(_SELF(self), &rect);
|
@@ -385,8 +342,7 @@ treeview_get_visible_rect(self)
|
|
385
342
|
|
386
343
|
#if GTK_CHECK_VERSION(2,8,0)
|
387
344
|
static VALUE
|
388
|
-
treeview_get_visible_range(self)
|
389
|
-
VALUE self;
|
345
|
+
treeview_get_visible_range(VALUE self)
|
390
346
|
{
|
391
347
|
GtkTreePath* start_path;
|
392
348
|
GtkTreePath* end_path;
|
@@ -399,15 +355,13 @@ treeview_get_visible_range(self)
|
|
399
355
|
#endif
|
400
356
|
|
401
357
|
static VALUE
|
402
|
-
treeview_get_bin_window(self)
|
403
|
-
VALUE self;
|
358
|
+
treeview_get_bin_window(VALUE self)
|
404
359
|
{
|
405
360
|
return GOBJ2RVAL(gtk_tree_view_get_bin_window(_SELF(self)));
|
406
361
|
}
|
407
362
|
|
408
363
|
static VALUE
|
409
|
-
treeview_widget_to_tree_coords(self, wx, wy)
|
410
|
-
VALUE self, wx, wy;
|
364
|
+
treeview_widget_to_tree_coords(VALUE self, VALUE wx, VALUE wy)
|
411
365
|
{
|
412
366
|
gint tx, ty;
|
413
367
|
gtk_tree_view_widget_to_tree_coords(_SELF(self),
|
@@ -417,8 +371,7 @@ treeview_widget_to_tree_coords(self, wx, wy)
|
|
417
371
|
}
|
418
372
|
|
419
373
|
static VALUE
|
420
|
-
treeview_tree_to_widget_coords(self, tx, ty)
|
421
|
-
VALUE self, tx, ty;
|
374
|
+
treeview_tree_to_widget_coords(VALUE self, VALUE tx, VALUE ty)
|
422
375
|
{
|
423
376
|
gint wx, wy;
|
424
377
|
gtk_tree_view_tree_to_widget_coords(_SELF(self),
|
@@ -429,8 +382,7 @@ treeview_tree_to_widget_coords(self, tx, ty)
|
|
429
382
|
|
430
383
|
#if GTK_CHECK_VERSION(2,12,0)
|
431
384
|
static VALUE
|
432
|
-
treeview_convert_bin_window_to_tree_coords(self, bx, by)
|
433
|
-
VALUE self, bx, by;
|
385
|
+
treeview_convert_bin_window_to_tree_coords(VALUE self, VALUE bx, VALUE by)
|
434
386
|
{
|
435
387
|
gint tx, ty;
|
436
388
|
gtk_tree_view_convert_bin_window_to_tree_coords(_SELF(self),
|
@@ -439,8 +391,7 @@ treeview_convert_bin_window_to_tree_coords(self, bx, by)
|
|
439
391
|
return rb_ary_new3(2, INT2NUM(tx), INT2NUM(ty));
|
440
392
|
}
|
441
393
|
static VALUE
|
442
|
-
treeview_convert_bin_window_to_widget_coords(self, bx, by)
|
443
|
-
VALUE self, bx, by;
|
394
|
+
treeview_convert_bin_window_to_widget_coords(VALUE self, VALUE bx, VALUE by)
|
444
395
|
{
|
445
396
|
gint wx, wy;
|
446
397
|
gtk_tree_view_convert_bin_window_to_widget_coords(_SELF(self),
|
@@ -450,8 +401,7 @@ treeview_convert_bin_window_to_widget_coords(self, bx, by)
|
|
450
401
|
}
|
451
402
|
|
452
403
|
static VALUE
|
453
|
-
treeview_convert_tree_to_bin_window_coords(self, tx, ty)
|
454
|
-
VALUE self, tx, ty;
|
404
|
+
treeview_convert_tree_to_bin_window_coords(VALUE self, VALUE tx, VALUE ty)
|
455
405
|
{
|
456
406
|
gint bx, by;
|
457
407
|
gtk_tree_view_convert_tree_to_bin_window_coords(_SELF(self),
|
@@ -460,8 +410,7 @@ treeview_convert_tree_to_bin_window_coords(self, tx, ty)
|
|
460
410
|
return rb_ary_new3(2, INT2NUM(bx), INT2NUM(by));
|
461
411
|
}
|
462
412
|
static VALUE
|
463
|
-
treeview_convert_tree_to_widget_coords(self, tx, ty)
|
464
|
-
VALUE self, tx, ty;
|
413
|
+
treeview_convert_tree_to_widget_coords(VALUE self, VALUE tx, VALUE ty)
|
465
414
|
{
|
466
415
|
gint wx, wy;
|
467
416
|
gtk_tree_view_convert_tree_to_widget_coords(_SELF(self),
|
@@ -471,8 +420,7 @@ treeview_convert_tree_to_widget_coords(self, tx, ty)
|
|
471
420
|
}
|
472
421
|
|
473
422
|
static VALUE
|
474
|
-
treeview_convert_widget_to_bin_window_coords(self, wx, wy)
|
475
|
-
VALUE self, wx, wy;
|
423
|
+
treeview_convert_widget_to_bin_window_coords(VALUE self, VALUE wx, VALUE wy)
|
476
424
|
{
|
477
425
|
gint bx, by;
|
478
426
|
gtk_tree_view_convert_widget_to_bin_window_coords(_SELF(self),
|
@@ -481,8 +429,7 @@ treeview_convert_widget_to_bin_window_coords(self, wx, wy)
|
|
481
429
|
return rb_ary_new3(2, INT2NUM(bx), INT2NUM(by));
|
482
430
|
}
|
483
431
|
static VALUE
|
484
|
-
treeview_convert_widget_to_tree_coords(self, wx, wy)
|
485
|
-
VALUE self, wx, wy;
|
432
|
+
treeview_convert_widget_to_tree_coords(VALUE self, VALUE wx, VALUE wy)
|
486
433
|
{
|
487
434
|
gint tx, ty;
|
488
435
|
gtk_tree_view_convert_widget_to_tree_coords(_SELF(self),
|
@@ -493,8 +440,7 @@ treeview_convert_widget_to_tree_coords(self, wx, wy)
|
|
493
440
|
#endif
|
494
441
|
|
495
442
|
static VALUE
|
496
|
-
treeview_enable_model_drag_dest(self, targets, actions)
|
497
|
-
VALUE self, targets, actions;
|
443
|
+
treeview_enable_model_drag_dest(VALUE self, VALUE targets, VALUE actions)
|
498
444
|
{
|
499
445
|
const GtkTargetEntry* entries = rbgtk_get_target_entry(targets);
|
500
446
|
int num = RARRAY_LEN(targets);
|
@@ -505,8 +451,7 @@ treeview_enable_model_drag_dest(self, targets, actions)
|
|
505
451
|
}
|
506
452
|
|
507
453
|
static VALUE
|
508
|
-
treeview_enable_model_drag_source(self, start_button_mask, targets, actions)
|
509
|
-
VALUE self, start_button_mask, targets, actions;
|
454
|
+
treeview_enable_model_drag_source(VALUE self, VALUE start_button_mask, VALUE targets, VALUE actions)
|
510
455
|
{
|
511
456
|
GtkTargetEntry* entries = rbgtk_get_target_entry(targets);
|
512
457
|
if (entries){
|
@@ -521,24 +466,21 @@ treeview_enable_model_drag_source(self, start_button_mask, targets, actions)
|
|
521
466
|
}
|
522
467
|
|
523
468
|
static VALUE
|
524
|
-
treeview_unset_rows_drag_source(self)
|
525
|
-
VALUE self;
|
469
|
+
treeview_unset_rows_drag_source(VALUE self)
|
526
470
|
{
|
527
471
|
gtk_tree_view_unset_rows_drag_source(_SELF(self));
|
528
472
|
return self;
|
529
473
|
}
|
530
474
|
|
531
475
|
static VALUE
|
532
|
-
treeview_unset_rows_drag_dest(self)
|
533
|
-
VALUE self;
|
476
|
+
treeview_unset_rows_drag_dest(VALUE self)
|
534
477
|
{
|
535
478
|
gtk_tree_view_unset_rows_drag_dest(_SELF(self));
|
536
479
|
return self;
|
537
480
|
}
|
538
481
|
|
539
482
|
static VALUE
|
540
|
-
treeview_set_drag_dest_row(self, path, pos)
|
541
|
-
VALUE self, path, pos;
|
483
|
+
treeview_set_drag_dest_row(VALUE self, VALUE path, VALUE pos)
|
542
484
|
{
|
543
485
|
gtk_tree_view_set_drag_dest_row(_SELF(self),
|
544
486
|
NIL_P(path)?NULL:RVAL2GTKTREEPATH(path),
|
@@ -547,8 +489,7 @@ treeview_set_drag_dest_row(self, path, pos)
|
|
547
489
|
}
|
548
490
|
|
549
491
|
static VALUE
|
550
|
-
treeview_get_drag_dest_row(self)
|
551
|
-
VALUE self;
|
492
|
+
treeview_get_drag_dest_row(VALUE self)
|
552
493
|
{
|
553
494
|
GtkTreePath* path = NULL;
|
554
495
|
GtkTreeViewDropPosition pos;
|
@@ -558,8 +499,7 @@ treeview_get_drag_dest_row(self)
|
|
558
499
|
}
|
559
500
|
|
560
501
|
static VALUE
|
561
|
-
treeview_get_dest_row_at_pos(self, drag_x, drag_y)
|
562
|
-
VALUE self;
|
502
|
+
treeview_get_dest_row_at_pos(VALUE self, VALUE drag_x, VALUE drag_y)
|
563
503
|
{
|
564
504
|
GtkTreePath* path;
|
565
505
|
GtkTreeViewDropPosition pos;
|
@@ -573,8 +513,7 @@ treeview_get_dest_row_at_pos(self, drag_x, drag_y)
|
|
573
513
|
}
|
574
514
|
|
575
515
|
static VALUE
|
576
|
-
treeview_create_row_drag_icon(self, path)
|
577
|
-
VALUE self, path;
|
516
|
+
treeview_create_row_drag_icon(VALUE self, VALUE path)
|
578
517
|
{
|
579
518
|
return GOBJ2RVAL(gtk_tree_view_create_row_drag_icon(_SELF(self),
|
580
519
|
RVAL2GTKTREEPATH(path)));
|
@@ -587,12 +526,7 @@ treeview_create_row_drag_icon(self, path)
|
|
587
526
|
*/
|
588
527
|
|
589
528
|
static gboolean
|
590
|
-
search_equal_func(model, column, key, iter, func)
|
591
|
-
GtkTreeModel* model;
|
592
|
-
gint column;
|
593
|
-
const gchar* key;
|
594
|
-
GtkTreeIter* iter;
|
595
|
-
gpointer func;
|
529
|
+
search_equal_func(GtkTreeModel *model, gint column, const gchar *key, GtkTreeIter *iter, gpointer func)
|
596
530
|
{
|
597
531
|
iter->user_data3 = model;
|
598
532
|
return RVAL2CBOOL(rb_funcall((VALUE)func, id_call, 4,
|
@@ -601,8 +535,7 @@ search_equal_func(model, column, key, iter, func)
|
|
601
535
|
}
|
602
536
|
|
603
537
|
static VALUE
|
604
|
-
treeview_set_search_equal_func(self)
|
605
|
-
VALUE self;
|
538
|
+
treeview_set_search_equal_func(VALUE self)
|
606
539
|
{
|
607
540
|
VALUE func = rb_block_proc();
|
608
541
|
G_RELATIVE(self, func);
|
@@ -618,9 +551,7 @@ treeview_set_search_equal_func(self)
|
|
618
551
|
* Optional Signals
|
619
552
|
*/
|
620
553
|
static VALUE
|
621
|
-
treeview_signal_func(num, values)
|
622
|
-
guint num;
|
623
|
-
const GValue* values;
|
554
|
+
treeview_signal_func(guint num, const GValue *values)
|
624
555
|
{
|
625
556
|
GtkTreeView* view = g_value_get_object(&values[0]);
|
626
557
|
GtkTreeIter* iter = g_value_get_boxed(&values[1]);
|
@@ -631,8 +562,7 @@ treeview_signal_func(num, values)
|
|
631
562
|
|
632
563
|
#if GTK_CHECK_VERSION(2,2,0)
|
633
564
|
static VALUE
|
634
|
-
treeview_set_cursor_on_cell(self, path, focus_column, focus_cell, start_editing)
|
635
|
-
VALUE self, path, focus_column, focus_cell, start_editing;
|
565
|
+
treeview_set_cursor_on_cell(VALUE self, VALUE path, VALUE focus_column, VALUE focus_cell, VALUE start_editing)
|
636
566
|
{
|
637
567
|
gtk_tree_view_set_cursor_on_cell(_SELF(self), RVAL2GTKTREEPATH(path),
|
638
568
|
NIL_P(focus_column) ? NULL : TREEVIEW_COL(focus_column),
|
@@ -665,10 +595,7 @@ GtkTreeViewRowSeparatorFunc gtk_tree_view_get_row_separator_func
|
|
665
595
|
|
666
596
|
#if GTK_CHECK_VERSION(2,6,0)
|
667
597
|
static gboolean
|
668
|
-
row_separator_func(model, iter, func)
|
669
|
-
GtkTreeModel* model;
|
670
|
-
GtkTreeIter* iter;
|
671
|
-
gpointer* func;
|
598
|
+
row_separator_func(GtkTreeModel *model, GtkTreeIter *iter, gpointer func)
|
672
599
|
{
|
673
600
|
VALUE ret;
|
674
601
|
iter->user_data3 = model;
|
@@ -678,14 +605,13 @@ row_separator_func(model, iter, func)
|
|
678
605
|
}
|
679
606
|
|
680
607
|
static VALUE
|
681
|
-
treeview_set_row_separator_func(self)
|
682
|
-
VALUE self;
|
608
|
+
treeview_set_row_separator_func(VALUE self)
|
683
609
|
{
|
684
610
|
VALUE func = rb_block_proc();
|
685
611
|
|
686
612
|
G_RELATIVE(self, func);
|
687
613
|
gtk_tree_view_set_row_separator_func(_SELF(self),
|
688
|
-
|
614
|
+
row_separator_func,
|
689
615
|
(gpointer)func,
|
690
616
|
(GtkDestroyNotify)NULL);
|
691
617
|
return self;
|
@@ -694,15 +620,13 @@ treeview_set_row_separator_func(self)
|
|
694
620
|
|
695
621
|
#if GTK_CHECK_VERSION(2,10,0)
|
696
622
|
static VALUE
|
697
|
-
treeview_get_search_entry(self)
|
698
|
-
VALUE self;
|
623
|
+
treeview_get_search_entry(VALUE self)
|
699
624
|
{
|
700
625
|
return GOBJ2RVAL(gtk_tree_view_get_search_entry(_SELF(self)));
|
701
626
|
}
|
702
627
|
|
703
628
|
static VALUE
|
704
|
-
treeview_set_search_entry(self, entry)
|
705
|
-
VALUE self, entry;
|
629
|
+
treeview_set_search_entry(VALUE self, VALUE entry)
|
706
630
|
{
|
707
631
|
gtk_tree_view_set_search_entry(_SELF(self), RVAL2GOBJ(entry));
|
708
632
|
return self;
|
@@ -729,10 +653,7 @@ invoke_callback(VALUE data)
|
|
729
653
|
}
|
730
654
|
|
731
655
|
static void
|
732
|
-
search_position_func(tree_view, search_dialog, func)
|
733
|
-
GtkTreeView* tree_view;
|
734
|
-
GtkWidget* search_dialog;
|
735
|
-
gpointer func;
|
656
|
+
search_position_func(GtkTreeView *tree_view, GtkWidget *search_dialog, gpointer func)
|
736
657
|
{
|
737
658
|
struct callback_arg arg;
|
738
659
|
|
@@ -750,8 +671,7 @@ remove_callback_reference(gpointer data)
|
|
750
671
|
|
751
672
|
|
752
673
|
static VALUE
|
753
|
-
treeview_set_search_position_func(self)
|
754
|
-
VALUE self;
|
674
|
+
treeview_set_search_position_func(VALUE self)
|
755
675
|
{
|
756
676
|
VALUE func = rb_block_proc();
|
757
677
|
G_CHILD_ADD(mGtk, func);
|