wxruby3 0.9.2 → 0.9.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (347) 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-Validator.h +39 -0
  6. data/ext/wxruby3/include/wxruby-ValidatorBinding.h +64 -0
  7. data/ext/wxruby3/swig/custom/director.swg +8 -0
  8. data/ext/wxruby3/swig/mark_free_impl.i +0 -33
  9. data/lib/wx/core/bitmap_combobox.rb +17 -21
  10. data/lib/wx/core/combobox.rb +13 -3
  11. data/lib/wx/core/controlwithitems.rb +40 -130
  12. data/lib/wx/core/enum.rb +17 -1
  13. data/lib/wx/core/event.rb +6 -1
  14. data/lib/wx/core/evthandler.rb +8 -2
  15. data/lib/wx/core/generic_validator.rb +312 -0
  16. data/lib/wx/core/listbox.rb +2 -2
  17. data/lib/wx/core/log.rb +1 -1
  18. data/lib/wx/core/owner_drawn_combobox.rb +45 -0
  19. data/lib/wx/core/size.rb +4 -0
  20. data/lib/wx/core/sizer.rb +1 -2
  21. data/lib/wx/core/standard_paths.rb +22 -0
  22. data/lib/wx/core/text_entry.rb +4 -1
  23. data/lib/wx/core/validator.rb +70 -5
  24. data/lib/wx/core/window.rb +3 -7
  25. data/lib/wx/doc/art_locator.rb +1 -0
  26. data/lib/wx/doc/comboctrl.rb +18 -0
  27. data/lib/wx/doc/controlwithitems.rb +16 -0
  28. data/lib/wx/doc/date_picker_ctrl.rb +23 -0
  29. data/lib/wx/doc/editable_listbox.rb +44 -0
  30. data/lib/wx/doc/enum.rb +15 -0
  31. data/lib/wx/doc/event.rb +12 -0
  32. data/lib/wx/doc/extra/12_client_data.md +89 -0
  33. data/lib/wx/doc/extra/13_validators.md +139 -0
  34. data/lib/wx/doc/gdi_common.rb +4 -0
  35. data/lib/wx/doc/generic_validator.rb +95 -0
  36. data/lib/wx/doc/html/simple_html_listbox.rb +22 -0
  37. data/lib/wx/doc/num_validator.rb +387 -0
  38. data/lib/wx/doc/owner_drawn_combobox.rb +96 -0
  39. data/lib/wx/doc/pg/numeric_property_validator.rb +33 -0
  40. data/lib/wx/doc/static_bitmap.rb +25 -0
  41. data/lib/wx/doc/text_validator.rb +10 -0
  42. data/lib/wx/doc/validator.rb +113 -0
  43. data/lib/wx/doc/window.rb +30 -0
  44. data/lib/wx/html/simple_html_listbox.rb +24 -91
  45. data/lib/wx/keyword_defs.rb +34 -2
  46. data/lib/wx/rbn/ribbon_gallery.rb +0 -21
  47. data/lib/wx/version.rb +1 -1
  48. data/rakelib/lib/config/mingw.rb +12 -0
  49. data/rakelib/lib/core/include/client_data.inc +65 -0
  50. data/rakelib/lib/core/include/funcall.inc +1 -1
  51. data/rakelib/lib/core/package.rb +17 -2
  52. data/rakelib/lib/core/parameter.rb +1 -1
  53. data/rakelib/lib/core/spec_helper.rb +7 -1
  54. data/rakelib/lib/director/app.rb +18 -0
  55. data/rakelib/lib/director/app_traits.rb +3 -1
  56. data/rakelib/lib/director/bitmap_combobox.rb +2 -2
  57. data/rakelib/lib/director/combobox.rb +22 -0
  58. data/rakelib/lib/director/comboctrl.rb +1 -55
  59. data/rakelib/lib/director/ctrl_with_items.rb +88 -21
  60. data/rakelib/lib/director/date_picker_ctrl.rb +8 -6
  61. data/rakelib/lib/director/editable_listbox.rb +30 -0
  62. data/rakelib/lib/director/event.rb +102 -12
  63. data/rakelib/lib/director/event_handler.rb +3 -2
  64. data/rakelib/lib/director/functions.rb +4 -2
  65. data/rakelib/lib/director/generic_dirctrl.rb +17 -0
  66. data/rakelib/lib/director/grid_cell_attr.rb +0 -2
  67. data/rakelib/lib/director/grid_cell_editor.rb +0 -2
  68. data/rakelib/lib/director/grid_cell_renderer.rb +0 -2
  69. data/rakelib/lib/director/header_ctrl.rb +6 -1
  70. data/rakelib/lib/director/html_listbox.rb +96 -22
  71. data/rakelib/lib/director/num_validator.rb +495 -0
  72. data/rakelib/lib/director/numeric_property_validator.rb +131 -6
  73. data/rakelib/lib/director/owner_drawn_combobox.rb +192 -0
  74. data/rakelib/lib/director/pgproperty.rb +3 -29
  75. data/rakelib/lib/director/ribbon_button_bar.rb +3 -3
  76. data/rakelib/lib/director/ribbon_gallery.rb +3 -5
  77. data/rakelib/lib/director/sizer.rb +15 -4
  78. data/rakelib/lib/director/sizer_item.rb +13 -0
  79. data/rakelib/lib/director/static_bitmap.rb +28 -0
  80. data/rakelib/lib/director/text_entry.rb +4 -0
  81. data/rakelib/lib/director/text_validator.rb +124 -13
  82. data/rakelib/lib/director/toggle_button.rb +1 -0
  83. data/rakelib/lib/director/top_level_window.rb +0 -2
  84. data/rakelib/lib/director/tree_ctrl.rb +35 -0
  85. data/rakelib/lib/director/utils.rb +16 -2
  86. data/rakelib/lib/director/validator.rb +196 -21
  87. data/rakelib/lib/director/window.rb +16 -2
  88. data/rakelib/lib/extractor/function.rb +2 -1
  89. data/rakelib/lib/generate/analyzer.rb +1 -1
  90. data/rakelib/lib/generate/doc.rb +10 -4
  91. data/rakelib/lib/specs/interfaces.rb +2 -0
  92. data/rakelib/lib/swig_runner.rb +55 -9
  93. data/rakelib/lib/typemap/client_data.rb +67 -0
  94. data/rakelib/lib/typemap/common.rb +3 -3
  95. data/rakelib/lib/typemap/datetime.rb +1 -1
  96. data/rakelib/lib/typemap/tree_itemid.rb +2 -2
  97. data/samples/aui/aui.rb +1237 -1233
  98. data/samples/calendar/calendar.rb +293 -289
  99. data/samples/controls/get_item_sample.rb +83 -79
  100. data/samples/controls/htlbox.rb +331 -327
  101. data/samples/dialogs/dialogs.rb +682 -694
  102. data/samples/dialogs/wizard.rb +52 -55
  103. data/samples/dragdrop/dragdrop.rb +146 -142
  104. data/samples/drawing/bitmap.rb +29 -26
  105. data/samples/drawing/bitmap_image.rb +84 -80
  106. data/samples/drawing/graphics_drawing.rb +209 -205
  107. data/samples/drawing/image_prt.rb +344 -340
  108. data/samples/drawing/maths_images.rb +18 -1
  109. data/samples/drawing/rmagic_bitmap_image.rb +88 -84
  110. data/samples/etc/caret.rb +306 -0
  111. data/samples/etc/miniframe.rb +65 -60
  112. data/samples/etc/sash.rb +109 -105
  113. data/samples/etc/scrollwin.rb +86 -80
  114. data/samples/etc/system_settings.rb +216 -209
  115. data/samples/event/activation.rb +72 -67
  116. data/samples/event/event.rb +160 -153
  117. data/samples/event/threaded.rb +8 -1
  118. data/samples/event/update_ui_event.rb +67 -60
  119. data/samples/grid/grid.rb +188 -181
  120. data/samples/grid/gridtablebase.rb +136 -129
  121. data/samples/html/html.rb +208 -204
  122. data/samples/mdi/mdi.rb +59 -54
  123. data/samples/minimal/minimal.rb +54 -51
  124. data/samples/minimal/nothing.rb +1 -0
  125. data/samples/printing/printing.rb +367 -377
  126. data/samples/printing/printing2.rb +203 -198
  127. data/samples/propgrid/propgrid.rb +2312 -2308
  128. data/samples/propgrid/propgrid_minimal.rb +57 -50
  129. data/samples/ribbon/ribbon.rb +780 -774
  130. data/samples/sampler/ext.rb +0 -33
  131. data/samples/sampler/sample.rb +4 -9
  132. data/samples/sampler.rb +1 -1
  133. data/samples/splash/splash.rb +118 -116
  134. data/samples/text/rich_textctrl.rb +207 -201
  135. data/samples/text/richtext.rb +1409 -1405
  136. data/samples/text/scintilla.rb +137 -128
  137. data/samples/text/textctrl.rb +89 -83
  138. data/samples/text/unicode.rb +175 -168
  139. data/samples/treectrl/treectrl.rb +1430 -1426
  140. data/samples/widgets/activityindicator.rb +95 -0
  141. data/samples/widgets/art/widgets/activityindicator.xpm +278 -0
  142. data/samples/widgets/art/widgets/bmpbtn.xpm +37 -0
  143. data/samples/widgets/art/widgets/bmpcombobox.xpm +54 -0
  144. data/samples/widgets/art/widgets/button.xpm +54 -0
  145. data/samples/widgets/art/widgets/checkbox.xpm +54 -0
  146. data/samples/{bigdemo/icons → widgets/art/widgets}/choice.xpm +1 -1
  147. data/samples/widgets/art/widgets/choicebk.xpm +54 -0
  148. data/samples/widgets/art/widgets/clrpicker.xpm +193 -0
  149. data/samples/widgets/art/widgets/combobox.xpm +54 -0
  150. data/samples/widgets/art/widgets/datepick.xpm +200 -0
  151. data/samples/widgets/art/widgets/dirctrl.xpm +54 -0
  152. data/samples/widgets/art/widgets/dirpicker.xpm +213 -0
  153. data/samples/widgets/art/widgets/filepicker.xpm +214 -0
  154. data/samples/widgets/art/widgets/fontpicker.xpm +185 -0
  155. data/samples/widgets/art/widgets/gauge.xpm +54 -0
  156. data/samples/widgets/art/widgets/header.xpm +54 -0
  157. data/samples/widgets/art/widgets/hyperlnk.xpm +54 -0
  158. data/samples/widgets/art/widgets/listbook.xpm +54 -0
  159. data/samples/widgets/art/widgets/listbox.xpm +54 -0
  160. data/samples/widgets/art/widgets/native.xpm +81 -0
  161. data/samples/widgets/art/widgets/notebook.xpm +54 -0
  162. data/samples/widgets/art/widgets/odcombobox.xpm +54 -0
  163. data/samples/widgets/art/widgets/radiobox.xpm +54 -0
  164. data/samples/widgets/art/widgets/scrolbar.xpm +54 -0
  165. data/samples/widgets/art/widgets/slider.xpm +54 -0
  166. data/samples/widgets/art/widgets/spinbtn.xpm +40 -0
  167. data/samples/widgets/art/widgets/statbmp.xpm +40 -0
  168. data/samples/widgets/art/widgets/statbox.xpm +54 -0
  169. data/samples/widgets/art/widgets/stattext.xpm +54 -0
  170. data/samples/widgets/art/widgets/text.xpm +54 -0
  171. data/samples/widgets/art/widgets/timepick.xpm +207 -0
  172. data/samples/widgets/art/widgets/toggle.xpm +54 -0
  173. data/samples/widgets/art/widgets/toucan.png +0 -0
  174. data/samples/widgets/bmpcombobox.rb +651 -0
  175. data/samples/widgets/button.rb +462 -0
  176. data/samples/widgets/checkbox.rb +211 -0
  177. data/samples/widgets/choice.rb +287 -0
  178. data/samples/widgets/clrpicker.rb +156 -0
  179. data/samples/widgets/combobox.rb +516 -0
  180. data/samples/widgets/datepick.rb +215 -0
  181. data/samples/widgets/dirctrl.rb +265 -0
  182. data/samples/widgets/dirpicker.rb +158 -0
  183. data/samples/widgets/editlbox.rb +122 -0
  184. data/samples/widgets/filectrl.rb +216 -0
  185. data/samples/widgets/filepicker.rb +214 -0
  186. data/samples/widgets/fontpicker.rb +135 -0
  187. data/samples/widgets/gauge.rb +311 -0
  188. data/samples/widgets/headerctrl.rb +236 -0
  189. data/samples/widgets/hyperlink.rb +203 -0
  190. data/samples/widgets/itemcontainer.rb +185 -0
  191. data/samples/widgets/listbox.rb +473 -0
  192. data/samples/widgets/notebook.rb +488 -0
  193. data/samples/widgets/odcombobox.rb +608 -0
  194. data/samples/widgets/radiobox.rb +328 -0
  195. data/samples/widgets/searchctrl.rb +159 -0
  196. data/samples/widgets/slider.rb +594 -0
  197. data/samples/widgets/spinbtn.rb +443 -0
  198. data/samples/widgets/statbmp.rb +130 -0
  199. data/samples/widgets/static.rb +436 -0
  200. data/samples/widgets/textctrl.rb +700 -0
  201. data/samples/widgets/timepick.rb +148 -0
  202. data/samples/widgets/tn_widgets.png +0 -0
  203. data/samples/widgets/toggle.rb +385 -0
  204. data/samples/widgets/widgets.rb +1233 -0
  205. data/samples/xrc/custom_xrc_sample.rb +47 -41
  206. data/samples/xrc/xrc_sample.rb +53 -47
  207. data/tests/test_event_handling.rb +52 -34
  208. data/tests/test_events.rb +7 -0
  209. data/tests/test_item_data.rb +24 -0
  210. data/tests/test_sizer.rb +44 -1
  211. data/tests/test_validators.rb +805 -0
  212. metadata +92 -138
  213. data/lib/wx/core/choice.rb +0 -14
  214. data/lib/wx/core/combo_ctrl.rb +0 -110
  215. data/rakelib/lib/typemap/grid_client_data.rb +0 -58
  216. data/samples/bigdemo/About.rbw +0 -39
  217. data/samples/bigdemo/ColorPanel.rbw +0 -23
  218. data/samples/bigdemo/GridSimple.rbw +0 -78
  219. data/samples/bigdemo/MDIDemo.rbw +0 -57
  220. data/samples/bigdemo/PopupMenu.rbw +0 -146
  221. data/samples/bigdemo/ShapedWindow.rbw +0 -128
  222. data/samples/bigdemo/Sizers.rbw +0 -541
  223. data/samples/bigdemo/bigdemo.rb +0 -817
  224. data/samples/bigdemo/demoTemplate.rbw +0 -33
  225. data/samples/bigdemo/helpfile.htb +0 -0
  226. data/samples/bigdemo/icons/Test 015.jpg +0 -0
  227. data/samples/bigdemo/icons/Test 015.png +0 -0
  228. data/samples/bigdemo/icons/choice.bmp +0 -0
  229. data/samples/bigdemo/icons/combo.bmp +0 -0
  230. data/samples/bigdemo/icons/combo.xpm +0 -27
  231. data/samples/bigdemo/icons/copy.xpm +0 -25
  232. data/samples/bigdemo/icons/cut.xpm +0 -24
  233. data/samples/bigdemo/icons/gauge.bmp +0 -0
  234. data/samples/bigdemo/icons/gauge.xpm +0 -27
  235. data/samples/bigdemo/icons/help.xpm +0 -25
  236. data/samples/bigdemo/icons/list.bmp +0 -0
  237. data/samples/bigdemo/icons/list.xpm +0 -27
  238. data/samples/bigdemo/icons/mondrian.ico +0 -0
  239. data/samples/bigdemo/icons/mondrian.xpm +0 -44
  240. data/samples/bigdemo/icons/new.xpm +0 -24
  241. data/samples/bigdemo/icons/ogl.ico +0 -0
  242. data/samples/bigdemo/icons/ogl.xpm +0 -45
  243. data/samples/bigdemo/icons/open.xpm +0 -26
  244. data/samples/bigdemo/icons/paste.bmp +0 -0
  245. data/samples/bigdemo/icons/paste.xpm +0 -38
  246. data/samples/bigdemo/icons/pointy.png +0 -0
  247. data/samples/bigdemo/icons/preview.xpm +0 -26
  248. data/samples/bigdemo/icons/print.xpm +0 -26
  249. data/samples/bigdemo/icons/radio.bmp +0 -0
  250. data/samples/bigdemo/icons/radio.xpm +0 -27
  251. data/samples/bigdemo/icons/robert.xpm +0 -415
  252. data/samples/bigdemo/icons/sashtest.ico +0 -0
  253. data/samples/bigdemo/icons/save.xpm +0 -25
  254. data/samples/bigdemo/icons/smiles.bmp +0 -0
  255. data/samples/bigdemo/icons/smiles.xpm +0 -39
  256. data/samples/bigdemo/icons/smiley.ico +0 -0
  257. data/samples/bigdemo/icons/smiley.xpm +0 -42
  258. data/samples/bigdemo/icons/stattext.xpm +0 -24
  259. data/samples/bigdemo/icons/test2.bmp +0 -0
  260. data/samples/bigdemo/icons/test2.png +0 -0
  261. data/samples/bigdemo/icons/test2.xpm +0 -79
  262. data/samples/bigdemo/icons/text.bmp +0 -0
  263. data/samples/bigdemo/icons/text.xpm +0 -27
  264. data/samples/bigdemo/icons/tog1.bmp +0 -0
  265. data/samples/bigdemo/icons/tog1.xpm +0 -38
  266. data/samples/bigdemo/icons/tog2.bmp +0 -0
  267. data/samples/bigdemo/icons/tog2.xpm +0 -38
  268. data/samples/bigdemo/icons/wxruby-128x128.png +0 -0
  269. data/samples/bigdemo/icons/wxwin.ico +0 -0
  270. data/samples/bigdemo/icons/wxwin16x16.png +0 -0
  271. data/samples/bigdemo/icons/wxwin16x16.xpm +0 -25
  272. data/samples/bigdemo/icons/wxwin32x32.png +0 -0
  273. data/samples/bigdemo/icons/wxwin48x48.png +0 -0
  274. data/samples/bigdemo/run.rb +0 -98
  275. data/samples/bigdemo/tips.txt +0 -7
  276. data/samples/bigdemo/utils.rb +0 -20
  277. data/samples/bigdemo/wxArtProvider.rbw +0 -282
  278. data/samples/bigdemo/wxBitmapButton.rbw +0 -65
  279. data/samples/bigdemo/wxButton.rbw +0 -64
  280. data/samples/bigdemo/wxCalendarCtrl.rbw +0 -59
  281. data/samples/bigdemo/wxCheckBox.rbw +0 -50
  282. data/samples/bigdemo/wxCheckListBox.rbw +0 -65
  283. data/samples/bigdemo/wxChoice.rbw +0 -47
  284. data/samples/bigdemo/wxChoicebook.rbw +0 -78
  285. data/samples/bigdemo/wxColourDialog.rbw +0 -33
  286. data/samples/bigdemo/wxComboBox.rbw +0 -77
  287. data/samples/bigdemo/wxCursor.rbw +0 -136
  288. data/samples/bigdemo/wxDialog.rbw +0 -74
  289. data/samples/bigdemo/wxDirDialog.rbw +0 -29
  290. data/samples/bigdemo/wxDragImage.rbw +0 -70
  291. data/samples/bigdemo/wxFileDialog.rbw +0 -37
  292. data/samples/bigdemo/wxFileDialog_Save.rbw +0 -35
  293. data/samples/bigdemo/wxFindReplaceDialog.rbw +0 -82
  294. data/samples/bigdemo/wxFontDialog.rbw +0 -200
  295. data/samples/bigdemo/wxFrame.rbw +0 -53
  296. data/samples/bigdemo/wxGauge.rbw +0 -65
  297. data/samples/bigdemo/wxGenericDirCtrl.rbw +0 -74
  298. data/samples/bigdemo/wxGrid.rbw +0 -66
  299. data/samples/bigdemo/wxHtmlHelpController.rbw +0 -52
  300. data/samples/bigdemo/wxListBox.rbw +0 -140
  301. data/samples/bigdemo/wxListCtrl_virtual.rbw +0 -112
  302. data/samples/bigdemo/wxMDIWindows.rbw +0 -50
  303. data/samples/bigdemo/wxMenu.rbw +0 -247
  304. data/samples/bigdemo/wxMessageDialog.rbw +0 -27
  305. data/samples/bigdemo/wxMiniFrame.rbw +0 -70
  306. data/samples/bigdemo/wxMultipleChoiceDialog.rbw +0 -29
  307. data/samples/bigdemo/wxNotebook.rbw +0 -136
  308. data/samples/bigdemo/wxProgressDialog.rbw +0 -43
  309. data/samples/bigdemo/wxRadioBox.rbw +0 -72
  310. data/samples/bigdemo/wxRadioButton.rbw +0 -125
  311. data/samples/bigdemo/wxSashWindow.rbw +0 -141
  312. data/samples/bigdemo/wxScrolledMessageDialog.rbw +0 -57
  313. data/samples/bigdemo/wxScrolledWindow.rbw +0 -199
  314. data/samples/bigdemo/wxSingleChoiceDialog.rbw +0 -33
  315. data/samples/bigdemo/wxSlider.rbw +0 -42
  316. data/samples/bigdemo/wxSpinButton.rbw +0 -50
  317. data/samples/bigdemo/wxSpinCtrl.rbw +0 -51
  318. data/samples/bigdemo/wxSplitterWindow.rbw +0 -63
  319. data/samples/bigdemo/wxStaticBitmap.rbw +0 -47
  320. data/samples/bigdemo/wxStaticText.rbw +0 -55
  321. data/samples/bigdemo/wxStatusBar.rbw +0 -126
  322. data/samples/bigdemo/wxTextCtrl.rbw +0 -149
  323. data/samples/bigdemo/wxTextEntryDialog.rbw +0 -31
  324. data/samples/bigdemo/wxToggleButton.rbw +0 -49
  325. data/samples/bigdemo/wxToolBar.rbw +0 -131
  326. data/samples/bigdemo/wxTreeCtrl.rbw +0 -191
  327. data/samples/caret/caret.rb +0 -298
  328. data/samples/caret/mondrian.xpm +0 -44
  329. data/samples/controls/books.rb +0 -189
  330. data/samples/controls/choice.xpm +0 -27
  331. data/samples/controls/combo.xpm +0 -27
  332. data/samples/controls/controls.rb +0 -1099
  333. data/samples/controls/gauge.xpm +0 -27
  334. data/samples/controls/list.xpm +0 -27
  335. data/samples/controls/mondrian.ico +0 -0
  336. data/samples/controls/mondrian.xpm +0 -44
  337. data/samples/controls/radio.xpm +0 -27
  338. data/samples/controls/stattext.xpm +0 -24
  339. data/samples/controls/test2.bmp +0 -0
  340. data/samples/controls/text.xpm +0 -27
  341. data/samples/controls/tn_books.png +0 -0
  342. data/samples/controls/tn_controls.png +0 -0
  343. data/samples/etc/choice.rb +0 -87
  344. data/samples/etc/tn_choice.png +0 -0
  345. data/samples/text/mondrian.ico +0 -0
  346. data/samples/text/mondrian.xpm +0 -44
  347. /data/samples/{caret → etc}/tn_caret.png +0 -0
