wxruby3 0.9.0.pre.beta.8

data/rakelib/lib/director/colour.rb

@@ -0,0 +1,64 @@
+###
+# wxRuby3 wxWidgets interface director
+# Copyright (c) M.J.N. Corino, The Netherlands
+###
+
+module WXRuby3
+
+  class Director
+
+    class Colour < Director
+
+      def setup
+        spec.require_app 'wxColour::wxColour(const wxColour&)'
+        spec.ignore(%w[
+          wxColour::GetPixel wxTransparentColour wxColour::operator!=
+          wxBLACK wxBLUE wxCYAN wxGREEN wxYELLOW wxLIGHT_GREY wxRED wxWHITE
+          ])
+        # rename static method to prevent masking the instance method
+        spec.rename_for_ruby 'create_disabled' => 'wxColour::MakeDisabled(unsigned char *r, unsigned char *g, unsigned char *b, unsigned char brightness=255)',
+                             # for consistency
+                             'create_mono' => 'wxColour::MakeMono',
+                             'create_grey' => 'wxColour::MakeGrey'
+        spec.add_wrapper_code <<~__HEREDOC
+          WXRUBY_EXPORT bool wxRuby_IsRubyColour(VALUE rbcol)
+          {
+            swig_class *sklass = (swig_class *) SWIGTYPE_p_wxColour->clientdata;
+            return (TYPE(rbcol) == T_STRING || 
+                    TYPE(rbcol) == T_SYMBOL || 
+                    (TYPE(rbcol) == T_DATA && rb_obj_is_kind_of(rbcol, sklass->klass)));
+          }
+          WXRUBY_EXPORT wxColour wxRuby_ColourFromRuby(VALUE rbcol)
+          {
+            if (TYPE(rbcol) == T_STRING || TYPE(rbcol) == T_SYMBOL)
+            {
+              wxString colstr;
+              if (TYPE(rbcol) == T_STRING)
+              { colstr = RSTR_TO_WXSTR(rbcol); }
+              else
+              { colstr = rb_id2name(SYM2ID(rbcol)); }
+              return wxColour(colstr);
+            }
+            else if (TYPE(rbcol) == T_DATA)
+            {
+              void *colp;
+              int res = SWIG_ConvertPtr(rbcol, &colp, SWIGTYPE_p_wxColour, 0);
+              if (SWIG_IsOK(res) && colp) 
+              {
+                return *reinterpret_cast<wxColour *>(colp);
+              }
+            }
+            return wxColour();
+          }
+          WXRUBY_EXPORT VALUE wxRuby_ColourToRuby(const wxColour& col)
+          {
+            return SWIG_NewPointerObj(new wxColour(col), SWIGTYPE_p_wxColour, SWIG_POINTER_OWN);
+          }
+          __HEREDOC
+        super
+      end
+    end # class Colour
+
+  end # class Director
+
+end # module WXRuby3

data/rakelib/lib/director/colour_picker_ctrl.rb

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

data/rakelib/lib/director/combobox.rb

@@ -0,0 +1,37 @@
+###
+# wxRuby3 wxWidgets interface director
+# Copyright (c) M.J.N. Corino, The Netherlands
+###
+
+require_relative './ctrl_with_items'
+
+module WXRuby3
+
+  class Director
+
+    class ComboBox < ControlWithItems
+
+      def setup
+        super
+        setup_ctrl_with_items('wxComboBox')
+        # mixin TextEntry
+        spec.include_mixin 'wxComboBox', 'Wx::TextEntry'
+        spec.override_inheritance_chain('wxComboBox',
+                                        %w[wxControlWithItems
+                                           wxControl
+                                           wxWindow
+                                           wxEvtHandler
+                                           wxObject])
+        spec.ignore(%w[
+          wxComboBox::IsEmpty])
+        spec.rename_for_ruby(
+          'SetTextSelectionRange' => 'wxComboBox::SetSelection(long, long)',
+          'GetTextSelectionRange' => 'wxComboBox::GetSelection(long *, long *) const')
+        spec.map_apply 'long * OUTPUT' => [ 'long *from', 'long *to' ]
+      end
+
+    end # class ComboBox
+
+  end # class Director
+
+end # module WXRuby3

data/rakelib/lib/director/control.rb

@@ -0,0 +1,22 @@
+###
+# wxRuby3 wxWidgets interface director
+# Copyright (c) M.J.N. Corino, The Netherlands
+###
+
+require_relative './window'
+
+module WXRuby3
+
+  class Director
+
+    class Control < Window
+
+      def setup
+        super
+        spec.ignore 'wxControl::GetLabelText(const wxString &)'
+      end
+    end # class Control
+
+  end # class Director
+
+end # module WXRuby3

