162 lines
4.9 KiB
Ruby
162 lines
4.9 KiB
Ruby
class Wxmac < Formula
|
|
desc "wxWidgets, a cross-platform C++ GUI toolkit (for OS X)"
|
|
homepage "https://www.wxwidgets.org"
|
|
revision 2
|
|
|
|
head "https://github.com/wxWidgets/wxWidgets.git"
|
|
|
|
stable do
|
|
url "https://github.com/wxWidgets/wxWidgets/releases/download/v3.0.2/wxWidgets-3.0.2.tar.bz2"
|
|
sha256 "346879dc554f3ab8d6da2704f651ecb504a22e9d31c17ef5449b129ed711585d"
|
|
|
|
# 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
|
|
end
|
|
|
|
bottle do
|
|
cellar :any
|
|
sha256 "3cc5a1c0a2c3a94fdc8ba9fc7664d55f936b95964227ab90a5ea19b904b91418" => :el_capitan
|
|
sha256 "61d719f4a7bd53e3105b8bd41bcf291cec122fe7fb2ab5991bbe462fca2b6d43" => :yosemite
|
|
sha256 "9b137f0338358bdce6afc21e94226a09aa32432563a95173f6f050709e5c8f37" => :mavericks
|
|
end
|
|
|
|
devel do
|
|
url "https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.0/wxWidgets-3.1.0.tar.bz2"
|
|
sha256 "e082460fb6bf14b7dd6e8ac142598d1d3d0b08a7b5ba402fdbf8711da7e66da8"
|
|
end
|
|
|
|
option :universal
|
|
option "with-stl", "use standard C++ classes for everything"
|
|
option "with-static", "build static libraries"
|
|
|
|
depends_on "jpeg"
|
|
depends_on "libpng"
|
|
depends_on "libtiff"
|
|
|
|
def install
|
|
# need to set with-macosx-version-min to avoid configure defaulting to 10.5
|
|
args = [
|
|
"--disable-debug",
|
|
"--prefix=#{prefix}",
|
|
"--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",
|
|
# On 64-bit, enabling mediactrl leads to wxconfig trying to pull
|
|
# in a non-existent 64 bit QuickTime framework. This is submitted
|
|
# upstream and will eventually be fixed, but for now...
|
|
MacOS.prefer_64_bit? ? "--disable-mediactrl" : "--enable-mediactrl",
|
|
"--enable-graphics_ctx",
|
|
"--enable-controls",
|
|
"--enable-dataviewctrl",
|
|
"--with-expat",
|
|
"--disable-precomp-headers",
|
|
"--with-macosx-version-min=#{MacOS.version}",
|
|
# This is the default option, but be explicit
|
|
"--disable-monolithic",
|
|
]
|
|
|
|
if build.universal?
|
|
ENV.universal_binary
|
|
args << "--enable-universal_binary=#{Hardware::CPU.universal_archs.join(",")}"
|
|
end
|
|
|
|
args << "--enable-stl" if build.with? "stl"
|
|
|
|
if build.with? "static"
|
|
args << "--disable-shared"
|
|
else
|
|
args << "--enable-shared"
|
|
end
|
|
|
|
system "./configure", *args
|
|
system "make", "install"
|
|
|
|
# wx-config should reference the public prefix, not wxmac's keg
|
|
# this ensures that Python software trying to locate wxpython headers
|
|
# using wx-config can find both wxmac and wxpython headers,
|
|
# which are linked to the same place
|
|
inreplace "#{bin}/wx-config", prefix, HOMEBREW_PREFIX
|
|
end
|
|
|
|
test do
|
|
system bin/"wx-config", "--libs"
|
|
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.
|