wxruby3 1.8.0 → 2.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (499) hide show
  1. checksums.yaml +4 -4
  2. data/INSTALL.md +20 -10
  3. data/README.md +3 -3
  4. data/ext/wxruby3/include/wxRubyApp.h +49 -3
  5. data/ext/wxruby3/include/wxruby-ComboPopup.h +17 -32
  6. data/ext/wxruby3/include/wxruby-Config.h +34 -11
  7. data/ext/wxruby3/include/wxruby-GCTracking.h +23 -5
  8. data/ext/wxruby3/include/wxruby-SharedEventHandler.h +7 -7
  9. data/ext/wxruby3/include/wxruby-runtime.h +65 -0
  10. data/ext/wxruby3/swig/common.i +6 -0
  11. data/ext/wxruby3/swig/custom/typed_data/rubyhead.swg +220 -0
  12. data/ext/wxruby3/swig/custom/typed_data/rubyprimtypes.swg +265 -0
  13. data/ext/wxruby3/swig/custom/typed_data/rubyrun.swg +243 -0
  14. data/ext/wxruby3/swig/custom/typed_data/swigrun.swg +689 -0
  15. data/ext/wxruby3/swig/custom/{rubyprimtypes.swg → untyped_data/rubyprimtypes.swg} +8 -0
  16. data/ext/wxruby3/swig/mark_free_impl.i +2 -2
  17. data/ext/wxruby3/swig/memory_management.i +1 -0
  18. data/ext/wxruby3/swig/wx.i +19 -6
  19. data/lib/wx/core/file_dialog.rb +3 -10
  20. data/lib/wx/doc/rbn/events.rb +32 -0
  21. data/lib/wx/doc/rbn/ribbon_backstage_mrulist.rb +25 -0
  22. data/lib/wx/doc/stream.rb +7 -3
  23. data/lib/wx/keyword_ctors.rb +3 -13
  24. data/lib/wx/rbn/events.rb +18 -0
  25. data/lib/wx/rbn/require.rb +1 -0
  26. data/lib/wx/rbn/ribbon_backstage_mrulist.rb +39 -0
  27. data/lib/wx/version.rb +1 -1
  28. data/lib/wx/wxruby/cmd/test.rb +8 -2
  29. data/rakelib/lib/config/pkgman/linux.rb +4 -2
  30. data/rakelib/lib/config.rb +3 -3
  31. data/rakelib/lib/core/include/typed_data/swigrubyrun.inc +629 -0
  32. data/rakelib/lib/core/include/typed_data/swigrun.inc +870 -0
  33. data/rakelib/lib/core/package.rb +2 -2
  34. data/rakelib/lib/director/app.rb +16 -0
  35. data/rakelib/lib/director/art_provider.rb +3 -3
  36. data/rakelib/lib/director/aui_mdi_child_frame.rb +24 -0
  37. data/rakelib/lib/director/aui_mdi_parent_frame.rb +0 -2
  38. data/rakelib/lib/director/aui_tab_ctrl.rb +3 -3
  39. data/rakelib/lib/director/comboctrl.rb +35 -2
  40. data/rakelib/lib/director/config_base.rb +79 -33
  41. data/rakelib/lib/director/data_object.rb +1 -1
  42. data/rakelib/lib/director/date_event.rb +10 -3
  43. data/rakelib/lib/director/derived_dc.rb +41 -32
  44. data/rakelib/lib/director/editable_listbox.rb +10 -8
  45. data/rakelib/lib/director/event.rb +16 -7
  46. data/rakelib/lib/director/event_handler.rb +48 -10
  47. data/rakelib/lib/director/events.rb +4 -2
  48. data/rakelib/lib/director/file_history.rb +46 -0
  49. data/rakelib/lib/director/frame.rb +29 -0
  50. data/rakelib/lib/director/fs_file.rb +25 -4
  51. data/rakelib/lib/director/functions.rb +2 -2
  52. data/rakelib/lib/director/graphics_context.rb +6 -6
  53. data/rakelib/lib/director/grid_cell_editor.rb +1 -1
  54. data/rakelib/lib/director/grid_cell_renderer.rb +1 -1
  55. data/rakelib/lib/director/grid_ctrl.rb +39 -12
  56. data/rakelib/lib/director/help_controller.rb +17 -0
  57. data/rakelib/lib/director/html_help_data.rb +20 -2
  58. data/rakelib/lib/director/icon.rb +3 -0
  59. data/rakelib/lib/director/log.rb +25 -1
  60. data/rakelib/lib/director/menu.rb +38 -106
  61. data/rakelib/lib/director/menu_bar.rb +36 -70
  62. data/rakelib/lib/director/num_validator.rb +3 -3
  63. data/rakelib/lib/director/numeric_property_validator.rb +1 -1
  64. data/rakelib/lib/director/page_setup_dialog.rb +18 -1
  65. data/rakelib/lib/director/pgeditor.rb +1 -1
  66. data/rakelib/lib/director/pgvalidation_info.rb +1 -0
  67. data/rakelib/lib/director/popup_window.rb +7 -0
  68. data/rakelib/lib/director/preview_frame.rb +8 -1
  69. data/rakelib/lib/director/print_dialog.rb +17 -0
  70. data/rakelib/lib/director/printer.rb +1 -1
  71. data/rakelib/lib/director/property_grid_page.rb +2 -0
  72. data/rakelib/lib/director/region_iterator.rb +1 -1
  73. data/rakelib/lib/director/ribbon_backstage.rb +28 -0
  74. data/rakelib/lib/director/ribbon_backstage_button.rb +25 -0
  75. data/rakelib/lib/director/ribbon_backstage_callout.rb +26 -0
  76. data/rakelib/lib/director/ribbon_backstage_heading.rb +26 -0
  77. data/rakelib/lib/director/ribbon_backstage_itemlist.rb +27 -0
  78. data/rakelib/lib/director/ribbon_backstage_mrulist.rb +112 -0
  79. data/rakelib/lib/director/ribbon_bar.rb +14 -0
  80. data/rakelib/lib/director/ribbon_gallery.rb +6 -2
  81. data/rakelib/lib/director/ribbon_page.rb +11 -0
  82. data/rakelib/lib/director/ribbon_tool_bar.rb +6 -4
  83. data/rakelib/lib/director/richtext_composite_object.rb +4 -4
  84. data/rakelib/lib/director/richtext_paragraph_layout_box.rb +1 -1
  85. data/rakelib/lib/director/scrolled_t.rb +1 -1
  86. data/rakelib/lib/director/sizer.rb +7 -0
  87. data/rakelib/lib/director/sizer_item.rb +4 -1
  88. data/rakelib/lib/director/splitter_event.rb +2 -2
  89. data/rakelib/lib/director/task_bar_icon.rb +4 -1
  90. data/rakelib/lib/director/text_validator.rb +1 -1
  91. data/rakelib/lib/director/top_level_window.rb +12 -4
  92. data/rakelib/lib/director/tree_event.rb +3 -3
  93. data/rakelib/lib/director/validator.rb +1 -1
  94. data/rakelib/lib/director/variant.rb +2 -2
  95. data/rakelib/lib/director/window.rb +27 -5
  96. data/rakelib/lib/director/window_disabler.rb +1 -1
  97. data/rakelib/lib/director/xml_resource.rb +33 -8
  98. data/rakelib/lib/extractor/class.rb +2 -1
  99. data/rakelib/lib/extractor.rb +3 -2
  100. data/rakelib/lib/generate/interface.rb +2 -3
  101. data/rakelib/lib/specs/interfaces.rb +9 -2
  102. data/rakelib/lib/swig_runner.rb +14 -3
  103. data/rakelib/lib/typemap/common.rb +2 -36
  104. data/rakelib/lib/typemap/config.rb +22 -0
  105. data/samples/ribbon/ribbon.rb +277 -20
  106. data/tests/test_shared_event_handler.rb +3 -3
  107. data/tests/test_webview.rb +5 -5
  108. metadata +32 -394
  109. data/assets/repo-social-preview.odg +0 -0
  110. data/assets/repo-social-preview.xcf +0 -0
  111. data/lib/wx/aui/events/evt_list.rb +0 -148
  112. data/lib/wx/core/events/evt_list.rb +0 -1458
  113. data/lib/wx/core/font/encoding.rb +0 -113
  114. data/lib/wx/doc/gen/about_dialog_info.rb +0 -330
  115. data/lib/wx/doc/gen/accelerator.rb +0 -178
  116. data/lib/wx/doc/gen/activity_indicator.rb +0 -83
  117. data/lib/wx/doc/gen/affine_matrix2d.rb +0 -286
  118. data/lib/wx/doc/gen/animation.rb +0 -275
  119. data/lib/wx/doc/gen/animation_ctrl.rb +0 -300
  120. data/lib/wx/doc/gen/any_button.rb +0 -191
  121. data/lib/wx/doc/gen/app.rb +0 -463
  122. data/lib/wx/doc/gen/app_traits.rb +0 -396
  123. data/lib/wx/doc/gen/art_provider.rb +0 -617
  124. data/lib/wx/doc/gen/aui/aui_dock_art.rb +0 -455
  125. data/lib/wx/doc/gen/aui/aui_floating_frame.rb +0 -54
  126. data/lib/wx/doc/gen/aui/aui_manager.rb +0 -847
  127. data/lib/wx/doc/gen/aui/aui_manager_event.rb +0 -131
  128. data/lib/wx/doc/gen/aui/aui_mdi_child_frame.rb +0 -180
  129. data/lib/wx/doc/gen/aui/aui_mdi_client_window.rb +0 -59
  130. data/lib/wx/doc/gen/aui/aui_mdi_parent_frame.rb +0 -130
  131. data/lib/wx/doc/gen/aui/aui_notebook.rb +0 -631
  132. data/lib/wx/doc/gen/aui/aui_notebook_event.rb +0 -233
  133. data/lib/wx/doc/gen/aui/aui_pane_info.rb +0 -769
  134. data/lib/wx/doc/gen/aui/aui_tab_art.rb +0 -352
  135. data/lib/wx/doc/gen/aui/aui_tab_ctrl.rb +0 -14
  136. data/lib/wx/doc/gen/aui/aui_tool_bar.rb +0 -510
  137. data/lib/wx/doc/gen/aui/aui_tool_bar_art.rb +0 -340
  138. data/lib/wx/doc/gen/aui/aui_tool_bar_event.rb +0 -244
  139. data/lib/wx/doc/gen/aui/aui_tool_bar_item.rb +0 -257
  140. data/lib/wx/doc/gen/aui/event_list.rb +0 -179
  141. data/lib/wx/doc/gen/banner_window.rb +0 -124
  142. data/lib/wx/doc/gen/bitmap.rb +0 -731
  143. data/lib/wx/doc/gen/bitmap_button.rb +0 -123
  144. data/lib/wx/doc/gen/bitmap_combo_box.rb +0 -221
  145. data/lib/wx/doc/gen/book_ctrl_base.rb +0 -274
  146. data/lib/wx/doc/gen/book_ctrl_event.rb +0 -66
  147. data/lib/wx/doc/gen/box_sizer.rb +0 -85
  148. data/lib/wx/doc/gen/brush.rb +0 -251
  149. data/lib/wx/doc/gen/busy_info.rb +0 -157
  150. data/lib/wx/doc/gen/button.rb +0 -182
  151. data/lib/wx/doc/gen/calculate_layout_event.rb +0 -62
  152. data/lib/wx/doc/gen/calendar_ctrl.rb +0 -505
  153. data/lib/wx/doc/gen/calendar_date_attr.rb +0 -138
  154. data/lib/wx/doc/gen/calendar_event.rb +0 -147
  155. data/lib/wx/doc/gen/caret.rb +0 -97
  156. data/lib/wx/doc/gen/check_box.rb +0 -175
  157. data/lib/wx/doc/gen/check_list_box.rb +0 -121
  158. data/lib/wx/doc/gen/choice.rb +0 -175
  159. data/lib/wx/doc/gen/choicebook.rb +0 -116
  160. data/lib/wx/doc/gen/client_dc.rb +0 -43
  161. data/lib/wx/doc/gen/clipboard.rb +0 -144
  162. data/lib/wx/doc/gen/collapsible_pane.rb +0 -138
  163. data/lib/wx/doc/gen/collapsible_pane_event.rb +0 -46
  164. data/lib/wx/doc/gen/colour.rb +0 -333
  165. data/lib/wx/doc/gen/colour_dialog.rb +0 -190
  166. data/lib/wx/doc/gen/colour_picker_ctrl.rb +0 -110
  167. data/lib/wx/doc/gen/colour_picker_event.rb +0 -77
  168. data/lib/wx/doc/gen/combo_box.rb +0 -292
  169. data/lib/wx/doc/gen/combo_ctrl.rb +0 -662
  170. data/lib/wx/doc/gen/command_link_button.rb +0 -134
  171. data/lib/wx/doc/gen/config_base.rb +0 -10
  172. data/lib/wx/doc/gen/context_help_button.rb +0 -56
  173. data/lib/wx/doc/gen/control.rb +0 -277
  174. data/lib/wx/doc/gen/control_with_items.rb +0 -253
  175. data/lib/wx/doc/gen/core.rb +0 -45
  176. data/lib/wx/doc/gen/credential_entry_dialog.rb +0 -137
  177. data/lib/wx/doc/gen/cursor.rb +0 -193
  178. data/lib/wx/doc/gen/data_format.rb +0 -85
  179. data/lib/wx/doc/gen/data_object.rb +0 -436
  180. data/lib/wx/doc/gen/data_object_simple_base.rb +0 -10
  181. data/lib/wx/doc/gen/date_event.rb +0 -49
  182. data/lib/wx/doc/gen/date_picker_ctrl.rb +0 -161
  183. data/lib/wx/doc/gen/dc.rb +0 -1631
  184. data/lib/wx/doc/gen/dc_overlay.rb +0 -102
  185. data/lib/wx/doc/gen/defs.rb +0 -2802
  186. data/lib/wx/doc/gen/dial_up_event.rb +0 -45
  187. data/lib/wx/doc/gen/dial_up_manager.rb +0 -149
  188. data/lib/wx/doc/gen/dialog.rb +0 -541
  189. data/lib/wx/doc/gen/dir_dialog.rb +0 -164
  190. data/lib/wx/doc/gen/dir_filter_list_ctrl.rb +0 -90
  191. data/lib/wx/doc/gen/dir_picker_ctrl.rb +0 -125
  192. data/lib/wx/doc/gen/display.rb +0 -238
  193. data/lib/wx/doc/gen/drag_drop.rb +0 -299
  194. data/lib/wx/doc/gen/drag_image.rb +0 -116
  195. data/lib/wx/doc/gen/editable_list_box.rb +0 -109
  196. data/lib/wx/doc/gen/event.rb +0 -990
  197. data/lib/wx/doc/gen/event_blocker.rb +0 -50
  198. data/lib/wx/doc/gen/event_filter.rb +0 -92
  199. data/lib/wx/doc/gen/event_list.rb +0 -1644
  200. data/lib/wx/doc/gen/events.rb +0 -2809
  201. data/lib/wx/doc/gen/evt_handler.rb +0 -229
  202. data/lib/wx/doc/gen/ext_help_controller.rb +0 -155
  203. data/lib/wx/doc/gen/file_ctrl.rb +0 -231
  204. data/lib/wx/doc/gen/file_ctrl_event.rb +0 -83
  205. data/lib/wx/doc/gen/file_dialog.rb +0 -353
  206. data/lib/wx/doc/gen/file_dialog_custom_control.rb +0 -165
  207. data/lib/wx/doc/gen/file_dialog_customize_hook.rb +0 -158
  208. data/lib/wx/doc/gen/file_dir_picker_event.rb +0 -100
  209. data/lib/wx/doc/gen/file_picker_ctrl.rb +0 -132
  210. data/lib/wx/doc/gen/file_system.rb +0 -232
  211. data/lib/wx/doc/gen/find_dialog_event.rb +0 -126
  212. data/lib/wx/doc/gen/find_replace_data.rb +0 -60
  213. data/lib/wx/doc/gen/find_replace_dialog.rb +0 -58
  214. data/lib/wx/doc/gen/flex_grid_sizer.rb +0 -199
  215. data/lib/wx/doc/gen/font.rb +0 -1379
  216. data/lib/wx/doc/gen/font_data.rb +0 -151
  217. data/lib/wx/doc/gen/font_dialog.rb +0 -88
  218. data/lib/wx/doc/gen/font_picker_ctrl.rb +0 -143
  219. data/lib/wx/doc/gen/font_picker_event.rb +0 -65
  220. data/lib/wx/doc/gen/frame.rb +0 -352
  221. data/lib/wx/doc/gen/fs_file.rb +0 -337
  222. data/lib/wx/doc/gen/functions.rb +0 -10
  223. data/lib/wx/doc/gen/gauge.rb +0 -157
  224. data/lib/wx/doc/gen/gb_sizer_item.rb +0 -68
  225. data/lib/wx/doc/gen/gcdc.rb +0 -46
  226. data/lib/wx/doc/gen/gdi_common.rb +0 -1271
  227. data/lib/wx/doc/gen/gdi_object.rb +0 -31
  228. data/lib/wx/doc/gen/generic_about_dialog.rb +0 -140
  229. data/lib/wx/doc/gen/generic_dir_ctrl.rb +0 -223
  230. data/lib/wx/doc/gen/geometry.rb +0 -661
  231. data/lib/wx/doc/gen/graphics_context.rb +0 -1184
  232. data/lib/wx/doc/gen/graphics_object.rb +0 -750
  233. data/lib/wx/doc/gen/grid/event_list.rb +0 -191
  234. data/lib/wx/doc/gen/grid/grid_cell_activatable_editor.rb +0 -40
  235. data/lib/wx/doc/gen/grid/grid_cell_attr.rb +0 -280
  236. data/lib/wx/doc/gen/grid/grid_cell_auto_wrap_string_editor.rb +0 -35
  237. data/lib/wx/doc/gen/grid/grid_cell_auto_wrap_string_renderer.rb +0 -37
  238. data/lib/wx/doc/gen/grid/grid_cell_bool_editor.rb +0 -49
  239. data/lib/wx/doc/gen/grid/grid_cell_bool_renderer.rb +0 -35
  240. data/lib/wx/doc/gen/grid/grid_cell_choice_editor.rb +0 -46
  241. data/lib/wx/doc/gen/grid/grid_cell_date_editor.rb +0 -38
  242. data/lib/wx/doc/gen/grid/grid_cell_date_renderer.rb +0 -45
  243. data/lib/wx/doc/gen/grid/grid_cell_date_time_renderer.rb +0 -40
  244. data/lib/wx/doc/gen/grid/grid_cell_editor.rb +0 -197
  245. data/lib/wx/doc/gen/grid/grid_cell_enum_editor.rb +0 -39
  246. data/lib/wx/doc/gen/grid/grid_cell_enum_renderer.rb +0 -44
  247. data/lib/wx/doc/gen/grid/grid_cell_float_editor.rb +0 -45
  248. data/lib/wx/doc/gen/grid/grid_cell_float_renderer.rb +0 -79
  249. data/lib/wx/doc/gen/grid/grid_cell_number_editor.rb +0 -46
  250. data/lib/wx/doc/gen/grid/grid_cell_number_renderer.rb +0 -35
  251. data/lib/wx/doc/gen/grid/grid_cell_renderer.rb +0 -108
  252. data/lib/wx/doc/gen/grid/grid_cell_string_renderer.rb +0 -35
  253. data/lib/wx/doc/gen/grid/grid_cell_text_editor.rb +0 -49
  254. data/lib/wx/doc/gen/grid/grid_ctrl.rb +0 -3037
  255. data/lib/wx/doc/gen/grid/grid_editor_created_event.rb +0 -95
  256. data/lib/wx/doc/gen/grid/grid_event.rb +0 -129
  257. data/lib/wx/doc/gen/grid/grid_range_select_event.rb +0 -104
  258. data/lib/wx/doc/gen/grid/grid_size_event.rb +0 -85
  259. data/lib/wx/doc/gen/grid/grid_string_table.rb +0 -142
  260. data/lib/wx/doc/gen/grid/grid_table_base.rb +0 -317
  261. data/lib/wx/doc/gen/grid/grid_table_message.rb +0 -81
  262. data/lib/wx/doc/gen/grid_bag_sizer.rb +0 -323
  263. data/lib/wx/doc/gen/grid_sizer.rb +0 -195
  264. data/lib/wx/doc/gen/gui_event_loop.rb +0 -159
  265. data/lib/wx/doc/gen/h_scrolled_window.rb +0 -562
  266. data/lib/wx/doc/gen/header_ctrl.rb +0 -880
  267. data/lib/wx/doc/gen/header_ctrl_event.rb +0 -133
  268. data/lib/wx/doc/gen/help_controller.rb +0 -238
  269. data/lib/wx/doc/gen/help_provider.rb +0 -98
  270. data/lib/wx/doc/gen/html/event_list.rb +0 -38
  271. data/lib/wx/doc/gen/html/html_cell.rb +0 -536
  272. data/lib/wx/doc/gen/html/html_cell_event.rb +0 -69
  273. data/lib/wx/doc/gen/html/html_data_object.rb +0 -42
  274. data/lib/wx/doc/gen/html/html_easy_printing.rb +0 -203
  275. data/lib/wx/doc/gen/html/html_help_controller.rb +0 -382
  276. data/lib/wx/doc/gen/html/html_help_data.rb +0 -159
  277. data/lib/wx/doc/gen/html/html_help_window.rb +0 -258
  278. data/lib/wx/doc/gen/html/html_link_event.rb +0 -41
  279. data/lib/wx/doc/gen/html/html_list_box.rb +0 -346
  280. data/lib/wx/doc/gen/html/html_printout.rb +0 -109
  281. data/lib/wx/doc/gen/html/html_window.rb +0 -461
  282. data/lib/wx/doc/gen/hyperlink_ctrl.rb +0 -311
  283. data/lib/wx/doc/gen/hyperlink_event.rb +0 -44
  284. data/lib/wx/doc/gen/icon.rb +0 -267
  285. data/lib/wx/doc/gen/icon_location.rb +0 -40
  286. data/lib/wx/doc/gen/image.rb +0 -1371
  287. data/lib/wx/doc/gen/image_list.rb +0 -168
  288. data/lib/wx/doc/gen/info_bar.rb +0 -195
  289. data/lib/wx/doc/gen/keyboard_state.rb +0 -140
  290. data/lib/wx/doc/gen/list_box.rb +0 -304
  291. data/lib/wx/doc/gen/list_ctrl.rb +0 -1774
  292. data/lib/wx/doc/gen/list_event.rb +0 -208
  293. data/lib/wx/doc/gen/listbook.rb +0 -116
  294. data/lib/wx/doc/gen/locale.rb +0 -4293
  295. data/lib/wx/doc/gen/log.rb +0 -603
  296. data/lib/wx/doc/gen/mb_conv.rb +0 -10
  297. data/lib/wx/doc/gen/mdi_client_window.rb +0 -47
  298. data/lib/wx/doc/gen/mdi_frame.rb +0 -324
  299. data/lib/wx/doc/gen/media_ctrl.rb +0 -269
  300. data/lib/wx/doc/gen/media_event.rb +0 -117
  301. data/lib/wx/doc/gen/memory_dc.rb +0 -174
  302. data/lib/wx/doc/gen/menu.rb +0 -509
  303. data/lib/wx/doc/gen/menu_bar.rb +0 -287
  304. data/lib/wx/doc/gen/menu_item.rb +0 -362
  305. data/lib/wx/doc/gen/message_dialog.rb +0 -238
  306. data/lib/wx/doc/gen/mini_frame.rb +0 -108
  307. data/lib/wx/doc/gen/mirror_dc.rb +0 -22
  308. data/lib/wx/doc/gen/mouse_state.rb +0 -150
  309. data/lib/wx/doc/gen/multi_choice_dialog.rb +0 -80
  310. data/lib/wx/doc/gen/non_owned_window.rb +0 -49
  311. data/lib/wx/doc/gen/notebook.rb +0 -278
  312. data/lib/wx/doc/gen/num_validator.rb +0 -37
  313. data/lib/wx/doc/gen/number_entry_dialog.rb +0 -93
  314. data/lib/wx/doc/gen/object.rb +0 -59
  315. data/lib/wx/doc/gen/owner_drawn_combo_box.rb +0 -395
  316. data/lib/wx/doc/gen/paint_dc.rb +0 -27
  317. data/lib/wx/doc/gen/palette.rb +0 -92
  318. data/lib/wx/doc/gen/panel.rb +0 -127
  319. data/lib/wx/doc/gen/pen.rb +0 -511
  320. data/lib/wx/doc/gen/persistence_manager.rb +0 -135
  321. data/lib/wx/doc/gen/persistent_object.rb +0 -52
  322. data/lib/wx/doc/gen/persistent_window.rb +0 -241
  323. data/lib/wx/doc/gen/pg/event_list.rb +0 -106
  324. data/lib/wx/doc/gen/pg/numeric_property_validator.rb +0 -54
  325. data/lib/wx/doc/gen/pg/pg_array_editor_dialog.rb +0 -292
  326. data/lib/wx/doc/gen/pg/pg_cell.rb +0 -177
  327. data/lib/wx/doc/gen/pg/pg_editor.rb +0 -721
  328. data/lib/wx/doc/gen/pg/pg_multi_button.rb +0 -152
  329. data/lib/wx/doc/gen/pg/pg_properties.rb +0 -2829
  330. data/lib/wx/doc/gen/pg/pg_property.rb +0 -2078
  331. data/lib/wx/doc/gen/pg/pg_validation_info.rb +0 -344
  332. data/lib/wx/doc/gen/pg/property_grid.rb +0 -740
  333. data/lib/wx/doc/gen/pg/property_grid_event.rb +0 -184
  334. data/lib/wx/doc/gen/pg/property_grid_interface.rb +0 -1098
  335. data/lib/wx/doc/gen/pg/property_grid_manager.rb +0 -415
  336. data/lib/wx/doc/gen/pg/property_grid_page.rb +0 -354
  337. data/lib/wx/doc/gen/pg/property_grid_page_state.rb +0 -165
  338. data/lib/wx/doc/gen/picker_base.rb +0 -152
  339. data/lib/wx/doc/gen/platform_info.rb +0 -622
  340. data/lib/wx/doc/gen/popup_window.rb +0 -107
  341. data/lib/wx/doc/gen/progress_dialog.rb +0 -100
  342. data/lib/wx/doc/gen/property_sheet_dialog.rb +0 -216
  343. data/lib/wx/doc/gen/prt/event_list.rb +0 -17
  344. data/lib/wx/doc/gen/prt/page_setup_dialog.rb +0 -44
  345. data/lib/wx/doc/gen/prt/post_script_dc.rb +0 -30
  346. data/lib/wx/doc/gen/prt/preview_frame.rb +0 -78
  347. data/lib/wx/doc/gen/prt/print_abort_dialog.rb +0 -151
  348. data/lib/wx/doc/gen/prt/print_data.rb +0 -804
  349. data/lib/wx/doc/gen/prt/print_dialog.rb +0 -55
  350. data/lib/wx/doc/gen/prt/printer.rb +0 -518
  351. data/lib/wx/doc/gen/prt/printer_dc.rb +0 -37
  352. data/lib/wx/doc/gen/query_layout_info_event.rb +0 -106
  353. data/lib/wx/doc/gen/radio_box.rb +0 -306
  354. data/lib/wx/doc/gen/radio_button.rb +0 -159
  355. data/lib/wx/doc/gen/rbn/event_list.rb +0 -136
  356. data/lib/wx/doc/gen/rbn/ribbon_art_provider.rb +0 -1142
  357. data/lib/wx/doc/gen/rbn/ribbon_bar.rb +0 -308
  358. data/lib/wx/doc/gen/rbn/ribbon_bar_event.rb +0 -45
  359. data/lib/wx/doc/gen/rbn/ribbon_button_bar.rb +0 -458
  360. data/lib/wx/doc/gen/rbn/ribbon_button_bar_event.rb +0 -63
  361. data/lib/wx/doc/gen/rbn/ribbon_control.rb +0 -143
  362. data/lib/wx/doc/gen/rbn/ribbon_gallery.rb +0 -229
  363. data/lib/wx/doc/gen/rbn/ribbon_gallery_event.rb +0 -55
  364. data/lib/wx/doc/gen/rbn/ribbon_page.rb +0 -174
  365. data/lib/wx/doc/gen/rbn/ribbon_panel.rb +0 -270
  366. data/lib/wx/doc/gen/rbn/ribbon_panel_event.rb +0 -45
  367. data/lib/wx/doc/gen/rbn/ribbon_tool_bar.rb +0 -360
  368. data/lib/wx/doc/gen/rbn/ribbon_tool_bar_event.rb +0 -42
  369. data/lib/wx/doc/gen/rearrange_ctrl.rb +0 -78
  370. data/lib/wx/doc/gen/rearrange_list.rb +0 -123
  371. data/lib/wx/doc/gen/region.rb +0 -380
  372. data/lib/wx/doc/gen/region_iterator.rb +0 -76
  373. data/lib/wx/doc/gen/rich_tool_tip.rb +0 -154
  374. data/lib/wx/doc/gen/rt/event_list.rb +0 -17
  375. data/lib/wx/doc/gen/rt/shared_evt_handler.rb +0 -14
  376. data/lib/wx/doc/gen/rt/thread_event.rb +0 -71
  377. data/lib/wx/doc/gen/rtc/event_list.rb +0 -125
  378. data/lib/wx/doc/gen/rtc/rich_text_box.rb +0 -445
  379. data/lib/wx/doc/gen/rtc/rich_text_buffer.rb +0 -1188
  380. data/lib/wx/doc/gen/rtc/rich_text_buffer_data_object.rb +0 -41
  381. data/lib/wx/doc/gen/rtc/rich_text_composite_object.rb +0 -538
  382. data/lib/wx/doc/gen/rtc/rich_text_ctrl.rb +0 -2103
  383. data/lib/wx/doc/gen/rtc/rich_text_event.rb +0 -173
  384. data/lib/wx/doc/gen/rtc/rich_text_file_handler.rb +0 -181
  385. data/lib/wx/doc/gen/rtc/rich_text_formatting_dialog.rb +0 -319
  386. data/lib/wx/doc/gen/rtc/rich_text_header_footer_data.rb +0 -193
  387. data/lib/wx/doc/gen/rtc/rich_text_html_handler.rb +0 -102
  388. data/lib/wx/doc/gen/rtc/rich_text_image.rb +0 -337
  389. data/lib/wx/doc/gen/rtc/rich_text_object.rb +0 -2922
  390. data/lib/wx/doc/gen/rtc/rich_text_paragraph_layout_box.rb +0 -1240
  391. data/lib/wx/doc/gen/rtc/rich_text_printing.rb +0 -258
  392. data/lib/wx/doc/gen/rtc/rich_text_style_list_box.rb +0 -344
  393. data/lib/wx/doc/gen/rtc/rich_text_style_organiser_dialog.rb +0 -227
  394. data/lib/wx/doc/gen/rtc/rich_text_xml_handler.rb +0 -59
  395. data/lib/wx/doc/gen/rtc/symbol_picker_dialog.rb +0 -169
  396. data/lib/wx/doc/gen/sash_event.rb +0 -147
  397. data/lib/wx/doc/gen/sash_layout_window.rb +0 -232
  398. data/lib/wx/doc/gen/sash_window.rb +0 -171
  399. data/lib/wx/doc/gen/scaled_dc.rb +0 -10
  400. data/lib/wx/doc/gen/screen_dc.rb +0 -30
  401. data/lib/wx/doc/gen/scroll_bar.rb +0 -204
  402. data/lib/wx/doc/gen/scrolled_canvas.rb +0 -410
  403. data/lib/wx/doc/gen/scrolled_control.rb +0 -410
  404. data/lib/wx/doc/gen/scrolled_window.rb +0 -430
  405. data/lib/wx/doc/gen/search_ctrl.rb +0 -159
  406. data/lib/wx/doc/gen/secret_store.rb +0 -116
  407. data/lib/wx/doc/gen/simplebook.rb +0 -110
  408. data/lib/wx/doc/gen/single_choice_dialog.rb +0 -89
  409. data/lib/wx/doc/gen/sizer.rb +0 -945
  410. data/lib/wx/doc/gen/sizer_item.rb +0 -244
  411. data/lib/wx/doc/gen/slider.rb +0 -342
  412. data/lib/wx/doc/gen/spin_button.rb +0 -157
  413. data/lib/wx/doc/gen/spin_ctrl.rb +0 -231
  414. data/lib/wx/doc/gen/spin_ctrl_double.rb +0 -192
  415. data/lib/wx/doc/gen/spin_double_event.rb +0 -55
  416. data/lib/wx/doc/gen/spin_event.rb +0 -51
  417. data/lib/wx/doc/gen/splash_screen.rb +0 -113
  418. data/lib/wx/doc/gen/splitter_event.rb +0 -99
  419. data/lib/wx/doc/gen/splitter_window.rb +0 -498
  420. data/lib/wx/doc/gen/static_bitmap.rb +0 -256
  421. data/lib/wx/doc/gen/static_box.rb +0 -180
  422. data/lib/wx/doc/gen/static_box_sizer.rb +0 -85
  423. data/lib/wx/doc/gen/static_line.rb +0 -83
  424. data/lib/wx/doc/gen/static_text.rb +0 -127
  425. data/lib/wx/doc/gen/status_bar.rb +0 -290
  426. data/lib/wx/doc/gen/stc/event_list.rb +0 -221
  427. data/lib/wx/doc/gen/stc/styled_text_ctrl.rb +0 -4474
  428. data/lib/wx/doc/gen/stc/styled_text_event.rb +0 -8762
  429. data/lib/wx/doc/gen/std_dialog_button_sizer.rb +0 -129
  430. data/lib/wx/doc/gen/svg_file_dc.rb +0 -164
  431. data/lib/wx/doc/gen/system_options.rb +0 -129
  432. data/lib/wx/doc/gen/system_settings.rb +0 -507
  433. data/lib/wx/doc/gen/task_bar_icon.rb +0 -127
  434. data/lib/wx/doc/gen/task_bar_icon_event.rb +0 -88
  435. data/lib/wx/doc/gen/text_attr.rb +0 -756
  436. data/lib/wx/doc/gen/text_ctrl.rb +0 -1033
  437. data/lib/wx/doc/gen/text_entry.rb +0 -441
  438. data/lib/wx/doc/gen/text_entry_dialog.rb +0 -220
  439. data/lib/wx/doc/gen/text_validator.rb +0 -245
  440. data/lib/wx/doc/gen/time_picker_ctrl.rb +0 -128
  441. data/lib/wx/doc/gen/timer.rb +0 -119
  442. data/lib/wx/doc/gen/timer_event.rb +0 -68
  443. data/lib/wx/doc/gen/tip_provider.rb +0 -63
  444. data/lib/wx/doc/gen/tip_window.rb +0 -51
  445. data/lib/wx/doc/gen/toggle_button.rb +0 -182
  446. data/lib/wx/doc/gen/tool_bar.rb +0 -890
  447. data/lib/wx/doc/gen/tool_tip.rb +0 -86
  448. data/lib/wx/doc/gen/toolbook.rb +0 -118
  449. data/lib/wx/doc/gen/top_level_window.rb +0 -516
  450. data/lib/wx/doc/gen/tree_ctrl.rb +0 -1052
  451. data/lib/wx/doc/gen/tree_event.rb +0 -127
  452. data/lib/wx/doc/gen/treebook.rb +0 -180
  453. data/lib/wx/doc/gen/ui_action_simulator.rb +0 -109
  454. data/lib/wx/doc/gen/utils.rb +0 -273
  455. data/lib/wx/doc/gen/v_list_box.rb +0 -272
  456. data/lib/wx/doc/gen/v_scrolled_canvas.rb +0 -195
  457. data/lib/wx/doc/gen/v_scrolled_window.rb +0 -191
  458. data/lib/wx/doc/gen/validator.rb +0 -68
  459. data/lib/wx/doc/gen/variant.rb +0 -294
  460. data/lib/wx/doc/gen/web/event_list.rb +0 -95
  461. data/lib/wx/doc/gen/web/web_view.rb +0 -1136
  462. data/lib/wx/doc/gen/web/web_view_event.rb +0 -210
  463. data/lib/wx/doc/gen/web/web_view_handler.rb +0 -318
  464. data/lib/wx/doc/gen/window.rb +0 -2917
  465. data/lib/wx/doc/gen/window_dc.rb +0 -38
  466. data/lib/wx/doc/gen/window_disabler.rb +0 -30
  467. data/lib/wx/doc/gen/with_images.rb +0 -84
  468. data/lib/wx/doc/gen/wizard.rb +0 -257
  469. data/lib/wx/doc/gen/wizard_event.rb +0 -113
  470. data/lib/wx/doc/gen/wizard_page.rb +0 -65
  471. data/lib/wx/doc/gen/wizard_page_simple.rb +0 -88
  472. data/lib/wx/doc/gen/wrap_sizer.rb +0 -79
  473. data/lib/wx/doc/gen/xml_node.rb +0 -316
  474. data/lib/wx/doc/gen/xml_resource.rb +0 -320
  475. data/lib/wx/grid/events/evt_list.rb +0 -166
  476. data/lib/wx/html/events/evt_list.rb +0 -27
  477. data/lib/wx/pg/events/evt_list.rb +0 -73
  478. data/lib/wx/rbn/events/evt_list.rb +0 -102
  479. data/lib/wx/rt/events/evt_list.rb +0 -8
  480. data/lib/wx/rtc/events/evt_list.rb +0 -98
  481. data/lib/wx/rtc/ext/rich_text_ctrl.rb +0 -24
  482. data/lib/wx/stc/events/evt_list.rb +0 -178
  483. data/lib/wx/web/events/evt_list.rb +0 -74
  484. data/samples/art/wxruby-512x512.png +0 -0
  485. data/tests/assets/test.css +0 -1
  486. data/tests/assets/test.html +0 -9
  487. /data/ext/wxruby3/swig/custom/{director.swg → common/director.swg} +0 -0
  488. /data/ext/wxruby3/swig/custom/{rubyapi.swg → common/rubyapi.swg} +0 -0
  489. /data/ext/wxruby3/swig/custom/{rubyerrors.swg → common/rubyerrors.swg} +0 -0
  490. /data/ext/wxruby3/swig/custom/{rubytracking.swg → common/rubytracking.swg} +0 -0
  491. /data/ext/wxruby3/swig/custom/{swiglabels.swg → common/swiglabels.swg} +0 -0
  492. /data/ext/wxruby3/swig/custom/{typemaps → common/typemaps}/swigtypemaps.swg +0 -0
  493. /data/ext/wxruby3/swig/custom/{wx_ruby_shared_ptr.i → common/wx_ruby_shared_ptr.i} +0 -0
  494. /data/ext/wxruby3/swig/custom/{wx_shared_ptr.i → common/wx_shared_ptr.i} +0 -0
  495. /data/ext/wxruby3/swig/custom/{rubyhead.swg → untyped_data/rubyhead.swg} +0 -0
  496. /data/ext/wxruby3/swig/custom/{rubyrun.swg → untyped_data/rubyrun.swg} +0 -0
  497. /data/ext/wxruby3/swig/custom/{swigrun.swg → untyped_data/swigrun.swg} +0 -0
  498. /data/rakelib/lib/core/include/{swigrubyrun.inc → untyped_data/swigrubyrun.inc} +0 -0
  499. /data/rakelib/lib/core/include/{swigrun.inc → untyped_data/swigrun.inc} +0 -0
