gtk2 0.90.7 → 0.90.8

Sign up to get free protection for your applications and to get access to all the features.
Files changed (232) hide show
  1. data/ChangeLog +62 -0
  2. data/ext/gtk2/extconf.rb +2 -2
  3. data/ext/gtk2/rbgdk.c +30 -61
  4. data/ext/gtk2/rbgdkatom.c +6 -14
  5. data/ext/gtk2/rbgdkcairo.c +4 -8
  6. data/ext/gtk2/rbgdkcolor.c +11 -27
  7. data/ext/gtk2/rbgdkcolormap.c +8 -16
  8. data/ext/gtk2/rbgdkcursor.c +5 -12
  9. data/ext/gtk2/rbgdkdevice.c +16 -32
  10. data/ext/gtk2/rbgdkdisplay.c +49 -100
  11. data/ext/gtk2/rbgdkdisplaymanager.c +3 -6
  12. data/ext/gtk2/rbgdkdragcontext.c +21 -48
  13. data/ext/gtk2/rbgdkdraw.c +27 -60
  14. data/ext/gtk2/rbgdkevent.c +51 -113
  15. data/ext/gtk2/rbgdkgc.c +35 -70
  16. data/ext/gtk2/rbgdkgeometry.c +24 -50
  17. data/ext/gtk2/rbgdkimage.c +14 -28
  18. data/ext/gtk2/rbgdkinput.c +3 -8
  19. data/ext/gtk2/rbgdkkeymap.c +7 -14
  20. data/ext/gtk2/rbgdkkeyval.c +9 -18
  21. data/ext/gtk2/rbgdkpango.c +8 -18
  22. data/ext/gtk2/rbgdkpangorenderer.c +7 -18
  23. data/ext/gtk2/rbgdkpixbuf.c +5 -20
  24. data/ext/gtk2/rbgdkpixmap.c +9 -24
  25. data/ext/gtk2/rbgdkproperty.c +8 -28
  26. data/ext/gtk2/rbgdkrectangle.c +12 -24
  27. data/ext/gtk2/rbgdkregion.c +15 -33
  28. data/ext/gtk2/rbgdkrgb.c +11 -26
  29. data/ext/gtk2/rbgdkscreen.c +37 -78
  30. data/ext/gtk2/rbgdkselection.c +5 -16
  31. data/ext/gtk2/rbgdkthreads.c +4 -8
  32. data/ext/gtk2/rbgdktimecoord.c +5 -10
  33. data/ext/gtk2/rbgdkvisual.c +25 -50
  34. data/ext/gtk2/rbgdkwindow.c +102 -211
  35. data/ext/gtk2/rbgdkwindowattr.c +16 -32
  36. data/ext/gtk2/rbgdkx11.c +5 -12
  37. data/ext/gtk2/rbgtk.c +9 -10
  38. data/ext/gtk2/rbgtkaboutdialog.c +5 -12
  39. data/ext/gtk2/rbgtkaccelerator.c +6 -12
  40. data/ext/gtk2/rbgtkaccelgroup.c +14 -32
  41. data/ext/gtk2/rbgtkaccelgroupentry.c +4 -8
  42. data/ext/gtk2/rbgtkaccelkey.c +7 -14
  43. data/ext/gtk2/rbgtkaccellabel.c +3 -6
  44. data/ext/gtk2/rbgtkaccelmap.c +12 -28
  45. data/ext/gtk2/rbgtkaccessible.c +1 -2
  46. data/ext/gtk2/rbgtkaction.c +20 -42
  47. data/ext/gtk2/rbgtkactiongroup.c +15 -39
  48. data/ext/gtk2/rbgtkadjustment.c +14 -28
  49. data/ext/gtk2/rbgtkalignment.c +4 -8
  50. data/ext/gtk2/rbgtkallocation.c +13 -26
  51. data/ext/gtk2/rbgtkarrow.c +2 -4
  52. data/ext/gtk2/rbgtkaspectframe.c +2 -4
  53. data/ext/gtk2/rbgtkassistant.c +23 -47
  54. data/ext/gtk2/rbgtkbbox.c +2 -4
  55. data/ext/gtk2/rbgtkbin.c +1 -2
  56. data/ext/gtk2/rbgtkbindingset.c +8 -18
  57. data/ext/gtk2/rbgtkborder.c +4 -8
  58. data/ext/gtk2/rbgtkbox.c +8 -23
  59. data/ext/gtk2/rbgtkbutton.c +8 -18
  60. data/ext/gtk2/rbgtkcalendar.c +11 -24
  61. data/ext/gtk2/rbgtkcelleditable.c +3 -6
  62. data/ext/gtk2/rbgtkcelllayout.c +9 -22
  63. data/ext/gtk2/rbgtkcellrenderer.c +8 -19
  64. data/ext/gtk2/rbgtkcellrendereraccel.c +1 -2
  65. data/ext/gtk2/rbgtkcellrenderercombo.c +1 -2
  66. data/ext/gtk2/rbgtkcellrendererpixbuf.c +1 -2
  67. data/ext/gtk2/rbgtkcellrendererprogress.c +1 -2
  68. data/ext/gtk2/rbgtkcellrendererspin.c +1 -2
  69. data/ext/gtk2/rbgtkcellrendererspinner.c +35 -0
  70. data/ext/gtk2/rbgtkcellrenderertext.c +2 -4
  71. data/ext/gtk2/rbgtkcellrenderertoggle.c +1 -2
  72. data/ext/gtk2/rbgtkcellview.c +6 -14
  73. data/ext/gtk2/rbgtkcheckbutton.c +1 -4
  74. data/ext/gtk2/rbgtkcheckmenuitem.c +2 -6
  75. data/ext/gtk2/rbgtkclipboard.c +30 -75
  76. data/ext/gtk2/rbgtkcolorbutton.c +1 -4
  77. data/ext/gtk2/rbgtkcolorsel.c +10 -24
  78. data/ext/gtk2/rbgtkcolorselectiondialog.c +5 -12
  79. data/ext/gtk2/rbgtkcombo.c +7 -16
  80. data/ext/gtk2/rbgtkcombobox.c +14 -32
  81. data/ext/gtk2/rbgtkcomboboxentry.c +1 -4
  82. data/ext/gtk2/rbgtkcontainer.c +27 -70
  83. data/ext/gtk2/rbgtkcurve.c +6 -12
  84. data/ext/gtk2/rbgtkdialog.c +14 -32
  85. data/ext/gtk2/rbgtkdrag.c +31 -68
  86. data/ext/gtk2/rbgtkdrawingarea.c +1 -2
  87. data/ext/gtk2/rbgtkeditable.c +13 -26
  88. data/ext/gtk2/rbgtkentry.c +7 -14
  89. data/ext/gtk2/rbgtkentrycompletion.c +10 -23
  90. data/ext/gtk2/rbgtkeventbox.c +1 -2
  91. data/ext/gtk2/rbgtkexpander.c +1 -4
  92. data/ext/gtk2/rbgtkfilechooser.c +30 -60
  93. data/ext/gtk2/rbgtkfilechooserbutton.c +1 -4
  94. data/ext/gtk2/rbgtkfilechooserdialog.c +1 -4
  95. data/ext/gtk2/rbgtkfilechooserwidget.c +1 -4
  96. data/ext/gtk2/rbgtkfilefilter.c +10 -21
  97. data/ext/gtk2/rbgtkfilesel.c +14 -30
  98. data/ext/gtk2/rbgtkfixed.c +5 -10
  99. data/ext/gtk2/rbgtkfontbutton.c +1 -4
  100. data/ext/gtk2/rbgtkfontselection.c +1 -2
  101. data/ext/gtk2/rbgtkfontselectiondialog.c +9 -20
  102. data/ext/gtk2/rbgtkframe.c +3 -8
  103. data/ext/gtk2/rbgtkgamma.c +3 -6
  104. data/ext/gtk2/rbgtkhandlebox.c +2 -4
  105. data/ext/gtk2/rbgtkhbbox.c +1 -2
  106. data/ext/gtk2/rbgtkhbox.c +1 -4
  107. data/ext/gtk2/rbgtkhpaned.c +1 -2
  108. data/ext/gtk2/rbgtkhruler.c +1 -2
  109. data/ext/gtk2/rbgtkhscale.c +1 -4
  110. data/ext/gtk2/rbgtkhscrollbar.c +1 -4
  111. data/ext/gtk2/rbgtkhseparator.c +1 -2
  112. data/ext/gtk2/rbgtkiconfactory.c +6 -12
  113. data/ext/gtk2/rbgtkiconinfo.c +8 -16
  114. data/ext/gtk2/rbgtkiconset.c +4 -12
  115. data/ext/gtk2/rbgtkiconsize.c +6 -12
  116. data/ext/gtk2/rbgtkiconsource.c +17 -34
  117. data/ext/gtk2/rbgtkicontheme.c +16 -32
  118. data/ext/gtk2/rbgtkiconview.c +23 -50
  119. data/ext/gtk2/rbgtkimage.c +3 -10
  120. data/ext/gtk2/rbgtkimagemenuitem.c +1 -4
  121. data/ext/gtk2/rbgtkimcontext.c +11 -22
  122. data/ext/gtk2/rbgtkimcontextsimple.c +2 -4
  123. data/ext/gtk2/rbgtkimmulticontext.c +2 -4
  124. data/ext/gtk2/rbgtkinputdialog.c +1 -2
  125. data/ext/gtk2/rbgtkinvisible.c +3 -8
  126. data/ext/gtk2/rbgtkitem.c +3 -6
  127. data/ext/gtk2/rbgtkitemfactory.c +13 -34
  128. data/ext/gtk2/rbgtklabel.c +10 -26
  129. data/ext/gtk2/rbgtklayout.c +6 -14
  130. data/ext/gtk2/rbgtklinkbutton.c +3 -10
  131. data/ext/gtk2/rbgtkliststore.c +15 -36
  132. data/ext/gtk2/rbgtkmain.c +32 -68
  133. data/ext/gtk2/rbgtkmenu.c +21 -46
  134. data/ext/gtk2/rbgtkmenubar.c +1 -2
  135. data/ext/gtk2/rbgtkmenuitem.c +12 -26
  136. data/ext/gtk2/rbgtkmenushell.c +9 -18
  137. data/ext/gtk2/rbgtkmenutoolbutton.c +2 -8
  138. data/ext/gtk2/rbgtkmessagedialog.c +4 -10
  139. data/ext/gtk2/rbgtkmisc.c +4 -8
  140. data/ext/gtk2/rbgtknotebook.c +53 -79
  141. data/ext/gtk2/rbgtkobject.c +7 -14
  142. data/ext/gtk2/rbgtkoptionmenu.c +4 -8
  143. data/ext/gtk2/rbgtkpaned.c +10 -20
  144. data/ext/gtk2/rbgtkplug.c +3 -8
  145. data/ext/gtk2/rbgtkprintsettings.c +1 -4
  146. data/ext/gtk2/rbgtkprogressbar.c +2 -4
  147. data/ext/gtk2/rbgtkradioaction.c +4 -8
  148. data/ext/gtk2/rbgtkradiobutton.c +3 -8
  149. data/ext/gtk2/rbgtkradiomenuitem.c +4 -10
  150. data/ext/gtk2/rbgtkradiotoolbutton.c +3 -8
  151. data/ext/gtk2/rbgtkrange.c +4 -8
  152. data/ext/gtk2/rbgtkrc.c +16 -34
  153. data/ext/gtk2/rbgtkrcstyle.c +13 -26
  154. data/ext/gtk2/rbgtkrecentaction.c +1 -4
  155. data/ext/gtk2/rbgtkrecentchooser.c +18 -38
  156. data/ext/gtk2/rbgtkrecentchooserdialog.c +1 -4
  157. data/ext/gtk2/rbgtkrecentchoosermenu.c +1 -4
  158. data/ext/gtk2/rbgtkrecentchooserwidget.c +1 -4
  159. data/ext/gtk2/rbgtkrecentdata.c +7 -14
  160. data/ext/gtk2/rbgtkrecentfilter.c +14 -29
  161. data/ext/gtk2/rbgtkrecentfilterinfo.c +11 -22
  162. data/ext/gtk2/rbgtkrecentinfo.c +21 -42
  163. data/ext/gtk2/rbgtkrecentmanager.c +11 -24
  164. data/ext/gtk2/rbgtkruler.c +6 -12
  165. data/ext/gtk2/rbgtkscale.c +2 -4
  166. data/ext/gtk2/rbgtkscalebutton.c +6 -14
  167. data/ext/gtk2/rbgtkscrolledwindow.c +9 -20
  168. data/ext/gtk2/rbgtkselection.c +10 -22
  169. data/ext/gtk2/rbgtkselectiondata.c +19 -41
  170. data/ext/gtk2/rbgtkseparatormenuitem.c +1 -2
  171. data/ext/gtk2/rbgtkseparatortoolitem.c +1 -2
  172. data/ext/gtk2/rbgtksettings.c +10 -22
  173. data/ext/gtk2/rbgtksizegroup.c +4 -8
  174. data/ext/gtk2/rbgtksocket.c +4 -8
  175. data/ext/gtk2/rbgtkspinbutton.c +9 -20
  176. data/ext/gtk2/rbgtkspinner.c +51 -0
  177. data/ext/gtk2/rbgtkstatusbar.c +7 -14
  178. data/ext/gtk2/rbgtkstatusicon.c +5 -10
  179. data/ext/gtk2/rbgtkstock.c +5 -13
  180. data/ext/gtk2/rbgtkstyle.c +51 -139
  181. data/ext/gtk2/rbgtktable.c +14 -33
  182. data/ext/gtk2/rbgtktargetlist.c +9 -18
  183. data/ext/gtk2/rbgtktearoffmenuitem.c +1 -2
  184. data/ext/gtk2/rbgtktextappearance.c +11 -22
  185. data/ext/gtk2/rbgtktextattributes.c +16 -32
  186. data/ext/gtk2/rbgtktextbuffer.c +69 -162
  187. data/ext/gtk2/rbgtktextchild.c +3 -8
  188. data/ext/gtk2/rbgtktextiter.c +34 -81
  189. data/ext/gtk2/rbgtktextmark.c +7 -14
  190. data/ext/gtk2/rbgtktexttag.c +4 -10
  191. data/ext/gtk2/rbgtktexttagtable.c +7 -15
  192. data/ext/gtk2/rbgtktextview.c +30 -62
  193. data/ext/gtk2/rbgtktoggleaction.c +4 -8
  194. data/ext/gtk2/rbgtktogglebutton.c +4 -10
  195. data/ext/gtk2/rbgtktoggletoolbutton.c +3 -8
  196. data/ext/gtk2/rbgtktoolbar.c +20 -46
  197. data/ext/gtk2/rbgtktoolbutton.c +1 -4
  198. data/ext/gtk2/rbgtktoolitem.c +16 -34
  199. data/ext/gtk2/rbgtktooltip.c +5 -10
  200. data/ext/gtk2/rbgtktooltips.c +7 -14
  201. data/ext/gtk2/rbgtktreeiter.c +14 -29
  202. data/ext/gtk2/rbgtktreemodel.c +16 -37
  203. data/ext/gtk2/rbgtktreemodelfilter.c +13 -36
  204. data/ext/gtk2/rbgtktreemodelsort.c +8 -16
  205. data/ext/gtk2/rbgtktreepath.c +13 -28
  206. data/ext/gtk2/rbgtktreerowreference.c +9 -20
  207. data/ext/gtk2/rbgtktreeselection.c +20 -47
  208. data/ext/gtk2/rbgtktreesortable.c +7 -18
  209. data/ext/gtk2/rbgtktreestore.c +17 -40
  210. data/ext/gtk2/rbgtktreeview.c +58 -138
  211. data/ext/gtk2/rbgtktreeviewcolumn.c +20 -46
  212. data/ext/gtk2/rbgtkuimanager.c +12 -26
  213. data/ext/gtk2/rbgtkvbbox.c +1 -2
  214. data/ext/gtk2/rbgtkvbox.c +1 -4
  215. data/ext/gtk2/rbgtkviewport.c +1 -2
  216. data/ext/gtk2/rbgtkvolumebutton.c +1 -2
  217. data/ext/gtk2/rbgtkvpaned.c +1 -2
  218. data/ext/gtk2/rbgtkvruler.c +1 -2
  219. data/ext/gtk2/rbgtkvscale.c +1 -4
  220. data/ext/gtk2/rbgtkvscrollbar.c +1 -4
  221. data/ext/gtk2/rbgtkvseparator.c +1 -2
  222. data/ext/gtk2/rbgtkwidget.c +126 -264
  223. data/ext/gtk2/rbgtkwindow.c +69 -142
  224. data/ext/gtk2/rbgtkwindowgroup.c +3 -6
  225. data/lib/gtk2/base.rb +1 -2
  226. data/sample/gtk-demo/main.rb +2 -0
  227. data/sample/gtk-demo/textview.rb +1 -0
  228. metadata +15 -17
  229. data/ext/gtk2/Makefile +0 -169
  230. data/ext/gtk2/rbgdkkeysyms.h +0 -2174
  231. data/ext/gtk2/rbgtkinits.c +0 -473
  232. data/ext/gtk2/ruby-gtk2.pc +0 -3
