mirror of
https://gitea.wildfiregames.com/0ad/0ad.git
synced 2026-07-11 02:36:23 +00:00
historic_bruno
4ca156e2d8
Adds patch to fix wxWidgets build on Yosemite (based on http://trac.wxwidgets.org/changeset/76743), fixes #2924. Removes patch for previous version of wxWidgets. This was SVN commit r16155.
113 lines
2.6 KiB
Diff
113 lines
2.6 KiB
Diff
Index: include/wx/defs.h
|
|
===================================================================
|
|
--- include/wx/defs.h
|
|
+++ include/wx/defs.h
|
|
@@ -3091,4 +3091,5 @@
|
|
DECLARE_WXCOCOA_OBJC_CLASS(NSSet);
|
|
DECLARE_WXCOCOA_OBJC_CLASS(EAGLContext);
|
|
+DECLARE_WXCOCOA_OBJC_CLASS(UIWebView);
|
|
|
|
typedef WX_UIWindow WXWindow;
|
|
@@ -3096,6 +3097,13 @@
|
|
typedef WX_EAGLContext WXGLContext;
|
|
typedef WX_NSString* WXGLPixelFormat;
|
|
-
|
|
-#endif
|
|
+typedef WX_UIWebView OSXWebViewPtr;
|
|
+
|
|
+#endif
|
|
+
|
|
+#if wxOSX_USE_COCOA_OR_CARBON
|
|
+DECLARE_WXCOCOA_OBJC_CLASS(WebView);
|
|
+typedef WX_WebView OSXWebViewPtr;
|
|
+#endif
|
|
+
|
|
|
|
#endif /* __WXMAC__ */
|
|
Index: include/wx/html/webkit.h
|
|
===================================================================
|
|
--- include/wx/html/webkit.h
|
|
+++ include/wx/html/webkit.h
|
|
@@ -19,5 +19,4 @@
|
|
|
|
#include "wx/control.h"
|
|
-DECLARE_WXCOCOA_OBJC_CLASS(WebView);
|
|
|
|
// ----------------------------------------------------------------------------
|
|
@@ -108,5 +107,5 @@
|
|
wxString m_pageTitle;
|
|
|
|
- WX_WebView m_webView;
|
|
+ OSXWebViewPtr m_webView;
|
|
|
|
// we may use this later to setup our own mouse events,
|
|
Index: include/wx/osx/webview_webkit.h
|
|
===================================================================
|
|
--- include/wx/osx/webview_webkit.h
|
|
+++ include/wx/osx/webview_webkit.h
|
|
@@ -158,5 +158,5 @@
|
|
wxString m_pageTitle;
|
|
|
|
- wxObjCID m_webView;
|
|
+ OSXWebViewPtr m_webView;
|
|
|
|
// we may use this later to setup our own mouse events,
|
|
Index: src/osx/webview_webkit.mm
|
|
===================================================================
|
|
--- src/osx/webview_webkit.mm
|
|
+++ src/osx/webview_webkit.mm
|
|
@@ -442,7 +442,7 @@
|
|
if ( !m_webView )
|
|
return;
|
|
|
|
- [(WebView*)m_webView goBack];
|
|
+ [m_webView goBack];
|
|
}
|
|
|
|
void wxWebViewWebKit::GoForward()
|
|
@@ -450,7 +450,7 @@
|
|
if ( !m_webView )
|
|
return;
|
|
|
|
- [(WebView*)m_webView goForward];
|
|
+ [m_webView goForward];
|
|
}
|
|
|
|
void wxWebViewWebKit::Reload(wxWebViewReloadFlags flags)
|
|
@@ -849,7 +849,7 @@
|
|
if ( !m_webView )
|
|
return;
|
|
|
|
- [(WebView*)m_webView cut:m_webView];
|
|
+ [m_webView cut:m_webView];
|
|
}
|
|
|
|
void wxWebViewWebKit::Copy()
|
|
@@ -857,7 +857,7 @@
|
|
if ( !m_webView )
|
|
return;
|
|
|
|
- [(WebView*)m_webView copy:m_webView];
|
|
+ [m_webView copy:m_webView];
|
|
}
|
|
|
|
void wxWebViewWebKit::Paste()
|
|
@@ -865,7 +865,7 @@
|
|
if ( !m_webView )
|
|
return;
|
|
|
|
- [(WebView*)m_webView paste:m_webView];
|
|
+ [m_webView paste:m_webView];
|
|
}
|
|
|
|
void wxWebViewWebKit::DeleteSelection()
|
|
@@ -873,7 +873,7 @@
|
|
if ( !m_webView )
|
|
return;
|
|
|
|
- [(WebView*)m_webView deleteSelection];
|
|
+ [m_webView deleteSelection];
|
|
}
|
|
|
|
bool wxWebViewWebKit::HasSelection() const
|