@@ -84,13 +84,22 @@ module WXRuby3
84
84
  swig_type_info* type = wxRuby_GetSwigTypeForClass(rb_event_class);
85
85
  swig_class* class_info = (swig_class*)type->clientdata;
86
86
  // Create a new (owned) Ruby event object
87
- VALUE rb_evt = Data_Wrap_Struct(class_info->klass, VOIDFUNC(class_info->mark),
88
- VOIDFUNC(class_info->destroy),
89
- wx_evt);
90
- // track new event object
91
- SWIG_RubyAddTracking(wx_evt, rb_evt);
87
+ VALUE rb_evt;
88
+ #ifdef WXRUBY_SWIG_UNTYPED_DATA
89
+ rb_evt = Data_Wrap_Struct(class_info->klass, VOIDFUNC(class_info->mark),
90
+ VOIDFUNC(class_info->destroy),
91
+ wx_evt);
92
+ #else
93
+ struct swig_ruby_wrapped_object *wrobj;
94
+ rb_evt = TypedData_Make_Struct(class_info->klass, struct swig_ruby_wrapped_object, &class_info->cext_type, wrobj);
95
+ wrobj->data = wx_evt;
96
+ wrobj->dmark = class_info->mark;
97
+ wrobj->dfree = class_info->destroy;
98
+ #endif
92
99
  // do not forget to mark the instance with the mangled swig type name
93
100
  rb_iv_set(rb_evt, "@__swigtype__", rb_str_new2(type->name));
101
+ // track new event object
102
+ SWIG_RubyAddTracking(wx_evt, rb_evt);
94
103
 
95
104
  WXRUBY_TRACE_IF(WxRubyTraceGCWrapEvents, 2)
96
105
  WXRUBY_TRACE("< wxRuby_WrapClonedWxEvent - wrapped cloned event " << wx_evt << "{" << type->name << "}")
@@ -129,7 +138,7 @@ module WXRuby3
129
138
  VALUE r_obj = SWIG_RubyInstanceFor((void *)this);
130
139
  VALUE r_obj_dup = rb_obj_clone(r_obj);
131
140
 
132
- DATA_PTR(r_obj_dup) = wx_ev;
141
+ WXRUBY_WRAPPER_DATA_PTR_SET(r_obj_dup, wx_ev);
133
142
  wxRuby_AddTracking( (void*)wx_ev, r_obj_dup );
134
143
  return wx_ev;
135
144
  }
@@ -203,7 +212,7 @@ module WXRuby3
203
212
  VALUE r_obj = SWIG_RubyInstanceFor((void *)this);
204
213
  VALUE r_obj_dup = rb_obj_clone(r_obj);
205
214
 
206
- DATA_PTR(r_obj_dup) = wx_ev;
215
+ WXRUBY_WRAPPER_DATA_PTR_SET(r_obj_dup, wx_ev);
207
216
  wxRuby_AddTracking( (void*)wx_ev, r_obj_dup );
208
217
  return wx_ev;
209
218
  }
@@ -53,7 +53,7 @@ module WXRuby3
53
53
  # User defined events however need to maintain their tracking register as we need to keep
54
54
  # the state of the linked Ruby objects. As WxW will clean up later we can however release ownership.
55
55
  map_in code: <<~__CODE
56
- $1 = (wxEvent*)DATA_PTR($input);
56
+ $1 = (wxEvent*)WXRUBY_WRAPPER_DATA_PTR($input);
57
57
  if (!wxRuby_Is_RubyEvent($1))
58
58
  {
59
59
  SWIG_RubyUnlinkObjects((void*)$1);
@@ -62,7 +62,7 @@ module WXRuby3
62
62
  else
63
63
  {
64
64
  // no need to do anything as c++ dtor will untrack/unlink
65
- RDATA($input)->dfree = 0;
65
+ WXRUBY_WRAPPER_DATA_DFREE_RESET($input);
66
66
  }
67
67
  __CODE
68
68
  end
@@ -234,6 +234,23 @@ module WXRuby3
234
234
  static void GC_mark_AsyncMethodCallEvent(void *ptr);
235
235
  static void free_AsyncMethodCallEvent(void *ptr);
236
236
 
237
+ #ifdef WXRUBY_SWIG_TYPED_DATA
238
+
239
+ static const rb_data_type_t wxruby_async_call_event_data_type = {
240
+ "RbAsyncProcCallEvent",
241
+ #if RUBY_API_VERSION_MAJOR > 4 || (RUBY_API_VERSION_MAJOR == 4 && RUBY_API_VERSION_MINOR >= 1)
242
+ { SWIG_Ruby_mark_swig_type, SWIG_Ruby_free_swig_type, 0, 0, 0, {}},
243
+ #else
244
+ { SWIG_Ruby_mark_swig_type, SWIG_Ruby_free_swig_type, 0, 0, {}},
245
+ #endif
246
+ 0, 0
247
+ #ifdef RUBY_TYPED_FREE_IMMEDIATELY
248
+ , SWIG_RUBY_TYPED_DATA_FLAGS
249
+ #endif
250
+ };
251
+
252
+ #endif
253
+
237
254
  class RbAsyncProcCallEvent : public wxAsyncMethodCallEvent
238
255
  {
239
256
  public:
@@ -256,10 +273,21 @@ module WXRuby3
256
273
  {
257
274
  RbAsyncProcCallEvent* wx_ev = new RbAsyncProcCallEvent(*this);
258
275
  // Create a new Ruby event object (owned)
259
- VALUE rb_evt = Data_Wrap_Struct(WxRuby_GetAsyncProcCallEvent_Class(),
260
- VOIDFUNC(GC_mark_AsyncMethodCallEvent),
261
- VOIDFUNC(free_AsyncMethodCallEvent),
262
- wx_ev);
276
+ VALUE rb_evt;
277
+ #ifdef WXRUBY_SWIG_UNTYPED_DATA
278
+ rb_evt = Data_Wrap_Struct(WxRuby_GetAsyncProcCallEvent_Class(),
279
+ VOIDFUNC(GC_mark_AsyncMethodCallEvent),
280
+ VOIDFUNC(free_AsyncMethodCallEvent),
281
+ wx_ev);
282
+ #else
283
+ struct swig_ruby_wrapped_object *wrobj;
284
+ rb_evt = TypedData_Make_Struct(WxRuby_GetAsyncProcCallEvent_Class(), struct swig_ruby_wrapped_object,
285
+ &wxruby_async_call_event_data_type, wrobj);
286
+ wrobj->data = wx_ev;
287
+ wrobj->dmark = GC_mark_AsyncMethodCallEvent;
288
+ wrobj->dfree = free_AsyncMethodCallEvent;
289
+ #endif
290
+ rb_iv_set(rb_evt, "@__swigtype__", rb_str_new2("RbAsyncProcCallEvent"));
263
291
  wxRuby_AddTracking( (void*)wx_ev, rb_evt);
264
292
  return wx_ev;
265
293
  }
@@ -398,10 +426,20 @@ module WXRuby3
398
426
  // create C++ event
399
427
  RbAsyncProcCallEvent * evt = new RbAsyncProcCallEvent(self, call);
400
428
  // Create a new Ruby event object (leave ownership to wxWidgets C++)
401
- VALUE rb_evt = Data_Wrap_Struct(WxRuby_GetAsyncProcCallEvent_Class(),
402
- VOIDFUNC(GC_mark_AsyncMethodCallEvent),
403
- 0,
404
- evt);
429
+ VALUE rb_evt;
430
+ #ifdef WXRUBY_SWIG_UNTYPED_DATA
431
+ rb_evt = Data_Wrap_Struct(WxRuby_GetAsyncProcCallEvent_Class(),
432
+ VOIDFUNC(GC_mark_AsyncMethodCallEvent),
433
+ 0,
434
+ evt);
435
+ #else
436
+ struct swig_ruby_wrapped_object *wrobj;
437
+ rb_evt = TypedData_Make_Struct(WxRuby_GetAsyncProcCallEvent_Class(), struct swig_ruby_wrapped_object,
438
+ &wxruby_async_call_event_data_type, wrobj);
439
+ wrobj->data = evt;
440
+ wrobj->dmark = GC_mark_AsyncMethodCallEvent;
441
+ #endif
442
+ rb_iv_set(rb_evt, "@__swigtype__", rb_str_new2("RbAsyncProcCallEvent"));
405
443
  // track it and the call object
406
444
  wxRuby_AddTracking( (void*)evt, rb_evt);
407
445
  // queue it (wxWidgets takes ownership of C++ event object)
@@ -30,10 +30,12 @@ module WXRuby3
30
30
  spec.items.concat %w[wxMouseCaptureChangedEvent wxMouseCaptureLostEvent wxDisplayChangedEvent]
31
31
  end
32
32
  spec.fold_bases('wxMouseEvent' => %w[wxMouseState wxKeyboardState], 'wxKeyEvent' => 'wxKeyboardState')
33
- spec.ignore 'wxShowEvent::GetShow', 'wxIconizeEvent::Iconized'
33
+ if Config.instance.wx_version_check('3.3.4') < 0
34
+ spec.ignore 'wxShowEvent::GetShow'
35
+ end
36
+ spec.ignore 'wxIconizeEvent::Iconized'
34
37
  spec.ignore 'wxKeyEvent::GetPosition(wxCoord *,wxCoord *) const'
35
38
  spec.ignore 'wxMouseState::GetPosition(int *,int *)'
36
- spec.ignore 'wxShowEvent::GetShow', 'wxIconizeEvent::Iconized'
37
39
  spec.do_not_generate(:variables, :defines, :enums, :functions)
38
40
  end
39
41
 
@@ -0,0 +1,46 @@
1
+ # Copyright (c) 2023 M.J.N. Corino, The Netherlands
2
+ #
3
+ # This software is released under the MIT license.
4
+
5
+ ###
6
+ # wxRuby3 wxWidgets interface director
7
+ ###
8
+
9
+ module WXRuby3
10
+
11
+ class Director
12
+
13
+ class FileHistory < Director
14
+
15
+ include Typemap::ConfigBase
16
+
17
+ def setup
18
+ super
19
+ spec.gc_as_untracked 'wxFileHistory'
20
+ spec.ignore 'wxFileHistory::GetMenus',
21
+ ignore_doc: false
22
+ spec.map 'const wxList&' => 'Array<Wx::Menu>', swig: false do
23
+ map_out
24
+ end
25
+ spec.add_extend_code 'wxFileHistory', <<~__CODE
26
+ VALUE get_menus()
27
+ {
28
+ VALUE ary = rb_ary_new();
29
+ const wxList& lst = $self->GetMenus();
30
+ for (wxList::compatibility_iterator node = lst.GetFirst();
31
+ node; node = node->GetNext())
32
+ {
33
+ wxMenu *menu = (wxMenu *) node->GetData();
34
+ VALUE rb_menu = SWIG_NewPointerObj(SWIG_as_voidptr(menu),
35
+ SWIGTYPE_p_wxMenu, 0);
36
+ rb_ary_push(ary, rb_menu);
37
+ }
38
+ return ary;
39
+ }
40
+ __CODE
41
+ end
42
+ end # class FileHistory
43
+
44
+ end # class Director
45
+
46
+ end # module WXRuby3
@@ -33,6 +33,34 @@ module WXRuby3
33
33
  'wxFrame::GetMenuBar',
34
34
  'wxFrame::GetStatusBar',
35
35
  'wxFrame::GetToolBar')
36
+ spec.add_wrapper_code <<~__HEREDOC
37
+ extern VALUE wxRuby_GetFrameClass() {
38
+ return SwigClassWxFrame.klass;
39
+ }
40
+ __HEREDOC
41
+ spec.add_header_code <<~__HEREDOC
42
+ WXRUBY_TRACE_GUARD(WxRubyTraceMarkFrame, "GC_MARK_FRAME")
43
+ WXRUBY_EXPORT void GC_mark_wxFrame(void* ptr)
44
+ {
45
+ WXRUBY_TRACE_IF(WxRubyTraceMarkFrame, 2)
46
+ WXRUBY_TRACE("> GC_mark_wxFrame : " << ptr)
47
+ WXRUBY_TRACE_END
48
+
49
+ if (GC_IsWindowDeleted(ptr)) return;
50
+
51
+ GC_mark_wxWindow(ptr);
52
+
53
+ wxFrame* wx_frame = reinterpret_cast<wxFrame*> (ptr);
54
+
55
+ // Mark attached menu bars
56
+ wxMenuBar* wx_mb = wx_frame->GetMenuBar();
57
+ rb_gc_mark(SWIG_RubyInstanceFor(wx_mb));
58
+
59
+ WXRUBY_TRACE_IF(WxRubyTraceMarkFrame, 2)
60
+ WXRUBY_TRACE("< GC_mark_wxFrame : " << ptr)
61
+ WXRUBY_TRACE_END
62
+ }
63
+ __HEREDOC
36
64
  end
37
65
  # for SetStatusWidths
38
66
  spec.map 'int n, int * widths_field' do
@@ -62,6 +90,7 @@ module WXRuby3
62
90
  spec.items.each do |citem|
63
91
  def_item = defmod.find_item(citem)
64
92
  if Extractor::ClassDef === def_item && (citem == 'wxFrame' || spec.is_derived_from?(def_item, 'wxFrame'))
93
+ spec.add_swig_code "%markfunc #{spec.class_name(citem)} \"GC_mark_wxFrame\";"
65
94
  spec.no_proxy %W[
66
95
  #{spec.class_name(citem)}::CreateStatusBar
67
96
  #{spec.class_name(citem)}::CreateToolBar
@@ -86,6 +86,29 @@ module WXRuby3
86
86
  return nread>0 ? rb_str_new(buffer.get(), nread) : Qnil;
87
87
  }
88
88
  __HEREDOC
89
+ if Config.instance.wx_version_check('3.3.3') >= 0
90
+ # covered by custom ReadAll()
91
+ spec.ignore 'wxInputStream::Read(std::vector<wxUint8> &)'
92
+ spec.add_extend_code 'wxInputStream', <<~__HEREDOC
93
+ VALUE ReadAll()
94
+ {
95
+ std::vector<wxUint8> buffer;
96
+ $self->Read(buffer);
97
+ return buffer.size()>0 ? rb_str_new(reinterpret_cast<char*> (buffer.data()), buffer.size()) : Qnil;
98
+ }
99
+ __HEREDOC
100
+ else
101
+ spec.include 'wx/mstream.h'
102
+ spec.add_extend_code 'wxInputStream', <<~__HEREDOC
103
+ VALUE ReadAll()
104
+ {
105
+ wxMemoryOutputStream stream;
106
+ $self->Read(stream);
107
+ wxStreamBuffer* buffer = stream.GetOutputStreamBuffer();
108
+ return buffer->GetBufferSize()>0 ? rb_str_new(reinterpret_cast<char*> (buffer->GetBufferStart()), buffer->GetBufferSize()) : Qnil;
109
+ }
110
+ __HEREDOC
111
+ end
89
112
  # for Read(wxOutputStream&)
90
113
  spec.map 'wxInputStream&' => 'Wx::InputStream' do
91
114
  map_out code: '$result = self; wxUnusedVar($1);'
@@ -323,8 +346,7 @@ module WXRuby3
323
346
  {
324
347
  if (wxRuby_IsInputStream(rbis))
325
348
  {
326
- void *ptr;
327
- Data_Get_Struct(rbis, void, ptr);
349
+ void *ptr = WXRUBY_WRAPPER_DATA_GET(rbis, void);
328
350
  return static_cast<wxInputStream*>(ptr);
329
351
  }
330
352
  return 0;
@@ -359,8 +381,7 @@ module WXRuby3
359
381
  {
360
382
  if (wxRuby_IsOutputStream(rbos))
361
383
  {
362
- void *ptr;
363
- Data_Get_Struct(rbos, void, ptr);
384
+ void *ptr = WXRUBY_WRAPPER_DATA_GET(rbos, void);
364
385
  return static_cast<wxOutputStream*>(ptr);
365
386
  }
366
387
  return 0;
@@ -147,7 +147,7 @@ module WXRuby3
147
147
  // To a specific window's status bar
148
148
  if( TYPE(argv[0]) == T_DATA ) {
149
149
  log_msg = rb_f_sprintf(argc-1, &argv[1]);
150
- Data_Get_Struct(argv[0], wxFrame, log_frame);
150
+ log_frame = WXRUBY_WRAPPER_DATA_GET(argv[0], wxFrame);
151
151
  }
152
152
  // To the application main window's status bar
153
153
  else {
@@ -190,7 +190,7 @@ module WXRuby3
190
190
  {
191
191
  static WxRuby_ID sprintf_id("sprintf");
192
192
 
193
- size_t ptr = (size_t)DATA_PTR(obj);
193
+ size_t ptr = (size_t)WXRUBY_WRAPPER_DATA_PTR(obj);
194
194
  return rb_funcall( rb_mKernel, sprintf_id(), 2,
195
195
  rb_str_new2("0x%x"), OFFT2NUM(ptr) );
196
196
  }
@@ -244,7 +244,7 @@ module WXRuby3
244
244
  VALUE rb_gc = SWIG_NewPointerObj(SWIG_as_voidptr(p_gc), SWIGTYPE_p_wxGraphicsContext, 1);
245
245
  rc = rb_yield(rb_gc);
246
246
  SWIG_RubyRemoveTracking((void *)p_gc);
247
- DATA_PTR(rb_gc) = NULL;
247
+ WXRUBY_WRAPPER_DATA_PTR_RESET(rb_gc);
248
248
  delete p_gc;
249
249
  }
250
250
  return rc;
@@ -261,7 +261,7 @@ module WXRuby3
261
261
  VALUE rb_gc = SWIG_NewPointerObj(SWIG_as_voidptr(p_gc), SWIGTYPE_p_wxGraphicsContext, 1);
262
262
  rc = rb_yield(rb_gc);
263
263
  SWIG_RubyRemoveTracking((void *)p_gc);
264
- DATA_PTR(rb_gc) = NULL;
264
+ WXRUBY_WRAPPER_DATA_PTR_RESET(rb_gc);
265
265
  delete p_gc;
266
266
  }
267
267
  return rc;
@@ -275,7 +275,7 @@ module WXRuby3
275
275
  VALUE rb_gc = SWIG_NewPointerObj(SWIG_as_voidptr(p_gc), SWIGTYPE_p_wxGraphicsContext, 1);
276
276
  rc = rb_yield(rb_gc);
277
277
  SWIG_RubyRemoveTracking((void *)p_gc);
278
- DATA_PTR(rb_gc) = NULL;
278
+ WXRUBY_WRAPPER_DATA_PTR_RESET(rb_gc);
279
279
  delete p_gc;
280
280
  }
281
281
  return rc;
@@ -289,7 +289,7 @@ module WXRuby3
289
289
  VALUE rb_gc = SWIG_NewPointerObj(SWIG_as_voidptr(p_gc), SWIGTYPE_p_wxGraphicsContext, 1);
290
290
  rc = rb_yield(rb_gc);
291
291
  SWIG_RubyRemoveTracking((void *)p_gc);
292
- DATA_PTR(rb_gc) = NULL;
292
+ WXRUBY_WRAPPER_DATA_PTR_RESET(rb_gc);
293
293
  delete p_gc;
294
294
  }
295
295
  return rc;
@@ -303,7 +303,7 @@ module WXRuby3
303
303
  VALUE rb_gc = SWIG_NewPointerObj(SWIG_as_voidptr(p_gc), SWIGTYPE_p_wxGraphicsContext, 1);
304
304
  rc = rb_yield(rb_gc);
305
305
  SWIG_RubyRemoveTracking((void *)p_gc);
306
- DATA_PTR(rb_gc) = NULL;
306
+ WXRUBY_WRAPPER_DATA_PTR_RESET(rb_gc);
307
307
  delete p_gc;
308
308
  }
309
309
  return rc;
@@ -317,7 +317,7 @@ module WXRuby3
317
317
  VALUE rb_gc = SWIG_NewPointerObj(SWIG_as_voidptr(p_gc), SWIGTYPE_p_wxGraphicsContext, 1);
318
318
  rc = rb_yield(rb_gc);
319
319
  SWIG_RubyRemoveTracking((void *)p_gc);
320
- DATA_PTR(rb_gc) = NULL;
320
+ WXRUBY_WRAPPER_DATA_PTR_RESET(rb_gc);
321
321
  delete p_gc;
322
322
  }
323
323
  return rc;
@@ -280,7 +280,7 @@ module WXRuby3
280
280
  }
281
281
  else if (rbEvt != Qnil)
282
282
  {
283
- const wxEvent* evt = (const wxEvent*)DATA_PTR(rbEvt);
283
+ const wxEvent* evt = (const wxEvent*)WXRUBY_WRAPPER_DATA_PTR(rbEvt);
284
284
  if (SYM2ID(rbOrg) == ga_key_id())
285
285
  return wxGridActivationSource::From(*(const wxKeyEvent*)evt);
286
286
  else if (SYM2ID(rbOrg) == ga_mouse_id())
@@ -113,7 +113,7 @@ module WXRuby3
113
113
 
114
114
  extern void GC_free_GridCellRenderer(void *ptr)
115
115
  {
116
- wxGridCellRenderer* gc_rdr = (wxGridCellRenderer*)ptr;
116
+ wxGridCellRenderer* gc_rdr = (wxGridCellRenderer*)ptr;
117
117
  if (ptr)
118
118
  gc_rdr->DecRef();
119
119
  }
@@ -64,8 +64,7 @@ module WXRuby3
64
64
  #define FOREACH_FUNC(x) reinterpret_cast<rb_foreach_func>((void*)&(x))
65
65
  static int _wxrb_cvt_custom_sizes(VALUE key, VALUE value, VALUE rbWxMap)
66
66
  {
67
- wxUnsignedToIntHashMap* wxMap;
68
- Data_Get_Struct(rbWxMap, wxUnsignedToIntHashMap, wxMap);
67
+ wxUnsignedToIntHashMap* wxMap = WXRUBY_WRAPPER_DATA_GET(rbWxMap, wxUnsignedToIntHashMap);
69
68
  (*wxMap)[NUM2UINT(key)] = NUM2INT(value);
70
69
  return ST_CONTINUE;
71
70
  }
@@ -74,7 +73,15 @@ module WXRuby3
74
73
  if (TYPE($input) == T_HASH)
75
74
  {
76
75
  void* ptr = &($1);
77
- VALUE rbWxMap = Data_Wrap_Struct(rb_cObject, 0, 0, ptr);
76
+ VALUE rbWxMap;
77
+ // wrap anonymously as we only want to pass the hashmap in to convert
78
+ #ifdef WXRUBY_SWIG_UNTYPED_DATA
79
+ rbWxMap = Data_Wrap_Struct(rb_cObject, 0, 0, ptr);
80
+ #else
81
+ struct swig_ruby_wrapped_object *wrobj;
82
+ rbWxMap = TypedData_Make_Struct(rb_cObject, struct swig_ruby_wrapped_object, &swig_type_data_type, wrobj);
83
+ wrobj->data = ptr;
84
+ #endif
78
85
  rb_hash_foreach($input, FOREACH_FUNC(_wxrb_cvt_custom_sizes), rbWxMap);
79
86
  }
80
87
  else
@@ -252,10 +259,10 @@ module WXRuby3
252
259
 
253
260
  static const rb_data_type_t __wxGridWindow_type = {
254
261
  "GridWindow",
255
- #if RUBY_API_VERSION_MAJOR >= 3
256
- { NULL, NULL, __wxGridWindow_size, 0, {}},
262
+ #if RUBY_API_VERSION_MAJOR > 4 || (RUBY_API_VERSION_MAJOR == 4 && RUBY_API_VERSION_MINOR >= 1)
263
+ { NULL, NULL, __wxGridWindow_size, 0, 0, {}},
257
264
  #else
258
- { NULL, NULL, __wxGridWindow_size, {}},
265
+ { NULL, NULL, __wxGridWindow_size, 0, {}},
259
266
  #endif
260
267
  NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
261
268
  };
@@ -330,7 +337,7 @@ module WXRuby3
330
337
  VALUE obj = ti.second;
331
338
 
332
339
  WXRUBY_TRACE_IF(WxRubyTraceGCMarkGridCellAttr, 2)
333
- WXRUBY_TRACE_WITH(void *c_ptr = (TYPE(obj) == T_DATA ? DATA_PTR(obj) : 0))
340
+ WXRUBY_TRACE_WITH(void *c_ptr = (WXRUBY_HAS_WRAPPED_DATA(obj) ? WXRUBY_WRAPPER_DATA_PTR(obj) : 0))
334
341
  WXRUBY_TRACE("| wxRuby_markGridCellAttr : " << ti.first << "|" << (void*)c_ptr)
335
342
  WXRUBY_TRACE_END
336
343
 
@@ -401,7 +408,7 @@ module WXRuby3
401
408
 
402
409
  // either a new Ruby created instance or an unwrapped C++ created instance
403
410
  // always disown; wxWidgets takes over or keeps ownership of reference count
404
- RDATA(rb_attr)->dfree = 0;
411
+ WXRUBY_WRAPPER_DATA_DFREE_RESET(rb_attr);
405
412
 
406
413
  wx_attr->SetClientObject(new WXRBGridCellAttrMonitor(wx_attr, rb_attr));
407
414
  }
