RubyGems - wxruby3 - Versions diffs - 0.9.2 → 0.9.4 - Mend

wxruby3 0.9.2 → 0.9.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (379) hide show

checksums.yaml +4 -4
data/INSTALL.md +35 -29
data/README.md +24 -15
data/ext/wxruby3/include/wxruby-ClientData.h +48 -0
data/ext/wxruby3/include/wxruby-Config.h +23 -5
data/ext/wxruby3/include/wxruby-Persistence.h +79 -0
data/ext/wxruby3/include/wxruby-Validator.h +39 -0
data/ext/wxruby3/include/wxruby-ValidatorBinding.h +64 -0
data/ext/wxruby3/swig/custom/director.swg +8 -0
data/ext/wxruby3/swig/mark_free_impl.i +0 -33
data/ext/wxruby3/swig/memory_management.i +6 -0
data/lib/wx/core/bitmap_combobox.rb +17 -21
data/lib/wx/core/book_ctrl_base.rb +16 -0
data/lib/wx/core/combobox.rb +13 -3
data/lib/wx/core/config.rb +454 -83
data/lib/wx/core/controlwithitems.rb +40 -130
data/lib/wx/core/enum.rb +17 -1
data/lib/wx/core/event.rb +6 -1
data/lib/wx/core/evthandler.rb +8 -2
data/lib/wx/core/generic_validator.rb +312 -0
data/lib/wx/core/listbox.rb +2 -2
data/lib/wx/core/log.rb +1 -1
data/lib/wx/core/notebook.rb +10 -8
data/lib/wx/core/owner_drawn_combobox.rb +45 -0
data/lib/wx/core/peristent_object.rb +15 -0
data/lib/wx/core/persistence_manager.rb +39 -0
data/lib/wx/core/persistent_window.rb +16 -0
data/lib/wx/core/size.rb +4 -0
data/lib/wx/core/sizer.rb +1 -2
data/lib/wx/core/standard_paths.rb +22 -0
data/lib/wx/core/text_entry.rb +4 -1
data/lib/wx/core/top_level_window.rb +16 -0
data/lib/wx/core/treebook.rb +18 -0
data/lib/wx/core/validator.rb +70 -5
data/lib/wx/core/window.rb +3 -7
data/lib/wx/core.rb +4 -0
data/lib/wx/doc/art_locator.rb +1 -0
data/lib/wx/doc/book_ctrl_base.rb +19 -0
data/lib/wx/doc/comboctrl.rb +18 -0
data/lib/wx/doc/config.rb +101 -41
data/lib/wx/doc/controlwithitems.rb +16 -0
data/lib/wx/doc/date_picker_ctrl.rb +23 -0
data/lib/wx/doc/editable_listbox.rb +44 -0
data/lib/wx/doc/enum.rb +15 -0
data/lib/wx/doc/event.rb +12 -0
data/lib/wx/doc/extra/12_client_data.md +89 -0
data/lib/wx/doc/extra/13_validators.md +139 -0
data/lib/wx/doc/extra/14_config.md +101 -0
data/lib/wx/doc/extra/15_persistence.md +148 -0
data/lib/wx/doc/gdi_common.rb +4 -0
data/lib/wx/doc/generic_validator.rb +95 -0
data/lib/wx/doc/html/simple_html_listbox.rb +22 -0
data/lib/wx/doc/num_validator.rb +387 -0
data/lib/wx/doc/owner_drawn_combobox.rb +96 -0
data/lib/wx/doc/persistence_manager.rb +36 -0
data/lib/wx/doc/persistent_object.rb +27 -0
data/lib/wx/doc/pg/numeric_property_validator.rb +33 -0
data/lib/wx/doc/static_bitmap.rb +25 -0
data/lib/wx/doc/text_validator.rb +10 -0
data/lib/wx/doc/top_level_window.rb +19 -0
data/lib/wx/doc/treebook.rb +6 -1
data/lib/wx/doc/validator.rb +113 -0
data/lib/wx/doc/window.rb +30 -0
data/lib/wx/html/simple_html_listbox.rb +24 -91
data/lib/wx/keyword_defs.rb +34 -2
data/lib/wx/rbn/ribbon_gallery.rb +0 -21
data/lib/wx/version.rb +1 -1
data/rakelib/build.rb +1 -1
data/rakelib/lib/config/mingw.rb +12 -0
data/rakelib/lib/core/include/client_data.inc +65 -0
data/rakelib/lib/core/include/funcall.inc +1 -1
data/rakelib/lib/core/package.rb +39 -3
data/rakelib/lib/core/parameter.rb +1 -1
data/rakelib/lib/core/spec.rb +10 -0
data/rakelib/lib/core/spec_helper.rb +8 -2
data/rakelib/lib/director/app.rb +18 -0
data/rakelib/lib/director/app_traits.rb +3 -1
data/rakelib/lib/director/bitmap_combobox.rb +2 -2
data/rakelib/lib/director/combobox.rb +22 -0
data/rakelib/lib/director/comboctrl.rb +1 -55
data/rakelib/lib/director/config_base.rb +490 -19
data/rakelib/lib/director/ctrl_with_items.rb +88 -21
data/rakelib/lib/director/date_picker_ctrl.rb +8 -6
data/rakelib/lib/director/editable_listbox.rb +30 -0
data/rakelib/lib/director/event.rb +102 -12
data/rakelib/lib/director/event_filter.rb +1 -1
data/rakelib/lib/director/event_handler.rb +3 -2
data/rakelib/lib/director/event_loop.rb +1 -1
data/rakelib/lib/director/file_dialog_customize_hook.rb +2 -2
data/rakelib/lib/director/functions.rb +4 -2
data/rakelib/lib/director/generic_dirctrl.rb +17 -0
data/rakelib/lib/director/grid_cell_attr.rb +1 -3
data/rakelib/lib/director/grid_cell_editor.rb +1 -3
data/rakelib/lib/director/grid_cell_renderer.rb +1 -3
data/rakelib/lib/director/header_ctrl.rb +9 -1
data/rakelib/lib/director/html_listbox.rb +97 -22
data/rakelib/lib/director/num_validator.rb +495 -0
data/rakelib/lib/director/numeric_property_validator.rb +131 -6
data/rakelib/lib/director/owner_drawn_combobox.rb +192 -0
data/rakelib/lib/director/persistence_manager.rb +410 -0
data/rakelib/lib/director/persistent_object.rb +70 -0
data/rakelib/lib/director/persistent_window.rb +73 -0
data/rakelib/lib/director/pgproperty.rb +3 -29
data/rakelib/lib/director/ribbon_button_bar.rb +3 -3
data/rakelib/lib/director/ribbon_gallery.rb +3 -5
data/rakelib/lib/director/sizer.rb +15 -4
data/rakelib/lib/director/sizer_item.rb +13 -0
data/rakelib/lib/director/static_bitmap.rb +32 -0
data/rakelib/lib/director/text_entry.rb +5 -1
data/rakelib/lib/director/text_validator.rb +124 -13
data/rakelib/lib/director/toggle_button.rb +1 -0
data/rakelib/lib/director/top_level_window.rb +0 -2
data/rakelib/lib/director/tree_ctrl.rb +35 -0
data/rakelib/lib/director/utils.rb +16 -2
data/rakelib/lib/director/validator.rb +196 -21
data/rakelib/lib/director/window.rb +16 -2
data/rakelib/lib/extractor/function.rb +2 -1
data/rakelib/lib/generate/analyzer.rb +44 -44
data/rakelib/lib/generate/doc.rb +11 -5
data/rakelib/lib/specs/interfaces.rb +5 -0
data/rakelib/lib/swig_runner.rb +55 -9
data/rakelib/lib/typemap/client_data.rb +67 -0
data/rakelib/lib/typemap/common.rb +3 -3
data/rakelib/lib/typemap/config.rb +8 -0
data/rakelib/lib/typemap/datetime.rb +1 -1
data/rakelib/lib/typemap/tree_itemid.rb +2 -2
data/samples/aui/aui.rb +1237 -1233
data/samples/calendar/calendar.rb +293 -289
data/samples/controls/get_item_sample.rb +83 -79
data/samples/controls/htlbox.rb +331 -327
data/samples/dialogs/dialogs.rb +682 -694
data/samples/dialogs/wizard.rb +52 -55
data/samples/dragdrop/dragdrop.rb +146 -142
data/samples/drawing/bitmap.rb +29 -26
data/samples/drawing/bitmap_image.rb +84 -80
data/samples/drawing/graphics_drawing.rb +209 -205
data/samples/drawing/image_prt.rb +344 -340
data/samples/drawing/maths_images.rb +18 -1
data/samples/drawing/rmagic_bitmap_image.rb +88 -84
data/samples/etc/caret.rb +306 -0
data/samples/etc/miniframe.rb +65 -60
data/samples/etc/sash.rb +109 -105
data/samples/etc/scrollwin.rb +86 -80
data/samples/etc/system_settings.rb +216 -209
data/samples/event/activation.rb +72 -67
data/samples/event/event.rb +160 -153
data/samples/event/threaded.rb +8 -1
data/samples/event/update_ui_event.rb +67 -60
data/samples/grid/grid.rb +188 -181
data/samples/grid/gridtablebase.rb +136 -129
data/samples/html/html.rb +208 -204
data/samples/mdi/mdi.rb +59 -54
data/samples/minimal/minimal.rb +54 -51
data/samples/minimal/nothing.rb +1 -0
data/samples/printing/printing.rb +367 -377
data/samples/printing/printing2.rb +203 -198
data/samples/propgrid/propgrid.rb +2312 -2308
data/samples/propgrid/propgrid_minimal.rb +57 -50
data/samples/ribbon/ribbon.rb +780 -774
data/samples/sampler/ext.rb +0 -33
data/samples/sampler/sample.rb +4 -9
data/samples/sampler.rb +1 -1
data/samples/splash/splash.rb +118 -116
data/samples/text/rich_textctrl.rb +207 -201
data/samples/text/richtext.rb +1409 -1405
data/samples/text/scintilla.rb +137 -128
data/samples/text/textctrl.rb +89 -83
data/samples/text/unicode.rb +175 -168
data/samples/treectrl/treectrl.rb +1430 -1426
data/samples/widgets/activityindicator.rb +95 -0
data/samples/widgets/art/widgets/activityindicator.xpm +278 -0
data/samples/widgets/art/widgets/bmpbtn.xpm +37 -0
data/samples/widgets/art/widgets/bmpcombobox.xpm +54 -0
data/samples/widgets/art/widgets/button.xpm +54 -0
data/samples/widgets/art/widgets/checkbox.xpm +54 -0
data/samples/{bigdemo/icons → widgets/art/widgets}/choice.xpm +1 -1
data/samples/widgets/art/widgets/choicebk.xpm +54 -0
data/samples/widgets/art/widgets/clrpicker.xpm +193 -0
data/samples/widgets/art/widgets/combobox.xpm +54 -0
data/samples/widgets/art/widgets/datepick.xpm +200 -0
data/samples/widgets/art/widgets/dirctrl.xpm +54 -0
data/samples/widgets/art/widgets/dirpicker.xpm +213 -0
data/samples/widgets/art/widgets/filepicker.xpm +214 -0
data/samples/widgets/art/widgets/fontpicker.xpm +185 -0
data/samples/widgets/art/widgets/gauge.xpm +54 -0
data/samples/widgets/art/widgets/header.xpm +54 -0
data/samples/widgets/art/widgets/hyperlnk.xpm +54 -0
data/samples/widgets/art/widgets/listbook.xpm +54 -0
data/samples/widgets/art/widgets/listbox.xpm +54 -0
data/samples/widgets/art/widgets/native.xpm +81 -0
data/samples/widgets/art/widgets/notebook.xpm +54 -0
data/samples/widgets/art/widgets/odcombobox.xpm +54 -0
data/samples/widgets/art/widgets/radiobox.xpm +54 -0
data/samples/widgets/art/widgets/scrolbar.xpm +54 -0
data/samples/widgets/art/widgets/slider.xpm +54 -0
data/samples/widgets/art/widgets/spinbtn.xpm +40 -0
data/samples/widgets/art/widgets/statbmp.xpm +40 -0
data/samples/widgets/art/widgets/statbox.xpm +54 -0
data/samples/widgets/art/widgets/stattext.xpm +54 -0
data/samples/widgets/art/widgets/text.xpm +54 -0
data/samples/widgets/art/widgets/timepick.xpm +207 -0
data/samples/widgets/art/widgets/toggle.xpm +54 -0
data/samples/widgets/art/widgets/toucan.png +0 -0
data/samples/widgets/bmpcombobox.rb +651 -0
data/samples/widgets/button.rb +462 -0
data/samples/widgets/checkbox.rb +211 -0
data/samples/widgets/choice.rb +287 -0
data/samples/widgets/clrpicker.rb +156 -0
data/samples/widgets/combobox.rb +516 -0
data/samples/widgets/datepick.rb +215 -0
data/samples/widgets/dirctrl.rb +265 -0
data/samples/widgets/dirpicker.rb +158 -0
data/samples/widgets/editlbox.rb +122 -0
data/samples/widgets/filectrl.rb +216 -0
data/samples/widgets/filepicker.rb +214 -0
data/samples/widgets/fontpicker.rb +135 -0
data/samples/widgets/gauge.rb +311 -0
data/samples/widgets/headerctrl.rb +236 -0
data/samples/widgets/hyperlink.rb +203 -0
data/samples/widgets/itemcontainer.rb +185 -0
data/samples/widgets/listbox.rb +473 -0
data/samples/widgets/notebook.rb +488 -0
data/samples/widgets/odcombobox.rb +608 -0
data/samples/widgets/radiobox.rb +328 -0
data/samples/widgets/searchctrl.rb +159 -0
data/samples/widgets/slider.rb +594 -0
data/samples/widgets/spinbtn.rb +443 -0
data/samples/widgets/statbmp.rb +130 -0
data/samples/widgets/static.rb +436 -0
data/samples/widgets/textctrl.rb +700 -0
data/samples/widgets/timepick.rb +148 -0
data/samples/widgets/tn_widgets.png +0 -0
data/samples/widgets/toggle.rb +385 -0
data/samples/widgets/widgets.rb +1229 -0
data/samples/xrc/custom_xrc_sample.rb +47 -41
data/samples/xrc/xrc_sample.rb +53 -47
data/tests/test_config.rb +207 -42
data/tests/test_event_handling.rb +52 -34
data/tests/test_events.rb +7 -0
data/tests/test_item_data.rb +24 -0
data/tests/test_persistence.rb +142 -0
data/tests/test_sizer.rb +44 -1
data/tests/test_validators.rb +805 -0
metadata +109 -138
data/lib/wx/core/choice.rb +0 -14
data/lib/wx/core/combo_ctrl.rb +0 -110
data/rakelib/lib/typemap/grid_client_data.rb +0 -58
data/samples/bigdemo/About.rbw +0 -39
data/samples/bigdemo/ColorPanel.rbw +0 -23
data/samples/bigdemo/GridSimple.rbw +0 -78
data/samples/bigdemo/MDIDemo.rbw +0 -57
data/samples/bigdemo/PopupMenu.rbw +0 -146
data/samples/bigdemo/ShapedWindow.rbw +0 -128
data/samples/bigdemo/Sizers.rbw +0 -541
data/samples/bigdemo/bigdemo.rb +0 -817
data/samples/bigdemo/demoTemplate.rbw +0 -33
data/samples/bigdemo/helpfile.htb +0 -0
data/samples/bigdemo/icons/Test 015.jpg +0 -0
data/samples/bigdemo/icons/Test 015.png +0 -0
data/samples/bigdemo/icons/choice.bmp +0 -0
data/samples/bigdemo/icons/combo.bmp +0 -0
data/samples/bigdemo/icons/combo.xpm +0 -27
data/samples/bigdemo/icons/copy.xpm +0 -25
data/samples/bigdemo/icons/cut.xpm +0 -24
data/samples/bigdemo/icons/gauge.bmp +0 -0
data/samples/bigdemo/icons/gauge.xpm +0 -27
data/samples/bigdemo/icons/help.xpm +0 -25
data/samples/bigdemo/icons/list.bmp +0 -0
data/samples/bigdemo/icons/list.xpm +0 -27
data/samples/bigdemo/icons/mondrian.ico +0 -0
data/samples/bigdemo/icons/mondrian.xpm +0 -44
data/samples/bigdemo/icons/new.xpm +0 -24
data/samples/bigdemo/icons/ogl.ico +0 -0
data/samples/bigdemo/icons/ogl.xpm +0 -45
data/samples/bigdemo/icons/open.xpm +0 -26
data/samples/bigdemo/icons/paste.bmp +0 -0
data/samples/bigdemo/icons/paste.xpm +0 -38
data/samples/bigdemo/icons/pointy.png +0 -0
data/samples/bigdemo/icons/preview.xpm +0 -26
data/samples/bigdemo/icons/print.xpm +0 -26
data/samples/bigdemo/icons/radio.bmp +0 -0
data/samples/bigdemo/icons/radio.xpm +0 -27
data/samples/bigdemo/icons/robert.xpm +0 -415
data/samples/bigdemo/icons/sashtest.ico +0 -0
data/samples/bigdemo/icons/save.xpm +0 -25
data/samples/bigdemo/icons/smiles.bmp +0 -0
data/samples/bigdemo/icons/smiles.xpm +0 -39
data/samples/bigdemo/icons/smiley.ico +0 -0
data/samples/bigdemo/icons/smiley.xpm +0 -42
data/samples/bigdemo/icons/stattext.xpm +0 -24
data/samples/bigdemo/icons/test2.bmp +0 -0
data/samples/bigdemo/icons/test2.png +0 -0
data/samples/bigdemo/icons/test2.xpm +0 -79
data/samples/bigdemo/icons/text.bmp +0 -0
data/samples/bigdemo/icons/text.xpm +0 -27
data/samples/bigdemo/icons/tog1.bmp +0 -0
data/samples/bigdemo/icons/tog1.xpm +0 -38
data/samples/bigdemo/icons/tog2.bmp +0 -0
data/samples/bigdemo/icons/tog2.xpm +0 -38
data/samples/bigdemo/icons/wxruby-128x128.png +0 -0
data/samples/bigdemo/icons/wxwin.ico +0 -0
data/samples/bigdemo/icons/wxwin16x16.png +0 -0
data/samples/bigdemo/icons/wxwin16x16.xpm +0 -25
data/samples/bigdemo/icons/wxwin32x32.png +0 -0
data/samples/bigdemo/icons/wxwin48x48.png +0 -0
data/samples/bigdemo/run.rb +0 -98
data/samples/bigdemo/tips.txt +0 -7
data/samples/bigdemo/utils.rb +0 -20
data/samples/bigdemo/wxArtProvider.rbw +0 -282
data/samples/bigdemo/wxBitmapButton.rbw +0 -65
data/samples/bigdemo/wxButton.rbw +0 -64
data/samples/bigdemo/wxCalendarCtrl.rbw +0 -59
data/samples/bigdemo/wxCheckBox.rbw +0 -50
data/samples/bigdemo/wxCheckListBox.rbw +0 -65
data/samples/bigdemo/wxChoice.rbw +0 -47
data/samples/bigdemo/wxChoicebook.rbw +0 -78
data/samples/bigdemo/wxColourDialog.rbw +0 -33
data/samples/bigdemo/wxComboBox.rbw +0 -77
data/samples/bigdemo/wxCursor.rbw +0 -136
data/samples/bigdemo/wxDialog.rbw +0 -74
data/samples/bigdemo/wxDirDialog.rbw +0 -29
data/samples/bigdemo/wxDragImage.rbw +0 -70
data/samples/bigdemo/wxFileDialog.rbw +0 -37
data/samples/bigdemo/wxFileDialog_Save.rbw +0 -35
data/samples/bigdemo/wxFindReplaceDialog.rbw +0 -82
data/samples/bigdemo/wxFontDialog.rbw +0 -200
data/samples/bigdemo/wxFrame.rbw +0 -53
data/samples/bigdemo/wxGauge.rbw +0 -65
data/samples/bigdemo/wxGenericDirCtrl.rbw +0 -74
data/samples/bigdemo/wxGrid.rbw +0 -66
data/samples/bigdemo/wxHtmlHelpController.rbw +0 -52
data/samples/bigdemo/wxListBox.rbw +0 -140
data/samples/bigdemo/wxListCtrl_virtual.rbw +0 -112
data/samples/bigdemo/wxMDIWindows.rbw +0 -50
data/samples/bigdemo/wxMenu.rbw +0 -247
data/samples/bigdemo/wxMessageDialog.rbw +0 -27
data/samples/bigdemo/wxMiniFrame.rbw +0 -70
data/samples/bigdemo/wxMultipleChoiceDialog.rbw +0 -29
data/samples/bigdemo/wxNotebook.rbw +0 -136
data/samples/bigdemo/wxProgressDialog.rbw +0 -43
data/samples/bigdemo/wxRadioBox.rbw +0 -72
data/samples/bigdemo/wxRadioButton.rbw +0 -125
data/samples/bigdemo/wxSashWindow.rbw +0 -141
data/samples/bigdemo/wxScrolledMessageDialog.rbw +0 -57
data/samples/bigdemo/wxScrolledWindow.rbw +0 -199
data/samples/bigdemo/wxSingleChoiceDialog.rbw +0 -33
data/samples/bigdemo/wxSlider.rbw +0 -42
data/samples/bigdemo/wxSpinButton.rbw +0 -50
data/samples/bigdemo/wxSpinCtrl.rbw +0 -51
data/samples/bigdemo/wxSplitterWindow.rbw +0 -63
data/samples/bigdemo/wxStaticBitmap.rbw +0 -47
data/samples/bigdemo/wxStaticText.rbw +0 -55
data/samples/bigdemo/wxStatusBar.rbw +0 -126
data/samples/bigdemo/wxTextCtrl.rbw +0 -149
data/samples/bigdemo/wxTextEntryDialog.rbw +0 -31
data/samples/bigdemo/wxToggleButton.rbw +0 -49
data/samples/bigdemo/wxToolBar.rbw +0 -131
data/samples/bigdemo/wxTreeCtrl.rbw +0 -191
data/samples/caret/caret.rb +0 -298
data/samples/caret/mondrian.xpm +0 -44
data/samples/controls/books.rb +0 -189
data/samples/controls/choice.xpm +0 -27
data/samples/controls/combo.xpm +0 -27
data/samples/controls/controls.rb +0 -1099
data/samples/controls/gauge.xpm +0 -27
data/samples/controls/list.xpm +0 -27
data/samples/controls/mondrian.ico +0 -0
data/samples/controls/mondrian.xpm +0 -44
data/samples/controls/radio.xpm +0 -27
data/samples/controls/stattext.xpm +0 -24
data/samples/controls/test2.bmp +0 -0
data/samples/controls/text.xpm +0 -27
data/samples/controls/tn_books.png +0 -0
data/samples/controls/tn_controls.png +0 -0
data/samples/etc/choice.rb +0 -87
data/samples/etc/tn_choice.png +0 -0
data/samples/text/mondrian.ico +0 -0
data/samples/text/mondrian.xpm +0 -44
/data/samples/{caret → etc}/tn_caret.png +0 -0

