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
@@ -11,97 +11,101 @@
11
11
 
12
12
  require 'wx'
13
13
 
14
- # Bitmap sample (rewritten by Chauk-Mean Proum)
15
-
16
- # This sample demonstrates how to draw the same image in various forms
17
- # (original, mirrored, greyscaled and blurred).
18
- #
19
- # This sample uses :
20
- # - Wx::Image, which allows a wide range of manipulations such as rescaling
21
- # and writing to files.
22
- # - Wx::Bitmap, which is a platform-specific representation of an image.
23
-
24
- # This is the class that must be used to actually display an image.
25
- class ImageFrame < Wx::Frame
26
- def initialize
27
- super(nil, :title => 'Simple image demo', :size => [600, 600])
28
-
29
- # Create the various images from the bitmap file
30
- img_file = File.join( File.dirname(__FILE__), 'ruby-logo.jpg')
31
- @image = Wx::Image.new(img_file)
32
- @mirrored_image = Wx::Image.new(img_file).mirror
33
- # load from Ruby IO (File)
34
- @greyscaled_image = Wx::Image.new
35
- File.open(img_file) { |f| @greyscaled_image.load_stream(f) }
36
- @greyscaled_image = @greyscaled_image.convert_to_greyscale
37
- # load from Ruby IO-like (at least #read) object
38
- klass = Class.new do
39
- def initialize(io)
40
- @io = io
41
- end
42
- def read(size)
43
- @io.read(size)
14
+ module BitmapImage
15
+
16
+ # Bitmap sample (rewritten by Chauk-Mean Proum)
17
+
18
+ # This sample demonstrates how to draw the same image in various forms
19
+ # (original, mirrored, greyscaled and blurred).
20
+ #
21
+ # This sample uses :
22
+ # - Wx::Image, which allows a wide range of manipulations such as rescaling
23
+ # and writing to files.
24
+ # - Wx::Bitmap, which is a platform-specific representation of an image.
25
+
26
+ # This is the class that must be used to actually display an image.
27
+ class ImageFrame < Wx::Frame
28
+ def initialize
29
+ super(nil, :title => 'Simple image demo', :size => [600, 600])
30
+
31
+ # Create the various images from the bitmap file
32
+ img_file = File.join( File.dirname(__FILE__), 'ruby-logo.jpg')
33
+ @image = Wx::Image.new(img_file)
34
+ @mirrored_image = Wx::Image.new(img_file).mirror
35
+ # load from Ruby IO (File)
36
+ @greyscaled_image = Wx::Image.new
37
+ File.open(img_file) { |f| @greyscaled_image.load_stream(f) }
38
+ @greyscaled_image = @greyscaled_image.convert_to_greyscale
39
+ # load from Ruby IO-like (at least #read) object
40
+ klass = Class.new do
41
+ def initialize(io)
42
+ @io = io
43
+ end
44
+ def read(size)
45
+ @io.read(size)
46
+ end
44
47
  end
45
- end
46
- @blurred_image = Wx::Image.new
47
- @blurred_image.load_stream(klass.new(File.open(img_file)), 'image/jpeg')
48
- @blurred_image = @blurred_image.blur(15)
49
-
50
- # Create the corresponding bitmaps
51
- compute_bitmaps
48
+ @blurred_image = Wx::Image.new
49
+ @blurred_image.load_stream(klass.new(File.open(img_file)), 'image/jpeg')
50
+ @blurred_image = @blurred_image.blur(15)
52
51
 
53
- # Set up event handling
54
- evt_size :on_size
55
- evt_idle :on_idle
56
- evt_paint :on_paint
57
- end
52
+ # Create the corresponding bitmaps
53
+ compute_bitmaps
58
54
 
59
- # Create a bitmap for the specified image and size
60
- def compute_bitmap image, width, height
61
- rescaled_image = image.copy.rescale(width, height)
62
- rescaled_image.to_bitmap
63
- end
55
+ # Set up event handling
56
+ evt_size :on_size
57
+ evt_idle :on_idle
58
+ evt_paint :on_paint
59
+ end
64
60
 
