wxruby 1.9.9-universal-darwin-9 → 1.9.10-universal-darwin-9

data/lib/wx/classes/sizer.rb

@@ -11,12 +11,27 @@ class Wx::Sizer
   def add_item(item, *mixed_args)
     args = Wx::args_as_list(ADD_ITEM_PARAMS, *mixed_args)
 
-    # Call add to append if default position
+    full_args = []
+
+    # extract the width and the height in the case of a spacer
+    # defined as an array
+    if item.kind_of?(Array)
+      Kernel.raise ArgumentError,
+        "Invalid Sizer specification : [width, height] expected" if item.size != 2
+      full_args << item[0] << item[1]
+    else
+      full_args << item
+    end
+
+    # update the full arguments list with the optional arguments (except index)
     idx = args.shift
+    full_args.concat(args)
+
+    # Call add to append if default position
     if idx == -1
-      add(item, *args)
+      add(*full_args)
     else
-      insert(idx, item, *args)
+      insert(idx, *full_args)
     end
   end
 end

data/lib/wx/classes/toolbar.rb

@@ -5,21 +5,19 @@ class Wx::ToolBar
   ADD_ITEM_PARAMS = [ Wx::Parameter[ :position, -1 ], 
                       Wx::Parameter[ :id, -1 ],
                       Wx::Parameter[ :label, "" ], 
-                      Wx::Parameter[ :bitmap, Wx::NULL_BITMAP ],
                       Wx::Parameter[ :bitmap2, Wx::NULL_BITMAP ],
                       Wx::Parameter[ :kind, Wx::ITEM_NORMAL ], 
                       Wx::Parameter[ :short_help, "" ], 
                       Wx::Parameter[ :long_help, "" ], 
                       Wx::Parameter[ :client_data, nil ] ]
   
-  def add_item(*mixed_args)
+  def add_item(bitmap, *mixed_args)
     args = Wx::args_as_list(ADD_ITEM_PARAMS, *mixed_args)
-    if args[3] == Wx::NULL_BITMAP
-      Kernel.raise ArgumentError, "Main button bitmap may not be NULL"
-    end
 
-    # Call add_tool to append if default position
     pos = args.shift
+    args.insert(2, bitmap)
+
+    # Call add_tool to append if default position
     if pos == -1
       add_tool(*args)
     else

data/lib/wx/classes/vboxsizer.rb

@@ -0,0 +1,6 @@
+# Just a shortcut version for creating a vertical box sizer
+class Wx::VBoxSizer < Wx::BoxSizer
+  def initialize
+    super(Wx::VERTICAL)
+  end
+end

data/lib/wx/classes/window.rb

@@ -11,6 +11,13 @@ class Wx::Window
   # In case a more explicit option is preferred.
   alias :wx_id :get_id
 
+  # The name of Wx::Window#raise conflicts with Ruby's core Kernel#raise
+  # method. This can cause unexpected errors when undecorated #raise is
+  # used inside a Window method. For wxRuby 2.0 it's too late to remove
+  # Window#raise completely, but for now, offer alternatives to
+  # raise/lower that could replace them in future versions.
+  alias :bring_to_front :raise
+  alias :send_to_back :lower
 
   # Recursively searches all windows below +self+ and returns the first
   # window which has the id +an_id+. This corresponds to the find_window

data/lib/wx/classes/xmlresource.rb

@@ -34,4 +34,21 @@ class Wx::XmlResource
     end
     fname
   end
+
+  # Returns a Wx::Wizard object from the element named +name+ in the
+  # loaded XRC file. The Wizard will have the parent +parent+.
+  # 
+  # This method is not available in wxWidgets, but is here for
+  # completeness and also to document how to use load_object (see
+  # below).
+  def load_wizard(parent, name)
+    wiz = Wx::Wizard.new()
+    load_wizard_subclass(wiz, parent, name)
+    wiz
+  end
+
+  # Completes the loading of a incomplete instance of Wx::Wizard.
+  def load_wizard_subclass(wizard, parent, name)
+    load_object(wizard, parent, name, "wxWizard")
+  end
 end

