require "formula"
class Wxmac < Formula
  homepage "http://www.wxwidgets.org"
  url "https://downloads.sourceforge.net/project/wxwindows/3.0.2/wxWidgets-3.0.2.tar.bz2"
  sha1 "6461eab4428c0a8b9e41781b8787510484dea800"
  bottle do
    revision 8
    sha1 "42ad0a415013533981111c93a33a1a07fd6034ac" => :yosemite
    sha1 "0bc175a25820885e15badf56745f99338f77b771" => :mavericks
    sha1 "d5f2ca56c1e7f27c43c714824a411740f1536b2b" => :mountain_lion
  end
  depends_on "jpeg"
  depends_on "libpng"
  depends_on "libtiff"
  # Various fixes related to Yosemite. Revisit in next stable release.
  # Please keep an eye on http://trac.wxwidgets.org/ticket/16329 as well
  # Theoretically the above linked patch should still be needed, but it isn't. Try to find out why.
  patch :DATA
  def install
    # need to set with-macosx-version-min to avoid configure defaulting to 10.5
    # need to enable universal binary build in order to build all x86_64
    # Jack - I don't believe this is the whole story, surely this can be fixed
    # without building universal for users who don't need it.
    # headers need to specify x86_64 and i386 or will try to build for ppc arch
    # and fail on newer OSes
    # DomT4 - MacPorts seems to have stopped building universal by default? Can we do the same?
    # https://trac.macports.org/browser/trunk/dports/graphics/wxWidgets-3.0/Portfile#L210
    ENV.universal_binary
    args = [
      "--disable-debug",
      "--prefix=#{prefix}",
      "--enable-shared",
      "--enable-unicode",
      "--enable-std_string",
      "--enable-display",
      "--with-opengl",
      "--with-osx_cocoa",
      "--with-libjpeg",
      "--with-libtiff",
      # Otherwise, even in superenv, the internal libtiff can pick
      # up on a nonuniversal xz and fail
      # https://github.com/Homebrew/homebrew/issues/22732
      "--without-liblzma",
      "--with-libpng",
      "--with-zlib",
      "--enable-dnd",
      "--enable-clipboard",
      "--enable-webkit",
      "--enable-svg",
      "--enable-mediactrl",
      "--enable-graphics_ctx",
      "--enable-controls",
      "--enable-dataviewctrl",
      "--with-expat",
      "--with-macosx-version-min=#{MacOS.version}",
      "--enable-universal_binary=#{Hardware::CPU.universal_archs.join(',')}",
      "--disable-precomp-headers",
      # This is the default option, but be explicit
      "--disable-monolithic"
    ]
    system "./configure", *args
    system "make", "install"
  end
end
__END__
diff --git a/include/wx/defs.h b/include/wx/defs.h
index 397ddd7..d128083 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -3169,12 +3169,20 @@ DECLARE_WXCOCOA_OBJC_CLASS(UIImage);
 DECLARE_WXCOCOA_OBJC_CLASS(UIEvent);
 DECLARE_WXCOCOA_OBJC_CLASS(NSSet);
 DECLARE_WXCOCOA_OBJC_CLASS(EAGLContext);
+DECLARE_WXCOCOA_OBJC_CLASS(UIWebView);
 
 typedef WX_UIWindow WXWindow;
 typedef WX_UIView WXWidget;
 typedef WX_EAGLContext WXGLContext;
 typedef WX_NSString* WXGLPixelFormat;
 
+typedef WX_UIWebView OSXWebViewPtr;
+
+#endif
+
+#if wxOSX_USE_COCOA_OR_CARBON
+DECLARE_WXCOCOA_OBJC_CLASS(WebView);
+typedef WX_WebView OSXWebViewPtr;
 #endif
 
 #endif /* __WXMAC__ */
diff --git a/include/wx/html/webkit.h b/include/wx/html/webkit.h
index 8700367..f805099 100644
--- a/include/wx/html/webkit.h
+++ b/include/wx/html/webkit.h
@@ -18,7 +18,6 @@
 #endif
 
 #include "wx/control.h"
-DECLARE_WXCOCOA_OBJC_CLASS(WebView); 
 
 // ----------------------------------------------------------------------------
 // Web Kit Control
