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
@@ -13,52 +13,12 @@ module WXRuby3
13
13
  class Menu < Director
14
14
 
15
15
  def setup
16
- spec.gc_as_marked
16
+ spec.gc_as_object
17
+ spec.add_swig_code '%markfunc wxMenu "GC_mark_wxMenu";'
17
18
  spec.ignore 'wxMenu::wxMenu(long)'
18
19
  spec.no_proxy 'wxMenu' # do not support derived wxMenu classes
19
- spec.add_header_code <<~__HEREDOC
20
- static void GC_mark_wxMenu(const TGCTrackingValueMap& values);
21
-
22
- // Custom subclass implementation.
23
- // Provides proper support for Ruby GC in destructor.
24
- class wxRubyMenu : public wxMenu
25
- {
26
- public:
27
- static const std::string TRACKING_CAT;
28
-
29
- wxRubyMenu() : wxMenu() {}
30
- wxRubyMenu(const wxString &title, long style=0) : wxMenu(title, style) {}
31
- virtual ~wxRubyMenu()
32
- {
33
- wxRuby_ReleaseEvtHandlerProcs(this);
34
- wxruby_unregister();
35
- }
36
-
37
- void wxruby_register(VALUE rb_menu)
38
- {
39
- if (!is_registered_)
40
- {
41
- wxRuby_RegisterTrackingCategory(TRACKING_CAT, GC_mark_wxMenu, true);
42
- is_registered_ = true;
43
- }
44
- if (RB_NIL_P(wxRuby_FindCategoryValue(TRACKING_CAT, this)))
45
- wxRuby_RegisterCategoryValue(TRACKING_CAT, this, rb_menu);
46
- }
47
- private:
48
- static bool is_registered_;
49
- void wxruby_unregister()
50
- {
51
- wxRuby_UnregisterCategoryValue(TRACKING_CAT, this);
52
- }
53
- };
54
-
55
- const std::string wxRubyMenu::TRACKING_CAT = { "WXRUBY_MENU" };
56
- bool wxRubyMenu::is_registered_ {};
57
- __HEREDOC
58
- # make Ruby director and wrappers use custom implementation
59
- spec.use_class_implementation('wxMenu', 'wxRubyMenu')
60
- # GC handling
61
- spec.disown 'wxMenu *submenu'
20
+ # submenu handling
21
+ spec.disown 'wxMenu *subMenu', 'wxMenu *submenu'
62
22
  # not wanted
63
23
  spec.ignore 'wxMenu::SetParent',
64
24
  'wxMenu::Attach',
@@ -87,7 +47,9 @@ module WXRuby3
87
47
  spec.map 'wxMenu **' => 'Wx::Menu' do
88
48
  map_in ignore: true, temp: 'wxMenu *tmp', code: '$1 = &tmp;'
89
49
  map_argout code: <<~__CODE
90
- $result = SWIG_Ruby_AppendOutput($result, wxRuby_WrapWxMenuInRuby(tmp$argnum));
50
+ VALUE rb_menu = SWIG_NewPointerObj(SWIG_as_voidptr(tmp$argnum),
51
+ SWIGTYPE_p_wxMenu, 0);
52
+ $result = SWIG_Ruby_AppendOutput($result, rb_menu);
91
53
  __CODE
92
54
  end
93
55
  # for FindChildItem
@@ -95,87 +57,57 @@ module WXRuby3
95
57
  spec.add_header_code <<~__HEREDOC
96
58
  WXRUBY_TRACE_GUARD(WxRubyTraceMarkMenu, "GC_MARK_MENU")
97
59
 
98
- // forward decl
99
- SWIGINTERN void free_wxMenu(void *self);
60
+ // Custom subclass implementation.
61
+ // Provides proper support for Ruby GC in destructor.
62
+ class wxRubyMenu : public wxMenu
63
+ {
64
+ public:
65
+ wxRubyMenu() : wxMenu() {}
66
+ wxRubyMenu(const wxString &title, long style=0) : wxMenu(title, style) {}
67
+ virtual ~wxRubyMenu()
68
+ {
69
+ VALUE rb_menu = SWIG_RubyInstanceFor(this);
70
+ if (!RB_NIL_P(rb_menu))
71
+ {
72
+ // delete from C++ code as the Ruby GC free func removes tracking before delete
73
+
74
+ // make sure to unlink and remove any tracked Ruby wrapper
75
+ SWIG_RubyUnlinkObjects(this);
76
+ SWIG_RubyRemoveTracking(this);
77
+ }
78
+ }
79
+ };
100
80
 
