gtk3 1.2.6-x86-mingw32 → 2.0.0-x86-mingw32

Sign up to get free protection for your applications and to get access to all the features.
data/Rakefile CHANGED
@@ -1,20 +1,22 @@
1
1
  # -*- ruby -*-
2
2
 
3
3
  $LOAD_PATH.unshift("./../glib2/lib")
4
- require 'gnome2-raketask'
4
+ require 'gnome2/rake/package-task'
5
5
 
6
- package = GNOME2Package.new do |_package|
7
- _package.summary = "Ruby/GTK3 is a Ruby binding of GTK+-3.x."
8
- _package.description = "Ruby/GTK3 is a Ruby binding of GTK+-3.x."
9
- _package.dependency.gem.runtime = ["glib2",
10
- "gio2",
11
- "atk",
12
- "pango",
13
- "gdk_pixbuf2",
14
- "gdk3"]
15
- _package.win32.packages = ["gtk+"]
16
- _package.win32.dependencies = []
17
- _package.required_ruby_version = ">= 1.9.2"
18
- _package.post_install_message = "This library is experimental."
6
+ package_task = GNOME2::Rake::PackageTask.new do |package|
7
+ package.summary = "Ruby/GTK3 is a Ruby binding of GTK+-3.x."
8
+ package.description = "Ruby/GTK3 is a Ruby binding of GTK+-3.x."
9
+ package.dependency.gem.runtime = [
10
+ "glib2",
11
+ "gio2",
12
+ "atk",
13
+ "pango",
14
+ "gdk_pixbuf2",
15
+ "gdk3",
16
+ ]
17
+ package.windows.packages = []
18
+ package.windows.dependencies = []
19
+ package.required_ruby_version = ">= 1.9.2"
20
+ package.post_install_message = "This library is experimental."
19
21
  end
20
- package.define_tasks
22
+ package_task.define
@@ -83,6 +83,17 @@ rg_get_iter(VALUE self, VALUE path)
83
83
  return val;
84
84
  }
85
85
 
86
+ static VALUE
87
+ rg_get_path(VALUE self, VALUE iter)
88
+ {
89
+ GtkTreePath *path;
90
+ VALUE rb_path;
91
+ path = gtk_tree_model_get_path(_SELF(self), RVAL2GTKTREEITER(iter));
92
+ rb_path = GTKTREEPATH2RVAL(path);
93
+ gtk_tree_path_free(path);
94
+ return rb_path;
95
+ }
96
+
86
97
  static VALUE
87
98
  rg_get_value(VALUE self, VALUE iter, VALUE column)
