wxruby 1.9.1-i686-linux → 1.9.2-i686-linux

data/samples/minimal/minimal.rb

@@ -13,35 +13,45 @@ rescue LoadError => no_wx_err
   end
 end
 
-# The frame or self-contained window for this application
+# This sample shows a fairly minimal Wx::App using a Frame, with a
+# MenuBar and StatusBar but no controls. For the absolute minimum app,
+# see nothing.rb
+
+# A Wx::Frame is a self-contained, top-level Window that can contain
+# controls, menubars, and statusbars
 class MinimalFrame < Wx::Frame
   def initialize(title)
-    
-    # A main application frame has no parent (nil)
+    # The main application frame has no parent (nil)
     super(nil, :title => title, :size => [ 400, 300 ])
 
-    # 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)
+    icon_file = File.join( File.dirname(__FILE__), "mondrian.png")
+    # PNG can be used on all platforms, but icon type must be specified
+    # to work on Windows; OS X doesn't have "Frame" icons.
+    self.icon = Wx::Icon.new(icon_file, Wx::BITMAP_TYPE_PNG)
 
-    menu_file = Wx::Menu.new()
-    menu_help = Wx::Menu.new()
-    # Using Wx::ID_ABOUT default id means the menu item will be placed
-    # in the correct platform-specific place
-    menu_help.append(Wx::ID_ABOUT, "&About...\tF1", "Show about dialog")
+    menu_bar = Wx::MenuBar.new
+    # The "file" menu
+    menu_file = Wx::Menu.new
     menu_file.append(Wx::ID_EXIT, "E&xit\tAlt-X", "Quit this program")
-    menu_bar = Wx::MenuBar.new()
     menu_bar.append(menu_file, "&File")
+
+    # The "help" menu
+    menu_help = Wx::Menu.new
+    # Using Wx::ID_ABOUT default id means the menu item will be placed
+    # in the correct platform-specific place - eg on OS X
+    menu_help.append(Wx::ID_ABOUT, "&About...\tF1", "Show about dialog")
     menu_bar.append(menu_help, "&Help")
-    # Assign the menus to this frame
-    set_menu_bar(menu_bar)
 
+    # Assign the menubar to this frame
+    self.menu_bar = menu_bar
+
+    # Create a status bar
     create_status_bar(2)
-    set_status_text("Welcome to wxRuby!")
+    self.status_text = "Welcome to wxRuby!"
 
-    # handle menu events
-    evt_menu(Wx::ID_EXIT) { on_quit }
-    evt_menu(Wx::ID_ABOUT) { on_about }
+    # Set it up to handle menu events using the relevant methods
+    evt_menu Wx::ID_EXIT, :on_quit
+    evt_menu Wx::ID_ABOUT, :on_about
   end
 
   # End the application; it should finish automatically when the last
@@ -58,26 +68,18 @@ class MinimalFrame < Wx::Frame
     # create a simple message dialog with OK button
     about_dlg = Wx::MessageDialog.new( self, msg, 'About Minimal',
                                        Wx::OK|Wx::ICON_INFORMATION )
+    # Display the dialog on top of and blocking other windows, until
+    # dismissed by clicking the 'OK' button
     about_dlg.show_modal
   end
 end
 
-# Wx::App is the container class for any wxruby app - only a single
-# instance is required
-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
-    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
+# Wx::App is the container class for any wxruby app. To start an
+# application, either define a subclass of Wx::App, create an instance,
+# and call its main_loop method, OR, simply call the Wx::App.run class
+# method, as shown here.
+Wx::App.run do 
+  self.app_name = 'Minimal'
+  frame = MinimalFrame.new("Minimal wxRuby App")
+  frame.show
 end
-
-# Create an instance ...
-app = MinimalApp.new
-# ... and run the application
-app.main_loop()

data/samples/minimal/nothing.rb

@@ -13,34 +13,9 @@ rescue LoadError => no_wx_err
   end
 end
 
-class MyFrame < Wx::Frame
-  def initialize(title)
-    super(nil, -1, title)
-  end
+# This is the minimum code to start a WxRuby app - create a Frame, and
+# show it.
+Wx::App.run do 
+  frame = Wx::Frame.new(nil, :title => "Minimal wxRuby App")
+  frame.show
 end
-
-class NothingApp < Wx::App
-  def on_init
-    puts("in on_init")
-    $frame = MyFrame.new("Minimal wxRuby App")
-    puts("about to call show")
-	$frame.show
-    puts("returning from on_init")
-    return true
-  end
-  
-  def on_fatal_exception
-    puts("on_fatal_exception")
-  end
-  
-  def on_exit
-    puts("on_exit")
-    return super
-  end
-end
-
-a = NothingApp.new
-a.main_loop()
-puts("back from main_loop...")
-GC.start
-puts("survived gc")

data/samples/treectrl/treectrl.rb

@@ -59,7 +59,6 @@ TreeTest_DecSpacing,
 TreeTest_ToggleIcon,
 TreeTest_Select,
 TreeTest_Unselect = (Wx::ID_HIGHEST..Wx::ID_HIGHEST+39).to_a
