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
@@ -28,266 +28,272 @@ require 'wx'
28
28
  # Icons are taken from the Tango Icon Theme.
29
29
  # Disabled icons are created at runtime as darkened grayscale versions.
30
30
 
31
- class RichTextFrame < Wx::Frame
31
+ module RichTextCtrl
32
32
 
33
- def initialize
34
- super( nil, :title => "RichTextCtrl Sample", :size => [900, 600] )
33
+ class RichTextFrame < Wx::Frame
35
34
 
36
- # Initialize the toolbar with standard actions
37
- initialize_toolbar
35
+ def initialize
36
+ super( nil, :title => "RichTextCtrl Sample", :size => [900, 600] )
38
37
 
39
- @editor = Wx::RichTextCtrl.new(self, :style => Wx::WANTS_CHARS)
38
+ self.icon = Wx.Icon(:sample, Wx::BITMAP_TYPE_XPM, art_path: File.join(__dir__, '..'))
40
39
 
41
- @editor.begin_text_colour(Wx::RICHTEXT_DEFAULT_FOCUS_RECT_COLOUR)
40
+ # Initialize the toolbar with standard actions
41
+ initialize_toolbar
42
42
 
43
- # Add extra handlers (plain text is automatically added)
44
- # @editor.buffer.add_handler(Wx::RichTextXMLHandler.new)
45
- # @editor.buffer.add_handler(Wx::RichTextHTMLHandler.new)
46
- Wx::RichTextBuffer.add_handler(Wx::RichTextXMLHandler.new)
47
- Wx::RichTextBuffer.add_handler(Wx::RichTextHTMLHandler.new)
48
- file_wildcard = "Text File (*.txt)|*.txt|XML File (*.xml)|*.xml"
49
- @file_open_wildcard = file_wildcard + "|All Supported File (*.*)|*.*"
50
- @file_save_wildcard = file_wildcard + "|HTML File (*.html)|*.html"
43
+ @editor = Wx::RichTextCtrl.new(self, :style => Wx::WANTS_CHARS)
51
44
 
52
- @cur_dir = Dir.getwd
53
- @cur_file = ""
54
- @cur_filter_index = 1 # XML file
45
+ @editor.begin_text_colour(Wx::RICHTEXT_DEFAULT_FOCUS_RECT_COLOUR)
55
46
 
56
- # Use the system's standard sans-serif font at 18 point
57
- @editor.font = Wx::Font.new( 18,
58
- Wx::FONTFAMILY_SWISS,
59
- Wx::FONTSTYLE_NORMAL,
60
- Wx::FONTWEIGHT_NORMAL )
47
+ # Add extra handlers (plain text is automatically added)
48
+ # @editor.buffer.add_handler(Wx::RichTextXMLHandler.new)
49
+ # @editor.buffer.add_handler(Wx::RichTextHTMLHandler.new)
50
+ Wx::RichTextBuffer.add_handler(Wx::RichTextXMLHandler.new)
51
+ Wx::RichTextBuffer.add_handler(Wx::RichTextHTMLHandler.new)
52
+ file_wildcard = "Text File (*.txt)|*.txt|XML File (*.xml)|*.xml"
53
+ @file_open_wildcard = file_wildcard + "|All Supported File (*.*)|*.*"
54
+ @file_save_wildcard = file_wildcard + "|HTML File (*.html)|*.html"
61
55
 
62
- initialize_text
56
+ @cur_dir = Dir.getwd
57
+ @cur_file = ""
58
+ @cur_filter_index = 1 # XML file
63
59
 
64
- # -- For complex event handling, use of a method call --
65
- evt_tool Wx::ID_OPEN, :open_file
66
- evt_tool Wx::ID_SAVE, :save_file
67
- evt_tool Wx::ID_PREFERENCES, :select_font
60
+ # Use the system's standard sans-serif font at 18 point
61
+ @editor.font = Wx::Font.new( 18,
62
+ Wx::FONTFAMILY_SWISS,
63
+ Wx::FONTSTYLE_NORMAL,
64
+ Wx::FONTWEIGHT_NORMAL )
68
65
 