@@ -15,16 +15,14 @@
15
15
  #include "global.h"
16
16
 
17
17
  static VALUE
18
- hb_initialize(self)
19
- VALUE self;
18
+ hb_initialize(VALUE self)
20
19
  {
21
20
  RBGTK_INITIALIZE(self, gtk_handle_box_new());
22
21
  return Qnil;
23
22
  }
24
23
 
25
24
  static VALUE
26
- hb_child_detached(self)
27
- VALUE self;
25
+ hb_child_detached(VALUE self)
28
26
  {
29
27
  return CBOOL2RVAL(GTK_HANDLE_BOX(RVAL2GOBJ(self))->child_detached);
30
28
  }
@@ -15,8 +15,7 @@
15
15
  #include "global.h"
16
16
 
17
17
  static VALUE
18
- hbbox_initialize(self)
19
- VALUE self;
18
+ hbbox_initialize(VALUE self)
20
19
  {
21
20
  RBGTK_INITIALIZE(self, gtk_hbutton_box_new());
22
21
  return Qnil;
@@ -15,10 +15,7 @@
15
15
  #include "global.h"
16
16
 
17
17
  static VALUE
18
- hbox_initialize(argc, argv, self)
19
- int argc;
20
- VALUE *argv;
21
- VALUE self;
18
+ hbox_initialize(int argc, VALUE *argv, VALUE self)
22
19
  {
23
20
  VALUE homogeneous, spacing;
24
21
 
@@ -15,8 +15,7 @@
15
15
  #include "global.h"
16
16
 
17
17
  static VALUE
18
- hpaned_initialize(self)
19
- VALUE self;
18
+ hpaned_initialize(VALUE self)
20
19
  {
21
20
  RBGTK_INITIALIZE(self, gtk_hpaned_new());
22
21
  return Qnil;
@@ -15,8 +15,7 @@
15
15
  #include "global.h"
16
16
 
17
17
  static VALUE
18
- hruler_initialize(self)
19
- VALUE self;
18
+ hruler_initialize(VALUE self)
20
19
  {
21
20
  RBGTK_INITIALIZE(self, gtk_hruler_new());
22
21
  return Qnil;
@@ -15,10 +15,7 @@
15
15
  #include "global.h"
16
16
 
17
17
  static VALUE
18
- hscale_initialize(argc, argv, self)
19
- int argc;
20
- VALUE *argv;
21
- VALUE self;
18
+ hscale_initialize(int argc, VALUE *argv, VALUE self)
22
19
  {
23
20
  VALUE arg1, arg2, arg3;
24
21
  GtkAdjustment *adj = NULL;
@@ -15,10 +15,7 @@
15
15
  #include "global.h"
16
16
 
17
17
  static VALUE
18
- hscrollbar_initialize(argc, argv, self)
19
- int argc;
20
- VALUE *argv;
21
- VALUE self;
18
+ hscrollbar_initialize(int argc, VALUE *argv, VALUE self)
22
19
  {
23
20
  VALUE arg1;
24
21
  GtkAdjustment *adj = NULL;
@@ -15,8 +15,7 @@
15
15
  #include "global.h"
16
16
 
17
17
  static VALUE
18
- hsep_initialize(self)
19
- VALUE self;
18
+ hsep_initialize(VALUE self)
20
19
  {
21
20
  RBGTK_INITIALIZE(self, gtk_hseparator_new());
22
21
  return Qnil;
@@ -13,16 +13,14 @@
13
13
  #define _SELF(s) (GTK_ICON_FACTORY(RVAL2GOBJ(s)))
14
14
 
15
15
  static VALUE
16
- ifactory_initialize(self)
17
- VALUE self;
16
+ ifactory_initialize(VALUE self)
18
17
  {
19
18
  G_INITIALIZE(self, gtk_icon_factory_new());
20
19
  return Qnil;
21
20
  }
22
21
 
23
22
  static VALUE
24
- ifactory_add(self, id, icon_set)
25
- VALUE self, id, icon_set;
23
+ ifactory_add(VALUE self, VALUE id, VALUE icon_set)
26
24
  {
27
25
  gtk_icon_factory_add(_SELF(self), RVAL2CSTR(id),
28
26
  (GtkIconSet*)RVAL2BOXED(icon_set, GTK_TYPE_ICON_SET));
@@ -30,16 +28,14 @@ ifactory_add(self, id, icon_set)
30
28
  }
31
29
 
32
30
  static VALUE
33
- ifactory_add_default(self)
34
- VALUE self;
31
+ ifactory_add_default(VALUE self)
35
32
  {
36
33
  gtk_icon_factory_add_default(_SELF(self));
37
34
  return self;
38
35
  }
39
36
 
40
37
  static VALUE
41
- ifactory_lookup(self, id)
42
- VALUE self, id;
38
+ ifactory_lookup(VALUE self, VALUE id)
43
39
  {
44
40
  GtkIconSet *icon_set;
45
41
 
@@ -48,8 +44,7 @@ ifactory_lookup(self, id)
48
44
  }
49
45
 
50
46
  static VALUE
51
- ifactory_lookup_default(self, id)
52
- VALUE self, id;
47
+ ifactory_lookup_default(VALUE self, VALUE id)
53
48
  {
54
49
  GtkIconSet *icon_set;
55
50
 
@@ -58,8 +53,7 @@ ifactory_lookup_default(self, id)
58
53
  }
59
54
 
60
55
  static VALUE
61
- ifactory_remove_default(self)
62
- VALUE self;
56
+ ifactory_remove_default(VALUE self)
63
57
  {
64
58
  gtk_icon_factory_remove_default(_SELF(self));
65
59
  return self;
@@ -15,29 +15,25 @@
15
15
  #define _SELF(i) ((GtkIconInfo*)RVAL2BOXED(i, GTK_TYPE_ICON_INFO))
16
16
 
17
17
  static VALUE
18
- iconinfo_get_base_size(self)
19
- VALUE self;
18
+ iconinfo_get_base_size(VALUE self)
20
19
  {
21
20
  return INT2NUM(gtk_icon_info_get_base_size(_SELF(self)));
22
21
  }
23
22
 
24
23
  static VALUE
25
- iconinfo_get_filename(self)
26
- VALUE self;
24
+ iconinfo_get_filename(VALUE self)
27
25
  {
28
26
  return CSTR2RVAL(gtk_icon_info_get_filename(_SELF(self)));
29
27
  }
30
28
 
31
29
  static VALUE
32
- iconinfo_get_builtin_pixbuf(self)
33
- VALUE self;
30
+ iconinfo_get_builtin_pixbuf(VALUE self)
34
31
  {
35
32
  return GOBJ2RVAL(gtk_icon_info_get_builtin_pixbuf(_SELF(self)));
36
33
  }
37
34
 
38
35
  static VALUE
39
- iconinfo_load_icon(self)
40
- VALUE self;
36
+ iconinfo_load_icon(VALUE self)
41
37
  {
42
38
  GError* error = NULL;
43
39
  GdkPixbuf* pixbuf = gtk_icon_info_load_icon(_SELF(self), &error);
@@ -51,16 +47,14 @@ iconinfo_load_icon(self)
51
47
  }
52
48
 
53
49
  static VALUE
54
- iconinfo_set_raw_coordinates(self, raw_coordinates)
55
- VALUE self, raw_coordinates;
50
+ iconinfo_set_raw_coordinates(VALUE self, VALUE raw_coordinates)
56
51
  {
57
52
  gtk_icon_info_set_raw_coordinates(_SELF(self), RVAL2CBOOL(raw_coordinates));
58
53
  return self;
59
54
  }
60
55
 
61
56
  static VALUE
62
- iconinfo_get_embedded_rect(self)
63
- VALUE self;
57
+ iconinfo_get_embedded_rect(VALUE self)
64
58
  {
65
59
  GdkRectangle rectangle;
66
60
  gboolean ret = gtk_icon_info_get_embedded_rect(_SELF(self), &rectangle);
@@ -72,8 +66,7 @@ iconinfo_get_embedded_rect(self)
72
66
  }
73
67
 
74
68
  static VALUE
75
- iconinfo_get_attach_points(self)
76
- VALUE self;
69
+ iconinfo_get_attach_points(VALUE self)
77
70
  {
78
71
  GdkPoint* points;
79
72
  gint n_points, i;
@@ -91,8 +84,7 @@ iconinfo_get_attach_points(self)
91
84
  }
92
85
 
93
86
  static VALUE
94
- iconinfo_get_display_name(self)
95
- VALUE self;
87
+ iconinfo_get_display_name(VALUE self)
96
88
  {
97
89
  return CSTR2RVAL(gtk_icon_info_get_display_name(_SELF(self)));
98
90
  }
@@ -13,10 +13,7 @@
13
13
  #define _SELF(s) ((GtkIconSet*)RVAL2BOXED(s, GTK_TYPE_ICON_SET))
14
14
 
15
15
  static VALUE
16
- icon_set_initialize(argc, argv, self)
17
- int argc;
18
- VALUE *argv;
19
- VALUE self;
16
+ icon_set_initialize(int argc, VALUE *argv, VALUE self)
20
17
  {
21
18
  GtkIconSet *icon_set;
22
19
  VALUE pixbuf;
@@ -33,16 +30,14 @@ icon_set_initialize(argc, argv, self)
33
30
  }
34
31
 
35
32
  static VALUE
36
- icon_set_add_source(self, source)
37
- VALUE self, source;
33
+ icon_set_add_source(VALUE self, VALUE source)
38
34
  {
39
35
  gtk_icon_set_add_source(_SELF(self), RVAL2BOXED(source, GTK_TYPE_ICON_SOURCE));
40
36
  return self;
41
37
  }
42
38
 
43
39
  static VALUE
44
- icon_set_get_sizes(self)
45
- VALUE self;
40
+ icon_set_get_sizes(VALUE self)
46
41
  {
47
42
  GtkIconSize *sizes;
48
43
  gint n_sizes;
@@ -57,10 +52,7 @@ icon_set_get_sizes(self)
57
52
  }
58
53
 
59
54
  static VALUE
60
- icon_set_render_icon(argc, argv, self)
61
- int argc;
62
- VALUE *argv;
63
- VALUE self;
55
+ icon_set_render_icon(int argc, VALUE *argv, VALUE self)
64
56
  {
65
57
  VALUE style, direction, state, size, widget, detail;
66
58
 
@@ -11,8 +11,7 @@
11
11
  #include "global.h"
12
12
 
13
13
  static VALUE
14
- icon_size_lookup(self, size)
15
- VALUE self, size;
14
+ icon_size_lookup(VALUE self, VALUE size)
16
15
  {
17
16
  gint width, height;
18
17
 
@@ -24,8 +23,7 @@ icon_size_lookup(self, size)
24
23
 
25
24
  #if GTK_CHECK_VERSION(2,2,0)
26
25
  static VALUE
27
- icon_size_lookup_for_settings(self, settings, size)
28
- VALUE self, settings, size;
26
+ icon_size_lookup_for_settings(VALUE self, VALUE settings, VALUE size)
29
27
  {
30
28
  gint width, height;
31
29
 
@@ -39,8 +37,7 @@ icon_size_lookup_for_settings(self, settings, size)
39
37
  #endif
40
38
 
41
39
  static VALUE
42
- icon_size_register(self, name, width, height)
43
- VALUE self, name, width, height;
40
+ icon_size_register(VALUE self, VALUE name, VALUE width, VALUE height)
44
41
  {
45
42
  /* XXXX FIXME This should be GENUM2RVAL */
46
43
  return INT2FIX(gtk_icon_size_register(RVAL2CSTR(name),
@@ -49,23 +46,20 @@ icon_size_register(self, name, width, height)
49
46
  }
50
47
 
51
48
  static VALUE
52
- icon_size_register_alias(self, alias, target)
53
- VALUE self, alias, target;
49
+ icon_size_register_alias(VALUE self, VALUE alias, VALUE target)
54
50
  {
55
51
  gtk_icon_size_register_alias(RVAL2CSTR(alias), RVAL2GENUM(target, GTK_TYPE_ICON_SIZE));
56
52
  return Qnil;
57
53
  }
58
54
 
59
55
  static VALUE
60
- icon_size_from_name(self, name)
61
- VALUE self, name;
56
+ icon_size_from_name(VALUE self, VALUE name)
62
57
  {
63
58
  return INT2FIX(gtk_icon_size_from_name(RVAL2CSTR(name)));
64
59
  }
65
60
 
66
61
  static VALUE
67
- icon_size_get_name(self, size)
68
- VALUE self, size;
62
+ icon_size_get_name(VALUE self, VALUE size)
69
63
  {
70
64
  return CSTR2RVAL(gtk_icon_size_get_name(RVAL2GENUM(size, GTK_TYPE_ICON_SIZE)));
71
65
  }
@@ -13,8 +13,7 @@
13
13
  #define _SELF(s) ((GtkIconSource*)RVAL2BOXED(s, GTK_TYPE_ICON_SOURCE))
14
14
 
15
15
  static VALUE
16
- icon_source_initialize(self)
17
- VALUE self;
16
+ icon_source_initialize(VALUE self)
18
17
  {
19
18
  GtkIconSource *icon_source;
20
19
 
@@ -24,30 +23,26 @@ icon_source_initialize(self)
24
23
  }
25
24
 
26
25
  static VALUE
27
- icon_source_get_direction(self)
28
- VALUE self;
26
+ icon_source_get_direction(VALUE self)
29
27
  {
30
28
  return GENUM2RVAL(gtk_icon_source_get_direction(_SELF(self)),
31
29
  GTK_TYPE_TEXT_DIRECTION);
32
30
  }
33
31
 
34
32
  static VALUE
35
- icon_source_get_direction_wildcarded(self)
36
- VALUE self;
33
+ icon_source_get_direction_wildcarded(VALUE self)
37
34
  {
38
35
  return CBOOL2RVAL(gtk_icon_source_get_direction_wildcarded(_SELF(self)));
39
36
  }
40
37
 
41
38
  static VALUE
42
- icon_source_get_filename(self)
43
- VALUE self;
39
+ icon_source_get_filename(VALUE self)
44
40
  {
45
41
  return CSTR2RVAL(gtk_icon_source_get_filename(_SELF(self)));
46
42
  }
47
43
 
48
44
  static VALUE
49
- icon_source_get_pixbuf(self)
50
- VALUE self;
45
+ icon_source_get_pixbuf(VALUE self)
51
46
  {
52
47
  GdkPixbuf *pixbuf;
53
48
  pixbuf = gtk_icon_source_get_pixbuf(_SELF(self));
@@ -55,36 +50,31 @@ icon_source_get_pixbuf(self)
55
50
  }
56
51
 
57
52
  static VALUE
58
- icon_source_get_size(self)
59
- VALUE self;
53
+ icon_source_get_size(VALUE self)
60
54
  {
61
55
  return GENUM2RVAL(gtk_icon_source_get_size(_SELF(self)), GTK_TYPE_ICON_SIZE);
62
56
  }
63
57
 
64
58
  static VALUE
65
- icon_source_get_size_wildcarded(self)
66
- VALUE self;
59
+ icon_source_get_size_wildcarded(VALUE self)
67
60
  {
68
61
  return CBOOL2RVAL(gtk_icon_source_get_size_wildcarded(_SELF(self)));
69
62
  }
70
63
 
71
64
  static VALUE
72
- icon_source_get_state(self)
73
- VALUE self;
65
+ icon_source_get_state(VALUE self)
74
66
  {
75
67
  return GENUM2RVAL(gtk_icon_source_get_state(_SELF(self)), GTK_TYPE_STATE_TYPE);
76
68
  }
77
69
 
78
70
  static VALUE
79
- icon_source_get_state_wildcarded(self)
80
- VALUE self;
71
+ icon_source_get_state_wildcarded(VALUE self)
81
72
  {
82
73
  return CBOOL2RVAL(gtk_icon_source_get_state_wildcarded(_SELF(self)));
83
74
  }
84
75
 
85
76
  static VALUE
86
- icon_source_set_direction(self, direction)
87
- VALUE self, direction;
77
+ icon_source_set_direction(VALUE self, VALUE direction)
88
78
  {
89
79
  gtk_icon_source_set_direction(_SELF(self),
90
80
  RVAL2GENUM(direction, GTK_TYPE_TEXT_DIRECTION));
@@ -92,56 +82,49 @@ icon_source_set_direction(self, direction)
92
82
  }
93
83
 
94
84
  static VALUE
95
- icon_source_set_direction_wildcarded(self, setting)
96
- VALUE self, setting;
85
+ icon_source_set_direction_wildcarded(VALUE self, VALUE setting)
97
86
  {
98
87
  gtk_icon_source_set_direction_wildcarded(_SELF(self), RVAL2CBOOL(setting));
99
88
  return self;
100
89
  }
101
90
 
102
91
  static VALUE
103
- icon_source_set_filename(self, filename)
104
- VALUE self, filename;
92
+ icon_source_set_filename(VALUE self, VALUE filename)
105
93
  {
106
94
  gtk_icon_source_set_filename(_SELF(self), RVAL2CSTR(filename));
107
95
  return self;
108
96
  }
109
97
 
110
98
  static VALUE
111
- icon_source_set_pixbuf(self, pixbuf)
112
- VALUE self, pixbuf;
99
+ icon_source_set_pixbuf(VALUE self, VALUE pixbuf)
113
100
  {
114
101
  gtk_icon_source_set_pixbuf(_SELF(self), GDK_PIXBUF(RVAL2GOBJ(pixbuf)));
115
102
  return self;
116
103
  }
117
104
 
118
105
  static VALUE
119
- icon_source_set_size(self, size)
120
- VALUE self, size;
106
+ icon_source_set_size(VALUE self, VALUE size)
121
107
  {
122
108
  gtk_icon_source_set_size(_SELF(self), RVAL2GENUM(size, GTK_TYPE_ICON_SIZE));
123
109
  return self;
124
110
  }
125
111
 
126
112
  static VALUE
127
- icon_source_set_size_wildcarded(self, setting)
128
- VALUE self, setting;
113
+ icon_source_set_size_wildcarded(VALUE self, VALUE setting)
129
114
  {
130
115
  gtk_icon_source_set_size_wildcarded(_SELF(self), RVAL2CBOOL(setting));
131
116
  return self;
132
117
  }
133
118
 
134
119
  static VALUE
135
- icon_source_set_state(self, state)
136
- VALUE self, state;
120
+ icon_source_set_state(VALUE self, VALUE state)
137
121
  {
138
122
  gtk_icon_source_set_state(_SELF(self), RVAL2GENUM(state, GTK_TYPE_STATE_TYPE));
139
123
  return self;
140
124
  }
141
125
 
142
126
  static VALUE
143
- icon_source_set_state_wildcarded(self, setting)
144
- VALUE self, setting;
127
+ icon_source_set_state_wildcarded(VALUE self, VALUE setting)
145
128
  {
146
129
  gtk_icon_source_set_state_wildcarded(_SELF(self), RVAL2CBOOL(setting));
147
130
  return self;