gtk2 0.90.7-x86-mingw32 → 0.90.8-x86-mingw32

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (230) 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/1.8/gtk2.so +0 -0
  226. data/lib/1.9/gtk2.so +0 -0
  227. data/lib/gtk2/base.rb +1 -2
  228. data/sample/gtk-demo/main.rb +2 -0
  229. data/sample/gtk-demo/textview.rb +1 -0
  230. metadata +15 -13
@@ -20,8 +20,7 @@
20
20
  #define _SELF(self) (GTK_ADJUSTMENT(RVAL2GOBJ(self)))
21
21
 
22
22
  static VALUE
23
- adj_initialize(self, value, lower, upper, step_inc, page_inc, page_size)
24
- VALUE self, value, lower, upper, step_inc, page_inc, page_size;
23
+ adj_initialize(VALUE self, VALUE value, VALUE lower, VALUE upper, VALUE step_inc, VALUE page_inc, VALUE page_size)
25
24
  {
26
25
  RBGTK_INITIALIZE(self, gtk_adjustment_new(NUM2DBL(value),
27
26
  NUM2DBL(lower),
@@ -33,32 +32,28 @@ adj_initialize(self, value, lower, upper, step_inc, page_inc, page_size)
33
32
  }
34
33
 
35
34
  static VALUE
36
- adj_clamp_page(self, lower, upper)
37
- VALUE self, lower, upper;
35
+ adj_clamp_page(VALUE self, VALUE lower, VALUE upper)
38
36
  {
39
37
  gtk_adjustment_clamp_page(_SELF(self), NUM2DBL(lower), NUM2DBL(upper));
40
38
  return self;
41
39
  }
42
40
 
43
41
  static VALUE
44
- adj_changed(self)
45
- VALUE self;
42
+ adj_changed(VALUE self)
46
43
  {
47
44
  gtk_adjustment_changed(_SELF(self));
48
45
  return self;
49
46
  }
50
47
 
51
48
  static VALUE
52
- adj_value_changed(self)
53
- VALUE self;
49
+ adj_value_changed(VALUE self)
54
50
  {
55
51
  gtk_adjustment_value_changed(_SELF(self));
56
52
  return self;
57
53
  }
58
54
 
59
55
  static VALUE
60
- adj_set_value(self, value)
61
- VALUE self, value;
56
+ adj_set_value(VALUE self, VALUE value)
62
57
  {
63
58
  gtk_adjustment_set_value(_SELF(self),
64
59
  NUM2DBL(value));
@@ -66,65 +61,56 @@ adj_set_value(self, value)
66
61
  }
67
62
 
68
63
  static VALUE
69
- adj_get_value(self)
70
- VALUE self;
64
+ adj_get_value(VALUE self)
71
65
  {
72
66
  return rb_float_new(_SELF(self)->value);
73
67
  }
74
68
 
75
69
  static VALUE
76
- adj_get_lower(self)
77
- VALUE self;
70
+ adj_get_lower(VALUE self)
78
71
  {
79
72
  return rb_float_new(_SELF(self)->lower);
80
73
  }
81
74
 
82
75
  static VALUE
83
- adj_get_upper(self)
84
- VALUE self;
76
+ adj_get_upper(VALUE self)
85
77
  {
86
78
  return rb_float_new(_SELF(self)->upper);
87
79
  }
88
80
 
89
81
  static VALUE
90
- adj_get_step_increment(self)
91
- VALUE self;
82
+ adj_get_step_increment(VALUE self)
92
83
  {
93
84
  return rb_float_new(_SELF(self)->step_increment);
94
85
  }
95
86
 
96
87
  static VALUE
97
- adj_set_step_increment(self, inc)
98
- VALUE self, inc;
88
+ adj_set_step_increment(VALUE self, VALUE inc)
99
89
  {
100
90
  _SELF(self)->step_increment = NUM2DBL(inc);
101
91
  return self;
102
92
  }
103
93
 
104
94
  static VALUE
105
- adj_get_page_increment(self)
106
- VALUE self;
95
+ adj_get_page_increment(VALUE self)
107
96
  {
108
97
  return rb_float_new(_SELF(self)->page_increment);
109
98
  }
110
99
 
111
100
  static VALUE
112
- adj_set_page_increment(self, inc)
113
- VALUE self, inc;
101
+ adj_set_page_increment(VALUE self, VALUE inc)
114
102
  {
115
103
  return _SELF(self)->page_increment = NUM2DBL(inc);
116
104
  }
117
105
 
118
106
  static VALUE
119
- adj_get_page_size(self)
120
- VALUE self;
107
+ adj_get_page_size(VALUE self)
121
108
  {
122
109
  return rb_float_new(_SELF(self)->page_size);
123
110
  }
124
111
 
125
112
  static VALUE
126
- adj_set_page_size(self, size)
127
- VALUE self, size;
113
+ adj_set_page_size(VALUE self, VALUE size)
128
114
  {
129
115
  return _SELF(self)->page_size = NUM2DBL(size);
130
116
  }
@@ -15,8 +15,7 @@
15
15
  #include "global.h"
16
16
 
17
17
  static VALUE
18
- align_initialize(self, xalign, yalign, xscale, yscale)
19
- VALUE self, xalign, yalign, xscale, yscale;
18
+ align_initialize(VALUE self, VALUE xalign, VALUE yalign, VALUE xscale, VALUE yscale)
20
19
  {
21
20
  RBGTK_INITIALIZE(self, gtk_alignment_new(NUM2DBL(xalign),
22
21
  NUM2DBL(yalign),
@@ -26,8 +25,7 @@ align_initialize(self, xalign, yalign, xscale, yscale)
26
25
  }
27
26
 
28
27
  static VALUE
29
- align_set(self, xalign, yalign, xscale, yscale)
30
- VALUE self, xalign, yalign, xscale, yscale;
28
+ align_set(VALUE self, VALUE xalign, VALUE yalign, VALUE xscale, VALUE yscale)
31
29
  {
32
30
  gtk_alignment_set(GTK_ALIGNMENT(RVAL2GOBJ(self)),
33
31
  NUM2DBL(xalign), NUM2DBL(yalign),
@@ -36,8 +34,7 @@ align_set(self, xalign, yalign, xscale, yscale)
36
34
  }
37
35
  #if GTK_CHECK_VERSION(2,4,0)
38
36
  static VALUE
39
- align_get_padding(self)
40
- VALUE self;
37
+ align_get_padding(VALUE self)
41
38
  {
42
39
  guint top, bottom, left, right;
43
40
  gtk_alignment_get_padding(GTK_ALIGNMENT(RVAL2GOBJ(self)),
@@ -46,8 +43,7 @@ align_get_padding(self)
46
43
  UINT2NUM(left), UINT2NUM(right));
47
44
  }
48
45
  static VALUE
49
- align_set_padding(self, top, bottom, left, right)
50
- VALUE self;
46
+ align_set_padding(VALUE self, VALUE top, VALUE bottom, VALUE left, VALUE right)
51
47
  {
52
48
  gtk_alignment_set_padding(GTK_ALIGNMENT(RVAL2GOBJ(self)),
53
49
  NUM2UINT(top), NUM2UINT(bottom),
@@ -34,8 +34,7 @@ gtk_allocation_get_type(void)
34
34
  #define _SELF(r) ((GtkAllocation*)RVAL2BOXED(r, GTK_TYPE_ALLOCATION))
35
35
 
36
36
  static VALUE
37
- alloc_initialize(self, x, y, width, height)
38
- VALUE self, x, y, width, height;
37
+ alloc_initialize(VALUE self, VALUE x, VALUE y, VALUE width, VALUE height)
39
38
  {
40
39
  GtkAllocation new;
41
40
 
@@ -49,8 +48,7 @@ alloc_initialize(self, x, y, width, height)
49
48
  }
50
49
 
51
50
  static VALUE
52
- alloc_intersect(self, other)
53
- VALUE self, other;
51
+ alloc_intersect(VALUE self, VALUE other)
54
52
  {
55
53
  GtkAllocation dest;
56
54
  gboolean ret = gdk_rectangle_intersect(_SELF(self), _SELF(other), &dest);
@@ -58,8 +56,7 @@ alloc_intersect(self, other)
58
56
  }
59
57
 
60
58
  static VALUE
61
- alloc_union(self, other)
62
- VALUE self, other;
59
+ alloc_union(VALUE self, VALUE other)
63
60
  {
64
61
  GtkAllocation dest;
65
62
  gdk_rectangle_union(_SELF(self), _SELF(other), &dest);
@@ -68,68 +65,59 @@ alloc_union(self, other)
68
65
 
69
66
  /* Struct accessors */
70
67
  static VALUE
71
- alloc_x(self)
72
- VALUE self;
68
+ alloc_x(VALUE self)
73
69
  {
74
70
  return INT2NUM(_SELF(self)->x);
75
71
  }
76
72
 
77
73
  static VALUE
78
- alloc_y(self)
79
- VALUE self;
74
+ alloc_y(VALUE self)
80
75
  {
81
76
  return INT2NUM(_SELF(self)->y);
82
77
  }
83
78
 
84
79
  static VALUE
85
- alloc_w(self)
86
- VALUE self;
80
+ alloc_w(VALUE self)
87
81
  {
88
82
  return INT2NUM(_SELF(self)->width);
89
83
  }
90
84
 
91
85
  static VALUE
92
- alloc_h(self)
93
- VALUE self;
86
+ alloc_h(VALUE self)
94
87
  {
95
88
  return INT2NUM(_SELF(self)->height);
96
89
  }
97
90
 
98
91
  static VALUE
99
- alloc_set_x(self, x)
100
- VALUE self, x;
92
+ alloc_set_x(VALUE self, VALUE x)
101
93
  {
102
94
  _SELF(self)->x = NUM2INT(x);
103
95
  return self;
104
96
  }
105
97
 
106
98
  static VALUE
107
- alloc_set_y(self, y)
108
- VALUE self, y;
99
+ alloc_set_y(VALUE self, VALUE y)
109
100
  {
110
101
  _SELF(self)->y = NUM2INT(y);
111
102
  return self;
112
103
  }
113
104
 
114
105
  static VALUE
115
- alloc_set_w(self, width)
116
- VALUE self, width;
106
+ alloc_set_w(VALUE self, VALUE width)
117
107
  {
118
108
  _SELF(self)->width = NUM2INT(width);
119
109
  return self;
120
110
  }
121
111
 
122
112
  static VALUE
123
- alloc_set_h(self, height)
124
- VALUE self, height;
113
+ alloc_set_h(VALUE self, VALUE height)
125
114
  {
126
115
  _SELF(self)->height = NUM2INT(height);
127
116
  return self;
128
117
  }
129
118
 
130
119
  static VALUE
131
- alloc_to_a(self)
132
- VALUE self;
120
+ alloc_to_a(VALUE self)
133
121
  {
134
122
  GtkAllocation* a = _SELF(self);
135
123
  return rb_ary_new3(4, INT2FIX(a->x), INT2FIX(a->y),
@@ -137,8 +125,7 @@ alloc_to_a(self)
137
125
  }
138
126
 
139
127
  static VALUE
140
- alloc_to_rect(self)
141
- VALUE self;
128
+ alloc_to_rect(VALUE self)
142
129
  {
143
130
  return BOXED2RVAL(_SELF(self), GDK_TYPE_RECTANGLE);
144
131
  }
@@ -15,8 +15,7 @@
15
15
  #include "global.h"
16
16
 
17
17
  static VALUE
18
- arrow_initialize(self, arrow_t, shadow_t)
19
- VALUE self, arrow_t, shadow_t;
18
+ arrow_initialize(VALUE self, VALUE arrow_t, VALUE shadow_t)
20
19
  {
21
20
  RBGTK_INITIALIZE(self, gtk_arrow_new(RVAL2GENUM(arrow_t, GTK_TYPE_ARROW_TYPE),
22
21
  RVAL2GENUM(shadow_t, GTK_TYPE_SHADOW_TYPE)));
@@ -24,8 +23,7 @@ arrow_initialize(self, arrow_t, shadow_t)
24
23
  }
25
24
 
26
25
  static VALUE
27
- arrow_set(self, arrow_t, shadow_t)
28
- VALUE self, arrow_t, shadow_t;
26
+ arrow_set(VALUE self, VALUE arrow_t, VALUE shadow_t)
29
27
  {
30
28
  gtk_arrow_set(GTK_ARROW(RVAL2GOBJ(self)),
31
29
  RVAL2GENUM(arrow_t, GTK_TYPE_ARROW_TYPE),
@@ -15,8 +15,7 @@
15
15
  #include "global.h"
16
16
 
17
17
  static VALUE
18
- aframe_initialize(self, label, xalign, yalign, ratio, obey_child)
19
- VALUE self, label, xalign, yalign, ratio, obey_child;
18
+ aframe_initialize(VALUE self, VALUE label, VALUE xalign, VALUE yalign, VALUE ratio, VALUE obey_child)
20
19
  {
21
20
  RBGTK_INITIALIZE(self, gtk_aspect_frame_new(NIL_P(label)?NULL:RVAL2CSTR(label),
22
21
  NUM2DBL(xalign),
@@ -27,8 +26,7 @@ aframe_initialize(self, label, xalign, yalign, ratio, obey_child)
27
26
  }
28
27
 
29
28
  static VALUE
30
- aframe_set(self, xalign, yalign, ratio, obey_child)
31
- VALUE self, xalign, yalign, ratio, obey_child;
29
+ aframe_set(VALUE self, VALUE xalign, VALUE yalign, VALUE ratio, VALUE obey_child)
32
30
  {
33
31
  gtk_aspect_frame_set(GTK_ASPECT_FRAME(RVAL2GOBJ(self)),
34
32
  NUM2DBL(xalign), NUM2DBL(yalign),
@@ -16,74 +16,63 @@
16
16
  #define _SELF(s) (GTK_ASSISTANT(RVAL2GOBJ(s)))
17
17
 
18
18
  static VALUE
19
- ass_initialize(self)
20
- VALUE self;
19
+ ass_initialize(VALUE self)
21
20
  {
22
21
  RBGTK_INITIALIZE(self, gtk_assistant_new());
23
22
  return Qnil;
24
23
  }
25
24
 
26
25
  static VALUE
27
- ass_get_current_page(self)
28
- VALUE self;
26
+ ass_get_current_page(VALUE self)
29
27
  {
30
28
  return INT2NUM(gtk_assistant_get_current_page(_SELF(self)));
31
29
  }
32
30
 
33
31
  static VALUE
34
- ass_set_current_page(self, page_num)
35
- VALUE self, page_num;
32
+ ass_set_current_page(VALUE self, VALUE page_num)
36
33
  {
37
34
  gtk_assistant_set_current_page(_SELF(self), NUM2INT(page_num));
38
35
  return self;
39
36
  }
40
37
 
41
38
  static VALUE
42
- ass_get_n_pages(self)
43
- VALUE self;
39
+ ass_get_n_pages(VALUE self)
44
40
  {
45
41
  return INT2NUM(gtk_assistant_get_n_pages(_SELF(self)));
46
42
  }
47
43
 
48
44
  static VALUE
49
- ass_get_nth_page(self, page_num)
50
- VALUE self, page_num;
45
+ ass_get_nth_page(VALUE self, VALUE page_num)
51
46
  {
52
47
  return GOBJ2RVAL(gtk_assistant_get_nth_page(_SELF(self), NUM2INT(page_num)));
53
48
  }
54
49
 
55
50
  static VALUE
56
- ass_prepend_page(self, page)
57
- VALUE self, page;
51
+ ass_prepend_page(VALUE self, VALUE page)
58
52
  {
59
53
  return INT2NUM(gtk_assistant_prepend_page(_SELF(self), GTK_WIDGET(RVAL2GOBJ(page))));
60
54
  }
61
55
 
62
56
  static VALUE
63
- ass_append_page(self, page)
64
- VALUE self, page;
57
+ ass_append_page(VALUE self, VALUE page)
65
58
  {
66
59
  return INT2NUM(gtk_assistant_append_page(_SELF(self), GTK_WIDGET(RVAL2GOBJ(page))));
67
60
  }
68
61
 
69
62
  static VALUE
70
- ass_insert_page(self, page, position)
71
- VALUE self, page, position;
63
+ ass_insert_page(VALUE self, VALUE page, VALUE position)
72
64
  {
73
65
  return INT2NUM(gtk_assistant_insert_page(_SELF(self), GTK_WIDGET(RVAL2GOBJ(page)), NUM2INT(position)));
74
66
  }
75
67
 
76
68
  static gint
77
- ass_page_func(current_page, func)
78
- gint current_page;
79
- gpointer func;
69
+ ass_page_func(gint current_page, gpointer func)
80
70
  {
81
71
  return NUM2INT(rb_funcall((VALUE)func, id_call, 1, INT2NUM(current_page)));
82
72
  }
83
73
 
84
74
  static VALUE
85
- ass_set_forward_page_func(self)
86
- VALUE self;
75
+ ass_set_forward_page_func(VALUE self)
87
76
  {
88
77
  VALUE func = rb_block_proc();
89
78
  G_RELATIVE(self, func);
@@ -92,99 +81,86 @@ ass_set_forward_page_func(self)
92
81
  }
93
82
 
94
83
  static VALUE
95
- ass_set_page_type(self, page, type)
96
- VALUE self, page, type;
84
+ ass_set_page_type(VALUE self, VALUE page, VALUE type)
97
85
  {
98
86
  gtk_assistant_set_page_type(_SELF(self), GTK_WIDGET(RVAL2GOBJ(page)), RVAL2GENUM(type, GTK_TYPE_ASSISTANT_PAGE_TYPE));
99
87
  return self;
100
88
  }
101
89
 
102
90
  static VALUE
103
- ass_get_page_type(self, page)
104
- VALUE self, page;
91
+ ass_get_page_type(VALUE self, VALUE page)
105
92
  {
106
93
  return GENUM2RVAL(gtk_assistant_get_page_type(_SELF(self), GTK_WIDGET(RVAL2GOBJ(page))), GTK_TYPE_ASSISTANT_PAGE_TYPE);
107
94
  }
108
95
 
109
96
  static VALUE
110
- ass_set_page_title(self, page, title)
111
- VALUE self, page, title;
97
+ ass_set_page_title(VALUE self, VALUE page, VALUE title)
112
98
  {
113
99
  gtk_assistant_set_page_title(_SELF(self), GTK_WIDGET(RVAL2GOBJ(page)), RVAL2CSTR(title));
114
100
  return self;
115
101
  }
116
102
 
117
103
  static VALUE
118
- ass_get_page_title(self, page)
119
- VALUE self, page;
104
+ ass_get_page_title(VALUE self, VALUE page)
120
105
  {
121
106
  return CSTR2RVAL(gtk_assistant_get_page_title(_SELF(self), GTK_WIDGET(RVAL2GOBJ(page))));
122
107
  }
123
108
 
124
109
  static VALUE
125
- ass_set_page_header_image(self, page, header_image)
126
- VALUE self, page, header_image;
110
+ ass_set_page_header_image(VALUE self, VALUE page, VALUE header_image)
127
111
  {
128
112
  gtk_assistant_set_page_header_image(_SELF(self), GTK_WIDGET(RVAL2GOBJ(page)), GDK_PIXBUF(RVAL2GOBJ(header_image)));
129
113
  return self;
130
114
  }
131
115
 
132
116
  static VALUE
133
- ass_get_page_header_image(self, page)
134
- VALUE self, page;
117
+ ass_get_page_header_image(VALUE self, VALUE page)
135
118
  {
136
119
  return GOBJ2RVAL(gtk_assistant_get_page_header_image(_SELF(self), GTK_WIDGET(RVAL2GOBJ(page))));
137
120
  }
138
121
 
139
122
  static VALUE
140
- ass_set_page_side_image(self, page, side_image)
141
- VALUE self, page, side_image;
123
+ ass_set_page_side_image(VALUE self, VALUE page, VALUE side_image)
142
124
  {
143
125
  gtk_assistant_set_page_side_image(_SELF(self), GTK_WIDGET(RVAL2GOBJ(page)), GDK_PIXBUF(RVAL2GOBJ(side_image)));
144
126
  return self;
145
127
  }
146
128
 
147
129
  static VALUE
148
- ass_get_page_side_image(self, page)
149
- VALUE self, page;
130
+ ass_get_page_side_image(VALUE self, VALUE page)
150
131
  {
151
132
  return GOBJ2RVAL(gtk_assistant_get_page_side_image(_SELF(self), GTK_WIDGET(RVAL2GOBJ(page))));
152
133
  }
153
134
 
154
135
  static VALUE
155
- ass_set_page_complete(self, page, complete)
156
- VALUE self, page, complete;
136
+ ass_set_page_complete(VALUE self, VALUE page, VALUE complete)
157
137
  {
158
138
  gtk_assistant_set_page_complete(_SELF(self), GTK_WIDGET(RVAL2GOBJ(page)), RVAL2CBOOL(complete));
159
139
  return self;
160
140
  }
161
141
 
162
142
  static VALUE
163
- ass_get_page_complete(self, page)
164
- VALUE self, page;
143
+ ass_get_page_complete(VALUE self, VALUE page)
165
144
  {
166
145
  return CBOOL2RVAL(gtk_assistant_get_page_complete(_SELF(self), GTK_WIDGET(RVAL2GOBJ(page))));
167
146
  }
168
147
 
169
148
  static VALUE
170
- ass_add_action_widget(self, child)
171
- VALUE self, child;
149
+ ass_add_action_widget(VALUE self, VALUE child)
172
150
  {
173
151
  gtk_assistant_add_action_widget(_SELF(self), GTK_WIDGET(RVAL2GOBJ(child)));
174
152
  return self;
175
153
  }
176
154
 
177
155
  static VALUE
178
- ass_remove_action_widget(self, child)
179
- VALUE self, child;
156
+ ass_remove_action_widget(VALUE self, VALUE child)
180
157
  {
181
158
  gtk_assistant_remove_action_widget(_SELF(self), GTK_WIDGET(RVAL2GOBJ(child)));
182
159
  return self;
183
160
  }
184
161
 
185
162
  static VALUE
186
- ass_update_buttons_state(self)
187
- VALUE self;
163
+ ass_update_buttons_state(VALUE self)
188
164
  {
189
165
  gtk_assistant_update_buttons_state(_SELF(self));
190
166
  return self;