69
- # -- For simple event handling, use of a code block --
66
+ initialize_text
70
67
 
71
- # Apply / unapply bold to selection
72
- evt_tool(Wx::ID_BOLD) do
73
- @editor.apply_bold_to_selection
74
- end
68
+ # -- For complex event handling, use of a method call --
69
+ evt_tool Wx::ID_OPEN, :open_file
70
+ evt_tool Wx::ID_SAVE, :save_file
71
+ evt_tool Wx::ID_PREFERENCES, :select_font
75
72
 
76
- # Keep the pressed / unpressed state of the button in sync with the
77
- # current selection in the text ctrl
78
- evt_update_ui(Wx::ID_BOLD) do |evt|
79
- evt.check(@editor.selection_bold?)
80
- end
73
+ # -- For simple event handling, use of a code block --
81
74
 
82
- evt_tool(Wx::ID_ITALIC) do
83
- @editor.apply_italic_to_selection
84
- end
75
+ # Apply / unapply bold to selection
76
+ evt_tool(Wx::ID_BOLD) do
77
+ @editor.apply_bold_to_selection
78
+ end
85
79
 
86
- evt_update_ui(Wx::ID_ITALIC) do |evt|
87
- evt.check(@editor.selection_italics?)
88
- end
80
+ # Keep the pressed / unpressed state of the button in sync with the
81
+ # current selection in the text ctrl
82
+ evt_update_ui(Wx::ID_BOLD) do |evt|
83
+ evt.check(@editor.selection_bold?)
84
+ end
89
85
 
90
- evt_tool(Wx::ID_UNDERLINE) do
91
- @editor.apply_underline_to_selection
92
- end
86
+ evt_tool(Wx::ID_ITALIC) do
87
+ @editor.apply_italic_to_selection
88
+ end
93
89
 
94
- evt_update_ui(Wx::ID_UNDERLINE) do |evt|
95
- evt.check(@editor.selection_underlined?)
96
- end
90
+ evt_update_ui(Wx::ID_ITALIC) do |evt|
91
+ evt.check(@editor.selection_italics?)
92
+ end
97
93
 
98
- evt_tool(Wx::ID_UNDO) do
99
- @editor.undo
100
- end
94
+ evt_tool(Wx::ID_UNDERLINE) do
95
+ @editor.apply_underline_to_selection
96
+ end
101
97
 
102
- evt_update_ui(Wx::ID_UNDO) do |evt|
103
- evt.enable(@editor.can_undo?)
104
- end
98
+ evt_update_ui(Wx::ID_UNDERLINE) do |evt|
99
+ evt.check(@editor.selection_underlined?)
100
+ end
105
101
 
106
- evt_tool(Wx::ID_REDO) do
107
- @editor.redo
108
- end
102
+ evt_tool(Wx::ID_UNDO) do
103
+ @editor.undo
104
+ end
109
105
 
110
- evt_update_ui(Wx::ID_REDO) do |evt|
111
- evt.enable(@editor.can_redo?)
112
- end
106
+ evt_update_ui(Wx::ID_UNDO) do |evt|
107
+ evt.enable(@editor.can_undo?)
108
+ end
113
109
 
114
- evt_tool(Wx::ID_COPY) do
115
- @editor.copy
116
- end
110
+ evt_tool(Wx::ID_REDO) do
111
+ @editor.redo
112
+ end
117
113
 
118
- evt_update_ui(Wx::ID_COPY) do |evt|
119
- evt.enable(@editor.can_copy?)
120
- end
114
+ evt_update_ui(Wx::ID_REDO) do |evt|
115
+ evt.enable(@editor.can_redo?)
116
+ end
121
117
 
122
- evt_tool(Wx::ID_CUT) do
123
- @editor.cut
124
- end
118
+ evt_tool(Wx::ID_COPY) do
119
+ @editor.copy
120
+ end
125
121
 
126
- evt_update_ui(Wx::ID_CUT) do |evt|
127
- evt.enable(@editor.can_cut?)
128
- end
122
+ evt_update_ui(Wx::ID_COPY) do |evt|
123
+ evt.enable(@editor.can_copy?)
124
+ end
129
125
 
