wxruby3 0.9.0.pre.rc.1 → 0.9.0.pre.rc.3

data/rakelib/lib/director/event_loop.rb

@@ -0,0 +1,26 @@
+###
+# wxRuby3 wxWidgets interface director
+# Copyright (c) M.J.N. Corino, The Netherlands
+###
+
+module WXRuby3
+
+  class Director
+
+    class GUIEventLoop < Director
+
+      def setup
+        super
+        spec.items << 'wxEventLoopBase'
+        spec.gc_as_untracked
+        spec.disable_proxies
+        spec.make_concrete 'wxGUIEventLoop'
+        spec.fold_bases 'wxGUIEventLoop' => 'wxEventLoopBase'
+        spec.ignore 'wxEventLoopBase::GetActive',
+                    'wxEventLoopBase::SetActive'
+      end
+    end # class GUIEventLoop
+
+  end # class Director
+
+end # module WXRuby3

data/rakelib/lib/director/font.rb

@@ -24,9 +24,7 @@ module WXRuby3
                          'wxFont::GetDefaultEncoding',
                          'wxFont::SetDefaultEncoding'
         spec.rename_for_ruby 'create' => 'wxFont::New'
-        spec.ignore %w[
-          wxFont::SetNativeFontInfo wxFont::GetNativeFontInfo wxFont::operator!=
-          ]
+        spec.ignore [ 'wxFont::SetNativeFontInfo(const wxNativeFontInfo &)', 'wxFont::GetNativeFontInfo', 'wxFont::operator!=' ]
         spec.ignore 'wxFont::wxFont(const wxNativeFontInfo &)'
         if Config.instance.wx_port == :wxQT
           # not implemented
@@ -87,6 +85,17 @@ module WXRuby3
             return SWIG_NewPointerObj(new wxFont(font), SWIGTYPE_p_wxFont, SWIG_POINTER_OWN);
           }
           __HEREDOC
+        # implement wxTheFontList methods as static methods of Wx::Font
+        spec.add_extend_code 'wxFont', <<~__HEREDOC
+          static wxFont * find_or_create_font(int point_size, wxFontFamily family, wxFontStyle style, wxFontWeight weight, bool underline=false, const wxString &facename=wxEmptyString, wxFontEncoding encoding=wxFONTENCODING_DEFAULT)
+          {
+            return wxTheFontList->FindOrCreateFont(point_size, family, style, weight, underline, facename, encoding);
+          }
+          static wxFont *	find_or_create_font(const wxFontInfo &fontInfo)
+          {
+            return wxTheFontList->FindOrCreateFont(fontInfo);
+          }
+          __HEREDOC
         spec.do_not_generate :functions
       end
 

data/rakelib/lib/director/functions.rb

@@ -30,93 +30,89 @@ module WXRuby3
           // sprintf in ruby, then pass the composed message directly to the
           // log. This also avoids format string attacks.
           
