wxruby3 0.9.0.pre.beta.8-x64-mingw-ucrt → 0.9.0.pre.beta.9-x64-mingw-ucrt

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b66fa45087c4c992188085a010135f6e061d234597360ed0899e03945675c2eb
-  data.tar.gz: d65baa370771ddc16a4e51385f8ad6cfdc5578002596870e41b02b71f7bfe7b2
+  metadata.gz: 67bec337bf61091235deb1a9c5fbefc8498791550ab3d84149000e8be01cd506
+  data.tar.gz: 9fb4b2a4a770a6d1fe0f53540e70a0c2fc3190e89e8a2ff642fae848b1c74575
 SHA512:
-  metadata.gz: 0b0396a74a8c18639f85567cee7ad2ff09a29e9359c9ea774e90abbd3779266e25a24650d1ccb7aa9808f60f7b3fbfc6c05647952fb681fc736939cb80655ea9
-  data.tar.gz: 100622a43259a9fddfdf82e308ccc8b8d6b7ad094ffa2fe475ed77b900753eaf2be6359aab4bde12aa4a5fcee0d92061b3215526df5735cb3ec4ab7d7394ca72
+  metadata.gz: 36408e9a7d31a4209d13ac54db02a8686bcb4f8f8a07c3772f1b537cc2200be0c94e0d2faea3fc91a2c9ed1598a83b0a649f6036c70eb4110e86956554b5abec
+  data.tar.gz: 2c14907e3c38f1ed47de3148f27f3b9cf8bf1c0ef634d9fa08603fd0ac629bdf4aad14a6e1f7184caf5bc03ea222cffbfb1a070dfee065f7c7c934cd964e0f8c

data/lib/wx/doc/gen/core.rb

@@ -7,10 +7,10 @@
 module Wx
 
   # wxRuby version string
-  Wx::WXRUBY_VERSION = '0.9.0-beta.8'
+  Wx::WXRUBY_VERSION = '0.9.0-beta.9'
 
   # wxRuby version release type (alpha, beta, rc)
-  Wx::WXRUBY_RELEASE_TYPE = 'beta.8'
+  Wx::WXRUBY_RELEASE_TYPE = 'beta.9'
   # wxRuby major version number
   Wx::WXRUBY_MAJOR = 0
   # wxRuby minor version number

data/lib/wx/version.rb

@@ -1,3 +1,3 @@
 module Wx
-  WXRUBY_VERSION    = '0.9.0-beta.8'
+  WXRUBY_VERSION    = '0.9.0-beta.9'
 end

data/samples/sampler/editor.rb

@@ -175,6 +175,19 @@ module WxRuby
       @editors.each { |e| e.find_close }
     end
 
+    def goto
+      res = Wx.get_number_from_user('Enter line number to go to.',
+                                    'Line:',
+                                    'Goto Line',
+                                    @editors[@edt_book.selection].current_line+1,
+                                    1,
+                                    @editors[@edt_book.selection].line_count,
+                                    @frame)
+      if res >= 1
+        @editors[@edt_book.selection].goto_line(res-1)
+      end
+    end
+
     def page_from_id(id)
       if id >= ID::EDT_MIN_ID && id < (ID::EDT_MIN_ID+@edt_book.page_count)
         id - ID::EDT_MIN_ID
@@ -231,6 +244,7 @@ module WxRuby
       FIND_NEXT = Wx::ID_FORWARD
       FIND_PREV = Wx::ID_BACKWARD
       REPLACE = Wx::ID_REPLACE
