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
@@ -0,0 +1,112 @@
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 BackstageMRUList < Window
16
+
17
+ include Typemap::DateTime
18
+
19
+ def setup
20
+ super
21
+ spec.gc_as_window 'wxBackstageMRUList'
22
+ spec.no_proxy('wxBackstageMRUList')
23
+ spec.override_inheritance_chain('wxBackstageMRUList', %w[wxBackstageItemList wxScrolledCanvas wxWindow wxEvtHandler wxObject])
24
+ spec.ignore 'wxBackstageMRUList::SetIconProvider'
25
+ spec.add_header_code <<~__HEREDOC
26
+ // define Ruby Icon Provider wrapper function object
27
+ class RbIconProvider
28
+ {
29
+ public:
30
+
31
+ RbIconProvider(VALUE rbip) : rbIconProvider_(rbip) {}
32
+
33
+ wxBitmapBundle operator() (const wxString& p)
34
+ {
35
+ static WxRuby_ID call_id("call");
36
+ static WxRuby_ID bitmap_bundle_id("BitmapBundle");
37
+ static WxRuby_ID bitmap_id("Bitmap");
38
+ static WxRuby_ID icon_id("Icon");
39
+ static WxRuby_ID image_id("Image");
40
+
41
+ bool ex_caught = false;
42
+ wxBitmapBundle tmpBundle;
43
+ if (!NIL_P(rbIconProvider_))
44
+ {
45
+ VALUE rc = wxRuby_Funcall(ex_caught, rbIconProvider_, call_id(), 1, WXSTR_TO_RSTR(p));
46
+ if (ex_caught)
47
+ {
48
+ #ifdef __WXRB_DEBUG__
49
+ if (!rb_obj_is_kind_of(rc, rb_eSystemExit))
50
+ {
51
+ wxRuby_PrintException(rc);
52
+ }
53
+ #endif
54
+ wxRuby_ExitMainLoop(rc);
55
+ }
56
+ if (!NIL_P(rc))
57
+ {
58
+ bool ok = false;
59
+ if (TYPE(rc) == T_DATA)
60
+ {
61
+ void *ptr = WXRUBY_WRAPPER_DATA_GET(rc, void);
62
+ if (ptr)
63
+ {
64
+ ok = true;
65
+ if (isClass(rc, bitmap_bundle_id()))
66
+ tmpBundle = *static_cast<wxBitmapBundle*> (ptr);
67
+ else if (isClass(rc, bitmap_id()))
68
+ tmpBundle = wxBitmapBundle(*static_cast<wxBitmap*> (ptr));
69
+ else if (isClass(rc, icon_id()))
70
+ tmpBundle = wxBitmapBundle(*static_cast<wxIcon*> (ptr));
71
+ else if (isClass(rc, image_id()))
72
+ tmpBundle = wxBitmapBundle(*static_cast<wxImage*> (ptr));
73
+ else
74
+ ok = false;
75
+ }
76
+ }
77
+
78
+ if (!ok)
79
+ {
80
+ std::wcerr << "Invalid return value from icon provider" << std::endl;
81
+ wxRuby_ExitMainLoop();
82
+ }
83
+ }
84
+ }
85
+ return tmpBundle;
86
+ }
87
+
88
+ private:
89
+
90
+ VALUE rbIconProvider_ {};
91
+
92
+ inline bool isClass(VALUE obj, ID class_id)
93
+ {
94
+ VALUE klass = rb_const_get(wxRuby_Core(), class_id);
95
+ return rb_obj_is_kind_of(obj, klass);
96
+ }
97
+ };
98
+ __HEREDOC
99
+ spec.add_extend_code 'wxBackstageMRUList', <<~__CODE
100
+ void set_icon_provider(VALUE provider)
101
+ {
102
+ std::function<wxBitmapBundle(const wxString&)> icon_provider_func = RbIconProvider(provider);
103
+ $self->SetIconProvider(icon_provider_func);
104
+ }
105
+ __CODE
106
+ spec.do_not_generate :variables, :enums, :defines, :functions, :typedefs
107
+ end
108
+ end # class BackstageMRUList
109
+
110
+ end # class Director
111
+
112
+ end # module WXRuby3
@@ -18,6 +18,20 @@ module WXRuby3
18
18
  super
19
19
  # for SetArtProvider (only in RibbonBar)
20
20
  spec.disown 'wxRibbonArtProvider *art'
21
+ if Config.instance.wx_version_check('3.3.4') >= 0
22
+ spec.regard 'wxRibbonBar::TriggerKey::keyCode',
23
+ 'wxRibbonBar::TriggerKey::modifiers'
24
+ spec.map 'const std::vector< wxRibbonBar::TriggerKey > &' => 'Array<Wx::RBN::RibbonBar::TriggerKey>' do
25
+ map_out code: <<~__CODE
26
+ $result = rb_ary_new();
27
+ for (const wxRibbonBar::TriggerKey& tkey : *$1)
28
+ {
29
+ VALUE r_tkey = SWIG_NewPointerObj(new wxRibbonBar::TriggerKey(tkey), SWIGTYPE_p_wxRibbonBar__TriggerKey, SWIG_POINTER_OWN);
30
+ rb_ary_push($result, r_tkey);
31
+ }
32
+ __CODE
33
+ end
34
+ end
21
35
  spec.do_not_generate :variables, :enums, :defines, :functions
22
36
  end
23
37
  end # class RibbonBar
@@ -19,8 +19,12 @@ module WXRuby3
19
19
  def setup
20
20
  super
21
21
  spec.ignore 'wxRibbonGallery::SetItemClientData',
22
- 'wxRibbonGallery::GetItemClientData',
23
- 'wxRibbonGallery::Append(const wxBitmap &, int, void *)'
22
+ 'wxRibbonGallery::GetItemClientData'
23
+ if Config.instance.wx_version_check('3.3.4') <= 0
24
+ spec.ignore 'wxRibbonGallery::Append(const wxBitmap &, int, void *)'
25
+ else
26
+ spec.ignore 'wxRibbonGallery::Append(const wxBitmapBundle &, int, void *)'
27
+ end
24
28
  spec.map 'wxRibbonGalleryItem*' => 'Integer' do
25
29
  map_out code: '$result = ULL2NUM(reinterpret_cast<uintptr_t> ($1));'
26
30
  map_directorout code: '$result = reinterpret_cast<wxRibbonGalleryItem*> ((uintptr_t)NUM2ULL($1));'
@@ -16,6 +16,17 @@ module WXRuby3
16
16
 
17
17
  def setup
18
18
  super
19
+ if Config.instance.wx_version_check('3.3.2') <= 0
20
+ # implement custom version of method because of unconventional
21
+ # (and problematic) return type
22
+ spec.ignore 'wxRibbonPage::GetIcon', ignore_doc: false
23
+ spec.add_extend_code 'wxRibbonPage', <<~__CODE
24
+ wxBitmap GetIcon()
25
+ {
26
+ return $self->GetIcon();
27
+ }
28
+ __CODE
29
+ end
19
30
  end
20
31
  end # class RibbonPage
21
32
 
@@ -129,10 +129,12 @@ module WXRuby3
129
129
  # not needed because of type mapping
130
130
  spec.ignore 'wxRibbonToolBar::GetToolId',
131
131
  'wxRibbonToolBar::FindById'
132
- # replace incorrectly documented method
133
- spec.ignore 'wxRibbonToolBar::AddToggleTool', ignore_doc: false
134
- spec.extend_interface 'wxRibbonToolBar',
135
- 'virtual wxRibbonToolBarToolBase* AddToggleTool (int tool_id, const wxBitmap &bitmap, const wxString &help_string=wxEmptyString)'
132
+ if Config.instance.wx_version_check('3.3.4') <= 0
133
+ # replace incorrectly documented method
134
+ spec.ignore 'wxRibbonToolBar::AddToggleTool', ignore_doc: false
135
+ spec.extend_interface 'wxRibbonToolBar',
136
+ 'virtual wxRibbonToolBarToolBase* AddToggleTool (int tool_id, const wxBitmap &bitmap, const wxString &help_string=wxEmptyString)'
137
+ end
136
138
  # map opaque wxRibbonToolBarToolBase* to the integer tool ID
137
139
  spec.map 'wxRibbonToolBarToolBase*' => 'Integer' do
138
140
  map_out code: '$result = ($1) ? INT2NUM((arg1)->GetToolId($1)) : Qnil;'
@@ -41,7 +41,7 @@ module WXRuby3
41
41
  bool rc = $self->RemoveChild(wx_child, deleteChild);