+          static WxRuby_ID __filename_id("filename");
+          static WxRuby_ID __line_id("line");
+          static WxRuby_ID __func_id("func");
+          static WxRuby_ID __comp_id("component");
+
+          static const char* __wxruby_component = "wxapp";
+
+          // As the wxw logger will only make synchronous use of the filename, func and component pointers while
+          // processing the log entry and never store them we simply gather pointers but no copies 
+          static void do_log(wxLogLevel lvl, int argc, VALUE *argv, ...)
+          {
+            const char* filename = nullptr;
+            int line = 0;
+            const char* func = nullptr;
+            const char* component = __wxruby_component;
+
+            if (argc>1 && TYPE(argv[argc-1]) == T_HASH)
+            {
+              VALUE rb_hash = argv[--argc];
+              VALUE rb_fnm  = rb_hash_aref(rb_hash, ID2SYM(__filename_id.get_id()));
+              if (!NIL_P(rb_fnm) && TYPE(rb_fnm) == T_STRING) filename = StringValuePtr(rb_fnm);
+              VALUE rb_ln   = rb_hash_aref(rb_hash, ID2SYM(__line_id.get_id()));
+              if (!NIL_P(rb_ln) && TYPE(rb_ln) == T_FIXNUM) line = NUM2INT(rb_ln);
+              VALUE rb_func = rb_hash_aref(rb_hash, ID2SYM(__func_id.get_id()));
+              if (!NIL_P(rb_func) && TYPE(rb_func) == T_STRING) func = StringValuePtr(rb_func);
+              VALUE rb_comp = rb_hash_aref(rb_hash, ID2SYM(__comp_id.get_id()));
+              if (!NIL_P(rb_comp) && TYPE(rb_comp) == T_STRING) component = StringValuePtr(rb_comp);
+            }
+
+            VALUE log_msg = argc==1 ? argv[0] : rb_f_sprintf(argc, argv);
+            va_list list;
+            va_start(list, argv); // just a dummy to satisfy wxLogger::LogV 
+            wxLogger(lvl, filename, line, func, component).LogV(RSTR_TO_WXSTR(log_msg), list);
+          }
+
           // Log a Wx message with the given level to the current Wx log output
           static VALUE log_generic(int argc, VALUE *argv, VALUE self)
           {
-            if ( wxLog::IsEnabled() )
-              {
-                wxLogLevel lvl = static_cast<wxLogLevel> (NUM2INT(argv[0]));
-                VALUE log_msg = argc==2 ? argv[1] : rb_f_sprintf(argc-1, &argv[1]);
-                wxLog::OnLog( lvl,
-                              wxString(StringValuePtr(log_msg), wxConvUTF8),
-                              time(NULL) );
-              }
+            wxLogLevel lvl = static_cast<wxLogLevel> (NUM2INT(argv[0]));
+            do_log(lvl, argc-1, &argv[1]);
             return Qnil;
           }
           
           // Log a Wx low prio Message to the current Wx log output
           static VALUE log_info(int argc, VALUE *argv, VALUE self)
           {
-            if ( wxLog::IsEnabled() )
-              {
-                VALUE log_msg = argc==1 ? argv[0] : rb_f_sprintf(argc, argv);
-                wxLog::OnLog( wxLOG_Info,
-                              wxString(StringValuePtr(log_msg), wxConvUTF8),
-                              time(NULL) );
-              }
+            do_log(wxLOG_Info, argc, argv);
             return Qnil;
           }
           
           // Log a Wx verbose Message to the current Wx log output
           static VALUE log_verbose(int argc, VALUE *argv, VALUE self)
           {
-            if ( wxLog::IsEnabled() && wxLog::GetVerbose () )
-              {
-                VALUE log_msg = argc==1 ? argv[0] : rb_f_sprintf(argc, argv);
-                wxLog::OnLog( wxLOG_Info,
-                              wxString(StringValuePtr(log_msg), wxConvUTF8),
-                              time(NULL) );
-              }
+            if (wxLog::GetVerbose ())
+              do_log(wxLOG_Info, argc, argv);
             return Qnil;
           }
           
           // Log a Wx Message to the current Wx log output
           static VALUE log_message(int argc, VALUE *argv, VALUE self)
           {
-            if ( wxLog::IsEnabled() )
-              {
-                VALUE log_msg = argc==1 ? argv[0] : rb_f_sprintf(argc, argv);
-                wxLog::OnLog( wxLOG_Message,
-                              wxString(StringValuePtr(log_msg), wxConvUTF8),
-                              time(NULL) );
-              }
+            do_log(wxLOG_Message, argc, argv);
             return Qnil;
           }
           
           // Log a Wx Warning message to the current Wx log output
           static VALUE log_warning(int argc, VALUE *argv, VALUE self)
           {
-            if ( wxLog::IsEnabled() )
-              {
-                VALUE log_msg = argc==1 ? argv[0] : rb_f_sprintf(argc, argv);
-                wxLog::OnLog( wxLOG_Warning,
-                              wxString(StringValuePtr(log_msg), wxConvUTF8),
-                              time(NULL) );
-              }
+            do_log(wxLOG_Warning, argc, argv);
             return Qnil;
           }
           
           // Log an error message to the current output
           static VALUE log_error(int argc, VALUE *argv, VALUE self)
           {
-            if ( wxLog::IsEnabled() )
-              {
-                VALUE log_msg = argc==1 ? argv[0] : rb_f_sprintf(argc, argv);
-                wxLog::OnLog( wxLOG_Error,
-                              wxString(StringValuePtr(log_msg), wxConvUTF8),
-                              time(NULL) );
-              }
+            do_log(wxLOG_Error, argc, argv);
             return Qnil;
           }
 
           // Log a debug message
           static VALUE log_debug(int argc, VALUE *argv, VALUE self)
           {
-            if (wxLog::IsLevelEnabled(wxLOG_Debug, wxASCII_STR(wxLOG_COMPONENT)))
-            {
-                VALUE log_msg = argc==1 ? argv[0] : rb_f_sprintf(argc, argv);
-                wxLogDebug(wxString(StringValuePtr(log_msg), wxConvUTF8));
-            }
+            do_log(wxLOG_Debug, argc, argv);
             return Qnil;
           }
           

