wxruby3 0.9.0.pre.beta.8

data/rakelib/lib/director/radio_box.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 RadioBox < Window
+      def setup
+        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')
+        spec.add_extend_code 'wxRadioBox', <<~__HEREDOC
+        // add custom method to reach common Window method
+        bool EnableWindow(bool enable=true)
+        {
+          return $self->wxWindow::Enable(enable);
+        }
+        // add right method to enable/disable items
+        bool EnableItem(unsigned int n, bool enable=true)
+        {
+          return $self->Enable(n, enable);
+        }
+        __HEREDOC
+        # rename common method
+        spec.rename_for_ruby('Enable' => 'wxRadioBox::EnableWindow')
+        super
+      end
+    end # class Window
+
+  end # class Director
+
+end # module WXRuby3

data/rakelib/lib/director/region.rb

@@ -0,0 +1,25 @@
+###
+# wxRuby3 wxWidgets interface director
+# Copyright (c) M.J.N. Corino, The Netherlands
+###
+
+module WXRuby3
+
+  class Director
+
+    class Region < Director
+
+      include Typemap::PointsList
+
+      def setup
+        super
+        spec.require_app 'wxRegion'
+        spec.disable_proxies
+        spec.ignore 'wxNullRegion' # does not exist in code
+        spec.map_apply 'int n, wxPoint points[]' => [ 'size_t, const wxPoint *']
+      end
+    end # class Region
+
+  end # class Director
+
+end # module WXRuby3

data/rakelib/lib/director/ribbon_art_provider.rb