@@ -19,36 +19,3 @@ class ::String
19
19
  self.dup.modulize!
20
20
  end
21
21
  end
22
-
23
- # Hack to make the sample loader modules behave like the normal 'toplevel' binding
24
- # otherwise samples using 'include Wx' (or other modules) will fail on referencing
25
- # a constant unscoped from one of these included modules
26
- class ::Module
27
- def const_missing(sym)
28
- if self.name.start_with?('WxRuby::Sample::SampleLoader_') && (scope = self.name.split('::')).size > 3
29
- top_mod = Object.const_get(scope[0,3].join('::'))
30
- return top_mod.const_get(sym)
31
- end
32
- begin
33
- super
34
- rescue NoMethodError
35
- raise NameError, "uninitialized constant #{sym}"
36
- end
37
- end
38
- end
39
-
40
- # Hack to make the sample loader modules behave like the normal 'toplevel' binding
41
- # otherwise samples using 'include Wx' (or other modules) will fail on referencing
42
- # a (module) method unscoped from one of these included modules
43
- module ::Kernel
44
- def method_missing(name, *args, &block)
45
- if self.class.name.start_with?('WxRuby::Sample::SampleLoader_') && (scope = self.class.name.split('::')).size > 3
46
- top_mod = Object.const_get(scope[0,3].join('::'))
47
- return top_mod.__send__(name, *args, &block) if top_mod.respond_to?(name)
48
- top_mod.included_modules.each do |imod|
49
- return imod.__send__(name, *args, &block) if imod.respond_to?(name)
50
- end
51
- end
52
- super
53
- end
54
- end
@@ -295,23 +295,18 @@ module WxRuby
295
295
 
296
296
  def collect_samples(&block)
297
297
  read_count = 0
298
- Dir[File.join(ROOT, '*')].each do |entry|
298
+ Dir[File.join(ROOT, '*')].sort.each do |entry|
299
299
  if File.directory?(entry)
300
300
  category = File.basename(entry)
301
- unless 'bigdemo' == category || 'sampler' == category
301
+ unless 'sampler' == category
302
302
  category.modulize!
303
303
  Dir[File.join(entry, '*.rb')].each do |rb|
304
304
  # only if this is a file (paranoia check) and contains 'include WxRuby::Sample'
305
- if File.file?(rb) && (sample_lns = File.readlines(rb, encoding: 'utf-8')).any? { |ln| /\s+include\s+WxRuby::Sample/ =~ ln }
305
+ if File.file?(rb) && (sample_lns = File.readlines(rb, encoding: 'utf-8')).any? { |ln| /\A\s+include\s+WxRuby::Sample/ =~ ln }
306
306
  # register currently required files
307
307
  cur_loaded = ::Set.new($LOADED_FEATURES)
308
308
  @loading_sample = rb
309
- # cannot use (Kernel#load with) an anonymous module because that will break the Wx::Dialog functor
310
- # functionality for one thing (that code will attempt to define a module method for a new dialog class
311
- # in the class/module scope in which the dialog class is defined working from the dialog class name;
312
- # this will fail for anonymous modules as these cannot be identified by name)
313
- sample_mod = Sample.const_set("SampleLoader_#{File.basename(rb, '.*').modulize!}", Module.new)
314
- sample_mod.module_eval File.read(rb, encoding: 'utf-8'), rb, 1
309
+ ::Kernel.load(rb)
315
310
  # determine additionally required files