data/rakelib/lib/director/help_provider.rb

@@ -27,7 +27,7 @@ module WXRuby3
           public:
             // This is pure virtual in base Wx class, so won't compile unless an
             // implementation is provided
-            wxString GetHelp(const wxWindowBase* window)
+            wxString GetHelp(const wxWindowBase* window) override
             {
               static WxRuby_ID get_help_id("get_help");
 
@@ -50,7 +50,7 @@ module WXRuby3
             // RemoveHelp is called by Wx after the window deletion event has been
             // handled. A standard director here re-wraps the already destroyed
             // object, which will cause rapid segfaults when it is later marked.
-            void RemoveHelp(wxWindowBase* window) 
+            void RemoveHelp(wxWindowBase* window) override
             {
               static WxRuby_ID remove_help_id("remove_help");
 
@@ -64,13 +64,8 @@ module WXRuby3
           };
           __HEREDOC
         spec.add_swig_code <<~__HEREDOC
+          GC_MANAGE_AS_OBJECT(wxRubyHelpProvider);
           typedef wxWindow wxWindowBase;
-
-          %ignore wxHelpProvider::GetHelp; // Must be supplied in Ruby
-          
-          // Need to avoid standard director as it will call with destroyed
-          // objects
-          %feature("nodirector") wxHelpProvider::RemoveHelp;
           __HEREDOC
         spec.map 'wxWindowBase' => 'Wx::Window', swig: false do
           map_in
@@ -88,8 +83,11 @@ module WXRuby3
             static wxRubyHelpProvider* Get();
             virtual void AddHelp(wxWindowBase* window, const wxString&  text);
             virtual void AddHelp(wxWindowID id, const wxString& text);
-            virtual wxString GetHelp(const wxWindowBase* window);
-            virtual void RemoveHelp(wxWindowBase* window);
+            // we do not include the declaration of GetHelp here because 
+            // we do not want a default implementation or director as we have
+            // a fixed director implementation above and the rest is pure Ruby
+            // virtual wxString GetHelp(const wxWindowBase* window);
+            void RemoveHelp(wxWindowBase* window); // no virtual as we have fixed director impl above
             virtual bool ShowHelp(wxWindowBase* window);
             virtual bool ShowHelpAtPoint(wxWindowBase* window, const wxPoint point, 
                                          wxHelpEvent::Origin origin);

data/rakelib/lib/director/hyperlink_event.rb

@@ -0,0 +1,22 @@
+###
+# wxRuby3 wxWidgets interface director
+# Copyright (c) M.J.N. Corino, The Netherlands
+###
+
+require_relative './event'
+
+module WXRuby3
+
+  class Director
+
+    class HyperlinkEvent < Event
+
+      def setup
+        super
+        spec.do_not_generate :variables, :enums, :defines, :functions # with HyperlinkCtrl
+      end
+    end # class HyperlinkEvent
+
+  end # class Director
+
+end # module WXRuby3

data/rakelib/lib/director/image.rb

@@ -77,6 +77,19 @@ module WXRuby3
             return ext_ary;
           }
 
+          static VALUE mime_types()
+          {
+            VALUE ext_ary = rb_ary_new();
+            wxList& hnd_lst = wxImage::GetHandlers();
+            for (wxList::compatibility_iterator node = hnd_lst.GetFirst();
+                    node; node = node->GetNext())
+            {
+              wxImageHandler *handler = (wxImageHandler *) node->GetData();
+              rb_ary_push(ext_ary, WXSTR_TO_RSTR(handler->GetMimeType()));
+            }
+            return ext_ary;
+          }
+
           static VALUE handler_extensions()
           {
             VALUE ext_hash = rb_hash_new();
@@ -157,6 +170,25 @@ module WXRuby3
             return rb_str_new( (const char*)rgb_data, length);
           }
           __HEREDOC