101
- static void _gc_mark_single_wxMenu(wxMenu *wx_menu, VALUE rb_menu)
81
+ static void GC_mark_wxMenu(void* ptr)
102
82
  {
103
83
  WXRUBY_TRACE_IF(WxRubyTraceMarkMenu, 2)
104
- WXRUBY_TRACE("> GC_mark_attached_wxMenu : " << wx_menu)
84
+ WXRUBY_TRACE("> GC_mark_wxMenu : " << ptr)
105
85
  WXRUBY_TRACE_END
106
-
107
- rb_gc_mark(rb_menu);
86
+
87
+ if (!ptr) return;
88
+
89
+ wxMenu* wx_menu = reinterpret_cast<wxMenu*> (ptr);
108
90
 
109
91
  wxMenuItemList wx_menu_items = wx_menu->GetMenuItems();
110
92
  wxMenuItemList::iterator iter;
111
93
  for (iter = wx_menu_items.begin(); iter != wx_menu_items.end(); ++iter)
112
94
  {
113
95
  wxMenuItem *wx_item = *iter;
114
- rb_gc_mark(SWIG_RubyInstanceFor(wx_item) );
96
+ rb_gc_mark(SWIG_RubyInstanceFor(wx_item));
115
97
  wxMenu* wx_sub_menu = wx_item->GetSubMenu();
116
98
  if (wx_sub_menu)
117
99
  {
118
- VALUE rb_sub_menu = wxRuby_FindCategoryValue(wxRubyMenu::TRACKING_CAT, wx_sub_menu);
119
- _gc_mark_single_wxMenu(wx_sub_menu, rb_sub_menu);
100
+ rb_gc_mark(SWIG_RubyInstanceFor(wx_sub_menu));
120
101
  }
121
102
  }
122
103
 
123
104
  WXRUBY_TRACE_IF(WxRubyTraceMarkMenu, 2)
124
- WXRUBY_TRACE("< GC_mark_attached_wxMenu : " << wx_menu)
125
- WXRUBY_TRACE_END
126
- }
127
-
128
- // Mark Function
129
- // Need to protect MenuItems which are included in the Menu, including
130
- // their associated sub-menus, recursively.
131
- static void GC_mark_wxMenu(const TGCTrackingValueMap& values)
132
- {
133
- WXRUBY_TRACE_IF(WxRubyTraceMarkMenu, 2)
134
- WXRUBY_TRACE("> GC_mark_wxMenu")
135
- WXRUBY_TRACE_END
136
-
137
- for (const auto& ti : values)
138
- {
139
- _gc_mark_single_wxMenu(static_cast<wxMenu*> (ti.first), ti.second);
140
- }
141
-
142
- WXRUBY_TRACE_IF(WxRubyTraceMarkMenu, 2)
143
- WXRUBY_TRACE("< GC_mark_wxMenu")
105
+ WXRUBY_TRACE("< GC_mark_wxMenu : " << wx_menu)
144
106
  WXRUBY_TRACE_END
145
107
  }
146
-
147
- WXRUBY_EXPORT VALUE wxRuby_WrapWxMenuInRuby(wxMenu* wx_menu)
148
- {
149
- VALUE rb_menu = Qnil;
150
- if (wx_menu)
151
- {
152
- rb_menu = wxRuby_FindCategoryValue(wxRubyMenu::TRACKING_CAT, wx_menu); // check for already registered instance
153
- if (NIL_P(rb_menu))
154
- {
155
- // newly created
156
- wxRubyMenu* wxrb_menu = dynamic_cast<wxRubyMenu*> (wx_menu);
157
- if (wxrb_menu)
158
- {
159
- // convert and own
160
- rb_menu = SWIG_NewPointerObj(SWIG_as_voidptr(wxrb_menu), SWIGTYPE_p_wxMenu, SWIG_POINTER_OWN);
161
- wxrb_menu->wxruby_register(rb_menu);
162
- }
163
- else
164
- {
165
- // created internally by wxWidgets; no tracking and no ownership
166
- rb_menu = SWIG_NewPointerObj(SWIG_as_voidptr(wx_menu), SWIGTYPE_p_wxMenu, 0);
167
- }
168
- }
169
- }
170
- return rb_menu;
171
- }
172
-
173
- WXRUBY_EXPORT void wxRuby_RegisterWxMenu(wxMenu* wx_menu, VALUE rb_menu)
174
- {
175
- wxRubyMenu* wxrb_menu = dynamic_cast<wxRubyMenu*> (wx_menu);
176
- if (wxrb_menu) wxrb_menu->wxruby_register(rb_menu);
177
- }
178
108
  __HEREDOC