data/rakelib/lib/director/ctrl_with_items.rb

@@ -0,0 +1,68 @@
+###
+# wxRuby3 wxWidgets interface director
+# Copyright (c) M.J.N. Corino, The Netherlands
+###
+
+require_relative './window'
+
+module WXRuby3
+
+  class Director
+
+    class ControlWithItems < Window
+
+      def setup
+        super
+        if spec.module_name == 'wxControlWithItems'
+          spec.items.replace %w[wxControlWithItems wxItemContainer wxItemContainerImmutable]
+          spec.fold_bases('wxControlWithItems' => %w[wxItemContainer wxItemContainerImmutable])
+          spec.override_inheritance_chain('wxControlWithItems',
+                                          %w[wxControl
+                                             wxWindow
+                                             wxEvtHandler
+                                             wxObject])
+          spec.ignore([
+            'wxItemContainer::Insert(const std::vector< wxString > &)',
+            'wxItemContainer::GetClientObject',
+            'wxItemContainer::SetClientObject'])
+          spec.ignore(%w[wxItemContainer::GetClientData wxItemContainer::SetClientData], ignore_doc: false) # keep docs
+          # Replace the old Wx definitions of these methods - which segfault
+          spec.add_extend_code('wxControlWithItems', <<~__HEREDOC
+            VALUE get_client_data(int n) {
+              // Avoid an assert failure if no data previously set
+              if ( ! self->HasClientUntypedData() )
+                return Qnil;
+            
+              VALUE returnVal = (VALUE) self->GetClientData(n);
+              if ( ! returnVal )
+                return Qnil;
+              return returnVal;
+            }
+          
+            VALUE set_client_data(int n, VALUE item_data) {
+              self->SetClientData(n, (void *)item_data);
+              return item_data;
+            }
+            __HEREDOC
+            )
+       end
+      end
+
+      def setup_ctrl_with_items(clsnm)
+        # used in GC phase so DO NOT trigger Ruby redirection
+        spec.no_proxy "#{clsnm}::GetCount"
+        spec.add_swig_code <<~__HEREDOC
+          // adjust GC marker
+          %markfunc #{clsnm} "GC_mark_wxControlWithItems";
+          __HEREDOC
+        spec.add_header_code <<~__HEREDOC
+          extern swig_class cWxControlWithItems;
+          WXRUBY_EXPORT void GC_mark_wxControlWithItems(void* ptr);
+          __HEREDOC
+        spec.no_proxy "#{clsnm}::GetStringSelection"
+      end
+    end # class ControlWithItems
+
+  end # class Director
+
+end # module WXRuby3

data/rakelib/lib/director/cursor.rb

@@ -0,0 +1,28 @@
+###
+# wxRuby3 wxWidgets interface director
+# Copyright (c) M.J.N. Corino, The Netherlands
+###
+
+module WXRuby3
+
+  class Director
+
+    class Cursor < Director
+
+      def setup
+        # all but the default ctor require a running App
+        spec.require_app 'wxCursor::wxCursor(const wxString &, wxBitmapType, int, int)',
+                         'wxCursor::wxCursor(wxStockCursor)',
+                         'wxCursor::wxCursor(const wxImage &)',
+                         'wxCursor::wxCursor(const char *const *)',
+                         'wxCursor::wxCursor(const wxCursor &)'
+        spec.ignore 'wxCursor::wxCursor(const char[],int,int,int,int,const char[])'
+        # ignore stock object (see RubyStockObjects.i)
+        spec.ignore %w[wxSTANDARD_CURSOR wxHOURGLASS_CURSOR wxCROSS_CURSOR]
+        super
+      end
+    end # class Cursor
+
+  end # class Director
+
+end # module WXRuby3

data/rakelib/lib/director/data_format.rb

@@ -0,0 +1,31 @@
+###
+# wxRuby3 wxWidgets interface director
+# Copyright (c) M.J.N. Corino, The Netherlands
+###
+
+module WXRuby3
+
+  class Director
+
+    class DataFormat < Director
+
+      def setup
+        super
+        spec.gc_as_object
+        spec.ignore 'wxDataFormat::operator ==(wxDataFormatId)'
+        if Config.platform == :mingw
+          # The formal signature for these is NativeFormat; this is required on
+          # MSVC as otherwise an impermissible implicit cast is tried, and so
+          # doesn't compile
+          spec.ignore 'wxDataFormat::GetType'
+          spec.extend_interface 'wxDataFormat',
+                                'typedef unsigned short NativeFormat',
+                                'wxDataFormat::NativeFormat GetType() const'
+        end
+        spec.do_not_generate :variables
+      end
+    end # class DataFormat
+
+  end # class Director
+
+end # module WXRuby3

