Merge pull request #250 from mcorino/develop

Develop
mcorino · Mar 1, 2024 · e00e51b · e00e51b
2 parents 18a6f52 + a14da74
commit e00e51b
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 0 deletions.
diff --git a/rakelib/lib/director/dialog.rb b/rakelib/lib/director/dialog.rb
@@ -212,6 +212,14 @@ def setup
                 return Qfalse;
             }
             __HEREDOC
+        when 'wxSymbolPickerDialog'
+          # redefine these to prevent problematic handling of title/caption defaults
+          spec.ignore 'wxSymbolPickerDialog::wxSymbolPickerDialog(const wxString &, const wxString &, const wxString &, wxWindow *, wxWindowID, const wxString &, const wxPoint &, const wxSize &, long)',
+                      'wxSymbolPickerDialog::Create',
+                      ignore_doc: false
+          spec.extend_interface 'wxSymbolPickerDialog',
+                                'wxSymbolPickerDialog(const wxString &symbol, const wxString &initialFont, const wxString &normalTextFont, wxWindow *parent, wxWindowID id, const wxString &title, const wxPoint &pos, const wxSize &size, long style)',
+                                'bool Create(const wxString &symbol, const wxString &initialFont, const wxString &normalTextFont, wxWindow *parent, wxWindowID id, const wxString &caption, const wxPoint &pos, const wxSize &size, long style)'
         when 'wxWizard'
           # special handling
           spec.ignore 'wxWizard::GetBitmap'

diff --git a/rakelib/memcheck/suppressions/ruby.supp b/rakelib/memcheck/suppressions/ruby.supp
@@ -182,3 +182,34 @@
   fun:_ZN8wxModule15RegisterModulesEv
   fun:*
 }
+{
+  insert_a_suppression_name_here
+  Memcheck:Leak
+  fun:malloc
+  fun:g_malloc
+  fun:g_strconcat
+  fun:gtk_module_init
+  ...
+  fun:gtk_init_check
+  fun:_ZN5wxApp10InitializeERiPPw
+  fun:*
+}
+{
+  insert_a_suppression_name_here
+  Memcheck:Leak
+  fun:malloc
+  fun:g_malloc
+  fun:g_slice_alloc
+  fun:g_slice_alloc0
+  fun:g_type_create_instance
+  fun:g_object_new_internal
+  fun:g_object_new_with_properties
+  fun:g_object_new
+  fun:_g_local_file_new
+  fun:g_daemon_vfs_get_file_for_path
+  fun:gtk_module_init
+  ...
+  fun:gtk_init_check
+  fun:_ZN5wxApp10InitializeERiPPw
+  fun:*
+}
diff --git a/tests/test_secret_store.rb b/tests/test_secret_store.rb
@@ -68,6 +68,8 @@ def test_store
         assert_not_equal('My Secret Password!'.encode('UTF-32'), secret_val2.get_as_string)
         assert_equal('My Secret Password!'.encode('UTF-32'), secret_val2.get_as_string.encode('UTF-32'))
 
+        assert_true(Wx::SecretStore.get_default.delete('My/Service'))
+
       else
         puts "Default SecretStore not usable : #{err}"
       end