wxruby3 0.9.2-x64-mingw-ucrt → 0.9.3-x64-mingw-ucrt

data/samples/text/scintilla.rb

@@ -11,147 +11,156 @@
 
 require 'wx'
 
-include Wx
-
-Minimal_Quit = 1
-Minimal_About = ID_ABOUT
-Toggle_Whitespace = 5000
-Toggle_EOL = 5001
-
-class MyFrame < Frame
-  def initialize(title,pos,size,style=DEFAULT_FRAME_STYLE)
-    super(nil,-1,title,pos,size,style)
-
-    menuFile = Menu.new
-    menuFile.append(Minimal_Quit, "E&xit\tAlt-X", "Quit this program")
-
-    menuView = Menu.new
-    menuView.append(Toggle_Whitespace, "Show &Whitespace\tF6", "Show Whitespace", ITEM_CHECK)
-    menuView.append(Toggle_EOL, "Show &End of Line\tF7", "Show End of Line characters", ITEM_CHECK)
-
-    menuHelp = Menu.new
-    menuHelp.append(Minimal_About, "&About...\tF1", "Show about dialog")
-
-    menuBar = MenuBar.new
-    menuBar.append(menuFile, "&File")
-    menuBar.append(menuView, "&View")
-    menuBar.append(menuHelp, "&Help")
-    set_menu_bar(menuBar)
-
-    tb = create_tool_bar(Wx::TB_HORIZONTAL | Wx::NO_BORDER | Wx::TB_FLAT | Wx::TB_TEXT)    
-
-    create_status_bar(2)
-    set_status_text("Welcome to wxRuby!")
-
-    @sci = Wx::StyledTextCtrl.new(self)
-
-    font = Font.new(10, FONTFAMILY_TELETYPE, FONTSTYLE_NORMAL, FONTWEIGHT_NORMAL)
-    @sci.style_set_font(STC_STYLE_DEFAULT, font);
-
-    @ws_visible = false
-    @eol_visible = false
-    @sci.set_edge_mode(STC_EDGE_LINE)
-
-    line_num_margin = @sci.text_width(STC_STYLE_LINENUMBER, "_99999")
-    @sci.set_margin_width(0, line_num_margin)
-
-    @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)
-    @sci.set_tab_indents(true)
-    @sci.set_back_space_un_indents(true)
-    @sci.set_indent(4)
-    @sci.set_edge_column(80)
-
-    @sci.set_lexer(STC_LEX_RUBY)
-    @sci.style_clear_all
-    @sci.style_set_foreground(2, RED)
-    @sci.style_set_foreground(3, GREEN)
-    @sci.style_set_foreground(5, BLUE)
-    @sci.style_set_foreground(6, BLUE)
-    @sci.style_set_foreground(7, BLUE)
-    @sci.set_key_words(0, "begin break elsif module retry unless end case next return until class ensure nil self when def false not super while alias defined? for or then yield and do if redo true else in rescue undef")
-
-    @sci.set_property("fold","1")
-    @sci.set_property("fold.compact", "0")
-    @sci.set_property("fold.comment", "1")
-    @sci.set_property("fold.preprocessor", "1")
-
-    @sci.set_margin_width(1, 0)
-    @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(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)
-
-    evt_menu(Minimal_Quit) {onQuit}
-    evt_menu(Minimal_About) {onAbout}
-    evt_menu(Toggle_Whitespace) {onWhitespace}
-    evt_menu(Toggle_EOL) {onEOL}
-    evt_stc_charadded(@sci.get_id) {|evt| onCharadded(evt)}
-    evt_stc_marginclick(@sci.get_id) {|evt| onMarginClick(evt)}
+module Scintilla
 
-  end
+  include Wx
 
-  def onQuit
-    close(true)
-  end
+  Minimal_Quit = 1
+  Minimal_About = ID_ABOUT
+  Toggle_Whitespace = 5000
+  Toggle_EOL = 5001
 
