wxruby3 0.9.2 → 0.9.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (379) hide show
  1. checksums.yaml +4 -4
  2. data/INSTALL.md +35 -29
  3. data/README.md +24 -15
  4. data/ext/wxruby3/include/wxruby-ClientData.h +48 -0
  5. data/ext/wxruby3/include/wxruby-Config.h +23 -5
  6. data/ext/wxruby3/include/wxruby-Persistence.h +79 -0
  7. data/ext/wxruby3/include/wxruby-Validator.h +39 -0
  8. data/ext/wxruby3/include/wxruby-ValidatorBinding.h +64 -0
  9. data/ext/wxruby3/swig/custom/director.swg +8 -0
  10. data/ext/wxruby3/swig/mark_free_impl.i +0 -33
  11. data/ext/wxruby3/swig/memory_management.i +6 -0
  12. data/lib/wx/core/bitmap_combobox.rb +17 -21
  13. data/lib/wx/core/book_ctrl_base.rb +16 -0
  14. data/lib/wx/core/combobox.rb +13 -3
  15. data/lib/wx/core/config.rb +454 -83
  16. data/lib/wx/core/controlwithitems.rb +40 -130
  17. data/lib/wx/core/enum.rb +17 -1
  18. data/lib/wx/core/event.rb +6 -1
  19. data/lib/wx/core/evthandler.rb +8 -2
  20. data/lib/wx/core/generic_validator.rb +312 -0
  21. data/lib/wx/core/listbox.rb +2 -2
  22. data/lib/wx/core/log.rb +1 -1
  23. data/lib/wx/core/notebook.rb +10 -8
  24. data/lib/wx/core/owner_drawn_combobox.rb +45 -0
  25. data/lib/wx/core/peristent_object.rb +15 -0
  26. data/lib/wx/core/persistence_manager.rb +39 -0
  27. data/lib/wx/core/persistent_window.rb +16 -0
  28. data/lib/wx/core/size.rb +4 -0
  29. data/lib/wx/core/sizer.rb +1 -2
  30. data/lib/wx/core/standard_paths.rb +22 -0
  31. data/lib/wx/core/text_entry.rb +4 -1
  32. data/lib/wx/core/top_level_window.rb +16 -0
  33. data/lib/wx/core/treebook.rb +18 -0
  34. data/lib/wx/core/validator.rb +70 -5
  35. data/lib/wx/core/window.rb +3 -7
  36. data/lib/wx/core.rb +4 -0
  37. data/lib/wx/doc/art_locator.rb +1 -0
  38. data/lib/wx/doc/book_ctrl_base.rb +19 -0
  39. data/lib/wx/doc/comboctrl.rb +18 -0
  40. data/lib/wx/doc/config.rb +101 -41
  41. data/lib/wx/doc/controlwithitems.rb +16 -0
  42. data/lib/wx/doc/date_picker_ctrl.rb +23 -0
  43. data/lib/wx/doc/editable_listbox.rb +44 -0
  44. data/lib/wx/doc/enum.rb +15 -0
  45. data/lib/wx/doc/event.rb +12 -0
  46. data/lib/wx/doc/extra/12_client_data.md +89 -0
  47. data/lib/wx/doc/extra/13_validators.md +139 -0
  48. data/lib/wx/doc/extra/14_config.md +101 -0
  49. data/lib/wx/doc/extra/15_persistence.md +148 -0
  50. data/lib/wx/doc/gdi_common.rb +4 -0
  51. data/lib/wx/doc/generic_validator.rb +95 -0
  52. data/lib/wx/doc/html/simple_html_listbox.rb +22 -0
  53. data/lib/wx/doc/num_validator.rb +387 -0
  54. data/lib/wx/doc/owner_drawn_combobox.rb +96 -0
  55. data/lib/wx/doc/persistence_manager.rb +36 -0
  56. data/lib/wx/doc/persistent_object.rb +27 -0
  57. data/lib/wx/doc/pg/numeric_property_validator.rb +33 -0
  58. data/lib/wx/doc/static_bitmap.rb +25 -0
  59. data/lib/wx/doc/text_validator.rb +10 -0
  60. data/lib/wx/doc/top_level_window.rb +19 -0
  61. data/lib/wx/doc/treebook.rb +6 -1
  62. data/lib/wx/doc/validator.rb +113 -0
  63. data/lib/wx/doc/window.rb +30 -0
  64. data/lib/wx/html/simple_html_listbox.rb +24 -91
  65. data/lib/wx/keyword_defs.rb +34 -2
  66. data/lib/wx/rbn/ribbon_gallery.rb +0 -21
  67. data/lib/wx/version.rb +1 -1
  68. data/rakelib/build.rb +1 -1
  69. data/rakelib/lib/config/mingw.rb +12 -0
  70. data/rakelib/lib/core/include/client_data.inc +65 -0
  71. data/rakelib/lib/core/include/funcall.inc +1 -1
  72. data/rakelib/lib/core/package.rb +39 -3
  73. data/rakelib/lib/core/parameter.rb +1 -1
  74. data/rakelib/lib/core/spec.rb +10 -0
  75. data/rakelib/lib/core/spec_helper.rb +8 -2
  76. data/rakelib/lib/director/app.rb +18 -0
  77. data/rakelib/lib/director/app_traits.rb +3 -1
  78. data/rakelib/lib/director/bitmap_combobox.rb +2 -2
  79. data/rakelib/lib/director/combobox.rb +22 -0
  80. data/rakelib/lib/director/comboctrl.rb +1 -55
  81. data/rakelib/lib/director/config_base.rb +490 -19
  82. data/rakelib/lib/director/ctrl_with_items.rb +88 -21
  83. data/rakelib/lib/director/date_picker_ctrl.rb +8 -6
  84. data/rakelib/lib/director/editable_listbox.rb +30 -0
  85. data/rakelib/lib/director/event.rb +102 -12
  86. data/rakelib/lib/director/event_filter.rb +1 -1
  87. data/rakelib/lib/director/event_handler.rb +3 -2
  88. data/rakelib/lib/director/event_loop.rb +1 -1
  89. data/rakelib/lib/director/file_dialog_customize_hook.rb +2 -2
  90. data/rakelib/lib/director/functions.rb +4 -2
  91. data/rakelib/lib/director/generic_dirctrl.rb +17 -0
  92. data/rakelib/lib/director/grid_cell_attr.rb +1 -3
  93. data/rakelib/lib/director/grid_cell_editor.rb +1 -3
  94. data/rakelib/lib/director/grid_cell_renderer.rb +1 -3
  95. data/rakelib/lib/director/header_ctrl.rb +9 -1
  96. data/rakelib/lib/director/html_listbox.rb +97 -22
  97. data/rakelib/lib/director/num_validator.rb +495 -0
  98. data/rakelib/lib/director/numeric_property_validator.rb +131 -6
  99. data/rakelib/lib/director/owner_drawn_combobox.rb +192 -0
  100. data/rakelib/lib/director/persistence_manager.rb +410 -0
  101. data/rakelib/lib/director/persistent_object.rb +70 -0
  102. data/rakelib/lib/director/persistent_window.rb +73 -0
  103. data/rakelib/lib/director/pgproperty.rb +3 -29
  104. data/rakelib/lib/director/ribbon_button_bar.rb +3 -3
  105. data/rakelib/lib/director/ribbon_gallery.rb +3 -5
  106. data/rakelib/lib/director/sizer.rb +15 -4
  107. data/rakelib/lib/director/sizer_item.rb +13 -0
  108. data/rakelib/lib/director/static_bitmap.rb +32 -0
  109. data/rakelib/lib/director/text_entry.rb +5 -1
  110. data/rakelib/lib/director/text_validator.rb +124 -13
  111. data/rakelib/lib/director/toggle_button.rb +1 -0
  112. data/rakelib/lib/director/top_level_window.rb +0 -2
  113. data/rakelib/lib/director/tree_ctrl.rb +35 -0
  114. data/rakelib/lib/director/utils.rb +16 -2
  115. data/rakelib/lib/director/validator.rb +196 -21
  116. data/rakelib/lib/director/window.rb +16 -2
  117. data/rakelib/lib/extractor/function.rb +2 -1
  118. data/rakelib/lib/generate/analyzer.rb +44 -44
  119. data/rakelib/lib/generate/doc.rb +11 -5
  120. data/rakelib/lib/specs/interfaces.rb +5 -0
  121. data/rakelib/lib/swig_runner.rb +55 -9
  122. data/rakelib/lib/typemap/client_data.rb +67 -0
  123. data/rakelib/lib/typemap/common.rb +3 -3
  124. data/rakelib/lib/typemap/config.rb +8 -0
  125. data/rakelib/lib/typemap/datetime.rb +1 -1
  126. data/rakelib/lib/typemap/tree_itemid.rb +2 -2
  127. data/samples/aui/aui.rb +1237 -1233
  128. data/samples/calendar/calendar.rb +293 -289
  129. data/samples/controls/get_item_sample.rb +83 -79
  130. data/samples/controls/htlbox.rb +331 -327
  131. data/samples/dialogs/dialogs.rb +682 -694
  132. data/samples/dialogs/wizard.rb +52 -55
  133. data/samples/dragdrop/dragdrop.rb +146 -142
  134. data/samples/drawing/bitmap.rb +29 -26
  135. data/samples/drawing/bitmap_image.rb +84 -80
  136. data/samples/drawing/graphics_drawing.rb +209 -205
  137. data/samples/drawing/image_prt.rb +344 -340
  138. data/samples/drawing/maths_images.rb +18 -1
  139. data/samples/drawing/rmagic_bitmap_image.rb +88 -84
  140. data/samples/etc/caret.rb +306 -0
  141. data/samples/etc/miniframe.rb +65 -60
  142. data/samples/etc/sash.rb +109 -105
  143. data/samples/etc/scrollwin.rb +86 -80
  144. data/samples/etc/system_settings.rb +216 -209
  145. data/samples/event/activation.rb +72 -67
  146. data/samples/event/event.rb +160 -153
  147. data/samples/event/threaded.rb +8 -1
  148. data/samples/event/update_ui_event.rb +67 -60
  149. data/samples/grid/grid.rb +188 -181
  150. data/samples/grid/gridtablebase.rb +136 -129
  151. data/samples/html/html.rb +208 -204
  152. data/samples/mdi/mdi.rb +59 -54
  153. data/samples/minimal/minimal.rb +54 -51
  154. data/samples/minimal/nothing.rb +1 -0
  155. data/samples/printing/printing.rb +367 -377
  156. data/samples/printing/printing2.rb +203 -198
  157. data/samples/propgrid/propgrid.rb +2312 -2308
  158. data/samples/propgrid/propgrid_minimal.rb +57 -50
  159. data/samples/ribbon/ribbon.rb +780 -774
  160. data/samples/sampler/ext.rb +0 -33
  161. data/samples/sampler/sample.rb +4 -9
  162. data/samples/sampler.rb +1 -1
  163. data/samples/splash/splash.rb +118 -116
  164. data/samples/text/rich_textctrl.rb +207 -201
  165. data/samples/text/richtext.rb +1409 -1405
  166. data/samples/text/scintilla.rb +137 -128
  167. data/samples/text/textctrl.rb +89 -83
  168. data/samples/text/unicode.rb +175 -168
  169. data/samples/treectrl/treectrl.rb +1430 -1426
  170. data/samples/widgets/activityindicator.rb +95 -0
  171. data/samples/widgets/art/widgets/activityindicator.xpm +278 -0
  172. data/samples/widgets/art/widgets/bmpbtn.xpm +37 -0
  173. data/samples/widgets/art/widgets/bmpcombobox.xpm +54 -0
  174. data/samples/widgets/art/widgets/button.xpm +54 -0
  175. data/samples/widgets/art/widgets/checkbox.xpm +54 -0
  176. data/samples/{bigdemo/icons → widgets/art/widgets}/choice.xpm +1 -1
  177. data/samples/widgets/art/widgets/choicebk.xpm +54 -0
  178. data/samples/widgets/art/widgets/clrpicker.xpm +193 -0
  179. data/samples/widgets/art/widgets/combobox.xpm +54 -0
  180. data/samples/widgets/art/widgets/datepick.xpm +200 -0
  181. data/samples/widgets/art/widgets/dirctrl.xpm +54 -0
  182. data/samples/widgets/art/widgets/dirpicker.xpm +213 -0
  183. data/samples/widgets/art/widgets/filepicker.xpm +214 -0
  184. data/samples/widgets/art/widgets/fontpicker.xpm +185 -0
  185. data/samples/widgets/art/widgets/gauge.xpm +54 -0
  186. data/samples/widgets/art/widgets/header.xpm +54 -0
  187. data/samples/widgets/art/widgets/hyperlnk.xpm +54 -0
  188. data/samples/widgets/art/widgets/listbook.xpm +54 -0
  189. data/samples/widgets/art/widgets/listbox.xpm +54 -0
  190. data/samples/widgets/art/widgets/native.xpm +81 -0
  191. data/samples/widgets/art/widgets/notebook.xpm +54 -0
  192. data/samples/widgets/art/widgets/odcombobox.xpm +54 -0
  193. data/samples/widgets/art/widgets/radiobox.xpm +54 -0
  194. data/samples/widgets/art/widgets/scrolbar.xpm +54 -0
  195. data/samples/widgets/art/widgets/slider.xpm +54 -0
  196. data/samples/widgets/art/widgets/spinbtn.xpm +40 -0
  197. data/samples/widgets/art/widgets/statbmp.xpm +40 -0
  198. data/samples/widgets/art/widgets/statbox.xpm +54 -0
  199. data/samples/widgets/art/widgets/stattext.xpm +54 -0
  200. data/samples/widgets/art/widgets/text.xpm +54 -0
  201. data/samples/widgets/art/widgets/timepick.xpm +207 -0
  202. data/samples/widgets/art/widgets/toggle.xpm +54 -0
  203. data/samples/widgets/art/widgets/toucan.png +0 -0
  204. data/samples/widgets/bmpcombobox.rb +651 -0
  205. data/samples/widgets/button.rb +462 -0
  206. data/samples/widgets/checkbox.rb +211 -0
  207. data/samples/widgets/choice.rb +287 -0
  208. data/samples/widgets/clrpicker.rb +156 -0
  209. data/samples/widgets/combobox.rb +516 -0
  210. data/samples/widgets/datepick.rb +215 -0
  211. data/samples/widgets/dirctrl.rb +265 -0
  212. data/samples/widgets/dirpicker.rb +158 -0
  213. data/samples/widgets/editlbox.rb +122 -0
  214. data/samples/widgets/filectrl.rb +216 -0
  215. data/samples/widgets/filepicker.rb +214 -0
  216. data/samples/widgets/fontpicker.rb +135 -0
  217. data/samples/widgets/gauge.rb +311 -0
  218. data/samples/widgets/headerctrl.rb +236 -0
  219. data/samples/widgets/hyperlink.rb +203 -0
  220. data/samples/widgets/itemcontainer.rb +185 -0
  221. data/samples/widgets/listbox.rb +473 -0
  222. data/samples/widgets/notebook.rb +488 -0
  223. data/samples/widgets/odcombobox.rb +608 -0
  224. data/samples/widgets/radiobox.rb +328 -0
  225. data/samples/widgets/searchctrl.rb +159 -0
  226. data/samples/widgets/slider.rb +594 -0
  227. data/samples/widgets/spinbtn.rb +443 -0
  228. data/samples/widgets/statbmp.rb +130 -0
  229. data/samples/widgets/static.rb +436 -0
  230. data/samples/widgets/textctrl.rb +700 -0
  231. data/samples/widgets/timepick.rb +148 -0
  232. data/samples/widgets/tn_widgets.png +0 -0
  233. data/samples/widgets/toggle.rb +385 -0
  234. data/samples/widgets/widgets.rb +1229 -0
  235. data/samples/xrc/custom_xrc_sample.rb +47 -41
  236. data/samples/xrc/xrc_sample.rb +53 -47
  237. data/tests/test_config.rb +207 -42
  238. data/tests/test_event_handling.rb +52 -34
  239. data/tests/test_events.rb +7 -0
  240. data/tests/test_item_data.rb +24 -0
  241. data/tests/test_persistence.rb +142 -0
  242. data/tests/test_sizer.rb +44 -1
  243. data/tests/test_validators.rb +805 -0
  244. metadata +109 -138
  245. data/lib/wx/core/choice.rb +0 -14
  246. data/lib/wx/core/combo_ctrl.rb +0 -110
  247. data/rakelib/lib/typemap/grid_client_data.rb +0 -58
  248. data/samples/bigdemo/About.rbw +0 -39
  249. data/samples/bigdemo/ColorPanel.rbw +0 -23
  250. data/samples/bigdemo/GridSimple.rbw +0 -78
  251. data/samples/bigdemo/MDIDemo.rbw +0 -57
  252. data/samples/bigdemo/PopupMenu.rbw +0 -146
  253. data/samples/bigdemo/ShapedWindow.rbw +0 -128
  254. data/samples/bigdemo/Sizers.rbw +0 -541
  255. data/samples/bigdemo/bigdemo.rb +0 -817
  256. data/samples/bigdemo/demoTemplate.rbw +0 -33
  257. data/samples/bigdemo/helpfile.htb +0 -0
  258. data/samples/bigdemo/icons/Test 015.jpg +0 -0
  259. data/samples/bigdemo/icons/Test 015.png +0 -0
  260. data/samples/bigdemo/icons/choice.bmp +0 -0
  261. data/samples/bigdemo/icons/combo.bmp +0 -0
  262. data/samples/bigdemo/icons/combo.xpm +0 -27
  263. data/samples/bigdemo/icons/copy.xpm +0 -25
  264. data/samples/bigdemo/icons/cut.xpm +0 -24
  265. data/samples/bigdemo/icons/gauge.bmp +0 -0
  266. data/samples/bigdemo/icons/gauge.xpm +0 -27
  267. data/samples/bigdemo/icons/help.xpm +0 -25
  268. data/samples/bigdemo/icons/list.bmp +0 -0
  269. data/samples/bigdemo/icons/list.xpm +0 -27
  270. data/samples/bigdemo/icons/mondrian.ico +0 -0
  271. data/samples/bigdemo/icons/mondrian.xpm +0 -44
  272. data/samples/bigdemo/icons/new.xpm +0 -24
  273. data/samples/bigdemo/icons/ogl.ico +0 -0
  274. data/samples/bigdemo/icons/ogl.xpm +0 -45
  275. data/samples/bigdemo/icons/open.xpm +0 -26
  276. data/samples/bigdemo/icons/paste.bmp +0 -0
  277. data/samples/bigdemo/icons/paste.xpm +0 -38
  278. data/samples/bigdemo/icons/pointy.png +0 -0
  279. data/samples/bigdemo/icons/preview.xpm +0 -26
  280. data/samples/bigdemo/icons/print.xpm +0 -26
  281. data/samples/bigdemo/icons/radio.bmp +0 -0
  282. data/samples/bigdemo/icons/radio.xpm +0 -27
  283. data/samples/bigdemo/icons/robert.xpm +0 -415
  284. data/samples/bigdemo/icons/sashtest.ico +0 -0
  285. data/samples/bigdemo/icons/save.xpm +0 -25
  286. data/samples/bigdemo/icons/smiles.bmp +0 -0
  287. data/samples/bigdemo/icons/smiles.xpm +0 -39
  288. data/samples/bigdemo/icons/smiley.ico +0 -0
  289. data/samples/bigdemo/icons/smiley.xpm +0 -42
  290. data/samples/bigdemo/icons/stattext.xpm +0 -24
  291. data/samples/bigdemo/icons/test2.bmp +0 -0
  292. data/samples/bigdemo/icons/test2.png +0 -0
  293. data/samples/bigdemo/icons/test2.xpm +0 -79
  294. data/samples/bigdemo/icons/text.bmp +0 -0
  295. data/samples/bigdemo/icons/text.xpm +0 -27
  296. data/samples/bigdemo/icons/tog1.bmp +0 -0
  297. data/samples/bigdemo/icons/tog1.xpm +0 -38
  298. data/samples/bigdemo/icons/tog2.bmp +0 -0
  299. data/samples/bigdemo/icons/tog2.xpm +0 -38
  300. data/samples/bigdemo/icons/wxruby-128x128.png +0 -0
  301. data/samples/bigdemo/icons/wxwin.ico +0 -0
  302. data/samples/bigdemo/icons/wxwin16x16.png +0 -0
  303. data/samples/bigdemo/icons/wxwin16x16.xpm +0 -25
  304. data/samples/bigdemo/icons/wxwin32x32.png +0 -0
  305. data/samples/bigdemo/icons/wxwin48x48.png +0 -0
  306. data/samples/bigdemo/run.rb +0 -98
  307. data/samples/bigdemo/tips.txt +0 -7
  308. data/samples/bigdemo/utils.rb +0 -20
  309. data/samples/bigdemo/wxArtProvider.rbw +0 -282
  310. data/samples/bigdemo/wxBitmapButton.rbw +0 -65
  311. data/samples/bigdemo/wxButton.rbw +0 -64
  312. data/samples/bigdemo/wxCalendarCtrl.rbw +0 -59
  313. data/samples/bigdemo/wxCheckBox.rbw +0 -50
  314. data/samples/bigdemo/wxCheckListBox.rbw +0 -65
  315. data/samples/bigdemo/wxChoice.rbw +0 -47
  316. data/samples/bigdemo/wxChoicebook.rbw +0 -78
  317. data/samples/bigdemo/wxColourDialog.rbw +0 -33
  318. data/samples/bigdemo/wxComboBox.rbw +0 -77
  319. data/samples/bigdemo/wxCursor.rbw +0 -136
  320. data/samples/bigdemo/wxDialog.rbw +0 -74
  321. data/samples/bigdemo/wxDirDialog.rbw +0 -29
  322. data/samples/bigdemo/wxDragImage.rbw +0 -70
  323. data/samples/bigdemo/wxFileDialog.rbw +0 -37
  324. data/samples/bigdemo/wxFileDialog_Save.rbw +0 -35
  325. data/samples/bigdemo/wxFindReplaceDialog.rbw +0 -82
  326. data/samples/bigdemo/wxFontDialog.rbw +0 -200
  327. data/samples/bigdemo/wxFrame.rbw +0 -53
  328. data/samples/bigdemo/wxGauge.rbw +0 -65
  329. data/samples/bigdemo/wxGenericDirCtrl.rbw +0 -74
  330. data/samples/bigdemo/wxGrid.rbw +0 -66
  331. data/samples/bigdemo/wxHtmlHelpController.rbw +0 -52
  332. data/samples/bigdemo/wxListBox.rbw +0 -140
  333. data/samples/bigdemo/wxListCtrl_virtual.rbw +0 -112
  334. data/samples/bigdemo/wxMDIWindows.rbw +0 -50
  335. data/samples/bigdemo/wxMenu.rbw +0 -247
  336. data/samples/bigdemo/wxMessageDialog.rbw +0 -27
  337. data/samples/bigdemo/wxMiniFrame.rbw +0 -70
  338. data/samples/bigdemo/wxMultipleChoiceDialog.rbw +0 -29
  339. data/samples/bigdemo/wxNotebook.rbw +0 -136
  340. data/samples/bigdemo/wxProgressDialog.rbw +0 -43
  341. data/samples/bigdemo/wxRadioBox.rbw +0 -72
  342. data/samples/bigdemo/wxRadioButton.rbw +0 -125
  343. data/samples/bigdemo/wxSashWindow.rbw +0 -141
  344. data/samples/bigdemo/wxScrolledMessageDialog.rbw +0 -57
  345. data/samples/bigdemo/wxScrolledWindow.rbw +0 -199
  346. data/samples/bigdemo/wxSingleChoiceDialog.rbw +0 -33
  347. data/samples/bigdemo/wxSlider.rbw +0 -42
  348. data/samples/bigdemo/wxSpinButton.rbw +0 -50
  349. data/samples/bigdemo/wxSpinCtrl.rbw +0 -51
  350. data/samples/bigdemo/wxSplitterWindow.rbw +0 -63
  351. data/samples/bigdemo/wxStaticBitmap.rbw +0 -47
  352. data/samples/bigdemo/wxStaticText.rbw +0 -55
  353. data/samples/bigdemo/wxStatusBar.rbw +0 -126
  354. data/samples/bigdemo/wxTextCtrl.rbw +0 -149
  355. data/samples/bigdemo/wxTextEntryDialog.rbw +0 -31
  356. data/samples/bigdemo/wxToggleButton.rbw +0 -49
  357. data/samples/bigdemo/wxToolBar.rbw +0 -131
  358. data/samples/bigdemo/wxTreeCtrl.rbw +0 -191
  359. data/samples/caret/caret.rb +0 -298
  360. data/samples/caret/mondrian.xpm +0 -44
  361. data/samples/controls/books.rb +0 -189
  362. data/samples/controls/choice.xpm +0 -27
  363. data/samples/controls/combo.xpm +0 -27
  364. data/samples/controls/controls.rb +0 -1099
  365. data/samples/controls/gauge.xpm +0 -27
  366. data/samples/controls/list.xpm +0 -27
  367. data/samples/controls/mondrian.ico +0 -0
  368. data/samples/controls/mondrian.xpm +0 -44
  369. data/samples/controls/radio.xpm +0 -27
  370. data/samples/controls/stattext.xpm +0 -24
  371. data/samples/controls/test2.bmp +0 -0
  372. data/samples/controls/text.xpm +0 -27
  373. data/samples/controls/tn_books.png +0 -0
  374. data/samples/controls/tn_controls.png +0 -0
  375. data/samples/etc/choice.rb +0 -87
  376. data/samples/etc/tn_choice.png +0 -0
  377. data/samples/text/mondrian.ico +0 -0
  378. data/samples/text/mondrian.xpm +0 -44
  379. /data/samples/{caret → etc}/tn_caret.png +0 -0
