<pre style='margin:0'>
ra1nb0w (ra1nb0w) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f03f5c6c1001a290096f0275adb74d59d35b8706">https://github.com/macports/macports-ports/commit/f03f5c6c1001a290096f0275adb74d59d35b8706</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f03f5c6c1001a290096f0275adb74d59d35b8706
</span>Author: Davide Gerhard <ra1nb0w@macports.org>
AuthorDate: Mon Aug 2 17:09:37 2021 +0200
<span style='display:block; white-space:pre;color:#404040;'> CubicSDR: update commit to 5c78738d
</span>---
science/CubicSDR/Portfile | 17 +--
science/CubicSDR/files/enable-highdpi.patch | 202 ----------------------------
2 files changed, 5 insertions(+), 214 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/CubicSDR/Portfile b/science/CubicSDR/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8c039642f6a..c947a160d28 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/CubicSDR/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/CubicSDR/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,11 +17,11 @@ long_description CubicSDR is the software portion of Software Defined \
</span> functions in software instead of traditional hardwre.
homepage https://www.cubicsdr.com
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup cjcliffe CubicSDR 29db1bde99d77420fe19af209564d181eee12235
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 20210706-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 59551fc85f23d074dc8e17092932541b5397bb0b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e59dacc5816a85ab9d6590fc1a26f40a6117dd746fd472567beb7902aea18fa3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 35969089
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup cjcliffe CubicSDR 5c78738d334d481b4bead165c0a138bf8633bd4b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 20210802-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 bcb657fc9cfafa80a44c7f5d0fc3caf3861fed02 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 3e11f0340dcd903e74b63e53165e172e96701b9b304410cbe677ee10a6304f7f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 37121251
</span> revision 0
compiler.cxx_standard 2011
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,13 +31,6 @@ compiler.cxx_standard 2011
</span> # does not work.
wxWidgets.use wxWidgets-3.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# CHECK if upstream has merged it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# enable out-of-tree patch the fix retina display
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- enable-highdpi.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DUSE_OSX_RETINA=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_lib-append \
port:liquid-dsp \
port:${wxWidgets.port} \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/CubicSDR/files/enable-highdpi.patch b/science/CubicSDR/files/enable-highdpi.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9bb87bc6e89..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/CubicSDR/files/enable-highdpi.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,202 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/CMakeLists.txt b/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index f5e6eaa..7750648 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -708,6 +708,12 @@ IF (APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DHAVE_TYPE_TRAITS=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -mmacosx-version-min=10.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SET(USE_OSX_RETINA OFF CACHE BOOL "Enable support for retina display on macOS.")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ IF (USE_OSX_RETINA)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ADD_DEFINITIONS(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -DUSE_OSX_RETINA=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ENDIF()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ENDIF(APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IF (APPLE AND BUNDLE_APP)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/ui/UITestCanvas.cpp b/src/ui/UITestCanvas.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 037258e..36dfaf2 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/ui/UITestCanvas.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/ui/UITestCanvas.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -39,7 +39,11 @@ UITestCanvas::~UITestCanvas() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void UITestCanvas::OnPaint(wxPaintEvent& WXUNUSED(event)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // wxPaintDC dc(this);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef USE_OSX_RETINA
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const wxSize ClientSize = GetClientSize() * GetContentScaleFactor();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const wxSize ClientSize = GetClientSize();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glContext->SetCurrent(*this);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- initGLExtensions();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/util/GLFont.cpp b/src/util/GLFont.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 10c894f..793b5e4 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/util/GLFont.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/util/GLFont.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -847,15 +847,25 @@ double GLFont::getScaleFactor() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GLFontScale scale = currentScale.load();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (scale == GLFONT_SCALE_MEDIUM) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef USE_OSX_RETINA
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return 2.5;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 1.5;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else if (scale == GLFONT_SCALE_LARGE) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef USE_OSX_RETINA
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return 3;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 2.0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef USE_OSX_RETINA
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return 2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 1.0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int GLFont::getScaledPx(int basicFontSize, double scaleFactor) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/visual/GainCanvas.cpp b/src/visual/GainCanvas.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index f0477a6..f8a2a86 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/visual/GainCanvas.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/visual/GainCanvas.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -52,7 +52,11 @@ GainCanvas::~GainCanvas() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void GainCanvas::OnPaint(wxPaintEvent& WXUNUSED(event)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // wxPaintDC dc(this);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef USE_OSX_RETINA
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const wxSize ClientSize = GetClientSize() * GetContentScaleFactor();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const wxSize ClientSize = GetClientSize();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glContext->SetCurrent(*this);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- initGLExtensions();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/visual/MeterCanvas.cpp b/src/visual/MeterCanvas.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 63d67fc..9dbb9b5 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/visual/MeterCanvas.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/visual/MeterCanvas.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -83,7 +83,11 @@ void MeterCanvas::setShowUserInput(bool showUserInput) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void MeterCanvas::OnPaint(wxPaintEvent& WXUNUSED(event)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // wxPaintDC dc(this);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef USE_OSX_RETINA
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const wxSize ClientSize = GetClientSize() * GetContentScaleFactor();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const wxSize ClientSize = GetClientSize();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glContext->SetCurrent(*this);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- initGLExtensions();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/visual/ModeSelectorCanvas.cpp b/src/visual/ModeSelectorCanvas.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 16e4ff0..e03440a 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/visual/ModeSelectorCanvas.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/visual/ModeSelectorCanvas.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -52,7 +52,11 @@ int ModeSelectorCanvas::getHoveredSelection() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void ModeSelectorCanvas::OnPaint(wxPaintEvent& WXUNUSED(event)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // wxPaintDC dc(this);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef USE_OSX_RETINA
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const wxSize ClientSize = GetClientSize() * GetContentScaleFactor();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const wxSize ClientSize = GetClientSize();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glContext->SetCurrent(*this);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- initGLExtensions();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/visual/ModeSelectorContext.cpp b/src/visual/ModeSelectorContext.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 8eb0005..5064b25 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/visual/ModeSelectorContext.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/visual/ModeSelectorContext.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -32,10 +32,18 @@ void ModeSelectorContext::DrawSelector(std::string label, int c, int cMax, bool
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- float viewHeight = (float) vp[3];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- float viewWidth = (float) vp[2];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef USE_OSX_RETINA
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int fontSize = 18 * GLFont::getScaleFactor();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int fontSize = 18;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (viewWidth < 30 || viewHeight < 200) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef USE_OSX_RETINA
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fontSize = 16 * GLFont::getScaleFactor();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fontSize = 16;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glColor4f(r, g, b, a);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/visual/ScopeCanvas.cpp b/src/visual/ScopeCanvas.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 805cc9d..db27fd4 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/visual/ScopeCanvas.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/visual/ScopeCanvas.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -102,7 +102,11 @@ bool ScopeCanvas::getShowDb() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void ScopeCanvas::OnPaint(wxPaintEvent& WXUNUSED(event)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // wxPaintDC dc(this);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef USE_OSX_RETINA
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const wxSize ClientSize = GetClientSize() * GetContentScaleFactor();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const wxSize ClientSize = GetClientSize();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ScopeRenderDataPtr avData;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- while (inputData->try_pop(avData)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/visual/SpectrumCanvas.cpp b/src/visual/SpectrumCanvas.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 2427408..baf4e5d 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/visual/SpectrumCanvas.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/visual/SpectrumCanvas.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -52,7 +52,11 @@ SpectrumCanvas::~SpectrumCanvas() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void SpectrumCanvas::OnPaint(wxPaintEvent& WXUNUSED(event)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // wxPaintDC dc(this);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef USE_OSX_RETINA
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const wxSize ClientSize = GetClientSize() * GetContentScaleFactor();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const wxSize ClientSize = GetClientSize();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SpectrumVisualDataPtr vData;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (visualDataQueue->try_pop(vData)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/visual/TuningCanvas.cpp b/src/visual/TuningCanvas.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 1fef0fc..9a1d0cb 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/visual/TuningCanvas.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/visual/TuningCanvas.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -85,7 +85,11 @@ void TuningCanvas::setHalfBand(bool hb) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void TuningCanvas::OnPaint(wxPaintEvent& WXUNUSED(event)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // wxPaintDC dc(this);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef USE_OSX_RETINA
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const wxSize ClientSize = GetClientSize() * GetContentScaleFactor();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const wxSize ClientSize = GetClientSize();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glContext->SetCurrent(*this);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- initGLExtensions();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/visual/WaterfallCanvas.cpp b/src/visual/WaterfallCanvas.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index a77ecb0..278cd3a 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/visual/WaterfallCanvas.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/visual/WaterfallCanvas.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -129,8 +129,12 @@ void WaterfallCanvas::processInputQueue() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void WaterfallCanvas::OnPaint(wxPaintEvent& WXUNUSED(event)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::lock_guard < std::mutex > lock(tex_update);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // wxPaintDC dc(this);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef USE_OSX_RETINA
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const wxSize ClientSize = GetClientSize() * GetContentScaleFactor();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const wxSize ClientSize = GetClientSize();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- long double currentZoom = zoom;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (mouseZoom != 1) {
</span></pre><pre style='margin:0'>
</pre>