@@ -0,0 +1,154 @@
+###
+# wxRuby3 wxWidgets interface director
+# Copyright (c) M.J.N. Corino, The Netherlands
+###
+
+module WXRuby3
+
+  class Director
+
+    class RibbonArtProvider < Director
+
+      def setup
+        spec.items << 'wxRibbonPageTabInfo' << 'wxRibbonMSWArtProvider' << 'wxRibbonAUIArtProvider'
+        super
+        spec.gc_as_object 'wxRibbonArtProvider'
+        spec.gc_as_temporary 'wxRibbonPageTabInfo'
+        spec.suppress_warning(473,
+                              'wxRibbonArtProvider::Clone',
+                              'wxRibbonMSWArtProvider::Clone',
+                              'wxRibbonAUIArtProvider::Clone')
+        # argout type mappings
+        spec.map_apply 'int *OUTPUT' => ['int *ideal', 'int *small_begin_need_separator',
+                                         'int *small_must_have_separator', 'int *minimum']
+        # wxDirection argout type mapping
+        spec.map 'wxDirection *' => 'Wx::Direction' do
+          map_in ignore: true, temp: 'wxDirection tmp', code: '$1 = &tmp;'
+          map_argout code: <<~__CODE
+            $result = SWIG_Ruby_AppendOutput($result, wxRuby_GetEnumValueObject("wxDirection", static_cast<int>(tmp$argnum)));
+            __CODE
+
+          map_directorargout code: <<~__CODE
+            if ($1 && !NIL_P($result)) 
+            {
+              int eval;
+              wxRuby_GetEnumValue("wxDirection", $result, eval);
+              (*$1) = static_cast<wxDirection> (eval);
+            }
+            __CODE
+        end
+        # add method for correctly wrapping RibbonArtProvider references
+        spec.add_header_code <<~__CODE
+            extern VALUE mWxRBN; // declare external module reference
+            extern VALUE wxRuby_WrapWxRibbonArtProviderInRuby(const wxRibbonArtProvider *wx_rap, int own)
+            {
+              // If no object was passed to be wrapped.
+              if ( ! wx_rap )
+                return Qnil;
+
+              // check for registered instance
+              VALUE rb_rap = wxRuby_FindTracking(const_cast<wxRibbonArtProvider*> (wx_rap));
+              if (rb_rap && !NIL_P(rb_rap))
+              {
+                return rb_rap;
+              }
+
+              const void *ptr = 0;
+              wxString class_name;
+              if ((ptr = dynamic_cast<const wxRibbonAUIArtProvider*> (wx_rap)))
+              {
+                class_name = "RibbonAUIArtProvider";
+              }
+              else if ((ptr = dynamic_cast<const wxRibbonMSWArtProvider*> (wx_rap)))
+              {
+                class_name = "RibbonMSWArtProvider";
+              }
+              else
+              {
+                class_name = "RibbonArtProvider";
+              }
+              VALUE r_class = Qnil;
+              if ( ptr && class_name.Len() > 0 )
+              {
+                wxCharBuffer wx_classname = class_name.mb_str();
+                VALUE r_class_name = rb_intern(wx_classname.data ()); // wxRuby class name
+                if (rb_const_defined(mWxRBN, r_class_name))
+                  r_class = rb_const_get(mWxRBN, r_class_name);
+              }
+
+              // If we cannot find the class output a warning and return nil
+              if ( r_class == Qnil )
+              {
+                rb_warn("Error wrapping object; class `%s' is not (yet) supported in wxRuby",
+                        (const char *)class_name.mb_str() );
+                return Qnil;
+              }
+
+              // Otherwise, retrieve the swig type info for this class and wrap it
+              // in Ruby. 
+              swig_type_info* swig_type = wxRuby_GetSwigTypeForClass(r_class);
+              rb_rap = SWIG_NewPointerObj(const_cast<void*> (ptr), swig_type, own);
+              return rb_rap;
+            }
+        __CODE
+        # type mapping for Clone return ref
+        spec.map 'wxRibbonArtProvider*' => 'Wx::RBN::RibbonArtProvider' do
+          # add_header_code 'extern VALUE wxRuby_WrapWxRibbonArtProviderInRuby(const wxRibbonArtProvider *wx_rap, int own);'
+          # wrap AND own in this case
+          map_out code: '$result = wxRuby_WrapWxRibbonArtProviderInRuby($1, 1);'
+        end
+        # type mapping for wxRibbonPageTabInfoArray; no need to expose it to Ruby
+        spec.map 'const wxRibbonPageTabInfoArray &' => 'Array<Wx::RBN::RibbonPageTabInfo>' do
+          map_in temp: 'wxRibbonPageTabInfoArray tmp', code: <<~__CODE
+            if (!NIL_P($input))
+            {
+              if (TYPE($input) == T_ARRAY)
+              {
+                for (int i=0; i<RARRAY_LEN($input) ;++i)
+                {
+                  VALUE rb_el = rb_ary_entry($input, i);
+                  void* ptr = 0;
+                  int res = SWIG_ConvertPtr(rb_el, &ptr, SWIGTYPE_p_wxRibbonPageTabInfo,  0);
+                  if (!SWIG_IsOK(res) || ptr == 0) 
+                  {
+                    const char* msg;
+                    VALUE rb_msg;
+                    if (ptr)
+                    {
+                      rb_msg = rb_inspect(rb_el);
+                      msg = StringValuePtr(rb_msg);
+                    }
+                    else
+                    {
+                      msg = "null reference";
+                    }
+                    rb_raise(rb_eTypeError, "$symname : expected Wx::RBN::RibbonPageTabInfo for array element for 3 but got %s",
+                             msg);
+                  }
+                  tmp.Add(*reinterpret_cast< wxRibbonPageTabInfo * >(ptr));
+                }
+              }
+              else
+              {
+                VALUE msg = rb_inspect($input);
+                rb_raise(rb_eArgError, "$symname : expected array for 3 but got %s",
+                         StringValuePtr(msg));
+              }
+            }
+            $1 = &tmp;
+            __CODE
+          map_directorin code: <<~__CODE
+            $input = rb_ary_new();
+            for (size_t i = 0; i < $1.GetCount(); i++)
+            {
+              wxRibbonPageTabInfo* wx_rbti = &$1.Item(i);
+              rb_ary_push($input, SWIG_NewPointerObj(SWIG_as_voidptr(wx_rbti), SWIGTYPE_p_wxRibbonPageTabInfo, 0));
+            }
+            __CODE
+        end
+      end
+    end # class RibbonArtProvider
+
+  end # class Director
+
+end # module WXRuby3