@@ -8,47 +8,353 @@
8
8
 
9
9
  module Wx
10
10
 
11
- class Config < Wx::ConfigBase
11
+ class ConfigBase
12
12
 
13
13
  SEPARATOR = '/'.freeze
14
14
 
15
15
  module Interface
16
16
 
17
- def each(&block)
17
+ # provide auto-magic accessor support for config objects
18
+ def method_missing(sym, *args, &block)
19
+ unless block_given? || args.size>1
20
+ setter = false
21
+ key = sym.to_s.sub(/=\z/) { |_| setter = true; '' }
22
+ if (!setter && args.empty?) || (!has_group?(key) && setter && args.size==1)
23
+ if setter
24
+ return set(key, args.shift)
25
+ else
26
+ return get(key)
27
+ end
28
+ elsif setter && args.size == 1 && args.first.is_a?(::Hash) && has_group?(key)
29
+ return set(key, args.shift)
30
+ end
31
+ end
32
+ super
33
+ end
34
+
35
+ end
36
+
37
+ end
38
+
39
+ class ConfigWx < ConfigBase
40
+
41
+ include ConfigBase::Interface
42
+
43
+ # add protection against exceptions raised in blocks
44
+ wx_for_path = instance_method :for_path
45
+ define_method :for_path do |path, &block|
46
+ if block
47
+ ex = nil
48
+ rc = wx_for_path.bind(self).call(path) do |cfg, key|
49
+ begin
50
+ block.call(cfg, key)
51
+ rescue Exception
52
+ ex = $!
53
+ nil
54
+ end
55
+ end
56
+ raise ex if ex
57
+ rc
58
+ else
59
+ nil
60
+ end
61
+ end
62
+ private :for_path # make this method private (internal use only)
63
+
64
+ # add Enumerator support
65
+
66
+ wx_each_entry = instance_method :each_entry
67
+ define_method :each_entry do |&block|
68
+ if block_given?
69
+ wx_each_entry.bind(self).call { |k| block.call(k, read(k)) }
70
+ else
71
+ ::Enumerator.new { |y| wx_each_entry.bind(self).call { |k| y << [k, read_entry(k)] } }
72
+ end
73
+ end
74
+
75
+ wx_each_group = instance_method :each_group
76
+ define_method :each_group do |&block|
77
+ if block_given?
78
+ wx_each_group.bind(self).call { |k| block.call(k, Group.new(self, self.path.dup.push(k))) }
79
+ else
80
+ ::Enumerator.new { |y| wx_each_group.bind(self).call { |k| y << [k, Group.new(self, self.path.dup.push(k))] } }
81
+ end
82
+ end
83
+
84
+ # make this return a path array
85
+ wx_path = instance_method :path
86
+ define_method :path do
87
+ wx_path.bind(self).call.split(ConfigBase::SEPARATOR)
88
+ end
89
+
90
+ # protect against attempts to rename complete paths
91
+ wx_rename = instance_method :rename
92
+ define_method :rename do |old_key, new_key|
93
+ raise ArgumentError, 'No paths allowed' if old_key.index(ConfigBase::SEPARATOR) || new_key.index(ConfigBase::SEPARATOR)
94
+ wx_rename.bind(self).call(old_key, new_key)
95
+ end
96
+
97
+ # fix recursive number_of_xxx methods as wxRegConfig does not support this currently
98
+ wx_number_of_entries = instance_method :number_of_entries
99
+ define_method :number_of_entries do |recurse=false|
100
+ if recurse
101
+ each_group.inject(wx_number_of_entries.bind(self).call) { |c, (_, g)| c + g.number_of_entries(true) }
102
+ else
103
+ wx_number_of_entries.bind(self).call
104
+ end
105
+ end
106
+
107
+ wx_number_of_groups = instance_method :number_of_groups
108
+ define_method :number_of_groups do |recurse=false|
109
+ if recurse
110
+ each_group.inject(wx_number_of_groups.bind(self).call) { |c, (_, g)| c + g.number_of_groups(true) }
111
+ else
112
+ wx_number_of_groups.bind(self).call
113
+ end
114
+ end
115
+
116
+ def root?
117
+ true
118
+ end
119
+
120
+ def root
121
+ self
122
+ end
123
+
124
+ def parent
125
+ nil
126
+ end
127
+
128
+ def read(path_str, output=nil)
129
+ if has_group?(path_str)
130
+ raise TypeError, "Cannot convert group" unless output.nil?
131
+ Group.new(self, get_path(path_str))
132
+ else
133
+ val = read_entry(path_str)
134
+ return val unless val && output
135
+ case
136
+ when ::String == output || ::String === output
137
+ val.to_s
138
+ when ::Integer == output || ::Integer === output
139
+ Kernel.Integer(val)
140
+ when ::Float == output || ::Float === output
141
+ Kernel.Float(val)
142
+ when ::TrueClass == output || ::FalseClass == output || output == true || output == false
143
+ val.is_a?(Integer) ? val != 0 : !!val
144
+ else
145
+ raise ArgumentError, "Unknown coercion type #{output.is_a?(::Class) ? output : output.class}" unless output.nil? || output.is_a?(::Proc)
146
+ output ? output.call(val) : val
147
+ end
148
+ end
149
+ end
150
+ alias :[] :read
151
+
152
+ def write(path_str, val)
153
+ if val.nil?
154
+ delete(path_str)
155
+ nil
156
+ elsif val.is_a?(::Hash)
157
+ raise ArgumentError, 'Cannot change existing value entry to group.' if has_entry?(path_str)
158
+ group = Group.new(self, get_path(path_str))
159
+ val.each_pair { |k, v| group.set(k, v) }
160
+ group
161
+ else
162
+ raise ArgumentError, 'Cannot change existing group to value entry.' if has_group?(path_str)
163
+ write_entry(path_str, val)
164
+ read_entry(path_str)
165
+ end
166
+ end
167
+ alias :[]= :write
168
+
169
+ def get_path(path_str)
170
+ path_str = path_str.to_s
171
+ abs = path_str.start_with?(ConfigBase::SEPARATOR)
172
+ segs = path_str.split(ConfigBase::SEPARATOR)
173
+ segs.shift if abs
174
+ abs ? segs : (self.path+segs)
175
+ end
176
+ protected :get_path
177
+
178
+ def get(key)
179
+ raise ArgumentError, 'No paths allowed' if key.index(ConfigBase::SEPARATOR)
180
+ if has_entry?(key)
181
+ read_entry(key)
182
+ elsif has_group?(key)
183
+ Group.new(self, self.path.dup.push(key))
184
+ else
185
+ nil
186
+ end
187
+ end
188
+
189
+ def set(key, val)
190
+ raise ArgumentError, 'No paths allowed' if key.index(ConfigBase::SEPARATOR)
191
+ if val.nil?
192
+ delete(key)
193
+ nil
194
+ else
195
+ if (!val.is_a?(::Hash) && !has_group?(key)) || has_entry?(key)
196
+ raise ArgumentError, 'Cannot change existing value entry to group.' if val.is_a?(::Hash)
197
+ write_entry(key, val)
198
+ read_entry(key)
199
+ else
200
+ raise ArgumentError, 'Cannot change existing group to value entry.' if has_group?(key) && !val.is_a?(::Hash)
201
+ delete(key)
202
+ group = Group.new(self, self.path.dup.push(key))
203
+ val.each_pair { |k, v| group.set(k, v) }
204
+ group
205
+ end
206
+ end
207
+ end
208
+
209
+ def to_s
210
+ ConfigBase::SEPARATOR
211
+ end
212
+
213
+ def to_h
214
+ data = each_entry.inject({}) { |hash, pair| hash[pair.first] = pair.last; hash }
215
+ each_group.inject(data) { |hash, pair| hash[pair.first] = pair.last.to_h; hash }
216
+ end
217
+
218
+ def replace(hash)
219
+ raise ArgumentError, 'Expected Hash' unless hash.is_a?(::Hash)
220
+ clear
221
+ hash.each_pair { |k,v| self.set(k, v) }
222
+ self
223
+ end
224
+
225
+ class Group
226
+
227
+ include ConfigBase::Interface
228
+
229
+ def initialize(parent, path)
230
+ @parent = parent
231
+ @path = path.freeze
232
+ @path_str = ConfigBase::SEPARATOR + @path.join(ConfigBase::SEPARATOR) + ConfigBase::SEPARATOR
233
+ end
234
+
235
+ def root?
236
+ false
237
+ end
238
+
239
+ def root
240
+ @parent.root
241
+ end
242
+
243
+ def path
244
+ @path
245
+ end
246
+
247
+ def parent
248
+ @parent
249
+ end
250
+
251
+ def each_entry(&block)
252
+ if block_given?
253
+ root.__send__(:for_path, @path_str) do |cfg, _|
254
+ cfg.each_entry(&block)
255
+ end
256
+ else
257
+ ::Enumerator.new { |y| root.__send__(:for_path, @path_str) { |cfg,_| cfg.each_entry { |k,v| y << [k, v] } } }
258
+ end
259
+ end
260
+
261
+ def each_group(&block)
18
262
  if block_given?