109
+ # make Ruby director and wrappers use custom implementation
110
+ spec.use_class_implementation('wxMenu', 'wxRubyMenu')
179
111
  # ignore MSW specific method
180
112
  spec.ignore 'wxMenu::MSWCommand'
181
113
  # fix SWIG's problems with const& return value
@@ -16,119 +16,85 @@ module WXRuby3
16
16
 
17
17
  def setup
18
18
  super
19
- spec.gc_as_marked # not a typical window
19
+ spec.gc_as_object # not a typical window
20
+ spec.add_swig_code '%markfunc wxMenuBar "GC_mark_wxMenuBar";'
20
21
  spec.no_proxy('wxMenuBar::FindItem',
21
22
  'wxMenuBar::Remove',
22
23
  'wxMenuBar::Replace')
23
24
  spec.ignore('wxMenuBar::wxMenuBar(size_t,wxMenu *[],const wxString[],long)',
24
- 'wxMenuBar::GetLabelTop',
25
- 'wxMenuBar::SetLabelTop',
26
25
  'wxMenuBar::Refresh')
27
- spec.disown 'wxMenu *'
26
+ if Config.instance.wx_version_check('3.3.4') < 0
27
+ spec.ignore('wxMenuBar::GetLabelTop',
28
+ 'wxMenuBar::SetLabelTop')
29
+ end
30
+ # menu handling
31
+ spec.ignore %w[wxMenuBar::Append wxMenuBar::Insert wxMenuBar::Replace], ignore_doc: false
32
+ spec.extend_interface 'wxMenuBar',
33
+ 'virtual bool Append(wxMenu *new_menu, const wxString &title)',
34
+ 'virtual bool Insert(size_t pos, wxMenu *new_menu, const wxString &title)',
35
+ 'virtual wxMenu * Replace(size_t pos, wxMenu *new_menu, const wxString &title)'
36
+ spec.disown 'wxMenu *new_menu'
28
37
  spec.new_object 'wxMenuBar::Remove', 'wxMenuBar::Replace'
29
38
  # for FindItem
30
39
  spec.map 'wxMenu **' => 'Wx::Menu' do
31
- add_header_code 'WXRUBY_EXPORT VALUE wxRuby_WrapWxMenuInRuby(wxMenu* wx_menu);'
32
40
  map_in ignore: true, temp: 'wxMenu *tmp', code: '$1 = &tmp;'
33
41
  map_argout code: <<~__CODE
34
- $result = SWIG_Ruby_AppendOutput($result, wxRuby_WrapWxMenuInRuby(tmp$argnum));
42
+ VALUE rb_menu = SWIG_NewPointerObj(SWIG_as_voidptr(tmp$argnum),
43
+ SWIGTYPE_p_wxMenu, 0);
44
+ $result = SWIG_Ruby_AppendOutput($result, rb_menu);
35
45
  __CODE
36
46
  end
37
47
  spec.add_header_code <<~__HEREDOC
38
- static void GC_mark_wxMenuBar(const TGCTrackingValueMap& values);
48
+ static void GC_mark_wxMenuBar(void *);
39
49
 
40
50
  // Custom subclass implementation.
41
51
  // Provides support for monitored tracking and GC handling.
42
52
  class wxRubyMenuBar : public wxMenuBar
