wxruby3 0.9.1 → 0.9.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (472) hide show
  1. checksums.yaml +4 -4
  2. data/.yardopts +1 -0
  3. data/INSTALL.md +35 -29
  4. data/README.md +24 -15
  5. data/ext/wxruby3/include/wxRubyApp.h +338 -0
  6. data/ext/wxruby3/include/wxruby-ClientData.h +48 -0
  7. data/ext/wxruby3/include/wxruby-Config.h +6 -6
  8. data/ext/wxruby3/include/wxruby-Validator.h +39 -0
  9. data/ext/wxruby3/include/wxruby-ValidatorBinding.h +64 -0
  10. data/ext/wxruby3/swig/common.i +1 -1
  11. data/ext/wxruby3/swig/custom/director.swg +8 -0
  12. data/ext/wxruby3/swig/mark_free_impl.i +0 -33
  13. data/lib/wx/aui/aui_tab_ctrl.rb +18 -0
  14. data/lib/wx/aui/auinotebook.rb +6 -2
  15. data/lib/wx/aui/require.rb +1 -0
  16. data/lib/wx/core/app.rb +2 -2
  17. data/lib/wx/core/bitmap_combobox.rb +17 -21
  18. data/lib/wx/core/collapsible_pane.rb +1 -1
  19. data/lib/wx/core/combobox.rb +13 -3
  20. data/lib/wx/core/controlwithitems.rb +40 -128
  21. data/lib/wx/core/enum.rb +17 -1
  22. data/lib/wx/core/event.rb +6 -1
  23. data/lib/wx/core/evthandler.rb +8 -2
  24. data/lib/wx/core/generic_validator.rb +312 -0
  25. data/lib/wx/core/listbox.rb +2 -2
  26. data/lib/wx/core/log.rb +1 -1
  27. data/lib/wx/core/menu.rb +10 -0
  28. data/lib/wx/core/notebook.rb +6 -2
  29. data/lib/wx/core/owner_drawn_combobox.rb +45 -0
  30. data/lib/wx/core/size.rb +4 -0
  31. data/lib/wx/core/sizer.rb +12 -2
  32. data/lib/wx/core/standard_paths.rb +22 -0
  33. data/lib/wx/core/task_bar_button.rb +19 -0
  34. data/lib/wx/core/text_entry.rb +4 -1
  35. data/lib/wx/core/textctrl.rb +11 -1
  36. data/lib/wx/core/{treectrl.rb → tree_ctrl.rb} +31 -12
  37. data/lib/wx/core/validator.rb +70 -5
  38. data/lib/wx/core/window.rb +13 -7
  39. data/lib/wx/doc/app.rb +48 -38
  40. data/lib/wx/doc/art_locator.rb +48 -43
  41. data/lib/wx/doc/aui/auimanager.rb +16 -8
  42. data/lib/wx/doc/aui/auinotebook.rb +20 -5
  43. data/lib/wx/doc/clipboard.rb +11 -7
  44. data/lib/wx/doc/colour_dialog.rb +14 -10
  45. data/lib/wx/doc/comboctrl.rb +18 -0
  46. data/lib/wx/doc/controlwithitems.rb +34 -8
  47. data/lib/wx/doc/data_object.rb +2 -2
  48. data/lib/wx/doc/date_picker_ctrl.rb +23 -0
  49. data/lib/wx/doc/editable_listbox.rb +44 -0
  50. data/lib/wx/doc/enum.rb +15 -0
  51. data/lib/wx/doc/event.rb +12 -0
  52. data/lib/wx/doc/evthandler.rb +113 -108
  53. data/lib/wx/doc/extra/12_client_data.md +89 -0
  54. data/lib/wx/doc/extra/13_validators.md +139 -0
  55. data/lib/wx/doc/font.rb +1 -0
  56. data/lib/wx/doc/gc_dc.rb +6 -1
  57. data/lib/wx/doc/gdi_common.rb +4 -0
  58. data/lib/wx/doc/generic_validator.rb +95 -0
  59. data/lib/wx/doc/graphics_context.rb +1 -0
  60. data/lib/wx/doc/grid/grid.rb +22 -1
  61. data/lib/wx/doc/help_controller.rb +11 -7
  62. data/lib/wx/doc/html/html_help_controller.rb +12 -4
  63. data/lib/wx/doc/html/simple_html_listbox.rb +22 -0
  64. data/lib/wx/doc/list_ctrl.rb +33 -29
  65. data/lib/wx/doc/menu.rb +20 -0
  66. data/lib/wx/doc/notebook.rb +21 -0
  67. data/lib/wx/doc/num_validator.rb +387 -0
  68. data/lib/wx/doc/owner_drawn_combobox.rb +96 -0
  69. data/lib/wx/doc/pg/events.rb +13 -9
  70. data/lib/wx/doc/pg/numeric_property_validator.rb +33 -0
  71. data/lib/wx/doc/pg/pg_property.rb +18 -0
  72. data/lib/wx/doc/progress_dialog.rb +36 -32
  73. data/lib/wx/doc/prt/page_setup_dialog.rb +20 -12
  74. data/lib/wx/doc/prt/print_data.rb +13 -5
  75. data/lib/wx/doc/prt/print_dialog.rb +31 -23
  76. data/lib/wx/doc/prt/printer.rb +20 -12
  77. data/lib/wx/doc/radio_box.rb +19 -15
  78. data/lib/wx/doc/rbn/ribbon_bar.rb +13 -5
  79. data/lib/wx/doc/rbn/ribbon_button_bar.rb +13 -5
  80. data/lib/wx/doc/rbn/ribbon_gallery.rb +13 -5
  81. data/lib/wx/doc/rbn/ribbon_tool_bar.rb +13 -5
  82. data/lib/wx/doc/region_iterator.rb +32 -28
  83. data/lib/wx/doc/rtc/rich_text_composite_object.rb +24 -0
  84. data/lib/wx/doc/rtc/rich_text_ctrl.rb +24 -0
  85. data/lib/wx/doc/rtc/rich_text_paragraph.rb +24 -0
  86. data/lib/wx/doc/rtc/richtext_buffer.rb +27 -19
  87. data/lib/wx/doc/rtc/richtext_printing.rb +17 -9
  88. data/lib/wx/doc/rtc/richtext_style_sheet.rb +17 -9
  89. data/lib/wx/doc/sizer.rb +20 -0
  90. data/lib/wx/doc/static_bitmap.rb +25 -0
  91. data/lib/wx/doc/stc/styled_text_ctrl.rb +24 -0
  92. data/lib/wx/doc/stream.rb +39 -35
  93. data/lib/wx/doc/system_settings.rb +30 -26
  94. data/lib/wx/doc/text_validator.rb +23 -9
  95. data/lib/wx/doc/textctrl.rb +16 -0
  96. data/lib/wx/doc/tree_ctrl.rb +95 -0
  97. data/lib/wx/doc/treebook.rb +9 -5
  98. data/lib/wx/doc/v_list_box.rb +9 -5
  99. data/lib/wx/doc/validator.rb +113 -0
  100. data/lib/wx/doc/variant.rb +164 -160
  101. data/lib/wx/doc/window.rb +87 -47
  102. data/lib/wx/doc/window_disabler.rb +10 -6
  103. data/lib/wx/grid/grid.rb +27 -4
  104. data/lib/wx/html/simple_html_listbox.rb +24 -91
  105. data/lib/wx/keyword_defs.rb +34 -2
  106. data/lib/wx/pg/pg_property.rb +22 -0
  107. data/lib/wx/rbn/ribbon_gallery.rb +0 -21
  108. data/lib/wx/rtc/require.rb +3 -0
  109. data/lib/wx/rtc/rich_text_composite_object.rb +25 -0
  110. data/lib/wx/rtc/rich_text_ctrl.rb +25 -0
  111. data/lib/wx/rtc/rich_text_paragraph.rb +25 -0
  112. data/lib/wx/stc/require.rb +1 -0
  113. data/lib/wx/stc/styled_text_ctrl.rb +25 -0
  114. data/lib/wx/version.rb +1 -1
  115. data/rakelib/lib/config/linux.rb +0 -3
  116. data/rakelib/lib/config/macosx.rb +2 -2
  117. data/rakelib/lib/config/mingw.rb +13 -1
  118. data/rakelib/lib/config/unixish.rb +1 -1
  119. data/rakelib/lib/config.rb +14 -4
  120. data/rakelib/lib/core/include/client_data.inc +65 -0
  121. data/rakelib/lib/core/include/funcall.inc +1 -1
  122. data/rakelib/lib/core/package.rb +31 -9
  123. data/rakelib/lib/core/parameter.rb +1 -1
  124. data/rakelib/lib/core/spec.rb +6 -1
  125. data/rakelib/lib/core/spec_helper.rb +7 -1
  126. data/rakelib/lib/director/accelerator.rb +2 -3
  127. data/rakelib/lib/director/accessible.rb +47 -0
  128. data/rakelib/lib/director/app.rb +30 -319
  129. data/rakelib/lib/director/app_traits.rb +13 -13
  130. data/rakelib/lib/director/bitmap_combobox.rb +2 -2
  131. data/rakelib/lib/director/combobox.rb +22 -0
  132. data/rakelib/lib/director/comboctrl.rb +1 -55
  133. data/rakelib/lib/director/ctrl_with_items.rb +105 -26
  134. data/rakelib/lib/director/data_format.rb +1 -1
  135. data/rakelib/lib/director/date_picker_ctrl.rb +8 -6
  136. data/rakelib/lib/director/derived_dc.rb +1 -1
  137. data/rakelib/lib/director/dialog.rb +1 -0
  138. data/rakelib/lib/director/drag_image.rb +2 -3
  139. data/rakelib/lib/director/editable_listbox.rb +30 -0
  140. data/rakelib/lib/director/event.rb +104 -14
  141. data/rakelib/lib/director/event_handler.rb +3 -2
  142. data/rakelib/lib/director/frame.rb +1 -3
  143. data/rakelib/lib/director/functions.rb +4 -2
  144. data/rakelib/lib/director/gdicommon.rb +8 -10
  145. data/rakelib/lib/director/generic_dirctrl.rb +17 -0
  146. data/rakelib/lib/director/graphics_context.rb +2 -4
  147. data/rakelib/lib/director/grid_cell_attr.rb +0 -2
  148. data/rakelib/lib/director/grid_cell_editor.rb +0 -2
  149. data/rakelib/lib/director/grid_cell_renderer.rb +0 -2
  150. data/rakelib/lib/director/grid_ctrl.rb +34 -3
  151. data/rakelib/lib/director/header_ctrl.rb +6 -1
  152. data/rakelib/lib/director/html_listbox.rb +96 -22
  153. data/rakelib/lib/director/icon.rb +5 -2
  154. data/rakelib/lib/director/list_ctrl.rb +5 -6
  155. data/rakelib/lib/director/locale.rb +1 -3
  156. data/rakelib/lib/director/log.rb +1 -4
  157. data/rakelib/lib/director/media_ctrl.rb +54 -0
  158. data/rakelib/lib/director/menu.rb +16 -1
  159. data/rakelib/lib/director/menu_item.rb +2 -2
  160. data/rakelib/lib/director/num_validator.rb +495 -0
  161. data/rakelib/lib/director/numeric_property_validator.rb +131 -6
  162. data/rakelib/lib/director/owner_drawn_combobox.rb +192 -0
  163. data/rakelib/lib/director/pgproperties.rb +1 -1
  164. data/rakelib/lib/director/pgproperty.rb +27 -30
  165. data/rakelib/lib/director/property_grid_interface.rb +5 -10
  166. data/rakelib/lib/director/ribbon_button_bar.rb +3 -3
  167. data/rakelib/lib/director/ribbon_gallery.rb +3 -5
  168. data/rakelib/lib/director/richtext_composite_object.rb +25 -0
  169. data/rakelib/lib/director/richtext_ctrl.rb +14 -4
  170. data/rakelib/lib/director/richtext_formatting_dialog.rb +7 -5
  171. data/rakelib/lib/director/richtext_paragraph_layout_box.rb +9 -7
  172. data/rakelib/lib/director/sizer.rb +30 -4
  173. data/rakelib/lib/director/sizer_item.rb +13 -0
  174. data/rakelib/lib/director/static_bitmap.rb +28 -0
  175. data/rakelib/lib/director/static_box.rb +4 -5
  176. data/rakelib/lib/director/styled_text_ctrl.rb +12 -0
  177. data/rakelib/lib/director/task_bar_button.rb +30 -0
  178. data/rakelib/lib/director/task_bar_icon.rb +5 -13
  179. data/rakelib/lib/director/text_entry.rb +4 -0
  180. data/rakelib/lib/director/text_validator.rb +124 -13
  181. data/rakelib/lib/director/textctrl.rb +12 -1
  182. data/rakelib/lib/director/toggle_button.rb +1 -0
  183. data/rakelib/lib/director/tool_tip.rb +1 -1
  184. data/rakelib/lib/director/top_level_window.rb +4 -7
  185. data/rakelib/lib/director/tree_ctrl.rb +40 -6
  186. data/rakelib/lib/director/utils.rb +16 -2
  187. data/rakelib/lib/director/validator.rb +196 -21
  188. data/rakelib/lib/director/variant.rb +1 -1
  189. data/rakelib/lib/director/window.rb +40 -7
  190. data/rakelib/lib/director.rb +4 -4
  191. data/rakelib/lib/extractor/function.rb +8 -7
  192. data/rakelib/lib/extractor.rb +34 -5
  193. data/rakelib/lib/generate/analyzer.rb +9 -4
  194. data/rakelib/lib/generate/doc/busy_info.yaml +0 -2
  195. data/rakelib/lib/generate/doc/clipboard.yaml +0 -2
  196. data/rakelib/lib/generate/doc/cursor.yaml +0 -2
  197. data/rakelib/lib/generate/doc/panel.yaml +7 -0
  198. data/rakelib/lib/generate/doc.rb +85 -17
  199. data/rakelib/lib/specs/interfaces.rb +163 -160
  200. data/rakelib/lib/swig_runner.rb +55 -9
  201. data/rakelib/lib/typemap/client_data.rb +67 -0
  202. data/rakelib/lib/typemap/common.rb +33 -4
  203. data/rakelib/lib/typemap/datetime.rb +1 -1
  204. data/rakelib/lib/typemap/tree_itemid.rb +2 -2
  205. data/rakelib/yard/templates/default/fulldoc/html/css/wxruby3.css +74 -2
  206. data/rakelib/yard/templates/default/fulldoc/html/full_list.erb +38 -0
  207. data/rakelib/yard/templates/default/fulldoc/html/setup.rb +39 -0
  208. data/rakelib/yard/templates/default/tags/html/wxrb_require.erb +10 -0
  209. data/rakelib/yard/templates/default/tags/setup.rb +16 -0
  210. data/rakelib/yard/yard-custom-templates.rb +3 -0
  211. data/samples/aui/aui.rb +1237 -1233
  212. data/samples/calendar/calendar.rb +293 -289
  213. data/samples/controls/get_item_sample.rb +83 -79
  214. data/samples/controls/htlbox.rb +331 -327
  215. data/samples/dialogs/dialogs.rb +682 -694
  216. data/samples/dialogs/wizard.rb +52 -55
  217. data/samples/dragdrop/dragdrop.rb +146 -142
  218. data/samples/drawing/bitmap.rb +29 -26
  219. data/samples/drawing/bitmap_image.rb +84 -80
  220. data/samples/drawing/graphics_drawing.rb +209 -205
  221. data/samples/drawing/image_prt.rb +344 -340
  222. data/samples/drawing/maths_images.rb +18 -1
  223. data/samples/drawing/rmagic_bitmap_image.rb +88 -84
  224. data/samples/etc/caret.rb +306 -0
  225. data/samples/etc/miniframe.rb +65 -60
  226. data/samples/etc/sash.rb +109 -105
  227. data/samples/etc/scrollwin.rb +86 -80
  228. data/samples/etc/system_settings.rb +216 -209
  229. data/samples/event/activation.rb +72 -67
  230. data/samples/event/event.rb +160 -153
  231. data/samples/event/threaded.rb +8 -1
  232. data/samples/event/update_ui_event.rb +67 -60
  233. data/samples/grid/grid.rb +188 -181
  234. data/samples/grid/gridtablebase.rb +136 -129
  235. data/samples/html/html.rb +208 -204
  236. data/samples/mdi/mdi.rb +59 -54
  237. data/samples/minimal/minimal.rb +54 -51
  238. data/samples/minimal/nothing.rb +1 -0
  239. data/samples/printing/printing.rb +367 -377
  240. data/samples/printing/printing2.rb +203 -198
  241. data/samples/propgrid/propgrid.rb +2312 -2308
  242. data/samples/propgrid/propgrid_minimal.rb +57 -50
  243. data/samples/ribbon/ribbon.rb +780 -774
  244. data/samples/sampler/ext.rb +0 -33
  245. data/samples/sampler/sample.rb +4 -9
  246. data/samples/sampler.rb +1 -1
  247. data/samples/splash/splash.rb +118 -116
  248. data/samples/text/rich_textctrl.rb +207 -201
  249. data/samples/text/richtext.rb +1409 -1405
  250. data/samples/text/scintilla.rb +137 -128
  251. data/samples/text/textctrl.rb +89 -83
  252. data/samples/text/unicode.rb +175 -168
  253. data/samples/treectrl/treectrl.rb +1430 -1426
  254. data/samples/widgets/activityindicator.rb +95 -0
  255. data/samples/widgets/art/widgets/activityindicator.xpm +278 -0
  256. data/samples/widgets/art/widgets/bmpbtn.xpm +37 -0
  257. data/samples/widgets/art/widgets/bmpcombobox.xpm +54 -0
  258. data/samples/widgets/art/widgets/button.xpm +54 -0
  259. data/samples/widgets/art/widgets/checkbox.xpm +54 -0
  260. data/samples/{bigdemo/icons → widgets/art/widgets}/choice.xpm +1 -1
  261. data/samples/widgets/art/widgets/choicebk.xpm +54 -0
  262. data/samples/widgets/art/widgets/clrpicker.xpm +193 -0
  263. data/samples/widgets/art/widgets/combobox.xpm +54 -0
  264. data/samples/widgets/art/widgets/datepick.xpm +200 -0
  265. data/samples/widgets/art/widgets/dirctrl.xpm +54 -0
  266. data/samples/widgets/art/widgets/dirpicker.xpm +213 -0
  267. data/samples/widgets/art/widgets/filepicker.xpm +214 -0
  268. data/samples/widgets/art/widgets/fontpicker.xpm +185 -0
  269. data/samples/widgets/art/widgets/gauge.xpm +54 -0
  270. data/samples/widgets/art/widgets/header.xpm +54 -0
  271. data/samples/widgets/art/widgets/hyperlnk.xpm +54 -0
  272. data/samples/widgets/art/widgets/listbook.xpm +54 -0
  273. data/samples/widgets/art/widgets/listbox.xpm +54 -0
  274. data/samples/widgets/art/widgets/native.xpm +81 -0
  275. data/samples/widgets/art/widgets/notebook.xpm +54 -0
  276. data/samples/widgets/art/widgets/odcombobox.xpm +54 -0
  277. data/samples/widgets/art/widgets/radiobox.xpm +54 -0
  278. data/samples/widgets/art/widgets/scrolbar.xpm +54 -0
  279. data/samples/widgets/art/widgets/slider.xpm +54 -0
  280. data/samples/widgets/art/widgets/spinbtn.xpm +40 -0
  281. data/samples/widgets/art/widgets/statbmp.xpm +40 -0
  282. data/samples/widgets/art/widgets/statbox.xpm +54 -0
  283. data/samples/widgets/art/widgets/stattext.xpm +54 -0
  284. data/samples/widgets/art/widgets/text.xpm +54 -0
  285. data/samples/widgets/art/widgets/timepick.xpm +207 -0
  286. data/samples/widgets/art/widgets/toggle.xpm +54 -0
  287. data/samples/widgets/art/widgets/toucan.png +0 -0
  288. data/samples/widgets/bmpcombobox.rb +651 -0
  289. data/samples/widgets/button.rb +462 -0
  290. data/samples/widgets/checkbox.rb +211 -0
  291. data/samples/widgets/choice.rb +287 -0
  292. data/samples/widgets/clrpicker.rb +156 -0
  293. data/samples/widgets/combobox.rb +516 -0
  294. data/samples/widgets/datepick.rb +215 -0
  295. data/samples/widgets/dirctrl.rb +265 -0
  296. data/samples/widgets/dirpicker.rb +158 -0
  297. data/samples/widgets/editlbox.rb +122 -0
  298. data/samples/widgets/filectrl.rb +216 -0
  299. data/samples/widgets/filepicker.rb +214 -0
  300. data/samples/widgets/fontpicker.rb +135 -0
  301. data/samples/widgets/gauge.rb +311 -0
  302. data/samples/widgets/headerctrl.rb +236 -0
  303. data/samples/widgets/hyperlink.rb +203 -0
  304. data/samples/widgets/itemcontainer.rb +185 -0
  305. data/samples/widgets/listbox.rb +473 -0
  306. data/samples/widgets/notebook.rb +488 -0
  307. data/samples/widgets/odcombobox.rb +608 -0
  308. data/samples/widgets/radiobox.rb +328 -0
  309. data/samples/widgets/searchctrl.rb +159 -0
  310. data/samples/widgets/slider.rb +594 -0
  311. data/samples/widgets/spinbtn.rb +443 -0
  312. data/samples/widgets/statbmp.rb +130 -0
  313. data/samples/widgets/static.rb +436 -0
  314. data/samples/widgets/textctrl.rb +700 -0
  315. data/samples/widgets/timepick.rb +148 -0
  316. data/samples/widgets/tn_widgets.png +0 -0
  317. data/samples/widgets/toggle.rb +385 -0
  318. data/samples/widgets/widgets.rb +1233 -0
  319. data/samples/xrc/custom_xrc_sample.rb +47 -41
  320. data/samples/xrc/xrc_sample.rb +53 -47
  321. data/tests/media/beep_lo.wav +0 -0
  322. data/tests/test_event_handling.rb +52 -34
  323. data/tests/test_events.rb +7 -0
  324. data/tests/test_item_data.rb +24 -0
  325. data/tests/test_list_ctrl.rb +1 -1
  326. data/tests/test_media_ctrl.rb +38 -0
  327. data/tests/test_menu.rb +69 -0
  328. data/tests/test_pg.rb +27 -0
  329. data/tests/test_richtext.rb +45 -0
  330. data/tests/test_sizer.rb +59 -0
  331. data/tests/test_std_controls.rb +42 -1
  332. data/tests/test_styled_text_ctrl.rb +46 -0
  333. data/tests/test_tree_ctrl.rb +138 -0
  334. data/tests/test_validators.rb +805 -0
  335. data/tests/test_window.rb +12 -0
  336. data/tests/testapp_noframe.rb +1 -1
  337. metadata +121 -139
  338. data/lib/wx/core/choice.rb +0 -14
  339. data/lib/wx/core/combo_ctrl.rb +0 -110
  340. data/rakelib/lib/typemap/grid_client_data.rb +0 -58
  341. data/samples/bigdemo/About.rbw +0 -39
  342. data/samples/bigdemo/ColorPanel.rbw +0 -23
  343. data/samples/bigdemo/GridSimple.rbw +0 -78
  344. data/samples/bigdemo/MDIDemo.rbw +0 -57
  345. data/samples/bigdemo/PopupMenu.rbw +0 -146
  346. data/samples/bigdemo/ShapedWindow.rbw +0 -128
  347. data/samples/bigdemo/Sizers.rbw +0 -541
  348. data/samples/bigdemo/bigdemo.rb +0 -817
  349. data/samples/bigdemo/demoTemplate.rbw +0 -33
  350. data/samples/bigdemo/helpfile.htb +0 -0
  351. data/samples/bigdemo/icons/Test 015.jpg +0 -0
  352. data/samples/bigdemo/icons/Test 015.png +0 -0
  353. data/samples/bigdemo/icons/choice.bmp +0 -0
  354. data/samples/bigdemo/icons/combo.bmp +0 -0
  355. data/samples/bigdemo/icons/combo.xpm +0 -27
  356. data/samples/bigdemo/icons/copy.xpm +0 -25
  357. data/samples/bigdemo/icons/cut.xpm +0 -24
  358. data/samples/bigdemo/icons/gauge.bmp +0 -0
  359. data/samples/bigdemo/icons/gauge.xpm +0 -27
  360. data/samples/bigdemo/icons/help.xpm +0 -25
  361. data/samples/bigdemo/icons/list.bmp +0 -0
  362. data/samples/bigdemo/icons/list.xpm +0 -27
  363. data/samples/bigdemo/icons/mondrian.ico +0 -0
  364. data/samples/bigdemo/icons/mondrian.xpm +0 -44
  365. data/samples/bigdemo/icons/new.xpm +0 -24
  366. data/samples/bigdemo/icons/ogl.ico +0 -0
  367. data/samples/bigdemo/icons/ogl.xpm +0 -45
  368. data/samples/bigdemo/icons/open.xpm +0 -26
  369. data/samples/bigdemo/icons/paste.bmp +0 -0
  370. data/samples/bigdemo/icons/paste.xpm +0 -38
  371. data/samples/bigdemo/icons/pointy.png +0 -0
  372. data/samples/bigdemo/icons/preview.xpm +0 -26
  373. data/samples/bigdemo/icons/print.xpm +0 -26
  374. data/samples/bigdemo/icons/radio.bmp +0 -0
  375. data/samples/bigdemo/icons/radio.xpm +0 -27
  376. data/samples/bigdemo/icons/robert.xpm +0 -415
  377. data/samples/bigdemo/icons/sashtest.ico +0 -0
  378. data/samples/bigdemo/icons/save.xpm +0 -25
  379. data/samples/bigdemo/icons/smiles.bmp +0 -0
  380. data/samples/bigdemo/icons/smiles.xpm +0 -39
  381. data/samples/bigdemo/icons/smiley.ico +0 -0
  382. data/samples/bigdemo/icons/smiley.xpm +0 -42
  383. data/samples/bigdemo/icons/stattext.xpm +0 -24
  384. data/samples/bigdemo/icons/test2.bmp +0 -0
  385. data/samples/bigdemo/icons/test2.png +0 -0
  386. data/samples/bigdemo/icons/test2.xpm +0 -79
  387. data/samples/bigdemo/icons/text.bmp +0 -0
  388. data/samples/bigdemo/icons/text.xpm +0 -27
  389. data/samples/bigdemo/icons/tog1.bmp +0 -0
  390. data/samples/bigdemo/icons/tog1.xpm +0 -38
  391. data/samples/bigdemo/icons/tog2.bmp +0 -0
  392. data/samples/bigdemo/icons/tog2.xpm +0 -38
  393. data/samples/bigdemo/icons/wxruby-128x128.png +0 -0
  394. data/samples/bigdemo/icons/wxwin.ico +0 -0
  395. data/samples/bigdemo/icons/wxwin16x16.png +0 -0
  396. data/samples/bigdemo/icons/wxwin16x16.xpm +0 -25
  397. data/samples/bigdemo/icons/wxwin32x32.png +0 -0
  398. data/samples/bigdemo/icons/wxwin48x48.png +0 -0
  399. data/samples/bigdemo/run.rb +0 -98
  400. data/samples/bigdemo/tips.txt +0 -7
  401. data/samples/bigdemo/utils.rb +0 -20
  402. data/samples/bigdemo/wxArtProvider.rbw +0 -282
  403. data/samples/bigdemo/wxBitmapButton.rbw +0 -65
  404. data/samples/bigdemo/wxButton.rbw +0 -64
  405. data/samples/bigdemo/wxCalendarCtrl.rbw +0 -59
  406. data/samples/bigdemo/wxCheckBox.rbw +0 -50
  407. data/samples/bigdemo/wxCheckListBox.rbw +0 -65
  408. data/samples/bigdemo/wxChoice.rbw +0 -47
  409. data/samples/bigdemo/wxChoicebook.rbw +0 -78
  410. data/samples/bigdemo/wxColourDialog.rbw +0 -33
  411. data/samples/bigdemo/wxComboBox.rbw +0 -77
  412. data/samples/bigdemo/wxCursor.rbw +0 -136
  413. data/samples/bigdemo/wxDialog.rbw +0 -74
  414. data/samples/bigdemo/wxDirDialog.rbw +0 -29
  415. data/samples/bigdemo/wxDragImage.rbw +0 -70
  416. data/samples/bigdemo/wxFileDialog.rbw +0 -37
  417. data/samples/bigdemo/wxFileDialog_Save.rbw +0 -35
  418. data/samples/bigdemo/wxFindReplaceDialog.rbw +0 -82
  419. data/samples/bigdemo/wxFontDialog.rbw +0 -200
  420. data/samples/bigdemo/wxFrame.rbw +0 -53
  421. data/samples/bigdemo/wxGauge.rbw +0 -65
  422. data/samples/bigdemo/wxGenericDirCtrl.rbw +0 -74
  423. data/samples/bigdemo/wxGrid.rbw +0 -66
  424. data/samples/bigdemo/wxHtmlHelpController.rbw +0 -52
  425. data/samples/bigdemo/wxListBox.rbw +0 -140
  426. data/samples/bigdemo/wxListCtrl_virtual.rbw +0 -112
  427. data/samples/bigdemo/wxMDIWindows.rbw +0 -50
  428. data/samples/bigdemo/wxMenu.rbw +0 -247
  429. data/samples/bigdemo/wxMessageDialog.rbw +0 -27
  430. data/samples/bigdemo/wxMiniFrame.rbw +0 -70
  431. data/samples/bigdemo/wxMultipleChoiceDialog.rbw +0 -29
  432. data/samples/bigdemo/wxNotebook.rbw +0 -136
  433. data/samples/bigdemo/wxProgressDialog.rbw +0 -43
  434. data/samples/bigdemo/wxRadioBox.rbw +0 -72
  435. data/samples/bigdemo/wxRadioButton.rbw +0 -125
  436. data/samples/bigdemo/wxSashWindow.rbw +0 -141
  437. data/samples/bigdemo/wxScrolledMessageDialog.rbw +0 -57
  438. data/samples/bigdemo/wxScrolledWindow.rbw +0 -199
  439. data/samples/bigdemo/wxSingleChoiceDialog.rbw +0 -33
  440. data/samples/bigdemo/wxSlider.rbw +0 -42
  441. data/samples/bigdemo/wxSpinButton.rbw +0 -50
  442. data/samples/bigdemo/wxSpinCtrl.rbw +0 -51
  443. data/samples/bigdemo/wxSplitterWindow.rbw +0 -63
  444. data/samples/bigdemo/wxStaticBitmap.rbw +0 -47
  445. data/samples/bigdemo/wxStaticText.rbw +0 -55
  446. data/samples/bigdemo/wxStatusBar.rbw +0 -126
  447. data/samples/bigdemo/wxTextCtrl.rbw +0 -149
  448. data/samples/bigdemo/wxTextEntryDialog.rbw +0 -31
  449. data/samples/bigdemo/wxToggleButton.rbw +0 -49
  450. data/samples/bigdemo/wxToolBar.rbw +0 -131
  451. data/samples/bigdemo/wxTreeCtrl.rbw +0 -191
  452. data/samples/caret/caret.rb +0 -298
  453. data/samples/caret/mondrian.xpm +0 -44
  454. data/samples/controls/books.rb +0 -189
  455. data/samples/controls/choice.xpm +0 -27
  456. data/samples/controls/combo.xpm +0 -27
  457. data/samples/controls/controls.rb +0 -1099
  458. data/samples/controls/gauge.xpm +0 -27
  459. data/samples/controls/list.xpm +0 -27
  460. data/samples/controls/mondrian.ico +0 -0
  461. data/samples/controls/mondrian.xpm +0 -44
  462. data/samples/controls/radio.xpm +0 -27
  463. data/samples/controls/stattext.xpm +0 -24
  464. data/samples/controls/test2.bmp +0 -0
  465. data/samples/controls/text.xpm +0 -27
  466. data/samples/controls/tn_books.png +0 -0
  467. data/samples/controls/tn_controls.png +0 -0
  468. data/samples/etc/choice.rb +0 -87
  469. data/samples/etc/tn_choice.png +0 -0
  470. data/samples/text/mondrian.ico +0 -0
  471. data/samples/text/mondrian.xpm +0 -44
  472. /data/samples/{caret → etc}/tn_caret.png +0 -0
