wxruby 1.9.8-x86-mswin32-60 → 1.9.9-x86-mswin32-60

data/lib/wx.rb

@@ -45,8 +45,8 @@ require 'wx/keyword_defs'
 # Wx clean-up routines called by Wx::App#on_exit. This can under some
 # circumstances cause crashes as the application ends.
 Kernel::at_exit do
-  # This is set in wxRubyApp.OnExit (see swig/classes/App.i)
-  if not $__wx_app_ended__
+  # These are set at App startup and wxRuby shut down respectively - see App.i
+  if Wx::const_defined?(:THE_APP) and not $__wx_app_ended__ 
     Wx::THE_APP.on_exit
   end
 end

data/lib/wx/accessors.rb

@@ -42,8 +42,14 @@ module WxRubyStyleAccessors
   end
 end
 
-all_classes = Wx::constants.collect { | c | Wx::const_get(c) }.grep(Class)
+# Allow Wx-global functions to be accessed with nice syntax
+module Wx
+  extend WxRubyStyleAccessors
+end
 
+# Apply the syntax extensions to every class, both class methods and
+# instance methods
+all_classes = Wx::constants.collect { | c | Wx::const_get(c) }.grep(Class)
 all_classes.each do | klass |
   klass.class_eval do
     include WxRubyStyleAccessors

data/lib/wx/classes/app.rb

@@ -37,9 +37,15 @@ class Wx::App
   # second. This should help ferret out bugs in memory management more
   # quickly.
   def gc_stress(interval = 1)
-    t = Wx::Timer.new(self, 9999)
-    evt_timer(9999) { Thread.pass }
-    Thread.new { loop { sleep interval; GC.start } }
-    t.start(100)
+    # Ruby 1.9 provides this built-in version, but doesn't like the 1.8
+    # version at all - results in frequent segfaults.
+    if RUBY_VERSION >= "1.9.0"
+      GC.stress
+    else # Ruby 1.8
+      t = Wx::Timer.new(self, 9999)
+      evt_timer(9999) { Thread.pass }
+      Thread.new { loop { sleep interval; GC.start } }
+      t.start(100)
+    end
   end
 end

data/lib/wx/classes/evthandler.rb

@@ -625,6 +625,9 @@ class Wx::EvtHandler
     EventType['evt_moving', 0,
               Wx::EVT_MOVING, 
               Wx::MoveEvent],
+    EventType['evt_navigation_key', 0,
+              Wx::EVT_NAVIGATION_KEY, 
+              Wx::NavigationKeyEvent],
     EventType['evt_nc_paint', 0,
               Wx::EVT_NC_PAINT, 
               Wx::Event],
@@ -649,6 +652,51 @@ class Wx::EvtHandler
     EventType['evt_radiobutton', 1,
               Wx::EVT_COMMAND_RADIOBUTTON_SELECTED, 
               Wx::CommandEvent],
+    EventType['evt_richtext_character', 1,
+              Wx::EVT_COMMAND_RICHTEXT_CHARACTER,
+              Wx::RichTextEvent],
+    EventType['evt_richtext_content_inserted', 1,
+              Wx::EVT_COMMAND_RICHTEXT_CONTENT_INSERTED,
+              Wx::RichTextEvent],
+    EventType['evt_richtext_content_deleted', 1,
+              Wx::EVT_COMMAND_RICHTEXT_CONTENT_DELETED,
+              Wx::RichTextEvent],    
+    EventType['evt_richtext_delete', 1,
+              Wx::EVT_COMMAND_RICHTEXT_DELETE,
+              Wx::RichTextEvent],
+    EventType['evt_richtext_left_click', 1,
+              Wx::EVT_COMMAND_RICHTEXT_LEFT_CLICK,
+              Wx::RichTextEvent],
+    EventType['evt_richtext_left_dclick', 1,
+              Wx::EVT_COMMAND_RICHTEXT_LEFT_DCLICK,
+              Wx::RichTextEvent],
+    EventType['evt_richtext_middle_click', 1,
+              Wx::EVT_COMMAND_RICHTEXT_MIDDLE_CLICK,
+              Wx::RichTextEvent],
+    EventType['evt_richtext_return', 1,
+              Wx::EVT_COMMAND_RICHTEXT_RETURN,
+              Wx::RichTextEvent],
+    EventType['evt_richtext_right_click', 1,
+              Wx::EVT_COMMAND_RICHTEXT_RIGHT_CLICK,
+              Wx::RichTextEvent],
+    EventType['evt_richtext_selection_changed', 1,
+              Wx::EVT_COMMAND_RICHTEXT_SELECTION_CHANGED,
+              Wx::RichTextEvent],
+    EventType['evt_richtext_style_changed', 1,
+              Wx::EVT_COMMAND_RICHTEXT_STYLE_CHANGED,
+              Wx::RichTextEvent],
+    EventType['evt_richtext_stylesheet_changed', 1,
+              Wx::EVT_COMMAND_RICHTEXT_STYLESHEET_CHANGED,
+              Wx::RichTextEvent],
+    EventType['evt_richtext_stylesheet_changing', 1,
+              Wx::EVT_COMMAND_RICHTEXT_STYLESHEET_CHANGING,
+              Wx::RichTextEvent],
+    EventType['evt_richtext_stylesheet_replaced', 1,
+              Wx::EVT_COMMAND_RICHTEXT_STYLESHEET_REPLACED,
+              Wx::RichTextEvent],
+    EventType['evt_richtext_stylesheet_replacing', 1,
+              Wx::EVT_COMMAND_RICHTEXT_STYLESHEET_REPLACING,
+              Wx::RichTextEvent],
     EventType['evt_right_dclick', 0,
               Wx::EVT_RIGHT_DCLICK, 
               Wx::MouseEvent],

data/lib/wx/classes/richtextctrl.rb

@@ -0,0 +1,41 @@
+# Text editor supporting various formatting, intended for editing
+# natural language texts
+class Wx::RichTextCtrl
+  # These three methods return the styles applicable at certain points
+  # in the document. However, the standard wx signature is to accept the
+  # value of some kind of TextAttr class that will hold the return as an
+  # argument. The return value is a boolean for success/failure. In
+  # Ruby, we only support returning the value as a RichTextAttr, and do
+  # so as a proper return value, having accepted a single argument
+  # specifying where to get the style from. If retrieval is not
+  # successful, raise an exception.
+  wx_get_style = self.instance_method(:get_style)
+  define_method(:get_style) do | pos |
+    style = Wx::RichTextAttr.new
+    if wx_get_style.bind(self).call(pos, style)
+      return style
+    else
+      Kernel.raise RuntimeError, "Could not retrieve style at position #{pos}"
+    end
+  end
+
+  wx_get_style_for_range = self.instance_method(:get_style_for_range)
+  define_method(:get_style_for_range) do | rng |
+    style = Wx::RichTextAttr.new
+    if wx_get_style_for_range.bind(self).call(rng, style)
+      return style
+    else
+      Kernel.raise RuntimeError, "Could not retrieve style for range #{rng}"
+    end
+  end
+
+  wx_get_uncombined_style = self.instance_method(:get_uncombined_style)
+  define_method(:get_uncombined_style) do | pos |
+    style = Wx::RichTextAttr.new
+    if wx_get_uncombined_style.bind(self).call(pos, style)
+      return style
+    else
+      Kernel.raise RuntimeError, "Could not retrieve style at position #{pos}"
+    end
+  end
+end

data/lib/wx/classes/standardpaths.rb

@@ -0,0 +1,9 @@
+# Access OS-standard locations for user files, config files etc
+class Wx::StandardPaths
+  class << self
+    # Expose instance methods as class methods in Ruby
+    Wx::StandardPaths.instance_methods(false).each do | meth |
+      define_method(meth) { get.send(meth) }
+    end
+  end
+end

data/lib/wx/classes/texturlevent.rb

@@ -1,6 +1,18 @@
+# Event fired when a user clicks or hovers over a hyperlink in a TextCtrl
 class Wx::TextUrlEvent
-  # Returns the string URL  that is being interacted with in this event
+  # Returns the string URL that is being interacted with in this event
   def get_url
-    get_event_object.get_value[get_url_start .. get_url_end]
+    text_ctrl = event_object
+    # In the standard TextCtrl, the relevant URL is always the same as
+    # the text clicked on, because all it does is highlight text that
+    # look like a URL. In RichTextCtrl, however, the URL value can be
+    # applied to any text (more like HTML), and so the URL has be
+    # retrieved by getting the applied RichTextAttr style and inspecting
+    # its property.
+    if text_ctrl.kind_of?(Wx::RichTextCtrl)
+      return text_ctrl.get_style(url_start).url
+    else      
+      return text_ctrl.value[url_start .. url_end]
+    end
   end
 end

data/lib/wx/keyword_defs.rb

@@ -505,3 +505,32 @@ Wx::define_keyword_ctors('AnimationCtrl') do
   wx_ctor_params :name => 'animationCtrl'
 end
 
+Wx::define_keyword_ctors('VScrolledWindow') do
+  wx_ctor_params :id, :pos, :size, :style, :name => 'VScrolledWindowNameStr'
+end
+
+Wx::define_keyword_ctors('VListBox') do
+  wx_ctor_params :id, :pos, :size, :style, :name => 'VListBoxNameStr'
+end
+
+Wx::define_keyword_ctors('HtmlListBox') do
+  wx_ctor_params :id, :pos, :size, :style, :name => 'HtmlListBoxNameStr'
+end
+
+Wx::define_keyword_ctors('RichTextCtrl') do
+  wx_ctor_params :id, :value => ''
+  wx_ctor_params :pos, :size, :style => Wx::TE_MULTILINE
+  wx_ctor_params :validator, :name => 'textCtrl'
+end
+
+Wx::define_keyword_ctors('RichTextStyleListBox') do
+  wx_ctor_params :id, :pos, :size, :style
+end
+
+Wx::define_keyword_ctors('RichTextStyleListCtrl') do
+  wx_ctor_params :id, :pos, :size, :style
+end
+
+# FIXME - SymbolPickerDialog is hard to because the parent argument is
+# in a strange place.
+

data/lib/wx/version.rb

@@ -1,3 +1,3 @@
 module Wx
-  WXRUBY_VERSION    = '1.9.8'
+  WXRUBY_VERSION    = '1.9.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: wxruby
 version: !ruby/object:Gem::Version 
-  version: 1.9.8
+  version: 1.9.9
 platform: x86-mswin32-60
 authors: 
 - wxRuby development team
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-04 00:00:00 +01:00
+date: 2008-10-31 00:00:00 +00:00
 default_executable: 
 dependencies: []
 
@@ -68,10 +68,12 @@ files:
 - lib/wx/classes/point.rb
 - lib/wx/classes/previewframe.rb
 - lib/wx/classes/rect.rb
+- lib/wx/classes/richtextctrl.rb
 - lib/wx/classes/simplehelpprovider.rb
 - lib/wx/classes/size.rb
 - lib/wx/classes/sizer.rb
 - lib/wx/classes/sound.rb
+- lib/wx/classes/standardpaths.rb
 - lib/wx/classes/styledtextctrl.rb
 - lib/wx/classes/textctrl.rb
 - lib/wx/classes/texturlevent.rb
@@ -86,6 +88,8 @@ files:
 - lib/wx/keyword_defs.rb
 - lib/wx/version.rb
 - lib/wx.rb
+- lib/wxruby2.exp
+- lib/wxruby2.lib
 - lib/wxruby2.so
 - samples/aui
 - samples/aui/aui.rb