Skip to content

Instantly share code, notes, and snippets.

@metacollin
Created April 20, 2016 01:21
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save metacollin/ac61226a187315ec933c340421069e55 to your computer and use it in GitHub Desktop.
Save metacollin/ac61226a187315ec933c340421069e55 to your computer and use it in GitHub Desktop.
diff -ru wxWidgets-3.1.0/configure wxWidgets-3.10mod/configure
--- wxWidgets-3.1.0/configure 2016-02-28 14:33:37.000000000 -0700
+++ wxWidgets-3.10mod/configure 2016-03-04 23:50:09.000000000 -0700
@@ -28199,7 +28199,7 @@
*-*-darwin* )
install_name_tool=`which ${HOST_PREFIX}install_name_tool`
if test "$install_name_tool" -a -x "$install_name_tool"; then
- DYLIB_RPATH_POSTLINK="${HOST_PREFIX}install_name_tool -id \$@ \$@"
+ DYLIB_RPATH_POSTLINK=""
cat <<EOF >change-install-names
#!/bin/sh
libnames=\`cd \${1} ; ls -1 | grep '\.[0-9][0-9]*\.dylib\$'\`
@@ -28212,7 +28212,7 @@
done
EOF
chmod +x change-install-names
- DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${DESTDIR}\${libdir} \${DESTDIR}\${bindir} \${libdir} \$(wx_top_builddir)/lib"
+ DYLIB_RPATH_INSTALL=""
fi
HEADER_PAD_OPTION="-headerpad_max_install_names"
diff -ru wxWidgets-3.1.0/configure.in wxWidgets-3.10mod/configure.in
--- wxWidgets-3.1.0/configure.in 2016-02-28 14:33:37.000000000 -0700
+++ wxWidgets-3.10mod/configure.in 2016-03-04 23:50:09.000000000 -0700
@@ -3600,7 +3600,7 @@
*-*-darwin* )
install_name_tool=`which ${HOST_PREFIX}install_name_tool`
if test "$install_name_tool" -a -x "$install_name_tool"; then
- DYLIB_RPATH_POSTLINK="${HOST_PREFIX}install_name_tool -id \$@ \$@"
+ DYLIB_RPATH_POSTLINK=""
cat <<EOF >change-install-names
#!/bin/sh
libnames=\`cd \${1} ; ls -1 | grep '\.[[0-9]][[0-9]]*\.dylib\$'\`
@@ -3613,7 +3613,7 @@
done
EOF
chmod +x change-install-names
- DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${DESTDIR}\${libdir} \${DESTDIR}\${bindir} \${libdir} \$(wx_top_builddir)/lib"
+ DYLIB_RPATH_INSTALL=""
fi
dnl the HEADER_PAD_OPTION is required by some wx samples to avoid the error:
diff -ru wxWidgets-3.1.0/include/wx/glcanvas.h wxWidgets-3.10mod/include/wx/glcanvas.h
--- wxWidgets-3.1.0/include/wx/glcanvas.h 2016-02-28 14:33:37.000000000 -0700
+++ wxWidgets-3.10mod/include/wx/glcanvas.h 2016-03-04 23:48:33.000000000 -0700
@@ -19,6 +19,8 @@
#include "wx/palette.h"
#include "wx/window.h"
+#define RETINA_OPENGL_PATCH
+
class WXDLLIMPEXP_FWD_GL wxGLCanvas;
class WXDLLIMPEXP_FWD_GL wxGLContext;
diff -ru wxWidgets-3.1.0/include/wx/osx/glcanvas.h wxWidgets-3.10mod/include/wx/osx/glcanvas.h
--- wxWidgets-3.1.0/include/wx/osx/glcanvas.h 2016-02-28 14:33:37.000000000 -0700
+++ wxWidgets-3.10mod/include/wx/osx/glcanvas.h 2016-03-04 23:48:33.000000000 -0700
@@ -114,6 +114,9 @@
// update the view port of the current context to match this window
void SetViewport();
+ void SetViewWantsBestResolution( bool aValue );
+ bool GetViewWantsBestResolution();
+ float GetBackingScaleFactor();
// deprecated methods
// ------------------
diff -ru wxWidgets-3.1.0/src/common/translation.cpp wxWidgets-3.10mod/src/common/translation.cpp
--- wxWidgets-3.1.0/src/common/translation.cpp 2016-02-28 14:33:37.000000000 -0700
+++ wxWidgets-3.10mod/src/common/translation.cpp 2016-03-04 23:50:32.000000000 -0700
@@ -1626,6 +1626,9 @@
/* static */
const wxString& wxTranslations::GetUntranslatedString(const wxString& str)
{
+ // Marco Serantoni - Dirty Patch
+ // Awaiting for http://trac.wxwidgets.org/ticket/15908
+ if( gs_translationsOwned == false) return str;
wxLocaleUntranslatedStrings& strings = wxThreadInfo.untranslatedStrings;
wxLocaleUntranslatedStrings::iterator i = strings.find(str);
diff -ru wxWidgets-3.1.0/src/osx/cocoa/glcanvas.mm wxWidgets-3.10mod/src/osx/cocoa/glcanvas.mm
--- wxWidgets-3.1.0/src/osx/cocoa/glcanvas.mm 2016-02-28 14:33:37.000000000 -0700
+++ wxWidgets-3.10mod/src/osx/cocoa/glcanvas.mm 2016-03-04 23:48:33.000000000 -0700
@@ -154,6 +154,22 @@
return true;
}
+void wxGLCanvas::SetViewWantsBestResolution( bool aValue )
+{
+ [GetHandle() setWantsBestResolutionOpenGLSurface:aValue];
+}
+
+bool wxGLCanvas::GetViewWantsBestResolution()
+{
+ return [GetHandle() wantsBestResolutionOpenGLSurface];
+}
+
+float wxGLCanvas::GetBackingScaleFactor()
+{
+ return [[GetHandle() window] backingScaleFactor];
+}
+
+
bool wxGLContext::SetCurrent(const wxGLCanvas& win) const
{
if ( !m_glContext )
diff -ru wxWidgets-3.1.0/src/osx/dataview_osx.cpp wxWidgets-3.10mod/src/osx/dataview_osx.cpp
--- wxWidgets-3.1.0/src/osx/dataview_osx.cpp 2016-02-28 14:33:37.000000000 -0700
+++ wxWidgets-3.10mod/src/osx/dataview_osx.cpp 2016-03-04 23:48:22.000000000 -0700
@@ -375,7 +375,6 @@
const wxValidator& validator,
const wxString& name)
{
- DontCreatePeer();
if (!(wxControl::Create(parent,id,pos,size,style,validator,name)))
return false;
SetPeer(::CreateDataView(this,parent,id,pos,size,style,GetExtraStyle()));
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment