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
@@ -17,10 +17,7 @@
17
17
  #define _SELF(self) (GTK_TABLE(RVAL2GOBJ(self)))
18
18
 
19
19
  static VALUE
20
- tbl_initialize(argc, argv, self)
21
- int argc;
22
- VALUE *argv;
23
- VALUE self;
20
+ tbl_initialize(int argc, VALUE *argv, VALUE self)
24
21
  {
25
22
  VALUE row, col, homogeneous;
26
23
 
@@ -32,18 +29,14 @@ tbl_initialize(argc, argv, self)
32
29
  }
33
30
 
34
31
  static VALUE
35
- tbl_resize(self, rows, columns)
36
- VALUE self, rows, columns;
32
+ tbl_resize(VALUE self, VALUE rows, VALUE columns)
37
33
  {
38
34
  gtk_table_resize(_SELF(self), NUM2UINT(rows), NUM2UINT(columns));
39
35
  return self;
40
36
  }
41
37
 
42
38
  static VALUE
43
- tbl_attach(argc, argv, self)
44
- int argc;
45
- VALUE *argv;
46
- VALUE self;
39
+ tbl_attach(int argc, VALUE *argv, VALUE self)
47
40
  {
48
41
  VALUE child, left, right, top, bottom;
49
42
  VALUE arg0, arg1, arg2, arg3;
@@ -72,9 +65,7 @@ tbl_attach(argc, argv, self)
72
65
  }
73
66
 
74
67
  static VALUE
