wxruby3 0.9.1 → 0.9.3

data/samples/etc/miniframe.rb

@@ -11,68 +11,73 @@
 
 require 'wx'
 
-
-class MyFrame < Wx::Frame
-  attr_reader :mini
-
-  def initialize(title, pos, size, style = Wx::DEFAULT_FRAME_STYLE)
-    super(nil, -1, title, pos, size, style)
-
-    menuFile = Wx::Menu.new
-    helpMenu = Wx::Menu.new
-    helpMenu.append(Wx::ID_ABOUT, "&About...\tF1", "Show about dialog")
-    menuFile.append(Wx::ID_EXIT, "E&xit\tAlt-X", "Quit this program")
-    menuBar = Wx::MenuBar.new
-    menuBar.append(menuFile, "&File")
-    menuBar.append(helpMenu, "&Help")
-    set_menu_bar(menuBar)
-
-    create_status_bar(2)
-    set_status_text("Welcome to wxRuby!")
-
-    evt_menu(Wx::ID_EXIT) { on_quit }
-    evt_menu(Wx::ID_ABOUT) { on_about }
-
-    make_miniframe
+module MiniFrame
+
+  class MyFrame < Wx::Frame
+    attr_reader :mini
+
+    def initialize(title, pos, size, style = Wx::DEFAULT_FRAME_STYLE)
+      super(nil, -1, title, pos, size, style)
+
+      self.icon = Wx.Icon(:sample, Wx::BITMAP_TYPE_XPM, art_path: File.join(__dir__, '..'))
+
+      menuFile = Wx::Menu.new
+      helpMenu = Wx::Menu.new
+      helpMenu.append(Wx::ID_ABOUT, "&About...\tF1", "Show about dialog")
+      menuFile.append(Wx::ID_EXIT, "E&xit\tAlt-X", "Quit this program")
+      menuBar = Wx::MenuBar.new
+      menuBar.append(menuFile, "&File")
+      menuBar.append(helpMenu, "&Help")
+      set_menu_bar(menuBar)
+
+      create_status_bar(2)
+      set_status_text("Welcome to wxRuby!")
+
+      evt_menu(Wx::ID_EXIT) { on_quit }
+      evt_menu(Wx::ID_ABOUT) { on_about }
+
+      make_miniframe
+    end
+
+    def make_miniframe
+      @mini = Wx::MiniFrame.new(self, -1, 'Mini Frame',
+                                Wx::Point.new(300, 75), Wx::Size.new(300, 150),
+                                Wx::DEFAULT_FRAME_STYLE|Wx::STAY_ON_TOP)
+      @mini_destroyed = false
+      sizer = Wx::BoxSizer.new(Wx::VERTICAL)
+      text = Wx::StaticText.new(mini, -1, 'This is a MiniFrame.')
+      sizer.add(text, 0, Wx::ALL, 2)
+      text = Wx::StaticText.new(mini, -1, 'It has a small title bar so it')
+      sizer.add(text, 0, Wx::ALL, 2)
+      text = Wx::StaticText.new(mini, -1, 'doesn\'t take up too much space.')
+      sizer.add(text, 0, Wx::ALL, 2)
+      text = Wx::StaticText.new(mini, -1, 'This MiniFrame has been set to')
+      sizer.add(text, 0, Wx::ALL, 2)
+      text = Wx::StaticText.new(mini, -1, 'stay above the main app window.')
+      sizer.add(text, 0, Wx::ALL, 2)
+      mini.set_sizer(sizer)
+
+      mini.evt_window_destroy { |evt| @mini_destroyed = true }
+
+      mini.show
+      mini.raise_window
+    end
+
+    def on_quit
+      mini.close unless @mini_destroyed
+      close
+    end
+
+    def on_about
+      msg =  sprintf("This is the About dialog of the miniframe sample.\n" \
+                      "Welcome to %s", Wx::WXWIDGETS_VERSION)
+      Wx::message_box(msg, "About MiniFrame", Wx::OK|Wx::ICON_INFORMATION, self)
+    end
   end
 