-  def onAbout
-    GC.start
-    msg =  sprintf("This is the About dialog of the scintilla sample.\n" \
-    		   "Welcome to %s", WXWIDGETS_VERSION)
+  class MyFrame < Frame
 
-    message_box(msg, "About Scintilla", OK | ICON_INFORMATION, self)
+    include Wx
 
-  end
+    def initialize(title,pos,size,style=DEFAULT_FRAME_STYLE)
+      super(nil,-1,title,pos,size,style)
 
-  def onWhitespace
-    @ws_visible = !@ws_visible
-    @sci.set_view_white_space(@ws_visible ? STC_WS_VISIBLEALWAYS : STC_WS_INVISIBLE)
-  end
+      self.icon = Wx.Icon(:sample, Wx::BITMAP_TYPE_XPM, art_path: File.join(__dir__, '..'))
 
-  def onEOL
-    @eol_visible = !@eol_visible
-    @sci.set_view_eol(@eol_visible)
-  end
+      menuFile = Menu.new
+      menuFile.append(Minimal_Quit, "E&xit\tAlt-X", "Quit this program")
+
+      menuView = Menu.new
+      menuView.append(Toggle_Whitespace, "Show &Whitespace\tF6", "Show Whitespace", ITEM_CHECK)
+      menuView.append(Toggle_EOL, "Show &End of Line\tF7", "Show End of Line characters", ITEM_CHECK)
+
+      menuHelp = Menu.new
+      menuHelp.append(Minimal_About, "&About...\tF1", "Show about dialog")
+
+      menuBar = MenuBar.new
+      menuBar.append(menuFile, "&File")
+      menuBar.append(menuView, "&View")
+      menuBar.append(menuHelp, "&Help")
+      set_menu_bar(menuBar)
+
+      tb = create_tool_bar(Wx::TB_HORIZONTAL | Wx::NO_BORDER | Wx::TB_FLAT | Wx::TB_TEXT)
+
+      create_status_bar(2)
+      set_status_text("Welcome to wxRuby!")
+
+      @sci = Wx::StyledTextCtrl.new(self)
+
+      font = Font.new(10, FONTFAMILY_TELETYPE, FONTSTYLE_NORMAL, FONTWEIGHT_NORMAL)
+      @sci.style_set_font(STC_STYLE_DEFAULT, font);
+
+      @ws_visible = false
+      @eol_visible = false
+      @sci.set_edge_mode(STC_EDGE_LINE)
+
+      line_num_margin = @sci.text_width(STC_STYLE_LINENUMBER, "_99999")
+      @sci.set_margin_width(0, line_num_margin)
+
+      @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)
+      @sci.set_tab_indents(true)
+      @sci.set_back_space_un_indents(true)
+      @sci.set_indent(4)
+      @sci.set_edge_column(80)
+
+      @sci.set_lexer(STC_LEX_RUBY)
+      @sci.style_clear_all
+      @sci.style_set_foreground(2, RED)
+      @sci.style_set_foreground(3, GREEN)
+      @sci.style_set_foreground(5, BLUE)
+      @sci.style_set_foreground(6, BLUE)
+      @sci.style_set_foreground(7, BLUE)
+      @sci.set_key_words(0, "begin break elsif module retry unless end case next return until class ensure nil self when def false not super while alias defined? for or then yield and do if redo true else in rescue undef")
 
-  def onCharadded(evt)
-    chr =  evt.get_key
-    curr_line = @sci.get_current_line
+      @sci.set_property("fold","1")
+      @sci.set_property("fold.compact", "0")
+      @sci.set_property("fold.comment", "1")
+      @sci.set_property("fold.preprocessor", "1")
 