43
53
  {
44
54
  public:
45
- static const std::string TRACKING_CAT;
46
-
47
55
  wxRubyMenuBar(long style=0) : wxMenuBar(style) {}
48
56
  virtual ~wxRubyMenuBar()
49
57
  {
50
58
  wxRuby_ReleaseEvtHandlerProcs(this);
51
- wxruby_unregister();
52
- }
53
-
54
- void wxruby_register(VALUE rb_menubar)
55
- {
56
- if (!is_registered_)
59
+ VALUE rb_menubar = SWIG_RubyInstanceFor(this);
60
+ if (!RB_NIL_P(rb_menubar))
57
61
  {
58
- wxRuby_RegisterTrackingCategory(TRACKING_CAT, GC_mark_wxMenuBar, true);
59
- is_registered_ = true;
62
+ // delete from C++ code as the Ruby GC free func removes tracking before delete
63
+
64
+ // make sure to unlink and remove any tracked Ruby wrapper
65
+ SWIG_RubyUnlinkObjects(this);
66
+ SWIG_RubyRemoveTracking(this);
60
67
  }
61
- if (RB_NIL_P(wxRuby_FindCategoryValue(TRACKING_CAT, this)))
62
- wxRuby_RegisterCategoryValue(TRACKING_CAT, this, rb_menubar);
63
- }
64
- private:
65
- static bool is_registered_;
66
- void wxruby_unregister()
67
- {
68
- wxRuby_UnregisterCategoryValue(TRACKING_CAT, this);
69
68
  }
70
69
  };
71
70
 
72
- const std::string wxRubyMenuBar::TRACKING_CAT = { "WXRUBY_MENU_BAR" };
73
- bool wxRubyMenuBar::is_registered_ {};
74
-
75
71
  WXRUBY_TRACE_GUARD(WxRubyTraceMarkMenubar, "GC_MARK_MENUBAR")
76
72
 
77
- // Mark Function for unattached menu bars
78
- // Need to protect Menu and MenuItems which are included in the MenuBar
79
- static void GC_mark_wxMenuBar(const TGCTrackingValueMap& values)
73
+ // Mark Function for attached menu bars
74
+ static void GC_mark_wxMenuBar(void *ptr)
80
75
  {
81
76
  WXRUBY_TRACE_IF(WxRubyTraceMarkMenubar, 2)
82
77
  WXRUBY_TRACE("> GC_mark_wxMenuBar")
83
78
  WXRUBY_TRACE_END
84
79
 
85
- for (const auto& ti : values)
86
- {
87
- rb_gc_mark(ti.second);
80
+ if (GC_IsWindowDeleted(ptr)) return;
88
81
 
89
- // Menu bars are also a subclass of wxWindow, so must do all the marking
90
- // of sizers and carets associated with that class
91
- GC_mark_wxWindow(ti.first);
82
+ // Menu bars are also a subclass of wxWindow, so must do all the marking
83
+ // of sizers and carets associated with that class
84
+ GC_mark_wxWindow(ptr);
92
85
 
93
- // no need to mark anything else as menus are tracked themselves separately
86
+ // always mark the menus managed by the menubar
87
+ wxMenuBar* wx_menu_bar = reinterpret_cast<wxMenuBar*> (ptr);
88
+ for (size_t ix=0; ix < wx_menu_bar->GetMenuCount(); ++ix)
89
+ {
90
+ wxMenu* wx_menu = wx_menu_bar->GetMenu(ix);
91
+ rb_gc_mark(SWIG_RubyInstanceFor(wx_menu));
94
92
  }
95
93
 
96
94
  WXRUBY_TRACE_IF(WxRubyTraceMarkMenubar, 2)
97
95
  WXRUBY_TRACE("< GC_mark_wxMenuBar")
98
96
  WXRUBY_TRACE_END
99
97
  }
100
-
101
- WXRUBY_EXPORT VALUE wxRuby_WrapWxMenuBarInRuby(wxMenuBar* wx_menubar)
102
- {
103
- VALUE rb_menubar = Qnil;
104
- if (wx_menubar)
105
- {
106
- rb_menubar = wxRuby_FindCategoryValue(wxRubyMenuBar::TRACKING_CAT, wx_menubar); // check for already registered instance
107
- if (NIL_P(rb_menubar))
108
- {
109
- // newly created
110
- wxRubyMenuBar* wxrb_mb = dynamic_cast<wxRubyMenuBar*> (wx_menubar);
111
- if (wxrb_mb)
112
- {
113
- // convert and own
114
- rb_menubar = SWIG_NewPointerObj(SWIG_as_voidptr(wxrb_mb), SWIGTYPE_p_wxMenuBar, SWIG_POINTER_OWN);
115
- wxrb_mb->wxruby_register(rb_menubar);
116
- }
117
- else
118
- {
119
- // created internally by wxWidgets; no tracking and no ownership
120
- rb_menubar = SWIG_NewPointerObj(SWIG_as_voidptr(wx_menubar), SWIGTYPE_p_wxMenuBar, 0);
121
- }
122
- }
123
- }
124
- return rb_menubar;
125
- }
126
-
127
- WXRUBY_EXPORT void wxRuby_RegisterWxMenuBar(wxMenuBar* wx_menubar, VALUE rb_menubar)
128
- {
129
- wxRubyMenuBar* wxrb_mb = dynamic_cast<wxRubyMenuBar*> (wx_menubar);
130
- if (wxrb_mb) wxrb_mb->wxruby_register(rb_menubar);
131
- }
132
98
  __HEREDOC
133
99
  # make Ruby director and wrappers use custom implementation
134
100
  spec.use_class_implementation('wxMenuBar', 'wxRubyMenuBar')
@@ -78,7 +78,7 @@ module WXRuby3
78
78
  this->wxIntegerValidator::SetWindow(win);
79
79
  VALUE self = get_self();
80
80
  // make sure Ruby does not own this validator instance anymore
81
- RDATA(self)->dfree = SWIG_RubyRemoveTracking;
81
+ WXRUBY_WRAPPER_DATA_DFREE_SET(self, SWIG_RubyRemoveTracking);
82
82
  }
