wxruby3 1.6.1 → 1.7.0

data/lib/wx/core/font/encoding.rb

@@ -0,0 +1,113 @@
+# --
+# This file is automatically generated by the WXRuby3 interface generator.
+# Do not alter this file.
+# --
+
+class Wx::Font
+  # String names of the constants provided by C++
+  # (extracted from enum defined in include/wx/fontenc.h)
+  ENCODING_NAMES = %w[
+    DEFAULT
+    ISO-8859-1
+    ISO-8859-2
+    ISO-8859-3
+    ISO-8859-4
+    ISO-8859-5
+    ISO-8859-6
+    ISO-8859-7
+    ISO-8859-8
+    ISO-8859-9
+    ISO-8859-10
+    ISO-8859-11
+    ISO-8859-12
+    ISO-8859-13
+    ISO-8859-14
+    ISO-8859-15
+    ISO-8859-MAX
+    KOI8
+    KOI8-U
+    ALTERNATIVE
+    BULGARIAN
+    CP437
+    CP850
+    CP852
+    CP855
+    CP866
+    CP874
+    CP932
+    CP936
+    CP949
+    CP950
+    CP1250
+    CP1251
+    CP1252
+    CP1253
+    CP1254
+    CP1255
+    CP1256
+    CP1257
+    CP1258
+    CP1361
+    CP12-MAX
+    UTF7
+    UTF8
+    EUC-JP
+    UTF16BE
+    UTF16LE
+    UTF32BE
+    UTF32LE
+    MACROMAN
+    MACJAPANESE
+    MACCHINESETRAD
+    MACKOREAN
+    MACARABIC
+    MACHEBREW
+    MACGREEK
+    MACCYRILLIC
+    MACDEVANAGARI
+    MACGURMUKHI
+    MACGUJARATI
+    MACORIYA
+    MACBENGALI
+    MACTAMIL
+    MACTELUGU
+    MACKANNADA
+    MACMALAJALAM
+    MACSINHALESE
+    MACBURMESE
+    MACKHMER
+    MACTHAI
+    MACLAOTIAN
+    MACGEORGIAN
+    MACARMENIAN
+    MACCHINESESIMP
+    MACTIBETAN
+    MACMONGOLIAN
+    MACETHIOPIC
+    MACCENTRALEUR
+    MACVIETNAMESE
+    MACARABICEXT
+    MACSYMBOL
+    MACDINGBATS
+    MACTURKISH
+    MACCROATIAN
+    MACICELANDIC
+    MACROMANIAN
+    MACCELTIC
+    MACGAELIC
+    MACKEYBOARD
+    ISO-2022-JP
+    MAX
+    MACMIN
+    MACMAX
+    UTF16
+    UTF32
+    UNICODE
+    GB2312
+    BIG5
+    SHIFT-JIS
+    EUC-KR
+    JOHAB
+    VIETNAMESE
+  ]
+end

data/lib/wx/core/generic_validator.rb

@@ -10,7 +10,7 @@ module Wx
 
     class << self
       def handlers
-        @handlers ||= ::Hash.new(Proc.new { |win, *rest| raise NotImplementedError, "#{win.class} not supported" })
+        @handlers ||= ::Hash.new
       end
 
       def define_handler(klass, meth=nil, &block)
@@ -30,15 +30,15 @@ module Wx
     end
 
     def initialize(*arg)
-      super
-      @value = arg.empty? ? nil : arg.first.value
+      (arg.empty? || arg.first.is_a?(GenericValidator)) ? super : super()
+      @value = (arg.empty? || arg.first.is_a?(GenericValidator)) ? nil : arg.first.value
       @handler = nil
       @klass = nil
     end
 
     attr_accessor :value
 
-    private
+    protected
 
     def do_transfer_from_window
       get_handler.call(get_window)
@@ -62,7 +62,9 @@ module Wx
         @handler
       else
         @klass = get_window.class
-        @handler = GenericValidator.handlers[@klass] || GenericValidator.handlers.each_key.detect { |k| k > klass }
+        # look for direct match or closest parent match (i.e. the handler registered for the most derived parent)
+        @handler = GenericValidator.handlers[@klass] ||
+                   GenericValidator.handlers.each.inject([]) { |hsel, hreg| hsel = hreg if hreg.first > @klass && (hsel.empty? || hsel.first > hreg.first); hsel }.last
         @handler || ::Kernel.raise(NotImplementedError, "#{@klass} not supported")
       end
     end
