wxruby 1.9.0-i686-linux → 1.9.1-i686-linux

data/lib/wx/version.rb

@@ -1,3 +1,3 @@
 module Wx
-  WXRUBY_VERSION    = '1.9.0'
+  WXRUBY_VERSION    = '1.9.1'
 end

data/samples/aui/aui.rb

@@ -564,7 +564,8 @@ class AuiFrame < Wx::Frame
     evt_update_ui(ID_VerticalGradient) { | e | on_update_ui(e) } 
     evt_update_ui(ID_HorizontalGradient) { | e | on_update_ui(e) } 
     evt_menu_range( ID_FirstPerspective, 
-                    ID_FirstPerspective + @perspectives.length) { | e | }
+                    ID_FirstPerspective + 
+                    @perspectives.length) { | e | on_restore_perspective(e) }
     evt_aui_pane_close { | e | on_pane_close(e) }
     evt_auinotebook_page_close(Wx::ID_ANY) { | e | on_notebook_page_close(e) }
   end
@@ -800,7 +801,7 @@ class AuiFrame < Wx::Frame
   def setup_perspectives
     perspective_all = @mgr.save_perspective
 
-    @mgr.get_all_panes.each do | pane | 
+    @mgr.each_pane do | pane | 
       pane.hide unless pane.is_toolbar
     end 
 
@@ -935,7 +936,7 @@ class AuiFrame < Wx::Frame
     end
 
 
-    @mgr.get_all_panes.each do | pane | 
+    @mgr.each_pane do | pane | 
       maybe_nb = pane.get_window
       next unless maybe_nb.kind_of?(Wx::AuiNotebook)
       if e_id == ID_NotebookArtGloss
@@ -1023,8 +1024,8 @@ class AuiFrame < Wx::Frame
   def on_create_perspective
     msg = "Enter a name for the new perspective:"
     dlg = Wx::TextEntryDialog.new(self, msg, "Wx::AUI Test")
-    dlg.set_value("Perspective %d" % @perspectives.length + 1)
-    return unless dlg.show_modal != Wx::ID_OK
+    dlg.set_value("Perspective %d" % [ @perspectives.length + 1 ] )
+    return unless dlg.show_modal == Wx::ID_OK
     if @perspectives.length.zero?
       @perspectives_menu.append_separator
     end

data/samples/bigdemo/wxListCtrl_virtual.rbw

@@ -60,33 +60,33 @@ class TestVirtualList < Wx::ListCtrl
         @log.write_text("on_item_deselected: %s" % event.get_index())
     end
     
-     #---------------------------------------------------
-    # These methods are callbacks for implementing the
-    # "virtualness" of the list...  Normally you would
-    # determine the text, attributes and/or image based
-    # on values from some external data source, but for
-    # this demo we'll just calculate them
-    
+    # These three following methods are callbacks for implementing the
+    # "virtualness" of the list; they *must* be defined by any ListCtrl
+    # object with the style LC_VIRTUAL.
+
+    # Normally you would determine the text, attributes and/or image
+    # based on values from some external data source, but for this demo
+    # we'll just calculate them based on order. 
     def on_get_item_text(item, col)
-        return "Item %d, column %d" % [item,col]
+      return "Item %d, column %d" % [item,col]
     end
     
-    def on_get_item_image(item)
-        if item % 3 == 0
-            return @idx1
-        else
-            return -1
-        end
+    def on_get_item_column_image(item, col)
+      if item % 4 == 0
+        return @idx1
+      else
+        return -1
+      end
     end
     
     def on_get_item_attr(item)
-        if item % 3 == 1
-            return @attr1
-        elsif item % 3 == 2
-            return @attr2
-        else 
-            return nil
-        end
+      if item % 3 == 1
+        return @attr1
+      elsif item % 3 == 2
+        return @attr2
+      else 
+        return nil
+      end
     end
 end
 

data/samples/event/event.rb

@@ -0,0 +1,184 @@
+#!/usr/bin/env ruby
+# wxRuby2 Sample Code. Copyright (c) 2004-2007 wxRuby development team
+# Freely reusable code: see SAMPLES-LICENSE.TXT for details
+
+begin
+  require 'rubygems'
+  require 'wx'
+rescue LoadError
+  require 'wx'
+end
+
+# This sample demonstrates how to dynamically connect and disconnect
+# event handlers, and how to create custom event types and listeners
+# associated with user-defined control classes.
+
+# A custom type of event associated with a target control. Note that for
+# user-defined controls, the associated event should inherit from
+# Wx::CommandEvent rather than Wx::Event.
+class TargetHitEvent < Wx::CommandEvent
+  # Create a new unique constant identifier, associate this class
+  # with events of that identifier, and create a shortcut 'evt_target'
+  # method for setting up this handler.
+  EVT_HIT_TARGET = Wx::EvtHandler.register_class(self, nil, 'evt_target', 1) 
+  
+  def initialize(target, score, distance)
+    # The constant id is the arg to super
+    super(EVT_HIT_TARGET)
+    # client_data should be used to store any information associated
+    # with the event.
+    self.client_data = { :score => score, :distance => distance  }
+    self.id = target.get_id
+  end
+
+  # Returns the points score associated with this event
+  def score
+    client_data[:score]
+  end
+
+  # Returns the distance (in pixels) from the centre of the target
+  def distance
+    client_data[:distance]
+  end
+end
+
+# An example of a simple user-written control, which displays a
+# "bulls-eye" like target, and sends events with a score and distance 
+class TargetControl < Wx::Window
+  TargetCircle = Struct.new(:radius, :score, :brush)
+
+  def initialize(parent, *args)
+    super(parent, *args)
+
+    # Set up the scores and sizes of the rings
+    @radii = [
+      TargetCircle[ 0.1, 20, Wx::RED_BRUSH ],
+      TargetCircle[ 0.25, 10, Wx::BLUE_BRUSH ],
+      TargetCircle[ 0.4, 5, Wx::GREEN_BRUSH ] ]
+    evt_paint { | e | on_paint(e) }
+    evt_left_down { | e | on_left_down(e) }
+  end
+
+  # What point is at the centre (assuming this control is always square)
+  def centre_point
+    size.width / 2
+  end
+
+  # Called whenever the target is repainted, draws a series of
+  # concentric circles
+  def on_paint(evt)
+    paint do | dc |
+      dc.clear
+      @radii.reverse_each do | circ |
+        dc.brush = circ.brush
+        dc.draw_circle(centre_point, centre_point, 
+                       ( size.width * circ.radius).to_i )
+      end
+    end
+  end
+
+  # Test if the target was hit, and generate a TargetHitEvent if so
+  def on_left_down(evt)
+    # quick bit of pythagoras...
+    distance = Math.sqrt( ( evt.x - centre_point ) ** 2  + 
+                          ( evt.y - centre_point ) ** 2 )
+    # See which target ring, if any, was hit by the event
+    @radii.each do | circ | 
+      if distance < ( size.width * circ.radius)
+        # Create an instance of the event
+        evt = TargetHitEvent.new(self, circ.score, distance)
+        # This sends the event for processing by listeners
+        event_handler.process_event(evt)
+        break
+      end
+    end
+  end
+end
+
+# Container frame for the target control
+class TargetFrame < Wx::Frame
+  def initialize(title)
+    super(nil, :title => title, :size => [300, 300])
+    @tgt = TargetControl.new(self)
+    # This user-defined event handling method was set up by
+    # EvtHandler.register_class, above
+    evt_target(@tgt.get_id) { | e | on_target(e) }
+    @listening = true
+    evt_size { | e | on_size(e) }
+    setup_menus
+    create_status_bar
+  end
+
+  # What's done when the target is hit
+  def on_target(evt)
+    msg = "Target hit for score %i, %.2f pixels from centre" % 
+          [ evt.score, evt.distance ]
+    self.status_text = msg
+  end
+
+  # Keep the target centred and square
+  def on_size(evt)
+    smaller = [ evt.size.width, evt.size.height ].min
+    @tgt.centre
+    @tgt.size = Wx::Size.new(smaller, smaller)
+    @tgt.refresh
+  end
+  
+  # Toggle whether or not we are listening for events from the bulls-eye
+  # target
+  def on_toggle_connect
+    if @listening
+      # Remove :evt_target event handler for the @tgt
+      disconnect(@tgt.get_id, Wx::ID_ANY, :evt_target)
+      menu_bar.check(TOGGLE_LISTEN, false)
+      self.status_text = "Ignoring target events"
+      @listening = false
+    else
+      # Restore evt_target event handler for the @tgt
+      evt_target(@tgt.get_id) { | e | on_target(e) }
+      menu_bar.check(TOGGLE_LISTEN, true)
+      self.status_text = ''
+      @listening = true
+    end
+  end
+
+  def on_about
+    msg =  sprintf("This is the About dialog of the event handling sample.\n" \
+                   "Welcome to wxRuby, version %s", Wx::WXRUBY_VERSION)
+
+    about_dlg = Wx::MessageDialog.new( self, msg, 'About Event Handling',
+                                       Wx::OK|Wx::ICON_INFORMATION )
+    about_dlg.show_modal
+
+  end
+
+  TOGGLE_LISTEN = 1001
+  def setup_menus
+    menu_file = Wx::Menu.new
+    menu_help = Wx::Menu.new
+    menu_help.append(Wx::ID_ABOUT, "&About...\tF1", "Show about dialog")
+    evt_menu(Wx::ID_ABOUT) { on_about }
+    menu_file.append(Wx::ID_EXIT, "E&xit\tAlt-X", "Quit this program")
+    evt_menu(Wx::ID_EXIT) { self.close }
+    menu_file.append_check_item(TOGGLE_LISTEN, "L&isten for events", 
+                                 "Toggle listening for target events")
+    evt_menu(TOGGLE_LISTEN) { on_toggle_connect }
+
+    menu_bar = Wx::MenuBar.new
+    menu_bar.append(menu_file, "&File")
+    menu_bar.append(menu_help, "&Help")
+
+    self.menu_bar = menu_bar
+    menu_bar.check(TOGGLE_LISTEN, true)
+  end
+end
+
+class TargetApp < Wx::App
+  def on_init
+    TargetFrame.new("Event Handling Sample").show
+    return true
+  end
+end
+
+a = TargetApp.new
+a.main_loop()