316
311
  new_loaded = ::Set.new($LOADED_FEATURES) - cur_loaded
317
312
  sample_captures.each do |mod|
data/samples/sampler.rb CHANGED
@@ -108,7 +108,7 @@ module WxRuby
108
108
  def on_taskbar_activate(evt)
109
109
  @frame.iconize(false)
110
110
  @frame.show(true)
111
- @frame.raise
111
+ @frame.raise_window
112
112
  end
113
113
  end
114
114
 
@@ -6,141 +6,143 @@
6
6
 
7
7
  require 'wx'
8
8
 
9
- class MyFrame < Wx::Frame
10
- def initialize(title)
11
- # The main application frame has no parent (nil)
12
- super(nil, :title => title, :size => [ 400, 300 ])
13
-
14
- @isPda = (Wx::SystemSettings.get_screen_type <= Wx::SYS_SCREEN_PDA)
15
-
16
- # Give the frame an icon. PNG is a good choice of format for
17
- # cross-platform images. Note that OS X doesn't have "Frame" icons.
18
- icon_file = File.join(__dir__,'..', 'art', "wxruby.png")
19
- self.icon = Wx::Icon.new(icon_file)
20
-
21
- menu_bar = Wx::MenuBar.new
22
- # The "file" menu
23
- menu_file = Wx::Menu.new
24
- # Using Wx::ID_EXIT standard id means the menu item will be given
25
- # the right label for the platform and language, and placed in the
26
- # correct platform-specific menu - eg on OS X, in the Application's menu
27
- menu_file.append(Wx::ID_EXIT, "E&xit\tAlt-X", "Quit this program")
28
- menu_bar.append(menu_file, "&File")
29
-
30
- # The "help" menu
31
- menu_help = Wx::Menu.new
32
- menu_help.append(Wx::ID_ABOUT, "&About...\tF1", "Show about dialog")
33
- menu_bar.append(menu_help, "&Help")
34
-
35
- # Assign the menubar to this frame
36
- self.menu_bar = menu_bar
37
-
38
- # Create a status bar at the bottom of the frame
39
- create_status_bar(2)
40
- self.status_text = "Welcome to wxRuby!"
41
-
42
- # Set it up to handle menu events using the relevant methods.
43
- evt_menu Wx::ID_EXIT, :on_quit
44
- evt_menu Wx::ID_ABOUT, :on_about
45
- end
9
+ module Splash
10
+
11
+ class MyFrame < Wx::Frame
12
+ def initialize(title)
13
+ # The main application frame has no parent (nil)
14
+ super(nil, :title => title, :size => [ 400, 300 ])
15
+
16
+ @isPda = (Wx::SystemSettings.get_screen_type <= Wx::SYS_SCREEN_PDA)
17
+
18
+ # Give the frame an icon.
19
+ self.icon = Wx.Icon(:sample, Wx::BITMAP_TYPE_XPM, art_path: File.join(__dir__, '..'))
20
+
21
+ menu_bar = Wx::MenuBar.new
22
+ # The "file" menu
23
+ menu_file = Wx::Menu.new
24
+ # Using Wx::ID_EXIT standard id means the menu item will be given
25
+ # the right label for the platform and language, and placed in the
26
+ # correct platform-specific menu - eg on OS X, in the Application's menu
27
+ menu_file.append(Wx::ID_EXIT, "E&xit\tAlt-X", "Quit this program")
28
+ menu_bar.append(menu_file, "&File")
29
+
30
+ # The "help" menu
31
+ menu_help = Wx::Menu.new
32
+ menu_help.append(Wx::ID_ABOUT, "&About...\tF1", "Show about dialog")
33
+ menu_bar.append(menu_help, "&Help")
34
+
35
+ # Assign the menubar to this frame
36
+ self.menu_bar = menu_bar
37
+
38
+ # Create a status bar at the bottom of the frame
39
+ create_status_bar(2)
40
+ self.status_text = "Welcome to wxRuby!"
41
+
42
+ # Set it up to handle menu events using the relevant methods.
43
+ evt_menu Wx::ID_EXIT, :on_quit
44
+ evt_menu Wx::ID_ABOUT, :on_about
45
+ end
46
46
 