+        # ignore this so we do not have to wrap wxImageHistogram
+        spec.ignore 'wxImage::ComputeHistogram'
+        # add custom method simply returning Hash; finish off in pure Ruby
+        spec.add_extend_code 'wxImage', <<~__HEREDOC
+          VALUE compute_histogram()
+          {
+            VALUE rb_img_hist = rb_hash_new();
+            wxImageHistogram img_hist;
+            $self->ComputeHistogram(img_hist);
+            for (auto pair : img_hist)
+            {
+              VALUE rb_hist_entry = rb_ary_new();
+              rb_ary_push(rb_hist_entry, ULL2NUM(pair.second.index));
+              rb_ary_push(rb_hist_entry, ULL2NUM(pair.second.value));
+              rb_hash_aset(rb_img_hist, ULL2NUM(pair.first), rb_hist_entry);
+            }
+            return rb_img_hist;
+          }
+          __HEREDOC
         spec.do_not_generate(:functions)
       end
     end # class Image

data/rakelib/lib/director/list_ctrl.rb

@@ -100,6 +100,7 @@ module WXRuby3
             VALUE items = rb_ary_new();
             rb_ary_push(items, (VALUE)item1);
             rb_ary_push(items, (VALUE)item2);
+            rb_ary_push(items, (VALUE)data);
             VALUE the_order = rb_yield(items);
             return NUM2INT(the_order);
           }
@@ -183,9 +184,9 @@ module WXRuby3
             return Qnil;
           }	
           
-          void sort_items()
+          void sort_items(VALUE data = Qnil)
           {
-            self->SortItems(wxListCtrl_SortByYielding, 0);
+            $self->SortItems(wxListCtrl_SortByYielding, static_cast<wxIntPtr> (data));
           }
           __HEREDOC
         super

data/rakelib/lib/director/log.rb

@@ -10,19 +10,79 @@ module WXRuby3
     class Log < Director
 
       def setup
-        spec.gc_as_object
-        spec.items.concat(%w[wxLogBuffer wxLogChain wxLogGui wxLogStderr wxLogStream wxLogTextCtrl wxLogInterposer wxLogInterposerTemp wxLogWindow])
-        spec.no_proxy(%w[wxLogBuffer wxLogChain wxLogGui wxLogStderr wxLogTextCtrl wxLogInterposer wxLogInterposerTemp wxLogWindow])
+        spec.gc_as_object %w[wxLog wxLogChain wxLogInterposer wxLogInterposerTemp]
+        spec.items.concat(%w[wxLogBuffer wxLogChain wxLogGui wxLogStderr wxLogStream wxLogTextCtrl wxLogInterposer wxLogInterposerTemp wxLogWindow wxLogNull wxLogRecordInfo])
+        spec.no_proxy(%w[wxLogBuffer wxLogGui wxLogStderr wxLogTextCtrl wxLogWindow])
+        spec.force_proxy(%w[wxLogInterposer wxLogInterposerTemp])
+        spec.regard %w[wxLog::DoLogRecord wxLog::DoLogTextAtLevel wxLog::DoLogText]
         spec.ignore 'wxLogBuffer::Flush'
         spec.ignore 'wxLogGui::Flush'
         if Config.instance.features_set?(%w[wxUSE_STD_IOSTREAM])
           spec.ignore 'wxLogStream'
         end
+        # wxLogStderr
+        spec.ignore 'wxLogStderr::wxLogStderr'
+        spec.add_extend_code 'wxLogStderr', <<~__HEREDOC
+          wxLogStderr(int fh=2)
+          {
+            if (fh == 2)
+            { return new wxLogStderr(); }
+            else if (fh == 1)
+            { return new wxLogStderr(stdout); }
+            rb_raise(rb_eArgError, "Expected 1 (for stdout) or 2 (for stderr).");
+          }
+          __HEREDOC
+        # for wxLogChain
+        spec.disown 'wxLog *logger'
+        spec.ignore 'wxLogChain::DetachOldLog' # too much potential trouble
+        # add override decl missing from xml specs
+        spec.extend_interface 'wxLogChain',
+                              'virtual void DoLogRecord(wxLogLevel level, const wxString& msg, const wxLogRecordInfo& info) override',
+                              visibility: 'protected'
+        # wxLogChain and derivatives need to be allocated disowned because new instances of these classes
+        # are installed as ActiveTarget on construction and so wxWidgets has ownership
+        spec.allocate_disowned 'wxLogChain'
+        spec.allocate_disowned 'wxLogInterposer'
+        spec.allocate_disowned 'wxLogInterposerTemp'
+        spec.allocate_disowned 'wxLogWindow'
+        # for ActiveTarget methods
         spec.ignore 'wxLog::SetThreadActiveTarget'
         spec.disown 'wxLog *logtarget'
