Merge branch 'maint'

* maint:
  Fix whitespace setting in test files
  Avoid some error reports when stopping mnesia
  wx: Improve error handling
  Fix all whitespace-related issues in erlang.el
  mnesia: Fix double blocked tables which could cause a crash
  wx: Add wxWindow:getContentScaleFactor

3 files changed, 19 insertions, 9 deletions

diff --git a/lib/wx/api_gen/gl_gen_erl.erl b/lib/wx/api_gen/gl_gen_erl.erl
index 1be8d775be..1f9407525d 100644
--- a/lib/wx/api_gen/gl_gen_erl.erl
+++ b/lib/wx/api_gen/gl_gen_erl.erl
@@ -116,7 +116,7 @@ gl_api(Fs) ->
     w("call(Op, Args) ->~n", []),
     w("    Port = get(opengl_port), ~n", []),
     w("    _ = erlang:port_control(Port,Op,Args),~n", []),
-    w("    rec().~n", []),
+    w("    rec(Op).~n", []),
     w("    ~n", []),
     w("%% @hidden~n", []),
     w("cast(Op, Args) ->~n", []),
@@ -125,11 +125,15 @@ gl_api(Fs) ->
     w("    ok.~n", []),
     w("    ~n", []),
     w("%% @hidden~n", []),
-    w("rec() ->~n", []),
-    w("    receive ~n", []),
+    w("rec(Op) ->~n", []),
+    w("    receive~n", []),
     w("        {'_egl_result_', Res} -> Res;~n", []),
-    w("        {'_egl_error_',  Op, Res} -> error({error,Res,Op})~n", []),
-    w("    end. ~n", []),
+    w("        {'_egl_error_',  Op, Res} -> error({error,Res,Op});~n", []),
+    w("        {'_egl_error_', Other, Res} ->~n ", []),
+    w("               Err = io_lib:format(\"~~p in op: ~~p\", [Res, Other]),~n", []),
+    w("               error_logger:error_report([{gl, error}, {message, lists:flatten(Err)}]),~n", []),
+    w("               rec(Op)~n", []),
+    w("    end.~n", []),
     w("~n", []),
     w("%% @hidden~n", []),
     w("send_bin(Bin) when is_binary(Bin) ->~n", []),
diff --git a/lib/wx/api_gen/wx_extra/added_func.h b/lib/wx/api_gen/wx_extra/added_func.h
index 417188cc8a..bffe391140 100644
--- a/lib/wx/api_gen/wx_extra/added_func.h
+++ b/lib/wx/api_gen/wx_extra/added_func.h
@@ -34,8 +34,13 @@ class wxToolBar {
 };
 
 
-class wxWindow {
+/* class wxWindow { */
+/*  public: */
+/*     bool IsDoubleBuffered(); */
+/*     void SetDoubleBuffered(bool on); */
+/* }; */
+
+class wxWindowGTK {
  public:
-    bool IsDoubleBuffered();
-    void SetDoubleBuffered(bool on);
+    double GetContentScaleFactor();
 };
diff --git a/lib/wx/api_gen/wxapi.conf b/lib/wx/api_gen/wxapi.conf
index 4300ffe734..a0dfa61dd1 100644
--- a/lib/wx/api_gen/wxapi.conf
+++ b/lib/wx/api_gen/wxapi.conf
@@ -155,7 +155,8 @@
   {'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__)"}]}
+  {'SetDoubleBuffered', [{test_if, "wxCHECK_VERSION(3,0,0) && !defined(__WXMAC__)"}]},
+  {'GetContentScaleFactor', [{test_if, "wxCHECK_VERSION(2,9,5)"}]}
 ]}.
 
 {class, wxTopLevelWindowGTK, wxWindow,