47
- # End the application; it should finish automatically when the last
48
- # window is closed.
49
- def on_quit
50
- close(true)
51
- end
47
+ # End the application; it should finish automatically when the last
48
+ # window is closed.
49
+ def on_quit
50
+ close(true)
51
+ end
52
52
 
53
- def on_about
54
- bitmap = Wx::Bitmap.new(File.join(__dir__, @isPda ? 'mobile.xpm' : 'splash.png'))
53
+ def on_about
54
+ bitmap = Wx::Bitmap.new(File.join(__dir__, @isPda ? 'mobile.xpm' : 'splash.png'))
55
55
 
56
- if bitmap.ok?
57
- image = bitmap.convert_to_image
56
+ if bitmap.ok?
57
+ image = bitmap.convert_to_image
58
58
 
59
- # do not scale on already small screens
60
- image.rescale(bitmap.width/2, bitmap.height/2) unless @isPda
59
+ # do not scale on already small screens
60
+ image.rescale(bitmap.width/2, bitmap.height/2) unless @isPda
61
61
 
62
- bitmap = Wx::Bitmap.new(image)
62
+ bitmap = Wx::Bitmap.new(image)
63
63
 
64
- splash = Wx::SplashScreen.new(bitmap,
65
- Wx::SPLASH_CENTRE_ON_PARENT | Wx::SPLASH_NO_TIMEOUT,
66
- 0, self,
67
- style: Wx::SIMPLE_BORDER|Wx::STAY_ON_TOP)
64
+ splash = Wx::SplashScreen.new(bitmap,
65
+ Wx::SPLASH_CENTRE_ON_PARENT | Wx::SPLASH_NO_TIMEOUT,
66
+ 0, self,
67
+ style: Wx::SIMPLE_BORDER|Wx::STAY_ON_TOP)
68
68
 