+        spec.new_object 'wxLog::SetActiveTarget'
         spec.do_not_generate(:functions)
         spec.make_concrete('wxLog')
-        spec.extend_interface('wxLog', '  virtual ~wxLog ();')
+        spec.extend_interface('wxLog', 'virtual ~wxLog ()')
+        spec.gc_as_untracked 'wxLogRecordInfo'
+        spec.add_extend_code 'wxLogRecordInfo', <<~__HEREDOC
+          VALUE filename()
+          {
+            return $self->filename ? WXSTR_TO_RSTR(wxString($self->filename)) : Qnil;
+          }
+          VALUE line()
+          {
+            return INT2NUM($self->line);
+          }
+          VALUE func()
+          {
+            return $self->func ? WXSTR_TO_RSTR(wxString($self->func)) : Qnil;
+          }
+          VALUE component()
+          {
+            return $self->component ? WXSTR_TO_RSTR(wxString($self->component)) : Qnil;
+          }
+          __HEREDOC
+        spec.make_abstract 'wxLogNull'
+        spec.ignore 'wxLogNull::wxLogNull'
+        spec.add_extend_code 'wxLogNull', <<~__HEREDOC__
+          static void no_log()
+          {
+            if (rb_block_given_p ())
+            {
+              wxLogNull noLog;
+              rb_yield(Qnil);
+            }
+          }
+          __HEREDOC__
         super
       end
     end # class Log

data/rakelib/lib/director/menu.rb

@@ -30,9 +30,6 @@ module WXRuby3
         __HEREDOC
         # make Ruby director and wrappers use custom implementation
         spec.use_class_implementation('wxMenu', 'wxRubyMenu')
-        spec.rename_for_ruby(
-          'AppendItem' =>
-            'wxMenu::Append(wxMenuItem *item)')
         # ignore non-const version as that has no benefits in Ruby
         spec.ignore 'wxMenu::GetMenuItems()'
         # Fix for GetMenuItems - converts list of MenuItems to Array

data/rakelib/lib/director/menu_bar.rb

@@ -19,6 +19,9 @@ module WXRuby3
                 'wxMenuBar::GetLabelTop',
                 'wxMenuBar::SetLabelTop',
                 'wxMenuBar::Refresh')
+        unless Config.instance.wx_version >= '3.3' || Config.instance.wx_abi_version > '3.0.0'
+          spec.ignore 'wxMenuBar::OSXGetAppleMenu'
+        end
         super
       end
     end # class MenuBar

data/rakelib/lib/director/pen.rb

@@ -166,7 +166,16 @@ module WXRuby3
         # these are defined and loaded in RubyStockObjects.i
         spec.ignore %w[
           wxRED_PEN wxBLUE_PEN wxCYAN_PEN wxGREEN_PEN wxYELLOW_PEN wxBLACK_PEN wxWHITE_PEN
-          wxTRANSPARENT_PEN wxBLACK_DASHED_PEN wxGREY_PEN wxMEDIUM_GREY_PEN wxLIGHT_GREY_PEN wxThePenList]
+          wxTRANSPARENT_PEN wxBLACK_DASHED_PEN wxGREY_PEN wxMEDIUM_GREY_PEN wxLIGHT_GREY_PEN]
+        # do not expose this
+        spec.ignore 'wxThePenList'
+        # provide it's functionality as a class method of Pen instead
+        spec.add_extend_code 'wxPen', <<~__HEREDOC
+          static wxPen* find_or_create_pen(const wxColour &colour, int width=1, wxPenStyle style=wxPENSTYLE_SOLID)
+          {
+            return wxThePenList->FindOrCreatePen(colour, width, style);
+          }
+          __HEREDOC
       end
     end # class Pen
 