@@ -75,10 +77,11 @@ module Wx
   if Wx.has_feature?(:USE_CHECKBOX)
 
     GenericValidator.define_handler(Wx::CheckBox) do |win, *val|
-      if val.empty?
-        !!win.get_value
+      value = val.shift
+      if value.nil?
+        win.is3state ? win.get3state_value : !!win.get_value
       else
-        win.set_value(!!val.shift)
+        (win.is3state && value.is_a?(CheckBoxState)) ? win.set3state_value(value) : win.set_value(!!value)
       end
     end
 
@@ -86,10 +89,42 @@ module Wx
   if Wx.has_feature?(:USE_RADIOBTN)
 
     GenericValidator.define_handler(Wx::RadioButton) do |win, *val|
-      if val.empty?
-        !!win.get_value
+      value = val.shift
+      if value.nil?
+        if win.window_style.allbits?(Wx::RB_GROUP)
+          n = 0
+          while win
+            break if win.value
+            win = win.next_in_group
+            if win
+              n += 1
+            else
+              n = -1
+              $stderr.puts 'No selected radio button' # should never happen
+            end
+          end
+          n
+        else
+          !!win.get_value
+        end
       else
-        win.set_value(!!val.shift)
+        if !value.is_a?(Numeric) || win.window_style.allbits?(Wx::RB_SINGLE)
+          win.set_value(!!val.shift)
+        else
+          n = 0
+          while win
+            if n == value
+              win.set_value(true)
+              break
+            end
+            win = win.next_in_group
+            if win
+              n += 1
+            else
+              $stderr.puts 'Value out of range or not enough radio buttons' # should never happen
+            end
+          end
+        end
       end
     end
 
@@ -188,16 +223,21 @@ module Wx
 
     GenericValidator.define_handler(Wx::ComboBox) do |win, *val|
       if val.empty?
-        if (win.get_window_style & Wx::CB_READONLY) == Wx::CB_READONLY
+        if win.get_window_style.allbits?(Wx::CB_READONLY)
           win.get_selection
         else
           win.get_string_selection
         end
       else
-        if (win.get_window_style & Wx::CB_READONLY) == Wx::CB_READONLY
-          win.set_selection(val.shift)
+        value = val.shift
+        if value.is_a?(Numeric)
+          win.set_selection(value.to_i)
         else
-          win.set_string_selection(val.shift)
+          if win.set_string_selection(value.to_s)
+            unless win.get_window_style.allbits?(Wx::CB_READONLY)
+              win.set_value(value.to_s)
+            end
+          end
         end
       end
     end
@@ -257,7 +297,7 @@ module Wx
       if val.empty?
         win.get_value
       else
-        win.set_value(val.shift)
+        win.set_value(val.shift.to_s)
       end
     end
 
@@ -268,17 +308,18 @@ module Wx
 
     GenericValidator.define_handler(Wx::CheckListBox) do |win, *val|
       if val.empty?
-        if (win.get_window_style & Wx::LB_SINGLE) == Wx::LB_SINGLE
-          win.get_checked_items.first
-        else
+        if win.get_window_style.anybits?(Wx::LB_MULTIPLE|Wx::LB_EXTENDED)
           win.get_checked_items
+        else
+          win.get_checked_items.first
         end
       else
-        if (win.get_window_style & Wx::LB_SINGLE) == Wx::LB_SINGLE
-          win.check(val.shift, true)
+        if win.get_window_style.anybits?(Wx::LB_MULTIPLE|Wx::LB_EXTENDED)
+          # reset current selections
+          win.count.times { |n| win.check(n, false) }
+          [val].flatten.each { |i| win.check(i.to_i, true) }
         else
-          win.get_count.times { |i| win.check(i, false) }
-          [val].flatten.each { |i| win.check(i, true) }
+          win.check(val.shift.to_i, true)
         end
       end
     end
@@ -288,23 +329,34 @@ module Wx
 
     GenericValidator.define_handler(Wx::ListBox) do |win, *val|
       if val.empty?