data/samples/minimal/minimal.rb

@@ -15,20 +15,14 @@ end
 
 # The frame or self-contained window for this application
 class MinimalFrame < Wx::Frame
-  def initialize(title, pos, size, style = Wx::DEFAULT_FRAME_STYLE)
+  def initialize(title)
     
     # A main application frame has no parent (nil)
-    # -1 means this frame will be supplied a default id
-    super(nil, -1, title, pos, size, style)
+    super(nil, :title => title, :size => [ 400, 300 ])
 
-    # Set the frame's icon - use .ico on windows, else .xpm
-    if Wx::PLATFORM == "WXMSW"
-      set_icon( Wx::Icon.new(local_icon_file("mondrian.ico"), 
-                             Wx::BITMAP_TYPE_ICO) )
-    else
-      set_icon( Wx::Icon.new(local_icon_file("mondrian.xpm"), 
-                             Wx::BITMAP_TYPE_XPM) )
-    end
+    # PNG is a good choice for cross-platofrm icons
+    icon_file = File.join( File.dirname(__FILE__), 'mondrian.png')
+    self.icon = Wx::Icon.new(icon_file)
 
     menu_file = Wx::Menu.new()
     menu_help = Wx::Menu.new()
@@ -66,11 +60,6 @@ class MinimalFrame < Wx::Frame
                                        Wx::OK|Wx::ICON_INFORMATION )
     about_dlg.show_modal
   end