data/rakelib/lib/director/popup_window.rb

@@ -14,6 +14,24 @@ module WXRuby3
       def setup
         spec.items << 'wxPopupTransientWindow'
         super
+        spec.items.each do |itm|
+          spec.no_proxy("#{itm}::ClearBackground",
+                        "#{itm}::Enable",
+                        "#{itm}::GetHelpTextAtPoint",
+                        "#{itm}::GetMaxSize",
+                        "#{itm}::GetMinSize",
+                        "#{itm}::Refresh",
+                        "#{itm}::Update")
+        end
+        # add these to the generated interface to be parsed by SWIG
+        # the wxWidgets docs are flawed in this respect that several reimplemented
+        # virtual methods are not documented at the reimplementing class as such
+        # that would cause them missing from the interface which would cause a problem
+        # for a SWIG director redirecting to the Ruby class as the SWIG wrappers
+        # redirect explicitly to the implementation at the same class level as the wrapper
+        # for upcalls
+        spec.extend_interface('wxPopupWindow',
+                              'virtual bool Show(bool show = true) override')
       end
 
     end # class PopupWindow

data/rakelib/lib/director/radio_box.rb

@@ -14,22 +14,33 @@ module WXRuby3
         spec.items << 'wxItemContainerImmutable'
         spec.fold_bases('wxRadioBox' => 'wxItemContainerImmutable')
         spec.override_inheritance_chain('wxRadioBox', %w[wxControl wxWindow wxEvtHandler wxObject])
-        # ignore overload hiding common Window method
-        spec.ignore('wxRadioBox::Enable')
+        # ignore overloads hiding common Window method
+        spec.ignore('wxRadioBox::Enable', 'wxRadioBox::Show')
         spec.add_extend_code 'wxRadioBox', <<~__HEREDOC
-        // add custom method to reach common Window method
+        // add custom method to reach common Window method overload
         bool EnableWindow(bool enable=true)
         {
-          return $self->wxWindow::Enable(enable);
+          return $self->Enable(enable);
         }
         // add right method to enable/disable items
         bool EnableItem(unsigned int n, bool enable=true)
         {
           return $self->Enable(n, enable);
         }
+        // add custom method to reach common Window method overload
+        bool ShowWindow(bool show=true)
+        {
+          return $self->Show(show);
+        }
+        // add right method to show/hide items
+        bool ShowItem(unsigned int n, bool show=true)
+        {
+          return $self->Show(n, show);
+        }
         __HEREDOC
         # rename common method
         spec.rename_for_ruby('Enable' => 'wxRadioBox::EnableWindow')
+        spec.rename_for_ruby('Show' => 'wxRadioBox::ShowWindow')
         super
       end
     end # class Window

data/rakelib/lib/director/searchctrl.rb

@@ -14,7 +14,8 @@ module WXRuby3
       def setup
         super
         # mixin TextEntry
-        spec.include_mixin 'wxSearchCtrl', 'Wx::TextEntry'
+        spec.include_mixin 'wxSearchCtrl', { 'Wx::TextEntry' => 'wxTextEntryBase' }
+        spec.suppress_warning(473, 'wxSearchCtrl::GetMenu')
         spec.override_inheritance_chain('wxSearchCtrl', %w[wxControl wxWindow wxEvtHandler wxObject])
       end
     end # class SearchCtrl

data/rakelib/lib/director/static_box.rb

@@ -13,7 +13,7 @@ module WXRuby3
 
       def setup
         super
-        if Config.instance.wx_port == :wxQT
+        if Config.instance.wx_port == :wxQT || Config.platform == :macosx
           # missing from implementation currently
           spec.ignore 'wxStaticBox::wxStaticBox(wxWindow *, wxWindowID, wxWindow *, const wxPoint &, const wxSize &, long, const wxString &)',
                       'wxStaticBox::Create(wxWindow *, wxWindowID, wxWindow *, const wxPoint &, const wxSize &, long, const wxString &)'

data/rakelib/lib/director/styled_text_ctrl.rb

@@ -15,7 +15,7 @@ module WXRuby3
         super
         spec.override_inheritance_chain('wxStyledTextCtrl', %w[wxControl wxWindow wxEvtHandler wxObject])
         # mixin TextEntry