-        # test this the hard since on WXOSX LB_SINGLE is default but does get set
+        # test this the hard way since on WXOSX LB_SINGLE is default but does get set
         # by default i.e. on WXOSX no selection type bit set == LB_SINGLE
-        if (win.get_window_style & (Wx::LB_MULTIPLE|Wx::LB_EXTENDED)) == 0
-          win.get_selection
-        else
+        if win.get_window_style.anybits?(Wx::LB_MULTIPLE|Wx::LB_EXTENDED)
           win.get_selections
+        else
+          win.get_selection
         end
       else
-        if (win.get_window_style & (Wx::LB_MULTIPLE|Wx::LB_EXTENDED)) == 0
-          win.set_selection(val.shift)
+        if win.get_window_style.anybits?(Wx::LB_MULTIPLE|Wx::LB_EXTENDED)
+          win.count.times { |i| win.deselect(i) }
+          [val].flatten.each { |i| win.set_selection(i.to_i) }
         else
-          win.get_count.times { |i| win.deselect(i) }
-          [val].flatten.each { |i| win.set_selection(i) }
+          win.set_selection(val.shift.to_i)
         end
       end
     end
 
+  end
+  if Wx.has_feature?(:USE_COLOURPICKERCTRL)
+
+    GenericValidator.define_handler(ColourPickerCtrl) do |win, *val|
+      if val.empty?
+        win.get_colour
+      else
+        win.set_colour(val.shift) if val.first.is_a?(Colour)
+      end
+    end
+
   end
 
   end # if USE_VALIDATORS

data/lib/wx/core/tipwindow.rb

@@ -0,0 +1,16 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+# 
+# Some parts are
+# Copyright 2004-2007, wxRuby development team
+# released under the MIT-like wxRuby2 license
+
+module Wx
+  class TipWindow
+
+    # import flattened Ref class
+    Ref = Wx::TipWindow_Ref
+
+  end
+end

data/lib/wx/doc/aui/auitabctrl.rb

@@ -0,0 +1,35 @@
+# :stopdoc:
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+# :startdoc:
+
+
+module Wx
+
+  module AUI
+
+    # Only used internally by Wx::AUI framework.
+    #
+    # Objects of this class are used by {Wx::AUI::AuiNotebook} to manage tabs. They can't be created by the application
+    # and shouldn't be used directly by it: all Wx::AUI::AuiTabCtrl values should be handled as opaque objects, i.e.
+    # they can be compared with other objects of the same type or passed to methods like {Wx::AUI::AuiNotebook#get_pages_in_display_order}
+    # but nothing otherwise.
+    class AuiTabCtrl
+
+      # Returns true if the AuiTabCtrl references a valid tab control, otherwise false.
+      # @return [Boolean]
+      def is_ok; end
+      alias ok? :is_ok
+
+      # Returns true if 'other' is a Wx::AUI::AuiTabCtrl that refers to the same tab control as this object.
+      # @param [Object] other
+      # @return [Boolean]
+      def ==(other) end
+      alias :eql? :==
+
+    end
+
+  end
+
+end

data/lib/wx/doc/config.rb

@@ -200,7 +200,7 @@ module Wx
     # Determine whether we wish to expand environment variables in string values.
     # @param [Boolean] flag enables expanding environment variables if true, disables otherwise
     def set_expand_env_vars(flag) end
-    alias :expand_env_vars :set_expand_env_vars
+    alias :expand_env_vars= :set_expand_env_vars
 
   end
 
@@ -249,7 +249,7 @@ module Wx
     # Determine whether we wish to expand environment variables in string values.
     # @param [Boolean] flag enables expanding environment variables if true, disables otherwise
     def set_expand_env_vars(flag) end
-    alias :expand_env_vars :set_expand_env_vars
+    alias :expand_env_vars= :set_expand_env_vars
 
   end
 

data/lib/wx/doc/functions.rb

@@ -118,7 +118,7 @@ module Wx
   # @return [Integer] Wx Id
   def self.xrcid(str) end
 
-  def self.begin_busy_cursor(cursor) end
+  def self.begin_busy_cursor(cursor_or_cursor_bundle) end
   def self.end_busy_cursor; end
   def self.bell; end
   def self.safe_yield(win = nil, only_if_needed = false) end