19
- @data.each_pair(&block)
263
+ root.__send__(:for_path, @path_str) do |cfg, _|
264
+ cfg.each_group(&block)
265
+ end
20
266
  else
21
- @data.each_pair
267
+ ::Enumerator.new { |y| root.__send__(:for_path, @path_str) { |cfg,_| cfg.each_group { |k,g| y << [k, g] } } }
22
268
  end
23
269
  end
24
270
 
271
+ def number_of_entries(recurse=false)
272
+ root.__send__(:for_path, @path_str) { |cfg,_| cfg.number_of_entries(recurse) }
273
+ end
274
+
275
+ def number_of_groups(recurse=false)
276
+ root.__send__(:for_path, @path_str) { |cfg,_| cfg.number_of_groups(recurse) }
277
+ end
278
+
279
+ def get(key)
280
+ root.__send__(:for_path, @path_str) { |cfg,_| cfg.get(key) }
281
+ end
282
+
283
+ def set(key, val)
284
+ root.__send__(:for_path, @path_str) { |cfg,_| cfg.set(key, val) }
285
+ end
286
+
287
+ def delete(path_str)
288
+ root.__send__(:for_path, @path_str) { |cfg,_| cfg.delete(path_str) }
289
+ end
290
+
291
+ def rename(old_key, new_key)
292
+ root.__send__(:for_path, @path_str) { |cfg,_| cfg.rename(old_key, new_key) }
293
+ end
294
+
295
+ def has_entry?(path_str)
296
+ root.__send__(:for_path, @path_str) { |cfg,_| cfg.has_entry?(path_str) }
297
+ end
298
+
299
+ def has_group?(path_str)
300
+ root.__send__(:for_path, @path_str) { |cfg,_| cfg.has_group?(path_str) }
301
+ end
302
+
303
+ def read(path_str, output=nil)
304
+ root.__send__(:for_path, @path_str) { |cfg,_| cfg.read(path_str, output) }
305
+ end
306
+ alias :[] :read
307
+
308
+ def write(path_str, val)
309
+ root.__send__(:for_path, @path_str) { |cfg,_| cfg.write(path_str, val) }
310
+ end
311
+ alias :[]= :write
312
+
313
+ def to_s
314
+ @path_str
315
+ end
316
+
317
+ def to_h
318
+ root.__send__(:for_path, @path_str) { |cfg,_| cfg.to_h }
319
+ end
320
+
321
+ end
322
+
323
+ end
324
+
325
+ class Config < ConfigBase
326
+
327
+ include ConfigBase::Interface
328
+
329
+ module Interface
330
+
25
331
  def each_entry(&block)