83
83
 
84
84
  virtual bool TransferFromWindow () override
@@ -196,7 +196,7 @@ module WXRuby3
196
196
  this->wxIntegerValidator::SetWindow(win);
197
197
  VALUE self = get_self();
198
198
  // make sure Ruby does not own this validator instance anymore
199
- RDATA(self)->dfree = SWIG_RubyRemoveTracking;
199
+ WXRUBY_WRAPPER_DATA_DFREE_SET(self, SWIG_RubyRemoveTracking);
200
200
  }
201
201
 
202
202
  virtual bool TransferFromWindow () override
@@ -312,7 +312,7 @@ module WXRuby3
312
312
  this->wxFloatingPointValidator::SetWindow(win);
313
313
  VALUE self = get_self();
314
314
  // make sure Ruby does not own this validator instance anymore
315
- RDATA(self)->dfree = SWIG_RubyRemoveTracking;
315
+ WXRUBY_WRAPPER_DATA_DFREE_SET(self, SWIG_RubyRemoveTracking);
316
316
  }
317
317
 
318
318
  virtual bool TransferFromWindow () override
@@ -58,7 +58,7 @@ module WXRuby3
58
58
  this->wxNumericPropertyValidator::SetWindow(win);
59
59
  VALUE self = get_self();
60
60
  // make sure Ruby does not own this validator instance anymore
61
- RDATA(self)->dfree = SWIG_RubyRemoveTracking;
61
+ WXRUBY_WRAPPER_DATA_DFREE_SET(self, SWIG_RubyRemoveTracking);
62
62
  }
63
63
 
64
64
  virtual bool TransferFromWindow () override
@@ -12,11 +12,28 @@ module WXRuby3
12
12
 
13
13
  class Director
14
14
 
15
- class PageSetupDialog < Director::Dialog
15
+ class PageSetupDialog < Director
16
16
 
17
17
  def setup
18
18
  super
19
19
  # make PageSetupDialog GC-safe
20
+ spec.add_header_code <<~__HEREDOC
21
+ static void wxRuby_delete_wxPageSetupDialog(void *self)
22
+ {
23
+ wxPageSetupDialog *arg1 = (wxPageSetupDialog *)self;
24
+ SWIG_RubyRemoveTracking(arg1);
25
+ delete arg1;
26
+ }
27
+
28
+ static void GC_free_wxPageSetupDialog(void* object)
29
+ {
30
+ wxRuby_RegisterDeferredObjectDestroy(object, wxRuby_delete_wxPageSetupDialog);
31
+ }
32
+ __HEREDOC
33
+ # wxPageSetupDialog is not actually a dialog, just a platform independent wrapper derived from wxObject,
34
+ # so it is not caught by the generic wxWindow post-processor but still needs a deferred destroy as
35
+ # destroying it will also destroy the wrapped actual dialog.
36
+ spec.add_swig_code '%feature("freefunc") wxPageSetupDialog "GC_free_wxPageSetupDialog";'
20
37
  spec.ignore 'wxPageSetupDialog::GetPageSetupData'
21
38
  spec.add_extend_code 'wxPageSetupDialog', <<~__HEREDOC
22
39
  wxPageSetupDialogData* GetPageSetupData()
@@ -78,7 +78,7 @@ module WXRuby3
78
78
 
79
79
  # Thin and trusting wrapping to bypass SWIG's normal mechanisms; we