65
- # Create the bitmaps corresponding to the images and with half the size of the frame
66
- def compute_bitmaps
67
- width = client_size.width / 2
68
- height = client_size.height / 2
69
- @bitmap1 = compute_bitmap(@image, width, height)
70
- @bitmap2 = compute_bitmap(@mirrored_image, width, height)
71
- @bitmap3 = compute_bitmap(@greyscaled_image, width, height)
72
- @bitmap4 = compute_bitmap(@blurred_image, width, height)
73
- @done = true
74
- end
61
+ # Create a bitmap for the specified image and size
62
+ def compute_bitmap image, width, height
63
+ rescaled_image = image.copy.rescale(width, height)
64
+ rescaled_image.to_bitmap
65
+ end
75
66
 
76
- # Note to recompute the bitmaps on a resize
77
- def on_size(event)
78
- @done = false
79
- event.skip
80
- end
67
+ # Create the bitmaps corresponding to the images and with half the size of the frame
68
+ def compute_bitmaps
69
+ width = client_size.width / 2
70
+ height = client_size.height / 2
71
+ @bitmap1 = compute_bitmap(@image, width, height)
72
+ @bitmap2 = compute_bitmap(@mirrored_image, width, height)
73
+ @bitmap3 = compute_bitmap(@greyscaled_image, width, height)
74
+ @bitmap4 = compute_bitmap(@blurred_image, width, height)
75
+ @done = true
76
+ end
81
77
 
82
- # Recompute the bitmaps if needed, then do a refresh
83
- def on_idle
84
- if not @done
85
- compute_bitmaps
86
- refresh
78
+ # Note to recompute the bitmaps on a resize
79
+ def on_size(event)
80
+ @done = false
81
+ event.skip
87
82
  end
88
- end
89
83
 
90
- # Paint the frame with the bitmaps
91
- def on_paint
92
- paint do | dc |
93
-
94
- if @done
95
- width = client_size.width / 2
96
- height = client_size.height / 2
97
- dc.draw_bitmap(@bitmap1, 0, 0, false)
98
- dc.draw_bitmap(@bitmap2, width, 0, false)
99
- dc.draw_bitmap(@bitmap3, 0, height, false)
100
- dc.draw_bitmap(@bitmap4, width, height, false)
84
+ # Recompute the bitmaps if needed, then do a refresh
85
+ def on_idle
86
+ if not @done
87
+ compute_bitmaps
88
+ refresh
101
89
  end
90
+ end
91
+
92
+ # Paint the frame with the bitmaps
93
+ def on_paint
94
+ paint do | dc |
95
+
96
+ if @done
97
+ width = client_size.width / 2
98
+ height = client_size.height / 2
99
+ dc.draw_bitmap(@bitmap1, 0, 0, false)
100
+ dc.draw_bitmap(@bitmap2, width, 0, false)
101
+ dc.draw_bitmap(@bitmap3, 0, height, false)
102
+ dc.draw_bitmap(@bitmap4, width, height, false)
103
+ end
102
104
 
105
+ end
103
106
  end
104
107
  end
108
+
105
109
  end
106
110
 
107
111
  module BitmapImageSample
@@ -122,7 +126,7 @@ module BitmapImageSample
122
126
  end
123
127
 
124
128
  def self.activate
125
- frame = ImageFrame.new
129
+ frame = BitmapImage::ImageFrame.new
126
130
  frame.show
127
131
  frame
128
132
  end
@@ -11,236 +11,240 @@
11
11
 
12
12
  require 'wx'
13
13
 