data/rakelib/lib/director/ribbon_bar.rb

@@ -0,0 +1,24 @@
+###
+# wxRuby3 wxWidgets interface director
+# Copyright (c) M.J.N. Corino, The Netherlands
+###
+
+require_relative './window'
+
+module WXRuby3
+
+  class Director
+
+    class RibbonBar < Window
+
+      def setup
+        super
+        # for SetArtProvider (only in RibbonBar)
+        spec.disown 'wxRibbonArtProvider *art'
+        spec.do_not_generate :variables, :enums, :defines, :functions
+      end
+    end # class RibbonBar
+
+  end # class Director
+
+end # module WXRuby3

data/rakelib/lib/director/ribbon_bar_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 RibbonBarEvent < Event
+
+      def setup
+        super
+        spec.do_not_generate :variables, :enums, :defines, :functions
+      end
+    end # class RibbonBarEvent
+
+  end # class Director
+
+end # module WXRuby3

data/rakelib/lib/director/ribbon_button_bar.rb

@@ -0,0 +1,37 @@
+###
+# wxRuby3 wxWidgets interface director
+# Copyright (c) M.J.N. Corino, The Netherlands
+###
+
+require_relative './window'
+
+module WXRuby3
+
+  class Director
+
+    class RibbonButtonBar < Window
+
+      def setup
+        super
+        # exclude these; far better done in pure Ruby
+        spec.ignore 'wxRibbonButtonBar::SetItemClientData',
+                    'wxRibbonButtonBar::GetItemClientData', ignore_doc: false
+        spec.ignore 'wxRibbonButtonBar::SetItemClientObject',
+                    'wxRibbonButtonBar::GetItemClientObject'
+        # not needed because of type mapping
+        spec.ignore 'wxRibbonButtonBar::GetItemId',
+                    'wxRibbonButtonBar::GetItemById'
+        # map opaque wxRibbonButtonBarButtonBase* to the integer tool ID
+        spec.map 'wxRibbonButtonBarButtonBase*' => 'Integer' do
+          map_out code: '$result = ($1) ? INT2NUM((arg1)->GetItemId($1)) : Qnil;'
+          map_directorout code: '$result = NIL_P($1) ? 0 : this->GetItemById(NUM2INT($1));'
+          map_in code: '$1 = NIL_P($input) ? 0 : (arg1)->GetItemById(NUM2INT($input));'
+          map_directorin code: '$input = ($1) ? INT2NUM(this->GetItemId($1)) : Qnil;'
+          map_typecheck precedence: 'INTEGER', code: '$1 = (TYPE($input) == T_FIXNUM);'
+        end
+      end
+    end # class RibbonButtonBar
+
+  end # class Director
+
+end # module WXRuby3

data/rakelib/lib/director/ribbon_button_bar_event.rb

