remove the hack of aliasing wait_for_event to wait_for_event_c

and implement the event loop in the native wait_for_event method
instead

Author: dmacvicar

ext/ui/dialog.cc

@@ -97,14 +97,33 @@ resize(VALUE self)
   YEXCEPTION_CATCH
 }
 
+/*
+ * Extend wait_for_event with ability to process event in block.
+ * @yield [event] pass raised event to block
+ * @yield_param [UI::Event] event that occur
+ * @yield_return [true,false] response if dialog should continue in waiting
+ *   for another event
+ *   @example change button label
+ *     dialog.wait_for_event do |event|
+ *       break unless event.is_a? UI::WidgetEvent
+ *       event.widget[:Label] = "Already pressed"
+ *       true
+ *     end
+ */
 static VALUE
 wait_for_event(VALUE self)
 {
   YEXCEPTION_TRY
+
   YDialog *ptr = ui_unwrap_dialog(self);
   new CallbackFilter(ptr); //see filter documentation
-  YEvent * ev = ptr->waitForEvent();
-  return convert_event(ev);
+  YEvent *ev = 0L;
+  do {
+    ev = ptr->waitForEvent();
+    if (!rb_block_given_p())
+      return convert_event(ev);
+  } while (rb_yield(convert_event(ev)) != Qfalse);
+
   YEXCEPTION_CATCH
 }
 

lib/ui/dialog.rb

@@ -1,27 +1,9 @@
 module UI
   class Dialog
-    alias_method :wait_for_event_c, :wait_for_event
+
     class << self
       alias_method :current, :current_dialog
     end
-    # extend wait_for_event with ability to process event in block.
-    # @yield [event] pass raised event to block
-    # @yield_param [UI::Event] event that occur
-    # @yield_return [true,false] response if dialog should continue in waiting
-    #   for another event
-    # @example change button label
-    #   dialog.wait_for_event do |event|
-    #     break unless event.is_a? UI::WidgetEvent
-    #     event.widget[:Label] = "Already pressed"
-    #     true
-    #   end
-    def wait_for_event(options={})
-      if block_given?
-        while (yield(wait_for_event_c)) do
-        end
-      else
-        return wait_for_event_c
-      end
-    end
+
   end
 end