88
99
  {
@@ -216,6 +227,7 @@ Init_gtk_treemodel(VALUE mGtk)
216
227
  RG_DEF_METHOD(get_column_type, 1);
217
228
  RG_DEF_METHOD(iter_first, 0);
218
229
  RG_DEF_METHOD(get_iter, 1);
230
+ RG_DEF_METHOD(get_path, 1);
219
231
  RG_DEF_METHOD(get_value, 2);
220
232
  RG_DEF_METHOD(each, 0);
221
233
  RG_DEF_METHOD(row_changed, 2);
Binary file
Binary file
@@ -10,7 +10,7 @@ require 'gdk3'
10
10
  base_dir = Pathname.new(__FILE__).dirname.dirname.dirname.expand_path
11
11
  vendor_dir = base_dir + "vendor" + "local"
12
12
  vendor_bin_dir = vendor_dir + "bin"
13
- GLib.prepend_environment_path(vendor_bin_dir)
13
+ GLib.prepend_dll_path(vendor_bin_dir)
14
14
  begin
15
15
  major, minor, _ = RUBY_VERSION.split(/\./)
16
16
  require "#{major}.#{minor}/gtk3.so"
@@ -111,8 +111,8 @@ module Demo
111
111
 
112
112
  ## Create document
113
113
  sw = Gtk::ScrolledWindow.new
114
- sw.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC)
115
- sw.shadow_type = Gtk::SHADOW_IN
114
+ sw.set_policy(:automatic, :automatic)
115
+ sw.shadow_type = :in
116
116
  table.attach(sw,
117
117
  # X direction # Y direction
118
118
  0, 1, 2, 3,
@@ -15,57 +15,56 @@ module Demo
15
15
  super('Button Boxes')
16
16
  set_border_width(10)
17
17
 
18
- main_vbox = Gtk::VBox.new(false, 0)
18
+ main_vbox = Gtk::Box.new(:vertical)
19
19
  add(main_vbox)
20
20
 
21
21
  frame_horiz = Gtk::Frame.new('Horizontal Button Boxes')
22
- main_vbox.pack_start(frame_horiz, true, true, 10)
22
+ main_vbox.pack_start(frame_horiz, :expand => true, :fill => true, :padding => 10)
23
23
 
24
- vbox = Gtk::VBox.new(false, 0)
24
+ vbox = Gtk::Box.new(:vertical)
25
25
  vbox.set_border_width(10)
26
26
  frame_horiz.add(vbox)
27
27
 
28
- vbox.pack_start(create_bbox(true, 'Spread', 40, Gtk::ButtonBox::SPREAD),
29
- true, true, 0)
30
-
31
- vbox.pack_start(create_bbox(true, 'Edge', 40, Gtk::ButtonBox::EDGE),
32
- true, true, 5)
33
-
34
- vbox.pack_start(create_bbox(true, 'Start', 40, Gtk::ButtonBox::START),
35
- true, true, 5)
36
-
37
- vbox.pack_start(create_bbox(true, 'End', 40, Gtk::ButtonBox::END),
38
- true, true, 5)
39
-
28
+ vbox.pack_start(create_bbox(true, 'Spread', 40, :spread),
29
+ :expand => true, :fill => true, :padding => 0)
30
+
31
+ vbox.pack_start(create_bbox(true, 'Edge', 40, :edge),
32
+ :expand => true, :fill => true, :padding => 5)
33
+
34
+ vbox.pack_start(create_bbox(true, 'Start', 40, :start),
35
+ :expand => true, :fill => true, :padding => 5)
36
+
37
+ vbox.pack_start(create_bbox(true, 'End', 40, :end),
38
+ :expand => true, :fill => true, :padding => 5)
39
+
40
40
  frame_vert = Gtk::Frame.new('Vertical Button Boxes')
41
- main_vbox.pack_start(frame_vert, true, true, 10)
41
+ main_vbox.pack_start(frame_vert, :expand => true, :fill => true, :padding => 10)
42
42
 
43
- hbox = Gtk::HBox.new(false, 0)
43
+ hbox = Gtk::Box.new(:horizontal, 0)
44
44
  hbox.set_border_width(10)
45
45
  frame_vert.add(hbox)
46
46
 
47
- hbox.pack_start(create_bbox(false, 'Spread', 30, Gtk::ButtonBox::SPREAD),
48
- true, true, 0)
49
-
50
- hbox.pack_start(create_bbox(false, 'Edge', 30, Gtk::ButtonBox::EDGE),
51
- true, true, 5)
52
-
53
- hbox.pack_start(create_bbox(false, 'Start', 30, Gtk::ButtonBox::START),
54
- true, true, 5)
55
-
56
- hbox.pack_start(create_bbox(false, 'End', 30, Gtk::ButtonBox::END),
57
- true, true, 5)
58
-
47
+ hbox.pack_start(create_bbox(false, 'Spread', 30, :spread),
48
+ :expand => true, :fill => true, :padding => 0)
49
+
50
+ hbox.pack_start(create_bbox(false, 'Edge', 30, :edge),
51
+ :expand => true, :fill => true, :padding => 5)
52
+
53
+ hbox.pack_start(create_bbox(false, 'Start', 30, :start),
54
+ :expand => true, :fill => true, :padding => 5)
55
+
56
+ hbox.pack_start(create_bbox(false, 'End', 30, :end),
57
+ :expand => true, :fill => true, :padding => 5)
59
58
  end
60
59
 
61
60
  def create_bbox(horizontal, title, spacing, layout)
62
61
  frame = Gtk::Frame.new(title)
63
-
62
+
64
63
  bbox = if horizontal
65
- Gtk::HButtonBox.new
66
- else
67
- Gtk::VButtonBox.new
68
- end
64
+ Gtk::ButtonBox.new(:horizontal)
65
+ else
66
+ Gtk::ButtonBox.new(:vertical)
67
+ end
69
68
 
70
69
  bbox.set_border_width(5)
71
70
  frame.add(bbox)
@@ -74,8 +73,8 @@ module Demo
74
73
  bbox.set_spacing(spacing)
75
74
 
76
75
  [Gtk::Stock::OK, Gtk::Stock::CANCEL, Gtk::Stock::HELP].each do |stock|
77
- button = Gtk::Button.new(stock)
78
- bbox.add(button)
76
+ button = Gtk::Button.new(:stock_id => stock)
77
+ bbox.add(button)
79
78
  end
80
79
 
81
80
  return frame
@@ -32,8 +32,8 @@ module Demo
32
32
  remove(@drawing_area)
33
33
 
34
34
  vbox = Gtk::VBox.new
35
- vbox.pack_start(@drawing_area, true, true)
36
- vbox.pack_start(operator_selector, false, false)
35
+ vbox.pack_start(@drawing_area, :expand => true, :fill => true)
36
+ vbox.pack_start(operator_selector, :expand => false, :fill => false)
37
37
  add(vbox)
38
38
  end
39
39
 
@@ -1,3 +1,5 @@
1
+ # -*- coding: utf-8 -*-
2
+ #
1
3
  # Copyright (c) 2003-2005 Ruby-GNOME2 Project Team
2
4
  # This program is licenced under the same licence as Ruby-GNOME2.
3
5
  #
@@ -54,45 +56,35 @@ module Demo
54
56
  @current_display = nil
55
57
  @current_screen = nil
56
58
 
57
- super('Change Screen or display',
58
- nil, # parent
59
- Gtk::Dialog::NO_SEPARATOR,
60
- [Gtk::Stock::CLOSE, Gtk::Dialog::RESPONSE_CLOSE],
61
- ['Change', Gtk::Dialog::RESPONSE_OK])
59
+ super(
60
+ :title => 'Change Screen or display',
61
+ :buttons => [
62
+ [:close, :close],
63
+ ['Change', :ok]
64
+ ]
65
+ )
62
66
 
63
67
  set_default_size(300, 400)
64
68
  signal_connect('response') do |dialog, response_id|
65
- if response_id == Gtk::Dialog::RESPONSE_OK
66
- if Gtk.check_version?(2, 2, 0)
67
- query_change_display
68
- else
69
- puts "This sample requires GTK+ 2.2.0 or later"
70
- end
71
- else
72
- destroy # Gtk.main_quit?
73
- end
74
- end
75
- signal_connect('destroy') do
76
-
77
- end
78
-
79
- unless Gtk.check_version?(2, 2, 0)
80
- vbox.add(Gtk::Label.new("This sample requires GTK+ 2.2.0 or later"))
81
- return
69
+ if response_id == Gtk::ResponseType::OK
70
+ query_change_display
71
+ else
72
+ destroy
73
+ end
82
74
  end
83
75
 
84
- vbox = Gtk::VBox.new(false, 5)
76
+ vbox = Gtk::Box.new(:vertical, 5)
85
77
  vbox.set_border_width(8)
86
78
 
87
- self.vbox.pack_start(vbox, true, true)
79
+ self.child.pack_start(vbox, :expand => true, :fill => true)
88
80
 
89
- @size_group = Gtk::SizeGroup.new(Gtk::SizeGroup::HORIZONTAL)
81
+ @size_group = Gtk::SizeGroup.new(:horizontal)
90
82
 
91
83
  frame = create_display_frame
92
- vbox.pack_start(frame, true, true)
84
+ vbox.pack_start(frame, :expand => true, :fill => true)
93
85
 
94
86
  frame = create_screen_frame
95
- vbox.pack_start(frame, true, true)
87
+ vbox.pack_start(frame, :expand => true, :fill => true)
96
88
 
97
89
  initialize_displays
98
90
  end
@@ -104,14 +96,14 @@ module Demo
104
96
  manager = Gdk::DisplayManager.get
105
97
 
106
98
  manager.displays.each do |display|
107
- add_display(display)
99
+ add_display(display)
108
100
  end
109
101
 
110
102
  handler_id = manager.signal_connect('display_opened') do |display|
111
- add_display(display)
103
+ add_display(display)
112
104
  end
113
105
  signal_connect('destroy') do
114
- manager.signal_handler_disconnect(handler_id)
106
+ manager.signal_handler_disconnect(handler_id)
115
107
  end
116
108
  end
117
109
 
@@ -120,17 +112,17 @@ module Demo
120
112
  @screen_model.clear
121
113
 
122
114
  if @current_display
123
- n_screens = @current_display.n_screens
115
+ n_screens = @current_display.n_screens
124
116
 
125
- n_screens.times do |i|
126
- iter = @screen_model.append
127
- iter.set_value(SCREEN_COLUMN_NUMBER, i)
128
- iter.set_value(SCREEN_COLUMN_SCREEN, @current_display.get_screen(i))
117
+ n_screens.times do |i|
118
+ iter = @screen_model.append
119
+ iter.set_value(SCREEN_COLUMN_NUMBER, i)
120
+ iter.set_value(SCREEN_COLUMN_SCREEN, @current_display.get_screen(i))
129
121
 
130
- if i == 0
131
- @screen_selection.select_iter(iter)
132
- end
133
- end
122
+ if i == 0
123
+ @screen_selection.select_iter(iter)
124
+ end
125
+ end
134
126
  end
135
127
  end
136
128
 
@@ -138,31 +130,31 @@ module Demo
138
130
  def create_display_frame
139
131
  frame, tree_view, button_vbox = create_frame('Display')
140
132
 
141
- button = left_align_button_new('_Open...')
133
+ button = left_align_button_new('_Open')
142
134
  button.signal_connect('clicked') do
143
- open_display_cb
135
+ open_display_cb
144
136
  end
145
- button_vbox.pack_start(button, false, false, 0)
137
+ button_vbox.pack_start(button, :expand => false, :fill => false, :padding => 0)
146
138
 
147
139
  button = left_align_button_new('_Close')
148
140
  button.signal_connect('clicked') do
149
- if @current_display
150
- @current_display.close
151
- end
141
+ if @current_display
142
+ @current_display.close
143
+ end
152
144
  end
153
- button_vbox.pack_start(button, false, false, 0)
145
+ button_vbox.pack_start(button, :expand => false, :fill => false, :padding => 0)
154
146
 
155
147
  @display_model = Gtk::ListStore.new(String, Gdk::Display)
156
148
  tree_view.model = @display_model
157
149
 
158
150
  column = Gtk::TreeViewColumn.new('Name',
159
- Gtk::CellRendererText.new,
160
- {'text' => DISPLAY_COLUMN_NAME})
151
+ Gtk::CellRendererText.new,
152
+ {'text' => DISPLAY_COLUMN_NAME})
161
153
  tree_view.append_column(column)