@@ -0,0 +1,40 @@
+###
+# wxRuby3 wxWidgets interface director
+# Copyright (c) M.J.N. Corino, The Netherlands
+###
+
+require_relative './event'
+
+module WXRuby3
+
+  class Director
+
+    class RibbonButtonBarEvent < Event
+
+      def setup
+        super
+        # map opaque wxRibbonButtonBarButtonBase* to the integer tool ID
+        spec.map 'wxRibbonButtonBarButtonBase*' => 'Integer' do
+          map_out code: '$result = (($1) && (arg1)->GetBar()) ? INT2NUM((arg1)->GetBar()->GetItemId($1)) : Qnil;'
+          map_in code: <<~__CODE
+            if ((arg1)->GetBar() == 0) rb_raise(rb_eRuntimeError, "Cannot set button before bar has been set.");
+            $1 = NIL_P($input) ? 0 : (arg1)->GetBar()->GetItemById(NUM2INT($input));
+            __CODE
+          map_typecheck precedence: 'INTEGER', code: '$1 = (TYPE($input) == T_FIXNUM);'
+        end
+        # customize ctor
+        spec.ignore 'wxRibbonButtonBarEvent::wxRibbonButtonBarEvent', ignore_doc: false
+        spec.add_extend_code 'wxRibbonButtonBarEvent', <<~__CODE
+          wxRibbonButtonBarEvent(wxEventType command_type=wxEVT_NULL, int win_id=0, wxRibbonButtonBar *bar=NULL, VALUE button_id=Qnil)
+          {
+            wxRibbonButtonBarButtonBase* button = (!NIL_P(button_id) && bar) ? bar->GetItemById(NUM2INT(button_id)) : 0;
+            return new wxRibbonButtonBarEvent(command_type, win_id, bar, button); 
+          }
+          __CODE
+        spec.do_not_generate :variables, :enums, :defines, :functions
+      end
+    end # class RibbonButtonBarEvent
+
+  end # class Director
+
+end # module WXRuby3

data/rakelib/lib/director/ribbon_ctrl.rb

@@ -0,0 +1,28 @@
+###
+# wxRuby3 wxWidgets interface director
+# Copyright (c) M.J.N. Corino, The Netherlands
+###
+
+require_relative './window'
+
+module WXRuby3
+
+  class Director
+
+    class RibbonControl < Window
+
+      def setup
+        super
+        # type mapping for GetArtProvider return ref
+        spec.map 'wxRibbonArtProvider*' => 'Wx::RBN::RibbonArtProvider' do
+          add_header_code 'extern VALUE wxRuby_WrapWxRibbonArtProviderInRuby(const wxRibbonArtProvider *wx_rap, int own);'
+          # wrap (do not own)
+          map_out code: '$result = wxRuby_WrapWxRibbonArtProviderInRuby($1, 0);'
+        end
+        spec.suppress_warning(473, 'wxRibbonControl::GetAncestorRibbonBar')
+      end
+    end # class RibbonControl
+
+  end # class Director
+
+end # module WXRuby3

data/rakelib/lib/director/ribbon_gallery.rb

@@ -0,0 +1,33 @@
+###
+# wxRuby3 wxWidgets interface director
+# Copyright (c) M.J.N. Corino, The Netherlands
+###
+
+require_relative './window'
+
+module WXRuby3
+
+  class Director
+
+    class RibbonGallery < Window
+
+      def setup
+        super
+        # exclude these; far better done in pure Ruby
+        spec.ignore 'wxRibbonGallery::SetItemClientObject',
+                    'wxRibbonGallery::GetItemClientObject'
+        spec.ignore 'wxRibbonGallery::SetItemClientData',
+                    'wxRibbonGallery::GetItemClientData', ignore_doc: false
+        spec.map 'wxRibbonGalleryItem*' => 'Integer' do
+          map_out code: '$result = ULL2NUM(reinterpret_cast<uintptr_t> ($1));'
+          map_directorout code: '$result = reinterpret_cast<wxRibbonGalleryItem*> ((uintptr_t)NUM2ULL($1));'
+          map_in code: '$1 = reinterpret_cast<wxRibbonGalleryItem*> ((uintptr_t)NUM2ULL($input));'
+          map_directorin code: '$input = ULL2NUM(reinterpret_cast<uintptr_t> ($1));'
+          map_typecheck precedence: 'INTEGER', code: '$1 = (TYPE($input) == T_FIXNUM);'
+        end
+      end
+    end # class RibbonGallery
+
+  end # class Director
+
+end # module WXRuby3

data/rakelib/lib/director/ribbon_gallery_event.rb

