wxruby3 1.8.0 → 2.0.0
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.
- checksums.yaml +4 -4
- data/INSTALL.md +20 -10
- data/README.md +3 -3
- data/ext/wxruby3/include/wxRubyApp.h +49 -3
- data/ext/wxruby3/include/wxruby-ComboPopup.h +17 -32
- data/ext/wxruby3/include/wxruby-Config.h +34 -11
- data/ext/wxruby3/include/wxruby-GCTracking.h +23 -5
- data/ext/wxruby3/include/wxruby-SharedEventHandler.h +7 -7
- data/ext/wxruby3/include/wxruby-runtime.h +65 -0
- data/ext/wxruby3/swig/common.i +6 -0
- data/ext/wxruby3/swig/custom/typed_data/rubyhead.swg +220 -0
- data/ext/wxruby3/swig/custom/typed_data/rubyprimtypes.swg +265 -0
- data/ext/wxruby3/swig/custom/typed_data/rubyrun.swg +243 -0
- data/ext/wxruby3/swig/custom/typed_data/swigrun.swg +689 -0
- data/ext/wxruby3/swig/custom/{rubyprimtypes.swg → untyped_data/rubyprimtypes.swg} +8 -0
- data/ext/wxruby3/swig/mark_free_impl.i +2 -2
- data/ext/wxruby3/swig/memory_management.i +1 -0
- data/ext/wxruby3/swig/wx.i +19 -6
- data/lib/wx/core/file_dialog.rb +3 -10
- data/lib/wx/doc/rbn/events.rb +32 -0
- data/lib/wx/doc/rbn/ribbon_backstage_mrulist.rb +25 -0
- data/lib/wx/doc/stream.rb +7 -3
- data/lib/wx/keyword_ctors.rb +3 -13
- data/lib/wx/rbn/events.rb +18 -0
- data/lib/wx/rbn/require.rb +1 -0
- data/lib/wx/rbn/ribbon_backstage_mrulist.rb +39 -0
- data/lib/wx/version.rb +1 -1
- data/lib/wx/wxruby/cmd/test.rb +8 -2
- data/rakelib/lib/config/pkgman/linux.rb +4 -2
- data/rakelib/lib/config.rb +3 -3
- data/rakelib/lib/core/include/typed_data/swigrubyrun.inc +629 -0
- data/rakelib/lib/core/include/typed_data/swigrun.inc +870 -0
- data/rakelib/lib/core/package.rb +2 -2
- data/rakelib/lib/director/app.rb +16 -0
- data/rakelib/lib/director/art_provider.rb +3 -3
- data/rakelib/lib/director/aui_mdi_child_frame.rb +24 -0
- data/rakelib/lib/director/aui_mdi_parent_frame.rb +0 -2
- data/rakelib/lib/director/aui_tab_ctrl.rb +3 -3
- data/rakelib/lib/director/comboctrl.rb +35 -2
- data/rakelib/lib/director/config_base.rb +79 -33
- data/rakelib/lib/director/data_object.rb +1 -1
- data/rakelib/lib/director/date_event.rb +10 -3
- data/rakelib/lib/director/derived_dc.rb +41 -32
- data/rakelib/lib/director/editable_listbox.rb +10 -8
- data/rakelib/lib/director/event.rb +16 -7
- data/rakelib/lib/director/event_handler.rb +48 -10
- data/rakelib/lib/director/events.rb +4 -2
- data/rakelib/lib/director/file_history.rb +46 -0
- data/rakelib/lib/director/frame.rb +29 -0
- data/rakelib/lib/director/fs_file.rb +25 -4
- data/rakelib/lib/director/functions.rb +2 -2
- data/rakelib/lib/director/graphics_context.rb +6 -6
- data/rakelib/lib/director/grid_cell_editor.rb +1 -1
- data/rakelib/lib/director/grid_cell_renderer.rb +1 -1
- data/rakelib/lib/director/grid_ctrl.rb +39 -12
- data/rakelib/lib/director/help_controller.rb +17 -0
- data/rakelib/lib/director/html_help_data.rb +20 -2
- data/rakelib/lib/director/icon.rb +3 -0
- data/rakelib/lib/director/log.rb +25 -1
- data/rakelib/lib/director/menu.rb +38 -106
- data/rakelib/lib/director/menu_bar.rb +36 -70
- data/rakelib/lib/director/num_validator.rb +3 -3
- data/rakelib/lib/director/numeric_property_validator.rb +1 -1
- data/rakelib/lib/director/page_setup_dialog.rb +18 -1
- data/rakelib/lib/director/pgeditor.rb +1 -1
- data/rakelib/lib/director/pgvalidation_info.rb +1 -0
- data/rakelib/lib/director/popup_window.rb +7 -0
- data/rakelib/lib/director/preview_frame.rb +8 -1
- data/rakelib/lib/director/print_dialog.rb +17 -0
- data/rakelib/lib/director/printer.rb +1 -1
- data/rakelib/lib/director/property_grid_page.rb +2 -0
- data/rakelib/lib/director/region_iterator.rb +1 -1
- data/rakelib/lib/director/ribbon_backstage.rb +28 -0
- data/rakelib/lib/director/ribbon_backstage_button.rb +25 -0
- data/rakelib/lib/director/ribbon_backstage_callout.rb +26 -0
- data/rakelib/lib/director/ribbon_backstage_heading.rb +26 -0
- data/rakelib/lib/director/ribbon_backstage_itemlist.rb +27 -0
- data/rakelib/lib/director/ribbon_backstage_mrulist.rb +112 -0
- data/rakelib/lib/director/ribbon_bar.rb +14 -0
- data/rakelib/lib/director/ribbon_gallery.rb +6 -2
- data/rakelib/lib/director/ribbon_page.rb +11 -0
- data/rakelib/lib/director/ribbon_tool_bar.rb +6 -4
- data/rakelib/lib/director/richtext_composite_object.rb +4 -4
- data/rakelib/lib/director/richtext_paragraph_layout_box.rb +1 -1
- data/rakelib/lib/director/scrolled_t.rb +1 -1
- data/rakelib/lib/director/sizer.rb +7 -0
- data/rakelib/lib/director/sizer_item.rb +4 -1
- data/rakelib/lib/director/splitter_event.rb +2 -2
- data/rakelib/lib/director/task_bar_icon.rb +4 -1
- data/rakelib/lib/director/text_validator.rb +1 -1
- data/rakelib/lib/director/top_level_window.rb +12 -4
- data/rakelib/lib/director/tree_event.rb +3 -3
- data/rakelib/lib/director/validator.rb +1 -1
- data/rakelib/lib/director/variant.rb +2 -2
- data/rakelib/lib/director/window.rb +27 -5
- data/rakelib/lib/director/window_disabler.rb +1 -1
- data/rakelib/lib/director/xml_resource.rb +33 -8
- data/rakelib/lib/extractor/class.rb +2 -1
- data/rakelib/lib/extractor.rb +3 -2
- data/rakelib/lib/generate/interface.rb +2 -3
- data/rakelib/lib/specs/interfaces.rb +9 -2
- data/rakelib/lib/swig_runner.rb +14 -3
- data/rakelib/lib/typemap/common.rb +2 -36
- data/rakelib/lib/typemap/config.rb +22 -0
- data/samples/ribbon/ribbon.rb +277 -20
- data/tests/test_shared_event_handler.rb +3 -3
- data/tests/test_webview.rb +5 -5
- metadata +32 -394
- data/assets/repo-social-preview.odg +0 -0
- data/assets/repo-social-preview.xcf +0 -0
- data/lib/wx/aui/events/evt_list.rb +0 -148
- data/lib/wx/core/events/evt_list.rb +0 -1458
- data/lib/wx/core/font/encoding.rb +0 -113
- data/lib/wx/doc/gen/about_dialog_info.rb +0 -330
- data/lib/wx/doc/gen/accelerator.rb +0 -178
- data/lib/wx/doc/gen/activity_indicator.rb +0 -83
- data/lib/wx/doc/gen/affine_matrix2d.rb +0 -286
- data/lib/wx/doc/gen/animation.rb +0 -275
- data/lib/wx/doc/gen/animation_ctrl.rb +0 -300
- data/lib/wx/doc/gen/any_button.rb +0 -191
- data/lib/wx/doc/gen/app.rb +0 -463
- data/lib/wx/doc/gen/app_traits.rb +0 -396
- data/lib/wx/doc/gen/art_provider.rb +0 -617
- data/lib/wx/doc/gen/aui/aui_dock_art.rb +0 -455
- data/lib/wx/doc/gen/aui/aui_floating_frame.rb +0 -54
- data/lib/wx/doc/gen/aui/aui_manager.rb +0 -847
- data/lib/wx/doc/gen/aui/aui_manager_event.rb +0 -131
- data/lib/wx/doc/gen/aui/aui_mdi_child_frame.rb +0 -180
- data/lib/wx/doc/gen/aui/aui_mdi_client_window.rb +0 -59
- data/lib/wx/doc/gen/aui/aui_mdi_parent_frame.rb +0 -130
- data/lib/wx/doc/gen/aui/aui_notebook.rb +0 -631
- data/lib/wx/doc/gen/aui/aui_notebook_event.rb +0 -233
- data/lib/wx/doc/gen/aui/aui_pane_info.rb +0 -769
- data/lib/wx/doc/gen/aui/aui_tab_art.rb +0 -352
- data/lib/wx/doc/gen/aui/aui_tab_ctrl.rb +0 -14
- data/lib/wx/doc/gen/aui/aui_tool_bar.rb +0 -510
- data/lib/wx/doc/gen/aui/aui_tool_bar_art.rb +0 -340
- data/lib/wx/doc/gen/aui/aui_tool_bar_event.rb +0 -244
- data/lib/wx/doc/gen/aui/aui_tool_bar_item.rb +0 -257
- data/lib/wx/doc/gen/aui/event_list.rb +0 -179
- data/lib/wx/doc/gen/banner_window.rb +0 -124
- data/lib/wx/doc/gen/bitmap.rb +0 -731
- data/lib/wx/doc/gen/bitmap_button.rb +0 -123
- data/lib/wx/doc/gen/bitmap_combo_box.rb +0 -221
- data/lib/wx/doc/gen/book_ctrl_base.rb +0 -274
- data/lib/wx/doc/gen/book_ctrl_event.rb +0 -66
- data/lib/wx/doc/gen/box_sizer.rb +0 -85
- data/lib/wx/doc/gen/brush.rb +0 -251
- data/lib/wx/doc/gen/busy_info.rb +0 -157
- data/lib/wx/doc/gen/button.rb +0 -182
- data/lib/wx/doc/gen/calculate_layout_event.rb +0 -62
- data/lib/wx/doc/gen/calendar_ctrl.rb +0 -505
- data/lib/wx/doc/gen/calendar_date_attr.rb +0 -138
- data/lib/wx/doc/gen/calendar_event.rb +0 -147
- data/lib/wx/doc/gen/caret.rb +0 -97
- data/lib/wx/doc/gen/check_box.rb +0 -175
- data/lib/wx/doc/gen/check_list_box.rb +0 -121
- data/lib/wx/doc/gen/choice.rb +0 -175
- data/lib/wx/doc/gen/choicebook.rb +0 -116
- data/lib/wx/doc/gen/client_dc.rb +0 -43
- data/lib/wx/doc/gen/clipboard.rb +0 -144
- data/lib/wx/doc/gen/collapsible_pane.rb +0 -138
- data/lib/wx/doc/gen/collapsible_pane_event.rb +0 -46
- data/lib/wx/doc/gen/colour.rb +0 -333
- data/lib/wx/doc/gen/colour_dialog.rb +0 -190
- data/lib/wx/doc/gen/colour_picker_ctrl.rb +0 -110
- data/lib/wx/doc/gen/colour_picker_event.rb +0 -77
- data/lib/wx/doc/gen/combo_box.rb +0 -292
- data/lib/wx/doc/gen/combo_ctrl.rb +0 -662
- data/lib/wx/doc/gen/command_link_button.rb +0 -134
- data/lib/wx/doc/gen/config_base.rb +0 -10
- data/lib/wx/doc/gen/context_help_button.rb +0 -56
- data/lib/wx/doc/gen/control.rb +0 -277
- data/lib/wx/doc/gen/control_with_items.rb +0 -253
- data/lib/wx/doc/gen/core.rb +0 -45
- data/lib/wx/doc/gen/credential_entry_dialog.rb +0 -137
- data/lib/wx/doc/gen/cursor.rb +0 -193
- data/lib/wx/doc/gen/data_format.rb +0 -85
- data/lib/wx/doc/gen/data_object.rb +0 -436
- data/lib/wx/doc/gen/data_object_simple_base.rb +0 -10
- data/lib/wx/doc/gen/date_event.rb +0 -49
- data/lib/wx/doc/gen/date_picker_ctrl.rb +0 -161
- data/lib/wx/doc/gen/dc.rb +0 -1631
- data/lib/wx/doc/gen/dc_overlay.rb +0 -102
- data/lib/wx/doc/gen/defs.rb +0 -2802
- data/lib/wx/doc/gen/dial_up_event.rb +0 -45
- data/lib/wx/doc/gen/dial_up_manager.rb +0 -149
- data/lib/wx/doc/gen/dialog.rb +0 -541
- data/lib/wx/doc/gen/dir_dialog.rb +0 -164
- data/lib/wx/doc/gen/dir_filter_list_ctrl.rb +0 -90
- data/lib/wx/doc/gen/dir_picker_ctrl.rb +0 -125
- data/lib/wx/doc/gen/display.rb +0 -238
- data/lib/wx/doc/gen/drag_drop.rb +0 -299
- data/lib/wx/doc/gen/drag_image.rb +0 -116
- data/lib/wx/doc/gen/editable_list_box.rb +0 -109
- data/lib/wx/doc/gen/event.rb +0 -990
- data/lib/wx/doc/gen/event_blocker.rb +0 -50
- data/lib/wx/doc/gen/event_filter.rb +0 -92
- data/lib/wx/doc/gen/event_list.rb +0 -1644
- data/lib/wx/doc/gen/events.rb +0 -2809
- data/lib/wx/doc/gen/evt_handler.rb +0 -229
- data/lib/wx/doc/gen/ext_help_controller.rb +0 -155
- data/lib/wx/doc/gen/file_ctrl.rb +0 -231
- data/lib/wx/doc/gen/file_ctrl_event.rb +0 -83
- data/lib/wx/doc/gen/file_dialog.rb +0 -353
- data/lib/wx/doc/gen/file_dialog_custom_control.rb +0 -165
- data/lib/wx/doc/gen/file_dialog_customize_hook.rb +0 -158
- data/lib/wx/doc/gen/file_dir_picker_event.rb +0 -100
- data/lib/wx/doc/gen/file_picker_ctrl.rb +0 -132
- data/lib/wx/doc/gen/file_system.rb +0 -232
- data/lib/wx/doc/gen/find_dialog_event.rb +0 -126
- data/lib/wx/doc/gen/find_replace_data.rb +0 -60
- data/lib/wx/doc/gen/find_replace_dialog.rb +0 -58
- data/lib/wx/doc/gen/flex_grid_sizer.rb +0 -199
- data/lib/wx/doc/gen/font.rb +0 -1379
- data/lib/wx/doc/gen/font_data.rb +0 -151
- data/lib/wx/doc/gen/font_dialog.rb +0 -88
- data/lib/wx/doc/gen/font_picker_ctrl.rb +0 -143
- data/lib/wx/doc/gen/font_picker_event.rb +0 -65
- data/lib/wx/doc/gen/frame.rb +0 -352
- data/lib/wx/doc/gen/fs_file.rb +0 -337
- data/lib/wx/doc/gen/functions.rb +0 -10
- data/lib/wx/doc/gen/gauge.rb +0 -157
- data/lib/wx/doc/gen/gb_sizer_item.rb +0 -68
- data/lib/wx/doc/gen/gcdc.rb +0 -46
- data/lib/wx/doc/gen/gdi_common.rb +0 -1271
- data/lib/wx/doc/gen/gdi_object.rb +0 -31
- data/lib/wx/doc/gen/generic_about_dialog.rb +0 -140
- data/lib/wx/doc/gen/generic_dir_ctrl.rb +0 -223
- data/lib/wx/doc/gen/geometry.rb +0 -661
- data/lib/wx/doc/gen/graphics_context.rb +0 -1184
- data/lib/wx/doc/gen/graphics_object.rb +0 -750
- data/lib/wx/doc/gen/grid/event_list.rb +0 -191
- data/lib/wx/doc/gen/grid/grid_cell_activatable_editor.rb +0 -40
- data/lib/wx/doc/gen/grid/grid_cell_attr.rb +0 -280
- data/lib/wx/doc/gen/grid/grid_cell_auto_wrap_string_editor.rb +0 -35
- data/lib/wx/doc/gen/grid/grid_cell_auto_wrap_string_renderer.rb +0 -37
- data/lib/wx/doc/gen/grid/grid_cell_bool_editor.rb +0 -49
- data/lib/wx/doc/gen/grid/grid_cell_bool_renderer.rb +0 -35
- data/lib/wx/doc/gen/grid/grid_cell_choice_editor.rb +0 -46
- data/lib/wx/doc/gen/grid/grid_cell_date_editor.rb +0 -38
- data/lib/wx/doc/gen/grid/grid_cell_date_renderer.rb +0 -45
- data/lib/wx/doc/gen/grid/grid_cell_date_time_renderer.rb +0 -40
- data/lib/wx/doc/gen/grid/grid_cell_editor.rb +0 -197
- data/lib/wx/doc/gen/grid/grid_cell_enum_editor.rb +0 -39
- data/lib/wx/doc/gen/grid/grid_cell_enum_renderer.rb +0 -44
- data/lib/wx/doc/gen/grid/grid_cell_float_editor.rb +0 -45
- data/lib/wx/doc/gen/grid/grid_cell_float_renderer.rb +0 -79
- data/lib/wx/doc/gen/grid/grid_cell_number_editor.rb +0 -46
- data/lib/wx/doc/gen/grid/grid_cell_number_renderer.rb +0 -35
- data/lib/wx/doc/gen/grid/grid_cell_renderer.rb +0 -108
- data/lib/wx/doc/gen/grid/grid_cell_string_renderer.rb +0 -35
- data/lib/wx/doc/gen/grid/grid_cell_text_editor.rb +0 -49
- data/lib/wx/doc/gen/grid/grid_ctrl.rb +0 -3037
- data/lib/wx/doc/gen/grid/grid_editor_created_event.rb +0 -95
- data/lib/wx/doc/gen/grid/grid_event.rb +0 -129
- data/lib/wx/doc/gen/grid/grid_range_select_event.rb +0 -104
- data/lib/wx/doc/gen/grid/grid_size_event.rb +0 -85
- data/lib/wx/doc/gen/grid/grid_string_table.rb +0 -142
- data/lib/wx/doc/gen/grid/grid_table_base.rb +0 -317
- data/lib/wx/doc/gen/grid/grid_table_message.rb +0 -81
- data/lib/wx/doc/gen/grid_bag_sizer.rb +0 -323
- data/lib/wx/doc/gen/grid_sizer.rb +0 -195
- data/lib/wx/doc/gen/gui_event_loop.rb +0 -159
- data/lib/wx/doc/gen/h_scrolled_window.rb +0 -562
- data/lib/wx/doc/gen/header_ctrl.rb +0 -880
- data/lib/wx/doc/gen/header_ctrl_event.rb +0 -133
- data/lib/wx/doc/gen/help_controller.rb +0 -238
- data/lib/wx/doc/gen/help_provider.rb +0 -98
- data/lib/wx/doc/gen/html/event_list.rb +0 -38
- data/lib/wx/doc/gen/html/html_cell.rb +0 -536
- data/lib/wx/doc/gen/html/html_cell_event.rb +0 -69
- data/lib/wx/doc/gen/html/html_data_object.rb +0 -42
- data/lib/wx/doc/gen/html/html_easy_printing.rb +0 -203
- data/lib/wx/doc/gen/html/html_help_controller.rb +0 -382
- data/lib/wx/doc/gen/html/html_help_data.rb +0 -159
- data/lib/wx/doc/gen/html/html_help_window.rb +0 -258
- data/lib/wx/doc/gen/html/html_link_event.rb +0 -41
- data/lib/wx/doc/gen/html/html_list_box.rb +0 -346
- data/lib/wx/doc/gen/html/html_printout.rb +0 -109
- data/lib/wx/doc/gen/html/html_window.rb +0 -461
- data/lib/wx/doc/gen/hyperlink_ctrl.rb +0 -311
- data/lib/wx/doc/gen/hyperlink_event.rb +0 -44
- data/lib/wx/doc/gen/icon.rb +0 -267
- data/lib/wx/doc/gen/icon_location.rb +0 -40
- data/lib/wx/doc/gen/image.rb +0 -1371
- data/lib/wx/doc/gen/image_list.rb +0 -168
- data/lib/wx/doc/gen/info_bar.rb +0 -195
- data/lib/wx/doc/gen/keyboard_state.rb +0 -140
- data/lib/wx/doc/gen/list_box.rb +0 -304
- data/lib/wx/doc/gen/list_ctrl.rb +0 -1774
- data/lib/wx/doc/gen/list_event.rb +0 -208
- data/lib/wx/doc/gen/listbook.rb +0 -116
- data/lib/wx/doc/gen/locale.rb +0 -4293
- data/lib/wx/doc/gen/log.rb +0 -603
- data/lib/wx/doc/gen/mb_conv.rb +0 -10
- data/lib/wx/doc/gen/mdi_client_window.rb +0 -47
- data/lib/wx/doc/gen/mdi_frame.rb +0 -324
- data/lib/wx/doc/gen/media_ctrl.rb +0 -269
- data/lib/wx/doc/gen/media_event.rb +0 -117
- data/lib/wx/doc/gen/memory_dc.rb +0 -174
- data/lib/wx/doc/gen/menu.rb +0 -509
- data/lib/wx/doc/gen/menu_bar.rb +0 -287
- data/lib/wx/doc/gen/menu_item.rb +0 -362
- data/lib/wx/doc/gen/message_dialog.rb +0 -238
- data/lib/wx/doc/gen/mini_frame.rb +0 -108
- data/lib/wx/doc/gen/mirror_dc.rb +0 -22
- data/lib/wx/doc/gen/mouse_state.rb +0 -150
- data/lib/wx/doc/gen/multi_choice_dialog.rb +0 -80
- data/lib/wx/doc/gen/non_owned_window.rb +0 -49
- data/lib/wx/doc/gen/notebook.rb +0 -278
- data/lib/wx/doc/gen/num_validator.rb +0 -37
- data/lib/wx/doc/gen/number_entry_dialog.rb +0 -93
- data/lib/wx/doc/gen/object.rb +0 -59
- data/lib/wx/doc/gen/owner_drawn_combo_box.rb +0 -395
- data/lib/wx/doc/gen/paint_dc.rb +0 -27
- data/lib/wx/doc/gen/palette.rb +0 -92
- data/lib/wx/doc/gen/panel.rb +0 -127
- data/lib/wx/doc/gen/pen.rb +0 -511
- data/lib/wx/doc/gen/persistence_manager.rb +0 -135
- data/lib/wx/doc/gen/persistent_object.rb +0 -52
- data/lib/wx/doc/gen/persistent_window.rb +0 -241
- data/lib/wx/doc/gen/pg/event_list.rb +0 -106
- data/lib/wx/doc/gen/pg/numeric_property_validator.rb +0 -54
- data/lib/wx/doc/gen/pg/pg_array_editor_dialog.rb +0 -292
- data/lib/wx/doc/gen/pg/pg_cell.rb +0 -177
- data/lib/wx/doc/gen/pg/pg_editor.rb +0 -721
- data/lib/wx/doc/gen/pg/pg_multi_button.rb +0 -152
- data/lib/wx/doc/gen/pg/pg_properties.rb +0 -2829
- data/lib/wx/doc/gen/pg/pg_property.rb +0 -2078
- data/lib/wx/doc/gen/pg/pg_validation_info.rb +0 -344
- data/lib/wx/doc/gen/pg/property_grid.rb +0 -740
- data/lib/wx/doc/gen/pg/property_grid_event.rb +0 -184
- data/lib/wx/doc/gen/pg/property_grid_interface.rb +0 -1098
- data/lib/wx/doc/gen/pg/property_grid_manager.rb +0 -415
- data/lib/wx/doc/gen/pg/property_grid_page.rb +0 -354
- data/lib/wx/doc/gen/pg/property_grid_page_state.rb +0 -165
- data/lib/wx/doc/gen/picker_base.rb +0 -152
- data/lib/wx/doc/gen/platform_info.rb +0 -622
- data/lib/wx/doc/gen/popup_window.rb +0 -107
- data/lib/wx/doc/gen/progress_dialog.rb +0 -100
- data/lib/wx/doc/gen/property_sheet_dialog.rb +0 -216
- data/lib/wx/doc/gen/prt/event_list.rb +0 -17
- data/lib/wx/doc/gen/prt/page_setup_dialog.rb +0 -44
- data/lib/wx/doc/gen/prt/post_script_dc.rb +0 -30
- data/lib/wx/doc/gen/prt/preview_frame.rb +0 -78
- data/lib/wx/doc/gen/prt/print_abort_dialog.rb +0 -151
- data/lib/wx/doc/gen/prt/print_data.rb +0 -804
- data/lib/wx/doc/gen/prt/print_dialog.rb +0 -55
- data/lib/wx/doc/gen/prt/printer.rb +0 -518
- data/lib/wx/doc/gen/prt/printer_dc.rb +0 -37
- data/lib/wx/doc/gen/query_layout_info_event.rb +0 -106
- data/lib/wx/doc/gen/radio_box.rb +0 -306
- data/lib/wx/doc/gen/radio_button.rb +0 -159
- data/lib/wx/doc/gen/rbn/event_list.rb +0 -136
- data/lib/wx/doc/gen/rbn/ribbon_art_provider.rb +0 -1142
- data/lib/wx/doc/gen/rbn/ribbon_bar.rb +0 -308
- data/lib/wx/doc/gen/rbn/ribbon_bar_event.rb +0 -45
- data/lib/wx/doc/gen/rbn/ribbon_button_bar.rb +0 -458
- data/lib/wx/doc/gen/rbn/ribbon_button_bar_event.rb +0 -63
- data/lib/wx/doc/gen/rbn/ribbon_control.rb +0 -143
- data/lib/wx/doc/gen/rbn/ribbon_gallery.rb +0 -229
- data/lib/wx/doc/gen/rbn/ribbon_gallery_event.rb +0 -55
- data/lib/wx/doc/gen/rbn/ribbon_page.rb +0 -174
- data/lib/wx/doc/gen/rbn/ribbon_panel.rb +0 -270
- data/lib/wx/doc/gen/rbn/ribbon_panel_event.rb +0 -45
- data/lib/wx/doc/gen/rbn/ribbon_tool_bar.rb +0 -360
- data/lib/wx/doc/gen/rbn/ribbon_tool_bar_event.rb +0 -42
- data/lib/wx/doc/gen/rearrange_ctrl.rb +0 -78
- data/lib/wx/doc/gen/rearrange_list.rb +0 -123
- data/lib/wx/doc/gen/region.rb +0 -380
- data/lib/wx/doc/gen/region_iterator.rb +0 -76
- data/lib/wx/doc/gen/rich_tool_tip.rb +0 -154
- data/lib/wx/doc/gen/rt/event_list.rb +0 -17
- data/lib/wx/doc/gen/rt/shared_evt_handler.rb +0 -14
- data/lib/wx/doc/gen/rt/thread_event.rb +0 -71
- data/lib/wx/doc/gen/rtc/event_list.rb +0 -125
- data/lib/wx/doc/gen/rtc/rich_text_box.rb +0 -445
- data/lib/wx/doc/gen/rtc/rich_text_buffer.rb +0 -1188
- data/lib/wx/doc/gen/rtc/rich_text_buffer_data_object.rb +0 -41
- data/lib/wx/doc/gen/rtc/rich_text_composite_object.rb +0 -538
- data/lib/wx/doc/gen/rtc/rich_text_ctrl.rb +0 -2103
- data/lib/wx/doc/gen/rtc/rich_text_event.rb +0 -173
- data/lib/wx/doc/gen/rtc/rich_text_file_handler.rb +0 -181
- data/lib/wx/doc/gen/rtc/rich_text_formatting_dialog.rb +0 -319
- data/lib/wx/doc/gen/rtc/rich_text_header_footer_data.rb +0 -193
- data/lib/wx/doc/gen/rtc/rich_text_html_handler.rb +0 -102
- data/lib/wx/doc/gen/rtc/rich_text_image.rb +0 -337
- data/lib/wx/doc/gen/rtc/rich_text_object.rb +0 -2922
- data/lib/wx/doc/gen/rtc/rich_text_paragraph_layout_box.rb +0 -1240
- data/lib/wx/doc/gen/rtc/rich_text_printing.rb +0 -258
- data/lib/wx/doc/gen/rtc/rich_text_style_list_box.rb +0 -344
- data/lib/wx/doc/gen/rtc/rich_text_style_organiser_dialog.rb +0 -227
- data/lib/wx/doc/gen/rtc/rich_text_xml_handler.rb +0 -59
- data/lib/wx/doc/gen/rtc/symbol_picker_dialog.rb +0 -169
- data/lib/wx/doc/gen/sash_event.rb +0 -147
- data/lib/wx/doc/gen/sash_layout_window.rb +0 -232
- data/lib/wx/doc/gen/sash_window.rb +0 -171
- data/lib/wx/doc/gen/scaled_dc.rb +0 -10
- data/lib/wx/doc/gen/screen_dc.rb +0 -30
- data/lib/wx/doc/gen/scroll_bar.rb +0 -204
- data/lib/wx/doc/gen/scrolled_canvas.rb +0 -410
- data/lib/wx/doc/gen/scrolled_control.rb +0 -410
- data/lib/wx/doc/gen/scrolled_window.rb +0 -430
- data/lib/wx/doc/gen/search_ctrl.rb +0 -159
- data/lib/wx/doc/gen/secret_store.rb +0 -116
- data/lib/wx/doc/gen/simplebook.rb +0 -110
- data/lib/wx/doc/gen/single_choice_dialog.rb +0 -89
- data/lib/wx/doc/gen/sizer.rb +0 -945
- data/lib/wx/doc/gen/sizer_item.rb +0 -244
- data/lib/wx/doc/gen/slider.rb +0 -342
- data/lib/wx/doc/gen/spin_button.rb +0 -157
- data/lib/wx/doc/gen/spin_ctrl.rb +0 -231
- data/lib/wx/doc/gen/spin_ctrl_double.rb +0 -192
- data/lib/wx/doc/gen/spin_double_event.rb +0 -55
- data/lib/wx/doc/gen/spin_event.rb +0 -51
- data/lib/wx/doc/gen/splash_screen.rb +0 -113
- data/lib/wx/doc/gen/splitter_event.rb +0 -99
- data/lib/wx/doc/gen/splitter_window.rb +0 -498
- data/lib/wx/doc/gen/static_bitmap.rb +0 -256
- data/lib/wx/doc/gen/static_box.rb +0 -180
- data/lib/wx/doc/gen/static_box_sizer.rb +0 -85
- data/lib/wx/doc/gen/static_line.rb +0 -83
- data/lib/wx/doc/gen/static_text.rb +0 -127
- data/lib/wx/doc/gen/status_bar.rb +0 -290
- data/lib/wx/doc/gen/stc/event_list.rb +0 -221
- data/lib/wx/doc/gen/stc/styled_text_ctrl.rb +0 -4474
- data/lib/wx/doc/gen/stc/styled_text_event.rb +0 -8762
- data/lib/wx/doc/gen/std_dialog_button_sizer.rb +0 -129
- data/lib/wx/doc/gen/svg_file_dc.rb +0 -164
- data/lib/wx/doc/gen/system_options.rb +0 -129
- data/lib/wx/doc/gen/system_settings.rb +0 -507
- data/lib/wx/doc/gen/task_bar_icon.rb +0 -127
- data/lib/wx/doc/gen/task_bar_icon_event.rb +0 -88
- data/lib/wx/doc/gen/text_attr.rb +0 -756
- data/lib/wx/doc/gen/text_ctrl.rb +0 -1033
- data/lib/wx/doc/gen/text_entry.rb +0 -441
- data/lib/wx/doc/gen/text_entry_dialog.rb +0 -220
- data/lib/wx/doc/gen/text_validator.rb +0 -245
- data/lib/wx/doc/gen/time_picker_ctrl.rb +0 -128
- data/lib/wx/doc/gen/timer.rb +0 -119
- data/lib/wx/doc/gen/timer_event.rb +0 -68
- data/lib/wx/doc/gen/tip_provider.rb +0 -63
- data/lib/wx/doc/gen/tip_window.rb +0 -51
- data/lib/wx/doc/gen/toggle_button.rb +0 -182
- data/lib/wx/doc/gen/tool_bar.rb +0 -890
- data/lib/wx/doc/gen/tool_tip.rb +0 -86
- data/lib/wx/doc/gen/toolbook.rb +0 -118
- data/lib/wx/doc/gen/top_level_window.rb +0 -516
- data/lib/wx/doc/gen/tree_ctrl.rb +0 -1052
- data/lib/wx/doc/gen/tree_event.rb +0 -127
- data/lib/wx/doc/gen/treebook.rb +0 -180
- data/lib/wx/doc/gen/ui_action_simulator.rb +0 -109
- data/lib/wx/doc/gen/utils.rb +0 -273
- data/lib/wx/doc/gen/v_list_box.rb +0 -272
- data/lib/wx/doc/gen/v_scrolled_canvas.rb +0 -195
- data/lib/wx/doc/gen/v_scrolled_window.rb +0 -191
- data/lib/wx/doc/gen/validator.rb +0 -68
- data/lib/wx/doc/gen/variant.rb +0 -294
- data/lib/wx/doc/gen/web/event_list.rb +0 -95
- data/lib/wx/doc/gen/web/web_view.rb +0 -1136
- data/lib/wx/doc/gen/web/web_view_event.rb +0 -210
- data/lib/wx/doc/gen/web/web_view_handler.rb +0 -318
- data/lib/wx/doc/gen/window.rb +0 -2917
- data/lib/wx/doc/gen/window_dc.rb +0 -38
- data/lib/wx/doc/gen/window_disabler.rb +0 -30
- data/lib/wx/doc/gen/with_images.rb +0 -84
- data/lib/wx/doc/gen/wizard.rb +0 -257
- data/lib/wx/doc/gen/wizard_event.rb +0 -113
- data/lib/wx/doc/gen/wizard_page.rb +0 -65
- data/lib/wx/doc/gen/wizard_page_simple.rb +0 -88
- data/lib/wx/doc/gen/wrap_sizer.rb +0 -79
- data/lib/wx/doc/gen/xml_node.rb +0 -316
- data/lib/wx/doc/gen/xml_resource.rb +0 -320
- data/lib/wx/grid/events/evt_list.rb +0 -166
- data/lib/wx/html/events/evt_list.rb +0 -27
- data/lib/wx/pg/events/evt_list.rb +0 -73
- data/lib/wx/rbn/events/evt_list.rb +0 -102
- data/lib/wx/rt/events/evt_list.rb +0 -8
- data/lib/wx/rtc/events/evt_list.rb +0 -98
- data/lib/wx/rtc/ext/rich_text_ctrl.rb +0 -24
- data/lib/wx/stc/events/evt_list.rb +0 -178
- data/lib/wx/web/events/evt_list.rb +0 -74
- data/samples/art/wxruby-512x512.png +0 -0
- data/tests/assets/test.css +0 -1
- data/tests/assets/test.html +0 -9
- /data/ext/wxruby3/swig/custom/{director.swg → common/director.swg} +0 -0
- /data/ext/wxruby3/swig/custom/{rubyapi.swg → common/rubyapi.swg} +0 -0
- /data/ext/wxruby3/swig/custom/{rubyerrors.swg → common/rubyerrors.swg} +0 -0
- /data/ext/wxruby3/swig/custom/{rubytracking.swg → common/rubytracking.swg} +0 -0
- /data/ext/wxruby3/swig/custom/{swiglabels.swg → common/swiglabels.swg} +0 -0
- /data/ext/wxruby3/swig/custom/{typemaps → common/typemaps}/swigtypemaps.swg +0 -0
- /data/ext/wxruby3/swig/custom/{wx_ruby_shared_ptr.i → common/wx_ruby_shared_ptr.i} +0 -0
- /data/ext/wxruby3/swig/custom/{wx_shared_ptr.i → common/wx_shared_ptr.i} +0 -0
- /data/ext/wxruby3/swig/custom/{rubyhead.swg → untyped_data/rubyhead.swg} +0 -0
- /data/ext/wxruby3/swig/custom/{rubyrun.swg → untyped_data/rubyrun.swg} +0 -0
- /data/ext/wxruby3/swig/custom/{swigrun.swg → untyped_data/swigrun.swg} +0 -0
- /data/rakelib/lib/core/include/{swigrubyrun.inc → untyped_data/swigrubyrun.inc} +0 -0
- /data/rakelib/lib/core/include/{swigrun.inc → untyped_data/swigrun.inc} +0 -0
data/rakelib/lib/core/package.rb
CHANGED
|
@@ -372,9 +372,9 @@ module WXRuby3
|
|
|
372
372
|
fsrc.puts "WXRB_IMPORT_FLAG VALUE wxRuby_Core();" unless is_core?
|
|
373
373
|
fsrc.puts
|
|
374
374
|
if is_core?
|
|
375
|
-
fsrc << File.read(File.join(File.dirname(__FILE__), 'include', 'swigrun.inc'))
|
|
375
|
+
fsrc << File.read(File.join(File.dirname(__FILE__), 'include', SwigRunner.swig_ruby_type, 'swigrun.inc'))
|
|
376
376
|
fsrc << File.read(File.join(File.dirname(__FILE__), 'include', 'swigrubyerrors.inc'))
|
|
377
|
-
fsrc << File.read(File.join(File.dirname(__FILE__), 'include', 'swigrubyrun.inc'))
|
|
377
|
+
fsrc << File.read(File.join(File.dirname(__FILE__), 'include', SwigRunner.swig_ruby_type, 'swigrubyrun.inc'))
|
|
378
378
|
fsrc << File.read(File.join(File.dirname(__FILE__), 'include', 'swigdirector.inc'))
|
|
379
379
|
fsrc << File.read(File.join(File.dirname(__FILE__), 'include', 'funcall.inc'))
|
|
380
380
|
fsrc << File.read(File.join(File.dirname(__FILE__), 'include', 'enum.inc'))
|
data/rakelib/lib/director/app.rb
CHANGED
|
@@ -24,6 +24,17 @@ module WXRuby3
|
|
|
24
24
|
# wxDarkModeSettings does has have virt dtor; it's just not documented
|
|
25
25
|
spec.suppress_warning(514, 'wxDarkModeSettings')
|
|
26
26
|
end
|
|
27
|
+
if Config.instance.wx_version_check('3.3.4') >= 0
|
|
28
|
+
if Config.instance.features_set?('WXMSW')
|
|
29
|
+
spec.ignore('wxApp::MSWEnableDarkMode', ignore_doc: false)
|
|
30
|
+
spec.add_extend_code 'wxApp', <<~__HEREDOC
|
|
31
|
+
bool MSWEnableDarkMode(int flags = 0, wxDarkModeSettings* settings = nullptr)
|
|
32
|
+
{
|
|
33
|
+
return $self->MSWEnableDarkMode(static_cast<wxApp::DarkMode> (flags), settings);
|
|
34
|
+
}
|
|
35
|
+
__HEREDOC
|
|
36
|
+
end
|
|
37
|
+
end
|
|
27
38
|
end
|
|
28
39
|
spec.fold_bases('wxApp' => 'wxAppConsole', 'wxAppConsole' => 'wxEventFilter')
|
|
29
40
|
spec.override_inheritance_chain('wxApp', %w[wxEvtHandler wxObject])
|
|
@@ -195,6 +206,11 @@ module WXRuby3
|
|
|
195
206
|
<< ' ' << StringValuePtr(msg) << '(' << StringValuePtr(err_name) << ')' << std::endl
|
|
196
207
|
<< "\\tfrom " << StringValuePtr(bt) << std::endl << std::endl;
|
|
197
208
|
}
|
|
209
|
+
|
|
210
|
+
WXRUBY_EXPORT void wxRuby_RegisterDeferredObjectDestroy(void* object, void(*free)(void*))
|
|
211
|
+
{
|
|
212
|
+
wxRubyApp::wxRuby_RegisterDeferredObjectDestroy(object, free);
|
|
213
|
+
}
|
|
198
214
|
__HEREDOC
|
|
199
215
|
super
|
|
200
216
|
end
|
|
@@ -88,7 +88,7 @@ module WXRuby3
|
|
|
88
88
|
v_ret = rb_funcall(self, create_bitmap_id(), 3, v_id, v_client, v_size);
|
|
89
89
|
|
|
90
90
|
if (v_ret != Qnil)
|
|
91
|
-
return *((wxBitmap *)
|
|
91
|
+
return *((wxBitmap *)WXRUBY_WRAPPER_DATA_PTR(v_ret));
|
|
92
92
|
else
|
|
93
93
|
return wxNullBitmap;
|
|
94
94
|
}
|
|
@@ -106,7 +106,7 @@ module WXRuby3
|
|
|
106
106
|
v_ret = rb_funcall(self, create_bitmap_bundle_id(), 3, v_id, v_client, v_size);
|
|
107
107
|
|
|
108
108
|
if (v_ret != Qnil)
|
|
109
|
-
return *((wxBitmapBundle *)
|
|
109
|
+
return *((wxBitmapBundle *)WXRUBY_WRAPPER_DATA_PTR(v_ret));
|
|
110
110
|
else
|
|
111
111
|
return wxBitmapBundle();
|
|
112
112
|
}
|
|
@@ -124,7 +124,7 @@ module WXRuby3
|
|
|
124
124
|
v_ret = rb_funcall(self, create_icon_bundle_id(), 2, v_id, v_client);
|
|
125
125
|
|
|
126
126
|
if (v_ret != Qnil)
|
|
127
|
-
return *((wxIconBundle *)
|
|
127
|
+
return *((wxIconBundle *)WXRUBY_WRAPPER_DATA_PTR(v_ret));
|
|
128
128
|
else
|
|
129
129
|
return wxIconBundle();
|
|
130
130
|
}
|
|
@@ -16,6 +16,7 @@ module WXRuby3
|
|
|
16
16
|
|
|
17
17
|
def setup
|
|
18
18
|
super
|
|
19
|
+
spec.add_swig_code '%markfunc wxAuiMDIChildFrame "GC_mark_wxAuiMDIChildFrame";'
|
|
19
20
|
spec.no_proxy 'wxAuiMDIChildFrame::Layout'
|
|
20
21
|
# incorrectly documented non-existent virtual method
|
|
21
22
|
# (does exist as non-virtual method in TopLevelWindow with return by value)
|
|
@@ -68,6 +69,29 @@ module WXRuby3
|
|
|
68
69
|
}
|
|
69
70
|
__CODE
|
|
70
71
|
end
|
|
72
|
+
spec.add_header_code <<~__HEREDOC
|
|
73
|
+
WXRUBY_TRACE_GUARD(WxRubyTraceMarkAuiMDIChildFrame, "GC_MARK_AUI_MDI_CHILD_FRAME")
|
|
74
|
+
static void GC_mark_wxAuiMDIChildFrame(void* ptr)
|
|
75
|
+
{
|
|
76
|
+
WXRUBY_TRACE_IF(WxRubyTraceMarkAuiMDIChildFrame, 2)
|
|
77
|
+
WXRUBY_TRACE("> GC_mark_wxAuiMDIChildFrame : " << ptr)
|
|
78
|
+
WXRUBY_TRACE_END
|
|
79
|
+
|
|
80
|
+
if (GC_IsWindowDeleted(ptr)) return;
|
|
81
|
+
|
|
82
|
+
GC_mark_wxWindow(ptr);
|
|
83
|
+
|
|
84
|
+
wxAuiMDIChildFrame* wx_frame = reinterpret_cast<wxAuiMDIChildFrame*> (ptr);
|
|
85
|
+
|
|
86
|
+
// Mark attached menu bars
|
|
87
|
+
wxMenuBar* wx_mb = wx_frame->GetMenuBar();
|
|
88
|
+
rb_gc_mark(SWIG_RubyInstanceFor(wx_mb));
|
|
89
|
+
|
|
90
|
+
WXRUBY_TRACE_IF(WxRubyTraceMarkAuiMDIChildFrame, 2)
|
|
91
|
+
WXRUBY_TRACE("< GC_mark_wxAuiMDIChildFrame : " << ptr)
|
|
92
|
+
WXRUBY_TRACE_END
|
|
93
|
+
}
|
|
94
|
+
__HEREDOC
|
|
71
95
|
end
|
|
72
96
|
end # class AuiMDIChildFrame
|
|
73
97
|
|
|
@@ -46,10 +46,10 @@ module WXRuby3
|
|
|
46
46
|
|
|
47
47
|
static const rb_data_type_t __wxAuiTabCtrl_type = {
|
|
48
48
|
"AuiTabCtrl",
|
|
49
|
-
#if RUBY_API_VERSION_MAJOR >=
|
|
50
|
-
{ NULL, NULL, __wxAuiTabCtrl_size, 0, {}},
|
|
49
|
+
#if RUBY_API_VERSION_MAJOR > 4 || (RUBY_API_VERSION_MAJOR == 4 && RUBY_API_VERSION_MINOR >= 1)
|
|
50
|
+
{ NULL, NULL, __wxAuiTabCtrl_size, 0, 0, {}},
|
|
51
51
|
#else
|
|
52
|
-
{ NULL, NULL, __wxAuiTabCtrl_size, {}},
|
|
52
|
+
{ NULL, NULL, __wxAuiTabCtrl_size, 0, {}},
|
|
53
53
|
#endif
|
|
54
54
|
NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
|
|
55
55
|
};
|
|
@@ -51,17 +51,41 @@ module WXRuby3
|
|
|
51
51
|
if (NIL_P(rb_cp_proxy))
|
|
52
52
|
{
|
|
53
53
|
cpp = new WxRubyComboPopup(popup);
|
|
54
|
+
// wrap the anonymously as we only use the Ruby object as a container for the C++ object
|
|
55
|
+
#ifdef WXRUBY_SWIG_UNTYPED_DATA
|
|
54
56
|
rb_cp_proxy = Data_Wrap_Struct(rb_cObject, 0, 0, cpp);
|
|
57
|
+
#else
|
|
58
|
+
struct swig_ruby_wrapped_object *wrobj;
|
|
59
|
+
rb_cp_proxy = TypedData_Make_Struct(rb_cObject, struct swig_ruby_wrapped_object, &swig_type_data_type, wrobj);
|
|
60
|
+
wrobj->data = cpp;
|
|
61
|
+
#endif
|
|
55
62
|
rb_iv_set(popup, "@_wx_combo_popup_proxy", rb_cp_proxy);
|
|
56
63
|
}
|
|
57
64
|
else
|
|
58
65
|
{
|
|
59
|
-
|
|
66
|
+
cpp = WXRUBY_WRAPPER_DATA_GET(rb_cp_proxy, wxComboPopup);
|
|
60
67
|
}
|
|
61
68
|
}
|
|
62
69
|
return cpp;
|
|
63
70
|
}
|
|
64
71
|
|
|
72
|
+
#ifdef WXRUBY_SWIG_TYPED_DATA
|
|
73
|
+
|
|
74
|
+
static const rb_data_type_t wxruby_wx_combo_popup_data_type = {
|
|
75
|
+
"C++ wxComboPopup class",
|
|
76
|
+
#if RUBY_API_VERSION_MAJOR > 4 || (RUBY_API_VERSION_MAJOR == 4 && RUBY_API_VERSION_MINOR >= 1)
|
|
77
|
+
{ SWIG_Ruby_mark_swig_type, SWIG_Ruby_free_swig_type, 0, 0, 0, {}},
|
|
78
|
+
#else
|
|
79
|
+
{ SWIG_Ruby_mark_swig_type, SWIG_Ruby_free_swig_type, 0, 0, {}},
|
|
80
|
+
#endif
|
|
81
|
+
0, 0
|
|
82
|
+
#ifdef RUBY_TYPED_FREE_IMMEDIATELY
|
|
83
|
+
, SWIG_RUBY_TYPED_DATA_FLAGS
|
|
84
|
+
#endif
|
|
85
|
+
};
|
|
86
|
+
|
|
87
|
+
#endif
|
|
88
|
+
|
|
65
89
|
WXRUBY_EXPORT VALUE wxRuby_ComboPopupToRuby(wxComboPopup* cpp)
|
|
66
90
|
{
|
|
67
91
|
VALUE rb_cpp = Qnil;
|
|
@@ -77,7 +101,16 @@ module WXRuby3
|
|
|
77
101
|
// in this case we're probably working for a wxOwnerDrawnComboBox or wxRichTextListbox
|
|
78
102
|
// with default popup control which is a C++ implemented class without any Ruby linkage.
|
|
79
103
|
// wrap this in the Wx::ComboPopupWx class to provide a Ruby interface
|
|
80
|
-
|
|
104
|
+
|
|
105
|
+
// do not own or track
|
|
106
|
+
#ifdef WXRUBY_SWIG_UNTYPED_DATA
|
|
107
|
+
rb_cpp = Data_Wrap_Struct(g_rb_cComboPopupWx, 0, 0, cpp);
|
|
108
|
+
#else
|
|
109
|
+
struct swig_ruby_wrapped_object *wrobj;
|
|
110
|
+
rb_cpp = TypedData_Make_Struct(g_rb_cComboPopupWx, struct swig_ruby_wrapped_object, &wxruby_wx_combo_popup_data_type, wrobj);
|
|
111
|
+
wrobj->data = cpp;
|
|
112
|
+
#endif
|
|
113
|
+
rb_iv_set(rb_cpp, "@__swigtype__", rb_str_new2("ComboPopup"));
|
|
81
114
|
}
|
|
82
115
|
}
|
|
83
116
|
return rb_cpp;
|
|
@@ -16,13 +16,44 @@ module WXRuby3
|
|
|
16
16
|
super
|
|
17
17
|
spec.items.clear
|
|
18
18
|
spec.add_header_code <<~__HEREDOC
|
|
19
|
-
#include "wxruby-Config.h"
|
|
20
19
|
#include <limits>
|
|
21
20
|
|
|
22
21
|
static const char * __iv_ConfigBase_sc_config = "@config";
|
|
23
22
|
|
|
24
23
|
static WxRuby_ID s_use_hash_config_id("use_hash_config");
|
|
25
24
|
|
|
25
|
+
#ifdef WXRUBY_SWIG_TYPED_DATA
|
|
26
|
+
|
|
27
|
+
static const rb_data_type_t wxruby_config_wx_data_type = {
|
|
28
|
+
"ConfigWx",
|
|
29
|
+
#if RUBY_API_VERSION_MAJOR > 4 || (RUBY_API_VERSION_MAJOR == 4 && RUBY_API_VERSION_MINOR >= 1)
|
|
30
|
+
{ SWIG_Ruby_mark_swig_type, SWIG_Ruby_free_swig_type, 0, 0, 0, {}},
|
|
31
|
+
#else
|
|
32
|
+
{ SWIG_Ruby_mark_swig_type, SWIG_Ruby_free_swig_type, 0, 0, {}},
|
|
33
|
+
#endif
|
|
34
|
+
0, 0
|
|
35
|
+
#ifdef RUBY_TYPED_FREE_IMMEDIATELY
|
|
36
|
+
, SWIG_RUBY_TYPED_DATA_FLAGS
|
|
37
|
+
#endif
|
|
38
|
+
};
|
|
39
|
+
|
|
40
|
+
static const rb_data_type_t wxruby_rb_hash_config_data_type = {
|
|
41
|
+
"Config",
|
|
42
|
+
#if RUBY_API_VERSION_MAJOR > 4 || (RUBY_API_VERSION_MAJOR == 4 && RUBY_API_VERSION_MINOR >= 1)
|
|
43
|
+
{ SWIG_Ruby_mark_swig_type, SWIG_Ruby_free_swig_type, 0, 0, 0, {}},
|
|
44
|
+
#else
|
|
45
|
+
{ SWIG_Ruby_mark_swig_type, SWIG_Ruby_free_swig_type, 0, 0, {}},
|
|
46
|
+
#endif
|
|
47
|
+
0, 0
|
|
48
|
+
#ifdef RUBY_TYPED_FREE_IMMEDIATELY
|
|
49
|
+
, SWIG_RUBY_TYPED_DATA_FLAGS
|
|
50
|
+
#endif
|
|
51
|
+
};
|
|
52
|
+
|
|
53
|
+
#endif
|
|
54
|
+
|
|
55
|
+
#include "wxruby-Config.h"
|
|
56
|
+
|
|
26
57
|
static void
|
|
27
58
|
_free_config_wx(void* cfg)
|
|
28
59
|
{
|
|
@@ -56,7 +87,14 @@ module WXRuby3
|
|
|
56
87
|
if (cfg)
|
|
57
88
|
{
|
|
58
89
|
// wrap the C++ config object
|
|
90
|
+
#ifdef WXRUBY_SWIG_UNTYPED_DATA
|
|
59
91
|
curConfig = Data_Wrap_Struct(g_cConfigWx, 0, 0, cfg);
|
|
92
|
+
#else
|
|
93
|
+
struct swig_ruby_wrapped_object *wrobj;
|
|
94
|
+
curConfig = TypedData_Make_Struct(g_cConfigWx, struct swig_ruby_wrapped_object, &wxruby_config_wx_data_type, wrobj);
|
|
95
|
+
wrobj->data = cfg;
|
|
96
|
+
#endif
|
|
97
|
+
rb_iv_set(curConfig, "@__swigtype__", rb_str_new2("ConfigWx"));
|
|
60
98
|
// store global ConfigBase instance as Ruby instance variable of ConfigBase singleton class
|
|
61
99
|
rb_iv_set(cConfigBase_Singleton, __iv_ConfigBase_sc_config, curConfig);
|
|
62
100
|
}
|
|
@@ -121,7 +159,14 @@ module WXRuby3
|
|
|
121
159
|
if (config) wxConfigBase::Set(nullptr); // reset
|
|
122
160
|
wxConfigBase* new_cfg = wxConfigBase::Create(); // create new C++ instance
|
|
123
161
|
// wrap the C++ config object
|
|
162
|
+
#ifdef WXRUBY_SWIG_UNTYPED_DATA
|
|
124
163
|
curConfig = Data_Wrap_Struct(g_cConfigWx, 0, 0, new_cfg);
|
|
164
|
+
#else
|
|
165
|
+
struct swig_ruby_wrapped_object *wrobj;
|
|
166
|
+
curConfig = TypedData_Make_Struct(g_cConfigWx, struct swig_ruby_wrapped_object, &wxruby_config_wx_data_type, wrobj);
|
|
167
|
+
wrobj->data = new_cfg;
|
|
168
|
+
#endif
|
|
169
|
+
rb_iv_set(curConfig, "@__swigtype__", rb_str_new2("ConfigWx"));
|
|
125
170
|
}
|
|
126
171
|
// store global ConfigBase instance as Ruby instance variable of ConfigBase singleton class
|
|
127
172
|
// (keeps it safe from GC)
|
|
@@ -140,7 +185,14 @@ module WXRuby3
|
|
|
140
185
|
{
|
|
141
186
|
// no global Ruby instance known so can't be wrapped yet (must be C++ instance than)
|
|
142
187
|
// wrap the C++ config object
|
|
188
|
+
#ifdef WXRUBY_SWIG_UNTYPED_DATA
|
|
143
189
|
curConfig = Data_Wrap_Struct(g_cConfigWx, 0, 0, config);
|
|
190
|
+
#else
|
|
191
|
+
struct swig_ruby_wrapped_object *wrobj;
|
|
192
|
+
curConfig = TypedData_Make_Struct(g_cConfigWx, struct swig_ruby_wrapped_object, &wxruby_config_wx_data_type, wrobj);
|
|
193
|
+
wrobj->data = config;
|
|
194
|
+
#endif
|
|
195
|
+
rb_iv_set(curConfig, "@__swigtype__", rb_str_new2("ConfigWx"));
|
|
144
196
|
// store global ConfigBase instance as Ruby instance variable of ConfigBase singleton class
|
|
145
197
|
// (keeps it safe from GC)
|
|
146
198
|
rb_iv_set(cConfigBase_Singleton, __iv_ConfigBase_sc_config, curConfig);
|
|
@@ -180,7 +232,7 @@ module WXRuby3
|
|
|
180
232
|
{
|
|
181
233
|
// need to make config Ruby owned to it gets proper GC handling
|
|
182
234
|
// and the C++ allocated config instance gets destroyed
|
|
183
|
-
|
|
235
|
+
WXRUBY_WRAPPER_DATA_DFREE_SET(curConfig, _free_config_wx);
|
|
184
236
|
}
|
|
185
237
|
|
|
186
238
|
return curConfig; // return old config (if any)
|
|
@@ -202,8 +254,7 @@ module WXRuby3
|
|
|
202
254
|
|
|
203
255
|
static VALUE config_wx_read(int argc, VALUE *argv, VALUE self)
|
|
204
256
|
{
|
|
205
|
-
wxConfigBase *cfg;
|
|
206
|
-
Data_Get_Struct(self, wxConfigBase, cfg);
|
|
257
|
+
wxConfigBase *cfg = WXRUBY_WRAPPER_DATA_GET(self, wxConfigBase);
|
|
207
258
|
|
|
208
259
|
if (argc < 1 || argc > 1)
|
|
209
260
|
{
|
|
@@ -257,8 +308,7 @@ module WXRuby3
|
|
|
257
308
|
|
|
258
309
|
static VALUE config_wx_write(int argc, VALUE *argv, VALUE self)
|
|
259
310
|
{
|
|
260
|
-
wxConfigBase *cfg;
|
|
261
|
-
Data_Get_Struct(self, wxConfigBase, cfg);
|
|
311
|
+
wxConfigBase *cfg = WXRUBY_WRAPPER_DATA_GET(self, wxConfigBase);
|
|
262
312
|
|
|
263
313
|
if (argc < 2 || argc > 2)
|
|
264
314
|
{
|
|
@@ -325,8 +375,7 @@ module WXRuby3
|
|
|
325
375
|
|
|
326
376
|
static VALUE config_wx_for_path(int argc, VALUE *argv, VALUE self)
|
|
327
377
|
{
|
|
328
|
-
wxConfigBase *cfg;
|
|
329
|
-
Data_Get_Struct(self, wxConfigBase, cfg);
|
|
378
|
+
wxConfigBase *cfg = WXRUBY_WRAPPER_DATA_GET(self, wxConfigBase);
|
|
330
379
|
|
|
331
380
|
if (argc < 1 || argc > 1)
|
|
332
381
|
{
|
|
@@ -345,8 +394,7 @@ module WXRuby3
|
|
|
345
394
|
|
|
346
395
|
static VALUE config_wx_delete(int argc, VALUE *argv, VALUE self)
|
|
347
396
|
{
|
|
348
|
-
wxConfigBase *cfg;
|
|
349
|
-
Data_Get_Struct(self, wxConfigBase, cfg);
|
|
397
|
+
wxConfigBase *cfg = WXRUBY_WRAPPER_DATA_GET(self, wxConfigBase);
|
|
350
398
|
|
|
351
399
|
if (argc < 1 || argc > 1)
|
|
352
400
|
{
|
|
@@ -367,8 +415,7 @@ module WXRuby3
|
|
|
367
415
|
|
|
368
416
|
static VALUE config_wx_rename(int argc, VALUE *argv, VALUE self)
|
|
369
417
|
{
|
|
370
|
-
wxConfigBase *cfg;
|
|
371
|
-
Data_Get_Struct(self, wxConfigBase, cfg);
|
|
418
|
+
wxConfigBase *cfg = WXRUBY_WRAPPER_DATA_GET(self, wxConfigBase);
|
|
372
419
|
|
|
373
420
|
if (argc < 2 || argc > 2)
|
|
374
421
|
{
|
|
@@ -390,8 +437,7 @@ module WXRuby3
|
|
|
390
437
|
|
|
391
438
|
static VALUE config_wx_each_entry(int argc, VALUE *argv, VALUE self)
|
|
392
439
|
{
|
|
393
|
-
wxConfigBase *cfg;
|
|
394
|
-
Data_Get_Struct(self, wxConfigBase, cfg);
|
|
440
|
+
wxConfigBase *cfg = WXRUBY_WRAPPER_DATA_GET(self, wxConfigBase);
|
|
395
441
|
|
|
396
442
|
if (argc < 0 || argc > 0)
|
|
397
443
|
{
|
|
@@ -415,8 +461,7 @@ module WXRuby3
|
|
|
415
461
|
|
|
416
462
|
static VALUE config_wx_each_group(int argc, VALUE *argv, VALUE self)
|
|
417
463
|
{
|
|
418
|
-
wxConfigBase *cfg;
|
|
419
|
-
Data_Get_Struct(self, wxConfigBase, cfg);
|
|
464
|
+
wxConfigBase *cfg = WXRUBY_WRAPPER_DATA_GET(self, wxConfigBase);
|
|
420
465
|
|
|
421
466
|
if (argc < 0 || argc > 0)
|
|
422
467
|
{
|
|
@@ -440,8 +485,7 @@ module WXRuby3
|
|
|
440
485
|
|
|
441
486
|
static VALUE config_wx_number_of_entries(int argc, VALUE *argv, VALUE self)
|
|
442
487
|
{
|
|
443
|
-
wxConfigBase *cfg;
|
|
444
|
-
Data_Get_Struct(self, wxConfigBase, cfg);
|
|
488
|
+
wxConfigBase *cfg = WXRUBY_WRAPPER_DATA_GET(self, wxConfigBase);
|
|
445
489
|
|
|
446
490
|
if (argc < 0 || argc > 2)
|
|
447
491
|
{
|
|
@@ -454,8 +498,7 @@ module WXRuby3
|
|
|
454
498
|
|
|
455
499
|
static VALUE config_wx_number_of_groups(int argc, VALUE *argv, VALUE self)
|
|
456
500
|
{
|
|
457
|
-
wxConfigBase *cfg;
|
|
458
|
-
Data_Get_Struct(self, wxConfigBase, cfg);
|
|
501
|
+
wxConfigBase *cfg = WXRUBY_WRAPPER_DATA_GET(self, wxConfigBase);
|
|
459
502
|
|
|
460
503
|
if (argc < 0 || argc > 2)
|
|
461
504
|
{
|
|
@@ -468,8 +511,7 @@ module WXRuby3
|
|
|
468
511
|
|
|
469
512
|
static VALUE config_wx_has_entry(int argc, VALUE *argv, VALUE self)
|
|
470
513
|
{
|
|
471
|
-
wxConfigBase *cfg;
|
|
472
|
-
Data_Get_Struct(self, wxConfigBase, cfg);
|
|
514
|
+
wxConfigBase *cfg = WXRUBY_WRAPPER_DATA_GET(self, wxConfigBase);
|
|
473
515
|
|
|
474
516
|
if (argc < 1 || argc > 1)
|
|
475
517
|
{
|
|
@@ -481,8 +523,7 @@ module WXRuby3
|
|
|
481
523
|
|
|
482
524
|
static VALUE config_wx_has_group(int argc, VALUE *argv, VALUE self)
|
|
483
525
|
{
|
|
484
|
-
wxConfigBase *cfg;
|
|
485
|
-
Data_Get_Struct(self, wxConfigBase, cfg);
|
|
526
|
+
wxConfigBase *cfg = WXRUBY_WRAPPER_DATA_GET(self, wxConfigBase);
|
|
486
527
|
|
|
487
528
|
if (argc < 1 || argc > 1)
|
|
488
529
|
{
|
|
@@ -494,8 +535,7 @@ module WXRuby3
|
|
|
494
535
|
|
|
495
536
|
static VALUE config_wx_path(int argc, VALUE *argv, VALUE self)
|
|
496
537
|
{
|
|
497
|
-
wxConfigBase *cfg;
|
|
498
|
-
Data_Get_Struct(self, wxConfigBase, cfg);
|
|
538
|
+
wxConfigBase *cfg = WXRUBY_WRAPPER_DATA_GET(self, wxConfigBase);
|
|
499
539
|
|
|
500
540
|
if (argc < 0 || argc > 2)
|
|
501
541
|
{
|
|
@@ -506,8 +546,7 @@ module WXRuby3
|
|
|
506
546
|
|
|
507
547
|
static VALUE config_wx_clear(int argc, VALUE *argv, VALUE self)
|
|
508
548
|
{
|
|
509
|
-
wxConfigBase *cfg;
|
|
510
|
-
Data_Get_Struct(self, wxConfigBase, cfg);
|
|
549
|
+
wxConfigBase *cfg = WXRUBY_WRAPPER_DATA_GET(self, wxConfigBase);
|
|
511
550
|
|
|
512
551
|
if (argc < 0 || argc > 2)
|
|
513
552
|
{
|
|
@@ -518,8 +557,7 @@ module WXRuby3
|
|
|
518
557
|
|
|
519
558
|
static VALUE config_wx_is_expanding_env_vars(int argc, VALUE *argv, VALUE self)
|
|
520
559
|
{
|
|
521
|
-
wxConfigBase *cfg;
|
|
522
|
-
Data_Get_Struct(self, wxConfigBase, cfg);
|
|
560
|
+
wxConfigBase *cfg = WXRUBY_WRAPPER_DATA_GET(self, wxConfigBase);
|
|
523
561
|
|
|
524
562
|
if (argc != 0)
|
|
525
563
|
{
|
|
@@ -530,8 +568,7 @@ module WXRuby3
|
|
|
530
568
|
|
|
531
569
|
static VALUE config_wx_set_expand_env_vars(int argc, VALUE *argv, VALUE self)
|
|
532
570
|
{
|
|
533
|
-
wxConfigBase *cfg;
|
|
534
|
-
Data_Get_Struct(self, wxConfigBase, cfg);
|
|
571
|
+
wxConfigBase *cfg = WXRUBY_WRAPPER_DATA_GET(self, wxConfigBase);
|
|
535
572
|
|
|
536
573
|
if (argc < 1 || argc > 1)
|
|
537
574
|
{
|
|
@@ -561,7 +598,16 @@ module WXRuby3
|
|
|
561
598
|
config_allocate(int argc, VALUE *argv, VALUE self)
|
|
562
599
|
#endif
|
|
563
600
|
{
|
|
564
|
-
VALUE vresult
|
|
601
|
+
VALUE vresult;
|
|
602
|
+
#ifdef WXRUBY_SWIG_UNTYPED_DATA
|
|
603
|
+
vresult = Data_Wrap_Struct(g_cConfig, 0, _free_config, 0);
|
|
604
|
+
#else
|
|
605
|
+
struct swig_ruby_wrapped_object *wrobj;
|
|
606
|
+
vresult = TypedData_Make_Struct(g_cConfig, struct swig_ruby_wrapped_object, &wxruby_rb_hash_config_data_type, wrobj);
|
|
607
|
+
wrobj->data = 0;
|
|
608
|
+
wrobj->dfree = _free_config;
|
|
609
|
+
#endif
|
|
610
|
+
rb_iv_set(vresult, "@__swigtype__", rb_str_new2("Config"));
|
|
565
611
|
#ifndef HAVE_RB_DEFINE_ALLOC_FUNC
|
|
566
612
|
rb_obj_call_init(vresult, argc, argv);
|
|
567
613
|
#endif
|
|
@@ -82,7 +82,7 @@ module WXRuby3
|
|
|
82
82
|
for (VALUE data_obj : do_list)
|
|
83
83
|
{
|
|
84
84
|
WXRUBY_TRACE_IF(WxRubyTraceGCCompositeDataObject, 2)
|
|
85
|
-
WXRUBY_TRACE_WITH(void *c_ptr = (
|
|
85
|
+
WXRUBY_TRACE_WITH(void *c_ptr = (WXRUBY_HAS_WRAPPED_DATA(data_obj) ? WXRUBY_WRAPPER_DATA_PTR(data_obj) : 0))
|
|
86
86
|
WXRUBY_TRACE("| GC_mark_wxCompositeDataObject : " << it->first << "|" << (void*)c_ptr)
|
|
87
87
|
WXRUBY_TRACE_END
|
|
88
88
|
|
|
@@ -46,8 +46,7 @@ module WXRuby3
|
|
|
46
46
|
|
|
47
47
|
static VALUE wxRuby_WXDT2RBT(VALUE rbdt)
|
|
48
48
|
{
|
|
49
|
-
wxDateTime* wxdt =
|
|
50
|
-
Data_Get_Struct(rbdt, wxDateTime, wxdt);
|
|
49
|
+
wxDateTime* wxdt = WXRUBY_WRAPPER_DATA_GET(rbdt, wxDateTime);
|
|
51
50
|
int year = wxdt->GetYear();
|
|
52
51
|
VALUE y = INT2NUM(year);
|
|
53
52
|
VALUE mon = INT2NUM(wxdt->GetMonth() + 1);
|
|
@@ -67,7 +66,15 @@ module WXRuby3
|
|
|
67
66
|
// depending on the timezone, the local January the first 1970 may be out of range.
|
|
68
67
|
// for 2038 not the entire year is available in the numerical representation.
|
|
69
68
|
void* ptr = const_cast<wxDateTime*> (&dt);
|
|
70
|
-
VALUE rbdt
|
|
69
|
+
VALUE rbdt;
|
|
70
|
+
// wrap the wxDateTime* anonymously (we only want to temporarily pass it here to the conversion method)
|
|
71
|
+
#ifdef WXRUBY_SWIG_UNTYPED_DATA
|
|
72
|
+
rbdt = Data_Wrap_Struct(rb_cObject, 0, 0, ptr);
|
|
73
|
+
#else
|
|
74
|
+
struct swig_ruby_wrapped_object *wrobj;
|
|
75
|
+
rbdt = TypedData_Make_Struct(rb_cObject, struct swig_ruby_wrapped_object, &swig_type_data_type, wrobj);
|
|
76
|
+
wrobj->data = ptr;
|
|
77
|
+
#endif
|
|
71
78
|
ruby_value = rb_rescue2(VALUEFUNC(wxRuby_WXDT2RBT), rbdt, VALUEFUNC(rescue), Qnil, rb_eException, 0);
|
|
72
79
|
if (ruby_value == Qnil)
|
|
73
80
|
{
|
|
@@ -38,7 +38,7 @@ module WXRuby3
|
|
|
38
38
|
}
|
|
39
39
|
return rc;
|
|
40
40
|
}
|
|
41
|
-
|
|
41
|
+
__HEREDOC
|
|
42
42
|
# not relevant anymore
|
|
43
43
|
spec.ignore 'wxScreenDC::StartDrawingOnTop',
|
|
44
44
|
'wxScreenDC::EndDrawingOnTop',
|
|
@@ -82,14 +82,14 @@ module WXRuby3
|
|
|
82
82
|
return Qfalse;
|
|
83
83
|
#endif
|
|
84
84
|
}
|
|
85
|
-
|
|
85
|
+
__HEREDOC
|
|
86
86
|
spec.add_extend_code 'wxPaintDC', <<~__HEREDOC
|
|
87
87
|
#include "wx/dcbuffer.h"
|
|
88
88
|
static VALUE has_native_double_buffer()
|
|
89
89
|
{
|
|
90
90
|
return do_check_native_double_buffer();
|
|
91
91
|
}
|
|
92
|
-
|
|
92
|
+
__HEREDOC
|
|
93
93
|
when 'wxMemoryDC'
|
|
94
94
|
spec.items << 'wxBufferedDC' << 'wxBufferedPaintDC'
|
|
95
95
|
spec.override_inheritance_chain('wxMemoryDC', ['wxDC', { 'wxReadOnlyDC' => 'wxDC' }, 'wxObject']) if Config.instance.wx_version_check('3.3.0') >= 0
|
|
@@ -249,6 +249,9 @@ module WXRuby3
|
|
|
249
249
|
when 'wxSVGFileDC'
|
|
250
250
|
spec.override_inheritance_chain('wxSVGFileDC', ['wxDC', { 'wxReadOnlyDC' => 'wxDC' }, 'wxObject']) if Config.instance.wx_version_check('3.3.0') >= 0
|
|
251
251
|
spec.items.concat %w[wxSVGBitmapHandler wxSVGBitmapFileHandler wxSVGBitmapEmbedHandler]
|
|
252
|
+
if Config.instance.wx_version_check('3.3.2') > 0
|
|
253
|
+
spec.items.concat %w[wxSVGAttributes]
|
|
254
|
+
end
|
|
252
255
|
spec.make_abstract 'wxSVGFileDC'
|
|
253
256
|
spec.ignore 'wxSVGFileDC::wxSVGFileDC'
|
|
254
257
|
# like all DC this should best always be a temporary stack object
|
|
@@ -284,6 +287,12 @@ module WXRuby3
|
|
|
284
287
|
'wxSVGFileDC::EndDoc',
|
|
285
288
|
'wxSVGFileDC::StartPage',
|
|
286
289
|
'wxSVGFileDC::EndPage'
|
|
290
|
+
if Config.instance.wx_version_check('3.3.2') > 0
|
|
291
|
+
# simplify/optimize mapping for wxSVGAttributes return values
|
|
292
|
+
spec.map 'wxSVGAttributes&' => 'Wx::SVGAttributes' do
|
|
293
|
+
map_out code: '$result = self; (void)$1;' # simply return the 'self' argument
|
|
294
|
+
end
|
|
295
|
+
end
|
|
287
296
|
when 'wxGCDC'
|
|
288
297
|
spec.override_inheritance_chain('wxGCDC', ['wxDC', { 'wxReadOnlyDC' => 'wxDC' }, 'wxObject']) if Config.instance.wx_version_check('3.3.0') >= 0
|
|
289
298
|
spec.make_abstract 'wxGCDC'
|
|
@@ -311,7 +320,7 @@ module WXRuby3
|
|
|
311
320
|
}
|
|
312
321
|
return rc;
|
|
313
322
|
}
|
|
314
|
-
|
|
323
|
+
__HEREDOC
|
|
315
324
|
end
|
|
316
325
|
spec.add_extend_code 'wxGCDC', <<~__HEREDOC
|
|
317
326
|
static VALUE draw_on()
|
|
@@ -386,7 +395,7 @@ module WXRuby3
|
|
|
386
395
|
}
|
|
387
396
|
return rc;
|
|
388
397
|
}
|
|
389
|
-
|
|
398
|
+
__HEREDOC
|
|
390
399
|
spec.disown 'wxGraphicsContext *gc'
|
|
391
400
|
spec.ignore 'wxGCDC::wxGCDC(const wxEnhMetaFileDC &)'
|
|
392
401
|
when 'wxScaledDC'
|
|
@@ -422,7 +431,7 @@ module WXRuby3
|
|
|
422
431
|
return rc;
|
|
423
432
|
}
|
|
424
433
|
};
|
|
425
|
-
|
|
434
|
+
__HEREDOC
|
|
426
435
|
spec.swig_import %w[ext/wxruby3/swig/classes/include/wxObject.h
|
|
427
436
|
ext/wxruby3/swig/classes/include/wxDC.h]
|
|
428
437
|
spec.add_interface_code <<~__HEREDOC
|
|
@@ -433,7 +442,7 @@ module WXRuby3
|
|
|
433
442
|
protected:
|
|
434
443
|
wxScaledDC(wxDC& target, double scale);
|
|
435
444
|
};
|
|
436
|
-
|
|
445
|
+
__HEREDOC
|
|
437
446
|
when 'wxPrinterDC'
|
|
438
447
|
spec.override_inheritance_chain('wxPrinterDC', ['wxDC', { 'wxReadOnlyDC' => 'wxDC' }, 'wxObject']) if Config.instance.wx_version_check('3.3.0') >= 0
|
|
439
448
|
spec.make_abstract 'wxPrinterDC'
|
|
@@ -513,41 +522,41 @@ module WXRuby3
|
|
|
513
522
|
}
|
|
514
523
|
return rc;
|
|
515
524
|
}
|
|
516
|
-
|
|
525
|
+
__HEREDOC
|
|
517
526
|
if Config.instance.wx_version_check('3.3.0') >= 0
|
|
518
527
|
spec.items << 'wxOverlayDC'
|
|
519
528
|
spec.override_inheritance_chain('wxOverlayDC', ['wxDC', { 'wxReadOnlyDC' => 'wxDC' }, 'wxObject'])
|
|
520
529
|
spec.make_abstract 'wxOverlayDC'
|
|
521
530
|
spec.ignore 'wxOverlayDC::wxOverlayDC'
|
|
522
531
|
spec.add_extend_code 'wxOverlayDC', <<~__HEREDOC
|
|
523
|
-
|
|
524
|
-
{
|
|
525
|
-
if (!wxRuby_IsAppRunning())
|
|
526
|
-
rb_raise(rb_eRuntimeError, "A running Wx::App is required.");
|
|
527
|
-
VALUE rc = Qnil;
|
|
528
|
-
if (rb_block_given_p ())
|
|
532
|
+
static VALUE draw_on(wxOverlay &overlay, wxWindow *win)
|
|
529
533
|
{
|
|
530
|
-
|
|
531
|
-
|
|
532
|
-
VALUE
|
|
533
|
-
|
|
534
|
+
if (!wxRuby_IsAppRunning())
|
|
535
|
+
rb_raise(rb_eRuntimeError, "A running Wx::App is required.");
|
|
536
|
+
VALUE rc = Qnil;
|
|
537
|
+
if (rb_block_given_p ())
|
|
538
|
+
{
|
|
539
|
+
wxOverlayDC ovl_dc(overlay, win);
|
|
540
|
+
wxOverlayDC* ovl_dc_ptr = &ovl_dc;
|
|
541
|
+
VALUE rb_dc = SWIG_NewPointerObj(SWIG_as_voidptr(ovl_dc_ptr), SWIGTYPE_p_wxOverlayDC, 0);
|
|
542
|
+
rc = rb_yield(rb_dc);
|
|
543
|
+
}
|
|
544
|
+
return rc;
|
|
534
545
|
}
|
|
535
|
-
|
|
536
|
-
}
|
|
537
|
-
static VALUE draw_on(wxOverlay &overlay, wxWindow *win, const wxRect &rect)
|
|
538
|
-
{
|
|
539
|
-
if (!wxRuby_IsAppRunning())
|
|
540
|
-
rb_raise(rb_eRuntimeError, "A running Wx::App is required.");
|
|
541
|
-
VALUE rc = Qnil;
|
|
542
|
-
if (rb_block_given_p ())
|
|
546
|
+
static VALUE draw_on(wxOverlay &overlay, wxWindow *win, const wxRect &rect)
|
|
543
547
|
{
|
|
544
|
-
|
|
545
|
-
|
|
546
|
-
VALUE
|
|
547
|
-
|
|
548
|
+
if (!wxRuby_IsAppRunning())
|
|
549
|
+
rb_raise(rb_eRuntimeError, "A running Wx::App is required.");
|
|
550
|
+
VALUE rc = Qnil;
|
|
551
|
+
if (rb_block_given_p ())
|
|
552
|
+
{
|
|
553
|
+
wxOverlayDC ovl_dc(overlay, win, rect);
|
|
554
|
+
wxOverlayDC* ovl_dc_ptr = &ovl_dc;
|
|
555
|
+
VALUE rb_dc = SWIG_NewPointerObj(SWIG_as_voidptr(ovl_dc_ptr), SWIGTYPE_p_wxOverlayDC, 0);
|
|
556
|
+
rc = rb_yield(rb_dc);
|
|
557
|
+
}
|
|
558
|
+
return rc;
|
|
548
559
|
}
|
|
549
|
-
return rc;
|
|
550
|
-
}
|
|
551
560
|
__HEREDOC
|
|
552
561
|
end
|
|
553
562
|
else
|
|
@@ -16,14 +16,16 @@ module WXRuby3
|
|
|
16
16
|
|
|
17
17
|
def setup
|
|
18
18
|
super
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
19
|
+
if Config.instance.wx_version_check('3.3.3') < 0
|
|
20
|
+
# methods missing from docs
|
|
21
|
+
spec.extend_interface 'wxEditableListBox',
|
|
22
|
+
'wxListCtrl* GetListCtrl()',
|
|
23
|
+
'wxBitmapButton* GetDelButton()',
|
|
24
|
+
'wxBitmapButton* GetNewButton()',
|
|
25
|
+
'wxBitmapButton* GetUpButton()',
|
|
26
|
+
'wxBitmapButton* GetDownButton()',
|
|
27
|
+
'wxBitmapButton* GetEditButton()'
|
|
28
|
+
end
|
|
27
29
|
# redefine this
|
|
28
30
|
spec.ignore 'wxEditableListBox::GetStrings', ignore_doc: false
|
|
29
31
|
spec.add_extend_code 'wxEditableListBox', <<~__HEREDOC
|