data/lib/wx/helpers.rb

@@ -8,7 +8,6 @@ module Wx
   # structs containing the keyword name and default value for each
   # possible argument. +mixed_args+ is an array which may optionally end
   # with a set of named arguments
-
   def self.args_as_list(param_spec, *mixed_args)
     # get keyword arguments from mixed args if supplied, else empty
     kwa = mixed_args.last.kind_of?(Hash) ? mixed_args.pop : {}
@@ -27,4 +26,20 @@ module Wx
     Kernel.raise ArgumentError, 
                  "Bad arg composition of #{mixed_args.inspect}"
   end
+
+  # Given an integer constant +int_const+, returns an array Wx constant
+  # names which have this value. If a string +prefix+ is supplied, find
+  # only constants whose names begin with this prefix. For example,
+  # passing "EVT" would return only constants with a name like
+  # Wx::EVT_XXX
+  # 
+  # This is primarily useful for debugging, when an unknown constant is
+  # returned, eg as an event type id.
+  def self.find_const(sought, prefix = "")
+    consts = constants.grep(/\A#{prefix}/)
+    consts.find_all do | c | 
+      c_val = const_get(c)
+      c_val.instance_of?(Fixnum) and c_val == sought
+    end
+  end
 end

data/lib/wx/keyword_ctors.rb

@@ -122,8 +122,9 @@ module Wx
       # API constructor
       def wx_ctor_params(*params)
         self.param_spec += params.map do | param |
-          param.kind_of?(Hash) ? Parameter[*param.to_a.flatten] : 
-            Parameter[param, STANDARD_DEFAULTS[param] ]
+          param.kind_of?(Hash) ? 
+            Parameter[ param.keys.first, param.values.first ] : 
+            Parameter[ param, STANDARD_DEFAULTS[param] ]
         end
       end
 

data/lib/wx/keyword_defs.rb

@@ -156,19 +156,29 @@ Wx::define_keyword_ctors('ToolBarTool') do
   wx_ctor_params :long_help => ''
 end
 
+# Similar to notebook but using choice control
+Wx::define_keyword_ctors('Choicebook') do
+  wx_ctor_params :id, :pos, :size, :style, :name => 'choiceBook'
+end
+
 # Notebook class
 Wx::define_keyword_ctors('Notebook') do
   wx_ctor_params :id, :pos, :size, :style, :name => 'noteBook' 
 end
 
-# Similar to notebook but using list control - undocumented
+# Similar to notebook but using list control
 Wx::define_keyword_ctors('Listbook') do
   wx_ctor_params :id, :pos, :size, :style, :name => 'listBook'
 end
 
-# Similar to notebook but using choice control
-Wx::define_keyword_ctors('Choicebook') do
-  wx_ctor_params :id, :pos, :size, :style, :name => 'choiceBook'
+# Similar to notebook but using toolbar
+Wx::define_keyword_ctors('Toolbook') do
+  wx_ctor_params :id, :pos, :size, :style, :name => 'toolBook'
+end
+
+# Similar to notebook but using tree control
+Wx::define_keyword_ctors('Treebook') do
+  wx_ctor_params :id, :pos, :size, :style, :name => 'treeBook'
 end
 
 # wxSashWindow:	Window with four optional sashes that can be dragged
@@ -268,7 +278,6 @@ Wx::define_keyword_ctors('PrintDialog') do
   wx_ctor_params :data
 end
 
-
 # Simple message box dialog
 Wx::define_keyword_ctors('MessageDialog') do
   wx_ctor_params :message => ''
@@ -277,6 +286,13 @@ Wx::define_keyword_ctors('MessageDialog') do
   wx_ctor_params :pos
 end
 
+# Property editing dialog
+Wx::define_keyword_ctors('PropertySheetDialog') do
+  wx_ctor_params :id, :title
+  wx_ctor_params :pos, :size, :style => Wx::DEFAULT_DIALOG_STYLE
+  wx_ctor_params :name => 'propertySheetDialog'
+end
+
 ### CONTROLS
 
 # Push button control, displaying text
@@ -517,6 +533,11 @@ Wx::define_keyword_ctors('HtmlListBox') do
   wx_ctor_params :id, :pos, :size, :style, :name => 'HtmlListBoxNameStr'
 end
 
+Wx::define_keyword_ctors('DatePickerCtrl') do
+  wx_ctor_params :id, :dt => Time.now
+  wx_ctor_params :pos, :size, :style, :validator, :name => 'dateCtrl'
+end
+
 Wx::define_keyword_ctors('RichTextCtrl') do
   wx_ctor_params :id, :value => ''
   wx_ctor_params :pos, :size, :style => Wx::TE_MULTILINE
@@ -531,6 +552,7 @@ 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.9'
+  WXRUBY_VERSION    = '1.9.10'
 end

data/samples/bigdemo/About.rbw

@@ -10,7 +10,7 @@ class MyAboutBox < Wx::Dialog
         title = Wx::StaticText.new(self, -1, "WxRuby Demo!", Wx::Point.new(20, 20))
         title.set_font(headerFont)
         
-        rVersion = Wx::StaticText.new(self, -1, "Running on Ruby version " + VERSION + " on " + RUBY_PLATFORM, Wx::Point.new(20,100))
+        rVersion = Wx::StaticText.new(self, -1, "Running on Ruby version " + RUBY_VERSION + " on " + RUBY_PLATFORM, Wx::Point.new(20,100))
         rVersion.set_font(bodyFont)
         rVersion.set_foreground_colour(Wx::RED)
         

data/samples/bigdemo/wxCheckListBox.rbw

@@ -10,62 +10,52 @@ require 'wx'
 
 
 class TestPanel < Wx::Panel
-    def initialize(parent, log)
-        super(parent, -1)
-        @log = log
-        
-        sampleList = %w(one two three four five six seven eight nine ten eleven twelve thirteen fourteen)
-        
-        Wx::StaticText.new(self, -1, "This example uses the wxCheckListBox control.", Wx::DEFAULT_POSITION, Wx::DEFAULT_SIZE)
-        
-        lb = Wx::CheckListBox.new(self, 60, Wx::Point.new(80,50), Wx::Size.new(80,120), sampleList)
-        evt_listbox(60) {|event| on_evt_listbox(event)}
-        evt_listbox_dclick(60) {|event| on_evt_listbox_dclick(event)}
-        lb.set_selection(0)
-        @lb = lb
-        
-        pos = lb.get_position().x + lb.get_size().get_width() + 25
-        btn = Wx::Button.new(self, -1, "Test SetString", Wx::Point.new(pos,50))
-        evt_button(btn.get_id()) {|event| on_test_button(event)}
-        
-        evt_right_up {|event| on_do_popup(event)}
-    end
+  attr_reader :lb
+  def initialize(parent, log)
+    super parent
+    @log = log
     
-    def on_evt_listbox(event)
-        @log.write_text("evt_listbox: " + event.get_string())
-    end
+    sample_list = %w|one two three four five six seven eight
+                     nine ten eleven twelve thirteen fourteen|
     
-    def on_evt_listbox_dclick(event)
-        @log.write_text("evt_listbox_dclick:")
-    end
+    self.sizer = Wx::VBoxSizer.new
+    tx = Wx::StaticText.new( self, 
+                             :label => "This example uses the wxCheckListBox control.")
+    sizer.add(tx, 0, Wx::ALL, 5)
+    @lb = Wx::CheckListBox.new(self, :choices => sample_list)
+    sizer.add(lb, 1, Wx::ALL|Wx::GROW, 5)
+    evt_listbox lb, :on_evt_listbox
+    evt_listbox_dclick lb, :on_evt_listbox_dclick
+    lb.set_selection(0)
     
-    def on_test_button(event)
-        @lb.set_string(4, "FUBAR")
-    end
-    
-    def on_do_popup(event)
-        menu = Wx::Menu.new()
-        # Make this first item bold
-        menu.append(50000, "Normal item &1")
-        menu.append(50001, "Normal item &2")
-        menu.append(50002, "Normal item &3")
-        menu.append(50003, "Normal item &4")
-        
-        popup_menu(menu, event.get_position())
-        menu.destroy()
-        event.skip()
-    end
+
+    btn = Wx::Button.new(self, :label => "Test SetString")
+    sizer.add(btn, 0, Wx::ALL, 5)
+    evt_button btn, :on_test_button
+  end
+  
+  def on_evt_listbox(event)
+    @log.write_text("evt_listbox: " + event.get_string())
+  end
+  
+  def on_evt_listbox_dclick(event)
+    @log.write_text("evt_listbox_dclick:")
+  end
+  
+  def on_test_button(event)
+    @lb.set_string(4, "FUBAR")
+  end
 end
 
 module Demo
-    def Demo.run(frame, nb, log)
-        win = TestPanel.new(nb, log)
-        return win
-    end
-    
-    def Demo.overview
-        return "A checklistbox is like a listbox, but allows items to be checked or unchecked."
-    end
+  def Demo.run(frame, nb, log)
+    win = TestPanel.new(nb, log)
+    return win
+  end
+  
+  def Demo.overview
+    return "A checklistbox is like a listbox, but allows items to be checked or unchecked."
+  end
 end
 
 if __FILE__ == $0

data/samples/bigdemo/wxListCtrl_virtual.rbw

@@ -8,10 +8,14 @@ end
 require 'wx'
 
 
-
+# A virtual ListCtrl loads its items as needed from a virtual store. So
+# it's useful for linking to existing data sources, or for displaying
+# very large lists. It's subclassed in ruby, and the item_count is set;
+# the get_item_text methods should return how to display a given line.
 class TestVirtualList < Wx::ListCtrl
     def initialize(parent, log)
-        super(parent, -1, Wx::DEFAULT_POSITION, Wx::DEFAULT_SIZE, Wx::LC_REPORT | Wx::LC_VIRTUAL | Wx::LC_HRULES | Wx::LC_VRULES)
+      super parent, :style => Wx::LC_REPORT|Wx::LC_VIRTUAL|
+                              Wx::LC_HRULES| Wx::LC_VRULES
         @log = log
         
         @il = Wx::ImageList.new(16,16)
@@ -27,7 +31,8 @@ class TestVirtualList < Wx::ListCtrl
         set_column_width(1,175)
         set_column_width(2,175)
         
-        set_item_count(1000000)
+        # Important - call this 
+        self.item_count = 10_000
         
         @attr1 = Wx::ListItemAttr.new()
         @attr1.set_background_colour(Wx::Colour.new("YELLOW"))

data/samples/bigdemo/wxSashWindow.rbw

@@ -81,8 +81,8 @@ class TestPanel < Wx::Panel
 
 
   def on_sash_drag(event)
-    if event.get_drag_status == Wx::SASH_STATUS_OUT_OF_RANGE:
-        @log.write_text('drag == out of range')
+    if event.get_drag_status == Wx::SASH_STATUS_OUT_OF_RANGE
+      @log.write_text('drag == out of range')
       return
     end
 

data/samples/bigdemo/wxTreeCtrl.rbw

@@ -79,20 +79,21 @@ class TestTreeCtrlPanel < Wx::Panel
         @root = @tree.add_root("The Root Item")
         @tree.set_item_image(@root, fldridx, Wx::TREE_ITEM_ICON_NORMAL)
         @tree.set_item_image(@root, fldropenidx, Wx::TREE_ITEM_ICON_EXPANDED)
-        
         0.upto(15) do |x|
             child = @tree.append_item(@root, "Item " + x.to_s())
             @tree.set_item_image(child, fldridx, Wx::TREE_ITEM_ICON_NORMAL)
             @tree.set_item_image(child, fldropenidx, Wx::TREE_ITEM_ICON_EXPANDED)
+            character = "a"
             0.upto(4) do |y|
-                last = @tree.append_item(child, "item " + x.to_s() + "-" + (?a + y).chr)
+                last = @tree.append_item(child, "item " + x.to_s() + "-" + character)
                 @tree.set_item_image(last, fldridx, Wx::TREE_ITEM_ICON_NORMAL)
                 @tree.set_item_image(last, fldropenidx, Wx::TREE_ITEM_ICON_EXPANDED)
                 0.upto(4) do |z|
-                    item = @tree.append_item(last, "item " + x.to_s() + "-" + (?a + y).chr + "-" + z.to_s())
+                    item = @tree.append_item(last, "item " + x.to_s() + "-" + character + "-" + z.to_s())
                     @tree.set_item_image(item, fileidx, Wx::TREE_ITEM_ICON_NORMAL)
                     @tree.set_item_image(item, smileidx, Wx::TREE_ITEM_ICON_SELECTED)
                 end
+                character.succ!
             end
         end
         

data/samples/calendar/calendar.rb

@@ -7,14 +7,8 @@ rescue LoadError
 end
 require 'wx'
 
-
 include Wx
 
-require 'date'
-
-
-Calendar_File_About = ID_ABOUT
-Calendar_File_Quit = ID_EXIT
 Calendar_Cal_Monday = 200
 Calendar_Cal_Holidays = 201
 Calendar_Cal_Special = 202
@@ -24,123 +18,114 @@ Calendar_Cal_SeqMonth = 205
 Calendar_Cal_SurroundWeeks = 206
 
 
-def format_date(d)
-    return "#{d.year}-#{d.mon}-#{d.day}"
-end
-
 class MyCalendar < CalendarCtrl
-    def initialize(parent, display_frame, initial_date, calendar_flags)
-        super(parent, -1, 
-                    initial_date,
-                    DEFAULT_POSITION,
-                    DEFAULT_SIZE,
-                    calendar_flags | RAISED_BORDER)
-
-        @display = display_frame
-        @date = initial_date
-        @weekday_names = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat']
-
-        id = get_id
-    evt_calendar(id) {|event| on_calendar(event)}
-    evt_calendar_month(id) {on_cal_month_change}
-    evt_calendar_year(id) {on_cal_year_change}
-    evt_calendar_sel_changed(id) {|event| on_calendar_change(event)}
-    evt_calendar_weekday_clicked(id) {|event| on_calendar_weekday_click(event)}
-    end
+  def initialize(parent, display_frame, initial_date, calendar_flags)
+    super( parent, 
+           :date  => initial_date, 
+           :style => calendar_flags | RAISED_BORDER)
+
+    @display = display_frame
+    @date = initial_date
+    @weekday_names = %w|Sun Mon Tue Wed Thu Fri Sat|
+
+    evt_calendar self, :on_calendar
+    evt_calendar_month self, :on_cal_month_change
+    evt_calendar_year self, :on_cal_year_change
+    evt_calendar_sel_changed self, :on_calendar_change
+    evt_calendar_weekday_clicked self, :on_calendar_weekday_click
+  end
 
   def on_calendar(event)
-        @date = event.get_date
-        @display.set_date(@date)
-    end
+    @display.date = event.date
+  end
 
   def on_calendar_change(event)
-        @date = event.get_date
-        log_status("Selected date: #{format_date(@date)}")
-    end
+    @date = event.date
+    log_status("Selected date: #{@date.strftime('%Y-%M-%D')}")
+  end
 
   def on_cal_month_change
-        log_status("Calendar month changed")
-    end
+    log_status("Calendar month changed")
+  end
 
   def on_cal_year_change
-        log_status("Calendar year changed")
-    end
+    log_status("Calendar year changed")
+  end
 
   def on_calendar_weekday_click(event)
-        wday = event.get_week_day
-        log_status("Clicked on #{@weekday_names[wday]}")
-    end
-    
-    attr_reader :date
+    wday = event.week_day
+    log_status("Clicked on #{@weekday_names[wday]}")
+  end
+  
+  attr_reader :date
 end
 
 class MyFrame < Frame
-    def initialize(title)
-        super(nil, -1, title)
-        @panel = Wx::Panel.new(self)
-        add_menu_bar
-        add_status_bar
+  def initialize(title)
+    super(nil, -1, title)
+    @panel = Wx::Panel.new(self)
+    add_menu_bar
+    add_status_bar
 
-        @calendar_flags = CAL_MONDAY_FIRST | CAL_SHOW_HOLIDAYS
+    @calendar_flags = CAL_MONDAY_FIRST | CAL_SHOW_HOLIDAYS
 
-        now = DateTime.now
-        @calendar = MyCalendar.new(@panel, self, now, @calendar_flags)
+    @calendar = MyCalendar.new(@panel, self, Time.now, @calendar_flags)
 
-        @sizer = BoxSizer.new(VERTICAL)
-        configure_window
+    @sizer = BoxSizer.new(VERTICAL)
+    configure_window
 
-  	evt_menu(Calendar_File_Quit) {on_quit}
-  	evt_menu(Calendar_File_About) {on_about}
+  	evt_menu Wx::ID_EXIT, :on_quit
+  	evt_menu Wx::ID_ABOUT, :on_about
 
-  	evt_menu(Calendar_Cal_Monday) {|event| on_cal_monday(event)}
-  	evt_menu(Calendar_Cal_Holidays) {|event| on_cal_holidays(event)}
-  	evt_menu(Calendar_Cal_Special) {|event| on_cal_special(event)}
+  	evt_menu Calendar_Cal_Monday, :on_cal_monday
+  	evt_menu Calendar_Cal_Holidays, :on_cal_holidays
+  	evt_menu Calendar_Cal_Special, :on_cal_special
 
-  	evt_menu(Calendar_Cal_Month) {|event| on_cal_allow_month(event)}
-  	evt_menu(Calendar_Cal_Year) {|event| on_cal_allow_year(event)}
+  	evt_menu Calendar_Cal_Month, :on_cal_allow_month
+  	evt_menu Calendar_Cal_Year, :on_cal_allow_year
 
-  	evt_menu(Calendar_Cal_SeqMonth) {|event| on_cal_seq_month(event)}
-  	evt_menu(Calendar_Cal_SurroundWeeks) {|event| on_cal_show_surrounding_weeks(event)}
+  	evt_menu Calendar_Cal_SeqMonth, :on_cal_seq_month
+  	evt_menu Calendar_Cal_SurroundWeeks, :on_cal_show_surrounding_weeks
 
-  	evt_update_ui(Calendar_Cal_Year) {|event| on_allow_year_update(event)}
-    end
-    
-    def add_menu_bar
-        # create a menu bar
+  	evt_update_ui Calendar_Cal_Year, :on_allow_year_update
+  end
+  
+  def add_menu_bar
+    # create a menu bar
     menu_file = Menu.new
 
-    menu_file.append(Calendar_File_About, "&About...\tCtrl-A", "Show about dialog")
-    menu_file.append_separator()
-    menu_file.append(Calendar_File_Quit, "E&xit\tAlt-X", "Quit self program")
+    menu_file.append(Wx::ID_ABOUT, "&About...\tCtrl-A", "Show about dialog")
+    menu_file.append_separator
+    menu_file.append(Wx::ID_EXIT, "E&xit\tAlt-X", "Quit self program")
 
     menu_cal = Menu.new
     menu_cal.append(Calendar_Cal_Monday,
-                        "Monday &first weekday\tCtrl-F",
-                        "Toggle between Mon and Sun as the first week day",
-                        ITEM_CHECK)
+                     "Monday &first weekday\tCtrl-F",
+                     "Toggle between Mon and Sun as the first week day",
+                     ITEM_CHECK)
     menu_cal.append(Calendar_Cal_Holidays, "Show &holidays\tCtrl-H",
-                        "Toggle highlighting the holidays",
-                        ITEM_CHECK)
+                     "Toggle highlighting the holidays",
+                     ITEM_CHECK)
     menu_cal.append(Calendar_Cal_Special, "Highlight &special dates\tCtrl-S",
-                        "Test custom highlighting",
-                        ITEM_CHECK)
+                     "Test custom highlighting",
+                     ITEM_CHECK)
     menu_cal.append(Calendar_Cal_SurroundWeeks,
-                        "Show s&urrounding weeks\tCtrl-W",
-                        "Show the neighbouring weeks in the prev/next month",
-                        ITEM_CHECK)
-    menu_cal.append_separator()
+                     "Show s&urrounding weeks\tCtrl-W",
+                     "Show the neighbouring weeks in the prev/next month",
+                     ITEM_CHECK)
+    menu_cal.append_separator
     menu_cal.append(Calendar_Cal_SeqMonth,
-                        "To&ggle month selector style\tCtrl-G",
-                        "Use another style for the calendar controls",
-                        ITEM_CHECK)
+                     "To&ggle month selector style\tCtrl-G",
+                     "Use another style for the calendar controls",
+                     ITEM_CHECK)
     menu_cal.append(Calendar_Cal_Month, "&Month can be changed\tCtrl-M",
-                        "Allow changing the month in the calendar",
-                        ITEM_CHECK)
+                     "Allow changing the month in the calendar",
+                     ITEM_CHECK)
     menu_cal.append(Calendar_Cal_Year, "&Year can be changed\tCtrl-Y",
-                        "Allow changing the year in the calendar",
-                        ITEM_CHECK)
+                     "Allow changing the year in the calendar",
+                     ITEM_CHECK)
 