@@ -11,51 +11,57 @@
11
11
 
12
12
  require 'wx'
13
13
 
14
- # Basic Frame Class. This creates the dialog window
15
- class SimpleFrame < Wx::Frame
16
- def initialize
17
- super nil, :title => "Custom XRC Dialog Sample", :pos => [50, 50], :size => [300, 300]
18
-
19
- txt = "Choose 'Open Dialog' from the menu to see a dialog made with XRC"
20
- Wx::StaticText.new self, :label => txt, :pos => [20, 20]
21
-
22
- # Create a new menu
23
- self.menu_bar = Wx::MenuBar.new
24
- menu = Wx::Menu.new
25
- menu.append Wx::ID_OPEN, "Open Dialog"
26
- menu.append Wx::ID_EXIT, "Quit"
27
- menu_bar.append(menu,"File")
28
-
29
- # Assign the menu events
30
- evt_menu(Wx::ID_OPEN) { (dlg = $xml.load_dialog(self, 'SAMPLE_DIALOG').setup_dialog).show_modal; dlg.destroy }
31
- evt_menu(Wx::ID_EXIT) { close }
14
+ module XrcCustom
15
+
16
+ # Basic Frame Class. This creates the dialog window
17
+ class SimpleFrame < Wx::Frame
18
+ def initialize
19
+ super nil, :title => "Custom XRC Dialog Sample", :pos => [50, 50], :size => [300, 300]
20
+
21
+ self.icon = Wx.Icon(:sample, Wx::BITMAP_TYPE_XPM, art_path: File.join(__dir__, '..'))
22
+
23
+ txt = "Choose 'Open Dialog' from the menu to see a dialog made with XRC"
24
+ Wx::StaticText.new self, :label => txt, :pos => [20, 20]
25
+
26
+ # Create a new menu
27
+ self.menu_bar = Wx::MenuBar.new
28
+ menu = Wx::Menu.new
29
+ menu.append Wx::ID_OPEN, "Open Dialog"
30
+ menu.append Wx::ID_EXIT, "Quit"
31
+ menu_bar.append(menu,"File")
32
+
33
+ # Assign the menu events
34
+ evt_menu(Wx::ID_OPEN) { (dlg = $xml.load_dialog(self, 'SAMPLE_DIALOG').setup_dialog).show_modal; dlg.destroy }
35
+ evt_menu(Wx::ID_EXIT) { close }
36
+ end
32
37
  end