130
- evt_tool(Wx::ID_PASTE) do
131
- # @editor.apply_bold_to_selection if @editor.selection_bold?
132
- # @editor.apply_italic_to_selection if @editor.selection_italics?
133
- # @editor.apply_underline_to_selection if @editor.selection_underlined?
134
- @editor.paste
135
- end
126
+ evt_tool(Wx::ID_CUT) do
127
+ @editor.cut
128
+ end
136
129
 
137
- evt_update_ui(Wx::ID_PASTE) do |evt|
138
- evt.enable(@editor.can_paste?)
139
- end
140
- # Shortcut keys for the editor
141
- accel_keys = { "Z" => Wx::ID_UNDO,
142
- "Y" => Wx::ID_REDO,
143
- "C" => Wx::ID_COPY,
144
- "X" => Wx::ID_CUT,
145
- "V" => Wx::ID_PASTE }
146
- accel_table = accel_keys.keys.map do | key |
147
- [ Wx::MOD_CMD, key, accel_keys[key] ]
148
- end
130
+ evt_update_ui(Wx::ID_CUT) do |evt|
131
+ evt.enable(@editor.can_cut?)
132
+ end
149
133
 
150
- @editor.accelerator_table = Wx::AcceleratorTable[ *accel_table ]
151
- end
134
+ evt_tool(Wx::ID_PASTE) do
135
+ # @editor.apply_bold_to_selection if @editor.selection_bold?
136
+ # @editor.apply_italic_to_selection if @editor.selection_italics?
137
+ # @editor.apply_underline_to_selection if @editor.selection_underlined?
138
+ @editor.paste
139
+ end
152
140
 
141
+ evt_update_ui(Wx::ID_PASTE) do |evt|
142
+ evt.enable(@editor.can_paste?)
143
+ end
144
+ # Shortcut keys for the editor
145
+ accel_keys = { "Z" => Wx::ID_UNDO,
146
+ "Y" => Wx::ID_REDO,
147
+ "C" => Wx::ID_COPY,
148
+ "X" => Wx::ID_CUT,
149
+ "V" => Wx::ID_PASTE }
150
+ accel_table = accel_keys.keys.map do | key |
151
+ [ Wx::MOD_CMD, key, accel_keys[key] ]
152
+ end
153
153
 
154
- # Return bitmaps corresponding to the specified PNG filename :
155
- # - the first one is the original version (e.g. for an enabled icon)
156
- # - the second one is a darkened grayscale version (e.g. for a disabled icon)
157
- def bitmaps_from_png(filename, greyscale = true)
158
- img_file = File.join( File.dirname(__FILE__), filename)
159
- normal_bmp = Wx::Bitmap.new(img_file, Wx::BITMAP_TYPE_PNG)
160
- if greyscale
161
- greyscale_img = normal_bmp.convert_to_image.convert_to_greyscale(0.2, 0.2, 0.2)
162
- greyscale_bmp = Wx::Bitmap.from_image(greyscale_img)
163
- return normal_bmp, greyscale_bmp
164
- else
165
- normal_bmp
154
+ @editor.accelerator_table = Wx::AcceleratorTable[ *accel_table ]
166
155
  end
167
- end
168
156
 
169
157
 
170
- # Return a new bitmap corresponding to the specified PNG filename
171
- def bitmap_from_png(filename)
172
- bitmaps_from_png(filename, false)
173
- end
158
+ # Return bitmaps corresponding to the specified PNG filename :
159
+ # - the first one is the original version (e.g. for an enabled icon)
160
+ # - the second one is a darkened grayscale version (e.g. for a disabled icon)
161
+ def bitmaps_from_png(filename, greyscale = true)
162
+ img_file = File.join( File.dirname(__FILE__), filename)
163
+ normal_bmp = Wx::Bitmap.new(img_file, Wx::BITMAP_TYPE_PNG)
164
+ if greyscale
165
+ greyscale_img = normal_bmp.convert_to_image.convert_to_greyscale(0.2, 0.2, 0.2)
166
+ greyscale_bmp = Wx::Bitmap.from_image(greyscale_img)
167
+ return normal_bmp, greyscale_bmp
168
+ else
169
+ normal_bmp
170
+ end
171
+ end
174
172
 