-TreeTest_Ctrl = 1000
 
 TreeCtrlIcon_File,
 TreeCtrlIcon_FileSelected,
@@ -68,8 +67,8 @@ TreeCtrlIcon_FolderSelected,
 TreeCtrlIcon_FolderOpened = 0,1,2,3,4
 
 class MyTreeCtrl < Wx::TreeCtrl
-  def initialize(parent, id,pos, size,style)
-    super(parent, id, pos, size, style)
+  def initialize(parent, args)
+    super
 
     @reverse_sort = false
 
@@ -79,26 +78,25 @@ class MyTreeCtrl < Wx::TreeCtrl
     add_test_items_to_tree(5, 2)
 
     # TreeCtrl supports a large number of different events...
-    evt_tree_begin_drag(TreeTest_Ctrl) { | e | on_begin_drag(e) }
-    evt_tree_begin_rdrag(TreeTest_Ctrl) { | e | on_begin_rdrag(e) }
-    evt_tree_end_drag(TreeTest_Ctrl) { | e | on_end_drag(e) }
-    evt_tree_begin_label_edit(TreeTest_Ctrl) { | e | on_begin_label_edit(e) }
-    evt_tree_end_label_edit(TreeTest_Ctrl) { | e | on_end_label_edit(e) }
-    evt_tree_delete_item(TreeTest_Ctrl) { | e | on_delete_item(e) }
-    evt_tree_set_info(TreeTest_Ctrl) { | e | on_set_info(e) }
-    evt_tree_item_expanded(TreeTest_Ctrl) { | e | on_item_expanded(e) }
-    evt_tree_item_expanding(TreeTest_Ctrl) { | e | on_item_expanding(e) }
-    evt_tree_item_collapsed(TreeTest_Ctrl) { | e | on_item_collapsed(e) }
-    evt_tree_item_collapsing(TreeTest_Ctrl) { | e | on_item_collapsing(e) }
-    evt_tree_item_right_click(TreeTest_Ctrl) { | e | on_item_right_click(e) }
-
-    evt_right_up { | e | on_rmouse_up(e) }
-    evt_tree_sel_changed(TreeTest_Ctrl) { | e | on_sel_changed(e) }
-    evt_tree_sel_changing(TreeTest_Ctrl) { | e | on_sel_changing(e) }
-    evt_tree_key_down(TreeTest_Ctrl) { | e | on_tree_key_down(e) }
-    evt_tree_item_activated(TreeTest_Ctrl) { | e | on_item_activated(e) }
-    evt_right_dclick { | e | on_rmouse_dclick(event) }
-
+    evt_tree_begin_drag self, :on_begin_drag
+    evt_tree_begin_rdrag self, :on_begin_rdrag
+    evt_tree_end_drag self, :on_end_drag
+    evt_tree_begin_label_edit self, :on_begin_label_edit
+    evt_tree_end_label_edit self, :on_end_label_edit
+    evt_tree_delete_item self, :on_delete_item
+    evt_tree_set_info self, :on_set_info
+    evt_tree_item_expanded self, :on_item_expanded
+    evt_tree_item_expanding self, :on_item_expanding
+    evt_tree_item_collapsed self, :on_item_collapsed
+    evt_tree_item_collapsing self, :on_item_collapsing
+    evt_tree_item_right_click self, :on_item_right_click
+    evt_tree_sel_changed self, :on_sel_changed
+    evt_tree_sel_changing self, :on_sel_changing
+    evt_tree_key_down self, :on_tree_key_down
+    evt_tree_item_activated self, :on_item_activated
+
+    evt_right_dclick :on_rmouse_dclick
+    evt_right_up :on_rmouse_up
   end
 
   def show_info(id)
@@ -131,7 +129,7 @@ class MyTreeCtrl < Wx::TreeCtrl
 
   def is_test_item(item)
     # the test item is the first child folder
-    return get_item_parent(item) == get_root_item() && !get_prev_sibling(item)
+    return item_parent(item) == root_item && ! prev_sibling(item)
   end
 
   def create_image_list
@@ -143,16 +141,15 @@ class MyTreeCtrl < Wx::TreeCtrl
     Wx::BusyCursor.busy do
       icons = (1 .. 5).map do | i |
         icon_file = File.join(File.dirname(__FILE__), "icon#{i}.xpm")
-        # Wx::Icon.new(icon_file, Wx::BITMAP_TYPE_XPM, 16, 16)
         Wx::Bitmap.new(icon_file, Wx::BITMAP_TYPE_XPM)
       end
       icons.each { | ic | images.add(ic) }
-      set_image_list(images)
+      self.image_list = images
     end
   end
 
   def unset_image_list
-    set_image_list(nil)
+    self.image_list = nil
   end
 
   def create_buttons_image_list()
@@ -165,19 +162,19 @@ class MyTreeCtrl < Wx::TreeCtrl
         Wx::Icon.new("icon3.xpm"),   # closed
         Wx::Icon.new("icon3.xpm"),   # closed, selected
         Wx::Icon.new("icon5.xpm"),   # open