75
- tbl_attach_defaults(self, widget, left_attach, right_attach, top_attach,
76
- bottom_attach)
77
- VALUE self, widget, left_attach, right_attach, top_attach, bottom_attach;
68
+ tbl_attach_defaults(VALUE self, VALUE widget, VALUE left_attach, VALUE right_attach, VALUE top_attach, VALUE bottom_attach)
78
69
  {
79
70
  gtk_table_attach_defaults(_SELF(self), GTK_WIDGET(RVAL2GOBJ(widget)),
80
71
  NUM2UINT(left_attach), NUM2UINT(right_attach),
@@ -84,75 +75,65 @@ tbl_attach_defaults(self, widget, left_attach, right_attach, top_attach,
84
75
  }
85
76
 
86
77
  static VALUE
87
- tbl_set_row_spacing(self, row, spc)
88
- VALUE self, row, spc;
78
+ tbl_set_row_spacing(VALUE self, VALUE row, VALUE spc)
89
79
  {
90
80
  gtk_table_set_row_spacing(_SELF(self), NUM2UINT(row), NUM2UINT(spc));
91
81
  return self;
92
82
  }
93
83
 
94
84
  static VALUE
95
- tbl_get_row_spacing(self, row)
96
- VALUE self, row;
85
+ tbl_get_row_spacing(VALUE self, VALUE row)
97
86
  {
98
87
  return UINT2NUM(gtk_table_get_row_spacing(_SELF(self), NUM2UINT(row)));
99
88
  }
100
89
 
101
90
  static VALUE
102
- tbl_set_col_spacing(self, col, spc)
103
- VALUE self, col, spc;
91
+ tbl_set_col_spacing(VALUE self, VALUE col, VALUE spc)
104
92
  {
105
93
  gtk_table_set_col_spacing(_SELF(self), NUM2UINT(col), NUM2UINT(spc));
106
94
  return self;
107
95
  }
108
96
 
109
97
  static VALUE
110
- tbl_get_col_spacing(self, col)
111
- VALUE self, col;
98
+ tbl_get_col_spacing(VALUE self, VALUE col)
112
99
  {
113
100
  return UINT2NUM(gtk_table_get_col_spacing(_SELF(self), NUM2UINT(col)));
114
101
  }
115
102
 
116
103
  static VALUE
117
- tbl_set_row_spacings(self, spc)
118
- VALUE self, spc;
104
+ tbl_set_row_spacings(VALUE self, VALUE spc)
119
105
  {
120
106
  gtk_table_set_row_spacings(_SELF(self), NUM2UINT(spc));
121
107
  return self;
122
108
  }
123
109
 
124
110
  static VALUE
125
- tbl_set_col_spacings(self, spc)
126
- VALUE self, spc;
111
+ tbl_set_col_spacings(VALUE self, VALUE spc)
127
112
  {
128
113
  gtk_table_set_col_spacings(_SELF(self), NUM2UINT(spc));
129
114
  return self;
130
115
  }
131
116
 
132
117
  static VALUE
133
- tbl_get_row_spacings(self)
134
- VALUE self;
118
+ tbl_get_row_spacings(VALUE self)
135
119
  {
136
120
  return UINT2NUM(_SELF(self)->row_spacing);
137
121
  }
138
122
 
139
123
  static VALUE
140
- tbl_get_col_spacings(self)
141
- VALUE self;
124
+ tbl_get_col_spacings(VALUE self)
142
125
  {
143
126
  return UINT2NUM(_SELF(self)->column_spacing);
144
127
  }
145
128
 
146
129
  static VALUE
147
- tbl_get_default_row_spacing(self)
148
- VALUE self;
130
+ tbl_get_default_row_spacing(VALUE self)
149
131
  {
150
132
  return UINT2NUM(gtk_table_get_default_row_spacing(_SELF(self)));
151
133
  }
152
134
 
153
135
  static VALUE
154
- tbl_get_default_col_spacing(self)
155
- VALUE self;
136
+ tbl_get_default_col_spacing(VALUE self)
156
137
  {
157
138
  return UINT2NUM(gtk_table_get_default_col_spacing(_SELF(self)));
158
139
  }
@@ -40,8 +40,7 @@ gtk_target_list_get_type(void)
40
40
  /**********************************/
41
41
 
42
42
  static VALUE
43
- target_list_initialize(self, targets)
44
- VALUE self, targets;
43
+ target_list_initialize(VALUE self, VALUE targets)
45
44
  {
46
45
  Check_Type(targets, T_ARRAY);
47
46
  G_INITIALIZE(self, gtk_target_list_new(
@@ -51,8 +50,7 @@ target_list_initialize(self, targets)
51
50
  }
52
51
 
53
52
  static VALUE
54
- target_list_add(self, target, flags, info)
55
- VALUE self, target, flags, info;
53
+ target_list_add(VALUE self, VALUE target, VALUE flags, VALUE info)
56
54
  {
57
55
  gtk_target_list_add(_SELF(self), RVAL2ATOM(target),
58
56
  FIX2UINT(flags), FIX2UINT(info));
@@ -60,8 +58,7 @@ target_list_add(self, target, flags, info)
60
58
  }
61
59
 
62
60
  static VALUE
63
- target_list_add_table(self, targets)
64
- VALUE self, targets;
61
+ target_list_add_table(VALUE self, VALUE targets)
65
62
  {
66
63
  gtk_target_list_add_table(_SELF(self),
67
64
  rbgtk_get_target_entry(targets),
@@ -71,24 +68,21 @@ target_list_add_table(self, targets)
71
68
 
72
69
  #if GTK_CHECK_VERSION(2,6,0)
73
70
  static VALUE
74
- target_list_add_text_targets(self, info)
75
- VALUE self, info;
71
+ target_list_add_text_targets(VALUE self, VALUE info)
76
72
  {
77
73
  gtk_target_list_add_text_targets(_SELF(self), NUM2UINT(info));
78
74
  return self;
79
75
  }
80
76
 
81
77
  static VALUE
82
- target_list_add_image_targets(self, info, writable)
83
- VALUE self, info, writable;
78
+ target_list_add_image_targets(VALUE self, VALUE info, VALUE writable)
84
79
  {
85
80
  gtk_target_list_add_image_targets(_SELF(self), NUM2UINT(info), RVAL2CBOOL(writable));
86
81
  return self;
87
82
  }
88
83
 
89
84
  static VALUE
90
- target_list_add_uri_targets(self, info)
91
- VALUE self, info;
85
+ target_list_add_uri_targets(VALUE self, VALUE info)
92
86
  {
93
87
  gtk_target_list_add_uri_targets(_SELF(self), NUM2UINT(info));
94
88
  return self;
@@ -97,8 +91,7 @@ target_list_add_uri_targets(self, info)
97
91
 
98
92
  #if GTK_CHECK_VERSION(2,10,0)
99
93
  static VALUE
100
- target_list_add_rich_text_targets(self, info, deserializable, buffer)
101
- VALUE self, info, deserializable, buffer;
94
+ target_list_add_rich_text_targets(VALUE self, VALUE info, VALUE deserializable, VALUE buffer)
102
95
  {
103
96
  gtk_target_list_add_rich_text_targets(_SELF(self), NUM2UINT(info),
104
97
  RVAL2CBOOL(deserializable),
@@ -108,16 +101,14 @@ target_list_add_rich_text_targets(self, info, deserializable, buffer)
108
101
  #endif
109
102
 
110
103
  static VALUE
111
- target_list_remove(self, target)
112
- VALUE self, target;
104
+ target_list_remove(VALUE self, VALUE target)
113
105
  {
114
106
  gtk_target_list_remove(_SELF(self), RVAL2ATOM(target));
115
107
  return self;
116
108
  }
117
109
 
118
110
  static VALUE
119
- target_list_find(self, target)
120
- VALUE self, target;
111
+ target_list_find(VALUE self, VALUE target)
121
112
  {
122
113
  guint info;
123
114
  gboolean ret = gtk_target_list_find(_SELF(self), RVAL2ATOM(target),
@@ -15,8 +15,7 @@
15
15
  #include "global.h"
16
16
 
17
17
  static VALUE
18
- tmitem_initialize(self)
19
- VALUE self;
18
+ tmitem_initialize(VALUE self)
20
19
  {
21
20
  RBGTK_INITIALIZE(self, gtk_tearoff_menu_item_new());
22
21
  return Qnil;
@@ -39,14 +39,12 @@ gtk_text_appearance_get_type(void)
39
39
  /***********************************************/
40
40
  #define ATTR_INT(name)\
41
41
  static VALUE \
42
- txt_app_int_ ## name (self)\
43
- VALUE self;\
42
+ txt_app_int_ ## name (VALUE self)\
44
43
  {\
45
44
  return INT2NUM(_SELF(self)->name);\
46
45
  }\
47
46
  static VALUE \
48
- txt_app_int_set_ ## name (self, val)\
49
- VALUE self, val;\
47
+ txt_app_int_set_ ## name (VALUE self, VALUE val)\
50
48
  {\
51
49
  _SELF(self)->name = NUM2INT(val); \
52
50
  return self;\
@@ -54,14 +52,12 @@ txt_app_int_set_ ## name (self, val)\
54
52
 
55
53
  #define ATTR_BOOL(name)\
56
54
  static VALUE \
57
- txt_app_bool_ ## name (self)\
58
- VALUE self;\
55
+ txt_app_bool_ ## name (VALUE self)\
59
56
  {\
60
57
  return CBOOL2RVAL(_SELF(self)->name);\
61
58
  }\
62
59
  static VALUE \
63
- txt_app_bool_set_ ## name (self, val)\
64
- VALUE self, val;\
60
+ txt_app_bool_set_ ## name (VALUE self, VALUE val)\
65
61
  {\
66
62
  _SELF(self)->name = RVAL2CBOOL(val);\
67
63
  return self;\
@@ -69,14 +65,12 @@ txt_app_bool_set_ ## name (self, val)\
69
65
 
70
66
  #define ATTR_ENUM(name, gtype)\
71
67
  static VALUE \
72
- txt_app_enums_ ## name (self)\
73
- VALUE self;\
68
+ txt_app_enums_ ## name (VALUE self)\
74
69
  {\
75
70
  return GENUM2RVAL(_SELF(self)->name, gtype);\
76
71
  }\
77
72
  static VALUE \
78
- txt_app_enums_set_ ## name (self, val)\
79
- VALUE self, val;\
73
+ txt_app_enums_set_ ## name (VALUE self, VALUE val)\
80
74
  {\
81
75
  _SELF(self)->name = RVAL2GENUM(val, gtype);\
82
76
  return self;\
@@ -84,8 +78,7 @@ txt_app_enums_set_ ## name (self, val)\
84
78
 
85
79
  #define ATTR_GOBJ(name)\
86
80
  static VALUE \
87
- txt_app_gobj_ ## name (self)\
88
- VALUE self;\
81
+ txt_app_gobj_ ## name (VALUE self)\
89
82
  {\
90
83
  VALUE val; \
91
84
  if (_SELF(self)->name == NULL) return Qnil;\
@@ -94,8 +87,7 @@ txt_app_gobj_ ## name (self)\
94
87
  return val; \
95
88
  }\
96
89
  static VALUE \
97
- txt_app_gobj_set_ ## name (self, val)\
98
- VALUE self, val;\
90
+ txt_app_gobj_set_ ## name (VALUE self, VALUE val)\
99
91
  {\
100
92
  _SELF(self)->name = RVAL2GOBJ(val);\
101
93
  G_CHILD_SET(self, rb_intern(G_STRINGIFY(name)), val);\
@@ -104,16 +96,14 @@ txt_app_gobj_set_ ## name (self, val)\
104
96
 
105
97
  #define ATTR_COLOR(name)\
106
98
  static VALUE \
107
- txt_app_color_ ## name (self)\
108
- VALUE self;\
99
+ txt_app_color_ ## name (VALUE self)\
109
100
  {\
110
101
  VALUE val = BOXED2RVAL(&_SELF(self)->name, GDK_TYPE_COLOR);\
111
102
  G_CHILD_SET(self, rb_intern(G_STRINGIFY(name)), val);\
112
103
  return val;\
113
104
  }\
114
105
  static VALUE \
115
- txt_app_color_set_ ## name (self, val)\
116
- VALUE self, val;\
106
+ txt_app_color_set_ ## name (VALUE self, VALUE val)\
117
107
  {\
118
108
  G_CHILD_SET(self, rb_intern(G_STRINGIFY(name)), val);\
119
109
  _SELF(self)->name = *RVAL2GDKCOLOR(val); \
@@ -137,8 +127,7 @@ ATTR_BOOL(inside_selection);
137
127
  ATTR_BOOL(is_text);
138
128
 
139
129
  static VALUE
140
- txt_app_initialize(self)
141
- VALUE self;
130
+ txt_app_initialize(VALUE self)
142
131
  {
143
132
  GtkTextAppearance* app = ALLOC(GtkTextAppearance);
144
133
  memset(app, 0, sizeof(GtkTextAppearance));
@@ -16,14 +16,12 @@
16
16
  /***********************************************/
17
17
  #define ATTR_INT(name)\
18
18
  static VALUE \
19
- txt_attr_int_ ## name (self)\
20
- VALUE self;\
19
+ txt_attr_int_ ## name (VALUE self)\
21
20
  {\
22
21
  return INT2NUM(_SELF(self)->name);\
23
22
  }\
24
23
  static VALUE \
25
- txt_attr_int_set_ ## name (self, val)\
26
- VALUE self, val;\
24
+ txt_attr_int_set_ ## name (VALUE self, VALUE val)\
27
25
  {\
28
26
  _SELF(self)->name = NUM2INT(val); \
29
27
  return self;\
@@ -31,14 +29,12 @@ txt_attr_int_set_ ## name (self, val)\
31
29
 
32
30
  #define ATTR_BOOL(name)\
33
31
  static VALUE \
34
- txt_attr_bool_ ## name (self)\
35
- VALUE self;\
32
+ txt_attr_bool_ ## name (VALUE self)\
36
33
  {\
37
34
  return CBOOL2RVAL(_SELF(self)->name);\
38
35
  }\
39
36
  static VALUE \
40
- txt_attr_bool_set_ ## name (self, val)\
41
- VALUE self, val;\
37
+ txt_attr_bool_set_ ## name (VALUE self, VALUE val)\
42
38
  {\
43
39
  _SELF(self)->name = RVAL2CBOOL(val);\
44
40
  return self;\
@@ -46,14 +42,12 @@ txt_attr_bool_set_ ## name (self, val)\
46
42
 
47
43
  #define ATTR_FLAGS(name, gtype)\
48
44
  static VALUE \
49
- txt_attr_flags_ ## name (self)\
50
- VALUE self;\
45
+ txt_attr_flags_ ## name (VALUE self)\
51
46
  {\
52
47
  return GFLAGS2RVAL(_SELF(self)->name, gtype);\
53
48
  }\
54
49
  static VALUE \
55
- txt_attr_flags_set_ ## name (self, val)\
56
- VALUE self, val;\
50
+ txt_attr_flags_set_ ## name (VALUE self, VALUE val)\
57
51
  {\
58
52
  _SELF(self)->name = RVAL2GFLAGS(val, gtype);\
59
53
  return self;\
@@ -61,14 +55,12 @@ txt_attr_flags_set_ ## name (self, val)\
61
55
 
62
56
  #define ATTR_ENUM(name, gtype)\
63
57
  static VALUE \
64
- txt_attr_enums_ ## name (self)\
65
- VALUE self;\
58
+ txt_attr_enums_ ## name (VALUE self)\
66
59
  {\
67
60
  return GENUM2RVAL(_SELF(self)->name, gtype);\
68
61
  }\
69
62
  static VALUE \
70
- txt_attr_enums_set_ ## name (self, val)\
71
- VALUE self, val;\
63
+ txt_attr_enums_set_ ## name (VALUE self, VALUE val)\
72
64
  {\
73
65
  _SELF(self)->name = RVAL2GENUM(val, gtype);\
74
66
  return self;\
@@ -76,8 +68,7 @@ txt_attr_enums_set_ ## name (self, val)\
76
68
 
77
69
  #define ATTR_BOXED(name, gtype)\
78
70
  static VALUE \
79
- txt_attr_boxed_ ## name (self)\
80
- VALUE self;\
71
+ txt_attr_boxed_ ## name (VALUE self)\
81
72
  {\
82
73
  VALUE val; \
83
74
  if (_SELF(self)->name == NULL) return Qnil;\
@@ -86,8 +77,7 @@ txt_attr_boxed_ ## name (self)\
86
77
  return val;\
87
78
  }\
88
79
  static VALUE \
89
- txt_attr_boxed_set_ ## name (self, val)\
90
- VALUE self, val;\
80
+ txt_attr_boxed_set_ ## name (VALUE self, VALUE val)\
91
81
  {\
92
82
  G_CHILD_SET(self, rb_intern(G_STRINGIFY(name)), val);\
93
83
  _SELF(self)->name = RVAL2BOXED(val, gtype);\
@@ -100,15 +90,13 @@ txt_attr_boxed_set_ ## name (self, val)\
100
90
 
101
91
  /***********************************************/
102
92
  static VALUE
103
- txt_attr_boxed_appearance(self)
104
- VALUE self;
93
+ txt_attr_boxed_appearance(VALUE self)
105
94
  {
106
95
  GtkTextAppearance app = _SELF(self)->appearance;
107
96
  return BOXED2RVAL(&app, GTK_TYPE_TEXT_APPEARANCE);
108
97
  }
109
98
  static VALUE
110
- txt_attr_boxed_set_appearance(self, val)
111
- VALUE self, val;
99
+ txt_attr_boxed_set_appearance(VALUE self, VALUE val)
112
100
  {
113
101
  GtkTextAppearance* app = (GtkTextAppearance*)RVAL2BOXED(val, GTK_TYPE_TEXT_APPEARANCE);
114
102
  _SELF(self)->appearance = *app;
@@ -120,14 +108,12 @@ ATTR_ENUM(direction, GTK_TYPE_DIRECTION_TYPE);
120
108
  ATTR_BOXED(font, PANGO_TYPE_FONT_DESCRIPTION);
121
109
 
122
110
  static VALUE
123
- txt_attr_double_font_scale(self)
124
- VALUE self;
111
+ txt_attr_double_font_scale(VALUE self)
125
112
  {
126
113
  return rb_float_new(_SELF(self)->font_scale);
127
114
  }
128
115
  static VALUE
129
- txt_attr_double_set_font_scale(self, val)
130
- VALUE self, val;
116
+ txt_attr_double_set_font_scale(VALUE self, VALUE val)
131
117
  {
132
118
  _SELF(self)->font_scale = NUM2DBL(val);
133
119
  return self;
@@ -153,8 +139,7 @@ ATTR_BOOL(realized);
153
139
  /***********************************************/
154
140
 
155
141
  static VALUE
156
- txt_attr_initialize(self)
157
- VALUE self;
142
+ txt_attr_initialize(VALUE self)
158
143
  {
159
144
  GtkTextAttributes *attr;
160
145
 
@@ -164,8 +149,7 @@ txt_attr_initialize(self)
164
149
  }
165
150
 
166
151
  static VALUE
167
- txt_attr_copy_values(self, dest)
168
- VALUE self;
152
+ txt_attr_copy_values(VALUE self, VALUE dest)
169
153
  {
170
154
  gtk_text_attributes_copy_values(_SELF(self), _SELF(dest));
171
155
  return self;