wxruby3 0.9.1 → 0.9.3

data/rakelib/lib/director/header_ctrl.rb

@@ -28,7 +28,12 @@ module WXRuby3
                               visibility: 'protected'
         # handled; can be suppressed
         spec.suppress_warning(473, 'wxHeaderCtrl::GetColumn', 'wxHeaderCtrlSimple::GetColumn')
-        spec.do_not_generate :typedefs, :variables, :enums, :defines, :functions
+        # ignore here as already available through HeaderCtrlEvent
+        spec.ignore '@.wxHD_ALLOW_REORDER',
+                    '@.wxHD_ALLOW_HIDE',
+                    '@.wxHD_BITMAP_ON_RIGHT',
+                    '@.wxHD_DEFAULT_STYLE'
+        spec.do_not_generate :typedefs, :variables, :defines, :functions
       end
     end # class HeaderCtrl
 

data/rakelib/lib/director/html_listbox.rb

@@ -14,6 +14,8 @@ module WXRuby3
 
     class HtmlListBox < Window
 
+      include Typemap::ClientData
+
       def setup
         spec.items << 'wxSimpleHtmlListBox' << 'wxItemContainer'
         super
@@ -72,47 +74,119 @@ module WXRuby3
         spec.extend_interface 'wxSimpleHtmlListBox',
                               'virtual wxString GetString(unsigned int n) const',
                               'virtual void SetString(unsigned int n, const wxString &string)'