69
- win = splash.get_splash_window
70
- text = Wx::StaticText.new(win,
71
- id: Wx::ID_EXIT,
72
- label: "click somewhere\non this image",
73
- pos: [@isPda ? 0 : 13, @isPda ? 0 : 11])
74
- text.set_background_colour(Wx::WHITE)
75
- text.set_foreground_colour(Wx::BLACK)
76
- font = text.font
77
- font.set_fractional_point_size(2.0*font.get_fractional_point_size/3.0)
78
- text.font = font
69
+ win = splash.get_splash_window
70
+ text = Wx::StaticText.new(win,
71
+ id: Wx::ID_EXIT,
72
+ label: "click somewhere\non this image",
73
+ pos: [@isPda ? 0 : 13, @isPda ? 0 : 11])
74
+ text.set_background_colour(Wx::WHITE)
75
+ text.set_foreground_colour(Wx::BLACK)
76
+ font = text.font
77
+ font.set_fractional_point_size(2.0*font.get_fractional_point_size/3.0)
78
+ text.font = font
79
+ end
79
80
  end
80
- end
81
81
 
82
- end
82
+ end
83
83
 
84
- class SplashApp < Wx::App
84
+ class SplashApp < Wx::App
85
85
 
86
- def on_init
87
- # create the main application window
88
- frame = MyFrame.new('Wx::SplashScreen sample application')
86
+ def on_init
87
+ # create the main application window
88
+ frame = MyFrame.new('Wx::SplashScreen sample application')
89
89
 