data/samples/html/html.rb CHANGED Viewed

@@ -14,252 +14,256 @@ require 'wx'
 require 'net/http'
 require 'uri'
-ID_PageOpen,
-  ID_DefaultLocalBrowser,
-  ID_DefaultWebBrowser,
-  ID_Back,
-  ID_Forward,
-  ID_Processor,
-  ID_DrawCustomBg = (Wx::ID_HIGHEST..Wx::ID_HIGHEST+7).to_a
-class MyHtmlFilter < Wx::HTML::HtmlFilter
-  def can_read(fsfile)
-    return /\.foobar\Z/ =~ fsfile.location
-  end
+module Html
-  def read_file(fsfile)
-    uri = URI.parse(fsfile.location)
-    if uri.scheme == 'file' && File.exist?(uri.path)
-      return File.read(uri.path)
-    else
-      "<html><body><b>Cannot locate #{fsfile.location}</b></body></html>"
-    end
-  end
-end
+  ID_PageOpen,
+    ID_DefaultLocalBrowser,
+    ID_DefaultWebBrowser,
+    ID_Back,
+    ID_Forward,
+    ID_Processor,
+    ID_DrawCustomBg = (Wx::ID_HIGHEST..Wx::ID_HIGHEST+7).to_a
-class MyHtmlWindow < Wx::HTML::HtmlWindow
-  BLUE_PEN = Wx::Pen.new
-  attr_reader :html_src
-  def initialize(*args)
-    super
-    @draw_custom_bg = false
-    evt_erase_background :on_erase_bg_event
-    BLUE_PEN.set_colour(Wx::BLUE)
-  end
+  class MyHtmlFilter < Wx::HTML::HtmlFilter
+    def can_read(fsfile)
+      return /\.foobar\Z/ =~ fsfile.location
+    end
-  def draw_custom_bg(val)
-    @draw_custom_bg = !!val
-    refresh
+    def read_file(fsfile)
+      uri = URI.parse(fsfile.location)
+      if uri.scheme == 'file' && File.exist?(uri.path)
+        return File.read(uri.path)
+      else
+        "<html><body><b>Cannot locate #{fsfile.location}</b></body></html>"
+      end
+    end
   end
-  def on_opening_url(_type, url)
-    related_frame.set_status_text(url + " lately opened", 1)
-    Wx::HTML_OPEN
-  end
+  class MyHtmlWindow < Wx::HTML::HtmlWindow
+    BLUE_PEN = Wx::Pen.new
+    attr_reader :html_src
+    def initialize(*args)
+      super
+      @draw_custom_bg = false
+      evt_erase_background :on_erase_bg_event
-  def on_erase_bg_event(event)
-    unless @draw_custom_bg
-      event.skip
-      return
+      BLUE_PEN.set_colour(Wx::BLUE)
     end
-    # draw a background grid to show that this handler is indeed executed
-    paint do |dc|
-      dc.pen = BLUE_PEN
-      dc.clear
+    def draw_custom_bg(val)
+      @draw_custom_bg = !!val
+      refresh
+    end
-      vx, vy = get_virtual_size
-      (vx / 15).times { |i| x = i*15; dc.draw_line(x, 0, x, vy) }
-      (vy / 15).times { |i| y = i*15; dc.draw_line(0, y, vx, y) }
+    def on_opening_url(_type, url)
+      related_frame.set_status_text(url + " lately opened", 1)
+      Wx::HTML_OPEN
     end
-  end
-end
+    def on_erase_bg_event(event)
+      unless @draw_custom_bg
+        event.skip
+        return
+      end
+      # draw a background grid to show that this handler is indeed executed
+      paint do |dc|
+        dc.pen = BLUE_PEN
+        dc.clear
+        vx, vy = get_virtual_size
+        (vx / 15).times { |i| x = i*15; dc.draw_line(x, 0, x, vy) }
+        (vy / 15).times { |i| y = i*15; dc.draw_line(0, y, vx, y) }
+      end
+    end
-# The frame or self-contained window for this application
-class HtmlFrame < Wx::Frame
-  attr_reader :html_win
-  def initialize(title, pos, size, style = Wx::DEFAULT_FRAME_STYLE)
-    # A main application frame has no parent (nil)
-    # -1 means this frame will be supplied a default id
-    super(nil, -1, title, pos, size, style)
-    setup_menus
-    create_status_bar(2)
-    self.icon = Wx::Icon.new(local_icon_file('../sample.xpm'))
-    setup_panel
-    self.status_text = "Welcome to wxRuby!"
-    evt_html_link_clicked Wx::ID_ANY, :on_html_link_clicked
-    evt_html_cell_hover Wx::ID_ANY, :on_html_cell_hover
-    evt_html_cell_clicked Wx::ID_ANY, :on_html_cell_clicked
   end