175
173
 
176
- # Initialize the toolbar
177
- #
178
- # As the toolbar contains only standard actions, use of stock/builtin IDs
179
- # to avoid keeping references to each tool item.
180
- def initialize_toolbar
181
- toolbar = create_tool_bar( Wx::TB_HORIZONTAL|Wx::NO_BORDER|
182
- Wx::TB_FLAT|Wx::TB_TEXT )
183
- toolbar.tool_bitmap_size = [ 32, 32 ]
174
+ # Return a new bitmap corresponding to the specified PNG filename
175
+ def bitmap_from_png(filename)
176
+ bitmaps_from_png(filename, false)
177
+ end
184
178
 
185
- open_bmp = bitmap_from_png("document-open.png")
186
- toolbar.add_item(open_bmp, :id => Wx::ID_OPEN,
187
- :label => "Open", :short_help => "Open file")
188
179
 
189
- save_bmp = bitmap_from_png("document-save.png")
190
- toolbar.add_item(save_bmp, :id => Wx::ID_SAVE,
191
- :label => "Save", :short_help => "Save file")
180
+ # Initialize the toolbar
181
+ #
182
+ # As the toolbar contains only standard actions, use of stock/builtin IDs
183
+ # to avoid keeping references to each tool item.
184
+ def initialize_toolbar
185
+ toolbar = create_tool_bar( Wx::TB_HORIZONTAL|Wx::NO_BORDER|
186
+ Wx::TB_FLAT|Wx::TB_TEXT )
187
+ toolbar.tool_bitmap_size = [ 32, 32 ]
192
188
 
193
- font_bmp = bitmap_from_png("preferences-desktop-font.png")
194
- toolbar.add_item(font_bmp, :id => Wx::ID_PREFERENCES,
195
- :label => "Font", :short_help => "Select font preferences")
189
+ open_bmp = bitmap_from_png("document-open.png")
190
+ toolbar.add_item(open_bmp, :id => Wx::ID_OPEN,
191
+ :label => "Open", :short_help => "Open file")
196
192
 
197
- toolbar.add_separator
193
+ save_bmp = bitmap_from_png("document-save.png")
194
+ toolbar.add_item(save_bmp, :id => Wx::ID_SAVE,
195
+ :label => "Save", :short_help => "Save file")
198
196
 
199
- copy_bmp, copy_disabled_bmp = bitmaps_from_png("edit-copy.png")
200
- toolbar.add_item(copy_bmp, copy_disabled_bmp, :id => Wx::ID_COPY,
201
- :label => "Copy", :short_help => "Copy selection (CMD+C)")
197
+ font_bmp = bitmap_from_png("preferences-desktop-font.png")
198
+ toolbar.add_item(font_bmp, :id => Wx::ID_PREFERENCES,
199
+ :label => "Font", :short_help => "Select font preferences")
202
200
 
203
- cut_bmp, cut_disabled_bmp = bitmaps_from_png("edit-cut.png")
204
- toolbar.add_item(cut_bmp, cut_disabled_bmp, :id => Wx::ID_CUT,
205
- :label => "Cut", :short_help => "Cut selection (CMD+X)")
201
+ toolbar.add_separator
206
202
 
207
- paste_bmp, paste_disabled_bmp = bitmaps_from_png("edit-paste.png")
208
- toolbar.add_item(paste_bmp, paste_disabled_bmp, :id => Wx::ID_PASTE,
209
- :label => "Paste", :short_help => "Paste clipboard (CMD+V)")
203
+ copy_bmp, copy_disabled_bmp = bitmaps_from_png("edit-copy.png")
204
+ toolbar.add_item(copy_bmp, copy_disabled_bmp, :id => Wx::ID_COPY,
205
+ :label => "Copy", :short_help => "Copy selection (CMD+C)")
210
206
 