162
154
 
163
155
  selection = tree_view.selection
164
156
  selection.signal_connect('changed') do
165
- display_changed_cb(selection)
157
+ display_changed_cb(selection)
166
158
  end
167
159
 
168
160
  return frame
@@ -176,17 +168,17 @@ module Demo
176
168
  tree_view.model = @screen_model
177
169
 
178
170
  column = Gtk::TreeViewColumn.new('Number',
179
- Gtk::CellRendererText.new,
180
- {'text' => SCREEN_COLUMN_NUMBER})
171
+ Gtk::CellRendererText.new,
172
+ {'text' => SCREEN_COLUMN_NUMBER})
181
173
  tree_view.append_column(column)
182
174
 
183
175
  @screen_selection = tree_view.selection
184
176
  @screen_selection.signal_connect('changed') do |selection|
185
- @current_screen = if iter = selection.selected
186
- iter.get_value(SCREEN_COLUMN_SCREEN)
187
- else
188
- nil
189
- end
177
+ @current_screen = if iter = selection.selected
178
+ iter.get_value(SCREEN_COLUMN_SCREEN)
179
+ else
180
+ nil
181
+ end
190
182
  end
191
183
 
192
184
  return frame
@@ -199,24 +191,24 @@ module Demo
199
191
  def create_frame(title)