14
- class GfxInfo
15
- attr_accessor :font, :w, :h, :x, :y, :x_axis, :y_axis, :txt, :rotation
16
- def initialize
17
- @font = nil
18
- @w = 0
19
- @h = 0
20
- @x = 0
21
- @y = 0
22
- @x_axis = 0
23
- @y_axis = 0
24
- @txt = ""
25
- @rotation = 0
26
- end
27
-
28
- def move(max_x,max_y,max_sp)
29
- @x += @x_axis
30
- @y += @y_axis
31
- if @x <= 0
32
- @x_axis = rand(max_sp)
14
+ module GraphicsDrawing
15
+
16
+ class GfxInfo
17
+ attr_accessor :font, :w, :h, :x, :y, :x_axis, :y_axis, :txt, :rotation
18
+ def initialize
19
+ @font = nil
20
+ @w = 0
21
+ @h = 0
33
22
  @x = 0
34
- elsif (@x+@w) >= max_x
35
- @x_axis = (rand(max_sp)*-1)
36
- @x = max_x - @w
37
- end
38
- if @y <= 0
39
- @y_axis = rand(max_sp)
40
23
  @y = 0
41
- elsif (@y+@h) >= max_y
42
- @y_axis = (rand(max_sp)*-1)
43
- @y = max_y - @h
44
- end
45
- end
46
-
47
- def rotate(run)
48
- @rotation += run
49
- if @rotation > 360
24
+ @x_axis = 0
25
+ @y_axis = 0
26
+ @txt = ""
50
27
  @rotation = 0
51
28
  end
52
- end
53
-
54
- def draw(gdc)
55
- gdc.set_font(font)
56
- gdc.draw_text(txt,x,y,rotation)
57
- end
58
-
59
- def [](symbol)
60
- self.__send__(symbol,*[])
61
- end
62
-
63
- def []=(symbol,val)
64
- self.__send__((symbol.to_s + "=").to_sym,*[val])
65
- end
66
- end
67
29
 
30
+ def move(max_x,max_y,max_sp)
31
+ @x += @x_axis
32
+ @y += @y_axis
33
+ if @x <= 0
34
+ @x_axis = rand(max_sp)
35
+ @x = 0
36
+ elsif (@x+@w) >= max_x
37
+ @x_axis = (rand(max_sp)*-1)
38
+ @x = max_x - @w
39
+ end
40
+ if @y <= 0
41
+ @y_axis = rand(max_sp)
42
+ @y = 0
43
+ elsif (@y+@h) >= max_y
44
+ @y_axis = (rand(max_sp)*-1)
45
+ @y = max_y - @h
46
+ end
47
+ end
68
48
 