33
- end
34
38
 
35
- # Dialog subclass. The components within the dialog are loaded from XRC.
36
- class CustomDialog < Wx::Dialog
37
- def setup_dialog
38
- # Get the buttons. The xrcid method turns a string identifier
39
- # used in an xml file into a numeric identifier as used in
40
- # wxruby.
41
- @ok = find_window_by_id( Wx::xrcid('wxID_OK') )
42
- @cancel = find_window_by_id( Wx::xrcid('wxID_CANCEL') )
43
- @message = find_window_by_id( Wx::xrcid('SAMPLE_MESSAGE') )
44
-
45
- # Bind the buttons to event handlers
46
- evt_button(@ok) { end_modal(Wx::ID_OK) }
47
- evt_button(@cancel) { end_modal(Wx::ID_CANCEL) }
48
- evt_button(@message) do
49
- Wx::message_box("And now a message from our sponsors.")
39
+ # Dialog subclass. The components within the dialog are loaded from XRC.
40
+ class CustomDialog < Wx::Dialog
41
+ def setup_dialog
42
+ # Get the buttons. The xrcid method turns a string identifier
43
+ # used in an xml file into a numeric identifier as used in
44
+ # wxruby.
45
+ @ok = find_window_by_id( Wx::xrcid('wxID_OK') )
46
+ @cancel = find_window_by_id( Wx::xrcid('wxID_CANCEL') )
47
+ @message = find_window_by_id( Wx::xrcid('SAMPLE_MESSAGE') )
48
+
49
+ # Bind the buttons to event handlers
50
+ evt_button(@ok) { end_modal(Wx::ID_OK) }
51
+ evt_button(@cancel) { end_modal(Wx::ID_CANCEL) }
52
+ evt_button(@message) do
53
+ Wx::message_box("And now a message from our sponsors.")
54
+ end
55
+ self
50
56
  end