-  def make_miniframe
-    @mini = Wx::MiniFrame.new(self, -1, 'Mini Frame', 
-                              Wx::Point.new(300, 75), Wx::Size.new(300, 150),
-                              Wx::DEFAULT_FRAME_STYLE|Wx::STAY_ON_TOP)
-    @mini_destroyed = false
-    sizer = Wx::BoxSizer.new(Wx::VERTICAL)
-    text = Wx::StaticText.new(mini, -1, 'This is a MiniFrame.')
-    sizer.add(text, 0, Wx::ALL, 2)
-    text = Wx::StaticText.new(mini, -1, 'It has a small title bar so it')
-    sizer.add(text, 0, Wx::ALL, 2)
-    text = Wx::StaticText.new(mini, -1, 'doesn\'t take up too much space.')
-    sizer.add(text, 0, Wx::ALL, 2)
-    text = Wx::StaticText.new(mini, -1, 'This MiniFrame has been set to')
-    sizer.add(text, 0, Wx::ALL, 2)
-    text = Wx::StaticText.new(mini, -1, 'stay above the main app window.')
-    sizer.add(text, 0, Wx::ALL, 2)
-    mini.set_sizer(sizer)
-
-    mini.evt_window_destroy { |evt| @mini_destroyed = true }
-
-    mini.show
-    mini.raise
-  end
-
-  def on_quit
-    mini.close unless @mini_destroyed
-    close
-  end
-
-  def on_about
-    msg =  sprintf("This is the About dialog of the miniframe sample.\n" \
-                    "Welcome to %s", Wx::WXWIDGETS_VERSION)
-    Wx::message_box(msg, "About MiniFrame", Wx::OK|Wx::ICON_INFORMATION, self)
-  end
 end
 
-module ActivationSample
+module MiniFrameSample
 
   include WxRuby::Sample if defined? WxRuby::Sample
 
@@ -83,7 +88,7 @@ module ActivationSample
   end
 
   def self.activate