-        Wx::Icon.new("icon5.xpm")]   # open, selected
+        Wx::Icon.new("icon5.xpm") ]   # open, selected
       
       icons.each do | ic |
         orig_size = ic.get_width()
         if size == orig_size
           images.add(ic)
         else
-          resized = ic.convert_to_image().rescale(size, size)
+          resized = ic.convert_to_image.rescale(size, size)
           images.add( Wx::Bitmap.new(resized) )
         end
       end
       
-      set_buttons_image_list(images)
+      self.buttons_image_list = images
     end
   end
 
@@ -203,7 +200,7 @@ class MyTreeCtrl < Wx::TreeCtrl
         end
         # here we pass to append_item() normal and selected item images (we
         # suppose that selected image follows the normal one in the enum)
-        if Wx::get_app.show_images()
+        if Wx::THE_APP.show_images
           image = depth == 1 ? TreeCtrlIcon_File : TreeCtrlIcon_Folder
           imageSel = image + 1
         else
@@ -213,8 +210,8 @@ class MyTreeCtrl < Wx::TreeCtrl
 
         # and now we also set the expanded one (only for the folders)
         if has_children && Wx::get_app.show_images()
-          set_item_image(id, TreeCtrlIcon_FolderOpened,
-                         Wx::TREE_ITEM_ICON_EXPANDED)
+          set_item_image( id, TreeCtrlIcon_FolderOpened,
+                          Wx::TREE_ITEM_ICON_EXPANDED)
         end
 
         # remember the last child for OnEnsureVisible()
@@ -228,10 +225,10 @@ class MyTreeCtrl < Wx::TreeCtrl
   end
 
   def add_test_items_to_tree(num_children,depth)
-    image = Wx::get_app.show_images ? TreeCtrlIcon_Folder : -1
+    image = Wx::THE_APP.show_images ? TreeCtrlIcon_Folder : -1
     root_id = add_root("Root",image, image)
     if image != -1
-      set_item_image(root_id, TreeCtrlIcon_FolderOpened, 
+      set_item_image( root_id, TreeCtrlIcon_FolderOpened, 
                       Wx::TREE_ITEM_ICON_EXPANDED)
     end
 
@@ -242,17 +239,18 @@ class MyTreeCtrl < Wx::TreeCtrl
     # that use the generic TreeCtrl - OS X and GTK, and only if
     # Wx::TR_HAS_VARIABLE_ROW_HEIGHT style was used in the constructor
     font = get_font
-    font.set_style(Wx::FONTSTYLE_ITALIC)
+    font.style = Wx::FONTSTYLE_ITALIC
     set_item_font(root_id, font)
 
-    id,cookie = get_first_child(root_id)
-    set_item_text_colour(id, Wx::BLUE)
+    ids = get_children(root_id)
+
+    # make the first item blue
+    set_item_text_colour(ids[0], Wx::BLUE)
 
-    id,cookie = get_next_child(root_id,cookie)
-    id,cookie = get_next_child(root_id,cookie)
+    # make the third item red on grey
     if Wx::PLATFORM == "WXMSW"
-      set_item_text_colour(id, Wx::RED)      
-      set_item_background_colour(id, Wx::LIGHT_GREY)
+      set_item_text_colour(ids[2], Wx::RED)      
+      set_item_background_colour(ids[2], Wx::LIGHT_GREY)
     end
   end
 
@@ -266,7 +264,7 @@ class MyTreeCtrl < Wx::TreeCtrl
       return nil
     end
 
-    text = get_item_text(id)
+    text = item_text(id)
     Wx::log_message(text)
 
     if item_has_children(id)
@@ -288,51 +286,51 @@ class MyTreeCtrl < Wx::TreeCtrl
 
   def on_begin_rdrag(event)
     Wx::log_message("OnBeginRDrag")
-    event.skip()
+    event.skip
   end
 
   def on_delete_item(event)
     Wx::log_message("OnDeleteItem")
-    event.skip()
+    event.skip
   end
 
   def on_get_info(event)
     Wx::log_message("OnGetInfo")
-    event.skip()
+    event.skip
   end
 
   def on_set_info(event)
     Wx::log_message("OnSetInfo")
-    event.skip()
+    event.skip
   end
 
   def on_item_expanded(event)
     Wx::log_message("OnItemExpanded")
-    event.skip()
+    event.skip
   end
 
   def on_item_expanding(event)
     Wx::log_message("OnItemExpanding")
-    event.skip()
+    event.skip
   end
 
   def on_item_collapsed(event)
     Wx::log_message("OnItemCollapsed")
-    event.skip()
+    event.skip
   end
 
   def on_sel_changed(event)
     Wx::log_message("OnSelChanged")
-    event.skip()
+    event.skip
   end
 
   def on_sel_changing(event)
     Wx::log_message("OnSelChanging")
-    event.skip()
+    event.skip
   end
 
   def log_key_event(name,event)
-    keycode = event.get_key_code()
+    keycode = event.key_code
 
     case keycode
     when Wx::K_BACK
@@ -548,26 +546,25 @@ class MyTreeCtrl < Wx::TreeCtrl
     end
 
     Wx::log_message( "%s event: %s (flags = %s%s%s%s)",
-                name, key,
-                event.control_down() ? 'C' : '-',
-                event.alt_down() ? 'A' : '-',
-                event.shift_down() ? 'S' : '-',
-                event.meta_down() ? 'M' : '-')
+                     name, key,
+                     event.control_down() ? 'C' : '-',
+                     event.alt_down() ? 'A' : '-',
+                     event.shift_down() ? 'S' : '-',
+                     event.meta_down() ? 'M' : '-')
   end
 
   def on_tree_key_down(event)