@@ -431,7 +438,7 @@ module WXRuby3
431
438
  VALUE obj = ti.second;
432
439
 
433
440
  WXRUBY_TRACE_IF(WxRubyTraceGCTrackGridCellEditor, 2)
434
- WXRUBY_TRACE_WITH(void *c_ptr = (TYPE(obj) == T_DATA ? DATA_PTR(obj) : 0))
441
+ WXRUBY_TRACE_WITH(void *c_ptr = (WXRUBY_HAS_WRAPPED_DATA(obj) ? WXRUBY_WRAPPER_DATA_PTR(obj) : 0))
435
442
  WXRUBY_TRACE("| wxRuby_markGridCellEditor : " << ti.first << "|" << (void*)c_ptr)
436
443
  WXRUBY_TRACE_END
437
444
 
@@ -502,7 +509,7 @@ module WXRuby3
502
509
 
503
510
  // either a new Ruby created instance or an unwrapped C++ created instance
504
511
  // always disown; wxWidgets takes over or keeps ownership of reference count
505
- RDATA(rb_edt)->dfree = 0;
512
+ WXRUBY_WRAPPER_DATA_DFREE_RESET(rb_edt);
506
513
 
507
514
  wx_edt->SetClientObject(new WXRBGridCellEditorMonitor(wx_edt, rb_edt));
508
515
  }
@@ -532,7 +539,7 @@ module WXRuby3
532
539
  VALUE obj = ti.second;
533
540
 
534
541
  WXRUBY_TRACE_IF(WxRubyTraceGCTrackGridCellRenderer, 2)
535
- WXRUBY_TRACE_WITH(void *c_ptr = (TYPE(obj) == T_DATA ? DATA_PTR(obj) : 0))
542
+ WXRUBY_TRACE_WITH(void *c_ptr = (WXRUBY_HAS_WRAPPED_DATA(obj) ? WXRUBY_WRAPPER_DATA_PTR(obj) : 0))
536
543
  WXRUBY_TRACE("| wxRuby_markGridCellRenderer : " << ti.first << "|" << (void*)c_ptr)
537
544
  WXRUBY_TRACE_END
538
545
 
@@ -603,7 +610,7 @@ module WXRuby3
603
610
 
604
611
  // either a new Ruby created instance or an unwrapped C++ created instance
605
612
  // always disown; wxWidgets takes over or keeps ownership of reference count
606
- RDATA(rb_rnd)->dfree = 0;
613
+ WXRUBY_WRAPPER_DATA_DFREE_RESET(rb_rnd);
607
614
 