80
80
  # don't want SWIG changing ownership or typechecking these.
81
- map_in code: '$1 = (wxEvent*)DATA_PTR($input);'
81
+ map_in code: '$1 = (wxEvent*)WXRUBY_WRAPPER_DATA_PTR($input);'
82
82
  end
83
83
  # add method for correctly wrapping PGEditor output references
84
84
  spec.add_header_code <<~__CODE
@@ -24,6 +24,7 @@ module WXRuby3
24
24
  end
25
25
  else # from 3.3.0 this is an enum but docs are still missing
26
26
  end
27
+ spec.do_not_generate :typedefs
27
28
  end
28
29
  end # class PGValidationInfo
29
30
 
@@ -37,6 +37,13 @@ module WXRuby3
37
37
  'virtual bool Show(bool show = true) override')
38
38
  spec.extend_interface('wxPopupTransientWindow',
39
39
  'virtual bool Destroy() override')
40
+ # OSX defines this override on the wxNonOwnedWindow class but since we declared that 'no_proxy'
41
+ # we have to the override on it's descendants wxPopupWindow and wxTopLevelWindow (the last one
42
+ # having the override itself also on all platforms)
43
+ if Config.instance.features_set?('WXOSX')
44
+ spec.extend_interface('wxNonOwnedWindow',
45
+ 'virtual bool Destroy() override')
46
+ end
40
47
  # For ProcessLeftDown
41
48
  spec.map 'wxMouseEvent &' => 'Wx::MouseEvent' do
42
49
  map_directorin code: <<~__CODE
@@ -79,7 +79,6 @@ module WXRuby3
79
79
  }
80
80
  __HEREDOC
81
81
  spec.use_class_implementation 'wxPreviewFrame', 'WxRubyPreviewFrame'
82
- spec.add_swig_code '%markfunc wxPreviewFrame "GC_mark_wxPreviewFrame";'
83
82
  spec.rename_for_ruby('init' => 'wxPreviewFrame::Initialize')
84
83
  # We do not wrap the (undocumented) wxPrintPreviewBase so map this to wxPrintPreview what
85
84
  # in all cases will be the actual base being used.
@@ -99,6 +98,14 @@ module WXRuby3
99
98
  spec.ignore 'wxPreviewFrame::OnCloseWindow' # not useful for public use
100
99
  spec.do_not_generate(:variables, :defines, :enums, :functions) # with PrintAbortDialog
101
100
  end
101
+
102
+
103
+ def process(gendoc: false)
104
+ defmod = super
105
+ # make sure to overrule the mark func set by the Frame director's #process
106
+ spec.add_swig_code '%markfunc wxPreviewFrame "GC_mark_wxPreviewFrame";'
107
+ defmod
108
+ end
102
109
  end # class PreviewFrame
103
110
 
104
111
  end # class Director
@@ -17,6 +17,23 @@ module WXRuby3
17
17
  spec.no_proxy 'wxPrintDialog::GetPrintDC' # do not think this is really useful
18
18
  spec.new_object 'wxPrintDialog::GetPrintDC'
19
19
  # make PrintDialog GC-safe
20
+ spec.add_header_code <<~__HEREDOC
21
+ static void wxRuby_delete_wxPrintDialog(void *self)
22
+ {
23
+ wxPrintDialog *arg1 = (wxPrintDialog *)self;
24
+ SWIG_RubyRemoveTracking(arg1);
25
+ delete arg1;
26
+ }
27
+
28
+ static void GC_free_wxPrintDialog(void* object)
29
+ {
30
+ wxRuby_RegisterDeferredObjectDestroy(object, wxRuby_delete_wxPrintDialog);
31
+ }
32
+ __HEREDOC
33
+ # wxPrintDialog is not actually a dialog, just a platform independent wrapper derived from wxObject,
34
+ # so it is not caught by the generic wxWindow post-processor but still needs a deferred destroy as
35
+ # destroying it will also destroy the wrapped actual dialog.
36
+ spec.add_swig_code '%feature("freefunc") wxPrintDialog "GC_free_wxPrintDialog";'
20
37
  spec.ignore 'wxPrintDialog::GetPrintData',
21
38
  'wxPrintDialog::GetPrintDialogData'
22
39
  spec.add_extend_code 'wxPrintDialog', <<~__HEREDOC
@@ -81,7 +81,7 @@ module WXRuby3
81
81
 