51
- self
52
57
  end
53
- end
54
58
 
55
- class CustomDialogXmlFactory < Wx::XmlSubclassFactory
56
- def create(subclass)
57
- subclass == 'CustomDialog' ? CustomDialog.new : nil
59
+ class CustomDialogXmlFactory < Wx::XmlSubclassFactory
60
+ def create(subclass)
61
+ subclass == 'CustomDialog' ? CustomDialog.new : nil
62
+ end
58
63
  end
64
+
59
65
  end
60
66
 
61
67
  module CustomXrcSample
@@ -71,13 +77,13 @@ module CustomXrcSample
71
77
 
72
78
  def self.activate
73
79
  # add the CustomDialog XML factory
74
- Wx::XmlResource.add_subclass_factory(CustomDialogXmlFactory.new)
80
+ Wx::XmlResource.add_subclass_factory(XrcCustom::CustomDialogXmlFactory.new)
75
81
  # Get a new resources object
76
82
  xrc_file = File.join( File.dirname(__FILE__), 'custom_dialog.xrc' )
77
83
  $xml = Wx::XmlResource.new(xrc_file)
78
84
 
79
85
  # Show the main frame.
80
- main = SimpleFrame.new
86
+ main = XrcCustom::SimpleFrame.new
81
87
  main.show(true)