42
42
  if (rc && !deleteChild)
43
43
  {
44
- RDATA(rb_child)->dfree = GC_RichTextObjectFreeFunc; // make sure Ruby owns
44
+ WXRUBY_WRAPPER_DATA_DFREE_SET(rb_child, GC_RichTextObjectFreeFunc); // make sure Ruby owns
45
45
  }
46
46
  return rc;
47
47
  }
@@ -92,10 +92,10 @@ module WXRuby3
92
92
 
93
93
  static const rb_data_type_t __wxRichTextFloatCollector_type = {
94
94
  "RichTextFloatCollector",
95
- #if RUBY_API_VERSION_MAJOR >= 3
96
- { NULL, NULL, __wxRichTextFloatCollector_size, 0, {}},
95
+ #if RUBY_API_VERSION_MAJOR > 4 || (RUBY_API_VERSION_MAJOR == 4 && RUBY_API_VERSION_MINOR >= 1)
96
+ { NULL, NULL, __wxRichTextFloatCollector_size, 0, 0, {}},
97
97
  #else
98
- { NULL, NULL, __wxRichTextFloatCollector_size, {}},
98
+ { NULL, NULL, __wxRichTextFloatCollector_size, 0, {}},
99
99
  #endif
100
100
  NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
101
101
  };
@@ -46,7 +46,7 @@ module WXRuby3
46
46
  static void wxRuby_MakeRichTextStyleDefinitionOwned(VALUE rb_rtsd)
47
47
  {
48
48
  swig_type_info* swig_type = wxRuby_GetSwigTypeForClass(CLASS_OF(rb_rtsd));
49
- RDATA(rb_rtsd)->dfree = ((swig_class *) swig_type->clientdata)->destroy; // make sure Ruby owns
49
+ WXRUBY_WRAPPER_DATA_DFREE_SET(rb_rtsd, ((swig_class *) swig_type->clientdata)->destroy); // make sure Ruby owns
50
50
  }
51
51
 
52
52
  extern VALUE wxRuby_RichTextStyleDefinition2Ruby(const wxRichTextStyleDefinition *wx_rtsd, int own)
@@ -61,7 +61,7 @@ module WXRuby3
61
61
  end
62
62
  spec.ignore 'wxScrolled::OnDraw'
63
63
  spec.ignore 'wxScrolled::GetViewStart(int *,int *)'
64
- if Config.instance.wx_version_check('3.3.2') >= 0
64
+ if Config.instance.wx_version_check('3.3.2') >= 0 && Config.instance.wx_version_check('3.3.4') <= 0
65
65
  spec.ignore 'wxScrolled::GetViewStartPixels(int *,int *) const'
66
66
  end
67
67
  spec.map_apply 'int * OUTPUT' => 'int *'
@@ -96,6 +96,9 @@ module WXRuby3
96
96
  return rc;
97
97
  }
98
98
  __HEREDOC
99
+ if Config.instance.wx_version_check('3.3.3') >= 0
100
+ spec.new_object 'wxSizer::DetachItem(size_t)'
101
+ end
99
102
  # Typemap for GetChildren - convert to array of Sizer items
100
103
  spec.map 'wxSizerItemList&' => 'Array<Wx::SizerItem>' do
101
104
  map_out code: <<~__CODE
@@ -171,6 +174,10 @@ module WXRuby3
171
174
  #{spec.module_name}::Layout
172
175
  ])
173
176
  spec.no_proxy "#{spec.module_name}::AddSpacer"
177
+ if Config.instance.wx_version_check('3.3.3') >= 0
178
+ spec.suppress_warning(473, 'wxSizer::DetachItem')
179
+ spec.no_proxy 'wxSizer::DetachItem'
180
+ end
174
181
  super
175
182
  end
176
183
 
@@ -33,7 +33,10 @@ module WXRuby3
33
33
  spec.map 'wxObject*' => 'Object', swig: false do
34
34
  map_out code: ''
35
35
  end
36
- spec.ignore(%w[wxSizerItem::SetSizer wxSizerItem::SetSpacer wxSizerItem::SetWindow])
36
+ spec.ignore('wxSizerItem::SetSizer')
37
+ if Config.instance.wx_version_check('3.3.4') < 0
38
+ spec.ignore(%w[wxSizerItem::SetSpacer wxSizerItem::SetWindow])
39
+ end
37
40
  # need to adjust sizer arg name to apply disown specs