26
332
  if block_given?
27
- @data.keys.select { |k| !@data[k].is_a?(::Hash) }.each(&block)
333
+ data.select { |_,v| !v.is_a?(::Hash) }.each(&block)
28
334
  else
29
- ::Enumerator.new { |y| @data.keys.each { |k| y << k if !@data[k].is_a?(::Hash) } }
335
+ ::Enumerator.new { |y| data.each_pair { |k,v| y << [k, expand(v)] unless v.is_a?(::Hash) } }
30
336
  end
31
337
  end
32
338
 
33
339
  def each_group(&block)
34
340
  if block_given?
35
- @data.select { |_,g| g.is_a?(::Hash) }.each { |k,g| block.call(k, Group.new(self, self.path.dup.push(k), g)) }
341
+ data.select { |_,g| g.is_a?(::Hash) }.each { |k,_| block.call(k, Group.new(self, self.path.dup.push(k))) }
36
342
  else
37
- ::Enumerator.new { |y| @data.each { |k,g| y << [k,Group.new(self, self.path.dup.push(k), g)] if g.is_a?(::Hash) } }
343
+ ::Enumerator.new { |y| data.each_pair { |k,g| y << [k,Group.new(self, self.path.dup.push(k))] if g.is_a?(::Hash) } }
38
344
  end
