wxruby3 1.7.0 → 1.8.1

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 (522) hide show
  1. checksums.yaml +4 -4
  2. data/INSTALL.md +27 -2
  3. data/README.md +15 -15
  4. data/ext/wxruby3/include/wxRubyApp.h +145 -46
  5. data/ext/wxruby3/include/wxruby-ComboPopup.h +25 -8
  6. data/ext/wxruby3/include/wxruby-GCTracking.h +262 -0
  7. data/ext/wxruby3/include/wxruby-MBConv.h +190 -0
  8. data/ext/wxruby3/include/wxruby-SharedEventHandler.h +183 -0
  9. data/ext/wxruby3/include/wxruby-SharedPtr.h +104 -0
  10. data/ext/wxruby3/include/wxruby-runtime.h +29 -0
  11. data/ext/wxruby3/swig/custom/rubytracking.swg +8 -22
  12. data/ext/wxruby3/swig/custom/wx_ruby_shared_ptr.i +434 -0
  13. data/ext/wxruby3/swig/custom/wx_shared_ptr.i +431 -0
  14. data/ext/wxruby3/swig/mark_free_impl.i +7 -132
  15. data/ext/wxruby3/swig/memory_management.i +8 -44
  16. data/ext/wxruby3/swig/wx.i +46 -73
  17. data/lib/wx/core/const.rb +0 -1
  18. data/lib/wx/core/context_help.rb +17 -0
  19. data/lib/wx/core/cursor.rb +1 -0
  20. data/lib/wx/core/helpcontrollerhelpprovider.rb +10 -2
  21. data/lib/wx/core/mbconv.rb +11 -0
  22. data/lib/wx/core/media_ctrl.rb +31 -0
  23. data/lib/wx/core/top_level_window.rb +7 -0
  24. data/lib/wx/core.rb +6 -0
  25. data/lib/wx/doc/art_provider.rb +17 -0
  26. data/lib/wx/doc/context_help.rb +42 -0
  27. data/lib/wx/doc/core.rb +0 -5
  28. data/lib/wx/doc/functions.rb +10 -0
  29. data/lib/wx/doc/html/html_help_controller.rb +23 -1
  30. data/lib/wx/doc/mbconv.rb +108 -0
  31. data/lib/wx/doc/rt/shared_event_handler.rb +49 -0
  32. data/lib/wx/doc/rt/thread_event.rb +28 -0
  33. data/lib/wx/doc/stream.rb +7 -3
  34. data/lib/wx/doc/webview.rb +40 -0
  35. data/lib/wx/helpers.rb +1 -1
  36. data/lib/wx/html/htmlhelpcontroller.rb +10 -0
  37. data/lib/wx/keyword_defs.rb +11 -0
  38. data/lib/wx/rt/require.rb +8 -0
  39. data/lib/wx/rt/thread_event.rb +14 -0
  40. data/lib/wx/rt.rb +16 -0
  41. data/lib/wx/version.rb +1 -1
  42. data/lib/wx/web/require.rb +8 -0
  43. data/lib/wx/web/webview.rb +106 -0
  44. data/lib/wx/web.rb +17 -0
  45. data/lib/wx/wxruby/cmd/setup.rb +15 -0
  46. data/lib/wx/wxruby/cmd/test.rb +8 -2
  47. data/lib/wx.rb +2 -0
  48. data/rakelib/configure.rb +24 -0
  49. data/rakelib/gem.rb +3 -2
  50. data/rakelib/install.rb +54 -27
  51. data/rakelib/lib/config/macosx.rb +7 -5
  52. data/rakelib/lib/config/mingw.rb +66 -5
  53. data/rakelib/lib/config/pkgman/linux.rb +4 -2
  54. data/rakelib/lib/config/pkgman/mingw.rb +1 -1
  55. data/rakelib/lib/config/unixish.rb +4 -2
  56. data/rakelib/lib/config.rb +37 -3
  57. data/rakelib/lib/core/include/client_data.inc +38 -17
  58. data/rakelib/lib/core/include/funcall.inc +1 -1
  59. data/rakelib/lib/core/include/swigdirector.inc +3 -3
  60. data/rakelib/lib/core/include/swigrubyrun.inc +14 -26
  61. data/rakelib/lib/core/package.rb +0 -2
  62. data/rakelib/lib/director/app.rb +1 -8
  63. data/rakelib/lib/director/art_provider.rb +7 -3
  64. data/rakelib/lib/director/comboctrl.rb +0 -7
  65. data/rakelib/lib/director/context_help_button.rb +35 -2
  66. data/rakelib/lib/director/derived_dc.rb +41 -32
  67. data/rakelib/lib/director/editable_listbox.rb +10 -8
  68. data/rakelib/lib/director/event_handler.rb +32 -28
  69. data/rakelib/lib/director/fs_file.rb +38 -10
  70. data/rakelib/lib/director/functions.rb +8 -0
  71. data/rakelib/lib/director/grid_cell_attr.rb +1 -3
  72. data/rakelib/lib/director/grid_cell_editor.rb +14 -12
  73. data/rakelib/lib/director/grid_cell_renderer.rb +11 -8
  74. data/rakelib/lib/director/grid_ctrl.rb +140 -121
  75. data/rakelib/lib/director/help_controller.rb +70 -2
  76. data/rakelib/lib/director/mb_conv.rb +30 -0
  77. data/rakelib/lib/director/menu.rb +92 -42
  78. data/rakelib/lib/director/menu_bar.rb +84 -45
  79. data/rakelib/lib/director/menu_item.rb +2 -2
  80. data/rakelib/lib/director/persistence_manager.rb +3 -2
  81. data/rakelib/lib/director/preview_frame.rb +2 -2
  82. data/rakelib/lib/director/ribbon_page.rb +11 -0
  83. data/rakelib/lib/director/richtext_buffer.rb +5 -2
  84. data/rakelib/lib/director/shared_evt_handler.rb +30 -0
  85. data/rakelib/lib/director/sizer.rb +8 -17
  86. data/rakelib/lib/director/sizer_item.rb +3 -4
  87. data/rakelib/lib/director/task_bar_icon.rb +7 -7
  88. data/rakelib/lib/director/thread_event.rb +33 -0
  89. data/rakelib/lib/director/top_level_window.rb +12 -4
  90. data/rakelib/lib/director/validator.rb +3 -1
  91. data/rakelib/lib/director/variant.rb +16 -12
  92. data/rakelib/lib/director/webview.rb +166 -0
  93. data/rakelib/lib/director/webview_event.rb +37 -0
  94. data/rakelib/lib/director/webview_handler.rb +63 -0
  95. data/rakelib/lib/generate/doc/thread_event.yaml +20 -0
  96. data/rakelib/lib/generate/doc/web_view.yaml +135 -0
  97. data/rakelib/lib/generate/doc/web_view_event.yaml +38 -0
  98. data/rakelib/lib/generate/doc/web_view_handler.yaml +58 -0
  99. data/rakelib/lib/specs/interfaces.rb +14 -2
  100. data/rakelib/lib/typemap/common.rb +34 -1
  101. data/rakelib/lib/typemap/mb_conv.rb +58 -0
  102. data/rakelib/prepost.rake +23 -31
  103. data/rakelib/prepost.rb +20 -0
  104. data/samples/event/threaded.rb +295 -42
  105. data/samples/event/tn_threaded.png +0 -0
  106. data/samples/help/doc/back.gif +0 -0
  107. data/samples/help/doc/contents.gif +0 -0
  108. data/samples/help/doc/cshelp.txt +9 -0
  109. data/samples/help/doc/doc.chm +0 -0
  110. data/samples/help/doc/doc.cnt +8 -0
  111. data/samples/help/doc/doc.h +7 -0
  112. data/samples/help/doc/doc.hhc +40 -0
  113. data/samples/help/doc/doc.hhk +31 -0
  114. data/samples/help/doc/doc.hhp +33 -0
  115. data/samples/help/doc/doc.hpj +21 -0
  116. data/samples/help/doc/doc.htm +27 -0
  117. data/samples/help/doc/doc1.htm +24 -0
  118. data/samples/help/doc/doc2.htm +12 -0
  119. data/samples/help/doc/doc3.htm +12 -0
  120. data/samples/help/doc/doc4.htm +12 -0
  121. data/samples/help/doc/doc5.htm +14 -0
  122. data/samples/help/doc/forward.gif +0 -0
  123. data/samples/help/doc/up.gif +0 -0
  124. data/samples/help/doc.chm +0 -0
  125. data/samples/help/doc.chw +0 -0
  126. data/samples/help/doc.zip +0 -0
  127. data/samples/help/help.rb +352 -0
  128. data/samples/help/tn_help.png +0 -0
  129. data/samples/webview/handler_advanced.html +55 -0
  130. data/samples/webview/tn_webview.png +0 -0
  131. data/samples/webview/webview.rb +1264 -0
  132. data/tests/assets/handler_advanced.html +55 -0
  133. data/tests/assets/test.zip +0 -0
  134. data/tests/lib/text_entry_tests.rb +2 -2
  135. data/tests/lib/wxapp_runner.rb +40 -0
  136. data/tests/lib/wxframe_runner.rb +17 -2
  137. data/tests/test_art.rb +8 -8
  138. data/tests/test_clipboard.rb +4 -4
  139. data/tests/test_config.rb +6 -6
  140. data/tests/test_exceptions.rb +8 -6
  141. data/tests/test_ext_controls.rb +3 -3
  142. data/tests/test_file_dialog.rb +5 -5
  143. data/tests/test_font.rb +7 -7
  144. data/tests/test_grid_ctrl.rb +133 -0
  145. data/tests/test_help.rb +88 -0
  146. data/tests/test_intl.rb +1 -1
  147. data/tests/test_media_ctrl.rb +14 -6
  148. data/tests/test_menu.rb +94 -86
  149. data/tests/test_persistence.rb +1 -1
  150. data/tests/test_proof_check.rb +5 -5
  151. data/tests/test_propgrid.rb +1 -1
  152. data/tests/test_shared_event_handler.rb +141 -0
  153. data/tests/test_std_controls.rb +5 -5
  154. data/tests/test_webview.rb +492 -0
  155. data/tests/test_window.rb +3 -3
  156. metadata +66 -368
  157. data/assets/repo-social-preview.odg +0 -0
  158. data/assets/repo-social-preview.xcf +0 -0
  159. data/lib/wx/aui/events/evt_list.rb +0 -148
  160. data/lib/wx/core/events/evt_list.rb +0 -1458
  161. data/lib/wx/core/font/encoding.rb +0 -113
  162. data/lib/wx/doc/gen/about_dialog_info.rb +0 -330
  163. data/lib/wx/doc/gen/accelerator.rb +0 -178
  164. data/lib/wx/doc/gen/activity_indicator.rb +0 -83
  165. data/lib/wx/doc/gen/affine_matrix2d.rb +0 -284
  166. data/lib/wx/doc/gen/animation.rb +0 -275
  167. data/lib/wx/doc/gen/animation_ctrl.rb +0 -300
  168. data/lib/wx/doc/gen/any_button.rb +0 -191
  169. data/lib/wx/doc/gen/app.rb +0 -463
  170. data/lib/wx/doc/gen/app_traits.rb +0 -396
  171. data/lib/wx/doc/gen/art_provider.rb +0 -605
  172. data/lib/wx/doc/gen/aui/aui_dock_art.rb +0 -455
  173. data/lib/wx/doc/gen/aui/aui_floating_frame.rb +0 -54
  174. data/lib/wx/doc/gen/aui/aui_manager.rb +0 -847
  175. data/lib/wx/doc/gen/aui/aui_manager_event.rb +0 -131
  176. data/lib/wx/doc/gen/aui/aui_mdi_child_frame.rb +0 -180
  177. data/lib/wx/doc/gen/aui/aui_mdi_client_window.rb +0 -59
  178. data/lib/wx/doc/gen/aui/aui_mdi_parent_frame.rb +0 -130
  179. data/lib/wx/doc/gen/aui/aui_notebook.rb +0 -631
  180. data/lib/wx/doc/gen/aui/aui_notebook_event.rb +0 -233
  181. data/lib/wx/doc/gen/aui/aui_pane_info.rb +0 -769
  182. data/lib/wx/doc/gen/aui/aui_tab_art.rb +0 -352
  183. data/lib/wx/doc/gen/aui/aui_tab_ctrl.rb +0 -14
  184. data/lib/wx/doc/gen/aui/aui_tool_bar.rb +0 -510
  185. data/lib/wx/doc/gen/aui/aui_tool_bar_art.rb +0 -340
  186. data/lib/wx/doc/gen/aui/aui_tool_bar_event.rb +0 -244
  187. data/lib/wx/doc/gen/aui/aui_tool_bar_item.rb +0 -257
  188. data/lib/wx/doc/gen/aui/event_list.rb +0 -179
  189. data/lib/wx/doc/gen/banner_window.rb +0 -124
  190. data/lib/wx/doc/gen/bitmap.rb +0 -731
  191. data/lib/wx/doc/gen/bitmap_button.rb +0 -123
  192. data/lib/wx/doc/gen/bitmap_combo_box.rb +0 -221
  193. data/lib/wx/doc/gen/book_ctrl_base.rb +0 -273
  194. data/lib/wx/doc/gen/book_ctrl_event.rb +0 -66
  195. data/lib/wx/doc/gen/box_sizer.rb +0 -85
  196. data/lib/wx/doc/gen/brush.rb +0 -251
  197. data/lib/wx/doc/gen/busy_info.rb +0 -157
  198. data/lib/wx/doc/gen/button.rb +0 -182
  199. data/lib/wx/doc/gen/calculate_layout_event.rb +0 -62
  200. data/lib/wx/doc/gen/calendar_ctrl.rb +0 -505
  201. data/lib/wx/doc/gen/calendar_date_attr.rb +0 -138
  202. data/lib/wx/doc/gen/calendar_event.rb +0 -147
  203. data/lib/wx/doc/gen/caret.rb +0 -97
  204. data/lib/wx/doc/gen/check_box.rb +0 -175
  205. data/lib/wx/doc/gen/check_list_box.rb +0 -121
  206. data/lib/wx/doc/gen/choice.rb +0 -175
  207. data/lib/wx/doc/gen/choicebook.rb +0 -116
  208. data/lib/wx/doc/gen/client_dc.rb +0 -43
  209. data/lib/wx/doc/gen/clipboard.rb +0 -144
  210. data/lib/wx/doc/gen/collapsible_pane.rb +0 -138
  211. data/lib/wx/doc/gen/collapsible_pane_event.rb +0 -46
  212. data/lib/wx/doc/gen/colour.rb +0 -333
  213. data/lib/wx/doc/gen/colour_dialog.rb +0 -190
  214. data/lib/wx/doc/gen/colour_picker_ctrl.rb +0 -110
  215. data/lib/wx/doc/gen/colour_picker_event.rb +0 -77
  216. data/lib/wx/doc/gen/combo_box.rb +0 -292
  217. data/lib/wx/doc/gen/combo_ctrl.rb +0 -662
  218. data/lib/wx/doc/gen/command_link_button.rb +0 -134
  219. data/lib/wx/doc/gen/config_base.rb +0 -10
  220. data/lib/wx/doc/gen/context_help_button.rb +0 -109
  221. data/lib/wx/doc/gen/control.rb +0 -277
  222. data/lib/wx/doc/gen/control_with_items.rb +0 -253
  223. data/lib/wx/doc/gen/core.rb +0 -45
  224. data/lib/wx/doc/gen/credential_entry_dialog.rb +0 -137
  225. data/lib/wx/doc/gen/cursor.rb +0 -193
  226. data/lib/wx/doc/gen/data_format.rb +0 -85
  227. data/lib/wx/doc/gen/data_object.rb +0 -436
  228. data/lib/wx/doc/gen/data_object_simple_base.rb +0 -10
  229. data/lib/wx/doc/gen/date_event.rb +0 -49
  230. data/lib/wx/doc/gen/date_picker_ctrl.rb +0 -161
  231. data/lib/wx/doc/gen/dc.rb +0 -1631
  232. data/lib/wx/doc/gen/dc_overlay.rb +0 -102
  233. data/lib/wx/doc/gen/defs.rb +0 -2802
  234. data/lib/wx/doc/gen/dial_up_event.rb +0 -45
  235. data/lib/wx/doc/gen/dial_up_manager.rb +0 -149
  236. data/lib/wx/doc/gen/dialog.rb +0 -541
  237. data/lib/wx/doc/gen/dir_dialog.rb +0 -164
  238. data/lib/wx/doc/gen/dir_filter_list_ctrl.rb +0 -90
  239. data/lib/wx/doc/gen/dir_picker_ctrl.rb +0 -125
  240. data/lib/wx/doc/gen/display.rb +0 -238
  241. data/lib/wx/doc/gen/drag_drop.rb +0 -299
  242. data/lib/wx/doc/gen/drag_image.rb +0 -116
  243. data/lib/wx/doc/gen/editable_list_box.rb +0 -109
  244. data/lib/wx/doc/gen/event.rb +0 -990
  245. data/lib/wx/doc/gen/event_blocker.rb +0 -50
  246. data/lib/wx/doc/gen/event_filter.rb +0 -92
  247. data/lib/wx/doc/gen/event_list.rb +0 -1644
  248. data/lib/wx/doc/gen/events.rb +0 -2809
  249. data/lib/wx/doc/gen/evt_handler.rb +0 -229
  250. data/lib/wx/doc/gen/ext_help_controller.rb +0 -109
  251. data/lib/wx/doc/gen/file_ctrl.rb +0 -231
  252. data/lib/wx/doc/gen/file_ctrl_event.rb +0 -83
  253. data/lib/wx/doc/gen/file_dialog.rb +0 -353
  254. data/lib/wx/doc/gen/file_dialog_custom_control.rb +0 -165
  255. data/lib/wx/doc/gen/file_dialog_customize_hook.rb +0 -158
  256. data/lib/wx/doc/gen/file_dir_picker_event.rb +0 -100
  257. data/lib/wx/doc/gen/file_picker_ctrl.rb +0 -132
  258. data/lib/wx/doc/gen/file_system.rb +0 -232
  259. data/lib/wx/doc/gen/find_dialog_event.rb +0 -126
  260. data/lib/wx/doc/gen/find_replace_data.rb +0 -60
  261. data/lib/wx/doc/gen/find_replace_dialog.rb +0 -58
  262. data/lib/wx/doc/gen/flex_grid_sizer.rb +0 -199
  263. data/lib/wx/doc/gen/font.rb +0 -1379
  264. data/lib/wx/doc/gen/font_data.rb +0 -151
  265. data/lib/wx/doc/gen/font_dialog.rb +0 -88
  266. data/lib/wx/doc/gen/font_picker_ctrl.rb +0 -143
  267. data/lib/wx/doc/gen/font_picker_event.rb +0 -65
  268. data/lib/wx/doc/gen/frame.rb +0 -352
  269. data/lib/wx/doc/gen/fs_file.rb +0 -337
  270. data/lib/wx/doc/gen/functions.rb +0 -10
  271. data/lib/wx/doc/gen/gauge.rb +0 -157
  272. data/lib/wx/doc/gen/gb_sizer_item.rb +0 -68
  273. data/lib/wx/doc/gen/gcdc.rb +0 -46
  274. data/lib/wx/doc/gen/gdi_common.rb +0 -1271
  275. data/lib/wx/doc/gen/gdi_object.rb +0 -31
  276. data/lib/wx/doc/gen/generic_about_dialog.rb +0 -140
  277. data/lib/wx/doc/gen/generic_dir_ctrl.rb +0 -223
  278. data/lib/wx/doc/gen/geometry.rb +0 -661
  279. data/lib/wx/doc/gen/graphics_context.rb +0 -1184
  280. data/lib/wx/doc/gen/graphics_object.rb +0 -750
  281. data/lib/wx/doc/gen/grid/event_list.rb +0 -191
  282. data/lib/wx/doc/gen/grid/grid_cell_activatable_editor.rb +0 -40
  283. data/lib/wx/doc/gen/grid/grid_cell_attr.rb +0 -280
  284. data/lib/wx/doc/gen/grid/grid_cell_auto_wrap_string_editor.rb +0 -35
  285. data/lib/wx/doc/gen/grid/grid_cell_auto_wrap_string_renderer.rb +0 -37
  286. data/lib/wx/doc/gen/grid/grid_cell_bool_editor.rb +0 -49
  287. data/lib/wx/doc/gen/grid/grid_cell_bool_renderer.rb +0 -35
  288. data/lib/wx/doc/gen/grid/grid_cell_choice_editor.rb +0 -46
  289. data/lib/wx/doc/gen/grid/grid_cell_date_editor.rb +0 -38
  290. data/lib/wx/doc/gen/grid/grid_cell_date_renderer.rb +0 -45
  291. data/lib/wx/doc/gen/grid/grid_cell_date_time_renderer.rb +0 -40
  292. data/lib/wx/doc/gen/grid/grid_cell_editor.rb +0 -197
  293. data/lib/wx/doc/gen/grid/grid_cell_enum_editor.rb +0 -39
  294. data/lib/wx/doc/gen/grid/grid_cell_enum_renderer.rb +0 -44
  295. data/lib/wx/doc/gen/grid/grid_cell_float_editor.rb +0 -45
  296. data/lib/wx/doc/gen/grid/grid_cell_float_renderer.rb +0 -79
  297. data/lib/wx/doc/gen/grid/grid_cell_number_editor.rb +0 -46
  298. data/lib/wx/doc/gen/grid/grid_cell_number_renderer.rb +0 -35
  299. data/lib/wx/doc/gen/grid/grid_cell_renderer.rb +0 -108
  300. data/lib/wx/doc/gen/grid/grid_cell_string_renderer.rb +0 -35
  301. data/lib/wx/doc/gen/grid/grid_cell_text_editor.rb +0 -49
  302. data/lib/wx/doc/gen/grid/grid_ctrl.rb +0 -3002
  303. data/lib/wx/doc/gen/grid/grid_editor_created_event.rb +0 -95
  304. data/lib/wx/doc/gen/grid/grid_event.rb +0 -129
  305. data/lib/wx/doc/gen/grid/grid_range_select_event.rb +0 -104
  306. data/lib/wx/doc/gen/grid/grid_size_event.rb +0 -85
  307. data/lib/wx/doc/gen/grid/grid_string_table.rb +0 -142
  308. data/lib/wx/doc/gen/grid/grid_table_base.rb +0 -317
  309. data/lib/wx/doc/gen/grid/grid_table_message.rb +0 -81
  310. data/lib/wx/doc/gen/grid_bag_sizer.rb +0 -323
  311. data/lib/wx/doc/gen/grid_sizer.rb +0 -195
  312. data/lib/wx/doc/gen/gui_event_loop.rb +0 -159
  313. data/lib/wx/doc/gen/h_scrolled_window.rb +0 -562
  314. data/lib/wx/doc/gen/header_ctrl.rb +0 -880
  315. data/lib/wx/doc/gen/header_ctrl_event.rb +0 -133
  316. data/lib/wx/doc/gen/help_controller.rb +0 -195
  317. data/lib/wx/doc/gen/help_provider.rb +0 -98
  318. data/lib/wx/doc/gen/html/event_list.rb +0 -38
  319. data/lib/wx/doc/gen/html/html_cell.rb +0 -536
  320. data/lib/wx/doc/gen/html/html_cell_event.rb +0 -69
  321. data/lib/wx/doc/gen/html/html_data_object.rb +0 -42
  322. data/lib/wx/doc/gen/html/html_easy_printing.rb +0 -203
  323. data/lib/wx/doc/gen/html/html_help_controller.rb +0 -340
  324. data/lib/wx/doc/gen/html/html_help_data.rb +0 -159
  325. data/lib/wx/doc/gen/html/html_help_window.rb +0 -258
  326. data/lib/wx/doc/gen/html/html_link_event.rb +0 -41
  327. data/lib/wx/doc/gen/html/html_list_box.rb +0 -346
  328. data/lib/wx/doc/gen/html/html_printout.rb +0 -109
  329. data/lib/wx/doc/gen/html/html_window.rb +0 -461
  330. data/lib/wx/doc/gen/hyperlink_ctrl.rb +0 -311
  331. data/lib/wx/doc/gen/hyperlink_event.rb +0 -44
  332. data/lib/wx/doc/gen/icon.rb +0 -267
  333. data/lib/wx/doc/gen/icon_location.rb +0 -40
  334. data/lib/wx/doc/gen/image.rb +0 -1371
  335. data/lib/wx/doc/gen/image_list.rb +0 -168
  336. data/lib/wx/doc/gen/info_bar.rb +0 -195
  337. data/lib/wx/doc/gen/keyboard_state.rb +0 -140
  338. data/lib/wx/doc/gen/list_box.rb +0 -304
  339. data/lib/wx/doc/gen/list_ctrl.rb +0 -1774
  340. data/lib/wx/doc/gen/list_event.rb +0 -208
  341. data/lib/wx/doc/gen/listbook.rb +0 -116
  342. data/lib/wx/doc/gen/locale.rb +0 -4293
  343. data/lib/wx/doc/gen/log.rb +0 -603
  344. data/lib/wx/doc/gen/mdi_client_window.rb +0 -47
  345. data/lib/wx/doc/gen/mdi_frame.rb +0 -324
  346. data/lib/wx/doc/gen/media_ctrl.rb +0 -269
  347. data/lib/wx/doc/gen/media_event.rb +0 -117
  348. data/lib/wx/doc/gen/memory_dc.rb +0 -174
  349. data/lib/wx/doc/gen/menu.rb +0 -509
  350. data/lib/wx/doc/gen/menu_bar.rb +0 -287
  351. data/lib/wx/doc/gen/menu_item.rb +0 -362
  352. data/lib/wx/doc/gen/message_dialog.rb +0 -238
  353. data/lib/wx/doc/gen/mini_frame.rb +0 -108
  354. data/lib/wx/doc/gen/mirror_dc.rb +0 -22
  355. data/lib/wx/doc/gen/mouse_state.rb +0 -150
  356. data/lib/wx/doc/gen/multi_choice_dialog.rb +0 -80
  357. data/lib/wx/doc/gen/non_owned_window.rb +0 -49
  358. data/lib/wx/doc/gen/notebook.rb +0 -278
  359. data/lib/wx/doc/gen/num_validator.rb +0 -37
  360. data/lib/wx/doc/gen/number_entry_dialog.rb +0 -93
  361. data/lib/wx/doc/gen/object.rb +0 -59
  362. data/lib/wx/doc/gen/owner_drawn_combo_box.rb +0 -395
  363. data/lib/wx/doc/gen/paint_dc.rb +0 -27
  364. data/lib/wx/doc/gen/palette.rb +0 -92
  365. data/lib/wx/doc/gen/panel.rb +0 -127
  366. data/lib/wx/doc/gen/pen.rb +0 -511
  367. data/lib/wx/doc/gen/persistence_manager.rb +0 -135
  368. data/lib/wx/doc/gen/persistent_object.rb +0 -52
  369. data/lib/wx/doc/gen/persistent_window.rb +0 -241
  370. data/lib/wx/doc/gen/pg/event_list.rb +0 -106
  371. data/lib/wx/doc/gen/pg/numeric_property_validator.rb +0 -54
  372. data/lib/wx/doc/gen/pg/pg_array_editor_dialog.rb +0 -292
  373. data/lib/wx/doc/gen/pg/pg_cell.rb +0 -177
  374. data/lib/wx/doc/gen/pg/pg_editor.rb +0 -721
  375. data/lib/wx/doc/gen/pg/pg_multi_button.rb +0 -152
  376. data/lib/wx/doc/gen/pg/pg_properties.rb +0 -2829
  377. data/lib/wx/doc/gen/pg/pg_property.rb +0 -2078
  378. data/lib/wx/doc/gen/pg/pg_validation_info.rb +0 -344
  379. data/lib/wx/doc/gen/pg/property_grid.rb +0 -740
  380. data/lib/wx/doc/gen/pg/property_grid_event.rb +0 -184
  381. data/lib/wx/doc/gen/pg/property_grid_interface.rb +0 -1098
  382. data/lib/wx/doc/gen/pg/property_grid_manager.rb +0 -415
  383. data/lib/wx/doc/gen/pg/property_grid_page.rb +0 -354
  384. data/lib/wx/doc/gen/pg/property_grid_page_state.rb +0 -165
  385. data/lib/wx/doc/gen/picker_base.rb +0 -152
  386. data/lib/wx/doc/gen/platform_info.rb +0 -622
  387. data/lib/wx/doc/gen/popup_window.rb +0 -107
  388. data/lib/wx/doc/gen/progress_dialog.rb +0 -100
  389. data/lib/wx/doc/gen/property_sheet_dialog.rb +0 -216
  390. data/lib/wx/doc/gen/prt/event_list.rb +0 -17
  391. data/lib/wx/doc/gen/prt/page_setup_dialog.rb +0 -44
  392. data/lib/wx/doc/gen/prt/post_script_dc.rb +0 -30
  393. data/lib/wx/doc/gen/prt/preview_frame.rb +0 -78
  394. data/lib/wx/doc/gen/prt/print_abort_dialog.rb +0 -151
  395. data/lib/wx/doc/gen/prt/print_data.rb +0 -804
  396. data/lib/wx/doc/gen/prt/print_dialog.rb +0 -55
  397. data/lib/wx/doc/gen/prt/printer.rb +0 -518
  398. data/lib/wx/doc/gen/prt/printer_dc.rb +0 -37
  399. data/lib/wx/doc/gen/query_layout_info_event.rb +0 -106
  400. data/lib/wx/doc/gen/radio_box.rb +0 -306
  401. data/lib/wx/doc/gen/radio_button.rb +0 -159
  402. data/lib/wx/doc/gen/rbn/event_list.rb +0 -136
  403. data/lib/wx/doc/gen/rbn/ribbon_art_provider.rb +0 -1132
  404. data/lib/wx/doc/gen/rbn/ribbon_bar.rb +0 -308
  405. data/lib/wx/doc/gen/rbn/ribbon_bar_event.rb +0 -45
  406. data/lib/wx/doc/gen/rbn/ribbon_button_bar.rb +0 -458
  407. data/lib/wx/doc/gen/rbn/ribbon_button_bar_event.rb +0 -63
  408. data/lib/wx/doc/gen/rbn/ribbon_control.rb +0 -143
  409. data/lib/wx/doc/gen/rbn/ribbon_gallery.rb +0 -229
  410. data/lib/wx/doc/gen/rbn/ribbon_gallery_event.rb +0 -55
  411. data/lib/wx/doc/gen/rbn/ribbon_page.rb +0 -174
  412. data/lib/wx/doc/gen/rbn/ribbon_panel.rb +0 -270
  413. data/lib/wx/doc/gen/rbn/ribbon_panel_event.rb +0 -45
  414. data/lib/wx/doc/gen/rbn/ribbon_tool_bar.rb +0 -360
  415. data/lib/wx/doc/gen/rbn/ribbon_tool_bar_event.rb +0 -42
  416. data/lib/wx/doc/gen/rearrange_ctrl.rb +0 -78
  417. data/lib/wx/doc/gen/rearrange_list.rb +0 -123
  418. data/lib/wx/doc/gen/region.rb +0 -380
  419. data/lib/wx/doc/gen/region_iterator.rb +0 -76
  420. data/lib/wx/doc/gen/rich_tool_tip.rb +0 -154
  421. data/lib/wx/doc/gen/rtc/event_list.rb +0 -125
  422. data/lib/wx/doc/gen/rtc/rich_text_box.rb +0 -445
  423. data/lib/wx/doc/gen/rtc/rich_text_buffer.rb +0 -1188
  424. data/lib/wx/doc/gen/rtc/rich_text_buffer_data_object.rb +0 -41
  425. data/lib/wx/doc/gen/rtc/rich_text_composite_object.rb +0 -538
  426. data/lib/wx/doc/gen/rtc/rich_text_ctrl.rb +0 -2103
  427. data/lib/wx/doc/gen/rtc/rich_text_event.rb +0 -173
  428. data/lib/wx/doc/gen/rtc/rich_text_file_handler.rb +0 -181
  429. data/lib/wx/doc/gen/rtc/rich_text_formatting_dialog.rb +0 -319
  430. data/lib/wx/doc/gen/rtc/rich_text_header_footer_data.rb +0 -193
  431. data/lib/wx/doc/gen/rtc/rich_text_html_handler.rb +0 -102
  432. data/lib/wx/doc/gen/rtc/rich_text_image.rb +0 -337
  433. data/lib/wx/doc/gen/rtc/rich_text_object.rb +0 -2922
  434. data/lib/wx/doc/gen/rtc/rich_text_paragraph_layout_box.rb +0 -1240
  435. data/lib/wx/doc/gen/rtc/rich_text_printing.rb +0 -258
  436. data/lib/wx/doc/gen/rtc/rich_text_style_list_box.rb +0 -344
  437. data/lib/wx/doc/gen/rtc/rich_text_style_organiser_dialog.rb +0 -227
  438. data/lib/wx/doc/gen/rtc/rich_text_xml_handler.rb +0 -59
  439. data/lib/wx/doc/gen/rtc/symbol_picker_dialog.rb +0 -169
  440. data/lib/wx/doc/gen/sash_event.rb +0 -147
  441. data/lib/wx/doc/gen/sash_layout_window.rb +0 -232
  442. data/lib/wx/doc/gen/sash_window.rb +0 -171
  443. data/lib/wx/doc/gen/scaled_dc.rb +0 -10
  444. data/lib/wx/doc/gen/screen_dc.rb +0 -30
  445. data/lib/wx/doc/gen/scroll_bar.rb +0 -204
  446. data/lib/wx/doc/gen/scrolled_canvas.rb +0 -410
  447. data/lib/wx/doc/gen/scrolled_control.rb +0 -410
  448. data/lib/wx/doc/gen/scrolled_window.rb +0 -430
  449. data/lib/wx/doc/gen/search_ctrl.rb +0 -159
  450. data/lib/wx/doc/gen/secret_store.rb +0 -116
  451. data/lib/wx/doc/gen/simplebook.rb +0 -110
  452. data/lib/wx/doc/gen/single_choice_dialog.rb +0 -89
  453. data/lib/wx/doc/gen/sizer.rb +0 -945
  454. data/lib/wx/doc/gen/sizer_item.rb +0 -244
  455. data/lib/wx/doc/gen/slider.rb +0 -342
  456. data/lib/wx/doc/gen/spin_button.rb +0 -157
  457. data/lib/wx/doc/gen/spin_ctrl.rb +0 -231
  458. data/lib/wx/doc/gen/spin_ctrl_double.rb +0 -192
  459. data/lib/wx/doc/gen/spin_double_event.rb +0 -55
  460. data/lib/wx/doc/gen/spin_event.rb +0 -51
  461. data/lib/wx/doc/gen/splash_screen.rb +0 -113
  462. data/lib/wx/doc/gen/splitter_event.rb +0 -99
  463. data/lib/wx/doc/gen/splitter_window.rb +0 -498
  464. data/lib/wx/doc/gen/static_bitmap.rb +0 -256
  465. data/lib/wx/doc/gen/static_box.rb +0 -180
  466. data/lib/wx/doc/gen/static_box_sizer.rb +0 -85
  467. data/lib/wx/doc/gen/static_line.rb +0 -83
  468. data/lib/wx/doc/gen/static_text.rb +0 -127
  469. data/lib/wx/doc/gen/status_bar.rb +0 -290
  470. data/lib/wx/doc/gen/stc/event_list.rb +0 -221
  471. data/lib/wx/doc/gen/stc/styled_text_ctrl.rb +0 -4474
  472. data/lib/wx/doc/gen/stc/styled_text_event.rb +0 -8762
  473. data/lib/wx/doc/gen/std_dialog_button_sizer.rb +0 -129
  474. data/lib/wx/doc/gen/svg_file_dc.rb +0 -164
  475. data/lib/wx/doc/gen/system_options.rb +0 -129
  476. data/lib/wx/doc/gen/system_settings.rb +0 -507
  477. data/lib/wx/doc/gen/task_bar_icon.rb +0 -127
  478. data/lib/wx/doc/gen/task_bar_icon_event.rb +0 -88
  479. data/lib/wx/doc/gen/text_attr.rb +0 -756
  480. data/lib/wx/doc/gen/text_ctrl.rb +0 -1033
  481. data/lib/wx/doc/gen/text_entry.rb +0 -441
  482. data/lib/wx/doc/gen/text_entry_dialog.rb +0 -220
  483. data/lib/wx/doc/gen/text_validator.rb +0 -245
  484. data/lib/wx/doc/gen/time_picker_ctrl.rb +0 -128
  485. data/lib/wx/doc/gen/timer.rb +0 -119
  486. data/lib/wx/doc/gen/timer_event.rb +0 -68
  487. data/lib/wx/doc/gen/tip_provider.rb +0 -63
  488. data/lib/wx/doc/gen/tip_window.rb +0 -51
  489. data/lib/wx/doc/gen/toggle_button.rb +0 -182
  490. data/lib/wx/doc/gen/tool_bar.rb +0 -890
  491. data/lib/wx/doc/gen/tool_tip.rb +0 -86
  492. data/lib/wx/doc/gen/toolbook.rb +0 -118
  493. data/lib/wx/doc/gen/top_level_window.rb +0 -497
  494. data/lib/wx/doc/gen/tree_ctrl.rb +0 -1052
  495. data/lib/wx/doc/gen/tree_event.rb +0 -127
  496. data/lib/wx/doc/gen/treebook.rb +0 -180
  497. data/lib/wx/doc/gen/ui_action_simulator.rb +0 -109
  498. data/lib/wx/doc/gen/utils.rb +0 -273
  499. data/lib/wx/doc/gen/v_list_box.rb +0 -272
  500. data/lib/wx/doc/gen/v_scrolled_canvas.rb +0 -195
  501. data/lib/wx/doc/gen/v_scrolled_window.rb +0 -191
  502. data/lib/wx/doc/gen/validator.rb +0 -68
  503. data/lib/wx/doc/gen/variant.rb +0 -294
  504. data/lib/wx/doc/gen/window.rb +0 -2917
  505. data/lib/wx/doc/gen/window_dc.rb +0 -38
  506. data/lib/wx/doc/gen/window_disabler.rb +0 -30
  507. data/lib/wx/doc/gen/with_images.rb +0 -84
  508. data/lib/wx/doc/gen/wizard.rb +0 -257
  509. data/lib/wx/doc/gen/wizard_event.rb +0 -113
  510. data/lib/wx/doc/gen/wizard_page.rb +0 -65
  511. data/lib/wx/doc/gen/wizard_page_simple.rb +0 -88
  512. data/lib/wx/doc/gen/wrap_sizer.rb +0 -79
  513. data/lib/wx/doc/gen/xml_node.rb +0 -316
  514. data/lib/wx/doc/gen/xml_resource.rb +0 -320
  515. data/lib/wx/grid/events/evt_list.rb +0 -166
  516. data/lib/wx/html/events/evt_list.rb +0 -27
  517. data/lib/wx/pg/events/evt_list.rb +0 -73
  518. data/lib/wx/rbn/events/evt_list.rb +0 -102
  519. data/lib/wx/rtc/events/evt_list.rb +0 -98
  520. data/lib/wx/rtc/ext/rich_text_ctrl.rb +0 -24
  521. data/lib/wx/stc/events/evt_list.rb +0 -178
  522. data/samples/art/wxruby-512x512.png +0 -0