38
41
  spec.ignore 'wxSizerItem::AssignSizer(wxSizer *)', ignore_doc: false
39
42
  spec.extend_interface 'wxSizerItem',
@@ -16,8 +16,8 @@ module WXRuby3
16
16
 
17
17
  def setup
18
18
  super
19
- # because of error in XML docs
20
- spec.ignore('wxSplitterEvent::GetOldSize', ignore_doc: false)
19
+ # because of error in XML docs in older wxWidgets
20
+ spec.ignore('wxSplitterEvent::GetOldSize', 'wxSplitterEvent::GetNewSize' , ignore_doc: false)
21
21
  # add these by hand here
22
22
  spec.extend_interface('wxSplitterEvent',
23
23
  'int GetOldSize() const',
@@ -48,6 +48,9 @@ module WXRuby3
48
48
  # It also handles the special case where +nil+ is returned, to signal to Wx that no menu is to
49
49
  # be shown.
50
50
  spec.map 'wxMenu *' do
51
+ add_header_code <<~__CODE
52
+ WXRUBY_EXPORT void wxRuby_RegisterWxMenu(wxMenu* wx_menu, VALUE rb_menu);
53
+ __CODE
51
54
  map_directorout code: <<~__CODE
52
55
  static const std::string create_popup_menu("CreatePopupMenu");
53
56
  bool disown = (std::string("$symname") == create_popup_menu);
@@ -59,7 +62,7 @@ module WXRuby3
59
62
  else
60
63
  {
61
64
  void * ptr;
62
- int swig_res = SWIG_ConvertPtr(result, &ptr, $1_descriptor, disown ? SWIG_POINTER_DISOWN : 0);
65
+ int swig_res = SWIG_ConvertPtr(result, &ptr, $1_descriptor, disown ? SWIG_POINTER_RELEASE : 0);
63
66
  if (!SWIG_IsOK(swig_res))
64
67
  {
65
68
  Swig::DirectorTypeMismatchException::raise(swig_get_self(), "$symname", rb_eTypeError,
@@ -56,7 +56,7 @@ module WXRuby3
56
56
  this->wxTextValidator::SetWindow(win);
57
57
  VALUE self = this->get_self();
58
58
  // make sure Ruby does not own this validator instance anymore
59
- RDATA(self)->dfree = SWIG_RubyRemoveTracking;
59
+ WXRUBY_WRAPPER_DATA_DFREE_SET(self, SWIG_RubyRemoveTracking);
60
60
  }
61
61
 
62
62
  virtual bool TransferFromWindow () override
@@ -35,10 +35,18 @@ module WXRuby3
35
35
  }
36
36
  __HEREDOC
37
37
  spec.ignore %w{
38
- wxTopLevelWindow::SaveGeometry
39
- wxTopLevelWindow::RestoreToGeometry
40
- wxTopLevelWindow::GeometrySerializer
41
- }
38
+ wxTopLevelWindow::SaveGeometry
39
+ wxTopLevelWindow::RestoreToGeometry
40
+ }
41
+ if Config.instance.wx_version_check('3.3.3') < 0
42
+ spec.ignore %w{
43
+ wxTopLevelWindow::GeometrySerializer
44
+ }
45
+ else
46
+ spec.ignore %w{
47
+ wxTopLevelWindow::GeometryStore
48
+ }
49
+ end
42
50
  # #ignore_unless if wxRuby one day supports 'WXUNIVERSAL'
43
51
  spec.ignore %w{
44
52
  wxTopLevelWindow::IsUsingNativeDecorations
@@ -54,10 +54,10 @@ module WXRuby3
54
54
 
55
55
  static const rb_data_type_t __wxTreeItemId_type = {
56
56
  "TreeItemId",
57
- #if RUBY_API_VERSION_MAJOR >= 3
58
- { NULL, NULL, __wxTreeItemId_size, 0, {}},
57
+ #if RUBY_API_VERSION_MAJOR > 4 || (RUBY_API_VERSION_MAJOR == 4 && RUBY_API_VERSION_MINOR >= 1)
58
+ { NULL, NULL, __wxTreeItemId_size, 0, 0, {}},
59
59
  #else
60
- { NULL, NULL, __wxTreeItemId_size, {}},
60
+ { NULL, NULL, __wxTreeItemId_size, 0, {}},
61
61
  #endif
62
62
  NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
63
63
  };
@@ -69,7 +69,7 @@ module WXRuby3
69
69
  this->wxValidator::SetWindow(win);
70
70
  VALUE self = this->get_self();
71
71
  // make sure Ruby does not own this validator instance anymore
72
- RDATA(self)->dfree = SWIG_RubyRemoveTracking;
72
+ WXRUBY_WRAPPER_DATA_DFREE_SET(self, SWIG_RubyRemoveTracking);
73
73
  }
74
74
 
75
75
  bool wxRubyValidator::TransferFromWindow()
@@ -402,7 +402,7 @@ module WXRuby3
402
402
  VALUE obj = ti.second;
403
403
 
404
404
  WXRUBY_TRACE_IF(WxRubyTraceGCMarkVariant, 2)
405
- WXRUBY_TRACE_WITH(void *c_ptr = (TYPE(obj) == T_DATA ? DATA_PTR(obj) : 0))
405
+ WXRUBY_TRACE_WITH(void *c_ptr = (WXRUBY_HAS_WRAPPED_DATA(obj) ? WXRUBY_WRAPPER_DATA_PTR(obj) : 0))
406
406
  WXRUBY_TRACE("| GC_mark_RbValueVariants : " << ti.first << "|" << (void*)c_ptr)
407
407
  WXRUBY_TRACE_END
408
408
 
@@ -419,7 +419,7 @@ module WXRuby3
419
419
  static bool is_marker_registered = false;
420
420
 
421
421
  WXRUBY_TRACE_IF(WxRubyTraceGCTrackVariant, 2)
422
- WXRUBY_TRACE_WITH(void *c_ptr = (TYPE(rbval) == T_DATA ? DATA_PTR(rbval) : 0))
422
+ WXRUBY_TRACE_WITH(void *c_ptr = (WXRUBY_HAS_WRAPPED_DATA(rbval) ? WXRUBY_WRAPPER_DATA_PTR(rbval) : 0))
423
423
  WXRUBY_TRACE("> wxRuby_RegisterValueVariantData : " << ptr << "|" << (void*)c_ptr)
424
424
  WXRUBY_TRACE_END
425
425
 
@@ -82,6 +82,9 @@ module WXRuby3
82
82
  'wxWindow::Raise',
83
83
  'wxWindow::Lower'
84
84
  ]