-    log_key_event("Tree key down ", event.get_key_event())
-
-    event.skip()
+    log_key_event("Tree key down ", event.key_event )
+    event.skip
   end
 
   def on_begin_drag(event)
     # need to explicitly allow drag
-    if event.get_item() != get_root_item()
-      @dragged_item = event.get_item()
-      Wx::log_message("OnBeginDrag: started dragging %s",
-                  get_item_text(@dragged_item))
-      event.allow()
+    if event.item != root_item()
+      @dragged_item = event.item
+      Wx::log_message( "OnBeginDrag: started dragging %s",
+                       item_text(@dragged_item))
+      event.allow
     else
       Wx::log_message("OnBeginDrag: selected item can't be dragged.")
     end
@@ -575,12 +572,12 @@ class MyTreeCtrl < Wx::TreeCtrl
 
   def on_end_drag(event)
     src_item = @dragged_item
-    dest_item = event.get_item()
+    dest_item = event.item
     @dragged_item = 0
 
     if dest_item.nonzero? && ! item_has_children(dest_item)
       # copy to the parent then
-      dest_item = get_item_parent(dest_item)
+      dest_item = item_parent(dest_item)
     end
 
     unless dest_item.nonzero?()
@@ -588,9 +585,9 @@ class MyTreeCtrl < Wx::TreeCtrl
       return nil
     end
 
-    text = get_item_text(src_item)
+    text = item_text(src_item)
     Wx::log_message("OnEndDrag: '%s' copied to '%s'.",
-                text, get_item_text(dest_item))
+                     text, item_text(dest_item))
 
     # just do append here - we could also insert it just before/after the item
     # on which it was dropped, but self requires slightly more work... we also
@@ -599,7 +596,7 @@ class MyTreeCtrl < Wx::TreeCtrl
     #
     # Finally, we only copy one item here but we might copy the entire tree if
     # we were dragging a folder.
-    image = Wx::get_app().show_images() ? TreeCtrlIcon_File : -1
+    image = Wx::THE_APP.show_images() ? TreeCtrlIcon_File : -1
     append_item(dest_item, text, image)
   end
 
@@ -607,26 +604,25 @@ class MyTreeCtrl < Wx::TreeCtrl
     Wx::log_message("OnBeginLabelEdit")
 
     # for testing, prevent self item's label editing
-    item_id = event.get_item()
-    if is_test_item(item_id)
-      message_box("The demo prevents you editing this item.")
+    if is_test_item(event.item)
+      Wx::message_box("The demo prevents you editing this item.")
       event.veto()
     end
   end
 
   def on_end_label_edit(event)
     Wx::log_message("OnEndLabelEdit")
-    if event.is_edit_cancelled
+    if event.edit_cancelled?
       Wx::log_message("Label edit was cancelled by user")
       return
     end
 
     # For a demo, don't allow anything except letters in the labels
-    if event.get_label =~ /[^\w.]/
+    if event.label =~ /[^\w.]/
       msg = "Only letters, numbers and full stops are allowed in the label."
-      message_box(msg)
+      Wx::message_box(msg)
       Wx::log_message("Label edit was cancelled by demo")
-      event.veto()
+      event.veto
     end
   end
 
@@ -634,28 +630,26 @@ class MyTreeCtrl < Wx::TreeCtrl
     Wx::log_message("OnItemCollapsing")
 
     # for testing, prevent the user from collapsing the first child folder
-    item_id = event.get_item()
-    if is_test_item(item_id)
-      message_box("You can't collapse self item.")
-
-      event.veto()
+    if is_test_item(event.item)
+      Wx::message_box("You can't collapse self item.")
+      event.veto
     end
   end
 
   # show some info about activated item
   def on_item_activated(event)
-    if item_id  = event.get_item()
+    if item_id  = event.item
       show_info(item_id)
     end
     Wx::log_message("OnItemActivated")
   end
 
   def on_item_right_click(event)
-    show_popup_menu(event.get_item(), event.get_point())
+    show_popup_menu(event.item, event.point)
   end
 
   def on_rmouse_up(event)
-    pos  = event.get_position()
+    pos  = event.position
     item = hit_test(pos)
     show_popup_menu(item, pos)
   end
@@ -663,7 +657,7 @@ class MyTreeCtrl < Wx::TreeCtrl
   def show_popup_menu(id, pos)
     title = ""
     if id.nonzero?
-      title << "Menu for " << get_item_text(id)
+      title << "Menu for " << item_text(id)
     else
       title = "Menu for no particular item"
     end