200
192
  frame = Gtk::Frame.new(title)
201
193
 
202
- hbox = Gtk::HBox.new(false, 8)
194
+ hbox = Gtk::Box.new(:horizontal, 8)
203
195
  hbox.set_border_width(8)
204
196
  frame.add(hbox)
205
197
 
206
198
  scrollwin = Gtk::ScrolledWindow.new
207
- scrollwin.set_policy(Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC)
208
- scrollwin.shadow_type = Gtk::SHADOW_IN
209
- hbox.pack_start(scrollwin, true, true)
199
+ scrollwin.set_policy(:never, :automatic)
200
+ scrollwin.shadow_type = :in
201
+ hbox.pack_start(scrollwin, :expand => true, :fill => true)
210
202
 
211
203
  tree_view = Gtk::TreeView.new
212
204
  tree_view.headers_visible = false
213
205
  scrollwin.add(tree_view)
214
206
 
215
207
  selection = tree_view.selection
216
- selection.mode = Gtk::SELECTION_BROWSE
208
+ selection.mode = :browse
217
209
 
218
- button_vbox = Gtk::VBox.new(false, 5)
219
- hbox.pack_start(button_vbox, false, false)
210
+ button_vbox = Gtk::Box.new(:vertical, 5)
211
+ hbox.pack_start(button_vbox, :expand => false, :fill => false)
220
212
 