82
88
  main
83
89
  end
@@ -11,56 +11,62 @@
11
11
 
12
12
  require 'wx'
13
13
 
14
- # Basic Frame Class. This creates the dialog window
15
- class SimpleFrame < Wx::Frame
16
- def initialize()
17
- super nil, :title => "XRC Dialog Sample", :pos => [50, 50], :size => [300, 300]
18
-
19
- txt = "Choose 'Open Dialog' from the menu to see a dialog made with XRC"
20
- Wx::StaticText.new self, :label => txt, :pos => [20, 20]
21
-
22
- # Create a new menu
23
- self.menu_bar = Wx::MenuBar.new
24
- menu = Wx::Menu.new
25
- menu.append Wx::ID_OPEN, "Open Dialog"
26
- menu.append Wx::ID_EXIT, "Quit"
27
- menu_bar.append(menu,"File")
28
-
29
- # Assign the menu events
30
- evt_menu(Wx::ID_OPEN) { SimpleDialog(self) }
31
- evt_menu(Wx::ID_EXIT) { close }
14
+ module Xrc
15
+
16
+ # Basic Frame Class. This creates the dialog window
17
+ class SimpleFrame < Wx::Frame
18
+ def initialize()
19
+ super nil, :title => "XRC Dialog Sample", :pos => [50, 50], :size => [300, 300]
20
+
21
+ self.icon = Wx.Icon(:sample, Wx::BITMAP_TYPE_XPM, art_path: File.join(__dir__, '..'))
22
+
23
+ txt = "Choose 'Open Dialog' from the menu to see a dialog made with XRC"
24
+ Wx::StaticText.new self, :label => txt, :pos => [20, 20]
25
+
26
+ # Create a new menu
27
+ self.menu_bar = Wx::MenuBar.new
28
+ menu = Wx::Menu.new
29
+ menu.append Wx::ID_OPEN, "Open Dialog"
30
+ menu.append Wx::ID_EXIT, "Quit"
31
+ menu_bar.append(menu,"File")
32
+
33
+ # Assign the menu events
34
+ evt_menu(Wx::ID_OPEN) { Xrc.SimpleDialog(self) }
35
+ evt_menu(Wx::ID_EXIT) { close }
36
+ end
32
37
  end