69
- class GraphicsWindow < Wx::Window
70
- # Create Needed Brushes and Pens
71
- RED_BRUSH = Wx::Brush.new
72
- GREEN_BRUSH = Wx::Brush.new
73
- BLUE_BRUSH = Wx::Brush.new
74
- RED_PEN = Wx::Pen.new
75
- GREEN_PEN = Wx::Pen.new
76
- BLUE_PEN = Wx::Pen.new
77
-
78
- # Instance Methods to keep track of toggle for corner, rect, and counter for frames per second
79
- attr_accessor :corner, :rect, :fps
80
-
81
- def initialize(parent)
82
- super(parent)
83
- # Create the font we'll use to create our pre-defined fonts for the painting
84
- @font = Wx::Font.new(32,
85
- Wx::FONTFAMILY_TELETYPE,
86
- Wx::FONTSTYLE_NORMAL,
87
- Wx::FONTWEIGHT_NORMAL)
88
- # Setup the actual data to be stored in Brushes and Pens
89
- RED_BRUSH.set_colour(Wx::RED)
90
- RED_PEN.set_colour(Wx::RED)
91
- GREEN_BRUSH.set_colour(Wx::GREEN)
92
- GREEN_PEN.set_colour(Wx::GREEN)
93
- BLUE_BRUSH.set_colour(Wx::BLUE)
94
- BLUE_PEN.set_colour(Wx::BLUE)
95
- # Create our Animation Timer
96
- @timer = Wx::Timer.new(self,1000)
97
- @fps = 0
98
- # Set it to run every 25 milliseconds, you can set this value higher, to get
99
- # higher frame rates, however, it may cause non-responsiveness of normal
100
- # gui controls.
101
- @timer.start(25)
102
- # Setup the event Handler to do the drawing on this window.
103
- evt_paint :on_paint
104
- evt_timer 1000, :animate
105
- set_background_style(Wx::BG_STYLE_PAINT)
106
- end
107
-
108
- def create_resources(gdc)
109
- # Create our Resource Class for holding the Text to be displayed
110
- @rtxt = GfxInfo.new
111
- @gtxt = GfxInfo.new
112
- @btxt = GfxInfo.new
113
- # Store our fonts, and strings into the classes
114
- @rtxt[:font] = gdc.create_font(@font,Wx::RED); @rtxt[:txt] = "This is a red string"
115
- @gtxt[:font] = gdc.create_font(@font,Wx::GREEN); @gtxt[:txt] = "This is a green string"
116
- @btxt[:font] = gdc.create_font(@font,Wx::BLUE); @btxt[:txt] = "This is a blue string"
117
- # Create the GraphicsContext resources.
118
- @rbrush = gdc.create_brush(RED_BRUSH)
119
- @gbrush = gdc.create_brush(GREEN_BRUSH)
120
- @bbrush = gdc.create_brush(BLUE_BRUSH)
121
- @rpen = gdc.create_pen(RED_PEN)
122
- @gpen = gdc.create_pen(GREEN_PEN)
123
- @bpen = gdc.create_pen(BLUE_PEN)
124
- end
125
-
126
- def get_extents(gdc)
127
- # Since we need a GDC and the text to get the extents, we do this in a
128
- # separate method, though we should be able to do it with create_resources
129
- width,height,*garbage = gdc.get_text_extent(@rtxt[:txt])
130
- @rtxt[:w] = width.to_i; @rtxt[:h] = height.to_i
131
- width,height,*garbage = gdc.get_text_extent(@gtxt[:txt])
132
- @gtxt[:w] = width.to_i; @gtxt[:h] = height.to_i
133
- width,height,*garbage = gdc.get_text_extent(@btxt[:txt])
134
- @btxt[:w] = width.to_i; @btxt[:h] = height.to_i
135
- end
136
-
137
- def setup_positions
138
- # Setup our initial positions for drawing.
139
- @rtxt[:x] = @rtxt[:y] = 0
140
- size = self.get_client_size
141
- pos_x = (size.width / 2) #- (@gtxt[:w] / 2)
142
- pos_y = (size.height / 2) #- (@gtxt[:h] / 2)
143
- @gtxt[:x] = pos_x
144
- @gtxt[:y] = pos_y
145
- @btxt[:x] = (size.width - @btxt[:w])
146
- @btxt[:y] = (size.height - @btxt[:h])
147
- end
148
-
149
- def animate
150
- # This routine manily animates the Text, which is also is handled by the
151
- # GfxInfo class as well. Mainly in #rotate and #move.
152
- rect = self.get_client_size
153
- @rtxt.move(rect.width,rect.height,8) unless @rtxt.nil?
154
- @gtxt.rotate(-0.01) unless @gtxt.nil?
155
- @btxt.move(rect.width,rect.height,5) unless @btxt.nil?
156
- # We're now ready to draw our stuff to the window
157
- refresh
49
+ def rotate(run)
50
+ @rotation += run
51
+ if @rotation > 360
52
+ @rotation = 0
53
+ end
54
+ end
55
+
56
+ def draw(gdc)
57
+ gdc.set_font(font)
58
+ gdc.draw_text(txt,x,y,rotation)
59
+ end
60
+
61
+ def [](symbol)
62
+ self.__send__(symbol,*[])
63
+ end
64
+
65
+ def []=(symbol,val)
66
+ self.__send__((symbol.to_s + "=").to_sym,*[val])
67
+ end
158
68
  end
159
-
160
- def on_paint
161
- # We do our drawing now
162
- rect = self.get_client_size
163
- paint_buffered do |paint_dc|
164
- Wx::GCDC.draw_on(paint_dc) do |gcdc|
165
- gdc = gcdc.get_graphics_context
166
- unless @rtxt
167
- create_resources(gdc)
168
- end
169
69
 