@@ -0,0 +1,431 @@
1
+ //Copyright (c) 2023 M.J.N. Corino, The Netherlands
2
+ //
3
+ // This software is released under the MIT license.
4
+
5
+ #ifndef _WX_SHAREDPTR_H_
6
+ #define _WX_SHAREDPTR_H_
7
+ // wxSharedPtr stub definition to appease older versions of SWIG
8
+ template <class T>
9
+ class wxSharedPtr;
10
+ #endif
11
+
12
+ // Main user macro for defining shared_ptr typemaps for both const and non-const pointer types
13
+ %define %wx_shared_ptr(TYPE...)
14
+ %feature("smartptr", noblock=1) TYPE { wxSharedPtr< TYPE > }
15
+ SWIG_WXSHARED_PTR_TYPEMAPS(, TYPE)
16
+ SWIG_WXSHARED_PTR_TYPEMAPS(const, TYPE)
17
+ %enddef
18
+
19
+ %{
20
+ #ifdef __cplusplus
21
+ #ifndef SWIG_STD_MOVE
22
+ #if __cplusplus >=201103L
23
+ # define SWIG_STD_MOVE(OBJ) std::move(OBJ)
24
+ #else
25
+ # define SWIG_STD_MOVE(OBJ) OBJ
26
+ #endif
27
+ #endif
28
+ #endif
29
+ %}
30
+
31
+ %{
32
+ // Set WXSHARED_PTR_DISOWN to $disown if required, for example
33
+ // #define WXSHARED_PTR_DISOWN $disown
34
+ #if !defined(WXSHARED_PTR_DISOWN)
35
+ #define WXSHARED_PTR_DISOWN 0
36
+ #endif
37
+ %}
38
+
39
+ // Macro implementing all the customisations for handling the smart pointer
40
+ %define SWIG_WXSHARED_PTR_TYPEMAPS(CONST, TYPE...)
41
+
42
+ // %naturalvar is as documented for member variables
43
+ %naturalvar TYPE;
44
+ %naturalvar wxSharedPtr< CONST TYPE >;
45
+
46
+ // destructor wrapper customisation
47
+ %feature("unref") TYPE
48
+ %{(void)arg1;
49
+ delete reinterpret_cast< wxSharedPtr< TYPE > * >(self);%}
50
+
51
+ // Typemap customisations...
52
+
53
+ // plain value
54
+ %typemap(in) CONST TYPE (void *argp, int res = 0) {
55
+ swig_ruby_owntype newmem = {0, 0};
56
+ res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(wxSharedPtr< TYPE > *), %convertptr_flags, &newmem);
57
+ if (!SWIG_IsOK(res)) {
58
+ %argument_fail(res, "$type", $symname, $argnum);
59
+ }
60
+ if (!argp) {
61
+ %argument_nullref("$type", $symname, $argnum);
62
+ } else {
63
+ $1 = *(%reinterpret_cast(argp, wxSharedPtr< CONST TYPE > *)->get());
64
+ if (newmem.own & SWIG_CAST_NEW_MEMORY) delete %reinterpret_cast(argp, wxSharedPtr< CONST TYPE > *);
65
+ }
66
+ }
67
+ %typemap(out) CONST TYPE {
68
+ wxSharedPtr< CONST TYPE > *smartresult = new wxSharedPtr< CONST TYPE >(new $1_ltype($1));
69
+ %set_output(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(wxSharedPtr< TYPE > *), SWIG_POINTER_OWN));
70
+ }
71
+
72
+ %typemap(varin) CONST TYPE {
73
+ void *argp = 0;
74
+ swig_ruby_owntype newmem = {0, 0};
75
+ int res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(wxSharedPtr< TYPE > *), %convertptr_flags, &newmem);
76
+ if (!SWIG_IsOK(res)) {
77
+ %variable_fail(res, "$type", "$name");
78
+ }
79
+ if (!argp) {
80
+ %variable_nullref("$type", "$name");
81
+ } else {
82
+ $1 = *(%reinterpret_cast(argp, wxSharedPtr< CONST TYPE > *)->get());
83
+ if (newmem.own & SWIG_CAST_NEW_MEMORY) delete %reinterpret_cast(argp, wxSharedPtr< CONST TYPE > *);
84
+ }
85
+ }
86
+ %typemap(varout) CONST TYPE {
87
+ wxSharedPtr< CONST TYPE > *smartresult = new wxSharedPtr< CONST TYPE >(new $1_ltype($1));
88
+ %set_varoutput(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(wxSharedPtr< TYPE > *), SWIG_POINTER_OWN));
89
+ }
90
+
91
+ %typemap(directorin,noblock=1) CONST TYPE (wxSharedPtr< CONST TYPE > *smartarg = 0) %{
92
+ smartarg = new wxSharedPtr< CONST TYPE >(new $1_ltype(SWIG_STD_MOVE($1)));
93
+ $input = SWIG_NewPointerObj(%as_voidptr(smartarg), $descriptor(wxSharedPtr< TYPE > *), SWIG_POINTER_OWN | %newpointer_flags);
94
+ %}
95
+ %typemap(directorout,noblock=1) CONST TYPE (void *swig_argp, int swig_res = 0) {
96
+ swig_ruby_owntype newmem = {0, 0};
97
+ swig_res = SWIG_ConvertPtrAndOwn($input, &swig_argp, $descriptor(wxSharedPtr< TYPE > *), %convertptr_flags, &newmem);
98
+ if (!SWIG_IsOK(swig_res)) {
99
+ %dirout_fail(swig_res, "$type");
100
+ }
101
+ if (!swig_argp) {
102
+ %dirout_nullref("$type");
103
+ } else {
104
+ $result = *(%reinterpret_cast(swig_argp, wxSharedPtr< CONST TYPE > *)->get());
105
+ if (newmem.own & SWIG_CAST_NEW_MEMORY) delete %reinterpret_cast(swig_argp, wxSharedPtr< CONST TYPE > *);
106
+ }
107
+ }
108
+
109
+ // plain pointer
110
+ // Note: $disown not implemented by default as it will lead to a memory leak of the shared_ptr instance
111
+ %typemap(in) CONST TYPE * (void *argp = 0, int res = 0, wxSharedPtr< CONST TYPE > tempshared, wxSharedPtr< CONST TYPE > *smartarg = 0) {
112
+ swig_ruby_owntype newmem = {0, 0};
113
+ res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(wxSharedPtr< TYPE > *), WXSHARED_PTR_DISOWN | %convertptr_flags, &newmem);
114
+ if (!SWIG_IsOK(res)) {
115
+ %argument_fail(res, "$type", $symname, $argnum);
116
+ }
117
+ if (newmem.own & SWIG_CAST_NEW_MEMORY) {
118
+ tempshared = *%reinterpret_cast(argp, wxSharedPtr< CONST TYPE > *);
119
+ delete %reinterpret_cast(argp, wxSharedPtr< CONST TYPE > *);
120
+ $1 = %const_cast(tempshared.get(), $1_ltype);
121
+ } else {
122
+ smartarg = %reinterpret_cast(argp, wxSharedPtr< CONST TYPE > *);
123
+ $1 = %const_cast((smartarg ? smartarg->get() : 0), $1_ltype);
124
+ }
125
+ }
126
+
127
+ %typemap(out, fragment="SWIG_null_deleter") CONST TYPE * {
128
+ wxSharedPtr< CONST TYPE > *smartresult = $1 ? new wxSharedPtr< CONST TYPE >($1 SWIG_NO_NULL_DELETER_$owner) : 0;
129
+ %set_output(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(wxSharedPtr< TYPE > *), $owner | SWIG_POINTER_OWN));
130
+ }
131
+
132
+ %typemap(varin) CONST TYPE * {
133
+ void *argp = 0;
134
+ swig_ruby_owntype newmem = {0, 0};
135
+ int res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(wxSharedPtr< TYPE > *), %convertptr_flags, &newmem);
136
+ if (!SWIG_IsOK(res)) {
137
+ %variable_fail(res, "$type", "$name");
138
+ }
139
+ wxSharedPtr< CONST TYPE > tempshared;
140
+ wxSharedPtr< CONST TYPE > *smartarg = 0;
141
+ if (newmem.own & SWIG_CAST_NEW_MEMORY) {
142
+ tempshared = *%reinterpret_cast(argp, wxSharedPtr< CONST TYPE > *);
143
+ delete %reinterpret_cast(argp, wxSharedPtr< CONST TYPE > *);
144
+ $1 = %const_cast(tempshared.get(), $1_ltype);
145
+ } else {
146
+ smartarg = %reinterpret_cast(argp, wxSharedPtr< CONST TYPE > *);
147
+ $1 = %const_cast((smartarg ? smartarg->get() : 0), $1_ltype);
148
+ }
149
+ }
150
+ %typemap(varout, fragment="SWIG_null_deleter") CONST TYPE * {
151
+ wxSharedPtr< CONST TYPE > *smartresult = $1 ? new wxSharedPtr< CONST TYPE >($1 SWIG_NO_NULL_DELETER_0) : 0;
152
+ %set_varoutput(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(wxSharedPtr< TYPE > *), SWIG_POINTER_OWN));
153
+ }
154
+
155
+ %typemap(directorin,noblock=1, fragment="SWIG_null_deleter") CONST TYPE * (wxSharedPtr< CONST TYPE > *smartarg = 0) %{
156
+ smartarg = $1 ? new wxSharedPtr< CONST TYPE >($1 SWIG_NO_NULL_DELETER_0) : 0;
157
+ $input = SWIG_NewPointerObj(%as_voidptr(smartarg), $descriptor(wxSharedPtr< TYPE > *), SWIG_POINTER_OWN | %newpointer_flags);
158
+ %}
159
+ %typemap(directorout,noblock=1) CONST TYPE * %{
160
+ #error "directorout typemap for plain pointer not implemented"
161
+ %}
162
+
163
+ // plain reference
164
+ %typemap(in) CONST TYPE & (void *argp = 0, int res = 0, wxSharedPtr< CONST TYPE > tempshared) {
165
+ swig_ruby_owntype newmem = {0, 0};
166
+ res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(wxSharedPtr< TYPE > *), %convertptr_flags, &newmem);
167
+ if (!SWIG_IsOK(res)) {
168
+ %argument_fail(res, "$type", $symname, $argnum);
169
+ }
170
+ if (!argp) { %argument_nullref("$type", $symname, $argnum); }
171
+ if (newmem.own & SWIG_CAST_NEW_MEMORY) {
172
+ tempshared = *%reinterpret_cast(argp, wxSharedPtr< CONST TYPE > *);
173
+ delete %reinterpret_cast(argp, wxSharedPtr< CONST TYPE > *);
174
+ $1 = %const_cast(tempshared.get(), $1_ltype);
175
+ } else {
176
+ $1 = %const_cast(%reinterpret_cast(argp, wxSharedPtr< CONST TYPE > *)->get(), $1_ltype);
177
+ }
178
+ }
179
+ %typemap(out, fragment="SWIG_null_deleter") CONST TYPE & {
180
+ wxSharedPtr< CONST TYPE > *smartresult = new wxSharedPtr< CONST TYPE >($1 SWIG_NO_NULL_DELETER_$owner);
181
+ %set_output(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(wxSharedPtr< TYPE > *), SWIG_POINTER_OWN));
182
+ }
183
+
184
+ %typemap(varin) CONST TYPE & {
185
+ void *argp = 0;
186
+ swig_ruby_owntype newmem = {0, 0};
187
+ int res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(wxSharedPtr< TYPE > *), %convertptr_flags, &newmem);
188
+ if (!SWIG_IsOK(res)) {
189
+ %variable_fail(res, "$type", "$name");
190
+ }
191
+ wxSharedPtr< CONST TYPE > tempshared;
192
+ if (!argp) {
193
+ %variable_nullref("$type", "$name");
194
+ }
195
+ if (newmem.own & SWIG_CAST_NEW_MEMORY) {
196
+ tempshared = *%reinterpret_cast(argp, wxSharedPtr< CONST TYPE > *);
197
+ delete %reinterpret_cast(argp, wxSharedPtr< CONST TYPE > *);
198
+ $1 = *%const_cast(tempshared.get(), $1_ltype);
199
+ } else {
200
+ $1 = *%const_cast(%reinterpret_cast(argp, wxSharedPtr< CONST TYPE > *)->get(), $1_ltype);
201
+ }
202
+ }
203
+ %typemap(varout, fragment="SWIG_null_deleter") CONST TYPE & {
204
+ wxSharedPtr< CONST TYPE > *smartresult = new wxSharedPtr< CONST TYPE >(&$1 SWIG_NO_NULL_DELETER_0);
205
+ %set_varoutput(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(wxSharedPtr< TYPE > *), SWIG_POINTER_OWN));
206
+ }
207
+
208
+ %typemap(directorin,noblock=1, fragment="SWIG_null_deleter") CONST TYPE & (wxSharedPtr< CONST TYPE > *smartarg = 0) %{
209
+ smartarg = new wxSharedPtr< CONST TYPE >(&$1 SWIG_NO_NULL_DELETER_0);
210
+ $input = SWIG_NewPointerObj(%as_voidptr(smartarg), $descriptor(wxSharedPtr< TYPE > *), SWIG_POINTER_OWN | %newpointer_flags);
211
+ %}
212
+ %typemap(directorout,noblock=1) CONST TYPE & %{
213
+ #error "directorout typemap for plain reference not implemented"
214
+ %}
215
+
216
+ // plain pointer by reference
217
+ // Note: $disown not implemented by default as it will lead to a memory leak of the shared_ptr instance
218
+ %typemap(in) TYPE *CONST& (void *argp = 0, int res = 0, $*1_ltype temp = 0, wxSharedPtr< CONST TYPE > tempshared) {
219
+ swig_ruby_owntype newmem = {0, 0};
220
+ res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(wxSharedPtr< TYPE > *), WXSHARED_PTR_DISOWN | %convertptr_flags, &newmem);
221
+ if (!SWIG_IsOK(res)) {
222
+ %argument_fail(res, "$type", $symname, $argnum);
223
+ }
224
+ if (newmem.own & SWIG_CAST_NEW_MEMORY) {
225
+ tempshared = *%reinterpret_cast(argp, wxSharedPtr< CONST TYPE > *);
226
+ delete %reinterpret_cast(argp, wxSharedPtr< CONST TYPE > *);
227
+ temp = %const_cast(tempshared.get(), $*1_ltype);
228
+ } else {
229
+ temp = %const_cast(%reinterpret_cast(argp, wxSharedPtr< CONST TYPE > *)->get(), $*1_ltype);
230
+ }
231
+ $1 = &temp;
232
+ }
233
+ %typemap(out, fragment="SWIG_null_deleter") TYPE *CONST& {
234
+ wxSharedPtr< CONST TYPE > *smartresult = *$1 ? new wxSharedPtr< CONST TYPE >(*$1 SWIG_NO_NULL_DELETER_$owner) : 0;
235
+ %set_output(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(wxSharedPtr< TYPE > *), SWIG_POINTER_OWN));
236
+ }
237
+
238
+ %typemap(varin) TYPE *CONST& %{
239
+ #error "varin typemap not implemented"
240
+ %}
241
+ %typemap(varout) TYPE *CONST& %{
242
+ #error "varout typemap not implemented"
243
+ %}
244
+
245
+ %typemap(directorin,noblock=1, fragment="SWIG_null_deleter") TYPE *CONST& (wxSharedPtr< CONST TYPE > *smartarg = 0) %{
246
+ smartarg = $1 ? new wxSharedPtr< CONST TYPE >($1 SWIG_NO_NULL_DELETER_0) : 0;
247
+ $input = SWIG_NewPointerObj(%as_voidptr(smartarg), $descriptor(wxSharedPtr< TYPE > *), SWIG_POINTER_OWN | %newpointer_flags);
248
+ %}
249
+ %typemap(directorout,noblock=1) TYPE *CONST& %{
250
+ #error "directorout typemap for plain pointer by reference not implemented"
251
+ %}
252
+
253
+ // shared_ptr by value
254
+ %typemap(in) wxSharedPtr< CONST TYPE > (void *argp, int res = 0) {
255
+ swig_ruby_owntype newmem = {0, 0};
256
+ res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(wxSharedPtr< TYPE > *), %convertptr_flags, &newmem);
257
+ if (!SWIG_IsOK(res)) {
258
+ %argument_fail(res, "$type", $symname, $argnum);
259
+ }
260
+ if (argp) $1 = *(%reinterpret_cast(argp, $&ltype));
261
+ if (newmem.own & SWIG_CAST_NEW_MEMORY) delete %reinterpret_cast(argp, $&ltype);
262
+ }
263
+ %typemap(out) wxSharedPtr< CONST TYPE > {
264
+ wxSharedPtr< CONST TYPE > *smartresult = $1 ? new wxSharedPtr< CONST TYPE >($1) : 0;
265
+ %set_output(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(wxSharedPtr< TYPE > *), SWIG_POINTER_OWN));
266
+ }
267
+
268
+ %typemap(varin) wxSharedPtr< CONST TYPE > {
269
+ swig_ruby_owntype newmem = {0, 0};
270
+ void *argp = 0;
271
+ int res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(wxSharedPtr< TYPE > *), %convertptr_flags, &newmem);
272
+ if (!SWIG_IsOK(res)) {
273
+ %variable_fail(res, "$type", "$name");
274
+ }
275
+ $1 = argp ? *(%reinterpret_cast(argp, $&ltype)) : wxSharedPtr< TYPE >();
276
+ if (newmem.own & SWIG_CAST_NEW_MEMORY) delete %reinterpret_cast(argp, $&ltype);
277
+ }
278
+ %typemap(varout) wxSharedPtr< CONST TYPE > {
279
+ wxSharedPtr< CONST TYPE > *smartresult = $1 ? new wxSharedPtr< CONST TYPE >($1) : 0;
280
+ %set_varoutput(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(wxSharedPtr< TYPE > *), SWIG_POINTER_OWN));
281
+ }
282
+
283
+ %typemap(directorin,noblock=1) wxSharedPtr< CONST TYPE > (wxSharedPtr< CONST TYPE > *smartarg = 0) %{
284
+ smartarg = $1 ? new wxSharedPtr< CONST TYPE >($1) : 0;
285
+ $input = SWIG_NewPointerObj(%as_voidptr(smartarg), $descriptor(wxSharedPtr< TYPE > *), SWIG_POINTER_OWN | %newpointer_flags);
286
+ %}
287
+ %typemap(directorout,noblock=1) wxSharedPtr< CONST TYPE > (void *swig_argp, int swig_res = 0) {
288
+ swig_ruby_owntype newmem = {0, 0};
289
+ swig_res = SWIG_ConvertPtrAndOwn($input, &swig_argp, $descriptor(wxSharedPtr< TYPE > *), %convertptr_flags, &newmem);
290
+ if (!SWIG_IsOK(swig_res)) {
291
+ %dirout_fail(swig_res, "$type");
292
+ }
293
+ if (swig_argp) {
294
+ $result = *(%reinterpret_cast(swig_argp, $&ltype));
295
+ if (newmem.own & SWIG_CAST_NEW_MEMORY) delete %reinterpret_cast(swig_argp, $&ltype);
296
+ }
297
+ }
298
+
299
+ // shared_ptr by reference
300
+ %typemap(in) wxSharedPtr< CONST TYPE > & (void *argp, int res = 0, $*1_ltype tempshared) {
301
+ swig_ruby_owntype newmem = {0, 0};
302
+ res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(wxSharedPtr< TYPE > *), %convertptr_flags, &newmem);
303
+ if (!SWIG_IsOK(res)) {
304
+ %argument_fail(res, "$type", $symname, $argnum);
305
+ }
306
+ if (newmem.own & SWIG_CAST_NEW_MEMORY) {
307
+ if (argp) tempshared = *%reinterpret_cast(argp, $ltype);
308
+ delete %reinterpret_cast(argp, $ltype);
309
+ $1 = &tempshared;
310
+ } else {
311
+ $1 = (argp) ? %reinterpret_cast(argp, $ltype) : &tempshared;
312
+ }
313
+ }
314
+ %typemap(out) wxSharedPtr< CONST TYPE > & {
315
+ wxSharedPtr< CONST TYPE > *smartresult = *$1 ? new wxSharedPtr< CONST TYPE >(*$1) : 0;
316
+ %set_output(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(wxSharedPtr< TYPE > *), SWIG_POINTER_OWN));
317
+ }
318
+
319
+ %typemap(varin) wxSharedPtr< CONST TYPE > & %{
320
+ #error "varin typemap not implemented"
321
+ %}
322
+ %typemap(varout) wxSharedPtr< CONST TYPE > & %{
323
+ #error "varout typemap not implemented"
324
+ %}
325
+
326
+ %typemap(directorin,noblock=1) wxSharedPtr< CONST TYPE > & (wxSharedPtr< CONST TYPE > *smartarg = 0) %{
327
+ smartarg = $1 ? new wxSharedPtr< CONST TYPE >($1) : 0;
328
+ $input = SWIG_NewPointerObj(%as_voidptr(smartarg), $descriptor(wxSharedPtr< TYPE > *), SWIG_POINTER_OWN | %newpointer_flags);
329
+ %}
330
+ %typemap(directorout,noblock=1) wxSharedPtr< CONST TYPE > & %{
331
+ #error "directorout typemap for shared_ptr ref not implemented"
332
+ %}
333
+
334
+ // shared_ptr by pointer
335
+ %typemap(in) wxSharedPtr< CONST TYPE > * (void *argp, int res = 0, $*1_ltype tempshared) {
336
+ swig_ruby_owntype newmem = {0, 0};
337
+ res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(wxSharedPtr< TYPE > *), %convertptr_flags, &newmem);
338
+ if (!SWIG_IsOK(res)) {
339
+ %argument_fail(res, "$type", $symname, $argnum);
340
+ }
341
+ if (newmem.own & SWIG_CAST_NEW_MEMORY) {
342
+ if (argp) tempshared = *%reinterpret_cast(argp, $ltype);
343
+ delete %reinterpret_cast(argp, $ltype);
344
+ $1 = &tempshared;
345
+ } else {
346
+ $1 = (argp) ? %reinterpret_cast(argp, $ltype) : &tempshared;
347
+ }
348
+ }
349
+ %typemap(out) wxSharedPtr< CONST TYPE > * {
350
+ wxSharedPtr< CONST TYPE > *smartresult = ($1 && *$1) ? new wxSharedPtr< CONST TYPE >(*$1) : 0;
351
+ %set_output(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(wxSharedPtr< TYPE > *), SWIG_POINTER_OWN));
352
+ if ($owner) delete $1;
353
+ }
354
+
355
+ %typemap(varin) wxSharedPtr< CONST TYPE > * %{
356
+ #error "varin typemap not implemented"
357
+ %}
358
+ %typemap(varout) wxSharedPtr< CONST TYPE > * %{
359
+ #error "varout typemap not implemented"
360
+ %}
361
+
362
+ %typemap(directorin,noblock=1) wxSharedPtr< CONST TYPE > * (wxSharedPtr< CONST TYPE > *smartarg = 0) %{
363
+ smartarg = ($1 && *$1) ? new wxSharedPtr< CONST TYPE >(*$1) : 0;
364
+ $input = SWIG_NewPointerObj(%as_voidptr(smartarg), $descriptor(wxSharedPtr< TYPE > *), SWIG_POINTER_OWN | %newpointer_flags);
365
+ %}
366
+ %typemap(directorout,noblock=1) wxSharedPtr< CONST TYPE > * %{
367
+ #error "directorout typemap for pointer to shared_ptr not implemented"
368
+ %}
369
+
370
+ // shared_ptr by pointer reference
371
+ %typemap(in) wxSharedPtr< CONST TYPE > *& (void *argp, int res = 0, wxSharedPtr< CONST TYPE > tempshared, $*1_ltype temp = 0) {
372
+ swig_ruby_owntype newmem = {0, 0};
373
+ res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(wxSharedPtr< TYPE > *), %convertptr_flags, &newmem);
374
+ if (!SWIG_IsOK(res)) {
375
+ %argument_fail(res, "$type", $symname, $argnum);
376
+ }
377
+ if (argp) tempshared = *%reinterpret_cast(argp, $*ltype);
378
+ if (newmem.own & SWIG_CAST_NEW_MEMORY) delete %reinterpret_cast(argp, $*ltype);
379
+ temp = &tempshared;
380
+ $1 = &temp;
381
+ }
382
+ %typemap(out) wxSharedPtr< CONST TYPE > *& {
383
+ wxSharedPtr< CONST TYPE > *smartresult = (*$1 && **$1) ? new wxSharedPtr< CONST TYPE >(**$1) : 0;
384
+ %set_output(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(wxSharedPtr< TYPE > *), SWIG_POINTER_OWN));
385
+ }
386
+
387
+ %typemap(varin) wxSharedPtr< CONST TYPE > *& %{
388
+ #error "varin typemap not implemented"
389
+ %}
390
+ %typemap(varout) wxSharedPtr< CONST TYPE > *& %{
391
+ #error "varout typemap not implemented"
392
+ %}
393
+
394
+ %typemap(directorin,noblock=1) wxSharedPtr< CONST TYPE > *& (wxSharedPtr< CONST TYPE > *smartarg = 0) %{
395
+ smartarg = ($1 && *$1) ? new wxSharedPtr< CONST TYPE >(*$1) : 0;
396
+ $input = SWIG_NewPointerObj(%as_voidptr(smartarg), $descriptor(wxSharedPtr< TYPE > *), SWIG_POINTER_OWN | %newpointer_flags);
397
+ %}
398
+ %typemap(directorout,noblock=1) wxSharedPtr< CONST TYPE > *& %{
399
+ #error "directorout typemap for pointer ref to shared_ptr not implemented"
400
+ %}
401
+
402
+ // Typecheck typemaps
403
+ // Note: SWIG_ConvertPtr with void ** parameter set to 0 instead of using SWIG_ConvertPtrAndOwn, so that the casting
404
+ // function is not called thereby avoiding a possible smart pointer copy constructor call when casting up the inheritance chain.
405
+ %typemap(typecheck, precedence=SWIG_TYPECHECK_POINTER, equivalent="TYPE *", noblock=1)
406
+ TYPE CONST,
407
+ TYPE CONST &,
408
+ TYPE CONST *,
409
+ TYPE *CONST&,
410
+ wxSharedPtr< CONST TYPE >,
411
+ wxSharedPtr< CONST TYPE > &,
412
+ wxSharedPtr< CONST TYPE > *,
413
+ wxSharedPtr< CONST TYPE > *& {
414
+ int res = SWIG_ConvertPtr($input, 0, $descriptor(wxSharedPtr< TYPE > *), 0);
415
+ $1 = SWIG_CheckState(res);
416
+ }
417
+
418
+
419
+ // various missing typemaps - If ever used (unlikely) ensure compilation error rather than runtime bug
420
+ %typemap(in) CONST TYPE[], CONST TYPE[ANY], CONST TYPE (CLASS::*) %{
421
+ #error "typemaps for $1_type not available"
422
+ %}
423
+ %typemap(out) CONST TYPE[], CONST TYPE[ANY], CONST TYPE (CLASS::*) %{
424
+ #error "typemaps for $1_type not available"
425
+ %}
426
+
427
+
428
+ %template() wxSharedPtr< CONST TYPE >;
429
+
430
+
431
+ %enddef
@@ -17,30 +17,16 @@
17
17
 
18
18
  %{
19
19
  WXRUBY_TRACE_GUARD(WxRubyTraceMarkSizer, "GC_MARK_SIZER")
20
- WXRUBY_TRACE_GUARD(WxRubyTraceFreeSizer, "GC_FREE_SIZER")
21
- WXRUBY_TRACE_GUARD(WxRubyTraceMarkMenubar, "GC_MARK_MENUBAR")
22
- WXRUBY_TRACE_GUARD(WxRubyTraceMarkMenu, "GC_MARK_MENU")
23
20
  WXRUBY_TRACE_GUARD(WxRubyTraceMarkWindow, "GC_MARK_WINDOW")
24
21
  WXRUBY_TRACE_GUARD(WxRubyTraceFreeWindow, "GC_FREE_WINDOW")
25
- WXRUBY_TRACE_GUARD(WxRubyTraceMarkFrame, "GC_MARK_FRAME")
26
- WXRUBY_TRACE_GUARD(WxRubyTraceFreeNull, "GC_FREE_NULL")
27
22
  WXRUBY_TRACE_GUARD(WxRubyTraceFreeRefcounted, "GC_FREE_REFCOUNT")
28
23
 
29
-
30
- // Code to be run when the ruby object is swept by GC - this only
31
- // unlinks the C++ object from the ruby VALUE but doesn't delete
32
- // it because it is still needed and will be managed by WxWidgets.
33
- WXRUBY_EXPORT void GcNullFreeFunc(void *ptr)
24
+ // Check if a Ruby object is (still) Ruby GC managed in which case it's
25
+ // 'dfree' function pointer should reference a specific free function
26
+ // and not be either 0 or a reference to the SWIG tracking removal function.
27
+ WXRUBY_EXPORT bool GC_IsObjectOwned(VALUE object)
34
28
  {
35
- WXRUBY_TRACE_IF(WxRubyTraceFreeNull, 2)
36
- WXRUBY_TRACE("> GcNullFreeFunc : " << ptr)
37
- WXRUBY_TRACE_END
38
-
39
- SWIG_RubyRemoveTracking(ptr);
40
-
41
- WXRUBY_TRACE_IF(WxRubyTraceFreeNull, 2)
42
- WXRUBY_TRACE("< GcNullFreeFunc")
43
- WXRUBY_TRACE_END
29
+ return RDATA(object)->dfree != SWIG_RubyRemoveTracking && RDATA(object)->dfree != 0;
44
30
  }
45
31
 
46
32
  // Tests if the window has been signalled as destroyed by a
@@ -124,25 +110,6 @@ WXRUBY_EXPORT void GcRefCountedFreeFunc(void *ptr)
124
110
  WXRUBY_TRACE_END
125
111
  }