@@ -0,0 +1,27 @@
+###
+# wxRuby3 wxWidgets interface director
+# Copyright (c) M.J.N. Corino, The Netherlands
+###
+
+require_relative './event'
+
+module WXRuby3
+
+  class Director
+
+    class RibbonGalleryEvent < Event
+
+      def setup
+        super
+        # map opaque wxRibbonGalleryItem* to an pointer sized integer value
+        spec.map 'wxRibbonGalleryItem*' => 'Integer' do
+          map_out code: '$result = ULL2NUM(reinterpret_cast<uintptr_t> ($1));'
+          map_in code: '$1 = reinterpret_cast<wxRibbonGalleryItem*> ((uintptr_t)NUM2ULL($input));'
+        end
+        spec.do_not_generate :variables, :enums, :defines, :functions
+      end
+    end # class RibbonGalleryEvent
+
+  end # class Director
+
+end # module WXRuby3

data/rakelib/lib/director/ribbon_page.rb

@@ -0,0 +1,21 @@
+###
+# wxRuby3 wxWidgets interface director
+# Copyright (c) M.J.N. Corino, The Netherlands
+###
+
+require_relative './window'
+
+module WXRuby3
+
+  class Director
+
+    class RibbonPage < Window
+
+      def setup
+        super
+      end
+    end # class RibbonPage
+
+  end # class Director
+
+end # module WXRuby3

data/rakelib/lib/director/ribbon_panel.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 RibbonPanel < Window
+
+      def setup
+        super
+        spec.items << 'wx/ribbon/panel.h'
+      end
+    end # class RibbonPanel
+
+  end # class Director
+
+end # module WXRuby3

data/rakelib/lib/director/ribbon_panel_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 RibbonPanelEvent < Event
+
+      def setup
+        super
+        spec.do_not_generate :variables, :enums, :defines, :functions
+      end
+    end # class RibbonPanelEvent
+
+  end # class Director
+
+end # module WXRuby3

data/rakelib/lib/director/ribbon_tool_bar.rb