170
- gcdc.clear
171
70
 
172
- unless @rtxt[:w] != 0
173
- gdc.set_font(@rtxt[:font])
174
- get_extents(gdc)
175
- setup_positions
176
- end
177
- @rtxt.draw(gdc)
178
- @gtxt.draw(gdc)
179
- @btxt.draw(gdc)
180
- # Draw our rectangles, if they are checked
181
- 15.times do
182
- pen = gdc.create_pen(Wx::Pen.new(Wx::Colour.new(rand(256),rand(256),rand(256),rand(256))))
183
- if @corner.is_checked
184
- x = rand(rect.width)
185
- y = rand(rect.height)
186
- gdc.set_pen(pen)
187
- gdc.draw_rectangle(x,y,x,1)
188
- gdc.draw_rectangle(x,y,1,y)
71
+ class GraphicsWindow < Wx::Window
72
+ # Create Needed Brushes and Pens
73
+ RED_BRUSH = Wx::Brush.new
74
+ GREEN_BRUSH = Wx::Brush.new
75
+ BLUE_BRUSH = Wx::Brush.new
76
+ RED_PEN = Wx::Pen.new
77
+ GREEN_PEN = Wx::Pen.new
78
+ BLUE_PEN = Wx::Pen.new
79
+
80
+ # Instance Methods to keep track of toggle for corner, rect, and counter for frames per second
81
+ attr_accessor :corner, :rect, :fps
82
+
83
+ def initialize(parent)
84
+ super(parent)
85
+ # Create the font we'll use to create our pre-defined fonts for the painting
86
+ @font = Wx::Font.new(32,
87
+ Wx::FONTFAMILY_TELETYPE,
88
+ Wx::FONTSTYLE_NORMAL,
89
+ Wx::FONTWEIGHT_NORMAL)
90
+ # Setup the actual data to be stored in Brushes and Pens
91
+ RED_BRUSH.set_colour(Wx::RED)
92
+ RED_PEN.set_colour(Wx::RED)
93
+ GREEN_BRUSH.set_colour(Wx::GREEN)
94
+ GREEN_PEN.set_colour(Wx::GREEN)
95
+ BLUE_BRUSH.set_colour(Wx::BLUE)
96
+ BLUE_PEN.set_colour(Wx::BLUE)
97
+ # Create our Animation Timer
98
+ @timer = Wx::Timer.new(self,1000)
99
+ @fps = 0
100
+ # Set it to run every 25 milliseconds, you can set this value higher, to get
101
+ # higher frame rates, however, it may cause non-responsiveness of normal
102
+ # gui controls.
103
+ @timer.start(25)
104
+ # Setup the event Handler to do the drawing on this window.
105
+ evt_paint :on_paint
106
+ evt_timer 1000, :animate
107
+ set_background_style(Wx::BG_STYLE_PAINT)
108
+ end
109
+
110
+ def create_resources(gdc)
111
+ # Create our Resource Class for holding the Text to be displayed
112
+ @rtxt = GfxInfo.new
113
+ @gtxt = GfxInfo.new
114
+ @btxt = GfxInfo.new
115
+ # Store our fonts, and strings into the classes
116
+ @rtxt[:font] = gdc.create_font(@font,Wx::RED); @rtxt[:txt] = "This is a red string"
117
+ @gtxt[:font] = gdc.create_font(@font,Wx::GREEN); @gtxt[:txt] = "This is a green string"
118
+ @btxt[:font] = gdc.create_font(@font,Wx::BLUE); @btxt[:txt] = "This is a blue string"
119
+ # Create the GraphicsContext resources.
120
+ @rbrush = gdc.create_brush(RED_BRUSH)
121
+ @gbrush = gdc.create_brush(GREEN_BRUSH)
122
+ @bbrush = gdc.create_brush(BLUE_BRUSH)
123
+ @rpen = gdc.create_pen(RED_PEN)
124
+ @gpen = gdc.create_pen(GREEN_PEN)
125
+ @bpen = gdc.create_pen(BLUE_PEN)
126
+ end
127
+
128
+ def get_extents(gdc)
129
+ # Since we need a GDC and the text to get the extents, we do this in a
130
+ # separate method, though we should be able to do it with create_resources
131
+ width,height,*garbage = gdc.get_text_extent(@rtxt[:txt])
132
+ @rtxt[:w] = width.to_i; @rtxt[:h] = height.to_i
133
+ width,height,*garbage = gdc.get_text_extent(@gtxt[:txt])
134
+ @gtxt[:w] = width.to_i; @gtxt[:h] = height.to_i
135
+ width,height,*garbage = gdc.get_text_extent(@btxt[:txt])
136
+ @btxt[:w] = width.to_i; @btxt[:h] = height.to_i
137
+ end
138
+
139
+ def setup_positions
140
+ # Setup our initial positions for drawing.
141
+ @rtxt[:x] = @rtxt[:y] = 0
142
+ size = self.get_client_size
143
+ pos_x = (size.width / 2) #- (@gtxt[:w] / 2)
144
+ pos_y = (size.height / 2) #- (@gtxt[:h] / 2)
145
+ @gtxt[:x] = pos_x
146
+ @gtxt[:y] = pos_y
147
+ @btxt[:x] = (size.width - @btxt[:w])
148
+ @btxt[:y] = (size.height - @btxt[:h])
149
+ end
150
+
151
+ def animate
152
+ # This routine manily animates the Text, which is also is handled by the
153
+ # GfxInfo class as well. Mainly in #rotate and #move.
154
+ rect = self.get_client_size
155
+ @rtxt.move(rect.width,rect.height,8) unless @rtxt.nil?
156
+ @gtxt.rotate(-0.01) unless @gtxt.nil?
157
+ @btxt.move(rect.width,rect.height,5) unless @btxt.nil?
158
+ # We're now ready to draw our stuff to the window
159
+ refresh
160
+ end
161
+
162
+ def on_paint
163
+ # We do our drawing now
164
+ rect = self.get_client_size
165
+ paint_buffered do |paint_dc|
166
+ Wx::GCDC.draw_on(paint_dc) do |gcdc|
167
+ gdc = gcdc.get_graphics_context
168
+ unless @rtxt
169
+ create_resources(gdc)
170
+ end
171
+
172
+ gcdc.clear
173
+
174
+ unless @rtxt[:w] != 0
175
+ gdc.set_font(@rtxt[:font])
176
+ get_extents(gdc)
177
+ setup_positions
189
178
  end