126
112
 
127
- // Code to be run when the ruby object is swept by GC - this checks
128
- // for unattached sizers and deletes those, only unlinking others
129
- // as these will be managed by WxWidgets.
130
- WXRUBY_EXPORT void GcSizerFreeFunc(void *ptr)
131
- {
132
- WXRUBY_TRACE_IF(WxRubyTraceFreeSizer, 2)
133
- WXRUBY_TRACE("> GcSizerFreeFunc : " << ptr)
134
- WXRUBY_TRACE_END
135
-
136
- wxSizer* wx_szr = (wxSizer*)ptr;
137
- // unlink in all cases
138
- SWIG_RubyRemoveTracking(ptr);
139
- delete wx_szr; // delete unattached sizers
140
-
141
- WXRUBY_TRACE_IF(WxRubyTraceFreeSizer, 2)
142
- WXRUBY_TRACE("< GcSizerFreeFunc")
143
- WXRUBY_TRACE_END
144
- }
145
-
146
113
  void GC_mark_SizerBelongingToWindow(wxSizer *wx_sizer, VALUE rb_sizer);
147
114
 
148
115
  WXRUBY_EXPORT void GC_mark_wxSizer(void* ptr)
@@ -154,10 +121,10 @@ WXRUBY_EXPORT void GC_mark_wxSizer(void* ptr)
154
121
  VALUE rb_szr = SWIG_RubyInstanceFor(ptr);