-  def setup_panel
-    panel = Wx::Panel.new(self, -1)
+  # The frame or self-contained window for this application
+  class HtmlFrame < Wx::Frame
+    attr_reader :html_win
+    def initialize(title, pos, size, style = Wx::DEFAULT_FRAME_STYLE)
+      # A main application frame has no parent (nil)
+      # -1 means this frame will be supplied a default id
+      super(nil, -1, title, pos, size, style)
+      setup_menus
+      create_status_bar(2)
+      self.icon = Wx::Icon.new(local_icon_file('../sample.xpm'))
+      setup_panel
+      self.status_text = "Welcome to wxRuby!"
+      evt_html_link_clicked Wx::ID_ANY, :on_html_link_clicked
+      evt_html_cell_hover Wx::ID_ANY, :on_html_cell_hover
+      evt_html_cell_clicked Wx::ID_ANY, :on_html_cell_clicked
+    end
-    @html_win = MyHtmlWindow.new(panel, -1)
-    @html_win.set_related_frame(self, 'HTML : %s')
-    @html_win.set_related_status_bar(1)
+    def setup_panel
+      panel = Wx::Panel.new(self, -1)
-    @html_win.load_file('samples/html/test.htm')
+      @html_win = MyHtmlWindow.new(panel, -1)
+      @html_win.set_related_frame(self, 'HTML : %s')
+      @html_win.set_related_status_bar(1)
-    text = Wx::TextCtrl.new(panel, Wx::ID_ANY, "",
-                            Wx::DEFAULT_POSITION, Wx::DEFAULT_SIZE,
-                            Wx::TE_MULTILINE)
-    Wx::Log.set_active_target(Wx::LogTextCtrl.new(text))
+      @html_win.load_file('samples/html/test.htm')
-    sizer = Wx::BoxSizer.new(Wx::VERTICAL)
-    sizer.add(@html_win, 3, Wx::GROW)
-    sizer.add(text, 1, Wx::GROW)
-    panel.set_sizer(sizer)
-  end
+      text = Wx::TextCtrl.new(panel, Wx::ID_ANY, "",
+                              Wx::DEFAULT_POSITION, Wx::DEFAULT_SIZE,
+                              Wx::TE_MULTILINE)
+      Wx::Log.set_active_target(Wx::LogTextCtrl.new(text))
-  def setup_menus
-    menu_file = Wx::Menu.new
-    menu_nav = Wx::Menu.new
-    menu_help = Wx::Menu.new
-    menu_file.append(ID_PageOpen, "&Open HTML page...\tCtrl-O")
-    menu_file.append(ID_DefaultLocalBrowser, "&Open current page with default browser")
-    menu_file.append(ID_DefaultWebBrowser, "Open a &web page with default browser")
-    # menu_file.append_separator
-    # menu_file.append(ID_Processor, "&Remove bold attribute",
-    #                  '', Wx::ITEM_CHECK)
-    menu_file.append_separator
-    menu_file.append_check_item(ID_DrawCustomBg, "&Draw custom background")
-    menu_file.append_separator
-    menu_file.append(Wx::ID_EXIT, "&Close frame")
-    menu_nav.append(ID_Back, "Go &BACK")
-    menu_nav.append(ID_Forward, "Go &FORWARD")
-    # Using Wx::ID_ABOUT default id means the menu item will be placed
-    # in the correct platform-specific place
-    menu_help.append(Wx::ID_ABOUT, "&About...\tF1", "Show about dialog")
-    menu_bar = Wx::MenuBar.new
-    menu_bar.append(menu_file, "&File")
-    menu_bar.append(menu_nav, "&Navigate")
-    menu_bar.append(menu_help, "&Help")
-    # Assign the menus to this frame
-    self.menu_bar = menu_bar
-    if Wx.has_feature?(:USE_ACCEL)
-      accel_entries = [
-        Wx::AcceleratorEntry.new(Wx::ACCEL_ALT, Wx::K_LEFT, ID_Back),
-        Wx::AcceleratorEntry.new(Wx::ACCEL_ALT, Wx::K_RIGHT, ID_Forward)
-      ]
-      set_accelerator_table(Wx::AcceleratorTable.new(accel_entries))
+      sizer = Wx::BoxSizer.new(Wx::VERTICAL)
+      sizer.add(@html_win, 3, Wx::GROW)
+      sizer.add(text, 1, Wx::GROW)
+      panel.set_sizer(sizer)
     end