@@ -0,0 +1,146 @@
+###
+# wxRuby3 wxWidgets interface director
+# Copyright (c) M.J.N. Corino, The Netherlands
+###
+
+require_relative './window'
+
+module WXRuby3
+
+  class Director
+
+    class RibbonToolBar < Window
+
+      def setup
+        super
+        if Config.instance.wx_version <= '3.2.2.1'
+          # In older versions a bug exists in wxRibbonToolBar::GetToolByPos and wxRibbonToolBar::DeleteToolByPos
+          # so we use a wxRuby custom derived class
+          spec.add_header_code <<~__HEREDOC
+            class wxRibbonToolBarToolBase
+            {
+            public:
+                wxString help_string;
+                wxBitmap bitmap;
+                wxBitmap bitmap_disabled;
+                wxRect dropdown;
+                wxPoint position;
+                wxSize size;
+                wxObject* client_data;
+                int id;
+                wxRibbonButtonKind kind;
+                long state;
+            };
+            
+            WX_DEFINE_ARRAY_PTR(wxRibbonToolBarToolBase*, wxArrayRibbonToolBarToolBase);
+            
+            class wxRibbonToolBarToolGroup
+            {
+            public:
+                // To identify the group as a wxRibbonToolBarToolBase*
+                wxRibbonToolBarToolBase dummy_tool;
+            
+                wxArrayRibbonToolBarToolBase tools;
+                wxPoint position;
+                wxSize size;
+            };
+
+            class wxRubyRibbonToolBar : public wxRibbonToolBar
+            {
+            public:
+              wxRubyRibbonToolBar() : wxRibbonToolBar() {}
+          
+              wxRubyRibbonToolBar(wxWindow* parent,
+                                  wxWindowID id = wxID_ANY,
+                                  const wxPoint& pos = wxDefaultPosition,
+                                  const wxSize& size = wxDefaultSize,
+                                  long style = 0)
+                : wxRibbonToolBar(parent, id, pos, size, style)
+              {}
+              virtual ~wxRubyRibbonToolBar() {}
+
+              virtual bool DeleteToolByPos(size_t pos)
+              {
+                size_t group_count = m_groups.GetCount();
+                size_t g, t;
+                for(g = 0; g < group_count; ++g)
+                {
+                    wxRibbonToolBarToolGroup* group = m_groups.Item(g);
+                    size_t tool_count = group->tools.GetCount();
+                    if(pos<tool_count)
+                    {
+                        // Remove tool
+                        wxRibbonToolBarToolBase* tool = group->tools.Item(pos);
+                        group->tools.RemoveAt(pos);
+                        delete tool;
+                        return true;
+                    }
+                    else if(pos==tool_count)
+                    {
+                        // Remove separator
+                        if(g < group_count - 1)
+                        {
+                            wxRibbonToolBarToolGroup* next_group = m_groups.Item(g+1);
+                            for(t = 0; t < next_group->tools.GetCount(); ++t)
+                                group->tools.Add(next_group->tools[t]);
+                            m_groups.RemoveAt(g+1);
+                            delete next_group;
+                        }
+                        return true;
+                    }
+                    pos -= tool_count+1;
+                }
+                return false;
+              }
+              virtual wxRibbonToolBarToolBase* GetToolByPos(size_t pos) const
+              {
+                size_t group_count = m_groups.GetCount();
+                size_t g;
+                for(g = 0; g < group_count; ++g)
+                {
+                    wxRibbonToolBarToolGroup* group = m_groups.Item(g);
+                    size_t tool_count = group->tools.GetCount();
+                    if(pos<tool_count)
+                    {
+                        return group->tools[pos];
+                    }
+                    else if(pos==tool_count)
+                    {
+                        return NULL;
+                    }
+                    pos -= tool_count+1;
+                }
+                return NULL;
+              }
+            };
+            __HEREDOC
+          spec.use_class_implementation('wxRibbonToolBar', 'wxRubyRibbonToolBar')
+        end
+        # exclude these; far better done in pure Ruby
+        spec.ignore 'wxRibbonToolBar::SetToolClientData',
+                    'wxRibbonToolBar::GetToolClientData', ignore_doc: false
+        spec.map 'wxObject*' => 'Object', swig: false do
+          map_in
+          map_out
+        end
+        # not needed because of type mapping
+        spec.ignore 'wxRibbonToolBar::GetToolId',
+                    'wxRibbonToolBar::FindById'
+        # replace incorrectly documented method
+        spec.ignore 'wxRibbonToolBar::AddToggleTool', ignore_doc: false
+        spec.extend_interface 'wxRibbonToolBar',
+                              'virtual wxRibbonToolBarToolBase*	AddToggleTool (int tool_id, const wxBitmap &bitmap, const wxString &help_string=wxEmptyString)'
+        # map opaque wxRibbonToolBarToolBase* to the integer tool ID
+        spec.map 'wxRibbonToolBarToolBase*' => 'Integer' do
+          map_out code: '$result = ($1) ? INT2NUM((arg1)->GetToolId($1)) : Qnil;'
+          map_directorout code: '$result = NIL_P($1) ? 0 : this->FindById(NUM2INT($1));'
+          map_in code: '$1 = NIL_P($input) ? 0 : (arg1)->FindById(NUM2INT($input));'
+          map_directorin code: '$input = ($1) ? INT2NUM(this->GetToolId($1)) : Qnil;'
+          map_typecheck precedence: 'INTEGER', code: '$1 = (TYPE($input) == T_FIXNUM);'
+        end
+      end
+    end # class RibbonToolBar
+
+  end # class Director
+
+end # module WXRuby3

data/rakelib/lib/director/ribbon_tool_bar_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 RibbonToolBarEvent < Event
+
+      def setup
+        super
+        spec.do_not_generate :variables, :enums, :defines, :functions
+      end
+    end # class RibbonToolBarEvent
+
+  end # class Director
+
+end # module WXRuby3