@@ -690,7 +684,7 @@ end
 
 class MyFrame < Wx::Frame
   def initialize(title, x, y, w, h)
-    super(nil, -1, title, Wx::Point.new(x, y), Wx::Size.new(w, h))
+    super( nil, :title => title, :pos => [ x, y ], :size => [ w, h ] )
     @treectrl = nil
     @textctrl = nil
     @s_num = 0
@@ -698,7 +692,7 @@ class MyFrame < Wx::Frame
     # This reduces flicker effects - even better would be to define
     # OnEraseBackground to do nothing. When the tree control's scrollbars are
     # show or hidden, the frame is sent a background erase event.
-    set_background_colour(Wx::Colour.new(255, 255, 255))
+    self.background_colour = Wx::WHITE
 
     # Make a menubar
     file_menu  = Wx::Menu.new
@@ -782,13 +776,13 @@ class MyFrame < Wx::Frame
     menu_bar.append(style_menu, "&Style")
     menu_bar.append(tree_menu, "&Tree")
     menu_bar.append(item_menu, "&Item")
-    set_menu_bar(menu_bar)
+    self.menu_bar = menu_bar
 
 
     # create the controls
-    @textctrl = Wx::TextCtrl.new(self, -1, "",
-                             Wx::DEFAULT_POSITION, Wx::DEFAULT_SIZE,
-                             Wx::TE_MULTILINE|Wx::SUNKEN_BORDER)
+    @textctrl = Wx::TextCtrl.new( self, 
+                                  :text => '', 
+                                  :style => Wx::TE_MULTILINE|Wx::SUNKEN_BORDER)
 
     create_tree_with_default_style()
 
@@ -800,55 +794,54 @@ class MyFrame < Wx::Frame
 
     # set our text control as the log target
     logWindow = Wx::LogTextCtrl.new(@textctrl)