-    # handle menu events
-    evt_menu ID_PageOpen, :on_open_page
-    evt_menu ID_DefaultLocalBrowser, :on_default_local_browser
-    evt_menu ID_DefaultWebBrowser, :on_default_web_browser
-    evt_menu ID_Back, :on_back
-    evt_menu ID_Forward, :on_forward
-    evt_menu ID_DrawCustomBg, :on_draw_custom_bg
-    evt_menu Wx::ID_EXIT, :on_quit
-    evt_menu Wx::ID_ABOUT, :on_about
-  end
+    def setup_menus
+      menu_file = Wx::Menu.new
+      menu_nav = Wx::Menu.new
+      menu_help = Wx::Menu.new
+      menu_file.append(ID_PageOpen, "&Open HTML page...\tCtrl-O")
+      menu_file.append(ID_DefaultLocalBrowser, "&Open current page with default browser")
+      menu_file.append(ID_DefaultWebBrowser, "Open a &web page with default browser")
+      # menu_file.append_separator
+      # menu_file.append(ID_Processor, "&Remove bold attribute",
+      #                  '', Wx::ITEM_CHECK)
+      menu_file.append_separator
+      menu_file.append_check_item(ID_DrawCustomBg, "&Draw custom background")
+      menu_file.append_separator
+      menu_file.append(Wx::ID_EXIT, "&Close frame")
+      menu_nav.append(ID_Back, "Go &BACK")
+      menu_nav.append(ID_Forward, "Go &FORWARD")
+      # Using Wx::ID_ABOUT default id means the menu item will be placed
+      # in the correct platform-specific place
+      menu_help.append(Wx::ID_ABOUT, "&About...\tF1", "Show about dialog")
+      menu_bar = Wx::MenuBar.new
+      menu_bar.append(menu_file, "&File")
+      menu_bar.append(menu_nav, "&Navigate")
+      menu_bar.append(menu_help, "&Help")
+      # Assign the menus to this frame
+      self.menu_bar = menu_bar
+      if Wx.has_feature?(:USE_ACCEL)
+        accel_entries = [
+          Wx::AcceleratorEntry.new(Wx::ACCEL_ALT, Wx::K_LEFT, ID_Back),
+          Wx::AcceleratorEntry.new(Wx::ACCEL_ALT, Wx::K_RIGHT, ID_Forward)
+        ]
+        set_accelerator_table(Wx::AcceleratorTable.new(accel_entries))
+      end
-  # end the application
-  def on_quit(_evt)
-    close(true)
-  end
+      # handle menu events
+      evt_menu ID_PageOpen, :on_open_page
+      evt_menu ID_DefaultLocalBrowser, :on_default_local_browser
+      evt_menu ID_DefaultWebBrowser, :on_default_web_browser
+      evt_menu ID_Back, :on_back
+      evt_menu ID_Forward, :on_forward
+      evt_menu ID_DrawCustomBg, :on_draw_custom_bg
+      evt_menu Wx::ID_EXIT, :on_quit
+      evt_menu Wx::ID_ABOUT, :on_about
+    end
+    # end the application
+    def on_quit(_evt)
+      close(true)
+    end
-  def on_open_page(_evt)
-    if Wx.has_feature?(:USE_FILEDLG)
-      p = Wx.file_selector("Open HTML document", '',
-                           '', '', 'HTML files|*.htm;*.html');
-      unless p.empty?
-        tm = Time.now
-        if html_win.load_file(p)
-          Wx.log_status("Loaded \"#{p}\" in #{Time.now-tm}sec")
+    def on_open_page(_evt)
+      if Wx.has_feature?(:USE_FILEDLG)
+        p = Wx.file_selector("Open HTML document", '',
+                             '', '', 'HTML files|*.htm;*.html');
+        unless p.empty?
+          tm = Time.now
+          if html_win.load_file(p)
+            Wx.log_status("Loaded \"#{p}\" in #{Time.now-tm}sec")
+          end
         end
       end
     end