-    if(chr == 13)
-        if curr_line > 0
-          line_ind = @sci.get_line_indentation(curr_line - 1)
-          if line_ind > 0
-            @sci.set_line_indentation(curr_line, line_ind)
-            @sci.goto_pos(@sci.position_from_line(curr_line)+line_ind)
+      @sci.set_margin_width(1, 0)
+      @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(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)
+
+      evt_menu(Minimal_Quit) {onQuit}
+      evt_menu(Minimal_About) {onAbout}
+      evt_menu(Toggle_Whitespace) {onWhitespace}
+      evt_menu(Toggle_EOL) {onEOL}
+      evt_stc_charadded(@sci.get_id) {|evt| onCharadded(evt)}
+      evt_stc_marginclick(@sci.get_id) {|evt| onMarginClick(evt)}
+
+    end
+
+    def onQuit
+      close(true)
+    end
+
+    def onAbout
+      GC.start
+      msg =  sprintf("This is the About dialog of the scintilla sample.\n" \
+             "Welcome to %s", WXWIDGETS_VERSION)
+
+      message_box(msg, "About Scintilla", OK | ICON_INFORMATION, self)
+
+    end
+
+    def onWhitespace
+      @ws_visible = !@ws_visible
+      @sci.set_view_white_space(@ws_visible ? STC_WS_VISIBLEALWAYS : STC_WS_INVISIBLE)
+    end
+
+    def onEOL
+      @eol_visible = !@eol_visible
+      @sci.set_view_eol(@eol_visible)
+    end
+
+    def onCharadded(evt)
+      chr =  evt.get_key
+      curr_line = @sci.get_current_line
+
+      if(chr == 13)
+          if curr_line > 0
+            line_ind = @sci.get_line_indentation(curr_line - 1)
+            if line_ind > 0
+              @sci.set_line_indentation(curr_line, line_ind)
+              @sci.goto_pos(@sci.position_from_line(curr_line)+line_ind)
+            end
           end
-        end
+      end
     end
-  end
 
-  def onMarginClick(evt)
-    line_num = @sci.line_from_position(evt.get_position)
-    margin = evt.get_margin
+    def onMarginClick(evt)
+      line_num = @sci.line_from_position(evt.get_position)
+      margin = evt.get_margin
 
-    if(margin == 1)
-      @sci.toggle_fold(line_num)
+      if(margin == 1)
+        @sci.toggle_fold(line_num)
+      end
     end
+
   end
 
 end
@@ -167,7 +176,7 @@ module STCSample
   end
 
   def self.activate
-    frame = MyFrame.new("wxRuby Scintilla App",Point.new(50, 50), Size.new(450, 340))
+    frame = Scintilla::MyFrame.new("wxRuby Scintilla App",Point.new(50, 50), Size.new(450, 340))
     frame.show(true)
     frame
   end

data/samples/text/textctrl.rb

@@ -11,109 +11,115 @@
 
 require 'wx'
 
-class InformativeTextCtrl < Wx::TextCtrl
-  # 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, :value => text, :style => STYLE)
-  end
+module TextCtrl
+
+  class InformativeTextCtrl < Wx::TextCtrl
+    # 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, :value => text, :style => STYLE)
+    end
 
-  # 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
+    # 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
-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, :style => STYLE)
+  # 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, :style => STYLE)
+    end
   end
-end
 
-class TextCtrlFrame < Wx::Frame
-  def initialize(*args)
-    super(nil, *args)
+  class TextCtrlFrame < Wx::Frame
+    def initialize(*args)
+      super(nil, *args)
 
-    panel = Wx::Panel.new(self)
-    sizer = Wx::BoxSizer.new(Wx::VERTICAL)
+      self.icon = Wx.Icon(:sample, Wx::BITMAP_TYPE_XPM, art_path: File.join(__dir__, '..'))
 
-    @textctrl = InformativeTextCtrl.new(panel)
-    if Wx.has_feature?(:USE_SPELLCHECK)
-      @textctrl.enable_proof_check(Wx::TextProofOptions.default)
-    end
-    populate_textctrl
-    sizer.add(@textctrl, 2, Wx::GROW|Wx::ALL, 2)
+      panel = Wx::Panel.new(self)
+      sizer = Wx::BoxSizer.new(Wx::VERTICAL)
 