39
345
  end
40
346
 
41
- def number_of_entries(recurse: false)
347
+ def number_of_entries(recurse=false)
42
348
  if recurse
43
- each_group.inject(each_entry.inject(0) { |c, _| c + 1 }) { |c, (_, g)| c + g.number_of_entries(recurse: true) }
349
+ each_group.inject(each_entry.inject(0) { |c, _| c + 1 }) { |c, (_, g)| c + g.number_of_entries(true) }
44
350
  else
45
351
  each_entry.inject(0) { |c, _| c + 1 }
46
352
  end
47
353
  end
48
354
 
49
- def number_of_groups(recurse: false)
355
+ def number_of_groups(recurse=false)
50
356
  if recurse
51
- each_group.inject(0) { |c, (_,g)| c + 1 + g.number_of_groups(recurse: true) }
357
+ each_group.inject(0) { |c, (_,g)| c + 1 + g.number_of_groups(true) }
52
358
  else
53
359
  each_group.inject(0) { |c, _| c + 1 }
54
360
  end
@@ -59,11 +365,9 @@ module Wx
59
365
  return false if segments.empty?
60
366
  entry = segments.pop
61
367
  group_data = if segments.empty?
62
- @data
368
+ data
63
369
  else
64
- unless abs || root?
65
- segments = self.path + segments
66
- end
370
+ segments = self.path + segments unless abs || root?
67
371
  get_group_at(segments)