-        # now append the freshly created menu to the menu bar...
+    # now append the freshly created menu to the menu bar...
     menu_bar = MenuBar.new
     menu_bar.append(menu_file, "&File")
     menu_bar.append(menu_cal, "&Calendar")
@@ -150,89 +135,89 @@ class MyFrame < Frame
     menu_bar.check(Calendar_Cal_Month, TRUE)
     menu_bar.check(Calendar_Cal_Year, TRUE)
 
-        # ... and attach self menu bar to the frame
-    set_menu_bar(menu_bar)
-    end
-
-    def add_status_bar
-        # create a status bar just for fun (by default with 1 pane only)
-        create_status_bar
-        set_status_text("Welcome to Windows!")
-    end
-    
-    def configure_window
-        @sizer.add(@calendar, 0, Wx::ALIGN_CENTRE|Wx::ALL, 5)
-        @sizer.set_size_hints(@panel)
-        layout
-        @panel.set_sizer(@sizer)
-    end
-    
+    # ... and attach self menu bar to the frame
+    self.menu_bar = menu_bar
+  end
+
+  def add_status_bar
+    # create a status bar just for fun (by default with 1 pane only)
+    create_status_bar
+    set_status_text("Welcome to Windows!")
+  end
+  
+  def configure_window
+    @sizer.add(@calendar, 0, Wx::ALIGN_CENTRE|Wx::ALL, 5)
+    @sizer.size_hints = @panel
+    layout
+    @panel.sizer = @sizer
+  end
+  
   def on_quit
     # true is to force the frame to close
     close(true)