+      GOTO = Wx::ID_JUMP_TO
       %i[
         RUN
         TOGGLE_THEME
@@ -268,6 +282,8 @@ module WxRuby
       menuEdit.append(ID::FIND_NEXT, "Find Next\tF3", 'Find next occurrence of the search phrase')
       menuEdit.append(ID::FIND_PREV, "Find Previous\tShift-F3", 'Find previous occurrence of the search phrase')
       menuEdit.append(ID::REPLACE, "Replace...\tCtrl-R", 'Show Replace Dialog')
+      menuEdit.append_separator
+      menuEdit.append(ID::GOTO, "Got to line...\tCtrl-G", 'Move to line number')
 
       menuView = Wx::Menu.new
       menuView.append(ID::TOGGLE_THEME, 'Display dark theme', 'Display dark theme', Wx::ITEM_CHECK)
@@ -354,6 +370,8 @@ module WxRuby
       evt_menu(ID::FIND_NEXT, :on_find_next)
       evt_menu(ID::FIND_PREV, :on_find_prev)
 
+      evt_menu(ID::GOTO, :on_goto)
+
       layout
     end
 
@@ -555,6 +573,10 @@ module WxRuby
       set_status_text('')
     end
 
+    def on_goto(_evt)
+      @editors.goto
+    end
+
   end
 
 end

data/samples/sampler/stc_editor.rb

@@ -133,17 +133,18 @@ module WxRuby
       style_set_foreground(SCE_RB_CHARACTER, Wx::RED)
       style_set_foreground(SCE_RB_SYMBOL, Wx::Colour.new('DARKBLUE'))
       style_set_bold(SCE_RB_SYMBOL, true)
-      # current wxWidgets Scintilla (Ruby lexer) version does not support these correctly
-      # style_set_foreground(SCE_RB_HERE_DELIM, Wx::BLACK)
-      # style_set_bold(SCE_RB_HERE_DELIM, true)
-      # style_set_foreground(SCE_RB_HERE_Q, c_maroon)
-      # style_set_foreground(SCE_RB_HERE_QQ, c_maroon)
-      # style_set_foreground(SCE_RB_HERE_QX, c_maroon)
-      # style_set_foreground(SCE_RB_STRING_Q, c_maroon)
-      # style_set_foreground(SCE_RB_STRING_QQ, c_maroon)
-      # style_set_foreground(SCE_RB_STRING_QX, c_maroon)
-      # style_set_foreground(SCE_RB_STRING_QR, c_maroon)
-      # style_set_foreground(SCE_RB_STRING_QW, c_maroon)
+      if Wx::WXWIDGETS_VERSION >= '3.3.0'
+        style_set_foreground(SCE_RB_HERE_DELIM, Wx::BLACK)
+        style_set_bold(SCE_RB_HERE_DELIM, true)
+        style_set_foreground(SCE_RB_HERE_Q, c_maroon)
+        style_set_foreground(SCE_RB_HERE_QQ, c_maroon)
+        style_set_foreground(SCE_RB_HERE_QX, c_maroon)
+        style_set_foreground(SCE_RB_STRING_Q, c_maroon)
+        style_set_foreground(SCE_RB_STRING_QQ, c_maroon)
+        style_set_foreground(SCE_RB_STRING_QX, c_maroon)
+        style_set_foreground(SCE_RB_STRING_QR, c_maroon)
+        style_set_foreground(SCE_RB_STRING_QW, c_maroon)
+      end
       bg = Wx::Colour.new('LightGray')
       fg = Wx::Colour.new('DarkCyan')
       set_fold_margin_colour(true, bg)
@@ -156,6 +157,7 @@ module WxRuby
 
     def dark_theme
       bg = Wx::Colour.new('DarkSlateGray')
+      c_str = Wx::Colour.new('LimeGreen')
       style_set_background(Wx::STC::STC_STYLE_DEFAULT, bg)
       style_set_foreground(Wx::STC::STC_STYLE_DEFAULT, Wx::WHITE)
       style_clear_all
@@ -177,24 +179,25 @@ module WxRuby
       style_set_background(SCE_RB_POD, bg)
       style_set_foreground(SCE_RB_NUMBER, Wx::Colour.new('DeepSkyBlue'))
       style_set_background(SCE_RB_NUMBER, bg)
-      style_set_foreground(SCE_RB_STRING, Wx::Colour.new('LimeGreen'))
+      style_set_foreground(SCE_RB_STRING, c_str)
       style_set_background(SCE_RB_STRING, bg)
       style_set_foreground(SCE_RB_CHARACTER, Wx::Colour.new('YellowGreen'))
       style_set_background(SCE_RB_CHARACTER, bg)
       style_set_foreground(SCE_RB_SYMBOL, Wx::Colour.new('Gold'))
       style_set_background(SCE_RB_SYMBOL, bg)
       style_set_bold(SCE_RB_SYMBOL, true)
-      # current wxWidgets Scintilla (Ruby lexer) version does not support these correctly
-      # style_set_foreground(SCE_RB_HERE_DELIM, Wx::BLACK)
-      # style_set_bold(SCE_RB_HERE_DELIM, true)
-      # style_set_foreground(SCE_RB_HERE_Q, c_maroon)
-      # style_set_foreground(SCE_RB_HERE_QQ, c_maroon)
-      # style_set_foreground(SCE_RB_HERE_QX, c_maroon)
-      # style_set_foreground(SCE_RB_STRING_Q, c_maroon)
-      # style_set_foreground(SCE_RB_STRING_QQ, c_maroon)
-      # style_set_foreground(SCE_RB_STRING_QX, c_maroon)
-      # style_set_foreground(SCE_RB_STRING_QR, c_maroon)
-      # style_set_foreground(SCE_RB_STRING_QW, c_maroon)
+      if Wx::WXWIDGETS_VERSION >= '3.3.0'
+        style_set_foreground(SCE_RB_HERE_DELIM, Wx::Colour.new('Chocolate'))
+        style_set_bold(SCE_RB_HERE_DELIM, true)
+        style_set_foreground(SCE_RB_HERE_Q, c_str)
+        style_set_foreground(SCE_RB_HERE_QQ, c_str)
+        style_set_foreground(SCE_RB_HERE_QX, c_str)
+        style_set_foreground(SCE_RB_STRING_Q, c_str)
+        style_set_foreground(SCE_RB_STRING_QQ, c_str)
+        style_set_foreground(SCE_RB_STRING_QX, c_str)
+        style_set_foreground(SCE_RB_STRING_QR, c_str)
+        style_set_foreground(SCE_RB_STRING_QW, c_str)
+      end
       bg = Wx::Colour.new('CadetBlue')
       fg = Wx::Colour.new('Chocolate')
       set_fold_margin_colour(true, bg)
@@ -212,7 +215,7 @@ module WxRuby
         start_pos = current_pos
         end_pos = length-1
       else
-        start_pos = current_pos
+        start_pos = [0, current_pos - (@search_indicator ? @search_indicator.last : 0)].max
         end_pos = 0
       end
       pos, end_pos = find_text(start_pos, end_pos, txt, flags)

data/samples/sampler/txt_editor.rb

@@ -45,6 +45,24 @@ module WxRuby
       clear
     end
 
+    def get_line_count
+      number_of_lines
+    end
+    alias :line_count :get_line_count
+
+    def get_current_line
+      pos = insertion_point
+      _, line = position_to_xy(pos)
+      line
+    end
+    alias :current_line :get_current_line
+
+    def goto_line(line)
+      pos = xy_to_position(0, line)
+      self.show_position(pos)
+      self.insertion_point = pos
+    end
+
     def do_find(txt, forward, whole_word, match_case)
       options = (match_case ? 0 : Regexp::IGNORECASE)
       pattern = if whole_word
@@ -52,7 +70,12 @@ module WxRuby
                 else
                   ::Regexp.new(txt, options)
                 end
-      forward ? self.value.index(pattern, self.insertion_point) : self.value.rindex(pattern, self.insertion_point)
+      if forward
+        self.value.index(pattern, insertion_point)
+      else
+        start_pos = [0, insertion_point - (@search_indicator ? @search_indicator.last+1 : 0)].max
+        self.value.rindex(pattern, start_pos)
+      end
     end
 
     def indicator_clear_range(pos, len)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wxruby3
 version: !ruby/object:Gem::Version
-  version: 0.9.0.pre.beta.8
+  version: 0.9.0.pre.beta.9
 platform: x64-mingw-ucrt
 authors:
 - Martin Corino
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-27 00:00:00.000000000 Z
+date: 2023-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake