wxruby 1.9.0-i386-mswin32 → 1.9.1-i386-mswin32

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/textctrl.rb

@@ -1,124 +1,124 @@
-#!/usr/bin/env ruby
-# wxRuby2 Sample Code. Copyright (c) 2004-2006 Kevin B. Smith
-# Freely reusable code: see SAMPLES-LICENSE.TXT for details
-
-begin
-  require 'wx'
-rescue LoadError => no_wx_err
-  begin
-    require 'rubygems'
-    require 'wx'
-  rescue LoadError
-    raise no_wx_err
-  end
-end
-
-class InformativeTextCtrl < Wx::TextCtrl
-  NEWLINE_CORRECTION_FACTOR = 0
-  
-  # These text controls are multiline, and may have rich (coloured,
-  # styled) text in them
-  STYLE = Wx::TE_MULTILINE|Wx::TE_RICH|Wx::TE_RICH2
-  def initialize(parent, text)
-    super(parent, -1, text, Wx::DEFAULT_POSITION, Wx::DEFAULT_SIZE, STYLE)
-  end
-
-  # more ruby-ish
-  alias :<< :append_text
-
-  # run through a few useful methods of textctrl and report the results
-  # as a string
-  def report()
-    report = ''
-    report << 'Insertion Point: ' << get_insertion_point.to_s() << "\n"
-    report << 'First Line Text: ' << get_line_text(0) << "\n"
-    report << 'Final Position: ' << get_last_position().to_s() << "\n"
-    report << 'Selection: ' << get_selection().inspect() << "\n"
-    report << 'String Selection: ' << get_string_selection().inspect << "\n"
-    report << 'Position to X, Y: ' << 
-               position_to_xy( get_insertion_point ).inspect
-    return report
-  end
-end
-
-# A read-only text ctrl useful for displaying output
-class LogTextCtrl < Wx::TextCtrl
-  STYLE = Wx::TE_READONLY|Wx::TE_MULTILINE
-  def initialize(parent)
-    super(parent, -1, '', Wx::DEFAULT_POSITION, Wx::DEFAULT_SIZE, STYLE)
-  end
-end
-
-class TextCtrlFrame < Wx::Frame
-  def initialize(title, pos, size)
-    super(nil, -1, title, pos, size)
-
-    panel = Wx::Panel.new(self, -1)
-    sizer = Wx::BoxSizer.new(Wx::VERTICAL)
-
-    @textctrl = InformativeTextCtrl.new(panel, '')
-    populate_textctrl()
-    sizer.add(@textctrl, 2, Wx::GROW|Wx::ALL, 2)
-
-    button = Wx::Button.new(panel, -1, 'Get Info')
-    sizer.add(button, 0, Wx::ADJUST_MINSIZE|Wx::ALL, 2 )
-    evt_button(button.get_id) { | e | on_click(e) }
-
-    @log = LogTextCtrl.new(panel)
-    sizer.add(@log, 1, Wx::GROW|Wx::ALL, 2)
-
-    panel.set_sizer( sizer )
-  end
-
-  def populate_textctrl()
-    @textctrl << "This is some plain text\n"
-    @textctrl << "Text with green letters and yellow background\n"
-    @textctrl << "This is some more plain text"
-    # create a new rich text style
-    attr = Wx::TextAttr.new(Wx::GREEN, Wx::Colour.new(255, 255, 0) )
-    # apply the style from character 26 to character 76
-    @textctrl.set_style(24, 69, attr)
-  end
-
-  def construct_menus()
-    menu_bar = Wx::MenuBar.new()
-
-    menu_file = Wx::Menu.new()
-    menu_file.append(Wx::ID_EXIT, "E&xit\tAlt-X", "Quit this program")
-    menu_bar.append(menu_file, "&File")
-    evt_menu(Wx::ID_EXIT) { on_quit() }
-
-    menu_help = Wx::Menu.new()
-    menu_help.append(Wx::ID_ABOUT, "&About...\tF1", "Show about dialog")
-    evt_menu(Wx::ID_ABOUT) { on_about() }
-    menu_bar.append(menu_help, "&Help")
-
-    set_menu_bar(menu_bar)
-  end
-
-  def on_click(e)
-    @log.set_value( @textctrl.report() )
-  end
-
-  def on_quit()
-    close(TRUE)
-  end
-
-  def on_about()
-    msg =  sprintf("This is the About dialog of the textctrl sample.\n" \
-                    "Welcome to %s", Wx::VERSION_STRING)
-    message_box(msg, "About Minimal", Wx::OK|Wx::ICON_INFORMATION, self)
-  end
-end
-
-class RbApp < Wx::App
-  def on_init()
-    frame = TextCtrlFrame.new("TextCtrl demonstration",
-                              Wx::Point.new(50, 50),
-                              Wx::Size.new(450, 340) )
-
-    frame.show(true)
-  end
-end
-
-RbApp.new().main_loop()
+#!/usr/bin/env ruby
+# wxRuby2 Sample Code. Copyright (c) 2004-2006 Kevin B. Smith
+# Freely reusable code: see SAMPLES-LICENSE.TXT for details
+
+begin
+  require 'wx'
+rescue LoadError => no_wx_err
+  begin
+    require 'rubygems'
+    require 'wx'
+  rescue LoadError
+    raise no_wx_err
+  end
+end
+
+class InformativeTextCtrl < Wx::TextCtrl
+  NEWLINE_CORRECTION_FACTOR = 0
+  
+  # These text controls are multiline, and may have rich (coloured,
+  # styled) text in them
+  STYLE = Wx::TE_MULTILINE|Wx::TE_RICH|Wx::TE_RICH2
+  def initialize(parent, text)
+    super(parent, -1, text, Wx::DEFAULT_POSITION, Wx::DEFAULT_SIZE, STYLE)
+  end
+
+  # more ruby-ish
+  alias :<< :append_text
+
+  # run through a few useful methods of textctrl and report the results
+  # as a string
+  def report()
+    report = ''
+    report << 'Insertion Point: ' << get_insertion_point.to_s() << "\n"
+    report << 'First Line Text: ' << get_line_text(0) << "\n"
+    report << 'Final Position: ' << get_last_position().to_s() << "\n"
+    report << 'Selection: ' << get_selection().inspect() << "\n"
+    report << 'String Selection: ' << get_string_selection().inspect << "\n"
+    report << 'Position to X, Y: ' << 
+               position_to_xy( get_insertion_point ).inspect
+    return report
+  end
+end
+
+# A read-only text ctrl useful for displaying output
+class LogTextCtrl < Wx::TextCtrl
+  STYLE = Wx::TE_READONLY|Wx::TE_MULTILINE
+  def initialize(parent)
+    super(parent, -1, '', Wx::DEFAULT_POSITION, Wx::DEFAULT_SIZE, STYLE)
+  end
+end
+
+class TextCtrlFrame < Wx::Frame
+  def initialize(title, pos, size)
+    super(nil, -1, title, pos, size)
+
+    panel = Wx::Panel.new(self, -1)
+    sizer = Wx::BoxSizer.new(Wx::VERTICAL)
+
+    @textctrl = InformativeTextCtrl.new(panel, '')
+    populate_textctrl()
+    sizer.add(@textctrl, 2, Wx::GROW|Wx::ALL, 2)
+
+    button = Wx::Button.new(panel, -1, 'Get Info')
+    sizer.add(button, 0, Wx::ADJUST_MINSIZE|Wx::ALL, 2 )
+    evt_button(button.get_id) { | e | on_click(e) }
+
+    @log = LogTextCtrl.new(panel)
+    sizer.add(@log, 1, Wx::GROW|Wx::ALL, 2)
+
+    panel.set_sizer( sizer )
+  end
+
+  def populate_textctrl()
+    @textctrl << "This is some plain text\n"
+    @textctrl << "Text with green letters and yellow background\n"
+    @textctrl << "This is some more plain text"
+    # create a new rich text style
+    attr = Wx::TextAttr.new(Wx::GREEN, Wx::Colour.new(255, 255, 0) )
+    # apply the style from character 26 to character 76
+    @textctrl.set_style(24, 69, attr)
+  end
+
+  def construct_menus()
+    menu_bar = Wx::MenuBar.new()
+
+    menu_file = Wx::Menu.new()
+    menu_file.append(Wx::ID_EXIT, "E&xit\tAlt-X", "Quit this program")
+    menu_bar.append(menu_file, "&File")
+    evt_menu(Wx::ID_EXIT) { on_quit() }
+
+    menu_help = Wx::Menu.new()
+    menu_help.append(Wx::ID_ABOUT, "&About...\tF1", "Show about dialog")
+    evt_menu(Wx::ID_ABOUT) { on_about() }
+    menu_bar.append(menu_help, "&Help")
+
+    set_menu_bar(menu_bar)
+  end
+
+  def on_click(e)
+    @log.set_value( @textctrl.report() )
+  end
+
+  def on_quit()
+    close(TRUE)
+  end
+
+  def on_about()
+    msg =  sprintf("This is the About dialog of the textctrl sample.\n" \
+                    "Welcome to %s", Wx::VERSION_STRING)
+    message_box(msg, "About Minimal", Wx::OK|Wx::ICON_INFORMATION, self)
+  end
+end
+
+class RbApp < Wx::App
+  def on_init()
+    frame = TextCtrlFrame.new("TextCtrl demonstration",
+                              Wx::Point.new(50, 50),
+                              Wx::Size.new(450, 340) )
+
+    frame.show(true)
+  end
+end
+
+RbApp.new().main_loop()