-    end
+  end
 
   def on_about
-        message_box("wxRuby CalendarCtrl sample\nby Kevin Smith\n" +
+    message_box("wxRuby CalendarCtrl sample\nby Kevin Smith\n" +
                  "based on the wxWidgets version by Vadim Zeitlin",
                  "About Calendar", OK | ICON_INFORMATION, self)
-    end
+  end
 
   def on_cal_monday(event)
-        enable = get_menu_bar().is_checked(event.get_id())
-        toggle_cal_style(enable, CAL_MONDAY_FIRST)
-    end
+    enable = get_menu_bar().is_checked(event.get_id())
+    toggle_cal_style(enable, CAL_MONDAY_FIRST)
+  end
 
   def on_cal_holidays(event)
-        enable = get_menu_bar().is_checked(event.get_id())
+    enable = get_menu_bar().is_checked(event.get_id())
     @calendar.enable_holiday_display(enable)
-    end
+  end
 
-	def on_cal_special(event)
-        highlight_special(get_menu_bar().is_checked(event.get_id()))
-    end
+  def on_cal_special(event)
+    highlight_special(get_menu_bar().is_checked(event.get_id()))
+  end
 
-	def on_cal_allow_month(event)
-        allow = get_menu_bar().is_checked(event.get_id())
+  def on_cal_allow_month(event)
+    allow = get_menu_bar().is_checked(event.get_id())
     @calendar.enable_month_change(allow)
-    end
+  end
 
-	def on_cal_allow_year(event)
-        allow = get_menu_bar().is_checked(event.get_id())
+  def on_cal_allow_year(event)
+    allow = get_menu_bar().is_checked(event.get_id())
     @calendar.enable_year_change(allow)
-    end
+  end
 
-	def on_cal_seq_month(event)
-        allow = get_menu_bar().is_checked(event.get_id())
-        toggle_cal_style(allow, CAL_SEQUENTIAL_MONTH_SELECTION)
-    end
+  def on_cal_seq_month(event)
+    allow = get_menu_bar().is_checked(event.get_id())
+    toggle_cal_style(allow, CAL_SEQUENTIAL_MONTH_SELECTION)
+  end
 
-	def on_cal_show_surrounding_weeks(event)
-        allow = get_menu_bar().is_checked(event.get_id())
-        toggle_cal_style(allow, CAL_SHOW_SURROUNDING_WEEKS)
-    end
+  def on_cal_show_surrounding_weeks(event)
+    allow = get_menu_bar().is_checked(event.get_id())
+    toggle_cal_style(allow, CAL_SHOW_SURROUNDING_WEEKS)
+  end
 
-	def on_allow_year_update(event)
-        event.enable( get_menu_bar().is_checked(Calendar_Cal_Month))
-    end
+  def on_allow_year_update(event)
+    event.enable( get_menu_bar().is_checked(Calendar_Cal_Month))
+  end
 
-    def toggle_cal_style(on,flag)
+  def toggle_cal_style(on,flag)
     style = @calendar.get_window_style_flag
     date = @calendar.date
     @sizer.detach(@calendar)
     @calendar.destroy
-        if  on
-            style |= flag
-        else
-            style &= ~flag
-        end
-      @calendar = MyCalendar.new(@panel, self, date, style)
-      @sizer.add(@calendar, 0, Wx::ALIGN_CENTRE|Wx::ALL, 5)
-      @panel.layout
+    if  on
+      style |= flag
+    else
+      style &= ~flag
     end
+    @calendar = MyCalendar.new(@panel, self, date, style)
+    @sizer.add(@calendar, 0, Wx::ALIGN_CENTRE|Wx::ALL, 5)
+    @panel.layout
+  end
 
-    def highlight_special(on)
-        if on
+  def highlight_special(on)
+    if on
       attr_red_circle = CalendarDateAttr.new(CAL_BORDER_ROUND, RED)
       attr_green_square = CalendarDateAttr.new(CAL_BORDER_SQUARE, GREEN)
       # This wraps correctly, but causes problems because the colour is freed
@@ -243,28 +228,28 @@ class MyFrame < Frame
       @calendar.set_attr(17, attr_red_circle)
       @calendar.set_attr(29, attr_green_square)
       # @calendar.set_attr(13, attr_header_like)
-        else
+    else
       @calendar.reset_attr(17)
       @calendar.reset_attr(29)
       # @calendar.reset_attr(13)
-        end
-    @calendar.refresh()
     end
-
-    def set_date(d)
-      str = "%s-%s-%s" % [ d.year, d.mon, d.day ]
-      Wx::MessageDialog.new( self, "The selected date is #{str}", 
-                             "Date chosen" ).show_modal
-    end
-    
+    @calendar.refresh()
+  end
+
+  def set_date(d)
+    str = "%s-%s-%s" % [ d.year, d.mon, d.day ]
+    Wx::MessageDialog.new( self, "The selected date is #{str}", 
+                           "Date chosen" ).show_modal
+  end
+  
 end
 
 
 class RbApp < App
-    def on_init()
-  	    frame = MyFrame.new("Calendar Windows sample")
+  def on_init()
+    frame = MyFrame.new("Calendar Windows sample")
     frame.show(true)
-    end
+  end
 end
 
 a = RbApp.new