155
122
  if (!RB_NIL_P(rb_szr))
156
123
  {
157
- // as long as the dfree function is still the GCSizeFreeFunc the sizer has not been attached to a window
124
+ // as long as the dfree function is still the sizer's free function the sizer has not been attached to a window
158
125
  // or added to a parent sizer (as that would 'disown' and replace the free function by the tracking removal function)
159
126
  // but it may hay have already had child sizers added which need to be marked
160
- if (RDATA(rb_szr)->dfree == (void (*)(void *))GcSizerFreeFunc)
127
+ if (RDATA(rb_szr)->dfree != (void (*)(void *))SWIG_RubyRemoveTracking)
161
128
  {
162
129
  wxSizer* wx_szr = (wxSizer*)ptr;
163
130
 
@@ -225,63 +192,6 @@ void GC_mark_SizerBelongingToWindow(wxSizer *wx_sizer, VALUE rb_sizer)
225
192
  WXRUBY_TRACE_END
226
193
  }
227
194
 
228
- WXRUBY_EXPORT void GC_mark_attached_wxMenu(void *ptr)
229
- {
230
- WXRUBY_TRACE_IF(WxRubyTraceMarkMenu, 2)
231
- WXRUBY_TRACE("> GC_mark_attached_wxMenu : " << ptr)
232
- WXRUBY_TRACE_END
233
-
234
- rb_gc_mark(SWIG_RubyInstanceFor(ptr));
235
-
236
- wxMenu *wx_menu = static_cast<wxMenu*> (ptr);
237
-
238
- wxMenuItemList wx_menu_items = wx_menu->GetMenuItems();
239
- wxMenuItemList::iterator iter;
240
- for (iter = wx_menu_items.begin(); iter != wx_menu_items.end(); ++iter)
241
- {
242
- wxMenuItem *wx_item = *iter;
243
- rb_gc_mark(SWIG_RubyInstanceFor(wx_item) );
244
- wxMenu* wx_sub_menu = wx_item->GetSubMenu();
245
- if (wx_sub_menu)
246
- GC_mark_attached_wxMenu(wx_sub_menu);
247
- }
248
-
249
- WXRUBY_TRACE_IF(WxRubyTraceMarkMenu, 2)
250
- WXRUBY_TRACE("< GC_mark_attached_wxMenu : " << ptr)
251
- WXRUBY_TRACE_END
252
- }
253
-
254
- // Similar to Sizers, MenuBar requires a special mark routine. This is
255
- // because Wx::Menu is not a subclass of Window so isn't automatically
256
- // protected in the mark phase by Wx::App. However, the ruby object
257
- // still must not be destroyed while it is still accessible on screen,
258
- // because it may still handle events. Rather than a SWIG %markfunc,
259
- // which can catch destroyed MenuBars linked to an in-scope ruby
260
- // variable and cause segfaults, MenuBars are always marked via the
261
- // containing Frame.
262
- void GC_mark_MenuBarBelongingToFrame(wxMenuBar *wx_menu_bar)
263
- {
264
- WXRUBY_TRACE_IF(WxRubyTraceMarkMenubar, 2)
265
- WXRUBY_TRACE("> GC_mark_MenuBarBelongingToFrame : " << wx_menu_bar)
266
- WXRUBY_TRACE_END
267
-
268
- rb_gc_mark( SWIG_RubyInstanceFor(wx_menu_bar) );
269
-
270
- WXRUBY_TRACE_IF(WxRubyTraceMarkMenubar, 3)
271
- WXRUBY_TRACE("< GC_mark_MenuBarBelongingToFrame : marking " << wx_menu_bar->GetMenuCount() << " menus")
272
- WXRUBY_TRACE_END
273
-
274
- // Mark each menu in the menubar in turn
275
- for ( size_t i = 0; i < wx_menu_bar->GetMenuCount(); i++ )
276
- {
277
- GC_mark_attached_wxMenu(wx_menu_bar->GetMenu(i));
278
- }
279
-
280
- WXRUBY_TRACE_IF(WxRubyTraceMarkMenubar, 2)
281
- WXRUBY_TRACE("< GC_mark_MenuBarBelongingToFrame : " << wx_menu_bar)
282
- WXRUBY_TRACE_END
283
- }
284
-
285
195
  // Default mark routine for Windows - preserve the main sizer and caret
286
196
  // belong to this window
287
197
  WXRUBY_EXPORT void GC_mark_wxWindow(void *ptr)
@@ -376,39 +286,4 @@ WXRUBY_EXPORT void GC_mark_wxWindow(void *ptr)
376
286
  WXRUBY_TRACE_END
377
287
  }