-        spec.include_mixin 'wxStyledTextCtrl', 'Wx::TextEntry'
+        spec.include_mixin 'wxStyledTextCtrl', { 'Wx::TextEntry' => 'wxTextEntryBase' }
         spec.map 'int *', 'long *', as: 'Integer' do
           map_in ignore: true, temp: '$*1_ltype a', code: '$1 = &a;'
           map_argout code: <<~__CODE

data/rakelib/lib/director/text_entry.rb

@@ -16,8 +16,38 @@ module WXRuby3
         spec.gc_as_untracked 'wxTextEntry' # actually no GC control necessary as this is a mixin only
         # turn wxTextEntry into a mixin module
         spec.make_mixin 'wxTextEntry'
+        # !!NOTE!!
+        # This is not very nice but it is the easiest way to work around the problem that
+        # what we actually want as native type is wxTextEntryBase (because of some bad implementation decisions in wxw)
+        # and what is documented is wxTextEntry.
+        spec.add_header_code '#define wxTextEntry wxTextEntryBase'
         spec.disown 'wxTextCompleter *completer' # managed by wxWidgets after passing in
         spec.map_apply 'long * OUTPUT' => 'long *' # for GetSelection
+        # for wxTextCompleterSimple::GetCompletions
+        spec.map 'wxArrayString &res' => 'Array<String>' do
+
+          map_in ignore: true, temp: 'wxArrayString tmp', code: '$1 = &tmp;'
+
+          map_argout code: <<~__CODE
+            $result = rb_ary_new();
+            for (size_t i = 0; i < $1->GetCount(); i++)
+            {
+              rb_ary_push($result,WXSTR_TO_RSTR( $1->Item(i) ) );
+            }
+          __CODE
+
+          map_directorargout code: <<~__CODE
+            if (result != Qnil && TYPE(result) == T_ARRAY)
+            {
+              for (int i = 0, n = RARRAY_LEN(result); i < n ;i++)
+              {
+                VALUE rb_comp = rb_ary_entry(result, i);
+                wxString comp = RSTR_TO_WXSTR(rb_comp);
+                $1.Add(comp);
+              }
+            }
+          __CODE
+        end
       end
     end # class TextEntry
 

data/rakelib/lib/director/text_validator.rb

@@ -20,8 +20,8 @@ module WXRuby3
           public:
             WXRubyTextValidator(const wxTextValidator& v) 
               : wxTextValidator(v) {}
-            WXRubyTextValidator(long style=wxFILTER_NONE, wxString *valPtr=NULL) 
-              : wxTextValidator(style, valPtr) {}
+            WXRubyTextValidator(long style=wxFILTER_NONE) 
+              : wxTextValidator(style) {}
             virtual ~WXRubyTextValidator() 
             {
               wxRuby_ReleaseEvtHandlerProcs(this);
@@ -29,6 +29,12 @@ module WXRuby3
           };
         __HEREDOC
         spec.use_class_implementation 'wxTextValidator', 'WXRubyTextValidator'
+        # ignore copy ctor doc
+        spec.regard 'wxTextValidator::wxTextValidator(const wxTextValidator&)', regard_doc: false
+        # ignore this ctor
+        spec.ignore 'wxTextValidator::wxTextValidator(long, wxString*)'
+        # add alternative
+        spec.extend_interface 'wxTextValidator', 'wxTextValidator(long style=wxFILTER_NONE)'
         spec.no_proxy 'wxTextValidator::Clone'
         spec.new_object 'wxTextValidator::Clone'
         # handle clone mapping

data/rakelib/lib/director/textctrl.rb

@@ -14,7 +14,7 @@ module WXRuby3
       def setup
         super
         # mixin TextEntry
-        spec.include_mixin 'wxTextCtrl', 'Wx::TextEntry'
+        spec.include_mixin 'wxTextCtrl', { 'Wx::TextEntry' => 'wxTextEntryBase' }
         spec.override_inheritance_chain('wxTextCtrl', %w[wxControl wxWindow wxEvtHandler wxObject])
         spec.ignore 'wxTextCtrl::HitTest(const wxPoint &,long *)'
         if Config.instance.wx_port == :wxQT