-  end
-  def on_default_local_browser(_evt)
-    page = html_win.get_opened_page
-    Wx.launch_default_browser(page) unless page.empty?
-  end
+    def on_default_local_browser(_evt)
+      page = html_win.get_opened_page
+      Wx.launch_default_browser(page) unless page.empty?
+    end
-  def on_default_web_browser(_evt)
-    page = html_win.get_opened_page
-    Wx.launch_default_browser('http://www.google.com') unless page.empty?
-  end
+    def on_default_web_browser(_evt)
+      page = html_win.get_opened_page
+      Wx.launch_default_browser('http://www.google.com') unless page.empty?
+    end
-  def on_back(_evt)
-    Wx.message_box('You reached prehistory era!') unless html_win.history_back
-  end
+    def on_back(_evt)
+      Wx.message_box('You reached prehistory era!') unless html_win.history_back
+    end
-  def on_forward(_evt)
-    Wx.message_box('No more items in history!') unless html_win.history_forward
-  end
+    def on_forward(_evt)
+      Wx.message_box('No more items in history!') unless html_win.history_forward
+    end
-  def on_draw_custom_bg(event)
-    html_win.draw_custom_bg(event.checked?)
-  end
+    def on_draw_custom_bg(event)
+      html_win.draw_custom_bg(event.checked?)
+    end
-  # show an 'About' dialog
-  def on_about(_evt)
-    msg =  sprintf("This is the About dialog of the HTML sample.\n" \
-                   "Welcome to wxRuby, version %s", Wx::WXRUBY_VERSION)
+    # show an 'About' dialog
+    def on_about(_evt)
+      msg =  sprintf("This is the About dialog of the HTML sample.\n" \
+                     "Welcome to wxRuby, version %s", Wx::WXRUBY_VERSION)
-    # create a simple message dialog with OK button
-    Wx::MessageDialog(self, msg, 'About WxRuby HTML',
-                      Wx::OK | Wx::ICON_INFORMATION)
-  end
+      # create a simple message dialog with OK button
+      Wx::MessageDialog(self, msg, 'About WxRuby HTML',
+                        Wx::OK | Wx::ICON_INFORMATION)
+    end
-  def on_html_link_clicked(event)
-    Wx.log_message("The url '%s' has been clicked!", event.link_info.href)
+    def on_html_link_clicked(event)
+      Wx.log_message("The url '%s' has been clicked!", event.link_info.href)
-    # skipping this event the default behaviour (load the clicked URL)
-    # will happen...
-    event.skip
-  end
+      # skipping this event the default behaviour (load the clicked URL)
+      # will happen...
+      event.skip
+    end
-  def on_html_cell_hover(event)
-    Wx.log_message("Mouse moved over cell %p at %d;%d",
-                 event.cell, event.point.x, event.point.y)
-  end
+    def on_html_cell_hover(event)
+      Wx.log_message("Mouse moved over cell %p at %d;%d",
+                   event.cell, event.point.x, event.point.y)
+    end
-  def on_html_cell_clicked(event)
-    Wx.log_message("Click over cell %p at %d;%d",
-                 event.cell, event.point.x, event.point.y)
+    def on_html_cell_clicked(event)
+      Wx.log_message("Click over cell %p at %d;%d",
+                   event.cell, event.point.x, event.point.y)
-    # if we don't skip the event, OnHtmlLinkClicked won't be called!
-    event.skip
-  end
+      # if we don't skip the event, OnHtmlLinkClicked won't be called!
+      event.skip
+    end
-  # utility function to find an icon relative to this ruby script
-  def local_icon_file(icon_name)
-    File.join( File.dirname(__FILE__), icon_name)
+    # utility function to find an icon relative to this ruby script
+    def local_icon_file(icon_name)
+      File.join( File.dirname(__FILE__), icon_name)
+    end
   end