-    frame = MyFrame.new("Mini Frame wxRuby App",
+    frame = MiniFrame::MyFrame.new("Mini Frame wxRuby App",
                         Wx::Point.new(50, 50),
                         Wx::Size.new(450, 340))
     frame.show
@@ -91,7 +96,7 @@ module ActivationSample
   end
 
   if $0 == __FILE__
-    Wx::App.run { ActivationSample.activate }
+    Wx::App.run { MiniFrameSample.activate }
   end
 
 end

data/samples/etc/sash.rb

@@ -11,112 +11,116 @@
 
 require 'wx'
 
-
-class MySashFrame < Wx::Frame
-  def initialize(title, pos, size, style = Wx::DEFAULT_FRAME_STYLE)
-    super(nil, -1, title, pos, size, style)
-
-
-    menuFile = Wx::Menu.new
-    helpMenu = Wx::Menu.new
-    helpMenu.append(Wx::ID_ABOUT, "&About...\tF1", "Show about dialog")
-    menuFile.append(Wx::ID_EXIT, "E&xit\tAlt-X", "Quit this program")
-    menuBar = Wx::MenuBar.new
-    menuBar.append(menuFile, "&File")
-    menuBar.append(helpMenu, "&Help")
-    set_menu_bar(menuBar)
-
-    create_status_bar(2)
-    set_status_text("wxRuby Sash sample")
-
-    evt_menu(Wx::ID_EXIT) { on_quit }
-    evt_menu(Wx::ID_ABOUT) { on_about }
-
-    # Start creating the sashes - these are created from outermost
-    # inwards. 
-    sash = Wx::SashLayoutWindow.new(self, -1, Wx::DEFAULT_POSITION,
-                                    Wx::Size.new(150, self.get_size.height) )
-    # The default width of the sash is 150 pixels, and it extends the
-    # full height of the frame
-    sash.set_default_size( Wx::Size.new(150, self.get_size.height) )
-    # This sash splits the frame top to bottom
-    sash.set_orientation(Wx::LAYOUT_VERTICAL)
-    # Place the sash on the left of the frame
-    sash.set_alignment(Wx::LAYOUT_LEFT)
-    # Show a drag bar on the right of the sash
-    sash.set_sash_visible(Wx::SASH_RIGHT, true)
-    sash.set_background_colour(Wx::Colour.new(225, 200, 200) )
-
-    panel = Wx::Panel.new(sash)
-    v_siz = Wx::BoxSizer.new(Wx::VERTICAL)
-    chk_1 = Wx::CheckBox.new(panel, -1, 'test 1')
-    v_siz.add(chk_1)
-    chk_2 = Wx::CheckBox.new(panel, -1, 'test 2')
-    v_siz.add(chk_2)
-    panel.set_sizer_and_fit(v_siz)
-
-    # handle the sash being dragged
-    evt_sash_dragged( sash.get_id ) { | e | on_v_sash_dragged(sash, e) }
-
-    # Create another small sash on the bottom of the frame
-    sash_2 = Wx::SashLayoutWindow.new(self, -1, Wx::DEFAULT_POSITION,
-                                      Wx::Size.new(self.get_size.width,
-                                      100),
-                                      Wx::SW_3DSASH)
-    sash_2.set_default_size( Wx::Size.new(self.get_size.width, 100) )
-    sash_2.set_orientation(Wx::LAYOUT_HORIZONTAL)
-    sash_2.set_alignment(Wx::LAYOUT_BOTTOM)
-    sash_2.set_sash_visible(Wx::SASH_TOP, true)
-    text = Wx::StaticText.new(sash_2, -1, 'This is the second sash window')
-    evt_sash_dragged( sash_2.get_id ) { | e | on_h_sash_dragged(sash_2, e) }
-
-    # The main panel - the residual part of the frame that takes up all
-    # remaining space not used by the sash windows.
-    @m_panel = Wx::Panel.new(self, -1)
-    sizer = Wx::BoxSizer.new(Wx::VERTICAL)
-
-    txt  = Wx::TextCtrl.new(@m_panel, -1, 'Main panel area', 
-                            Wx::DEFAULT_POSITION, Wx::DEFAULT_SIZE,
-                            Wx::SUNKEN_BORDER|Wx::TE_MULTILINE)
-    sizer.add(txt, 1, Wx::EXPAND|Wx::ALL, 10)
-    @m_panel.set_sizer_and_fit(sizer)
-
-    # Adjust the size of the sashes when the frame is resized
-    evt_size { | e | on_size(e) }
-
-    # Call LayoutAlgorithm#layout_frame to layout the sashes.
-    # The second argument is the residual window that takes up remaining
-    # space
-    Wx::LayoutAlgorithm.new.layout_frame(self, @m_panel)
-  end
-
-  def on_v_sash_dragged(sash, e)
-    # Call get_drag_rect to get the new size
-    size = Wx::Size.new(  e.get_drag_rect.width, self.get_size.height )
-    sash.set_default_size( size )
-    Wx::LayoutAlgorithm.new.layout_frame(self, @m_panel)
-  end
-
-  def on_h_sash_dragged(sash, e)
-    size = Wx::Size.new( self.get_size.width, e.get_drag_rect.height )
-    sash.set_default_size( size )
-    Wx::LayoutAlgorithm.new.layout_frame(self, @m_panel)
+module Sash
+
+  class MySashFrame < Wx::Frame
+    def initialize(title, pos, size, style = Wx::DEFAULT_FRAME_STYLE)
+      super(nil, -1, title, pos, size, style)
+
+      self.icon = Wx.Icon(:sample, Wx::BITMAP_TYPE_XPM, art_path: File.join(__dir__, '..'))
+
+      menuFile = Wx::Menu.new
+      helpMenu = Wx::Menu.new
+      helpMenu.append(Wx::ID_ABOUT, "&About...\tF1", "Show about dialog")
+      menuFile.append(Wx::ID_EXIT, "E&xit\tAlt-X", "Quit this program")
+      menuBar = Wx::MenuBar.new
+      menuBar.append(menuFile, "&File")
+      menuBar.append(helpMenu, "&Help")
+      set_menu_bar(menuBar)
+
+      create_status_bar(2)
+      set_status_text("wxRuby Sash sample")
+
+      evt_menu(Wx::ID_EXIT) { on_quit }
+      evt_menu(Wx::ID_ABOUT) { on_about }
+
+      # Start creating the sashes - these are created from outermost
+      # inwards.
+      sash = Wx::SashLayoutWindow.new(self, -1, Wx::DEFAULT_POSITION,
+                                      Wx::Size.new(150, self.get_size.height) )
+      # The default width of the sash is 150 pixels, and it extends the
+      # full height of the frame
+      sash.set_default_size( Wx::Size.new(150, self.get_size.height) )
+      # This sash splits the frame top to bottom
+      sash.set_orientation(Wx::LAYOUT_VERTICAL)
+      # Place the sash on the left of the frame
+      sash.set_alignment(Wx::LAYOUT_LEFT)
+      # Show a drag bar on the right of the sash
+      sash.set_sash_visible(Wx::SASH_RIGHT, true)
+      sash.set_background_colour(Wx::Colour.new(225, 200, 200) )
+
+      panel = Wx::Panel.new(sash)
+      v_siz = Wx::BoxSizer.new(Wx::VERTICAL)
+      chk_1 = Wx::CheckBox.new(panel, -1, 'test 1')
+      v_siz.add(chk_1)
+      chk_2 = Wx::CheckBox.new(panel, -1, 'test 2')
+      v_siz.add(chk_2)
+      panel.set_sizer_and_fit(v_siz)
+
+      # handle the sash being dragged
+      evt_sash_dragged( sash.get_id ) { | e | on_v_sash_dragged(sash, e) }
+
+      # Create another small sash on the bottom of the frame
+      sash_2 = Wx::SashLayoutWindow.new(self, -1, Wx::DEFAULT_POSITION,
+                                        Wx::Size.new(self.get_size.width,
+                                        100),
+                                        Wx::SW_3DSASH)
+      sash_2.set_default_size( Wx::Size.new(self.get_size.width, 100) )
+      sash_2.set_orientation(Wx::LAYOUT_HORIZONTAL)
+      sash_2.set_alignment(Wx::LAYOUT_BOTTOM)
+      sash_2.set_sash_visible(Wx::SASH_TOP, true)
+      text = Wx::StaticText.new(sash_2, -1, 'This is the second sash window')
+      evt_sash_dragged( sash_2.get_id ) { | e | on_h_sash_dragged(sash_2, e) }
+
+      # The main panel - the residual part of the frame that takes up all
+      # remaining space not used by the sash windows.
+      @m_panel = Wx::Panel.new(self, -1)
+      sizer = Wx::BoxSizer.new(Wx::VERTICAL)
+
+      txt  = Wx::TextCtrl.new(@m_panel, -1, 'Main panel area',
+                              Wx::DEFAULT_POSITION, Wx::DEFAULT_SIZE,
+                              Wx::SUNKEN_BORDER|Wx::TE_MULTILINE)
+      sizer.add(txt, 1, Wx::EXPAND|Wx::ALL, 10)
+      @m_panel.set_sizer_and_fit(sizer)
+
+      # Adjust the size of the sashes when the frame is resized
+      evt_size { | e | on_size(e) }
+
+      # Call LayoutAlgorithm#layout_frame to layout the sashes.
+      # The second argument is the residual window that takes up remaining
+      # space
+      Wx::LayoutAlgorithm.new.layout_frame(self, @m_panel)
+    end
+
+    def on_v_sash_dragged(sash, e)
+      # Call get_drag_rect to get the new size
+      size = Wx::Size.new(  e.get_drag_rect.width, self.get_size.height )
+      sash.set_default_size( size )
+      Wx::LayoutAlgorithm.new.layout_frame(self, @m_panel)
+    end
+
+    def on_h_sash_dragged(sash, e)
+      size = Wx::Size.new( self.get_size.width, e.get_drag_rect.height )
+      sash.set_default_size( size )
+      Wx::LayoutAlgorithm.new.layout_frame(self, @m_panel)
+    end
+
+    def on_size(e)
+      e.skip
+      Wx::LayoutAlgorithm.new.layout_frame(self, @m_panel)
+    end
+
+    def on_quit
+      close(true)
+    end
+
+    def on_about
+      msg =  sprintf("This is the About dialog of the sash sample.\n" \
+                      "Welcome to %s", Wx::WXWIDGETS_VERSION)
+      Wx::message_box(msg, "About Sash", Wx::OK|Wx::ICON_INFORMATION, self)
+    end
   end
 
-  def on_size(e)
-    e.skip
-    Wx::LayoutAlgorithm.new.layout_frame(self, @m_panel)
-  end
-
-  def on_quit
-    close(true)
-  end
-
-  def on_about
-    msg =  sprintf("This is the About dialog of the sash sample.\n" \
-                    "Welcome to %s", Wx::WXWIDGETS_VERSION)
-    Wx::message_box(msg, "About Sash", Wx::OK|Wx::ICON_INFORMATION, self)
-  end
 end
 
 module SashSample
@@ -130,7 +134,7 @@ module SashSample
   end
 
   def self.activate
-    frame = MySashFrame.new("Sash Layout wxRuby App",
+    frame = Sash::MySashFrame.new("Sash Layout wxRuby App",
                             Wx::Point.new(50, 50),
                             Wx::Size.new(450, 340))
 

data/samples/etc/scrollwin.rb

@@ -14,90 +14,96 @@ require 'wx'
 # Example demonstrating the use of Wx::ScrolledWindow and the
 # ScrollWinEvents
 
-class ScrollFrame < Wx::Frame
-  def initialize(title)
-    super(nil, -1, 'Thumb Scrolling Test', 
-          Wx::DEFAULT_POSITION, Wx::Size.new(400, 300), 
-          Wx::SYSTEM_MENU|Wx::CAPTION|Wx::RESIZE_BORDER|
-                          Wx::MAXIMIZE_BOX|Wx::MINIMIZE_BOX|Wx::CLOSE_BOX)
-
-    @scroll_win = Wx::ScrolledWindow.new(self, -1)
-    # Set the interior size (pixels) of the scrolling window
-    @scroll_win.set_virtual_size(1000, 1500)
-    # Set the number of pixels moved per 'line' / click on the scrollbars
-    @scroll_win.set_scroll_rate(5, 5)
-
-    @button = Wx::Button.new(@scroll_win, -1, 'Press Me', 
-                             Wx::Point.new(200,200), 
-                             Wx::Size.new(125, 30))
-    
-    # NOTE that all ScrollWin event hooks do not take an id - i.e. they
-    # are only generated from the originating Window itself - in this
-    # case, the ScrollWindow. So, we need to do:
-    #  @scroll_win.evt_scrollwin_xxx { ...
-    # AND NOT
-    #  evt_scrollwin_xxx(@scroll_win.get_id) { ...
-    @scroll_win.evt_scrollwin_linedown { | e | on_line(e, 'down') }
-    @scroll_win.evt_scrollwin_lineup { | e | on_line(e,'up') }
-    
-    @scroll_win.evt_scrollwin_thumbtrack { | e | on_thumb(e, 'track') }
-    @scroll_win.evt_scrollwin_thumbrelease { | e | on_thumb(e, 'release') }
-
-    @scroll_win.evt_scrollwin_pagedown { | e | on_page(e, 'down') }
-    @scroll_win.evt_scrollwin_pageup { | e | on_page(e, 'up') }
-
-    # not sure how these are meant to be generated
-    @scroll_win.evt_scrollwin_top { | e | on_top(e) }
-    @scroll_win.evt_scrollwin_bottom { | e | on_bottom(e) }
-    #@scroll_win.evt_scrollwin { | e | p e }
-  end
-  
-  # Handle scrolling by page - typically done by clicking on the
-  # scrollbar itself, above or below the thumb position
-  # +direction+ is either 'up' (= left, if dealing with a horizontal
-  # scrollbar) or 'down' (= right) - WxRuby generates different events
-  # for these.
-  def on_page(event, direction)
-    pos = event.get_position
-    orient = event.get_orientation == Wx::VERTICAL ? 'VERTICAL' : 'HORIZONTAL'
-    puts "#{orient} scrollbar page #{direction} @ #{pos}"
-    event.skip # allow default scrolling action
-  end
+module ScrollWin
+
+  class ScrollFrame < Wx::Frame
+    def initialize(title)
+      super(nil, -1, 'Thumb Scrolling Test',
+            Wx::DEFAULT_POSITION, Wx::Size.new(400, 300),
+            Wx::SYSTEM_MENU|Wx::CAPTION|Wx::RESIZE_BORDER|
+                            Wx::MAXIMIZE_BOX|Wx::MINIMIZE_BOX|Wx::CLOSE_BOX)
+
+      self.icon = Wx.Icon(:sample, Wx::BITMAP_TYPE_XPM, art_path: File.join(__dir__, '..'))
+
+      @scroll_win = Wx::ScrolledWindow.new(self, -1)
+      # Set the interior size (pixels) of the scrolling window
+      @scroll_win.set_virtual_size(1000, 1500)
+      # Set the number of pixels moved per 'line' / click on the scrollbars
+      @scroll_win.set_scroll_rate(5, 5)
+
+      @button = Wx::Button.new(@scroll_win, -1, 'Press Me',
+                               Wx::Point.new(200,200),
+                               Wx::Size.new(125, 30))
+
+      # NOTE that all ScrollWin event hooks do not take an id - i.e. they
+      # are only generated from the originating Window itself - in this
+      # case, the ScrollWindow. So, we need to do:
+      #  @scroll_win.evt_scrollwin_xxx { ...
+      # AND NOT
+      #  evt_scrollwin_xxx(@scroll_win.get_id) { ...
+      @scroll_win.evt_scrollwin_linedown { | e | on_line(e, 'down') }
+      @scroll_win.evt_scrollwin_lineup { | e | on_line(e,'up') }
+
+      @scroll_win.evt_scrollwin_thumbtrack { | e | on_thumb(e, 'track') }
+      @scroll_win.evt_scrollwin_thumbrelease { | e | on_thumb(e, 'release') }
+
+      @scroll_win.evt_scrollwin_pagedown { | e | on_page(e, 'down') }
+      @scroll_win.evt_scrollwin_pageup { | e | on_page(e, 'up') }
+
+      # not sure how these are meant to be generated
+      @scroll_win.evt_scrollwin_top { | e | on_top(e) }
+      @scroll_win.evt_scrollwin_bottom { | e | on_bottom(e) }
+      #@scroll_win.evt_scrollwin { | e | p e }
+    end
+
+    # Handle scrolling by page - typically done by clicking on the
+    # scrollbar itself, above or below the thumb position
+    # +direction+ is either 'up' (= left, if dealing with a horizontal
+    # scrollbar) or 'down' (= right) - WxRuby generates different events
+    # for these.
+    def on_page(event, direction)
+      pos = event.get_position
+      orient = event.get_orientation == Wx::VERTICAL ? 'VERTICAL' : 'HORIZONTAL'
+      puts "#{orient} scrollbar page #{direction} @ #{pos}"
+      event.skip # allow default scrolling action
+    end
 
-  
-  # Handle scrolling by line - typically done by clicking the up/down
-  # (or left/right) scroll buttons at the end of the scrollbar.
-  # +direction+ is either 'up' (= left, if dealing with a horizontal
-  # scrollbar) or 'down' (= right)
-  def on_line(event, direction)
-    orient = event.get_orientation == Wx::VERTICAL ? 'VERTICAL' : 'HORIZONTAL'
-    pos = event.get_position
-    puts "#{orient} scrollbar line #{direction} @ #{pos}"
-    event.skip # allow default action
-  end
 
-  # Handle scrolling done by click-dragging the 'thumb' within a scrollbar.
-  # +action+ contains either 'track' for thumbtrack drag events, or 'release'
-  # for thumb-release
-  def on_thumb(event, action)
-    pos = event.get_position
-    if event.get_orientation == Wx::VERTICAL
-      puts "VERTICAL thumb #{action} @ #{pos}"
-    else
-      puts "HORIZONTAL thumb #{action} @ #{pos}"
+    # Handle scrolling by line - typically done by clicking the up/down
+    # (or left/right) scroll buttons at the end of the scrollbar.
+    # +direction+ is either 'up' (= left, if dealing with a horizontal
+    # scrollbar) or 'down' (= right)
+    def on_line(event, direction)
+      orient = event.get_orientation == Wx::VERTICAL ? 'VERTICAL' : 'HORIZONTAL'
+      pos = event.get_position
+      puts "#{orient} scrollbar line #{direction} @ #{pos}"
+      event.skip # allow default action
     end
-    event.skip
-  end
 
-  # (Assuming this should be triggered when the End key is pressed)?
-  def on_bottom(event)
-    puts "bottom"
-  end
-  
+    # Handle scrolling done by click-dragging the 'thumb' within a scrollbar.
+    # +action+ contains either 'track' for thumbtrack drag events, or 'release'
+    # for thumb-release
+    def on_thumb(event, action)
+      pos = event.get_position
+      if event.get_orientation == Wx::VERTICAL
+        puts "VERTICAL thumb #{action} @ #{pos}"
+      else
+        puts "HORIZONTAL thumb #{action} @ #{pos}"
+      end
+      event.skip
+    end
+
+    # (Assuming this should be triggered when the End key is pressed)?
+    def on_bottom(event)
+      puts "bottom"
+    end
+
+
+    #  (Assuming this should be triggered when the Home/Begin key is pressed)?
+    def on_top(event)
+      puts "top"
+    end
 
-  #  (Assuming this should be triggered when the Home/Begin key is pressed)?
-  def on_top(event)
-    puts "top"
   end
 
 end
@@ -113,7 +119,7 @@ module ScrollwinSample
   end
 
   def self.activate
-    frame = ScrollFrame.new('')
+    frame = ScrollWin::ScrollFrame.new('')
     frame.show(true)
     frame
   end