33
- end
34
38
 
35
- # Dialog subclass. The components within the dialog are loaded from XRC.
36
- class SimpleDialog < Wx::Dialog
37
- def initialize(parent)
38
- # To load a layout defined in XRC into a Ruby subclass of Dialog,
39
- # first call the empty constructor. All the details of size,
40
- # title, position and so on are loaded from the XRC by the call to
41
- # load_frame_subclass. Using a non-empty constructor will cause
42
- # errors on GTK.
43
- super()
44
-
45
- # Load the dialog from XRC. We define $xml in on_init.
46
- # We could use XmlResource.get() over and over again, but
47
- # honestly, thats just too much work.
48
- $xml.load_dialog_subclass(self,parent,'SAMPLE_DIALOG')
49
-
50
- # Get the buttons. The xrcid method turns a string identifier
51
- # used in an xml file into a numeric identifier as used in
52
- # wxruby.
53
- @ok = find_window_by_id( Wx::xrcid('wxID_OK') )
54
- @cancel = find_window_by_id( Wx::xrcid('wxID_CANCEL') )
55
- @message = find_window_by_id( Wx::xrcid('SAMPLE_MESSAGE') )
56
-
57
- # Bind the buttons to event handlers
58
- evt_button(@ok) { end_modal(Wx::ID_OK) }
59
- evt_button(@cancel) { end_modal(Wx::ID_CANCEL) }
60
- evt_button(@message) do
61
- Wx::message_box("And now a message from our sponsors.")
39
+ # Dialog subclass. The components within the dialog are loaded from XRC.
40
+ class SimpleDialog < Wx::Dialog
41
+ def initialize(parent)
42
+ # To load a layout defined in XRC into a Ruby subclass of Dialog,
43
+ # first call the empty constructor. All the details of size,
44
+ # title, position and so on are loaded from the XRC by the call to
45
+ # load_frame_subclass. Using a non-empty constructor will cause
46
+ # errors on GTK.
47
+ super()
48
+
49
+ # Load the dialog from XRC. We define $xml in on_init.
50
+ # We could use XmlResource.get() over and over again, but
51
+ # honestly, that's just too much work.
52
+ $xml.load_dialog_subclass(self,parent,'SAMPLE_DIALOG')
53
+
54
+ # Get the buttons. The xrcid method turns a string identifier
55
+ # used in an xml file into a numeric identifier as used in
56
+ # wxruby.
57
+ @ok = find_window_by_id( Wx::xrcid('wxID_OK') )
58
+ @cancel = find_window_by_id( Wx::xrcid('wxID_CANCEL') )
59
+ @message = find_window_by_id( Wx::xrcid('SAMPLE_MESSAGE') )
60
+
61
+ # Bind the buttons to event handlers
62
+ evt_button(@ok) { end_modal(Wx::ID_OK) }
63
+ evt_button(@cancel) { end_modal(Wx::ID_CANCEL) }
64
+ evt_button(@message) do
65
+ Wx::message_box("And now a message from our sponsors.")
66
+ end
62
67
  end
63
68
  end
69
+
64
70
  end
65
71
 
66
72
  module XrcSample
@@ -79,7 +85,7 @@ module XrcSample
79
85
  $xml = Wx::XmlResource.new(xrc_file)
80
86
 
81
87
  # Show the main frame.
82
- main = SimpleFrame.new()
88
+ main = Xrc::SimpleFrame.new()
83
89
  main.show(true)
84
90
  main
85
91
  end
Binary file
@@ -13,10 +13,13 @@ class EventHandlingTests < Test::Unit::TestCase
13
13
  end
14
14
  end
15
15
 
16
+ CLIENT_DATA = {one: 'first'}
17
+
16
18
  class TestCmdEvent < Wx::CommandEvent
17
19
  EVT_TEST_CMD_EVENT = Wx::EvtHandler.register_class(self, nil, 'evt_test_cmd_event', 0)
18
20
  def initialize(id=0)
19
21
  super(EVT_TEST_CMD_EVENT, id)
22
+ set_client_object(CLIENT_DATA.dup) if id > 0
20
23
  end
21
24
  end
22
25
 
@@ -27,11 +30,18 @@ class EventHandlingTests < Test::Unit::TestCase
27
30
  super(parent)
28
31
  @test_event = false
29
32
  @test_cmd_event = false
33
+ @test_client_data = false
30
34
 
31
35
  evt_test_event { |evt| @test_event = true; evt.skip if evt.id > 0 }
32
- evt_test_cmd_event { |evt| @test_cmd_event = true; evt.skip if evt.id > 0 }
36
+ evt_test_cmd_event do |evt|
37
+ @test_cmd_event = true
38
+ if evt.id > 0
39
+ @test_client_data = (evt.get_client_data == CLIENT_DATA)
40
+ evt.skip
41
+ end
42
+ end
33
43
  end
34
- attr_reader :test_event, :test_cmd_event
44
+ attr_reader :test_event, :test_cmd_event, :test_client_data
35
45
 
36
46
  def reset
37
47
  @test_event = false
@@ -83,85 +93,93 @@ class EventHandlingTests < Test::Unit::TestCase
83
93
 
84
94
  def test_cmd_event
85
95
  win = TestFrame.new
86
- assert(!win.test_cmd_event)
87
- assert(!win.child.test_cmd_event)
96
+ assert_false(win.test_cmd_event)
97
+ assert_false(win.child.test_cmd_event)
88
98
  win.child.event_handler.process_event(TestCmdEvent.new)
89
- assert(!win.test_cmd_event)
90
- assert(win.child.test_cmd_event)
99
+ assert_false(win.test_cmd_event)
100
+ assert_true(win.child.test_cmd_event)
101
+ assert_false(win.child.test_client_data)
91
102
  win.reset
92
103
  win.child.event_handler.process_event(TestCmdEvent.new(1))
93
- assert(win.test_cmd_event)
94
- assert(win.child.test_cmd_event)
104
+ assert_true(win.test_cmd_event)
105
+ assert_true(win.child.test_cmd_event)
106
+ assert_true(win.child.test_client_data)
95
107
  win.reset
96
108
  win.event_handler.process_event(TestCmdEvent.new)
97
- assert(win.test_cmd_event)
98
- assert(!win.child.test_cmd_event)
109
+ assert_true(win.test_cmd_event)
110
+ assert_false(win.child.test_cmd_event)
99
111
  win.destroy
100
112
  Wx.get_app.yield
101
113
  end
102
114
 
103
115
  def test_queue_event