608
615
  wx_rnd->SetClientObject(new WXRBGridCellRendererMonitor(wx_rnd, rb_rnd));
609
616
  }
@@ -653,10 +660,30 @@ module WXRuby3
653
660
  add_header_code 'extern VALUE wxRuby_WrapWxGridCellEditorInRuby(const wxGridCellEditor *wx_gce);'
654
661
  map_out code: '$result = wxRuby_WrapWxGridCellEditorInRuby($1);'
655
662
  map_check code: 'wxRuby_RegisterGridCellEditor($1, argv[$argnum-2]);'
663
+ map_directorout code: <<~__CODE
664
+ void* swig_argp;
665
+ swig_owntype own;
666
+ int swig_res = SWIG_ConvertPtrAndOwn(result, &swig_argp, $1_descriptor, SWIG_POINTER_DISOWN, &own);
667
+ if (!SWIG_IsOK(swig_res)) {
668
+ Swig::DirectorTypeMismatchException::raise(swig_get_self(), "$symname", SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""wxGridCellEditor *""'");
669
+ }
670
+ $result = reinterpret_cast< wxGridCellEditor * >(swig_argp);
671
+ $result->IncRef();
672
+ __CODE
656
673
  end
657
674
  spec.map 'wxGridCellRenderer *' => 'Wx::GRID::GridCellRenderer' do
658
675
  add_header_code 'extern VALUE wxRuby_WrapWxGridCellRendererInRuby(const wxGridCellRenderer *wx_gcr);'
659
676
  map_out code: '$result = wxRuby_WrapWxGridCellRendererInRuby($1);'
677
+ map_directorout code: <<~__CODE
678
+ void* swig_argp;
679
+ swig_owntype own;
680
+ int swig_res = SWIG_ConvertPtrAndOwn(result, &swig_argp, $1_descriptor, SWIG_POINTER_DISOWN, &own);
681
+ if (!SWIG_IsOK(swig_res)) {
682
+ Swig::DirectorTypeMismatchException::raise(swig_get_self(), "$symname", SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""wxGridCellRenderer *""'");
683
+ }
684
+ $result = reinterpret_cast< wxGridCellRenderer * >(swig_argp);
685
+ $result->IncRef();
686
+ __CODE
660
687
  map_check code: 'wxRuby_RegisterGridCellRenderer($1, argv[$argnum-2]);'
661
688
  end
662
689
  # add constants missing from documentation
@@ -18,6 +18,23 @@ module WXRuby3
18
18
  super
19
19
  spec.items << 'wxHelpControllerBase' << 'helpfrm.h'
20
20
  spec.fold_bases(spec.module_name => 'wxHelpControllerBase')
21
+ # make all HelpController classes GC-safe
22
+ spec.add_header_code <<~__HEREDOC
23
+ static void wxRuby_delete_#{spec.module_name}(void *self)
24
+ {
25
+ #{spec.module_name} *arg1 = (#{spec.module_name} *)self;
26
+ SWIG_RubyRemoveTracking(arg1);
27
+ delete arg1;
28
+ }
29
+
30
+ static void GC_free_#{spec.module_name}(void* object)
31
+ {
32
+ wxRuby_RegisterDeferredObjectDestroy(object, wxRuby_delete_#{spec.module_name});
33
+ }
34
+ __HEREDOC
35
+ # a HelpController is not window but it does manage windows which it will delete on destruction,,
36
+ # so it needs a deferred destroy.
37
+ spec.add_swig_code "%feature(\"freefunc\") #{spec.module_name} \"GC_free_#{spec.module_name}\";"
21
38
  spec.rename_for_ruby('Init' => "#{spec.module_name}::Initialize")
22
39
  # ignore these (pure virtual) decls
23
40
  spec.ignore %w[
@@ -22,7 +22,16 @@ module WXRuby3
22
22
  for (size_t n=0; n<$1->GetCount() ;++n)
23
23
  {
24
24
  wxHtmlBookRecord* hbr_ptr = &($1->Item(n));
25
- VALUE rb_hbr = Data_Wrap_Struct(rb_cObject, 0, 0, hbr_ptr);
25
+ swig_class *sklass = (swig_class *)SWIGTYPE_p_wxHtmlBookRecord->clientdata;
26
+ VALUE rb_hbr;
27
+ #ifdef WXRUBY_SWIG_UNTYPED_DATA
28
+ rb_hbr = Data_Wrap_Struct(sklass->klass, 0, 0, hbr_ptr);
29
+ #else
30
+ struct swig_ruby_wrapped_object *wrobj;
31
+ rb_hbr = TypedData_Make_Struct(sklass->klass, struct swig_ruby_wrapped_object, &sklass->cext_type, wrobj);
32
+ wrobj->data = hbr_ptr;
33
+ #endif
34
+ rb_iv_set(rb_hbr, "@__swigtype__", rb_str_new2(SWIGTYPE_p_wxHtmlBookRecord->name));
26
35
  rb_ary_push($result, rb_hbr);
27
36
  }
28
37
  __CODE
@@ -33,7 +42,16 @@ module WXRuby3
33
42
  for (size_t n=0; n<$1->GetCount() ;++n)
34
43
  {
35
44
  wxHtmlHelpDataItem* hdi_ptr = &($1->Item(n));
36
- VALUE rb_hdi = Data_Wrap_Struct(rb_cObject, 0, 0, hdi_ptr);
45
+ swig_class *sklass = (swig_class *)SWIGTYPE_p_wxHtmlHelpDataItem->clientdata;
46
+ VALUE rb_hdi;
47
+ #ifdef WXRUBY_SWIG_UNTYPED_DATA
48
+ rb_hdi = Data_Wrap_Struct(sklass->klass, 0, 0, hdi_ptr);
49
+ #else
50
+ struct swig_ruby_wrapped_object *wrobj;
51
+ rb_hdi = TypedData_Make_Struct(sklass->klass, struct swig_ruby_wrapped_object, &sklass->cext_type, wrobj);
52
+ wrobj->data = hdi_ptr;
53
+ #endif
54
+ rb_iv_set(rb_hdi, "@__swigtype__", rb_str_new2(SWIGTYPE_p_wxHtmlHelpDataItem->name));
37
55
  rb_ary_push($result, rb_hdi);
38
56
  }
39
57
  __CODE
@@ -29,6 +29,9 @@ module WXRuby3
29
29
  spec.ignore 'wxIconBundle::wxIconBundle(const wxString &, WXHINSTANCE)',
30
30
  'wxIconBundle::AddIcon(const wxString&,WXHINSTANCE)',
31
31
  'wxIcon::CreateFromHICON'
32
+ if Config.instance.wx_version_check('3.3.4') >= 0
33
+ spec.ignore 'wxIcon::GetHICON'
34
+ end
32
35
  else
33
36
  spec.override_inheritance_chain('wxIcon', %w[wxBitmap wxGDIObject wxObject])
34
37
  end
@@ -17,6 +17,30 @@ module WXRuby3
17
17
  spec.items.concat(%w[wxLogBuffer wxLogChain wxLogGui wxLogStderr wxLogTextCtrl wxLogInterposer wxLogWindow wxLogNull wxLogRecordInfo])
18
18
  spec.no_proxy(%w[wxLogBuffer wxLogGui wxLogStderr wxLogTextCtrl wxLogWindow])
19
19
  spec.force_proxy(%w[wxLogInterposer])
20
+ # make loggers GC-safe
21
+ spec.add_header_code <<~__HEREDOC
22
+ static void wxRuby_delete_wxLog(void *self)
23
+ {
24
+ wxLog *arg1 = (wxLog *)self;
25
+ SWIG_RubyRemoveTracking(arg1);
26
+ delete arg1;
27
+ }
28
+
29
+ static void GC_free_wxLog(void* object)
30
+ {
31
+ wxRuby_RegisterDeferredObjectDestroy(object, wxRuby_delete_wxLog);
32
+ }
33
+ __HEREDOC
34
+ # defer destroying log objects because they otherwise trigger Ruby object allocations during GC
35
+ spec.add_swig_code '%feature("freefunc") wxLog "GC_free_wxLog";'
36
+ spec.add_swig_code '%feature("freefunc") wxLogBuffer "GC_free_wxLog";'
37
+ spec.add_swig_code '%feature("freefunc") wxLogChain "GC_free_wxLog";'
38
+ spec.add_swig_code '%feature("freefunc") wxLogGui "GC_free_wxLog";'
39
+ spec.add_swig_code '%feature("freefunc") wxLogStderr "GC_free_wxLog";'
40
+ spec.add_swig_code '%feature("freefunc") wxLogTextCtrl "GC_free_wxLog";'
41
+ spec.add_swig_code '%feature("freefunc") wxLogInterposer "GC_free_wxLog";'
42
+ spec.add_swig_code '%feature("freefunc") wxLogWindow "GC_free_wxLog";'
43
+ spec.add_swig_code '%feature("freefunc") wxLogNull "GC_free_wxLog";'
20
44
  spec.ignore 'wxLog::SetFormatter'
21
45
  spec.regard %w[wxLog::DoLogRecord wxLog::DoLogTextAtLevel wxLog::DoLogText]
22
46
  spec.ignore 'wxLogBuffer::Flush'
@@ -49,7 +73,7 @@ module WXRuby3
49
73
  if (!NIL_P(rb_self))
50
74
  {
51
75
  swig_type_info* swig_type = wxRuby_GetSwigTypeForClass(CLASS_OF(rb_self));
52
- RDATA(rb_self)->dfree = ((swig_class *)swig_type->clientdata)->destroy;
76
+ WXRUBY_WRAPPER_DATA_DFREE_SET(rb_self, ((swig_class *)swig_type->clientdata)->destroy);
53
77
  }
54
78
  }
55
79
  __CODE