summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Gudmundsson <dgud@erlang.org>2019-11-20 11:26:06 +0100
committerDan Gudmundsson <dgud@erlang.org>2019-11-20 11:26:06 +0100
commit31d97c32b8585fab4144a6046808983f7491180d (patch)
tree263162003b4e9b0810868b37478fa7d2c5aea25a
parent73a799c2794c2313304badc354b473a607ccfa36 (diff)
downloaderlang-31d97c32b8585fab4144a6046808983f7491180d.tar.gz
Fix bad compiler test
Turned the tests the wrong way and compilation failed with wxWidget-3.0 and wxMac.
-rw-r--r--lib/wx/api_gen/wxapi.conf2
-rw-r--r--lib/wx/c_src/gen/wxe_funcs.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/wx/api_gen/wxapi.conf b/lib/wx/api_gen/wxapi.conf
index c870f7afd6..afddd92a03 100644
--- a/lib/wx/api_gen/wxapi.conf
+++ b/lib/wx/api_gen/wxapi.conf
@@ -190,7 +190,7 @@
{'SetTransparent', [{test_if, "wxCHECK_VERSION(2,8,12)"}]},
{'CanSetTransparent', [{test_if, "wxCHECK_VERSION(2,8,12)"}]},
{'IsDoubleBuffered', [{test_if, "wxCHECK_VERSION(3,0,0)"}]},
- {'SetDoubleBuffered', [{test_if, "wxCHECK_VERSION(3,0,0) || (defined(__WXMAC__) && wxCHECK_VERSION(3,1,0))"}]},
+ {'SetDoubleBuffered', [{test_if, "wxCHECK_VERSION(3,1,0) || (!defined(__WXMAC__) && wxCHECK_VERSION(3,0,0))"}]},
{'GetContentScaleFactor', [{test_if, "wxCHECK_VERSION(2,9,5)"}]}
]}.
diff --git a/lib/wx/c_src/gen/wxe_funcs.cpp b/lib/wx/c_src/gen/wxe_funcs.cpp
index 309d1c8f45..481c3a4107 100644
--- a/lib/wx/c_src/gen/wxe_funcs.cpp
+++ b/lib/wx/c_src/gen/wxe_funcs.cpp
@@ -1714,7 +1714,7 @@ case wxWindow_IsDoubleBuffered: { // wxWindow::IsDoubleBuffered
break;
}
#endif
-#if wxCHECK_VERSION(3,0,0) || (defined(__WXMAC__) && wxCHECK_VERSION(3,1,0))
+#if wxCHECK_VERSION(3,1,0) || (!defined(__WXMAC__) && wxCHECK_VERSION(3,0,0))
case wxWindow_SetDoubleBuffered: { // wxWindow::SetDoubleBuffered
wxWindow *This = (wxWindow *) getPtr(bp,memenv); bp += 4;
bool * on = (bool *) bp; bp += 4;