68
372
  end
69
373
  !!(group_data && group_data.has_key?(entry) && !group_data[entry].is_a?(::Hash))
@@ -72,87 +376,112 @@ module Wx
72
376
  def has_group?(path_str)
73
377
  segments, abs = get_path(path_str)
74
378
  return root? if segments.empty?
75
- unless abs || root?
76
- segments = self.path + segments
77
- end
379
+ segments = self.path + segments unless abs || root?
78
380
  !!get_group_at(segments)
79
381
  end
80
382
 
81
383
  def get(key)
82
384
  key = key.to_s
83
- elem = @data[key]
385
+ raise ArgumentError, 'No paths allowed' if key.index(ConfigBase::SEPARATOR)
386
+ elem = data[key]
84
387
  if elem.is_a?(::Hash)
85
- Group.new(self, self.path.dup.push(key), elem)
388
+ Group.new(self, self.path.dup.push(key))
86
389
  else
87
- elem
390
+ expand(elem)
88
391
  end
89
392
  end
90
393
 
91
394
  def set(key, val)
92
395
  key = key.to_s
93
- exist = @data.has_key?(key)
94
- elem = exist ? @data[key] : nil
396
+ raise ArgumentError, 'No paths allowed' if key.index(ConfigBase::SEPARATOR)
397
+ hsh = data
398
+ exist = hsh.has_key?(key)
399
+ elem = exist ? hsh[key] : nil
95
400
  if val.nil?