data/samples/text/unicode.rb

@@ -1,238 +1,238 @@
-# wxRuby2 Sample Code. Copyright (c) 2004-2006 Kevin B. Smith
-# Freely reusable code: see SAMPLES-LICENSE.TXT for details
-
-# Tell ruby this script is written in UTF-8 encoded text.
-$KCODE = 'u'
-
-# Library to get character lengths (as opposed to byte lengths) from
-# Ruby strings.
-require 'jcode'
-
-require 'wx'
-
-$utf8_file = File.join( File.dirname(__FILE__), 'utf8.txt')
-
-class UnicodeDemoTextCtrl < Wx::TextCtrl
-  NEWLINE_CORRECTION_FACTOR = 0
-  
-  DEFAULT_TEXT = "If you have a unicode version of wxruby, you should be able to see a range of characters from different languages displayed, and be able to type multilingual strings in the text area. Note that some scripts may only be displayed if you are using a suitable font; otherwise characters will appear as blank boxes.
-
-" << File.read( $utf8_file )
-
-  def initialize(parent, text = DEFAULT_TEXT)
-    super(parent, -1, text, 
-          Wx::DEFAULT_POSITION, Wx::DEFAULT_SIZE, Wx::TE_MULTILINE)
-  end
-
-  # run through a few useful methods of textctrl and report the results
-  # as a string
-  def report()
-    report = ''
-    sel = get_string_selection()
-    report << 'Selected string byte length: ' << sel.length.to_s << "\n"
-    report << 'Selected string character length: ' << sel.jlength.to_s << "\n"
-    report << 'Selected string:: ' << sel.inspect << "\n"
-    return report
-  end
-end
-
-# A read-only text ctrl useful for displaying output
-class LogTextCtrl < Wx::TextCtrl
-  STYLE = Wx::TE_READONLY|Wx::TE_MULTILINE
-  def initialize(parent)
-    super(parent, -1, '', Wx::DEFAULT_POSITION, Wx::DEFAULT_SIZE, STYLE)
-  end
-end
-
-class IConvFrame < Wx::Frame
-  # Ruby stdlib for converting strings between encodings
-  begin
-    require 'iconv'
-    ICONV_LOADED = 1
-  rescue LoadError
-  end
-
-  # The encodings we're going to make importable and exportable in this
-  # application - see construct_import_export_menus below
-  ENCODINGS = { 'US ASCII' => 'ASCII', 
-                'UTF-8' => 'UTF-8',
-                'UTF-16' => 'UTF-16',
-                'Windows Latin CP1252' => 'CP1252',
-                'Latin ISO-8859-1' => 'ISO-8859-1',
-                'Japanese SHIFT-JIS' => 'SHIFT-JIS' }
-
-  def initialize(title, pos, size)
-    super(nil, -1, title, pos, size)
-    panel = Wx::Panel.new(self)
-    sizer = Wx::BoxSizer.new(Wx::VERTICAL)
-
-    sys_lang = Wx::Locale.get_system_language_name
-    text = Wx::StaticText.new(panel, -1, "System language: #{sys_lang}")
-    sizer.add(text, 0, Wx::ALL, 5)
-
-    sys_enc = Wx::Locale.get_system_encoding_name
-    text = Wx::StaticText.new(panel, -1, "System default encoding: #{sys_enc}")
-    sizer.add(text, 0, Wx::ALL, 5)
-
-    # The text input and display
-    @textctrl = UnicodeDemoTextCtrl.new(panel)
-    sizer.add(@textctrl, 3, Wx::GROW|Wx::ALL, 2)
-
-    # The button to show what's selected
-    button = Wx::Button.new(panel, -1, 'Describe text selection')
-    sizer.add(button, 0, Wx::ADJUST_MINSIZE|Wx::ALL, 2 )
-    evt_button(button.get_id) { | e | on_click(e) }
-
-    @log = LogTextCtrl.new(panel)
-    sizer.add(@log, 1, Wx::GROW|Wx::ALL, 2)
-    sizer.add( Wx::StaticText.new(panel, -1, 'Some controls with unicode'),
-               0, Wx::ADJUST_MINSIZE|Wx::ALL, 2 )
-    ctrl_sizer = Wx::BoxSizer.new(Wx::HORIZONTAL)
-
-    test_button = Wx::Button.new(panel, -1, '万')
-    ctrl_sizer.add(test_button, 0, Wx::ADJUST_MINSIZE|Wx::ALL, 2)
-    choice = Wx::Choice.new(panel, -1, Wx::DEFAULT_POSITION, 
-                            Wx::DEFAULT_SIZE, [])
-    File.readlines($utf8_file).each do | line |
-      next if line.chomp.empty?
-      choice.append(line.chomp)
-    end
-    choice.set_selection(0)
-    ctrl_sizer.add(choice, 0, Wx::ADJUST_MINSIZE|Wx::ALL, 2)
-
-    sizer.add(ctrl_sizer, 0, Wx::ADJUST_MINSIZE|Wx::ALL, 2)
-    construct_menus()
-    panel.set_sizer( sizer )
-  end
-
-  # Prompt the user to specify a file whose contents should be loaded
-  # into the text ctrl. The file should be encoded in +encoding+
-  def on_import_file(encoding)
-    fd = Wx::FileDialog.new( nil, 'Import file', "", "", 
-                             "*.*", Wx::OPEN|Wx::FILE_MUST_EXIST  )
-    return unless fd.show_modal() == Wx::ID_OK
-    File.open( fd.get_path ) do | file |
-      import_file( file, encoding )
-    end
-  rescue Iconv::IllegalSequence
-    message = "The file %s does not seem to be in %s encoding " %
-              [ fd.get_filename, encoding ]
-    Wx::MessageDialog.new(self, message, 'Wrong encoding',
-                          Wx::OK|Wx::ICON_EXCLAMATION).show_modal()
-  end
-
-  # Read +io+, which should be text file encoding in +source_encoding+,
-  # and display the contents in the textctrl.
-  def import_file(io, source_encoding = 'UTF-8')
-    case source_encoding
-    when /UTF-?8/
-      @textctrl.set_value( io.read() )
-    else
-      output = ''
-      Iconv.open('UTF-8', source_encoding) do | converter |
-        output << converter.iconv( io.read() )
-        output << converter.iconv(nil)
-      end
-      @textctrl.set_value( output )
-    end
-  end
-
-  # Ask the user for a file path, and then export the content of the
-  # textctrl to it in the encoding +encoding+
-  def on_export_file(encoding)
-    fd = Wx::FileDialog.new( nil, 'Export file', "", "",
-                             "*.*", Wx::SAVE|Wx::OVERWRITE_PROMPT )
-    return unless fd.show_modal() == Wx::ID_OK
-    File.open( fd.get_path, 'w' ) do | file |
-      export_file( file, encoding )
-    end
-  rescue Iconv::IllegalSequence
-    message = "The text content containts characters that " <<
-              "cannot be encoded using %s" % encoding
-    Wx::MessageDialog.new(self, message, 'Invalid encoding',
-                          Wx::OK|Wx::ICON_EXCLAMATION).show_modal()
-  end
-
-  # Write the content of the textctrl to the file or io +io+, encoding
-  # the text in encoding +target_encoding+
-  def export_file(io, target_encoding = 'utf-8')
-    case target_encoding
-    when /UTF-?8/
-      io.write( @textctrl.get_value )
-    else
-      Iconv.open(target_encoding, 'UTF-8') do | converter |
-        io << converter.iconv( @textctrl.get_value )
-        io << converter.iconv(nil)
-      end
-    end
-  end
-
-  def construct_menus()
-    menu_bar = Wx::MenuBar.new()
-
-    menu_file = Wx::Menu.new()
-    menu_file.append(Wx::ID_EXIT, "E&xit\tAlt-X", "Quit this program")
-    evt_menu(Wx::ID_EXIT) { on_quit() }
-    menu_bar.append(menu_file, "&File")
-    if self.class.const_defined?(:ICONV_LOADED)
-      construct_import_export_menus(menu_bar)
-    end
-
-    menu_help = Wx::Menu.new()
-    menu_help.append(Wx::ID_ABOUT, "&About...\tF1", "Show about dialog")
-    evt_menu(Wx::ID_ABOUT) { on_about() }
-    menu_bar.append(menu_help, "&Help")
-
-    set_menu_bar(menu_bar)
-  end
-
-  def construct_import_export_menus(menu_bar)
-    id_counter = 0
-    menu_import = Wx::Menu.new()
-
-    ENCODINGS.each do | desc, enc |
-      id_counter += 1
-      menu_import.append(id_counter, "Import (#{desc})",
-                         "Import a file in #{desc} encoding")
-      
-      evt_menu(id_counter) { on_import_file(enc) }
-    end
-    menu_bar.append(menu_import, '&Import')
-
-    menu_export = Wx::Menu.new()
-    ENCODINGS.each do | desc, enc |
-      id_counter += 1
-      menu_export.append(id_counter, "Export (#{desc})",
-                         "Export a file in #{desc} encoding")
-      
-      evt_menu(id_counter) { on_export_file(enc) }
-    end
-    menu_bar.append(menu_export, '&Export')
-  end
-
-  def on_click(e)
-    @log.set_value( @textctrl.report() )
-  end
-
-  def on_quit()
-    close(TRUE)
-  end
-
-  def on_about()
-    msg =  sprintf("This is the About dialog of the Unicode sample.\n" \
-                    "Welcome to %s", Wx::VERSION_STRING)
-    Wx::message_box(msg, "About Minimal", Wx::OK|Wx::ICON_INFORMATION, self)
-  end
-end
-
-class IConvApp < Wx::App
-  def on_init()
-    frame = IConvFrame.new("Unicode demonstration - ",
-                           Wx::Point.new(50, 50),
-                           Wx::Size.new(450, 450) )
-
-    frame.show(true)
-  end
-end
-
-IConvApp.new().main_loop()
+# wxRuby2 Sample Code. Copyright (c) 2004-2006 Kevin B. Smith
+# Freely reusable code: see SAMPLES-LICENSE.TXT for details
+
+# Tell ruby this script is written in UTF-8 encoded text.
+$KCODE = 'u'
+
+# Library to get character lengths (as opposed to byte lengths) from
+# Ruby strings.
+require 'jcode'
+
+require 'wx'
+
+$utf8_file = File.join( File.dirname(__FILE__), 'utf8.txt')
+
+class UnicodeDemoTextCtrl < Wx::TextCtrl
+  NEWLINE_CORRECTION_FACTOR = 0
+  
+  DEFAULT_TEXT = "If you have a unicode version of wxruby, you should be able to see a range of characters from different languages displayed, and be able to type multilingual strings in the text area. Note that some scripts may only be displayed if you are using a suitable font; otherwise characters will appear as blank boxes.
+
+" << File.read( $utf8_file )
+
+  def initialize(parent, text = DEFAULT_TEXT)
+    super(parent, -1, text, 
+          Wx::DEFAULT_POSITION, Wx::DEFAULT_SIZE, Wx::TE_MULTILINE)
+  end
+
+  # run through a few useful methods of textctrl and report the results
+  # as a string
+  def report()
+    report = ''
+    sel = get_string_selection()
+    report << 'Selected string byte length: ' << sel.length.to_s << "\n"
+    report << 'Selected string character length: ' << sel.jlength.to_s << "\n"
+    report << 'Selected string:: ' << sel.inspect << "\n"
+    return report
+  end
+end
+
+# A read-only text ctrl useful for displaying output
+class LogTextCtrl < Wx::TextCtrl
+  STYLE = Wx::TE_READONLY|Wx::TE_MULTILINE
+  def initialize(parent)
+    super(parent, -1, '', Wx::DEFAULT_POSITION, Wx::DEFAULT_SIZE, STYLE)
+  end
+end
+
+class IConvFrame < Wx::Frame
+  # Ruby stdlib for converting strings between encodings
+  begin
+    require 'iconv'
+    ICONV_LOADED = 1
+  rescue LoadError
+  end
+
+  # The encodings we're going to make importable and exportable in this
+  # application - see construct_import_export_menus below
+  ENCODINGS = { 'US ASCII' => 'ASCII', 
+                'UTF-8' => 'UTF-8',
+                'UTF-16' => 'UTF-16',
+                'Windows Latin CP1252' => 'CP1252',
+                'Latin ISO-8859-1' => 'ISO-8859-1',
+                'Japanese SHIFT-JIS' => 'SHIFT-JIS' }
+
+  def initialize(title, pos, size)
+    super(nil, -1, title, pos, size)
+    panel = Wx::Panel.new(self)
+    sizer = Wx::BoxSizer.new(Wx::VERTICAL)
+
+    sys_lang = Wx::Locale.get_system_language_name
+    text = Wx::StaticText.new(panel, -1, "System language: #{sys_lang}")
+    sizer.add(text, 0, Wx::ALL, 5)
+
+    sys_enc = Wx::Locale.get_system_encoding_name
+    text = Wx::StaticText.new(panel, -1, "System default encoding: #{sys_enc}")
+    sizer.add(text, 0, Wx::ALL, 5)
+
+    # The text input and display
+    @textctrl = UnicodeDemoTextCtrl.new(panel)
+    sizer.add(@textctrl, 3, Wx::GROW|Wx::ALL, 2)
+
+    # The button to show what's selected
+    button = Wx::Button.new(panel, -1, 'Describe text selection')
+    sizer.add(button, 0, Wx::ADJUST_MINSIZE|Wx::ALL, 2 )
+    evt_button(button.get_id) { | e | on_click(e) }
+
+    @log = LogTextCtrl.new(panel)
+    sizer.add(@log, 1, Wx::GROW|Wx::ALL, 2)
+    sizer.add( Wx::StaticText.new(panel, -1, 'Some controls with unicode'),
+               0, Wx::ADJUST_MINSIZE|Wx::ALL, 2 )
+    ctrl_sizer = Wx::BoxSizer.new(Wx::HORIZONTAL)
+
+    test_button = Wx::Button.new(panel, -1, '万')
+    ctrl_sizer.add(test_button, 0, Wx::ADJUST_MINSIZE|Wx::ALL, 2)
+    choice = Wx::Choice.new(panel, -1, Wx::DEFAULT_POSITION, 
+                            Wx::DEFAULT_SIZE, [])
+    File.readlines($utf8_file).each do | line |
+      next if line.chomp.empty?
+      choice.append(line.chomp)
+    end
+    choice.set_selection(0)
+    ctrl_sizer.add(choice, 0, Wx::ADJUST_MINSIZE|Wx::ALL, 2)
+
+    sizer.add(ctrl_sizer, 0, Wx::ADJUST_MINSIZE|Wx::ALL, 2)
+    construct_menus()
+    panel.set_sizer_and_fit( sizer )
+  end
+
+  # Prompt the user to specify a file whose contents should be loaded
+  # into the text ctrl. The file should be encoded in +encoding+
+  def on_import_file(encoding)
+    fd = Wx::FileDialog.new( nil, 'Import file', "", "", 
+                             "*.*", Wx::OPEN|Wx::FILE_MUST_EXIST  )
+    return unless fd.show_modal() == Wx::ID_OK
+    File.open( fd.get_path ) do | file |
+      import_file( file, encoding )
+    end
+  rescue Iconv::IllegalSequence
+    message = "The file %s does not seem to be in %s encoding " %
+              [ fd.get_filename, encoding ]
+    Wx::MessageDialog.new(self, message, 'Wrong encoding',
+                          Wx::OK|Wx::ICON_EXCLAMATION).show_modal()
+  end
+
+  # Read +io+, which should be text file encoding in +source_encoding+,
+  # and display the contents in the textctrl.
+  def import_file(io, source_encoding = 'UTF-8')
+    case source_encoding
+    when /UTF-?8/
+      @textctrl.set_value( io.read() )
+    else
+      output = ''
+      Iconv.open('UTF-8', source_encoding) do | converter |
+        output << converter.iconv( io.read() )
+        output << converter.iconv(nil)
+      end
+      @textctrl.set_value( output )
+    end
+  end
+
+  # Ask the user for a file path, and then export the content of the
+  # textctrl to it in the encoding +encoding+
+  def on_export_file(encoding)
+    fd = Wx::FileDialog.new( nil, 'Export file', "", "",
+                             "*.*", Wx::SAVE|Wx::OVERWRITE_PROMPT )
+    return unless fd.show_modal() == Wx::ID_OK
+    File.open( fd.get_path, 'w' ) do | file |
+      export_file( file, encoding )
+    end
+  rescue Iconv::IllegalSequence
+    message = "The text content containts characters that " <<
+              "cannot be encoded using %s" % encoding
+    Wx::MessageDialog.new(self, message, 'Invalid encoding',
+                          Wx::OK|Wx::ICON_EXCLAMATION).show_modal()
+  end
+
+  # Write the content of the textctrl to the file or io +io+, encoding
+  # the text in encoding +target_encoding+
+  def export_file(io, target_encoding = 'utf-8')
+    case target_encoding
+    when /UTF-?8/
+      io.write( @textctrl.get_value )
+    else
+      Iconv.open(target_encoding, 'UTF-8') do | converter |
+        io << converter.iconv( @textctrl.get_value )
+        io << converter.iconv(nil)
+      end
+    end
+  end
+
+  def construct_menus()
+    menu_bar = Wx::MenuBar.new()
+
+    menu_file = Wx::Menu.new()
+    menu_file.append(Wx::ID_EXIT, "E&xit\tAlt-X", "Quit this program")
+    evt_menu(Wx::ID_EXIT) { on_quit() }
+    menu_bar.append(menu_file, "&File")
+    if self.class.const_defined?(:ICONV_LOADED)
+      construct_import_export_menus(menu_bar)
+    end
+
+    menu_help = Wx::Menu.new()
+    menu_help.append(Wx::ID_ABOUT, "&About...\tF1", "Show about dialog")
+    evt_menu(Wx::ID_ABOUT) { on_about() }
+    menu_bar.append(menu_help, "&Help")
+
+    set_menu_bar(menu_bar)
+  end
+
+  def construct_import_export_menus(menu_bar)
+    id_counter = 0
+    menu_import = Wx::Menu.new()
+
+    ENCODINGS.each do | desc, enc |
+      id_counter += 1
+      menu_import.append(id_counter, "Import (#{desc})",
+                         "Import a file in #{desc} encoding")
+      
+      evt_menu(id_counter) { on_import_file(enc) }
+    end
+    menu_bar.append(menu_import, '&Import')
+
+    menu_export = Wx::Menu.new()
+    ENCODINGS.each do | desc, enc |
+      id_counter += 1
+      menu_export.append(id_counter, "Export (#{desc})",
+                         "Export a file in #{desc} encoding")
+      
+      evt_menu(id_counter) { on_export_file(enc) }
+    end
+    menu_bar.append(menu_export, '&Export')
+  end
+
+  def on_click(e)
+    @log.set_value( @textctrl.report() )
+  end
+
+  def on_quit()
+    close(TRUE)
+  end
+
+  def on_about()
+    msg =  sprintf("This is the About dialog of the Unicode sample.\n" \
+                    "Welcome to %s", Wx::VERSION_STRING)
+    Wx::message_box(msg, "About Minimal", Wx::OK|Wx::ICON_INFORMATION, self)
+  end
+end
+
+class IConvApp < Wx::App
+  def on_init()
+    frame = IConvFrame.new("Unicode demonstration - ",
+                           Wx::Point.new(50, 50),
+                           Wx::Size.new(450, 450) )
+
+    frame.show(true)
+  end
+end
+
+IConvApp.new().main_loop()