85
+ if Config.instance.wx_version_check('3.3.4') > 0
86
+ spec.ignore 'wxWindow::GetViewStartPixels(int *,int *) const'
87
+ end
85
88
 
86
89
  # Event handler chaining methods; pushed handlers always remain owned by Ruby
87
90
  # wxRuby3 will automatically pop any remaining handlers when windows get deleted
@@ -236,10 +239,6 @@ module WXRuby3
236
239
  spec.override_events 'wxWindow', 'EVT_ACTIVATE' => ['EVT_ACTIVATE', 0, 'wxActivateEvent']
237
240
  when 'wxNonOwnedWindow'
238
241
  spec.no_proxy('wxNonOwnedWindow')
239
- if Config.instance.features_set?('WXOSX')
240
- spec.extend_interface('wxNonOwnedWindow',
241
- 'virtual bool Destroy() override')
242
- end
243
242
  when 'wxControl'
244
243
  # add these to the generated interface to be parsed by SWIG
245
244
  # the wxWidgets docs are flawed in this respect that several reimplemented
@@ -345,6 +344,9 @@ module WXRuby3
345
344
  "#{spec.class_name(citem)}::AdjustForLayoutDirection",
346
345
  "#{spec.class_name(citem)}::IsTransparentBackgroundSupported",
347
346
  "#{spec.class_name(citem)}::Reparent")
347
+ if Config.instance.wx_version_check('3.3.4') > 0
348
+ spec.no_proxy("#{spec.class_name(citem)}::GetViewStartPixels")
349
+ end
348
350
  if Config.instance.features_set?('USE_ACCESSIBILITY')
349
351
  if Config.instance.wx_version_check('3.2.4') > 0
350
352
  spec.no_proxy "#{spec.class_name(citem)}::CreateAccessible"
@@ -387,15 +389,33 @@ module WXRuby3
387
389
  # true for dialogs which are not cleaned up by wxWidgets but rather garbage collected by Ruby).