-
-  # utility function to find an icon relative to this ruby script
-  def local_icon_file(icon_name)
-    File.join( File.dirname(__FILE__), icon_name) 
-  end
 end
 
 # Wx::App is the container class for any wxruby app - only a single
@@ -79,13 +68,12 @@ class MinimalApp < Wx::App
   # This method is called when main_loop is entered; it should set up
   # the application's and display initial GUI windows.
   def on_init
-    frame = MinimalFrame.new("Minimal wxRuby App",
-                             Wx::Point.new(50, 50), 
-                             Wx::Size.new(450, 340))
-    set_app_name('Minimal')
-    # This is required, and on_init must return a true value else the
-    # app will not start
-    frame.show()
+    self.app_name = 'Minimal'
+    frame = MinimalFrame.new("Minimal wxRuby App")
+    # This is required,
+    frame.show
+    # on_init must return a true value else the app will not start
+    true
   end
 end
 

data/samples/text/scintilla.rb

@@ -24,12 +24,6 @@ class MyFrame < Frame
   def initialize(title,pos,size,style=DEFAULT_FRAME_STYLE)
     super(nil,-1,title,pos,size,style)
 
-    if Wx::PLATFORM == "WXMSW"
-      set_icon(Icon.new("mondrian.ico",BITMAP_TYPE_ICO))
-    else
-      set_icon(Icon.new("mondrian.xpm",BITMAP_TYPE_XPM))
-    end
-
     menuFile = Menu.new()
     menuFile.append(Minimal_Quit, "E&xit\tAlt-X", "Quit this program")
 
@@ -51,23 +45,23 @@ class MyFrame < Frame
     create_status_bar(2)
     set_status_text("Welcome to wxRuby!")
 
-    @sci = Wx::Scintilla.new(self)
+    @sci = Wx::StyledTextCtrl.new(self)
 
     font = Font.new(10, TELETYPE, NORMAL, NORMAL)
-    @sci.style_set_font(SCI_STYLE_DEFAULT, font);
+    @sci.style_set_font(STC_STYLE_DEFAULT, font);
 
     @ws_visible = false
     @eol_visible = false
-    @sci.set_edge_mode(SCI_EDGE_LINE)
+    @sci.set_edge_mode(STC_EDGE_LINE)
 
-    line_num_margin = @sci.text_width(SCI_STYLE_LINENUMBER, "_99999")
+    line_num_margin = @sci.text_width(STC_STYLE_LINENUMBER, "_99999")
     @sci.set_margin_width(0, line_num_margin)
 
-    @sci.style_set_foreground(SCI_STYLE_DEFAULT, BLACK);
-    @sci.style_set_background(SCI_STYLE_DEFAULT, WHITE);
-    @sci.style_set_foreground(SCI_STYLE_LINENUMBER, LIGHT_GREY);
-    @sci.style_set_background(SCI_STYLE_LINENUMBER, WHITE);
-    @sci.style_set_foreground(SCI_STYLE_INDENTGUIDE, LIGHT_GREY);
+    @sci.style_set_foreground(STC_STYLE_DEFAULT, BLACK);
+    @sci.style_set_background(STC_STYLE_DEFAULT, WHITE);
+    @sci.style_set_foreground(STC_STYLE_LINENUMBER, LIGHT_GREY);
+    @sci.style_set_background(STC_STYLE_LINENUMBER, WHITE);
+    @sci.style_set_foreground(STC_STYLE_INDENTGUIDE, LIGHT_GREY);
 
     @sci.set_tab_width(4)
     @sci.set_use_tabs(false)
@@ -76,7 +70,7 @@ class MyFrame < Frame
     @sci.set_indent(4)
     @sci.set_edge_column(80)
 