-    Wx::Log::set_active_target(logWindow)
-
-    evt_size {|event| on_size(event) }
-
-    evt_menu(Wx::ID_EXIT) {|event| on_quit(event) }
-    evt_menu(Wx::ID_ABOUT) {|event| on_about(event) }
-
-    evt_menu(TreeTest_TogButtons) {|event| on_tog_buttons(event) }
-    evt_menu(TreeTest_TogTwist) {|event| on_tog_twist(event) }
-    evt_menu(TreeTest_TogLines) {|event| on_tog_lines(event) }
-    evt_menu(TreeTest_TogEdit) {|event| on_tog_edit(event) }
-    evt_menu(TreeTest_TogHideRoot) {|event| on_tog_hide_root(event) }
-    evt_menu(TreeTest_TogRootLines) {|event| on_tog_root_lines(event) }
-    evt_menu(TreeTest_TogBorder) {|event| on_tog_border(event) }
-    evt_menu(TreeTest_TogFullHighlight) {|event| on_tog_full_highlight(event) }
-    evt_menu(TreeTest_SetFgColour) {|event| on_set_fg_colour(event) }
-    evt_menu(TreeTest_SetBgColour) {|event| on_set_bg_colour(event) }
-    evt_menu(TreeTest_ResetStyle) {|event| on_reset_style(event) }
-
-    evt_menu(TreeTest_Dump) {|event| on_dump(event) }
-    evt_menu(TreeTest_DumpSelected) {|event| on_dump_selected(event) }
-    evt_menu(TreeTest_Select) {|event| on_select(event) }
-    evt_menu(TreeTest_Unselect) {|event| on_unselect(event) }
-    evt_menu(TreeTest_ToggleSel) {|event| on_toggle_sel(event) }
-    evt_menu(TreeTest_Rename) {|event| on_rename(event) }
-    evt_menu(TreeTest_Count) {|event| on_count(event) }
-    evt_menu(TreeTest_CountRec) {|event| on_count_rec(event) }
-    evt_menu(TreeTest_Sort) {|event| on_sort(event) }
-    evt_menu(TreeTest_SortRev) {|event| on_sort_rev(event) }
-    evt_menu(TreeTest_SetBold) {|event| on_set_bold(event) }
-    evt_menu(TreeTest_ClearBold) {|event| on_clear_bold(event) }
-    evt_menu(TreeTest_Delete) {|event| on_delete(event) }
-    evt_menu(TreeTest_DeleteChildren) {|event| on_delete_children(event) }
-    evt_menu(TreeTest_DeleteAll) {|event| on_delete_all(event) }
-    evt_menu(TreeTest_Recreate) {|event| on_recreate(event) }
-    evt_menu(TreeTest_ToggleImages) {|event| on_toggle_images(event) }
-    evt_menu(TreeTest_ToggleButtons) {|event| on_toggle_buttons(event) }
-    evt_menu(TreeTest_SetImageSize) {|event| on_set_image_size(event) }
-    evt_menu(TreeTest_CollapseAndReset) {|event| on_collapse_and_reset(event) }
-    evt_menu(TreeTest_EnsureVisible) {|event| on_ensure_visible(event) }
-    evt_menu(TreeTest_AddItem) {|event| on_add_item(event) }
-    evt_menu(TreeTest_InsertItem) {|event| on_insert_item(event) }
-    evt_menu(TreeTest_IncIndent) {|event| on_inc_indent(event) }
-    evt_menu(TreeTest_DecIndent) {|event| on_dec_indent(event) }
-    evt_menu(TreeTest_IncSpacing) {|event| on_inc_spacing(event) }
-    evt_menu(TreeTest_DecSpacing) {|event| on_dec_spacing(event) }
-    evt_menu(TreeTest_ToggleIcon) {|event| on_toggle_icon(event) }
-
-    evt_close {|event| on_close(event) }
+    Wx::Log::active_target = logWindow
+
+    evt_size :on_size
+    evt_close :on_close
+
+    evt_menu Wx::ID_EXIT, :on_quit
+    evt_menu Wx::ID_ABOUT, :on_about
+
+    evt_menu TreeTest_TogButtons, :on_tog_buttons
+    evt_menu TreeTest_TogTwist, :on_tog_twist
+    evt_menu TreeTest_TogLines, :on_tog_lines
+    evt_menu TreeTest_TogEdit, :on_tog_edit
+    evt_menu TreeTest_TogHideRoot, :on_tog_hide_root
+    evt_menu TreeTest_TogRootLines, :on_tog_root_lines
+    evt_menu TreeTest_TogBorder, :on_tog_border
+    evt_menu TreeTest_TogFullHighlight, :on_tog_full_highlight
+    evt_menu TreeTest_SetFgColour, :on_set_fg_colour
+    evt_menu TreeTest_SetBgColour, :on_set_bg_colour
+    evt_menu TreeTest_ResetStyle, :on_reset_style
+
+    evt_menu TreeTest_Dump, :on_dump
+    evt_menu TreeTest_DumpSelected, :on_dump_selected
+    evt_menu TreeTest_Select, :on_select
+    evt_menu TreeTest_Unselect, :on_unselect
+    evt_menu TreeTest_ToggleSel, :on_toggle_sel
+    evt_menu TreeTest_Rename, :on_rename
+    evt_menu TreeTest_Count, :on_count
+    evt_menu TreeTest_CountRec, :on_count_rec
+    evt_menu TreeTest_Sort, :on_sort
+    evt_menu TreeTest_SortRev, :on_sort_rev
+    evt_menu TreeTest_SetBold, :on_set_bold
+    evt_menu TreeTest_ClearBold, :on_clear_bold
+    evt_menu TreeTest_Delete, :on_delete
+    evt_menu TreeTest_DeleteChildren, :on_delete_children
+    evt_menu TreeTest_DeleteAll, :on_delete_all
+    evt_menu TreeTest_Recreate, :on_recreate
+    evt_menu TreeTest_ToggleImages, :on_toggle_images
+    evt_menu TreeTest_ToggleButtons, :on_toggle_buttons
+    evt_menu TreeTest_SetImageSize, :on_set_image_size
+    evt_menu TreeTest_CollapseAndReset, :on_collapse_and_reset
+    evt_menu TreeTest_EnsureVisible, :on_ensure_visible
+    evt_menu TreeTest_AddItem, :on_add_item
+    evt_menu TreeTest_InsertItem, :on_insert_item
+    evt_menu TreeTest_IncIndent, :on_inc_indent
+    evt_menu TreeTest_DecIndent, :on_dec_indent
+    evt_menu TreeTest_IncSpacing, :on_inc_spacing
+    evt_menu TreeTest_DecSpacing, :on_dec_spacing
+    evt_menu TreeTest_ToggleIcon, :on_toggle_icon
   end
 
   def create_tree_with_default_style()
@@ -860,7 +853,7 @@ class MyFrame < Wx::Frame
 
     # as we don't know what Wx::TR_DEFAULT_STYLE could contain, test for
     # everything
-    mbar = get_menu_bar()
+    mbar = menu_bar
     mbar.check(TreeTest_TogButtons, (style & Wx::TR_HAS_BUTTONS) != 0)
     mbar.check(TreeTest_TogButtons, (style & Wx::TR_TWIST_BUTTONS) != 0)
     mbar.check(TreeTest_TogLines, (style & Wx::TR_NO_LINES) == 0)
@@ -872,53 +865,51 @@ class MyFrame < Wx::Frame
   end
 
   def create_tree(style)
-    @treectrl = MyTreeCtrl.new(self, TreeTest_Ctrl,
-                               Wx::DEFAULT_POSITION, Wx::DEFAULT_SIZE,
-                               style)
-    resize()
+    @treectrl = MyTreeCtrl.new(self, :style => style)
+    resize
   end
 
   def tog_style(id,flag)
 
-    style = @treectrl.get_window_style_flag() ^ flag
+    style = @treectrl.window_style_flag ^ flag
 
     # most treectrl styles can't be changed on the fly using the native
     # control and the tree must be recreated
     @treectrl.destroy
     create_tree(style)
-    get_menu_bar().check(id, (style & flag) != 0)
+    menu_bar.check(id, (style & flag) != 0)
   end
 
   def on_tog_buttons(event)