388
390
  class UpdateWindow < Processor
389
391
 
392
+ def collect_window_classes
393
+ def_items.select { |def_item| Extractor::ClassDef === def_item && (def_item == 'wxWindow' || is_derived_from?(def_item, 'wxWindow')) }.collect { |def_item| rb_wx_name(def_item.name) }
394
+ end
395
+
390
396
  def run
397
+ swig_ruby_type_data = SwigRunner.swig_ruby_type == 'typed_data'
398
+ at_init_method = false
391
399
  at_director_method = false
392
400
  director_wx_class = nil
393
401
  director_method_line = 0
394
402
 
403
+ window_classes = collect_window_classes if swig_ruby_type_data
404
+
405
+ core_name = name
406
+ core_name = 'ruby3' if /\Awx\Z/i =~ core_name
407
+
395
408
  prev_line = nil
396
409
 
397
410
  update_source(at_end: ->(){ prev_line }) do |line|
398
- if at_director_method
411
+ if at_init_method
412
+ if /SwigClassWx(\S+)\.cext_type.function.dfree\s+=\s+SWIG_Ruby_free_swig_type;/ =~ line
413
+ class_name = $1
414
+ if window_classes.include?(class_name)
415
+ line = "SwigClassWx#{class_name}.cext_type.function.dfree = WxRuby_Ruby_free_swig_window_type;"
416
+ end
417
+ end
418
+ elsif at_director_method
399
419
  director_method_line += 1 # update line counter
400
420
  if director_method_line == 2 && line.strip.empty? # are we at the right spot?
401
421
  code = <<~__CODE # insert the code update
@@ -413,6 +433,8 @@ module WXRuby3
413
433
  director_wx_class = $1
414
434
  at_director_method = true # we're at a director method to be updated
415
435
  director_method_line = 0 # keep track of the method lines
436
+ elsif swig_ruby_type_data && /void\s+Init_(wx|Wx)#{core_name}\(/ =~ line
437
+ at_init_method = true
416
438
  end
417
439
 
418
440
  result = prev_line
@@ -31,7 +31,7 @@ module WXRuby3
31
31
  return ;
32
32
  }
33
33
  __HEREDOC
34
- spec.do_not_generate(:variables, :enums, :defines, :functions)
34
+ spec.do_not_generate(:variables, :enums, :defines, :functions, :typedefs)
35
35
  end
36
36
  end # class WindowDisabler
37
37
 
@@ -57,12 +57,12 @@ module WXRuby3
57
57
  static void AddSubclassFactory(VALUE factory)
58
58
  {
59
59
  void *pfactory = 0;
60
- if (TYPE(factory) != T_DATA || !rb_obj_is_kind_of(factory, WxRuby_XmlSubclassFactory_klass))
60
+ if (!WXRUBY_HAS_WRAPPED_DATA(factory) || !rb_obj_is_kind_of(factory, WxRuby_XmlSubclassFactory_klass))
61
61
  {
62
62
  rb_raise(rb_eArgError, "expected Wx::XmlSubclassFactory for argument 1"); return;
63
63
  }
64
- RDATA(factory)->dfree = 0; // wxWidgets will take over management
65
- Data_Get_Struct(factory, void, pfactory);
64
+ WXRUBY_WRAPPER_DATA_DFREE_RESET(factory); // wxWidgets will take over management
65
+ pfactory = WXRUBY_WRAPPER_DATA_PTR(factory);
66
66
  wxXmlResource::AddSubclassFactory(reinterpret_cast< wxXmlSubclassFactory * >(pfactory));
67
67
  }
68
68
  __HEREDOC
@@ -94,12 +94,12 @@ module WXRuby3
94
94
  result = rb_funcall(this->self_, create_id(), 1, rb_classname);
95
95
  if (result != Qnil)
