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

1 files changed, 8 insertions, 3 deletions

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();
 };