-    tog_style(event.get_id(), Wx::TR_HAS_BUTTONS)
+    tog_style(event.id, Wx::TR_HAS_BUTTONS)
   end
 
   def on_tog_twist(event)
-    tog_style(event.get_id(), Wx::TR_TWIST_BUTTONS)
+    tog_style(event.id, Wx::TR_TWIST_BUTTONS)
   end
 
   def on_tog_lines(event)
-    tog_style(event.get_id(), Wx::TR_NO_LINES)
+    tog_style(event.id, Wx::TR_NO_LINES)
   end
 
   def on_tog_edit(event)
-    tog_style(event.get_id(), Wx::TR_EDIT_LABELS)
+    tog_style(event.id, Wx::TR_EDIT_LABELS)
   end
 
   def on_tog_hide_root(event)
-    tog_style(event.get_id(), Wx::TR_HIDE_ROOT)
+    tog_style(event.id, Wx::TR_HIDE_ROOT)
   end
 
   def on_tog_root_lines(event)
-    tog_style(event.get_id(), Wx::TR_LINES_AT_ROOT)
+    tog_style(event.id, Wx::TR_LINES_AT_ROOT)
   end
 
   def on_tog_border(event)
-    tog_style(event.get_id(), Wx::TR_ROW_LINES)
+    tog_style(event.id, Wx::TR_ROW_LINES)
   end
 
   def on_tog_full_highlight(event)
-    tog_style(event.get_id(), Wx::TR_FULL_ROW_HIGHLIGHT)
+    tog_style(event.id, Wx::TR_FULL_ROW_HIGHLIGHT)
   end
 
   def on_reset_style(event)
@@ -934,7 +925,7 @@ class MyFrame < Wx::Frame
   end
 
   def on_sort(event)
-    do_sort()
+    do_sort
   end
 
   def on_sort_rev(event)
@@ -943,22 +934,19 @@ class MyFrame < Wx::Frame
 
   def on_size(event)
     if @treectrl && @textctrl
-      resize()
+      resize
     end
-
-    event.skip()
+    event.skip
   end
 
-  def resize()
-    my_size = get_client_size()
-    tree_size = Wx::Size.new(my_size.x, 2*my_size.y/3)
-    @treectrl.set_size( tree_size )
-    @textctrl.set_dimensions(0, 2*my_size.y/3, my_size.x, my_size.y/3)
+  def resize
+    my_size = self.client_size
+    @treectrl.size = [ my_size.x, 2 * my_size.y / 3 ]
   end
 
   def on_close(event)
-    Wx::Log::set_active_target(nil)
-    destroy()
+    Wx::Log::active_target = nil
+    destroy
   end
 
   def on_quit(event)
@@ -966,15 +954,15 @@ class MyFrame < Wx::Frame
   end
 
   def on_about(event)
-    Wx::message_box("Tree test sample\n" +
-                                      "(c) Julian Smart 1997, Vadim Zeitlin 1998",
-                "About tree test",
-                Wx::OK|Wx::ICON_INFORMATION, self)
+    Wx::message_box( "Tree test sample\n" +
+                     "(c) Julian Smart 1997, Vadim Zeitlin 1998",
+                     "About tree test",
+                     Wx::OK|Wx::ICON_INFORMATION, self)
   end
 
   def check_item(item)
     unless item.nonzero?