90
- bitmap = Wx::Bitmap.new(File.join(__dir__, @isPda ? 'mobile.xpm' : 'splash.png'))
90
+ bitmap = Wx::Bitmap.new(File.join(__dir__, @isPda ? 'mobile.xpm' : 'splash.png'))
91
91
 
92
- if bitmap.ok?
93
- # we can even draw dynamic artwork onto our splashscreen
94
- decorate_splash_screen(bitmap)
92
+ if bitmap.ok?
93
+ # we can even draw dynamic artwork onto our splashscreen
94
+ decorate_splash_screen(bitmap)
95
95
 
96
- # show the splashscreen
97
- Wx::SplashScreen.new(bitmap,
98
- Wx::SPLASH_CENTRE_ON_SCREEN|Wx::SPLASH_TIMEOUT,
99
- 6000, frame,
100
- style: Wx::SIMPLE_BORDER|Wx::STAY_ON_TOP)
101
- end
96
+ # show the splashscreen
97
+ Wx::SplashScreen.new(bitmap,
98
+ Wx::SPLASH_CENTRE_ON_SCREEN|Wx::SPLASH_TIMEOUT,
99
+ 6000, frame,
100
+ style: Wx::SIMPLE_BORDER|Wx::STAY_ON_TOP)
101
+ end
102
102
 