221
213
  @size_group.add_widget(button_vbox)
222
214
 
@@ -227,7 +219,7 @@ module Demo
227
219
  # are left-aligned, rather than centered. This function creates a button
228
220
  # and left-aligns it contents.
229
221
  def left_align_button_new(label)
230
- button = Gtk::Button.new(label, true)
222
+ button = Gtk::Button.new(:mnemonic => label)
231
223
  button.child.set_alignment(0.0, 0.5)
232
224
 
233
225
  return button
@@ -237,16 +229,16 @@ module Demo
237
229
  # Prompts the user for a toplevel window to move, and then moves
238
230
  # that window to the currently selected display
239
231
  def query_change_display
240
- screen = self.window.screen
232
+ screen = self.screen
241
233
 
242
234
  toplevel = query_for_toplevel(screen,
243
235
  "Please select the toplevel\n"+
244
236
  "to move to the new screen")
245
237
 
246
238
  if toplevel
247
- toplevel.screen = @current_screen
239
+ toplevel.screen = @current_screen
248
240
  else
249
- screen.display.beep
241
+ screen.display.beep
250
242
  end
251
243
  end
252
244
 
@@ -258,13 +250,13 @@ module Demo
258
250
 
259
251
  display = screen.display
260
252
 
261
- popup = Gtk::Window.new(Gtk::Window::POPUP)
253
+ popup = Gtk::Window.new(:popup)
262
254
  popup.screen = screen
263
255
  popup.modal = true
264
- popup.window_position = Gtk::Window::POS_CENTER
256
+ popup.window_position = :center
265
257
 
266
258
  frame = Gtk::Frame.new
267
- frame.set_shadow_type(Gtk::SHADOW_OUT)
259
+ frame.set_shadow_type(:out)
268
260
  popup.add(frame)
269
261
 
270
262
  label = Gtk::Label.new(prompt)
@@ -274,35 +266,38 @@ module Demo
274
266
  popup.show_all
275
267
 
276
268
  # TODO: Gdk::Cursor.new(screen.display, Gdk::Cursor::CROSSHAIR)
277
- cursor = Gdk::Cursor.new(Gdk::Cursor::CROSSHAIR)
278
-
279
- if Gdk::pointer_grab(popup.window, false,
280
- Gdk::Event::BUTTON_RELEASE_MASK,
281
- nil,
282
- cursor,
283
- Gdk::Event::CURRENT_TIME) == Gdk::GRAB_SUCCESS
284
- clicked = false
285
-
286
- popup.signal_connect('button-release-event') do
287
- clicked = true
288
- end
289
-
290
- # Process events until clicked is set by button_release_event_cb.
291
- # We pass in may_block = true since we want to wait if there
292
- # are no events currently.
293
- until clicked
294
- Gtk.main_iteration # TODO: GLib::main_context_iteration(nil, true)
295
-
296
- toplevel = find_toplevel_at_pointer(screen.display)
297
- if toplevel == popup
298
- toplevel = nil
299
- end
300
- end
301
-
302
- popup.destroy
303
- Gdk.flush # Really release the grab
304
-
305
- return toplevel
269
+ cursor = Gdk::Cursor.new(:crosshair)
270
+
271
+ if Gdk::pointer_grab(
272
+ popup.window,
273
+ false,
274
+ :button_release_mask,
275
+ nil,
276
+ cursor,
277
+ Gdk::Event::CURRENT_TIME
278
+ ) == Gdk::GRAB_SUCCESS
279
+ clicked = false
280
+
281
+ popup.signal_connect('button-release-event') do
282
+ clicked = true
283
+ end
284
+
285
+ # Process events until clicked is set by button_release_event_cb.
286
+ # We pass in may_block = true since we want to wait if there
287
+ # are no events currently.
288
+ until clicked
289
+ Gtk.main_iteration # TODO: GLib::main_context_iteration(nil, true)
290
+
291
+ toplevel = find_toplevel_at_pointer(screen.display)
292
+ if toplevel == popup
293
+ toplevel = nil
294
+ end
295
+ end
296
+
297
+ popup.destroy
298
+ Gdk.flush # Really release the grab
299
+
300
+ return toplevel
306
301
  end
307
302
  end
308
303
 
@@ -313,52 +308,56 @@ module Demo
313
308
  # The user data field of a GdkWindow is used to store a pointer
314
309
  # to the widget that created it.
315
310
  if pointer_window
316
- widget = pointer_window.user_data
311
+ widget = pointer_window.user_data
317
312
  end