211
- undo_bmp, undo_disabled_bmp = bitmaps_from_png("edit-undo.png")
212
- toolbar.add_item(undo_bmp, undo_disabled_bmp, :id => Wx::ID_UNDO,
213
- :label => "Undo", :short_help => "Undo change (CMD+Z)")
207
+ cut_bmp, cut_disabled_bmp = bitmaps_from_png("edit-cut.png")
208
+ toolbar.add_item(cut_bmp, cut_disabled_bmp, :id => Wx::ID_CUT,
209
+ :label => "Cut", :short_help => "Cut selection (CMD+X)")
214
210
 
215
- redo_bmp, redo_disabled_bmp = bitmaps_from_png("edit-redo.png")
216
- toolbar.add_item(redo_bmp, redo_disabled_bmp, :id => Wx::ID_REDO,
217
- :label => "Redo", :short_help => "Redo change (CMD+Y)")
211
+ paste_bmp, paste_disabled_bmp = bitmaps_from_png("edit-paste.png")
212
+ toolbar.add_item(paste_bmp, paste_disabled_bmp, :id => Wx::ID_PASTE,
213
+ :label => "Paste", :short_help => "Paste clipboard (CMD+V)")
218
214
 
219
- toolbar.add_separator
215
+ undo_bmp, undo_disabled_bmp = bitmaps_from_png("edit-undo.png")
216
+ toolbar.add_item(undo_bmp, undo_disabled_bmp, :id => Wx::ID_UNDO,
217
+ :label => "Undo", :short_help => "Undo change (CMD+Z)")
220
218
 
221
- bold_bmp = bitmap_from_png("format-text-bold.png")
222
- toolbar.add_item(bold_bmp, :id => Wx::ID_BOLD, :kind => Wx::ITEM_CHECK,
223
- :label => "Bold", :short_help => "Apply bold")
219
+ redo_bmp, redo_disabled_bmp = bitmaps_from_png("edit-redo.png")
220
+ toolbar.add_item(redo_bmp, redo_disabled_bmp, :id => Wx::ID_REDO,
221
+ :label => "Redo", :short_help => "Redo change (CMD+Y)")
224
222
 
225
- italic_bmp = bitmap_from_png("format-text-italic.png")
226
- toolbar.add_item(italic_bmp, :id => Wx::ID_ITALIC, :kind => Wx::ITEM_CHECK,
227
- :label => "Italic", :short_help => "Apply italic")
223
+ toolbar.add_separator
228
224
 
229
- underline_bmp = bitmap_from_png("format-text-underline.png")
230
- toolbar.add_item(underline_bmp, :id => Wx::ID_UNDERLINE, :kind => Wx::ITEM_CHECK,
231
- :label => "Underline", :short_help => "Apply underline")
232
-
233
- toolbar.realize
234
- end
225
+ bold_bmp = bitmap_from_png("format-text-bold.png")
226
+ toolbar.add_item(bold_bmp, :id => Wx::ID_BOLD, :kind => Wx::ITEM_CHECK,
227
+ :label => "Bold", :short_help => "Apply bold")
235
228
 
236
- def initialize_text
237
- @editor.begin_suppress_undo
238
- @editor.begin_bold
239
- @editor.write_text "Simple RichTextCtrl sample"
240
- @editor.end_bold
241
- @editor.newline
242
- @editor.begin_italic
243
- @editor.write_text "Use the formatting buttons then type some text or "
244
- @editor.write_text "select some text and use the buttons to apply the formatting.\n"
245
- @editor.write_text "Save as an XML file in order to keep the text formatting.\n"
246
- @editor.end_italic
247
- @editor.newline
248
- @editor.end_suppress_undo
249
- end
229
+ italic_bmp = bitmap_from_png("format-text-italic.png")
230
+ toolbar.add_item(italic_bmp, :id => Wx::ID_ITALIC, :kind => Wx::ITEM_CHECK,
231
+ :label => "Italic", :short_help => "Apply italic")
232
+
233
+ underline_bmp = bitmap_from_png("format-text-underline.png")
234
+ toolbar.add_item(underline_bmp, :id => Wx::ID_UNDERLINE, :kind => Wx::ITEM_CHECK,
235
+ :label => "Underline", :short_help => "Apply underline")
250
236
 