-end
-# Wx::App is the container class for any wxruby app - only a single
-# instance is required
-class HtmlApp < Wx::App
-  def on_init
-    Wx::HTML::HtmlWindow.add_filter(MyHtmlFilter.new)
-    set_vendor_name("wxRuby")
-    set_app_name("Wx::HtmlTest")
-    frame = HtmlFrame.new("Wx::HtmlWindow testing application",
-                             Wx::Point.new(50, 50),
-                             Wx::Size.new(450, 340))
-    set_app_name('HtmlDemo')
-    # required
-    frame.show
+  # Wx::App is the container class for any wxruby app - only a single
+  # instance is required
+  class HtmlApp < Wx::App
+    def on_init
+      Wx::HTML::HtmlWindow.add_filter(MyHtmlFilter.new)
+      set_vendor_name("wxRuby")
+      set_app_name("Wx::HtmlTest")
+      frame = HtmlFrame.new("Wx::HtmlWindow testing application",
+                               Wx::Point.new(50, 50),
+                               Wx::Size.new(450, 340))
+      set_app_name('HtmlDemo')
+      # required
+      frame.show
+    end
   end
 end
 module HTMLSample
@@ -277,7 +281,7 @@ module HTMLSample
   end
   if $0 == __FILE__
-    HtmlApp.run
+    Html::HtmlApp.run
   end
 end