318
313
 
319
314
  return (if widget
320
- widget.toplevel
321
- else
322
- nil
323
- end)
315
+ widget.toplevel
316
+ else
317
+ nil
318
+ end)
324
319
  end
325
320
 
326
321
  # Called when the user clicks on 'Open...' in the display
327
322
  # frame. Prompts for a new display, and then opens a connection
328
323
  # to that display.
329
324
  def open_display_cb
330
- dialog = Gtk::Dialog.new('Open Display',
331
- self,
332
- Gtk::Dialog::MODAL,
333
- [Gtk::Stock::CANCEL, Gtk::Dialog::RESPONSE_CANCEL],
334
- [Gtk::Stock::OK, Gtk::Dialog::RESPONSE_OK])
335
-
336
- dialog.default_response = Gtk::Dialog::RESPONSE_OK
325
+ dialog = Gtk::Dialog.new(
326
+ :title => 'Open Display',
327
+ :parent => self,
328
+ :flags => :modal,
329
+ :buttons => [
330
+ [:cancel, :cancel],
331
+ [:ok, :ok]
332
+ ]
333
+ )
334
+
335
+ dialog.default_response = Gtk::ResponseType::OK
337
336
  display_entry = Gtk::Entry.new
338
337
  display_entry.activates_default = true
339
338
  dialog_label =
340
- Gtk::Label.new("Please enter the name of\nthe new display\n")
339
+ Gtk::Label.new("Please enter the name of\nthe new display\n")
341
340
 
342
- dialog.vbox.add(dialog_label)
343
- dialog.vbox.add(display_entry)
341
+ dialog.child.add(dialog_label)
342
+ dialog.child.add(display_entry)
344
343
 
345
344
  display_entry.grab_focus
346
- dialog.vbox.show_all
345
+ dialog.child.show_all
347
346
 
348
347
  result = nil
349
348
  until result
350
- response_id = dialog.run
351
- break if response_id != Gtk::Dialog::RESPONSE_OK
352
-
353
- new_screen_name = display_entry.text
354
-
355
- unless new_screen_name.empty?
356
- begin
357
- result = Gdk::Dispaly.open(new_screen_name)
358
- rescue
359
- dialog_label.text = "Can't open display :\n\t%s\nplease try another one\n" % [new_screen_name]
360
- end
361
- end
349
+ response_id = dialog.run
350
+ break if response_id != Gtk::ResponseType::OK
351
+
352
+ new_screen_name = display_entry.text
353
+
354
+ unless new_screen_name.empty?
355
+ begin
356
+ result = Gdk::Dispaly.open(new_screen_name)
357
+ rescue
358
+ dialog_label.text = "Can't open display :\n\t%s\nplease try another one\n" % [new_screen_name]
359
+ end
360
+ end
362
361
  end
363
362
  dialog.destroy
364
363
  end
@@ -368,11 +367,11 @@ module Demo
368
367
  # screens.
369
368
  def display_changed_cb(selection)
370
369
  @current_display =
371
- if iter = selection.selected
372
- iter.get_value(DISPLAY_COLUMN_DISPLAY)
373
- else
374
- nil
375
- end
370
+ if iter = selection.selected
371
+ iter.get_value(DISPLAY_COLUMN_DISPLAY)
372
+ else
373
+ nil
374
+ end
376
375
  fill_screens
377
376
  end
378
377
 
@@ -385,11 +384,11 @@ module Demo
385
384
  iter.set_value(DISPLAY_COLUMN_DISPLAY, display)
386
385
 
387
386
  handler_id = display.signal_connect('closed') do
388
- display_closed_cb(display)
387
+ display_closed_cb(display)
389
388
  end
390
389
 
391
390
  signal_connect('destroy') do
392
- display.signal_handler_disconnect(handler_id)
391
+ display.signal_handler_disconnect(handler_id)
393
392
  end
394
393
  end
395
394
 
@@ -397,11 +396,11 @@ module Demo
397
396
  # Remove it from our list of displays.
398
397
  def display_closed_cb(display)
399
398
  @display_model.each do |model, path, iter|
400
- tmp_display = iter.get_value( DISPLAY_COLUMN_DISPLAY)
401
- if tmp_display == display
402
- @display_model.remove(iter)
403
- break
404
- end
399
+ tmp_display = iter.get_value( DISPLAY_COLUMN_DISPLAY)
400
+ if tmp_display == display
401
+ @display_model.remove(iter)
402
+ break
403
+ end
405
404
  end
406
405
  end
407
406
  end