-    @sci.set_lexer(SCI_LEX_RUBY)
+    @sci.set_lexer(STC_LEX_RUBY)
     @sci.style_clear_all
     @sci.style_set_foreground(2, RED)
     @sci.style_set_foreground(3, GREEN)
@@ -91,17 +85,17 @@ class MyFrame < Frame
     @sci.set_property("fold.preprocessor", "1")
 
     @sci.set_margin_width(1, 0)
-    @sci.set_margin_type(1, SCI_MARGIN_SYMBOL)
-    @sci.set_margin_mask(1, SCI_MASK_FOLDERS)
+    @sci.set_margin_type(1, STC_MARGIN_SYMBOL)
+    @sci.set_margin_mask(1, STC_MASK_FOLDERS)
     @sci.set_margin_width(1, 20)
 
-    @sci.marker_define(SCI_MARKNUM_FOLDER, SCI_MARK_PLUS)
-    @sci.marker_define(SCI_MARKNUM_FOLDEROPEN, SCI_MARK_MINUS)
-    @sci.marker_define(SCI_MARKNUM_FOLDEREND, SCI_MARK_EMPTY)
-    @sci.marker_define(SCI_MARKNUM_FOLDERMIDTAIL, SCI_MARK_EMPTY)
-    @sci.marker_define(SCI_MARKNUM_FOLDEROPENMID, SCI_MARK_EMPTY)
-    @sci.marker_define(SCI_MARKNUM_FOLDERSUB, SCI_MARK_EMPTY)
-    @sci.marker_define(SCI_MARKNUM_FOLDERTAIL, SCI_MARK_EMPTY)
+    @sci.marker_define(STC_MARKNUM_FOLDER, STC_MARK_PLUS)
+    @sci.marker_define(STC_MARKNUM_FOLDEROPEN, STC_MARK_MINUS)
+    @sci.marker_define(STC_MARKNUM_FOLDEREND, STC_MARK_EMPTY)
+    @sci.marker_define(STC_MARKNUM_FOLDERMIDTAIL, STC_MARK_EMPTY)
+    @sci.marker_define(STC_MARKNUM_FOLDEROPENMID, STC_MARK_EMPTY)
+    @sci.marker_define(STC_MARKNUM_FOLDERSUB, STC_MARK_EMPTY)
+    @sci.marker_define(STC_MARKNUM_FOLDERTAIL, STC_MARK_EMPTY)
     @sci.set_fold_flags(16)
 
     @sci.set_margin_sensitive(1,1)
@@ -110,8 +104,8 @@ class MyFrame < Frame
     evt_menu(Minimal_About) {onAbout}
     evt_menu(Toggle_Whitespace) {onWhitespace}
     evt_menu(Toggle_EOL) {onEOL}
-    evt_sci_charadded {|evt| onCharadded(evt)}
-    evt_sci_marginclick {|evt| onMarginClick(evt)}
+    evt_stc_charadded(@sci.get_id) {|evt| onCharadded(evt)}
+    evt_stc_marginclick(@sci.get_id) {|evt| onMarginClick(evt)}
 
   end
 
@@ -130,7 +124,7 @@ class MyFrame < Frame
 
   def onWhitespace
     @ws_visible = !@ws_visible
-    @sci.set_view_white_space(@ws_visible ? SCI_WS_VISIBLEALWAYS : SCI_WS_INVISIBLE)
+    @sci.set_view_white_space(@ws_visible ? STC_WS_VISIBLEALWAYS : STC_WS_INVISIBLE)
   end
 
   def onEOL

data/samples/text/unicode.rb

@@ -102,7 +102,7 @@ class IConvFrame < Wx::Frame
 
     sizer.add(ctrl_sizer, 0, Wx::ADJUST_MINSIZE|Wx::ALL, 2)
     construct_menus()
-    panel.set_sizer( sizer )
+    panel.set_sizer_and_fit( sizer )
   end
 
   # Prompt the user to specify a file whose contents should be loaded