-    button = Wx::Button.new(panel, :label => 'Get Info')
-    sizer.add(button, 0, Wx::ALL, 2 )
-    evt_button button, :on_click
+      @textctrl = InformativeTextCtrl.new(panel)
+      if Wx.has_feature?(:USE_SPELLCHECK)
+        @textctrl.enable_proof_check(Wx::TextProofOptions.default)
+      end
+      populate_textctrl
+      sizer.add(@textctrl, 2, Wx::GROW|Wx::ALL, 2)
 
-    @log = LogTextCtrl.new(panel)
-    sizer.add(@log, 1, Wx::GROW|Wx::ALL, 2)
-    panel.sizer = sizer
+      button = Wx::Button.new(panel, :label => 'Get Info')
+      sizer.add(button, 0, Wx::ALL, 2 )
+      evt_button button, :on_click
 
-    construct_menus
-  end
+      @log = LogTextCtrl.new(panel)
+      sizer.add(@log, 1, Wx::GROW|Wx::ALL, 2)
+      panel.sizer = sizer
 
-  def populate_textctrl
-    @textctrl <<
-      "This is some plain text\n" <<
-      "Text with green letters and yellow background\n" <<
-      "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
+      construct_menus
+    end
 
-  def construct_menus
-    menu_bar = Wx::MenuBar.new
+    def populate_textctrl
+      @textctrl <<
+        "This is some plain text\n" <<
+        "Text with green letters and yellow background\n" <<
+        "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
 
-    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
+    def construct_menus
+      menu_bar = Wx::MenuBar.new
 
-    menu_help = Wx::Menu.new
-    menu_help.append(Wx::ID_ABOUT, "&About...\tF1", "Show about dialog")
-    evt_menu Wx::ID_ABOUT, :on_about
-    menu_bar.append(menu_help, "&Help")
+      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
 
-    self.menu_bar = 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")
 
-  def on_click
-    @log.value = @textctrl.report
-    if Wx.has_feature?(:USE_SPELLCHECK)
-      if @textctrl.get_proof_check_options.is_spell_check_enabled
-        @textctrl.enable_proof_check(Wx::TextProofOptions.disable)
-      else
-        @textctrl.enable_proof_check(Wx::TextProofOptions.default)
+      self.menu_bar = menu_bar
+    end
+
+    def on_click
+      @log.value = @textctrl.report
+      if Wx.has_feature?(:USE_SPELLCHECK)
+        if @textctrl.get_proof_check_options.is_spell_check_enabled
+          @textctrl.enable_proof_check(Wx::TextProofOptions.disable)
+        else
+          @textctrl.enable_proof_check(Wx::TextProofOptions.default)
+        end
       end
     end
-  end
 
-  def on_quit
-    close
-  end
+    def on_quit
+      close
+    end
 
-  def on_about
-    msg =  sprintf("This is the About dialog of the textctrl sample.\n" \
-                    "Welcome to %s", Wx::WXWIDGETS_VERSION)
-    Wx.message_box(msg, "About Minimal", Wx::OK|Wx::ICON_INFORMATION, self)
+    def on_about
+      msg =  sprintf("This is the About dialog of the textctrl sample.\n" \
+                      "Welcome to %s", Wx::WXWIDGETS_VERSION)
+      Wx.message_box(msg, "About Minimal", Wx::OK|Wx::ICON_INFORMATION, self)
+    end
   end
+
 end
 
 module TextCtrlSample
@@ -127,7 +133,7 @@ module TextCtrlSample
   end
 
   def self.activate
-    frame = TextCtrlFrame.new( :title => "TextCtrl demonstration",
+    frame = TextCtrl::TextCtrlFrame.new( :title => "TextCtrl demonstration",
                                :pos => [ 50, 50 ],
                                :size => [ 450, 340 ] )
     frame.show