96
- @data.delete(key) if exist
401
+ hsh.delete(key) if exist
97
402
  nil
98
403
  elsif val.is_a?(::Hash)
99
404
  raise ArgumentError, 'Cannot change existing value entry to group.' if exist && !elem.is_a?(::Hash)
100
- elem = @data[key] = {} unless elem
101
- group = Group.new(self, self.path.dup.push(key), elem)
405
+ hsh[key] = {} unless elem
406
+ group = Group.new(self, self.path.dup.push(key))
102
407
  val.each_pair { |k, v| group.set(k, v) }
103
408
  group
104
409
  else
105
410
  raise ArgumentError, 'Cannot change existing group to value entry.' if exist && elem.is_a?(::Hash)
106
- @data[key] = sanitize_value(val)
411
+ hsh[key] = val
107
412
  end
108
413
  end
109
414
 
110
- def delete(key)
111
- @data.delete(key.to_s)
415
+ def delete(path_str)
416
+ segments, abs = get_path(path_str)
417
+ return nil if segments.empty?
418
+ last = segments.pop
419
+ group_data = if segments.empty?
420
+ data
421
+ else
422
+ segments = self.path + segments unless abs || root?
423
+ get_group_at(segments, create_missing_groups: false)
424
+ end
425
+ group_data ? group_data.delete(last) : nil
112
426
  end
113
427
 
114
428
  def rename(old_key, new_key)
115
429
  old_key = old_key.to_s
116
430
  new_key = new_key.to_s
117
- if @data.has_key?(old_key) && !@data.has_key?(new_key)
118
- @data[new_key] = @data.delete(old_key)
431
+ raise ArgumentError, 'No paths allowed' if old_key.index(ConfigBase::SEPARATOR) || new_key.index(ConfigBase::SEPARATOR)
432
+ hsh = data
433
+ if hsh.has_key?(old_key) && !hsh.has_key?(new_key)
434
+ hsh[new_key] = hsh.delete(old_key)
119
435
  true
120
436
  else
121
437
  false
122
438
  end
123
439
  end
124
440
 
125
- def [](path_str)
441
+ def read(path_str, output=nil)
126
442
  segments, abs = get_path(path_str)
127
443
  return nil if segments.empty?
128
444
  last = segments.pop
129
445
  group_data = if segments.empty?
130
- @data
446
+ segments = self.path.dup unless abs || root?
447
+ data
131
448
  else
132
- unless abs || root?
133
- segments = self.path + segments
134
- end
135
- get_group_at(segments, create_missing_groups: true)
449
+ segments = self.path + segments unless abs || root?
450
+ get_group_at(segments)
136
451
  end
137
- raise ArgumentError, "Unable to resolve path #{segments+[last]}" unless group_data
138
- elem = group_data[last]
139
- if elem.is_a?(::Hash)
140
- Group.new(self, segments.dup.push(last), elem)
452
+ val = group_data ? group_data[last] : nil
453
+ if val.is_a?(::Hash)
454
+ raise TypeError, "Cannot convert group" unless output.nil?
455
+ Group.new(self, segments.dup.push(last))
141
456
  else
142
- elem
457
+ val = expand(val)
458
+ return val unless val && output
459
+ case
460
+ when ::String == output || ::String === output
461
+ val.to_s
462
+ when ::Integer == output || ::Integer === output
463
+ Kernel.Integer(val)
464
+ when ::Float == output || ::Float === output
465
+ Kernel.Float(val)
466
+ when ::TrueClass == output || ::FalseClass == output || output == true || output == false
467
+ val.is_a?(::Integer) ? val != 0 : !!val
468
+ else
469
+ raise ArgumentError, "Unknown coercion type #{output.is_a?(::Class) ? output : output.class}" unless output.nil? || output.is_a?(::Proc)
470
+ output ? output.call(val) : val
471
+ end
143
472
  end
144
473
  end
474
+ alias :[] :read
145
475
 
146
- def []=(path_str, val)
476
+ def write(path_str, val)
147
477
  segments, abs = get_path(path_str)
148
478
  return false if segments.empty?
149
479
  last = segments.pop