-      message_box("Please select some item first!",
+      Wx::message_box("Please select some item first!",
                   "Tree sample error",
                   Wx::OK|Wx::ICON_EXCLAMATION, self)
       return false
@@ -983,51 +971,44 @@ class MyFrame < Wx::Frame
   end
 
   def on_rename(event)
-    item = @treectrl.get_selection()
-
+    item = @treectrl.selection
     return nil unless check_item( item )
-
     # TODO demonstrate creating a custom edit control...
     @treectrl.edit_label(item)
   end
 
   def on_count(event)
-    item = @treectrl.get_selection()
-
+    item = @treectrl.selection
     return nil unless check_item( item )
-
-    i = @treectrl.get_children_count( item, false )
-
+    i = @treectrl.children_count( item, false )
     Wx::log_message("%d children", i)
   end
 
   def on_count_rec(event)
-    item = @treectrl.get_selection()
+    item = @treectrl.selection
     return nil unless check_item( item )
-    Wx::log_message("%d children", @treectrl.get_children_count( item ))
+    Wx::log_message("%d children", @treectrl.children_count( item ))
   end
 
   def do_sort(reverse = false)
-    item = @treectrl.get_selection()
+    item = @treectrl.selection
     return nil unless check_item( item )
     @treectrl.do_sort_children(item, reverse)
   end
 
   def on_dump(event)
-    root = @treectrl.get_selection()
-
+    root = @treectrl.selection
     return nil unless check_item( root )
-
     @treectrl.get_items_recursively(root, -1)
   end
 
   def on_toggle_sel(event)
-    tog_style(event.get_id(), Wx::TR_MULTIPLE)
+    tog_style(event.id, Wx::TR_MULTIPLE)
   end
 
   def on_dump_selected(event)
-    if ( @treectrl.get_window_style & Wx::TR_MULTIPLE ) == 0
-      item_id = @treectrl.get_selection
+    if ( @treectrl.window_style & Wx::TR_MULTIPLE ) == 0
+      item_id = @treectrl.selection
       if item_id.nonzero?
         Wx::log_message("<TreeItem '%s'>", 
                         @treectrl.get_item_text(item_id))
@@ -1046,7 +1027,7 @@ class MyFrame < Wx::Frame
   end
 
   def on_select(event)
-    @treectrl.select_item(@treectrl.get_selection())
+    @treectrl.select_item(@treectrl.selection)
   end
 
   def on_unselect(event)
@@ -1054,26 +1035,20 @@ class MyFrame < Wx::Frame
   end
 
   def do_set_bold(bold = true)
-    item = @treectrl.get_selection()
-
+    item = @treectrl.selection
     return nil unless check_item( item )
-
     @treectrl.set_item_bold(item, bold)
   end
 
   def on_delete(event)
-    item = @treectrl.get_selection()
-
+    item = @treectrl.selection
     return nil unless check_item( item )
-
     @treectrl.delete(item)
   end
 
   def on_delete_children(event)
-    item = @treectrl.get_selection()
-
+    item = @treectrl.selection
     return nil unless check_item( item )
-
     @treectrl.delete_children(item)
   end
 
@@ -1096,7 +1071,7 @@ class MyFrame < Wx::Frame
     end
 
     @treectrl.create_image_list(size)
-    Wx::get_app.show_images = true
+    Wx::THE_APP.show_images = true
   end
 
   def on_toggle_images(event)
@@ -1121,46 +1096,42 @@ class MyFrame < Wx::Frame
   end
 
   def on_insert_item(event)
-    image = Wx::get_app.show_images() ? TreeCtrlIcon_File : -1
-    @treectrl.insert_item(@treectrl.get_root_item(), -1, "2nd item", image)
+    image = Wx::THE_APP.show_images() ? TreeCtrlIcon_File : -1
+    @treectrl.insert_item(@treectrl.root_item, -1, "2nd item", image)
   end
 
   def on_add_item(event)
     @s_num += 1
     text = sprintf("Item #%d", @s_num)
-    @treectrl.append_item(@treectrl.get_root_item(), text)
+    @treectrl.append_item(@treectrl.root_item, text)
   end
 
   def on_inc_indent(event)
-    indent = @treectrl.get_indent()
-    if indent < 100
-      @treectrl.set_indent( indent+5 )
+    if @treectrl.indent < 100
+      @treectrl.indent += 5
     end
   end
 
   def on_dec_indent(event)
-    indent = @treectrl.get_indent()
-    if indent > 10
-      @treectrl.set_indent( indent-5 )
+    if @treectrl.indent > 10
+      @treectrl.indent -= 5
     end
   end
 
   def on_inc_spacing(event)
-    indent = @treectrl.get_spacing()
-    if indent < 100
-      @treectrl.set_spacing( indent+5 )
+    if @treectrl.spacing < 100
+      @treectrl.spacing += 5
     end
   end
 
   def on_dec_spacing(event)
-    indent = @treectrl.get_spacing()
-    if indent > 10
-      @treectrl.set_spacing( indent-5 )
+    if @treectrl.spacing > 10
+      @treectrl.spacing -= 5
     end
   end
 
   def on_toggle_icon(event)
-    item = @treectrl.get_selection()
+    item = @treectrl.selection
     return nil unless check_item( item )
     @treectrl.do_toggle_icon(item)
   end
@@ -1169,9 +1140,9 @@ class MyFrame < Wx::Frame
   def on_set_fg_colour(event)
     Wx::log_message('NOT IMPLEMENTED')
     return
-    col = Wx::get_colour_from_user(self, @treectrl.get_foreground_colour())
-    if col.is_ok
-      @treectrl.set_foreground_colour(col)
+    col = Wx::get_colour_from_user(self, @treectrl.foreground_colour)
+    if col.ok?
+      @treectrl.foreground_colour = col
     end
   end
 
@@ -1179,9 +1150,9 @@ class MyFrame < Wx::Frame
   def on_set_bg_colour(event)
     Wx::log_message('NOT IMPLEMENTED')
     return
-    col = Wx::get_colour_from_user(self, @treectrl.get_background_colour())
-    if col.is_ok
-      @treectrl.set_background_colour(col)
+    col = Wx::get_colour_from_user(self, @treectrl.background_colour)
+    if col.ok?
+      @treectrl.background_colour = col
     end
   end
 
@@ -1198,7 +1169,7 @@ class MyApp < Wx::App
   def on_init
     # Create the main frame window
     frame = MyFrame.new("TreeCtrl Test", 50, 50, 450, 600)
-
+    gc_stress
     # show the frame
     frame.show(true)
     # set_top_window(frame)
@@ -1206,5 +1177,5 @@ class MyApp < Wx::App
   end
 end
 
-a = MyApp.new
-a.main_loop()
+app = MyApp.new
+app.main_loop