96
96
  {
97
- if (TYPE(result) != T_DATA || !rb_obj_is_kind_of(result, ((swig_class *) (SWIGTYPE_p_wxObject->clientdata))->klass))
97
+ if (!WXRUBY_HAS_WRAPPED_DATA(result) || !rb_obj_is_kind_of(result, ((swig_class *) (SWIGTYPE_p_wxObject->clientdata))->klass))
98
98
  {
99
99
  Swig::DirectorTypeMismatchException::raise(rb_eTypeError, "in output value of type '""wxObject *""'");
100
100
  }
101
- Data_Get_Struct(result, void, result_ptr);
102
- RDATA(result)->dfree = 0; // disown
101
+ result_ptr = WXRUBY_WRAPPER_DATA_PTR(result);
102
+ WXRUBY_WRAPPER_DATA_DFREE_RESET(result); // disown
103
103
  // the returned wxObject's should be Window objects which are always managed by wxWidgets after creation
104
104
  // so no need to own anything anymore
105
105
  c_result = reinterpret_cast< wxObject * >(result_ptr);
@@ -111,7 +111,7 @@ module WXRuby3
111
111
 
112
112
  WxRuby_XmlSubclassFactory::~WxRuby_XmlSubclassFactory()
113
113
  {
114
- DATA_PTR(this->self_) = 0; // unlink
114
+ WXRUBY_WRAPPER_DATA_PTR_RESET(this->self_); // unlink
115
115
  }
116
116
 
117
117
  SWIGINTERN void
@@ -121,6 +121,23 @@ module WXRuby3
121
121
  delete arg1;
122
122
  }
123
123
 
124
+ #ifdef WXRUBY_SWIG_TYPED_DATA
125
+
126
+ static const rb_data_type_t wxruby_subclass_factory_data_type = {
127
+ "C++ WxRuby_XmlSubclassFactory",
128
+ #if RUBY_API_VERSION_MAJOR > 4 || (RUBY_API_VERSION_MAJOR == 4 && RUBY_API_VERSION_MINOR >= 1)
129
+ { SWIG_Ruby_mark_swig_type, SWIG_Ruby_free_swig_type, 0, 0, 0, {}},
130
+ #else
131
+ { SWIG_Ruby_mark_swig_type, SWIG_Ruby_free_swig_type, 0, 0, {}},
132
+ #endif
133
+ 0, 0
134
+ #ifdef RUBY_TYPED_FREE_IMMEDIATELY
135
+ , SWIG_RUBY_TYPED_DATA_FLAGS
136
+ #endif
137
+ };
138
+
139
+ #endif
140
+
124
141
  SWIGINTERN VALUE
125
142
  #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
126
143
  WxRuby_XmlSubclassFactory_allocate(VALUE self)
@@ -129,9 +146,17 @@ module WXRuby3
129
146
  #endif
130
147
  {
131
148
  VALUE obj;
149
+ #ifdef WXRUBY_SWIG_UNTYPED_DATA
132
150
  obj = Data_Wrap_Struct(self, 0, WxRuby_XmlSubclassFactory_free, 0);
151
+ #else
152
+ struct swig_ruby_wrapped_object *wrobj;
153
+ obj = TypedData_Make_Struct(self, struct swig_ruby_wrapped_object, &wxruby_subclass_factory_data_type, wrobj);
154
+ wrobj->data = 0;
155
+ wrobj->dfree = WxRuby_XmlSubclassFactory_free;
156
+ #endif
157
+ rb_iv_set(obj, "@__swigtype__", rb_str_new2("XmlSubclassFactory"));
133
158
  WxRuby_XmlSubclassFactory *pfactory = new WxRuby_XmlSubclassFactory(obj);
134
- DATA_PTR(obj) = pfactory;
159
+ WXRUBY_WRAPPER_DATA_PTR_SET(obj, pfactory);
135
160
  #ifndef HAVE_RB_DEFINE_ALLOC_FUNC
136
161
  rb_obj_call_init(obj, argc, argv);
137
162
  #endif
@@ -215,7 +215,8 @@ module WXRuby3
215
215
  else
216
216
  nil
217
217
  end
218
- evt_paras[1].xpath('.//listitem').each do |li|
218
+ evt_list_para = evt_paras.detect { |para| !para.xpath('.//listitem').empty? }
219
+ (evt_list_para ? evt_list_para.xpath('.//listitem') : []).each do |li|
219
220
  if li.text =~ /(EVT_\w+)\((.*)\)/
220
221
  evt_handler = $1
221
222
  args = $2.split(',').collect {|a| a.strip }
@@ -82,8 +82,9 @@ module WXRuby3
82
82
  attempts << pathname
83
83
  unless File.exist?(pathname)
84
84
  msg = "Unable to find xml file for ITEM: %s" % class_or_filename
85
- puts(msg)
86
- puts("Tried: %s" % (attempts.join("\n ")))
85
+ STDERR.puts(msg)
86
+ STDERR.puts("Tried: %s" % (attempts.join("\n ")))
87
+ STDERR.puts("Matches: %s" % (Dir[File.join(xml_dir,'*defs.*.*')].join("\n ")))
87
88
  raise DoxyXMLError.new(msg)
88
89
  end
89
90
  end
@@ -68,7 +68,7 @@ module WXRuby3
68
68
  return SWIG_ERROR;
69
69
  }