190
- if @rect.is_checked
191
- x = rand(rect.width)
192
- y = rand(rect.height)
193
- w = rand(rect.width)
194
- h = rand(rect.height)
195
- w + x > rect.width ? (w -= x; w -= rand(150)) : 0
196
- h + y > rect.height ? (h -= y; h -= rand(150)) : 0
197
- gdc.set_pen(pen)
198
- gdc.draw_rectangle(x,y,w,h)
179
+ @rtxt.draw(gdc)
180
+ @gtxt.draw(gdc)
181
+ @btxt.draw(gdc)
182
+ # Draw our rectangles, if they are checked
183
+ 15.times do
184
+ pen = gdc.create_pen(Wx::Pen.new(Wx::Colour.new(rand(256),rand(256),rand(256),rand(256))))
185
+ if @corner.is_checked
186
+ x = rand(rect.width)
187
+ y = rand(rect.height)
188
+ gdc.set_pen(pen)
189
+ gdc.draw_rectangle(x,y,x,1)
190
+ gdc.draw_rectangle(x,y,1,y)
191
+ end
192
+ if @rect.is_checked
193
+ x = rand(rect.width)
194
+ y = rand(rect.height)
195
+ w = rand(rect.width)
196
+ h = rand(rect.height)
197
+ w + x > rect.width ? (w -= x; w -= rand(150)) : 0
198
+ h + y > rect.height ? (h -= y; h -= rand(150)) : 0
199
+ gdc.set_pen(pen)
200
+ gdc.draw_rectangle(x,y,w,h)
201
+ end
199
202
  end