378
288
 
379
-
380
- WXRUBY_EXPORT void GC_mark_wxFrame(void *ptr)
381
- {
382
- WXRUBY_TRACE_IF(WxRubyTraceMarkFrame, 2)
383
- WXRUBY_TRACE("> GC_mark_wxFrame : " << ptr)
384
- WXRUBY_TRACE_END
385
-
386
- if ( GC_IsWindowDeleted(ptr) )
387
- {
388
- WXRUBY_TRACE_IF(WxRubyTraceMarkFrame, 2)
389
- WXRUBY_TRACE("< GC_mark_wxFrame : deleted")
390
- WXRUBY_TRACE_END
391
- return;
392
- }
393
-
394
- // Frames are also a subclass of wxWindow, so must do all the marking
395
- // of sizers and carets associated with that class
396
- GC_mark_wxWindow(ptr);
397
-
398
- wxFrame* wx_frame = (wxFrame*)ptr;
399
- // Then mark the MenuBar, if one is associated with this Frame
400
-
401
- wxMenuBar* menu_bar = wx_frame->GetMenuBar();
402
- if ( menu_bar )
403
- {
404
- // as this is an attached menu bar the regular marker will not mark
405
- // any menu content as it can't tell if the c++ object has been deleted or not
406
- // so we do that here now we know it is still alive
407
- GC_mark_MenuBarBelongingToFrame(menu_bar);
408
- }
409
-
410
- WXRUBY_TRACE_IF(WxRubyTraceMarkFrame, 2)
411
- WXRUBY_TRACE("< GC_mark_wxFrame : " << ptr)
412
- WXRUBY_TRACE_END
413
- }
414
289
  %}