104
116
  win = TestFrame.new
105
- assert(!win.test_cmd_event)
106
- assert(!win.child.test_cmd_event)
117
+ assert_false(win.test_cmd_event)
118
+ assert_false(win.child.test_cmd_event)
107
119
  win.child.event_handler.queue_event(TestCmdEvent.new)
108
120
  Wx.get_app.yield
109
- assert(!win.test_cmd_event)
110
- assert(win.child.test_cmd_event)
121
+ assert_false(win.test_cmd_event)
122
+ assert_true(win.child.test_cmd_event)
123
+ assert_false(win.child.test_client_data)
111
124
  win.reset
112
125
  win.child.event_handler.queue_event(TestCmdEvent.new(1))
113
126
  Wx.get_app.yield
114
- assert(win.test_cmd_event)
115
- assert(win.child.test_cmd_event)
127
+ assert_true(win.test_cmd_event)
128
+ assert_true(win.child.test_cmd_event)
129
+ assert_true(win.child.test_client_data)
116
130
  win.reset
117
131
  win.event_handler.queue_event(TestCmdEvent.new)
118
132
  Wx.get_app.yield
119
- assert(win.test_cmd_event)
120
- assert(!win.child.test_cmd_event)
133
+ assert_true(win.test_cmd_event)
134
+ assert_false(win.child.test_cmd_event)
121
135
  win.destroy
122
136
  Wx.get_app.yield
123
137
  end
124
138
 
125
139
  def test_pending_event
126
140
  win = TestFrame.new
127
- assert(!win.test_cmd_event)
128
- assert(!win.child.test_cmd_event)
141
+ assert_false(win.test_cmd_event)
142
+ assert_false(win.child.test_cmd_event)
129
143
  win.child.event_handler.add_pending_event(TestCmdEvent.new)
130
144
  Wx.get_app.yield
131
- assert(!win.test_cmd_event)
132
- assert(win.child.test_cmd_event)
145
+ assert_false(win.test_cmd_event)
146
+ assert_true(win.child.test_cmd_event)
147
+ assert_false(win.child.test_client_data)
133
148
  win.reset
134
149
  win.child.event_handler.add_pending_event(TestCmdEvent.new(1))
135
150
  Wx.get_app.yield
136
- assert(win.test_cmd_event)
137
- assert(win.child.test_cmd_event)
151
+ assert_true(win.test_cmd_event)
152
+ assert_true(win.child.test_cmd_event)
153
+ assert_true(win.child.test_client_data)
138
154
  win.reset
139
155
  win.event_handler.add_pending_event(TestCmdEvent.new)
140
156
  Wx.get_app.yield
141
- assert(win.test_cmd_event)
142
- assert(!win.child.test_cmd_event)
157
+ assert_true(win.test_cmd_event)
158
+ assert_false(win.child.test_cmd_event)
143
159
  win.destroy
144
160
  Wx.get_app.yield
145
161
  end
146
162
 
147
163
  def test_post_event
148
164
  win = TestFrame.new
149
- assert(!win.test_cmd_event)
150
- assert(!win.child.test_cmd_event)
165
+ assert_false(win.test_cmd_event)
166
+ assert_false(win.child.test_cmd_event)
151
167
  Wx.post_event(win.child.event_handler, TestCmdEvent.new)
152
168
  Wx.get_app.yield
153
- assert(!win.test_cmd_event)
154
- assert(win.child.test_cmd_event)
169
+ assert_false(win.test_cmd_event)
170
+ assert_true(win.child.test_cmd_event)
171
+ assert_false(win.child.test_client_data)
155
172
  win.reset
156
173
  Wx.post_event(win.child.event_handler, TestCmdEvent.new(1))
157
174
  Wx.get_app.yield
158
- assert(win.test_cmd_event)
159
- assert(win.child.test_cmd_event)
175
+ assert_true(win.test_cmd_event)
176
+ assert_true(win.child.test_cmd_event)
177
+ assert_true(win.child.test_client_data)
160
178
  win.reset
161
179
  Wx.post_event(win.event_handler, TestCmdEvent.new)
162
180
  Wx.get_app.yield
163
- assert(win.test_cmd_event)
164
- assert(!win.child.test_cmd_event)
181
+ assert_true(win.test_cmd_event)
182
+ assert_false(win.child.test_cmd_event)
165
183
  win.destroy
166
184
  Wx.get_app.yield
167
185
  end
data/tests/test_events.rb CHANGED
@@ -20,19 +20,26 @@ class EventTests < Test::Unit::TestCase
20
20
  end
21
21
 
22
22
  def test_command_event
23
+ GC.start
23
24
  evt = Wx::CommandEvent.new(100, 1)
25
+ evt.set_client_object({one: 'first'})
24
26
  assert_equal(100, evt.event_type)
25
27
  assert_equal(1, evt.id)
28
+ assert_equal({one: 'first'}, evt.get_client_object)
26
29
  assert(evt.should_propagate)
30
+ GC.start
27
31
  evt.skip
28
32
  assert(evt.skipped)
29
33
  evt.string = 'CommandEvent Test'
30
34
  assert_equal('CommandEvent Test', evt.string)
31
35
  evt_dup = evt.clone
36
+ GC.start
32
37
  assert_not_equal(evt, evt_dup)
33
38
  assert_equal(evt.event_type, evt_dup.event_type)
34
39
  assert_equal(evt.id, evt_dup.id)
35
40
  assert_equal(evt.string, evt_dup.string)
41
+ assert_equal({one: 'first'}, evt.get_client_object)
42
+ assert_equal({one: 'first'}, evt_dup.get_client_object)
36
43
  end
37
44
 
38
45
  def test_event_clone
@@ -22,6 +22,9 @@ class TestItemData < Test::Unit::TestCase
22
22
  end
23
23
 
24
24
  def do_control_with_items_assertions(f)
25
+ f.control.set_client_object([:client, :object])
26
+ assert_equal([:client, :object], f.control.client_object)
27
+
25
28
  assert_retrievable_data(f.control, 0, { 'b' => 'B' })
26
29
  assert_retrievable_data(f.control, 1, 'string item data')
27
30
  assert_retrievable_data(f.control, 2, 42.3)
@@ -87,10 +90,31 @@ class TestItemData < Test::Unit::TestCase
87
90
 
88
91
  GC.start
89
92
 
93
+ klass = Class.new do
94
+ def initialize(list)
95
+ @list = list
96
+ @list << self
97
+ end
98
+ def client_data_unlinked
99
+ @list.delete(self)
100
+ end
101
+ end
102
+ data_list = []
103
+ 10.times { |i| f.control.append("test #{i}", klass.new(data_list)) }
104
+
105
+ assert_equal(10, data_list.size)
106
+ assert_equal(28, f.control.count)
107
+ assert_kind_of(klass, f.control.get_item_data(27))
108
+
90
109
  # clear all
91
110
  f.control.clear
92
111
  assert_equal(0, f.control.count)
93
112
 
113
+ assert_equal(0, data_list.size)
114
+
115
+ # still there?
116
+ assert_equal([:client, :object], f.control.client_object)
117
+
94
118
  GC.start
95
119
  end
96
120
 
@@ -4,7 +4,7 @@
4
4
 
5
5
  require_relative './lib/wxframe_runner'
6
6
 
7
- class ButtonTests < WxRuby::Test::GUITests
7
+ class ListCtrlTests < WxRuby::Test::GUITests
8
8
 
9
9
  def setup
10
10
  super