150
480
  group_data = if segments.empty?
151
- @data
481
+ segments = self.path.dup unless abs || root?
482
+ data
152
483
  else
153
- unless abs || root?
154
- segments = self.path + segments
155
- end
484
+ segments = self.path + segments unless abs || root?
156
485
  get_group_at(segments, create_missing_groups: true)
157
486
  end
158
487
  raise ArgumentError, "Unable to resolve path #{segments+[last]}" unless group_data
@@ -163,61 +492,80 @@ module Wx
163
492
  nil
164
493
  elsif val.is_a?(::Hash)
165
494
  raise ArgumentError, 'Cannot change existing value entry to group.' if exist && !elem.is_a?(::Hash)
166
- elem = group_data[last] = {} unless elem
167
- group = Group.new(self, segments.dup.push(last), elem)
168
- val.each_pair { |key, val| group.set(key, val) }
495
+ group_data[last] = {} unless elem
496
+ group = Group.new(self, segments.dup.push(last))
497
+ val.each_pair { |k, v| group.set(k, v) }
169
498
  group
170
499
  else
171
500
  raise ArgumentError, 'Cannot change existing group to value entry.' if exist && elem.is_a?(::Hash)
172
- group_data[last] = sanitize_value(val)
501
+ group_data[last] = val
173
502
  end
174
503
  end
504
+ alias :[]= :write
175
505
 
176
506
  def to_s
177
- SEPARATOR+self.path.join(SEPARATOR)
507
+ ConfigBase::SEPARATOR+self.path.join(ConfigBase::SEPARATOR)
178
508
  end
179
509
 
180
510
  def to_h
181
- @data
511
+ data
182
512
  end
183
513
 
184
514
  def get_path(path_str)
185
515
  path_str = path_str.to_s
186
- abs = path_str.start_with?(SEPARATOR)
187
- segs = path_str.split(SEPARATOR)
516
+ abs = path_str.start_with?(ConfigBase::SEPARATOR)
517
+ segs = path_str.split(ConfigBase::SEPARATOR)
188
518
  segs.shift if abs
189
519
  [segs, abs]
190
520
  end
191
521
  protected :get_path
192
522
 
193
- def sanitize_value(val)
194
- case val
195
- when TrueClass, FalseClass, Numeric, String
196
- val
197
- else
198
- if val.respond_to?(:to_int)
199
- val.to_int
200
- elsif val.respond_to?(:to_f)
201
- val.to_f
202
- else
203
- val.to_s
523
+ EXPAND_RE = if Wx::PLATFORM == 'WXMSW'
524
+ /(\\)?([$][{(]?|%)(\w+)([})%])?/
525
+ else
526
+ /(\\)?([$][{(]?)(\w+)([})])?/
527
+ end
528
+ private_constant :EXPAND_RE
529
+
530
+ def expand(val)
531
+ if root.expanding_env_vars? && ::String === val
532
+ val.gsub(EXPAND_RE) do |s|
533
+ if $1.nil? &&
534
+ (($2[0] == '$' &&
535
+ ($2.size == 1 && $4.nil?) ||
536
+ ($2[1] == '(' && $4 == ')') ||
537
+ ($2[1] == '{' && $4 == '}'))||
538
+ ($2[0] == '%' && $4 == '%')) &&
539
+ ENV[$3]
540
+ $1 ? $1+ENV[$3] : ENV[$3]
541
+ else
542
+ $1 ? s[1,s.size] : s
543
+ end
204
544
  end
545
+ else
546
+ val
205
547
  end
206
548
  end
207
- protected :sanitize_value
549
+ protected :expand
208
550
 
209
551
  end
210
552
 
211
553
  class Group
212
554
 
555
+ include ConfigBase::Interface
556
+
213
557
  include Interface
214
558
 
215
- def initialize(parent, path, data)
559
+ def initialize(parent, path)
216
560
  @parent = parent
217
561
  @path = path.freeze
218
- @data = data
219
562
  end
220
563
 
564
+ def data
565
+ self.root.__send__(:get_group_at, @path, create_missing_groups: true, is_pruned: true)
566
+ end
567
+ protected :data
568
+
221
569
  def root?
222
570
  false
223
571
  end
@@ -235,7 +583,7 @@ module Wx
235
583
  end
236
584
 
237
585
  def get_group_at(segments, create_missing_groups: false)
238
- root.__send__(:get_group_at, segments)
586
+ root.__send__(:get_group_at, segments, create_missing_groups: create_missing_groups)
239
587
  end
240
588
  protected :get_group_at
241
589
 
@@ -244,10 +592,16 @@ module Wx
244
592
  include Interface
245
593
 
246
594
  def initialize(hash = nil)
595
+ @expand_env_vars = true
247
596
  @data = {}
248
597
  replace(hash) if hash
249
598
  end
250
599
 
600
+ def data
601
+ @data
602
+ end
603
+ protected :data
604
+
251
605
  def root?
252
606
  true
253
607
  end
@@ -264,6 +618,11 @@ module Wx
264
618
  nil
265
619
  end
266
620
 
621
+ def clear
622
+ @data.clear
623
+ true
624
+ end
625
+
267
626
  def replace(hash)
268
627
  raise ArgumentError, 'Expected Hash' unless hash.is_a?(::Hash)
269
628
  @data.clear
@@ -271,19 +630,31 @@ module Wx
271
630
  self
272
631
  end
273
632
 
274
- def get_group_at(segments, create_missing_groups: false)
275
- # prune segments (process relative segments)
276
- segments = segments.inject([]) do |lst, seg|
277
- case seg
278
- when '..'
279
- lst.pop # remove previous
280
- # forget ..
281
- when '.'
282
- # forget
283
- else
284
- lst << seg
633
+ def is_expanding_env_vars
634
+ @expand_env_vars
635
+ end
636
+ alias :expanding_env_vars? :is_expanding_env_vars
637
+
638
+ def set_expand_env_vars(flag)
639
+ @expand_env_vars = !!flag
640
+ end
641
+ alias :expand_env_vars :set_expand_env_vars
642
+
643
+ def get_group_at(segments, create_missing_groups: false, is_pruned: false)
644
+ unless is_pruned
645
+ # prune segments (process relative segments)
646
+ segments = segments.inject([]) do |lst, seg|
647
+ case seg
648
+ when '..'
649
+ lst.pop # remove previous
650
+ # forget ..
651
+ when '.'
652
+ # forget
653
+ else
654
+ lst << seg
655
+ end
656
+ lst
285
657
  end
286
- lst
287
658
  end
288
659
  # find group matching segments
289
660
  segments.inject(@data) do |hsh, seg|