-        spec.ignore([ 'wxItemContainer::Append(const wxString &, wxClientData *)',
+        spec.ignore([ 'wxItemContainer::Append(const wxString &, void *)',
                       'wxItemContainer::Append(const std::vector< wxString > &)',
-                      'wxItemContainer::Append(const wxArrayString &, wxClientData **)',
+                      'wxItemContainer::Append(const wxArrayString &, void **)',
                       'wxItemContainer::Append(unsigned int, const wxString *)',
                       'wxItemContainer::Append(unsigned int, const wxString *, void **)',
                       'wxItemContainer::Append(unsigned int, const wxString *, wxClientData **)',
-                      'wxItemContainer::Insert(const wxString &, unsigned int, wxClientData *)',
+                      'wxItemContainer::Insert(const wxString &, unsigned int, void *)',
                       'wxItemContainer::Insert(const std::vector< wxString > &)',
-                      'wxItemContainer::Insert(const wxArrayString &, unsigned int, wxClientData **)',
+                      'wxItemContainer::Insert(const wxArrayString &, unsigned int, void **)',
                       'wxItemContainer::Insert(unsigned int, const wxString *, unsigned int)',
                       'wxItemContainer::Insert(unsigned int, const wxString *, unsigned int, void **)',
                       'wxItemContainer::Insert(unsigned int, const wxString *, unsigned int, wxClientData **)',
                       'wxItemContainer::Set(const std::vector< wxString > &)',
-                      'wxItemContainer::Set(const wxArrayString &, wxClientData **)',
+                      'wxItemContainer::Set(const wxArrayString &, void **)',
                       'wxItemContainer::Set(unsigned int, const wxString *)',
                       'wxItemContainer::Set(unsigned int, const wxString *, void **)',
                       'wxItemContainer::Set(unsigned int, const wxString *, wxClientData **)',
-                      'wxItemContainer::DetachClientObject',
-                      'wxItemContainer::HasClientObjectData',
-                      'wxItemContainer::GetClientObject',
-                      'wxItemContainer::SetClientObject',
+                      'wxItemContainer::GetClientData',
+                      'wxItemContainer::SetClientData',
                       'wxItemContainer::HasClientUntypedData',
                       'wxItemContainer::Clear'])
-        spec.ignore([ 'wxItemContainer::Append(const wxArrayString &, void **)',
-                      'wxItemContainer::Insert(const wxArrayString &, unsigned int, void **)',
-                      'wxItemContainer::Set(const wxArrayString &, void **)'], ignore_doc: false)
+        spec.ignore([ 'wxItemContainer::Append(const wxArrayString &, wxClientData **)',
+                      'wxItemContainer::Insert(const wxArrayString &, unsigned int, wxClientData **)',
+                      'wxItemContainer::Set(const wxArrayString &, wxClientData **)'], ignore_doc: false)
         # for doc only
         spec.map 'void** clientData' => 'Array', swig: false do
           map_in code: ''
         end
-        spec.ignore(%w[wxItemContainer::GetClientData wxItemContainer::SetClientData], ignore_doc: false) # keep docs
-        # Replace the old Wx definition of this method (which segfaults)
-        # Only need the setter as we cache data in Ruby and the getter
-        # therefor can be pure Ruby
-        spec.add_extend_code('wxSimpleHtmlListBox', <<~__HEREDOC
-            VALUE set_client_data(int n, VALUE item_data) {
-              self->SetClientData(n, (void *)item_data);
-              return item_data;
+        # Replace the old Wx definitions of these methods adding
+        # proper checks on the data arrays.
+        # Also add an item enumerator.
+        spec.add_extend_code 'wxSimpleHtmlListBox', <<~__HEREDOC
+          VALUE DetachClientObject(unsigned int n)
+          {
+            VALUE rc = Qnil;
+            wxClientData *wxcd = $self->DetachClientObject(n);
+            wxRubyClientData *rbcd = wxcd ? dynamic_cast<wxRubyClientData*> (wxcd) : nullptr;
+            if (rbcd)
+            {
+              rc = rbcd->GetData();
+              delete rbcd;
             }
-        __HEREDOC
-        )
+            return rc;
+          }
+
+          int Append(const wxArrayString &items, VALUE rb_clientData)
+          {
+            if (TYPE(rb_clientData) != T_ARRAY || 
+                  static_cast<unsigned int> (RARRAY_LEN(rb_clientData)) != items.GetCount())
+            {
+              rb_raise(rb_eArgError, 
+                       TYPE(rb_clientData) == T_ARRAY ? 
+                          "expected Array for client_data" : 
+                          "client_data Array needs to be equal in size to items Array");
+            }
+
+            std::unique_ptr<wxClientData*[]> cd_arr = std::make_unique<wxClientData*[]> (RARRAY_LEN(rb_clientData));
+            for (int i=0; i<RARRAY_LEN(rb_clientData) ;++i)
+            {
+              cd_arr[i] = new wxRubyClientData(rb_ary_entry(rb_clientData, i));
+            }
+            return $self->Append(items, cd_arr.get());
+          }
+
+          int Insert(const wxArrayString &items, unsigned int pos, VALUE rb_clientData)
+          {
+            if (TYPE(rb_clientData) != T_ARRAY || 
+                  static_cast<unsigned int> (RARRAY_LEN(rb_clientData)) != items.GetCount())
+            {
+              rb_raise(rb_eArgError, 
+                       TYPE(rb_clientData) == T_ARRAY ? 
+                          "expected Array for client_data" : 
+                          "client_data Array needs to be equal in size to items Array");
+            }
+
+            std::unique_ptr<wxClientData*[]> cd_arr = std::make_unique<wxClientData*[]> (RARRAY_LEN(rb_clientData));
+            for (int i=0; i<RARRAY_LEN(rb_clientData) ;++i)
+            {
+              cd_arr[i] = new wxRubyClientData(rb_ary_entry(rb_clientData, i));
+            }
+            return $self->Insert(items, pos, cd_arr.get());
+          }
+
+          void Set(const wxArrayString &items, VALUE rb_clientData)
+          {
+            if (TYPE(rb_clientData) != T_ARRAY || 
+                  static_cast<unsigned int> (RARRAY_LEN(rb_clientData)) != items.GetCount())
+            {
+              rb_raise(rb_eArgError, 
+                       TYPE(rb_clientData) == T_ARRAY ? 
+                          "expected Array for client_data" : 
+                          "client_data Array needs to be equal in size to items Array");
+            }
+
+            std::unique_ptr<wxClientData*[]> cd_arr = std::make_unique<wxClientData*[]> (RARRAY_LEN(rb_clientData));
+            for (int i=0; i<RARRAY_LEN(rb_clientData) ;++i)
+            {
+              cd_arr[i] = new wxRubyClientData(rb_ary_entry(rb_clientData, i));
+            }
+            $self->Set(items, cd_arr.get());
+          }
+
+          VALUE each_string()
+          {
+            VALUE rc = Qnil;
+            for (unsigned int i=0; i<$self->GetCount() ;++i)
+            {
+              VALUE rb_s = WXSTR_TO_RSTR($self->GetString(i));
+              rc = rb_yield(rb_s);
+            }
+            return rc;
+          }
+          __HEREDOC
       end
     end # class HtmlListBox
 

data/rakelib/lib/director/icon.rb

@@ -25,9 +25,12 @@ module WXRuby3
         spec.ignore('wxIcon::wxIcon(const char *const *)', 'wxIcon::wxIcon(const char[],int,int)')
         # xml specs incorrectly list this method for MWS while it does not exist anymore
         spec.ignore('wxIcon::ConvertToDisabled')
-        unless Config.platform == :mingw
+        if Config.platform == :mingw
+          spec.ignore 'wxIconBundle::wxIconBundle(const wxString &, WXHINSTANCE)',
+                      'wxIconBundle::AddIcon(const wxString&,WXHINSTANCE)',
+                      'wxIcon::CreateFromHICON'
+        else
           spec.override_inheritance_chain('wxIcon', %w[wxBitmap wxGDIObject wxObject])
-          spec.ignore 'wxIconBundle::wxIconBundle(const wxString &, WXHINSTANCE)'
         end
         super
       end

data/rakelib/lib/director/list_ctrl.rb

@@ -55,12 +55,11 @@ module WXRuby3
             (void)self->EditLabel(item);
           }
         __HEREDOC
-        unless Config.instance.features_set?('wxHAS_LISTCTRL_COLUMN_ORDER')
-          spec.ignore %w[wxListCtrl::GetColumnIndexFromOrder
-                         wxListCtrl::GetColumnOrder
-                         wxListCtrl::GetColumnsOrder
-                         wxListCtrl::SetColumnsOrder]
-        end
+        spec.ignore_unless 'HAS_LISTCTRL_COLUMN_ORDER',
+                           %w[wxListCtrl::GetColumnIndexFromOrder
+                              wxListCtrl::GetColumnOrder
+                              wxListCtrl::GetColumnsOrder
+                              wxListCtrl::SetColumnsOrder]
         # these are protected so ignored by default but we want them here
         spec.regard %w[
             wxListCtrl::OnGetItemAttr

data/rakelib/lib/director/locale.rb

@@ -28,9 +28,7 @@ module WXRuby3
           wxLanguageInfo::DescriptionNative
           wxLanguageInfo::LayoutDirection
           ]
-        if Config.instance.features_set?('__WXMSW__')
-          spec.regard('wxLanguageInfo::WinLang', 'wxLanguageInfo::WinSublang')
-        end
+        spec.ignore_unless('WXMSW', 'wxLanguageInfo::WinLang', 'wxLanguageInfo::WinSublang')
       end
     end # class Locale
 

data/rakelib/lib/director/log.rb

@@ -14,16 +14,13 @@ module WXRuby3
 
       def setup
         spec.gc_as_object %w[wxLog wxLogChain wxLogInterposer wxLogWindow]
-        spec.items.concat(%w[wxLogBuffer wxLogChain wxLogGui wxLogStderr wxLogStream wxLogTextCtrl wxLogInterposer wxLogWindow wxLogNull wxLogRecordInfo])
+        spec.items.concat(%w[wxLogBuffer wxLogChain wxLogGui wxLogStderr wxLogTextCtrl wxLogInterposer wxLogWindow wxLogNull wxLogRecordInfo])
         spec.no_proxy(%w[wxLogBuffer wxLogGui wxLogStderr wxLogTextCtrl wxLogWindow])
         spec.force_proxy(%w[wxLogInterposer])
         spec.ignore 'wxLog::SetFormatter'
         spec.regard %w[wxLog::DoLogRecord wxLog::DoLogTextAtLevel wxLog::DoLogText]
         spec.ignore 'wxLogBuffer::Flush'
         spec.ignore 'wxLogGui::Flush'
-        if Config.instance.features_set?('wxUSE_STD_IOSTREAM')
-          spec.ignore 'wxLogStream'
-        end
         # wxLogStderr
         spec.ignore 'wxLogStderr::wxLogStderr'
         spec.add_extend_code 'wxLogStderr', <<~__HEREDOC

data/rakelib/lib/director/media_ctrl.rb

@@ -16,6 +16,60 @@ module WXRuby3
 
       def setup
         super
+        spec.map 'const wxURI&' => 'URI' do
+          add_header <<~__CODE
+            static VALUE wxRuby_GetRubyURIClass()
+            {
+              static VALUE rb_cURI = Qnil;
+              if (NIL_P(rb_cURI))
+              {
+                rb_require("uri");
+                rb_cURI = rb_const_get(rb_cObject, rb_intern("URI"));
+              }
+              return rb_cURI;
+            }
+            static WxRuby_ID to_s_id("to_s");
+            __CODE
+          map_in temp: 'wxURI tmp', code: <<~__CODE
+            if (rb_obj_is_kind_of($input, wxRuby_GetRubyURIClass()))
+            {
+              VALUE s = rb_funcall($input, to_s_id(), 0);
+              tmp = wxURI(RSTR_TO_WXSTR(s));
+              $1 = &tmp;
+            }
+            else
+            {
+              rb_raise(rb_eArgError, "expected URI for %d", $argnum-1);
+            }                        
+            __CODE
+          map_typecheck precedence: 'POINTER', code: '$1 = rb_obj_is_kind_of($input, wxRuby_GetRubyURIClass());'
+        end
+        spec.map 'wxFileOffset' => 'Integer' do
+          # we need these inline methods here as we do not want SWIG to preprocess the code
+          # as it will do in the type mapping code sections
+          add_header_code <<~__CODE
+            inline wxFileOffset __ruby2wxFileOffset(VALUE num)
+            {
+            #ifdef wxHAS_HUGE_FILES
+              return static_cast<wxFileOffset> (NUM2LL(num));
+            #else
+              return static_cast<wxFileOffset> (NUM2LONG(num));
+            #endif
+            } 
+            inline VALUE __wxFileOffset2ruby(wxFileOffset offs)
+            {
+            #ifdef wxHAS_HUGE_FILES
+              return LL2NUM(offs);
+            #else
+              return LONG2NUM(offs);
+            #endif
+            } 
+            __CODE
+
+          map_in code: '$1 = __ruby2wxFileOffset($input);'
+          map_out code: '$result = __wxFileOffset2ruby($1);'
+          map_typecheck code: '$1 = TYPE($input) == T_FIXNUM;'
+        end
         spec.do_not_generate :variables, :enums, :defines, :functions
       end
     end # class MediaCtrl

data/rakelib/lib/director/menu.rb

@@ -85,6 +85,8 @@ module WXRuby3
         spec.add_swig_code <<~__HEREDOC
           %markfunc wxMenu "mark_wxMenu";
         __HEREDOC
+        # ignore MSW specific method
+        spec.ignore 'wxMenu::MSWCommand'
         # fix SWIG's problems with const& return value
         spec.ignore('wxMenu::GetTitle', ignore_doc: false) # keep doc
         spec.add_extend_code 'wxMenu', <<~__HEREDOC
@@ -92,7 +94,20 @@ module WXRuby3
             wxString const& title = $self->GetTitle();
             return &const_cast<wxString&> (title);
           }
-        __HEREDOC
+
+          VALUE each_item()
+          {
+            VALUE rc = Qnil;
+            for (size_t i=0; i<$self->GetMenuItemCount(); ++i)
+            {
+              wxMenuItem *wx_menu_item = $self->FindItemByPosition(i);
+              VALUE rb_menu_item = SWIG_NewPointerObj(SWIG_as_voidptr(wx_menu_item), 
+                                                      SWIGTYPE_p_wxMenuItem, 0);
+              rc = rb_yield(rb_menu_item);
+            }
+            return rc;
+          }
+          __HEREDOC
         super
       end
     end # class Menu

data/rakelib/lib/director/menu_item.rb

@@ -21,11 +21,11 @@ module WXRuby3
         spec.ignore(%w[wxMenuItem::GetLabel wxMenuItem::GetName wxMenuItem::GetText wxMenuItem::SetText wxMenuItem::GetLabelFromText])
         # ignore this as there is no implementation anymore
         spec.ignore 'wxMenuItem::GetAccelFromString'
-        spec.ignore('wxMenuItem::GetAccel') unless Config.instance.features_set?('wxUSE_ACCEL')
+        spec.ignore_unless('USE_ACCEL', 'wxMenuItem::GetAccel')
         spec.no_proxy 'wxMenuItem::GetAccel'
         spec.ignore 'wxMenuItem::GetBitmap(bool)' # not portable
         if Config.instance.wx_version >= '3.3.0'
-          spec.ignore('wxMenuItem::SetBackgroundColour','wxMenuItem::SetFont','wxMenuItem::SetTextColour') unless Config.instance.features_set?('__WXMSW__')
+          spec.ignore_unless('WXMSW', 'wxMenuItem::SetBackgroundColour','wxMenuItem::SetFont','wxMenuItem::SetTextColour')
         end
         super
       end