lib/win32/autogui/window.rb in win32-autogui-0.4.0 vs lib/win32/autogui/window.rb in win32-autogui-0.4.1

@@ -70,11 +70,11 @@
     def each
       child_after = 0
       while (child_after = FindWindowEx(@parent.handle, child_after, nil, nil)) > 0 do
         window = Window.new child_after
         # immediate children only
-        yield window if (window.parent.handle == @parent.handle)
+        yield window if (window.parent) && (window.parent.handle == @parent.handle)
       end
     end
   end
 
   # Wrapper for window
@@ -89,20 +89,20 @@
     attr_reader :handle
 
     def initialize(handle)
       @handle = handle
     end
-    
+
     # enumerable immeadiate child windows
     #
     # @see Children
     #
     def children
       Children.new(self)
     end
 
-    # @return [Object] Window or nil 
+    # @return [Object] Window or nil
     #
     def parent
       h = GetParent(handle)
       Window.new h if h > 0
     end
@@ -113,22 +113,25 @@
     # @option options [Boolean] :wait_for_close (true) sleep while waiting for timeout or close
     # @option options [Boolean] :timeout (5) wait_for_close timeout in seconds
     #
     def close(options={})
       PostMessage(handle, WM_SYSCOMMAND, SC_CLOSE, 0)
-      wait_for_close(options) if (options[:wait_for_close] == true) 
+      wait_for_close(options) if (options[:wait_for_close] == true)
     end
 
     # Wait for the window to close
     #
     # @param [Hash] options
     # @option options [Boolean] :timeout (5) timeout in seconds
     #
     def wait_for_close(options={})
       seconds = options[:timeout] || 5
       timeout(seconds) do
-        sleep 0.05 until 0 == IsWindow(handle)
+        begin
+          yield if block_given?
+          sleep 0.05
+        end until 0 == IsWindow(handle)
       end
     end
 
     # @return [String] the Windows ClassName
     #
@@ -149,38 +152,38 @@
       length = SendMessageA(handle, WM_GETTEXT, buffer.length, buffer)
       length == 0 ? '' : buffer[0..length - 1]
     end
     alias :title :text
 
-    # Determines whether the specified window handle identifies an existing window 
+    # Determines whether the specified window handle identifies an existing window
     #
     # @return [Boolean]
     #
     def is_window?
       (handle != 0) && (IsWindow(handle) != 0)
     end
-    
-    # Brings the window into the foreground and activates it. 
+
+    # Brings the window into the foreground and activates it.
     # Keyboard input is directed to the window, and various visual cues
     # are changed for the user.
     #
-    # A process can set the foreground window only if one of the following conditions is true: 
+    # A process can set the foreground window only if one of the following conditions is true:
     #
     #    * The process is the foreground process.
     #    * The process was started by the foreground process.
     #    * The process received the last input event.
     #    * There is no foreground process.
     #    * The foreground process is being debugged.
     #    * The foreground is not locked.
     #    * The foreground lock time-out has expired.
-    #    * No menus are active. 
+    #    * No menus are active.
     #
     # @return [Number] nonzero number if sucessful, nil or zero if failed
     #
     def set_focus
       if is_window?
-        # if current process was the last to receive input, we can be sure that 
+        # if current process was the last to receive input, we can be sure that
         # SetForegroundWindow will be allowed.  Send the shift key to whatever has
         # the focus now.  This allows IRB to set_focus.
         keystroke(VK_SHIFT)
         ret = SetForegroundWindow(handle)
         logger.warn("SetForegroundWindow failed") if ret == 0
@@ -205,11 +208,11 @@
     def thread_id
       return nil unless is_window?
       GetWindowThreadProcessId(handle, nil)
     end
 
-    # The window text including all child windows 
+    # The window text including all child windows
     # joined together with newlines. Faciliates matching text.
     # Text from any given window is limited to 2048 characters
     #
     # @example partial match of the Window's calulator's about dialog copywrite text
     #
@@ -221,22 +224,22 @@
     #
     def combined_text
       return unless is_window?
       t = []
       t << text unless text == ''
-      children.each do |w| 
+      children.each do |w|
         t << w.combined_text unless w.combined_text == ''
       end
       t.join("\n")
     end
 
     # Debugging information
     #
     # @return [String] with child window information
     def inspect
-      c = [] 
-      children.each do |w| 
-        c << w.inspect 
+      c = []
+      children.each do |w|
+        c << w.inspect
       end
       s = super + " #{self.class}=<window_class:#{window_class} pid:#{pid} thread_id:#{thread_id} title:\"#{title}\" children=<" + c.join("\n") + ">>"
     end
 
   end