data/rakelib/lib/director/data_object.rb

@@ -0,0 +1,64 @@
+###
+# wxRuby3 wxWidgets interface director
+# Copyright (c) M.J.N. Corino, The Netherlands
+###
+
+module WXRuby3
+
+  class Director
+
+    class DataObject < Director
+
+      include Typemap::DataFormat
+      include Typemap::DataObjectData
+
+      def setup
+        super
+        spec.items.concat %w[wxDataObjectSimple wxDataObjectComposite wxBitmapDataObject wxFileDataObject wxTextDataObject wxCustomDataObject wxImageDataObject wxURLDataObject]
+        spec.gc_as_object
+
+        # we only allow Ruby derivatives from wxDataObject but not of any of the C++ implemented
+        # specializations
+        %w[wxDataObjectSimple wxDataObjectComposite wxBitmapDataObject wxFileDataObject wxTextDataObject wxCustomDataObject wxImageDataObject wxURLDataObject].each do |kls|
+          spec.no_proxy kls
+        end
+
+        # ignore the shortened 'convenience' forms
+        spec.ignore 'wxDataObjectSimple::GetDataHere(void *) const'
+        spec.ignore 'wxDataObjectSimple::SetData(size_t, const void *)'
+        spec.ignore 'wxDataObjectSimple::GetDataSize() const'
+        # ignore this as all derivatives have a fixed format
+        spec.ignore 'wxDataObjectSimple::SetFormat'
+
+        # ignore these as all fully implemented in derived and not useful in Ruby
+        spec.ignore 'wxCustomDataObject::Alloc'
+        spec.ignore 'wxCustomDataObject::Free'
+        spec.ignore 'wxCustomDataObject::GetData'
+        spec.ignore 'wxCustomDataObject::SetData'
+        spec.ignore 'wxCustomDataObject::GetSize'
+        spec.ignore 'wxCustomDataObject::TakeData'
+
+        # all available in bases
+        spec.ignore 'wxTextDataObject::GetFormatCount'
+        spec.ignore 'wxTextDataObject::GetFormat'
+        spec.ignore 'wxTextDataObject::GetAllFormats'
+
+        %w[wxDataObjectComposite wxBitmapDataObject wxFileDataObject wxTextDataObject wxImageDataObject wxURLDataObject].each do |kls|
+          spec.add_swig_code <<~__HEREDOC
+            // SWIG gets confused and doesn't realise that various virtual methods
+            // from wxDataObject are implemented fully in this subclass, and so,
+            // believing it to be abstract doesn't provide an allocator for this
+            // class. This undocumented feature overrides this.
+            %feature("notabstract") #{kls};
+            __HEREDOC
+        end
+
+        # Once a DataObject has been added, it belongs to the wxDataObjectComposite object,
+        # and will be freed by it on destruction.
+        spec.disown 'wxDataObjectSimple* dataObject'
+      end
+    end # class DataObject
+
+  end # class Director
+
+end # module WXRuby3

data/rakelib/lib/director/date_event.rb