251
- def select_font
252
- data = Wx::FontData.new
253
- data.initial_font = @editor.font
254
- # data.enable_effects(false)
237
+ toolbar.realize
238
+ end
239
+
240
+ def initialize_text
241
+ @editor.begin_suppress_undo
242
+ @editor.begin_bold
243
+ @editor.write_text "Simple RichTextCtrl sample"
244
+ @editor.end_bold
245
+ @editor.newline
246
+ @editor.begin_italic
247
+ @editor.write_text "Use the formatting buttons then type some text or "
248
+ @editor.write_text "select some text and use the buttons to apply the formatting.\n"
249
+ @editor.write_text "Save as an XML file in order to keep the text formatting.\n"
250
+ @editor.end_italic
251
+ @editor.newline
252
+ @editor.end_suppress_undo
253
+ end
255
254
 
256
- Wx::FontDialog(self, data) do |dlg|
257
- if dlg.show_modal == Wx::ID_OK
258
- data = dlg.font_data
259
- @editor.font = data.chosen_font
255
+ def select_font
256
+ data = Wx::FontData.new
257
+ data.initial_font = @editor.font
258
+ # data.enable_effects(false)
259
+
260
+ Wx::FontDialog(self, data) do |dlg|
261
+ if dlg.show_modal == Wx::ID_OK
262
+ data = dlg.font_data
263
+ @editor.font = data.chosen_font
264
+ end
260
265
  end
261
266
  end
262
- end
263
267
 
264
- def open_file
265
- Wx::FileDialog(self, "Open file", @cur_dir, @cur_file, @file_open_wildcard, Wx::FD_OPEN) do |dlg|
266
- dlg.filter_index = @cur_filter_index
267
- if dlg.show_modal == Wx::ID_OK
268
- @editor.load_file(dlg.path, Wx::RICHTEXT_TYPE_ANY)
269
- update_from_file dlg
268
+ def open_file
269
+ Wx::FileDialog(self, "Open file", @cur_dir, @cur_file, @file_open_wildcard, Wx::FD_OPEN) do |dlg|
270
+ dlg.filter_index = @cur_filter_index
271
+ if dlg.show_modal == Wx::ID_OK
272
+ @editor.load_file(dlg.path, Wx::RICHTEXT_TYPE_ANY)
273
+ update_from_file dlg
274
+ end
270
275
  end
271
276
  end
272
- end
273
277
 
274
- def save_file
275
- Wx::FileDialog(self, "Save file as...", @cur_dir, @cur_file, @file_save_wildcard, Wx::FD_SAVE) do |dlg|
276
- dlg.filter_index = @cur_filter_index
277
- if dlg.show_modal == Wx::ID_OK
278
- @editor.save_file(dlg.path, Wx::RICHTEXT_TYPE_ANY)
279
- update_from_file dlg
278
+ def save_file
279
+ Wx::FileDialog(self, "Save file as...", @cur_dir, @cur_file, @file_save_wildcard, Wx::FD_SAVE) do |dlg|
280
+ dlg.filter_index = @cur_filter_index
281
+ if dlg.show_modal == Wx::ID_OK
282
+ @editor.save_file(dlg.path, Wx::RICHTEXT_TYPE_ANY)
283
+ update_from_file dlg
284
+ end
280
285
  end
281
286
  end
282
- end
283
287
 
284
- # Update current file parameters
285
- def update_from_file dlg
286
- @cur_dir = dlg.directory
287
- @cur_file = dlg.filename
288
- @cur_filter_index = dlg.filter_index
289
- self.title = "RichTextCtrl Sample - #{@cur_file}"
288
+ # Update current file parameters
289
+ def update_from_file dlg
290
+ @cur_dir = dlg.directory
291
+ @cur_file = dlg.filename
292
+ @cur_filter_index = dlg.filter_index
293
+ self.title = "RichTextCtrl Sample - #{@cur_file}"
294
+ end
290
295
  end
296
+
291
297
  end
292
298
 
293
299
  module RichTextSample
@@ -315,7 +321,7 @@ module RichTextSample
315
321
  end
316
322
 
317
323
  def self.activate
318
- frame = RichTextFrame.new
324
+ frame = RichTextCtrl::RichTextFrame.new
319
325
  frame.centre
320
326
  frame.show
321
327
  frame