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

Sign up to get free protection for your applications and to get access to all the features.
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
data/ChangeLog CHANGED
@@ -1,3 +1,65 @@
1
+ 2011-02-28 Vincent Carmona
2
+
3
+ * sample/gtk-demo/main.rb: Add gtk-demo directory to $: to fix
4
+ bugs with ruby1.9.
5
+ * sample/gtk-demo/textview.rb: add coding header.
6
+
7
+ 2011-02-25 Kouhei Sutou <kou@cozmixng.org>
8
+
9
+ * ext/gtk2/rbgtk.c (remove_from_windows): add nil check for GC
10
+ finalizer at exit. [#3046538]
11
+ Reported by Vincent Carmona. Thanks!!!
12
+
13
+ * lib/gtk2/base.rb: require 'gdk_pixbuf2' before require 'gtk2'.
14
+ Patch by id:kenhys. Thanks!!!
15
+
16
+ 2011-02-19 Kouhei Sutou <kou@cozmixng.org>
17
+
18
+ * ext/gtk2/extconf.rb (InitCreator#run): support 'void' as
19
+ argument declaration.
20
+
21
+ 2011-02-19 Masaaki Aoyagi
22
+
23
+ * ext/gtk2/rbgtkspinner.c: add.
24
+
25
+ * ext/gtk2/rbgtkcellrendererspinner.c: add.
26
+
27
+ * ext/gtk2/rbgtknotebook.c: add methods.
28
+ Gtk::Notebook#set_action_widget
29
+ Gtk::Notebook#get_action_widget
30
+
31
+ 2011-02-06 Kouhei Sutou <kou@cozmixng.org>
32
+
33
+ * ext/gtk2/rbgtktreeview.c (row_separator_func): fix type.
34
+
35
+ 2011-02-05 Masaaki Aoyagi
36
+
37
+ * ext/gtk2/*.c: change to ANSI C style.
38
+
39
+ 2011-02-04 Masaaki Aoyagi
40
+
41
+ * ext/gtk2/rbgdkdisplay.c: fix declaration.
42
+
43
+ * ext/gtk2/rbgdkimage.c: fix declaration.
44
+
45
+ * ext/gtk2/rbgtkalignment.c: fix declaration.
46
+
47
+ * ext/gtk2/rbgtkclipboard.c: fix declaration.
48
+
49
+ * ext/gtk2/rbgtkfixed.c: fix declaration.
50
+
51
+ * ext/gtk2/rbgtkimcontext.c: fix declaration.
52
+
53
+ * ext/gtk2/rbgtkmain.c: fix declaration.
54
+
55
+ * ext/gtk2/rbgtktextattributes.c: fix declaration.
56
+
57
+ * ext/gtk2/rbgtktreemodel.c: fix declaration.
58
+
59
+ * ext/gtk2/rbgtktreeview.c: fix declaration.
60
+
61
+ * ext/gtk2/rbgtkwidget.c: fix declaration.
62
+
1
63
  2011-01-31 Kouhei Sutou <kou@cozmixng.org>
2
64
 
3
65
  * Rakefile: create default gtkrc to use "MS-Windows" GTK+ theme.
@@ -112,7 +112,7 @@ class InitCreator
112
112
  except_targets = ["Init_gtk2()", "Init_gtk_gdk()", "Init_gtk_gtk()"]
113
113
  @targets.each do |target|
114
114
  target.each_line do |line|
115
- if /^(Init_.*\(\))(.*)/ =~ line
115
+ if /^(Init_.*\((?:void)?\))(.*)/ =~ line
116
116
  init = $1
117
117
  unless except_targets.include?(init)
118
118
  flag = $2
@@ -134,7 +134,7 @@ class InitCreator
134
134
  print_data(inits, "GTK_DISABLE_DEPRECATED", "ifndef", true)
135
135
  print_data(inits, "GTK_ENABLE_BROKEN", "ifdef", true)
136
136
 
137
- print "void Init_gtk_inits()\n"
137
+ print "void Init_gtk_inits(void)\n"
138
138
  print "{\n"
139
139
  print_data(inits, "", nil)
140
140
  print_data(inits, "GTK_DISABLE_DEPRECATED", "ifndef")
@@ -27,23 +27,20 @@ void gdk_parse_args (gint *argc,
27
27
 
28
28
  #if GTK_CHECK_VERSION(2,2,0)
29
29
  static VALUE
30
- gdk_s_get_display_arg_name(self)
31
- VALUE self;
30
+ gdk_s_get_display_arg_name(VALUE self)
32
31
  {
33
32
  return CSTR2RVAL(gdk_get_display_arg_name());
34
33
  }
35
34
  #endif
36
35
 
37
36
  static VALUE
38
- gdk_s_set_locale(self)
39
- VALUE self;
37
+ gdk_s_set_locale(VALUE self)
40
38
  {
41
39
  return CSTR2RVAL(gdk_set_locale());
42
40
  }
43
41
 
44
42
  static VALUE
45
- gdk_s_set_sm_client_id(self, id)
46
- VALUE self, id;
43
+ gdk_s_set_sm_client_id(VALUE self, VALUE id)
47
44
  {
48
45
  gdk_set_sm_client_id(NIL_P(id) ? NULL : RVAL2CSTR(id));
49
46
  return self;
@@ -73,23 +70,20 @@ gdk_s_notify_startup_complete(int argc, VALUE *argv, VALUE self)
73
70
  #endif
74
71
 
75
72
  static VALUE
76
- gdk_s_get_program_class(self)
77
- VALUE self;
73
+ gdk_s_get_program_class(VALUE self)
78
74
  {
79
75
  return CSTR2RVAL(gdk_get_program_class());
80
76
  }
81
77
 
82
78
  static VALUE
83
- gdk_s_set_program_class(self, program_class)
84
- VALUE self, program_class;
79
+ gdk_s_set_program_class(VALUE self, VALUE program_class)
85
80
  {
86
81
  gdk_set_program_class(RVAL2CSTR(program_class));
87
82
  return self;
88
83
  }
89
84
 
90
85
  static VALUE
91
- gdk_s_get_display(self)
92
- VALUE self;
86
+ gdk_s_get_display(VALUE self)
93
87
  {
94
88
  return CSTR2RVAL(gdk_get_display());
95
89
  }
@@ -103,9 +97,7 @@ static VALUE rb_x_error;
103
97
  static VALUE rb_x_io_error;
104
98
 
105
99
  static int
106
- rbgdk_x_error(display, error)
107
- Display* display;
108
- XErrorEvent* error;
100
+ rbgdk_x_error(Display *display, XErrorEvent *error)
109
101
  {
110
102
  gchar buf[64];
111
103
 
@@ -118,8 +110,7 @@ rbgdk_x_error(display, error)
118
110
  }
119
111
 
120
112
  static int
121
- rbgdk_x_io_error(display)
122
- Display* display;
113
+ rbgdk_x_io_error(Display *display)
123
114
  {
124
115
  int errno_saved = errno;
125
116
  const gchar* disp;
@@ -143,8 +134,7 @@ rbgdk_x_io_error(display)
143
134
  #endif
144
135
 
145
136
  static VALUE
146
- gdk_s_set_x_error_handler(self)
147
- VALUE self;
137
+ gdk_s_set_x_error_handler(VALUE self)
148
138
  {
149
139
  #ifdef HAVE_XGETERRORTEXT
150
140
  rb_x_error = rb_block_proc();
@@ -157,8 +147,7 @@ gdk_s_set_x_error_handler(self)
157
147
  }
158
148
 
159
149
  static VALUE
160
- gdk_s_set_x_io_error_handler(self)
161
- VALUE self;
150
+ gdk_s_set_x_io_error_handler(VALUE self)
162
151
  {
163
152
  #ifdef HAVE_XGETERRORTEXT
164
153
  rb_x_io_error = rb_block_proc();
@@ -171,44 +160,38 @@ gdk_s_set_x_io_error_handler(self)
171
160
  }
172
161
 
173
162
  static VALUE
174
- gdk_s_flush(self)
175
- VALUE self;
163
+ gdk_s_flush(VALUE self)
176
164
  {
177
165
  gdk_flush();
178
166
  return self;
179
167
  }
180
168
 
181
169
  static VALUE
182
- gdk_s_screen_width(self)
183
- VALUE self;
170
+ gdk_s_screen_width(VALUE self)
184
171
  {
185
172
  return INT2NUM(gdk_screen_width());
186
173
  }
187
174
 
188
175
  static VALUE
189
- gdk_s_screen_width_mm(self)
190
- VALUE self;
176
+ gdk_s_screen_width_mm(VALUE self)
191
177
  {
192
178
  return INT2NUM(gdk_screen_width_mm());
193
179
  }
194
180
 
195
181
  static VALUE
196
- gdk_s_screen_height(self)
197
- VALUE self;
182
+ gdk_s_screen_height(VALUE self)
198
183
  {
199
184
  return INT2NUM(gdk_screen_height());
200
185
  }
201
186
 
202
187
  static VALUE
203
- gdk_s_screen_height_mm(self)
204
- VALUE self;
188
+ gdk_s_screen_height_mm(VALUE self)
205
189
  {
206
190
  return INT2NUM(gdk_screen_height_mm());
207
191
  }
208
192
 
209
193
  static VALUE
210
- gdk_s_pointer_grab(self, win, owner_events, event_mask, confine_to, cursor, time)
211
- VALUE self, win, owner_events, event_mask, confine_to, cursor, time;
194
+ gdk_s_pointer_grab(VALUE self, VALUE win, VALUE owner_events, VALUE event_mask, VALUE confine_to, VALUE cursor, VALUE time)
212
195
  {
213
196
  return GENUM2RVAL(gdk_pointer_grab(GDK_WINDOW(RVAL2GOBJ(win)),
214
197
  RVAL2CBOOL(owner_events),
@@ -219,16 +202,14 @@ gdk_s_pointer_grab(self, win, owner_events, event_mask, confine_to, cursor, time
219
202
  }
220
203
 
221
204
  static VALUE
222
- gdk_s_pointer_ungrab(self, time)
223
- VALUE self, time;
205
+ gdk_s_pointer_ungrab(VALUE self, VALUE time)
224
206
  {
225
207
  gdk_pointer_ungrab(NUM2INT(time));
226
208
  return self;
227
209
  }
228
210
 
229
211
  static VALUE
230
- gdk_s_keyboard_grab(self, win, owner_events, time)
231
- VALUE self, win, owner_events, time;
212
+ gdk_s_keyboard_grab(VALUE self, VALUE win, VALUE owner_events, VALUE time)
232
213
  {
233
214
  return GENUM2RVAL(gdk_keyboard_grab(GDK_WINDOW(RVAL2GOBJ(win)),
234
215
  RVAL2CBOOL(owner_events), NUM2INT(time)),
@@ -236,55 +217,48 @@ gdk_s_keyboard_grab(self, win, owner_events, time)
236
217
  }
237
218
 
238
219
  static VALUE
239
- gdk_s_keyboard_ungrab(self, time)
240
- VALUE self, time;
220
+ gdk_s_keyboard_ungrab(VALUE self, VALUE time)
241
221
  {
242
222
  gdk_keyboard_ungrab(NUM2INT(time));
243
223
  return self;
244
224
  }
245
225
 
246
226
  static VALUE
247
- gdk_s_pointer_is_grabbed(self)
248
- VALUE self;
227
+ gdk_s_pointer_is_grabbed(VALUE self)
249
228
  {
250
229
  return CBOOL2RVAL(gdk_pointer_is_grabbed());
251
230
  }
252
231
 
253
232
  static VALUE
254
- gdk_s_set_double_click_time(self, msec)
255
- VALUE self, msec;
233
+ gdk_s_set_double_click_time(VALUE self, VALUE msec)
256
234
  {
257
235
  gdk_set_double_click_time(NUM2UINT(msec));
258
236
  return self;
259
237
  }
260
238
 
261
239
  static VALUE
262
- gdk_s_beep(self)
263
- VALUE self;
240
+ gdk_s_beep(VALUE self)
264
241
  {
265
242
  gdk_beep();
266
243
  return self;
267
244
  }
268
245
 
269
246
  static VALUE
270
- gdk_s_error_trap_push(self)
271
- VALUE self;
247
+ gdk_s_error_trap_push(VALUE self)
272
248
  {
273
249
  gdk_error_trap_push();
274
250
  return self;
275
251
  }
276
252
 
277
253
  static VALUE
278
- gdk_s_error_trap_pop(self)
279
- VALUE self;
254
+ gdk_s_error_trap_pop(VALUE self)
280
255
  {
281
256
  gdk_error_trap_pop();
282
257
  return self;
283
258
  }
284
259
 
285
260
  static VALUE
286
- gdk_s_windowing_x11(self)
287
- VALUE self;
261
+ gdk_s_windowing_x11(VALUE self)
288
262
  {
289
263
  #ifdef GDK_WINDOWING_X11
290
264
  return Qtrue;
@@ -294,8 +268,7 @@ gdk_s_windowing_x11(self)
294
268
  }
295
269
 
296
270
  static VALUE
297
- gdk_s_windowing_win32(self)
298
- VALUE self;
271
+ gdk_s_windowing_win32(VALUE self)
299
272
  {
300
273
  #ifdef GDK_WINDOWING_WIN32
301
274
  return Qtrue;
@@ -305,8 +278,7 @@ gdk_s_windowing_win32(self)
305
278
  }
306
279
 
307
280
  static VALUE
308
- gdk_s_windowing_fb(self)
309
- VALUE self;
281
+ gdk_s_windowing_fb(VALUE self)
310
282
  {
311
283
  #ifdef GDK_WINDOWING_FB
312
284
  return Qtrue;
@@ -316,8 +288,7 @@ gdk_s_windowing_fb(self)
316
288
  }
317
289
 
318
290
  static VALUE
319
- gdk_s_windowing_quartz(self)
320
- VALUE self;
291
+ gdk_s_windowing_quartz(VALUE self)
321
292
  {
322
293
  #ifdef GDK_WINDOWING_QUARTZ
323
294
  return Qtrue;
@@ -327,8 +298,7 @@ gdk_s_windowing_quartz(self)
327
298
  }
328
299
 
329
300
  static VALUE
330
- gdk_s_windowing_directfb(self)
331
- VALUE self;
301
+ gdk_s_windowing_directfb(VALUE self)
332
302
  {
333
303
  #ifdef GDK_WINDOWING_DIRECTFB
334
304
  return Qtrue;
@@ -338,8 +308,7 @@ gdk_s_windowing_directfb(self)
338
308
  }
339
309
 
340
310
  static VALUE
341
- gdk_m_target(self)
342
- VALUE self;
311
+ gdk_m_target(VALUE self)
343
312
  {
344
313
  return CSTR2RVAL(RUBY_GTK2_TARGET);
345
314
  }
@@ -37,8 +37,7 @@ gdk_atom_get_type (void)
37
37
 
38
38
 
39
39
  GdkAtom
40
- get_gdkatom(atom)
41
- VALUE atom;
40
+ get_gdkatom(VALUE atom)
42
41
  {
43
42
  if (TYPE(atom) == T_STRING)
44
43
  return gdk_atom_intern(RVAL2CSTR(atom), FALSE);
@@ -47,10 +46,7 @@ get_gdkatom(atom)
47
46
  /*****************************************/
48
47
 
49
48
  static VALUE
50
- gdkatom_s_intern(argc, argv, self)
51
- int argc;
52
- VALUE *argv;
53
- VALUE self;
49
+ gdkatom_s_intern(int argc, VALUE *argv, VALUE self)
54
50
  {
55
51
  VALUE name;
56
52
  VALUE exist;
@@ -66,8 +62,7 @@ GdkAtom gdk_atom_intern_static_string(const gchar *atom_name);
66
62
  */
67
63
 
68
64
  static VALUE
69
- gdkatom_initialize(self, num)
70
- VALUE self, num;
65
+ gdkatom_initialize(VALUE self, VALUE num)
71
66
  {
72
67
  guint atom = FIX2INT(num);
73
68
  if (atom == 0){
@@ -82,22 +77,19 @@ gdkatom_initialize(self, num)
82
77
  }
83
78
 
84
79
  static VALUE
85
- gdkatom_name(self)
86
- VALUE self;
80
+ gdkatom_name(VALUE self)
87
81
  {
88
82
  return CSTR2RVAL_FREE(gdk_atom_name(_SELF(self)));
89
83
  }
90
84
 
91
85
  static VALUE
92
- gdkatom_to_i(self)
93
- VALUE self;
86
+ gdkatom_to_i(VALUE self)
94
87
  {
95
88
  return UINT2NUM(GPOINTER_TO_UINT(_SELF(self)));
96
89
  }
97
90
 
98
91
  static VALUE
99
- gdkatom_eq(self, other)
100
- VALUE self, other;
92
+ gdkatom_eq(VALUE self, VALUE other)
101
93
  {
102
94
  return CBOOL2RVAL(_SELF(self) == _SELF(other));
103
95
  }
@@ -24,8 +24,7 @@
24
24
  #define _SELF(self) RVAL2CRCONTEXT(self)
25
25
 
26
26
  static VALUE
27
- gdkdraw_cairo_set_source_color(self, color)
28
- VALUE self, color;
27
+ gdkdraw_cairo_set_source_color(VALUE self, VALUE color)
29
28
  {
30
29
  gdk_cairo_set_source_color(_SELF(self), RVAL2GDKCOLOR(color));
31
30
  rb_cairo_check_status(cairo_status(_SELF(self)));
@@ -49,8 +48,7 @@ gdkdraw_cairo_set_source_pixbuf(int argc, VALUE *argv, VALUE self)
49
48
 
50
49
  #if GTK_CHECK_VERSION(2,10,0)
51
50
  static VALUE
52
- gdkdraw_cairo_set_source_pixmap(self, pixmap, pixmap_x, pixmap_y)
53
- VALUE self, pixmap, pixmap_x, pixmap_y;
51
+ gdkdraw_cairo_set_source_pixmap(VALUE self, VALUE pixmap, VALUE pixmap_x, VALUE pixmap_y)
54
52
  {
55
53
  gdk_cairo_set_source_pixmap(_SELF(self), GDK_PIXMAP(RVAL2GOBJ(pixmap)),
56
54
  NUM2DBL(pixmap_x), NUM2DBL(pixmap_y));
@@ -60,8 +58,7 @@ gdkdraw_cairo_set_source_pixmap(self, pixmap, pixmap_x, pixmap_y)
60
58
  #endif
61
59
 
62
60
  static VALUE
63
- gdkdraw_cairo_rectangle(self, rectangle)
64
- VALUE self, rectangle;
61
+ gdkdraw_cairo_rectangle(VALUE self, VALUE rectangle)
65
62
  {
66
63
  gdk_cairo_rectangle(_SELF(self),
67
64
  (GdkRectangle*)RVAL2BOXED(rectangle, GDK_TYPE_RECTANGLE));
@@ -70,8 +67,7 @@ gdkdraw_cairo_rectangle(self, rectangle)
70
67
  }
71
68
 
72
69
  static VALUE
73
- gdkdraw_cairo_region(self, region)
74
- VALUE self, region;
70
+ gdkdraw_cairo_region(VALUE self, VALUE region)
75
71
  {
76
72
  gdk_cairo_region(_SELF(self), (GdkRegion*)RVAL2BOXED(region, GDK_TYPE_REGION));
77
73
  rb_cairo_check_status(cairo_status(_SELF(self)));