103
- self.yield
103
+ self.yield
104
104
 
105
- # and show it (the frames, unlike simple controls, are not shown when
106
- # created initially)
107
- frame.show(true)
105
+ # and show it (the frames, unlike simple controls, are not shown when
106
+ # created initially)
107
+ frame.show(true)
108
108
 
109
- # success: the app will enter the main message
110
- # loop and the application will run. If we returned false here, the
111
- # application would exit immediately.
112
- true
113
- end
109
+ # success: the app will enter the main message
110
+ # loop and the application will run. If we returned false here, the
111
+ # application would exit immediately.
112
+ true
113
+ end
114
114
 
115
- def decorate_splash_screen(bmp)
116
- # use a memory DC to draw directly onto the bitmap
117
- bmp.draw do |memDc|
118
- # draw an orange box (with black outline) at the bottom of the splashscreen.
119
- # this box will be 8% of the height of the bitmap, and be at the bottom.
120
- bannerRect = Wx::Rect.new(Wx::Point.new(0, ((bmp.height / 10)*9.2).to_i),
121
- Wx::Point.new(bmp.width, bmp.height))
122
- memDc.with_brush Wx::Brush.new(Wx::Colour.new(255, 102, 0)) do
123
- memDc.draw_rectangle(bannerRect)
124
- memDc.draw_line(bannerRect.top_left, bannerRect.top_right)
125
-
126
- # dynamically get the wxWidgets version to display
127
- description = "wxRuby %s" % Wx::WXRUBY_VERSION
128
- # create a copyright notice that uses the year that this file is run
129
- copyrightLabel = "%s%s wxWidgets. %s" % ["\xc2\xa9", Time.now.year.to_s, "All rights reserved."]
130
-
131
- # draw the (white) labels inside of our orange box (at the bottom of the splashscreen)
132
- memDc.set_text_foreground(Wx::WHITE)
133
- # draw the "wxRuby" label on the left side, vertically centered.
134
- # note that we deflate the banner rect a little bit horizontally
135
- # so that the text has some padding to its left.
136
- labelRect = bannerRect.deflate([5, 0])
137
- memDc.draw_label(description, labelRect, Wx::ALIGN_CENTRE_VERTICAL | Wx::ALIGN_LEFT)
138
-
139
- # draw the copyright label on the right side
140
- memDc.font = Wx::FontInfo.new(8)
141
- memDc.draw_label(copyrightLabel, labelRect, Wx::ALIGN_CENTRE_VERTICAL | Wx::ALIGN_RIGHT)
115
+ def decorate_splash_screen(bmp)
116
+ # use a memory DC to draw directly onto the bitmap
117
+ bmp.draw do |memDc|
118
+ # draw an orange box (with black outline) at the bottom of the splashscreen.
119
+ # this box will be 8% of the height of the bitmap, and be at the bottom.
120
+ bannerRect = Wx::Rect.new(Wx::Point.new(0, ((bmp.height / 10)*9.2).to_i),
121
+ Wx::Point.new(bmp.width, bmp.height))
122
+ memDc.with_brush Wx::Brush.new(Wx::Colour.new(255, 102, 0)) do
123
+ memDc.draw_rectangle(bannerRect)
124
+ memDc.draw_line(bannerRect.top_left, bannerRect.top_right)
125
+
126
+ # dynamically get the wxWidgets version to display
127
+ description = "wxRuby %s" % Wx::WXRUBY_VERSION
128
+ # create a copyright notice that uses the year that this file is run
129
+ copyrightLabel = "%s%s wxWidgets. %s" % ["\xc2\xa9", Time.now.year.to_s, "All rights reserved."]
130
+
131
+ # draw the (white) labels inside of our orange box (at the bottom of the splashscreen)
132
+ memDc.set_text_foreground(Wx::WHITE)
133
+ # draw the "wxRuby" label on the left side, vertically centered.
134
+ # note that we deflate the banner rect a little bit horizontally
135
+ # so that the text has some padding to its left.
136
+ labelRect = bannerRect.deflate([5, 0])
137
+ memDc.draw_label(description, labelRect, Wx::ALIGN_CENTRE_VERTICAL | Wx::ALIGN_LEFT)
138
+
139
+ # draw the copyright label on the right side
140
+ memDc.font = Wx::FontInfo.new(8)
141
+ memDc.draw_label(copyrightLabel, labelRect, Wx::ALIGN_CENTRE_VERTICAL | Wx::ALIGN_RIGHT)
142
+ end
142
143
  end
143
144
  end
145
+
144
146
  end
145
147
 
146
148
  end
@@ -160,7 +162,7 @@ module SplashSample
160
162
  end
161
163
 
162
164
  if $0 == __FILE__
163
- SplashApp.run
165
+ Splash::SplashApp.run
164
166
  end
165
167
 
166
168
  end