@@ -107,7 +106,7 @@ private:
     wxString m_currentURL;
     wxString m_pageTitle;
 
-    WX_WebView m_webView;
+    OSXWebViewPtr m_webView;
 
     // we may use this later to setup our own mouse events,
     // so leave it in for now.
diff --git a/include/wx/osx/webview_webkit.h b/include/wx/osx/webview_webkit.h
index 803f8b0..438e532 100644
--- a/include/wx/osx/webview_webkit.h
+++ b/include/wx/osx/webview_webkit.h
@@ -158,7 +158,7 @@ private:
     wxWindowID m_windowID;
     wxString m_pageTitle;
 
-    wxObjCID m_webView;
+    OSXWebViewPtr m_webView;
 
     // we may use this later to setup our own mouse events,
     // so leave it in for now.
ion>
4726-breadcrumb 
4727-clone-compliance-control-set 
4728-hstore-presence-validation 
4774-compliance_control_sets-filters 
4776-compliance_controls_policy 
4800-hstore-numeric-validation 
4812-display_empty_compliance_control_blocks 
4817-better-traduction 
4820_refactoring_breadcrumb 
4824-create_line_referentials 
4944_remove_route_section_code 
4951-spec-to-validate-that-primary-and-foreign-keys-in-the-database-are-type-bigint 
4981_last_editor 
4986-compliance_control_sets_fix 
4987-compliance_check-sets_show 
5006-wb_import_filter_refs_with_foreign_lines 
5102-begin_of_association_chain 
5102-verify_line-refs_org_in_controllers 
5111-begin_of_association_chain 
5111-verify_stop_area_org_in_controllers 
5113-update-logo 
5119_i18n_dashboard 
5129-import-report-button 
5130-del_fk_compliance_ctrl_set_in_compliance_check_sets 
5137-timetable-color 
5140-wb_index_show_only_collaborators 
5150_decorator_policy 
5156-handle-long-distance-routes 
5163-5164-export-csv 
5179-ref_creation_enforces_objectid_format 
5197-compliance-control-set-view-spec 
5198-bis-wkbch-view-spec-modal-with-js 
5206-multiple-selection-refactoring 
5253-truncate-breadcrumb 
5281-workbench-import-structural-bug-reading-zip 
5287-clean-links-in-stop-areas-index 
5291-disable-useless-checkboxes-on-referentials-index 
5297_fix_referential_create_validation 
5299-merge-operation 
5305_autocomplete_stop_area_unaccent 
5307_referential_lines_menu 
5311-stop-area-type-customizable 
5313_stop_areas_parent 
5321-remove-duplicated-field-in-new-line-form 
5325-use-policies-for-calendars-sharing 
5331-display-users-name 
5333-add-policies-for-referentials-sharing 
5334-add-nulldb-support 
5336-spurious-buttons 
5339-organisation-and-features 
5340-deactivate-lines 
5341-create-referential-vehiclejourneys-controller 
5348_clickable_brandname 
5349-deactivate-stop-areas 
5351-stop-area-waiting-time 
5355-add-button-to-opposite-itinerary-timetable 
5358-fix-undefined-in-header 
5361-make-company-optional-on-lines 
5367-add-color-input 
5372-clean-referential-after-cloning 
5372-clean-with-metadata-2 
5376-fix-vehicle-journeys-ui 
5382-all-stop-types-in-routes 
5392-add-beradcrumb-on-referential-form 
5407-add-purchase-windows-to-vehicle-journeys 
5409-add_purchase_window_to_date_filters 
5413-read_only_policy_for_finalised_refs 
5416_checksum_attribute--original 
5416_checksum_attribute--rb201802071702 
5417-checksum-relationships 
5426-refactor-sticky-actions 
5427_stop_area_country_select 
5433-show-journeys-name-in-editor 
5435-fix-journey-edition-from-editor 
5436-keep-stops-order-on-routes-cloning 
5444-add-company-filter-on-journeys-index 
5444-add-company-filter-on-referentialjourneys-index 
5445-add-name-filter-on-journeys-index 
5445-add-name-filter-on-referentialjourneys-index 
5448-fix-objectid-filters 
5454-revert-cancel-button-on-journeys-editor 
5455-store-costs-between-stops 
5460_display_checksum 
5465-dezoom-routes-show 
5466-fix-title-overflow-in-stick-header 
5485-first-docker-scripts 
5486-fix-react-warnings 
5493-use-tz-for-time-display 
5499-workgroup-model 
5502-remove-search-from-selects 
5505-custom_fields 
5505-custom_fields_with_jsonb 
5506-testdb_migration_after_rollback 
5519-single-day-purchse-windows 
5520-fix-company-in-vjs-editor 
5529-prevent-double-submitting-of-react-forms 
5535-compute-vehicle-journeys-times 
5547-show-vj-id 
5549_networks_policy 
5551-handle-custom-fields-in-vjs-editor 
5556-total-time-on-j-editor 
5557-fix-calendar-creation 
5560-add-validation-on-customfields 
5563-show-parent-stop-type 
5567-routes-map-on-line-show 
5568-fix-vjs-editor 
5571-remove-pagination-on-referential-vjs-index 
5574-vehicle-journeys--fix-transporter-deletion-in-modal--rb 
5576-vehicle-journeys--filter-by-line 
5585_stop_area_waiting_time 
5586-refactor-action-links 
5592-workbenches-show--filter-by-workgroup-on-initial-load 
5593-task-to-update-checksum 
5598-fix-journey-patterns-collection 
5609_referential_slug 
5609_slug_format 
5610_vehicle_journey_published_journey_name 
5614-fix-schedule-computation 
5623-fix-schedule-when-jp-is-prefilled 
5642-insee-code 
5647-scope-custom-fields-validations 
5669-specs-snpashots 
5670-user-registration-i18n 
5682-add-days-to-calendars 
5683-add_workgroup_id_to_calendars 
5709_fix_ccset_sorting 
5717-fix-periods-on-timetables 
5718-show-times-in-vehiclejourneys-index 
5750-non-commercial-stop-areas 
5754-filter-journeys-on-calendar 
5758-localized-stop-areas-names 
5762-stoparea-coordinates-are-optional 
5763-fix-referentials-list 
5764-add-checksum-to-purchase-windows 
5765-customizable-importer 
5796-fix-vjs-index 
5798-show-return-times-on-vjs-editor 
5807-update-webpacker 
5824-autocomplete-stop-areas-scope 
5825-fix-vjs-index 
5830-fix-route-duplication-button 
5832-fix-filter-by-stopareas-on-vjs-index 
5835-fix-timetable-creation 
5843-bad-translation 
5844-missing-title-on-new-import 
5846-wrong-translation 
5852-sort-journeys-on-times 
5853-detailed-calendar-view-in-vjs-index 
5865-validate-referential-cloning 
5877-handle-nil-objects-in-tablebuilderhelper 
5878-fix-ComplianceChecksController-show 
5879_compliance_control_predicates 
5882_ccset_code_filter 
5888-fix-i18n-in-js 
5899-use-waiting-time-in-schedules 
5903-fix-VJS-editor 
5911-stops-filter-on-referential-journeys-index 
5919-make-coluns-sortable 
5924-extend-importer 
5927-add-bom-header-to-exported-csv 
5934_add_policy_to_stop_point_action_links 
5938-locale-selector 
5940-add-missing-flash 
5942-apply-user-tz 
5944-skip-schedule-calculation-when-no-time-is-set 
5947_fix_route_duplicate_action_link 
5949-referential-date-select 
5950_allow_user_to_see_ccset_from_other_organisation 
5956-merge-purchase-windows 
5979_change_export_csv_filenames 
5989-fix_compliance_check_resource_status 
5990-clear-button-on-referentials 
5993-enhance-detailed-calendar 
5995-update-display-on-vjs-index 
5996-use-local-times-in-journeys-index 
6000_fix_workbench_output_show 
6006-fix-stops-filter 
6008-no-transition-time-for-journeys-start-and-end 
6021-handlke-offsets-in-journeys 
6026-dedicated-env-for-seeds 
6028-compliance-controls-model-attributes 
6033-stop-area-states 
6035-fix-inflections 
6036-fix-journeys-editor 
6039-handle-long-delats-in-vj-editor 
6040-fix-stop-points-poitions-in-merged-routes 
6042-detailed_purchase_windows 
6044_add_ccset_spec_affectation 
6064-inconsistency-in-dashboard 
6068-simple-exporter 
6092-update-custom-fields 
6097-cache-route-WayCosts 
6102-commercial-missions 
6107-bind-stop_area_referential-and-workgroups 
6132-forms-breadcrumb 
6133-new-exports 
6139-generic-compliance-control-numericality-validation 
6143-extra-rows-in-vjs-editor-header 
6146-line-states 
6156-dashboard-translations 
6156-journey_pattern-translations 
6156-vehicle-journey-translations 
6158-compliance-check-transport-submode-display 
6161-missing_var_in_crontab 
6177-compliance-control-metadatas 
6178-change-breadcrumb-name-for-compliance-control 
6179-update-acts_as_list 
6184-add-custom-fields-to-vjs 
6187-dashboard-calendar-link-fix 
6189-fix-i18n-on-stoparea-show 
6190-fix-consistency-issue-with-calendars 
6193-journey-time-in-vj-editors 
6196-ad-custom-fields-on-companies 
6202-fix-ccset-typo 
6210-remove-attributes-from-models 
6213-fix-journey-pattern-editor 
6216-uniformize-simple-interfaces-outputs-folders 
6217-extrapolate-border-passing-times 
6218-sqills-exports 
6218-upload_files_to_exporters 
6222-route-way-costs--use-TomTom-matrix-API-instead-of-batch 
6226-create-opposite-route 
6240-fix-compliance-check-set-index-bug 
6241-compliance-control-set-affectation-labels 
6242-workbench-output 
6252-cc-labels 
6256-compliance-check-set-breadcrumb 
6258-calendar-workgroup 
6259-calendar-mailer 
6292-compliance-control-sets-organisation-filter 
6298-change-companies-breadcrumb 
6300-fix-referentials-numbers-on-dashboard 
6303-vj-edit-modal-label 
6306-translation-in-csv-exports 
6311-fix-calendars-assignment 
6328-check-seeds 
6333-validation-select-type-breadcrumb 
6334-change-csv-export-filename 
6337-fix-dates-input-for-en-locale 
6340-exporter-flatten-services 
6360-workbenchimport-display 
6363-fix-sticky-header 
6366-split-area-types-in-2-cols 
6367-remove-papertrail 
6368-gtfs-import 
6370-translations-2 
6376-translations 
6377-centralize-lines-scope-in-workbenches 
6382-ccblock-breadcrumb 
6382-compliance-control-block-refacto 
6383-stop-point-default-attributes 
6384-display_referential_ready_false 
6386-fix-timetables-editor 
6387-default-values-for-stop-point-alighting-boarding 
6400-vehicle-journey-i18n 
6404-way-costs--snap-distance-and-time-to-1-when-between-0-a 
6405-allow-timtables-without-periods 
6407-route--calculate-way-costs-on-after_commit-instead-of-a 
6410-route--don,t-run-calculate_costs-during-referential-mer 
6411-fix-routes-editor 
6413-fix-journey-patterns 
6415-referential-vehicle-journeys-companies-distinct 
6424-clean-timetable-i18n 
6425-fix-lines-show 
6426-fix-vjs-index 
6433-stop-area-status-sort 
6435-inconsistent-filters-behaviour 
6436-fix-companies-form 
6442-referential-status-sort 
6448-add-sortable-columns-for-timetables 
6449-fix-timetables-editor 
6450-fix-timetable-form 
6453-fix-purchase-windows-index 
6456-fix-vjs-editor 
6458-fix-timetable-autocomplete 
6459-fix-tz-in-vj-editor 
6461-fix-customfields-support 
6462-disable-create-opposite-route-action 
6472-itls-exclusions 
6476-merge-permissions 
6477-use-custom-fields-in-checksums 
6481-inverted-stops 
6483-fix-vjs-editor 
6486-fix-bumpy-front 
6486-fix-font-display 
6491-timetable-confirm-modal-cancel 
6506-lines-index--remove-new-line-link-from-cog-menu--rb2018 
6527-fix-vjs-editor 
6536-fix-lines-form 
6539-format-timezones 
6542-destoy-archived-referential 
6545-add_generic_navbar 
6549-fix-tiletables-specs 
6550-custom)fiezlds-in-journey-patterns 
6551-add_custom_field_values_to_journey_patterns 
6572-make-new-referentials-pending 
6572-referential-states 
6573-fix-checksums-update-task 
6574-sync-actions-in-decorators 
6575-dashboard-workbench-outputs 
6603-missing-translation 
6620-show-waiting-time 
6621-show-all-return-journeys 
6622-fix-loops-in-merge 
6624-update-checksum-on-child-deletion 
6627-add-chouette-favicon 
6627-favicon--make-transparent-and-retina-compatible 
6628-fix-i18n 
6630-clean-up-fix-attempt 
6633-duplicated-error-essages 
6634-update-checksum-on-duplicated-routes 
6638-stop-area-coordinates 
6642-fix-metadata-serialization 
6661-make-TomTom-data-more-consistent 
6664-fix-journeys-creation 
6667-fix-json_serilization 
6668-merges-controller-current-organization 
6669-fix-custom-fields-initialization 
6681-stop-areas--filter-by-registration-number 
6683-uniformize-timezone-formats 
6711-update-parents-checksum 
6762-merge-ignored_routing_contraint_zones 
6779-fix-info-button-on-vjs-editor 
6819-fix-vjs-custom-fields 
6826-fix-times-interpolation 
6827-companies-show-short-id 
6828-fix-purchase-windows-bounding-dates 
6829-fix-vjs-editor 
6830-lines-sort-on-status 
6833-clone-by-command 
6836-fix-checksums 
6841-fix-itls 
6842-merge-opposite-routes 
6844-merge-new-id 
6845-fix-ie 
6852-make-capacity-optional 
6854-clean-up--destroy-routes-outside-referential 
6858-workbenches-show--disallow-deletion-of-pending-referent 
6860-stop-point-show-link 
6863-workbench-show 
6864-fix-schedules-editor 
6867-fix-tilmezones-selector 
6870-workbench-breadcrumb 
6884-tomtom-matrix--handle-error-when-response-doesn,t-inclu 
6920-activate-newly-created-referentials 
6923-consolidated-offer 
6949-compliance-check-set-csv-export-filename 
6950-import-csv-export-filename 
6952-waycost--costs-under-500m-birds-eye-distance-should-sna 
6955-translations 
6955-translations-fixes 
6960-workgroup-edition 
6962-add-cron-class 
6972-fix-consolidated-views 
6976-security-driven-packages-update 
6979-ruby-controls-sets 
6996-dockerfile-build 
6997-enable-signups 
6998-fix-jest-specs 
7004-companies-sort-name 
7030-import-show-i18n 
7031-fox-consolidated-view 
7053-rcz-pagination 
7055-ccset-filters 
7056-fix-jp-editor 
7057-compliance-control-object-reference 
7059-failed-clones 
7073-Fix_imports_details 
7088-workbench-workgroup-configure 
7101-workgroup-controls 
7118-fix-menus 
7159-netex-exports 
7161-spring-cleaning 
7184-timetable-tag-duplicates 
7185-cleanup 
7193-protext-route-way-cost-workers 
7213-destroy-rczs-with-route 
7214-merge-save-with-log 
7217-move-code-back-from-chouette-its 
7225-new-api-endpoints 
7231-rationalize-iev-api 
7259-add-season-attribute-to-line-form 
7260-fix-time-interpolation 
9999-0000-transport-mode-validation 
calendars 
check_policy_specs 
companies_line_referential_association 
compliance_control 
compliance_controls_policy 
custom-clean-on-routes 
developer-toolbar 
docker 
docker-for-staging 
enhance-map-with-several-routes 
enhanced-i18n 
faster-spex 
fix-routes-editor 
fix-timetables-specs 
fix-vehicle-journeys-editor 
fix-vj-creation-with-full-schedule 
fix_http_errors 
ie-fixes 
improve-referentials-overview 
master 
metadata_multiple_periods 
networks_line_referential_association 
new-uniqueness-validation-for-ccblocks 
rationalize-imports-ui 
regression_tests_user_permissions_in_controllers 
revert-502-0000-import_dir_in_docker 
robert-bup 
small-consolidated-view-improvement 
update-INSTALL 
wiki 
with_custom_daterange_attr 
  
Chouette manage transport static data  
blob: 95741f4416f9d3900e512c44b77641d1be112362 (
plain )