@@ -0,0 +1,38 @@
1
+ # Copyright (c) 2023 M.J.N. Corino, The Netherlands
2
+ #
3
+ # This software is released under the MIT license.
4
+
5
+ require_relative './lib/wxframe_runner'
6
+
7
+ # test seems to deadlock for WXGTK
8
+ if Wx.has_feature?(:USE_MEDIACTRL)
9
+
10
+ require 'uri'
11
+
12
+ class MediaCtrlTests < WxRuby::Test::GUITests
13
+
14
+ def setup
15
+ super
16
+ @media = Wx::MediaCtrl.new(frame_win)
17
+ end
18
+
19
+ def cleanup
20
+ @media.destroy
21
+ super
22
+ end
23
+
24
+ attr_reader :media
25
+
26
+ def test_uri
27
+ # just checking if Ruby URI is properly mapped
28
+ # it doesn't seem the mediactrl returns a very consistent result whether the resource is not a media file
29
+ # or if it is a non-existing file so only check whether it is a boolean return.
30
+ uri = URI("file://#{File.join(__dir__, 'media/beep_lo.wav')}")
31
+ assert_boolean(media.load(uri))
32
+ uri = URI("file://#{File.join(__dir__, 'art/test_art/image/wxruby.png')}")
33
+ assert_boolean(media.load(uri))
34
+ end
35
+
36
+ end
37
+
38
+ end
@@ -0,0 +1,69 @@
1
+ # Copyright (c) 2023 M.J.N. Corino, The Netherlands
2
+ #
3
+ # This software is released under the MIT license.
4
+
5
+ require_relative './lib/wxframe_runner'
6
+
7
+ class MenuTests < WxRuby::Test::GUITests
8
+
9
+ def setup
10
+ super
11
+ @menu = Wx::Menu.new
12
+ @menu.append(Wx::ID_HIGHEST+1, 'Item 1', 'Test menuitem 1')
13
+ @menu.append(Wx::ID_HIGHEST+2, 'Item 2', 'Test menuitem 2')
14
+ @menu.append_separator
15
+ @menu.append_check_item(Wx::ID_HIGHEST+3, 'Check 3', 'Test menuitem 3')
16
+ @menu.append_separator
17
+ @menu.append_radio_item(Wx::ID_HIGHEST+4, 'Radio 4', 'Test menuitem 4')
18
+ @menu.append_radio_item(Wx::ID_HIGHEST+5, 'Radio 5', 'Test menuitem 5')
19
+ @menu.append_radio_item(Wx::ID_HIGHEST+6, 'Radio 6', 'Test menuitem 6')
20
+ frame_win.menu_bar = Wx::MenuBar.new
21
+ frame_win.menu_bar.append(@menu, "&Test")
22
+ end
23
+
24
+ def cleanup
25
+ frame_win.menu_bar = nil
26
+ super
27
+ end
28
+
29
+ attr_reader :menu
30
+
31
+ def test_basic
32
+ assert_equal(8, menu.get_menu_item_count)
33
+ check, pos = menu.find_child_item(Wx::ID_HIGHEST+3)
34
+ assert_not_nil(check)
35
+ assert_equal(3, pos)
36
+ assert_equal('Check 3', check.item_label)
37
+ assert_false(check.checked?)
38
+ check.check
39
+ assert_true(check.checked?)
40
+ radio, pos = menu.find_child_item(Wx::ID_HIGHEST+5)
41
+ assert_not_nil(radio)
42
+ assert_equal(6, pos)
43
+ assert_equal('Radio 5', radio.item_label)
44
+ assert_false(radio.checked?)
45
+ radio.check
46
+ assert_true(radio.checked?)
47
+ radio, pos = menu.find_child_item(Wx::ID_HIGHEST+4)
48
+ assert_false(radio.checked?)
49
+ radio, pos = menu.find_child_item(Wx::ID_HIGHEST+6)
50
+ assert_false(radio.checked?)
51
+ radio.check
52
+ assert_true(radio.checked?)
53
+ radio, pos = menu.find_child_item(Wx::ID_HIGHEST+5)
54
+ assert_false(radio.checked?)
55
+ end
56
+
57
+ def test_enumerate
58
+ radio, pos = menu.find_child_item(Wx::ID_HIGHEST+4)
59
+ assert_true(radio.checked?) # first by default checked
60
+ menu.each_item do |mi|
61
+ mi.check if mi.id == (Wx::ID_HIGHEST+5)
62
+ end
63
+ radio, pos = menu.find_child_item(Wx::ID_HIGHEST+4)
64
+ assert_false(radio.checked?)
65
+ radio = menu.each_item.detect { |mi| mi.id == (Wx::ID_HIGHEST+5) }
66
+ assert_true(radio.checked?)
67
+ end
68
+
69
+ end
data/tests/test_pg.rb ADDED
@@ -0,0 +1,27 @@
1
+ # Copyright (c) 2023 M.J.N. Corino, The Netherlands
2
+ #
3
+ # This software is released under the MIT license.
4
+
5
+ require_relative './lib/wxframe_runner'
6
+
7
+ class PGChoicesTests < WxRuby::Test::GUITests
8
+
9
+ def test_enum_labels
10
+ texts = %w[Red Blue Green Yellow Black White]
11
+ choices = Wx::PG::PGChoices.new(texts)
12
+ choices.each_label { |lbl| assert_equal(texts.shift, lbl) }
13
+ end
14
+
15
+ def test_enum_entries
16
+ texts = %w[Flag1 Flag2 Flag3 Flag4]
17
+ choices = Wx::PG::PGChoices.new
18
+ texts.each_with_index do |s, i|
19
+ choices.add(s, 1 << i)
20
+ end
21
+ choices.each_entry.each_with_index do |entry, ix|
22
+ assert_equal(1 << ix, entry.value)
23
+ assert_equal(texts[ix], entry.get_text)
24
+ end
25
+ end
26
+
27
+ end
@@ -67,6 +67,51 @@ class RichTextCtrlWriteTests < WxRuby::Test::GUITests
67
67
  assert_equal('Second Line', richtext.get_line_text(1))
68
68
  end
69
69
 
70
+ def test_enumerate_lines
71
+ richtext.write_text <<~__HEREDOC
72
+ This is line 1.
73
+ This is line 2.
74
+ This is line 3.
75
+ __HEREDOC
76
+ assert_equal(4, richtext.get_number_of_lines)
77
+ richtext.each_line.each_with_index do |txt, lnr|
78
+ if lnr < 3
79
+ assert("This is line #{lnr+1}.", txt)
80
+ else
81
+ assert('', txt)
82
+ end
83
+ end
84
+ line_enum = richtext.each_line
85
+ txt = line_enum.detect { |l| l.index('2') }
86
+ assert_equal('This is line 2.', txt)
87
+ para = richtext.buffer.get_child_at_position(0)
88
+ assert_kind_of(Wx::RTC::RichTextParagraph, para)
89
+ assert_equal(1, para.get_lines.size)
90
+ para.each_line do |rtl|
91
+ txt = para.get_text_for_range(rtl.get_range)
92
+ assert("This is line 1.", txt)
93
+ end
94
+ end
95
+
96
+ def test_enumerate_children
97
+ richtext.write_text <<~__HEREDOC
98
+ This is line 1.
99
+ This is line 2.
100
+ This is line 3.
101
+ __HEREDOC
102
+ richtext.write_image(Wx.Bitmap(:wxruby, Wx::BitmapType::BITMAP_TYPE_PNG, art_section: 'test_art'))
103
+ assert_equal(4, richtext.buffer.get_child_count)
104
+ richtext.buffer.each_child.each_with_index do |c, i|
105
+ if i<3
106
+ assert_kind_of(Wx::RTC::RichTextParagraph, c)
107
+ assert_equal(1, c.get_lines.size)
108
+ else
109
+ assert_equal(1, c.get_child_count)
110
+ c.each_child { |cc| assert_kind_of(Wx::RTC::RichTextImage, cc) }
111
+ end
112
+ end
113
+ end
114
+
70
115
  def test_write_image
71
116
  assert_nothing_raised { richtext.write_image(Wx.Bitmap(:wxruby, Wx::BitmapType::BITMAP_TYPE_PNG, art_section: 'test_art')) }
72
117
  img_obj = richtext.buffer.get_leaf_object_at_position(0)