82
82
  VALUE rb_pp = SWIG_RubyInstanceFor(ptr);
83
83
  // if this is still an instance 'owned' by Ruby
84
- if (!RB_NIL_P(rb_pp) && RDATA(rb_pp)->dfree==free_wxPrintPreview)
84
+ if (!RB_NIL_P(rb_pp) && WXRUBY_WRAPPER_DATA_DFREE(rb_pp)==free_wxPrintPreview)
85
85
  {
86
86
  WxRuby_mark_wxPrintPreview(ptr);
87
87
  }
@@ -81,6 +81,8 @@ module WXRuby3
81
81
  WXRUBY_TRACE("> WXRuby_GC_mark_wxPropertyGridPage : " << wx_pgp)
82
82
  WXRUBY_TRACE_END
83
83
 
84
+ if (!wx_pgp) return;
85
+
84
86
  #ifdef __WXRB_DEBUG__
85
87
  long l = 0, n = 0;
86
88
  #endif
@@ -38,7 +38,7 @@ module WXRuby3
38
38
  VALUE rb_region_it = SWIG_NewPointerObj(SWIG_as_voidptr(p_region_it), SWIGTYPE_p_wxRegionIterator, 0);
39
39
  rb_yield(rb_region_it);
40
40
  SWIG_RubyRemoveTracking((void *)p_region_it);
41
- DATA_PTR(rb_region_it) = NULL;
41
+ WXRUBY_WRAPPER_DATA_PTR_RESET(rb_region_it);
42
42
  }
43
43
  }
44
44
  __HEREDOC
@@ -0,0 +1,28 @@
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
+ require_relative './window'
10
+
11
+ module WXRuby3
12
+
13
+ class Director
14
+
15
+ class Backstage < Window
16
+
17
+ def setup
18
+ super
19
+ spec.no_proxy('wxBackstage', 'wxBackstagePage')
20
+ spec.items << 'wxBackstagePage'
21
+ spec.gc_as_window 'wxBackstagePage'
22
+ spec.override_inheritance_chain('wxBackstagePage', %w[wxScrolledWindow wxPanel wxWindow wxEvtHandler wxObject])
23
+ end
24
+ end # class Backstage
25
+
26
+ end # class Director
27
+
28
+ end # module WXRuby3
@@ -0,0 +1,25 @@
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
+ require_relative './window'
10
+
11
+ module WXRuby3
12
+
13
+ class Director
14
+
15
+ class BackstageButton < Window
16
+
17
+ def setup
18
+ super
19
+ spec.no_proxy('wxBackstageButton')
20
+ end
21
+ end # class BackstageButton
22
+
23
+ end # class Director
24
+
25
+ end # module WXRuby3
@@ -0,0 +1,26 @@
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
+ require_relative './window'
10
+
11
+ module WXRuby3
12
+
13
+ class Director
14
+
15
+ class BackstageCallout < Window
16
+
17
+ def setup
18
+ super
19
+ spec.no_proxy('wxBackstageCallout')
20
+ spec.do_not_generate :variables, :enums, :defines, :functions, :typedefs
21
+ end
22
+ end # class BackstageCallout
23
+
24
+ end # class Director
25
+
26
+ end # module WXRuby3
@@ -0,0 +1,26 @@
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
+ require_relative './window'
10
+
11
+ module WXRuby3
12
+
13
+ class Director
14
+
15
+ class BackstageHeading < Window
16
+
17
+ def setup
18
+ super
19
+ spec.no_proxy('wxBackstageHeading')
20
+ spec.do_not_generate :variables, :enums, :defines, :functions, :typedefs
21
+ end
22
+ end # class BackstageHeading
23
+
24
+ end # class Director
25
+
26
+ end # module WXRuby3
@@ -0,0 +1,27 @@
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
+ require_relative './window'
10
+
11
+ module WXRuby3
12
+
13
+ class Director
14
+
15
+ class BackstageItemList < Window
16
+
17
+ def setup
18
+ super
19
+ spec.gc_as_window 'wxBackstageItemList'
20
+ spec.override_inheritance_chain('wxBackstageItemList', %w[wxScrolledCanvas wxWindow wxEvtHandler wxObject])
21
+ spec.do_not_generate :variables, :enums, :defines, :functions, :typedefs
22
+ end
23
+ end # class BackstageItemList
24
+
25
+ end # class Director
26
+
27
+ end # module WXRuby3