@@ -0,0 +1,141 @@
+###
+# wxRuby3 wxWidgets interface director
+# Copyright (c) M.J.N. Corino, The Netherlands
+###
+
+require_relative './event'
+
+module WXRuby3
+
+  class Director
+
+    class DateEvent < Event
+
+      include Typemap::DateTime
+
+      def setup
+        super
+        if spec.module_name == 'wxDateEvent'
+          # add DateTime conversion helpers
+          spec.add_header_code <<~__HEREDOC
+            #define __WXRB_DATETIME_HELPERS__
+  
+            #include <wx/datetime.h>
+            
+            static WxRuby_ID __wxrb_local("local");
+            static WxRuby_ID __wxrb_utc_offset("utc_offset");
+            static WxRuby_ID __wxrb_Rational("Rational");
+            static WxRuby_ID __wxrb_civil("civil");
+            static WxRuby_ID __wxrb_to_time("to_time");
+            static WxRuby_ID __wxrb_round("round");
+
+            static VALUE rescue(VALUE, VALUE)
+            { 
+              return Qnil;
+            }
+
+            static VALUE __wxrb_cDateTime()
+            {
+              static VALUE __klass = Qnil;
+              if (__klass == Qnil) __klass = rb_eval_string("require 'date'; ::DateTime");
+              return __klass;
+            }
+
+            static VALUE wxRuby_WXDT2RBT(VALUE rbdt)
+            {
+              wxDateTime* wxdt = 0;
+              Data_Get_Struct(rbdt, wxDateTime, wxdt);
+              int year = wxdt->GetYear();
+              VALUE y   = INT2NUM(year);
+              VALUE mon = INT2NUM(wxdt->GetMonth() + 1);
+              VALUE d   = INT2NUM(wxdt->GetDay());
+              VALUE h   = INT2NUM(wxdt->GetHour());
+              VALUE min = INT2NUM(wxdt->GetMinute());
+              VALUE s   = INT2NUM(wxdt->GetSecond());
+              VALUE us  = INT2NUM(wxdt->GetMillisecond()*1000);
+              return rb_funcall(rb_cTime, __wxrb_local(), 7, y, mon, d, h, min, s, us);
+            }
+
+            WXRB_EXPORT_FLAG VALUE wxRuby_wxDateTimeToRuby(const wxDateTime& dt)
+            {
+                VALUE ruby_value = Qnil;
+                if (dt.IsValid())
+                { 
+                  // depending on the timezone, the local January the first 1970 may be out of range.
+                  // for 2038 not the entire year is available in the numerical representation.
+                  void* ptr = const_cast<wxDateTime*> (&dt);
+                  VALUE rbdt = Data_Wrap_Struct(rb_cObject, 0, 0, ptr);
+                  ruby_value = rb_rescue2(VALUEFUNC(wxRuby_WXDT2RBT), rbdt, VALUEFUNC(rescue), Qnil, rb_eException, 0);
+                  if (ruby_value == Qnil)
+                  {
+                      int year = dt.GetYear();
+                      VALUE y   = INT2NUM(year);
+                      VALUE mon = INT2NUM(dt.GetMonth() + 1);
+                      VALUE d   = INT2NUM(dt.GetDay());
+                      VALUE h   = INT2NUM(dt.GetHour());
+                      VALUE min = INT2NUM(dt.GetMinute());
+                      VALUE s   = INT2NUM(dt.GetSecond());
+                      // DateTime has no constructor for local timezone, so we have to compute the current offset
+                      // local_offset = Time.local(2007).utc_offset.to_r / 86400
+                      VALUE non_leap_year_without_dst = rb_funcall(rb_cTime, __wxrb_local(), 1, INT2NUM(2007));
+                      VALUE utc_offset = rb_funcall(non_leap_year_without_dst, __wxrb_utc_offset(), 0);
+                      VALUE local_offset = rb_funcall(rb_cObject, __wxrb_Rational(), 2, utc_offset, INT2NUM(86400));       // 60*60*24
+                      ruby_value = rb_funcall(__wxrb_cDateTime(), __wxrb_civil(), 7, y, mon, d, h, min, s, local_offset);
+                  }
+                }
+                return ruby_value;
+            }
+        
+            static WxRuby_ID __wxrb_year("year");
+            static WxRuby_ID __wxrb_month("month");
+            static WxRuby_ID __wxrb_mday("mday");
+            static WxRuby_ID __wxrb_hour("hour");
+            static WxRuby_ID __wxrb_min("min");
+            static WxRuby_ID __wxrb_sec("sec");
+            static WxRuby_ID __wxrb_usec("usec");
+
+            WXRB_EXPORT_FLAG wxDateTime* wxRuby_wxDateTimeFromRuby(VALUE ruby_value)
+            {
+                if (ruby_value == Qnil)
+                {
+                    return new wxDateTime();
+                }
+                else
+                {
+                    if (!rb_obj_is_kind_of(ruby_value, rb_cTime))
+                    {
+                      ruby_value = rb_funcall(ruby_value, __wxrb_to_time(), 0);
+                    }
+                    ruby_value = rb_funcall(ruby_value, __wxrb_round(), 1, INT2NUM(3));
+
+                    int y       = NUM2INT(rb_funcall(ruby_value, __wxrb_year(), 0));
+                    int rMonth  = NUM2INT(rb_funcall(ruby_value, __wxrb_month(), 0));
+                    int rDay    = NUM2INT(rb_funcall(ruby_value, __wxrb_mday(), 0));
+                    int rHour   = NUM2INT(rb_funcall(ruby_value, __wxrb_hour(), 0));
+                    int rMinute = NUM2INT(rb_funcall(ruby_value, __wxrb_min(), 0));
+                    int rSecond = NUM2INT(rb_funcall(ruby_value, __wxrb_sec(), 0));
+                    int rUSecond = NUM2INT(rb_funcall(ruby_value, __wxrb_usec(), 0));
+                    int rMSecond = rUSecond / 1000;
+                
+                    wxDateTime::Month mon        = (wxDateTime::Month)(rMonth-1);
+                    wxDateTime::wxDateTime_t d   = (wxDateTime::wxDateTime_t)rDay;
+                    wxDateTime::wxDateTime_t h   = (wxDateTime::wxDateTime_t)rHour;
+                    wxDateTime::wxDateTime_t min = (wxDateTime::wxDateTime_t)rMinute;
+                    wxDateTime::wxDateTime_t s   = (wxDateTime::wxDateTime_t)rSecond;
+                    wxDateTime::wxDateTime_t ms   = (wxDateTime::wxDateTime_t)rMSecond;
+                    
+                    return new wxDateTime(d, mon, y, h, min, s, ms);
+                }
+            }
+            __HEREDOC
+        elsif spec.module_name == 'wxCalendarEvent'
+          spec.override_inheritance_chain('wxCalendarEvent', 'wxDateEvent', {'wxCommandEvent' => 'wxEvent'}, 'wxEvent', 'wxObject', doc_override: false)
+          # inconsistent definitions
+          spec.add_swig_code %Q{%constant wxEventType wxEVT_CALENDAR = wxEVT_CALENDAR_DOUBLECLICKED;}
+        end
+      end
+    end # class DateEvent
+
+  end # class Director
+
+end # module WXRuby3