data/samples/mdi/mdi.rb CHANGED Viewed

@@ -26,62 +26,67 @@ require 'wx'
 # development. Alternative interface strategies include using separate
 # frames, or the AUI classes.
-class MDIFrame < Wx::MDIParentFrame
-  def initialize(title)
-    super(nil, :title => title, :size => [ 500, 400 ] )
-    @child_number = 0
-    menuFile = Wx::Menu.new
-    menuFile.append(Wx::ID_EXIT, "E&xit\tAlt-X")
-    evt_menu(Wx::ID_EXIT) { self.close }
-    menuMDI = Wx::Menu.new
-    menuMDI.append(Wx::ID_FORWARD, "&Next Child\tCtrl-F6")
-    evt_menu(Wx::ID_FORWARD) { self.activate_next }
-    menuMDI.append(Wx::ID_BACKWARD, "&Previous Child")
-    evt_menu(Wx::ID_BACKWARD) { self.activate_previous }
-    menuMDI.append_separator
-    mi_cascade = menuMDI.append("&Cascade")
-    evt_menu(mi_cascade) { self.cascade }
-    mi_tile    = menuMDI.append("&Tile")
-    evt_menu(mi_tile) { self.tile }
-    menuMDI.append_separator
-    menuMDI.append(Wx::ID_NEW, "&Add Child")
-    evt_menu Wx::ID_NEW, :create_child
-    menuMDI.append(Wx::ID_CLOSE, "&Remove Child\tCtrl-F4")
-    evt_menu Wx::ID_CLOSE, :on_close_child
-    menuBar = Wx::MenuBar.new
-    menuBar.append(menuFile, "&File")
-    menuBar.append(menuMDI, "&Window")
-    self.menu_bar = menuBar
-    create_status_bar(2).set_status_widths([100, -1])
-    set_status_text("Some features only work on MS Windows", 1)
-    3.times { create_child }
-  end
-  def on_close_child
-    if active_child
-        active_child.close
+module MDI
+  class MDIFrame < Wx::MDIParentFrame
+    def initialize(title)
+      super(nil, :title => title, :size => [ 500, 400 ] )
+      self.icon = Wx.Icon(:sample, Wx::BITMAP_TYPE_XPM, art_path: File.join(__dir__, '..'))
+      @child_number = 0
+      menuFile = Wx::Menu.new
+      menuFile.append(Wx::ID_EXIT, "E&xit\tAlt-X")
+      evt_menu(Wx::ID_EXIT) { self.close }
+      menuMDI = Wx::Menu.new
+      menuMDI.append(Wx::ID_FORWARD, "&Next Child\tCtrl-F6")
+      evt_menu(Wx::ID_FORWARD) { self.activate_next }
+      menuMDI.append(Wx::ID_BACKWARD, "&Previous Child")
+      evt_menu(Wx::ID_BACKWARD) { self.activate_previous }
+      menuMDI.append_separator
+      mi_cascade = menuMDI.append("&Cascade")
+      evt_menu(mi_cascade) { self.cascade }
+      mi_tile    = menuMDI.append("&Tile")
+      evt_menu(mi_tile) { self.tile }
+      menuMDI.append_separator
+      menuMDI.append(Wx::ID_NEW, "&Add Child")
+      evt_menu Wx::ID_NEW, :create_child
+      menuMDI.append(Wx::ID_CLOSE, "&Remove Child\tCtrl-F4")
+      evt_menu Wx::ID_CLOSE, :on_close_child
+      menuBar = Wx::MenuBar.new
+      menuBar.append(menuFile, "&File")
+      menuBar.append(menuMDI, "&Window")
+      self.menu_bar = menuBar
+      create_status_bar(2).set_status_widths([100, -1])
+      set_status_text("Some features only work on MS Windows", 1)
+      3.times { create_child }
+    end
+    def on_close_child
+      if active_child
+          active_child.close
+      end
+    end
+    def create_child
+      @child_number += 1
+      name = "Child #{@child_number.to_s}"
+      child = Wx::MDIChildFrame.new(self, :title => name)
+      # Note that this is required on OS X; if no child frames are shown,
+      # then nothing is shown at all.
+      child.show
     end
   end
-  def create_child
-    @child_number += 1
-    name = "Child #{@child_number.to_s}"
-    child = Wx::MDIChildFrame.new(self, :title => name)
-    # Note that this is required on OS X; if no child frames are shown,
-    # then nothing is shown at all.
-    child.show
-  end
-end
+end
 module MDISample
@@ -111,7 +116,7 @@ module MDISample
   end
   def self.activate
-    frame = MDIFrame.new("MDI Application")
+    frame = MDI::MDIFrame.new("MDI Application")
     frame.show # may return false on OS X
     frame
   end