200
203
  end
201
204
  end
205
+ @fps += 1
202
206
  end
203
- @fps += 1
204
207
  end
205
- end
206
208
 
207
- class GraphicsFrame < Wx::Frame
208
- def initialize
209
- super(nil, title: "Graphics Context example", size: [500,400])
209
+ class GraphicsFrame < Wx::Frame
210
+ def initialize
211
+ super(nil, title: "Graphics Context example", size: [500,400])
210
212
 
211
- @win = GraphicsWindow.new(self)
213
+ @win = GraphicsWindow.new(self)
212
214
 
213
- create_status_bar(3)
214
- status_bar.set_status_text("Frames per sec: 0", 0)
215
- @win.rect = Wx::CheckBox.new(status_bar,:label=>"Draw Rectangles")
216
- @win.corner = Wx::CheckBox.new(status_bar,:label=>"Draw Corners")
215
+ create_status_bar(3)
216
+ status_bar.set_status_text("Frames per sec: 0", 0)
217
+ @win.rect = Wx::CheckBox.new(status_bar,:label=>"Draw Rectangles")
218
+ @win.corner = Wx::CheckBox.new(status_bar,:label=>"Draw Corners")
217
219
 
218
- @fps_timer = Wx::Timer.every(1000) { fps_display }
220
+ @fps_timer = Wx::Timer.every(1000) { fps_display }
219
221
 
220
- evt_size :on_size
221
- evt_close { |evt| @fps_timer.stop; evt.skip }
222
+ evt_size :on_size
223
+ evt_close { |evt| @fps_timer.stop; evt.skip }
222
224
 
223
- centre
224
- end
225
+ centre
226
+ end
225
227
 
226
228
 
227
- # Place the two control checkboxes within the StatusBar
228
- def on_size
229
- cli_rect = self.client_rect
230
- @win.size = [cli_rect.width, cli_rect.height]
231
- rect = status_bar.field_rect(1)
232
- @win.rect.move [ rect.x + 2, rect.y + 2]
233
- @win.rect.size = [ rect.width - 4, rect.height - 4 ]
229
+ # Place the two control checkboxes within the StatusBar
230
+ def on_size
231
+ cli_rect = self.client_rect
232
+ @win.size = [cli_rect.width, cli_rect.height]
233
+ rect = status_bar.field_rect(1)
234
+ @win.rect.move [ rect.x + 2, rect.y + 2]
235
+ @win.rect.size = [ rect.width - 4, rect.height - 4 ]
234
236
 
235
- rect = status_bar.field_rect(2)
236
- @win.corner.move [ rect.x + 2, rect.y + 2]
237
- @win.corner.size = [ rect.width - 4, rect.height - 4 ]
238
- end
237
+ rect = status_bar.field_rect(2)
238
+ @win.corner.move [ rect.x + 2, rect.y + 2]
239
+ @win.corner.size = [ rect.width - 4, rect.height - 4 ]
240
+ end
239
241
 
240
- def fps_display
241
- get_status_bar.set_status_text("Frames per sec: #{@win.fps}", 0)
242
- @win.fps = 0
242
+ def fps_display
243
+ get_status_bar.set_status_text("Frames per sec: #{@win.fps}", 0)
244
+ @win.fps = 0
245
+ end
243
246
  end
247
+
244
248
  end
245
249
 
246
250
  module GraphicsSample
@@ -254,7 +258,7 @@ module GraphicsSample
254
258
  end
255
259
 
256
260
  def self.activate
257
- frame = GraphicsFrame.new
261
+ frame = GraphicsDrawing::GraphicsFrame.new
258
262
  frame.show
259
263
  frame
260
264
  end