data/rakelib/lib/director/date_picker_ctrl.rb

@@ -0,0 +1,39 @@
+###
+# wxRuby3 wxWidgets interface director
+# Copyright (c) M.J.N. Corino, The Netherlands
+###
+
+require_relative './window'
+
+module WXRuby3
+
+  class Director
+
+    class DatePickerCtrl < Window
+
+      include Typemap::DateTime
+
+      def setup
+        super
+        # Custom implementation for Ruby
+        spec.ignore 'wxDatePickerCtrl::GetRange'
+
+        spec.add_extend_code 'wxDatePickerCtrl', <<~__HEREDOC
+          VALUE get_range() 
+          {
+            wxDateTime dt1, dt2;
+            $self->GetRange(&dt1, &dt2);
+       
+            VALUE items = rb_ary_new();
+            rb_ary_push(items, wxRuby_wxDateTimeToRuby(dt1));
+            rb_ary_push(items, wxRuby_wxDateTimeToRuby(dt2));
+         
+            return items;
+          }
+          __HEREDOC
+      end
+    end # class DatePickerCtrl
+
+  end # class Director
+
+end # module WXRuby3

data/rakelib/lib/director/dc.rb

@@ -0,0 +1,52 @@
+###
+# wxRuby3 wxWidgets interface director
+# Copyright (c) M.J.N. Corino, The Netherlands
+###
+
+module WXRuby3
+
+  class Director
+
+    class DC < Director
+
+      include Typemap::PointsList
+
+      def setup
+        super
+        spec.ignore [
+          'wxDC::StartPage',
+          'wxDC::GetPartialTextExtents',
+          'wxDC::DrawLines(const wxPointList *,wxCoord,wxCoord)',
+          'wxDC::DrawPolygon(const wxPointList *,wxCoord,wxCoord,wxPolygonFillMode)',
+          'wxDC::DrawSpline(const wxPointList *)',
+          'wxDC::GetLogicalOrigin(wxCoord *,wxCoord *) const',
+          'wxDC::GetHandle'
+        ]
+        spec.disable_proxies
+        spec.rename_for_ruby({
+          'GetDimensions' => 'wxDC::GetSize(wxCoord *, wxCoord *) const',
+          'GetDimensionsMM' => 'wxDC::GetSizeMM(wxCoord *, wxCoord *) const',
+          'GetTextSize' => 'wxDC::GetTextExtent(const wxString &) const',
+          'GetMultiLineTextSize' => 'wxDC::GetMultiLineTextExtent(const wxString &) const'
+        })
+        spec.add_extend_code 'wxDC', <<~__HEREDOC
+          // Needs to return input parameter with list of lengths
+          VALUE get_partial_text_extents(VALUE text) {
+            wxString str = wxString(StringValuePtr(text), wxConvUTF8);
+            wxArrayInt result = wxArrayInt();
+            $self->GetPartialTextExtents(str, result);
+            VALUE rb_result = rb_ary_new();
+            for (size_t i = 0; i < result.GetCount(); i++)
+              {
+                rb_ary_push(rb_result, INT2NUM( result.Item(i) ) );
+              }
+            return rb_result;
+          }
+          __HEREDOC
+        spec.swig_import 'swig/classes/include/wxGDICommon.h'
+      end
+    end # class DC
+
+  end # class Director
+
+end # module WXRuby3