70
70
 
71
- if (TYPE(obj) != T_DATA)
71
+ if (!WXRUBY_HAS_WRAPPED_DATA(obj))
72
72
  {
73
73
  VALUE msg = rb_inspect(obj);
74
74
  rb_raise(rb_eArgError,
@@ -82,9 +82,8 @@ module WXRuby3
82
82
  swig_class* cls_info = static_cast<swig_class*> (it->first);
83
83
  if (rb_obj_is_kind_of(obj, cls_info->klass))
84
84
  {
85
- void *vptr = 0;
86
85
  /* Grab the pointer */
87
- Data_Get_Struct(obj, void, vptr);
86
+ void *vptr = WXRUBY_WRAPPER_DATA_GET(obj, void);
88
87
  wx_#{underscore(rb_name)}_convert_fn fn_cvt = it->second;
89
88
  *ptr = (*fn_cvt)(vptr);
90
89
  if (!ptr)
@@ -248,11 +248,12 @@ module WXRuby3
248
248
  Director.Spec(pkg, 'wxPersistentWindow', requirements: %w[USE_CONFIG])
249
249
  Director.Spec(pkg, 'wxSecretStore', requirements: %w[USE_SECRETSTORE])
250
250
  Director.Spec(pkg, 'wxDCOverlay', director: Director::DerivedDC)
251
- Director.Spec(pkg, 'wxGeometry', requirements: %w[USE_GEOMETRY])
252
- Director.Spec(pkg, 'wxAffineMatrix2D', requirements: %w[USE_GEOMETRY])
251
+ Director.Spec(pkg, 'wxGeometry', requirements: Config.instance.wx_version_check('3.3.2') <= 0 ? %w[USE_GEOMETRY] : [])
252
+ Director.Spec(pkg, 'wxAffineMatrix2D', requirements: Config.instance.wx_version_check('3.3.2') <= 0 ? %w[USE_GEOMETRY] : [])
253
253
  Director.Spec(pkg, 'wxCredentialEntryDialog', director: Director::Dialog, requirements: %w[USE_CREDENTIALDLG])
254
254
  Director.Spec(pkg, 'wxGenericAboutDialog', director: Director::Dialog, requirements: %w[USE_ABOUTDLG])
255
255
  Director.Spec(pkg, 'wxMBConv')
256
+ Director.Spec(pkg, 'wxFileHistory', requirements: %w[USE_FILE_HISTORY])
256
257
  }
257
258
 
258
259
  Director.Package('Wx::RT', 'USE_THREADS') do |pkg|
@@ -392,6 +393,12 @@ module WXRuby3
392
393
  Director.Spec(pkg, 'wxRibbonPanel')
393
394
  Director.Spec(pkg, 'wxRibbonToolBar')
394
395
  Director.Spec(pkg, 'wxRibbonButtonBar')
396
+ Director.Spec(pkg, 'wxBackstage') if Config.instance.wx_version_check('3.3.4') >= 0
397
+ Director.Spec(pkg, 'wxBackstageButton') if Config.instance.wx_version_check('3.3.4') >= 0
398
+ Director.Spec(pkg, 'wxBackstageHeading', requirements: %w[USE_STATTEXT]) if Config.instance.wx_version_check('3.3.4') >= 0
399
+ Director.Spec(pkg, 'wxBackstageCallout') if Config.instance.wx_version_check('3.3.4') >= 0
400
+ Director.Spec(pkg, 'wxBackstageItemList') if Config.instance.wx_version_check('3.3.4') >= 0
401
+ Director.Spec(pkg, 'wxBackstageMRUList') if Config.instance.wx_version_check('3.3.4') >= 0
395
402
  }
396
403
 
397
404
  Director.Package('Wx::WEB', 'USE_WEBVIEW') { |pkg|