From 8b4f01b6b74b9caab39a8d9f159a1cd728a70220 Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Tue, 28 Aug 2018 14:27:13 +0100
Subject: [PATCH] Add common property initialisation to sch_draw_panel.

---
 eeschema/sch_draw_panel.cpp | 30 ++++++++++++++++--------------
 eeschema/sch_draw_panel.h   | 13 ++++++++-----
 2 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/eeschema/sch_draw_panel.cpp b/eeschema/sch_draw_panel.cpp
index 4f4f78dbe4..4ab065b0fa 100644
--- a/eeschema/sch_draw_panel.cpp
+++ b/eeschema/sch_draw_panel.cpp
@@ -37,23 +37,24 @@
 #include <functional>
 
 #include <sch_sheet.h>
+#include <pgm_base.h>
 
 using namespace std::placeholders;
 
 
 SCH_DRAW_PANEL::SCH_DRAW_PANEL( wxWindow* aParentWindow, wxWindowID aWindowId,
-                                        const wxPoint& aPosition, const wxSize& aSize,
-                                        KIGFX::GAL_DISPLAY_OPTIONS& aOptions, GAL_TYPE aGalType ) :
-EDA_DRAW_PANEL_GAL( aParentWindow, aWindowId, aPosition, aSize, aOptions, GAL_TYPE_OPENGL ),
-m_parent( aParentWindow )
+                                const wxPoint& aPosition, const wxSize& aSize,
+                                KIGFX::GAL_DISPLAY_OPTIONS& aOptions, GAL_TYPE aGalType ) :
+    EDA_DRAW_PANEL_GAL( aParentWindow, aWindowId, aPosition, aSize, aOptions, aGalType ),
+    m_parent( aParentWindow )
 {
-    #ifdef __WXMAC__
-        m_defaultCursor = m_currentCursor = wxCURSOR_CROSS;
-        m_showCrossHair = false;
-    #else
-        m_defaultCursor = m_currentCursor = wxCURSOR_ARROW;
-        m_showCrossHair = true;
-    #endif
+#ifdef __WXMAC__
+    m_defaultCursor = m_currentCursor = wxCURSOR_CROSS;
+    m_showCrossHair = false;
+#else
+    m_defaultCursor = m_currentCursor = wxCURSOR_ARROW;
+    m_showCrossHair = true;
+#endif
 
     m_view = new KIGFX::SCH_VIEW( true );
     m_view->SetGAL( m_gal );
@@ -91,11 +92,12 @@ m_parent( aParentWindow )
     Connect( wxEVT_CHAR, wxKeyEventHandler( SCH_DRAW_PANEL::OnKeyEvent ), NULL, this );
     Connect( wxEVT_CHAR_HOOK, wxKeyEventHandler( SCH_DRAW_PANEL::OnCharHook ), NULL, this );
 
+    Pgm().CommonSettings()->Read( ENBL_MOUSEWHEEL_PAN_KEY, &m_enableMousewheelPan, false );
+    Pgm().CommonSettings()->Read( ENBL_ZOOM_NO_CENTER_KEY, &m_enableZoomNoCenter, false );
+    Pgm().CommonSettings()->Read( ENBL_AUTO_PAN_KEY, &m_enableAutoPan, true );
+
     m_canStartBlock = -1;       // Command block can start if >= 0
     m_abortRequest = false;
-    m_enableMousewheelPan = false;
-    m_enableZoomNoCenter = false;
-    m_enableAutoPan = true;
     m_ignoreMouseEvents = false;
     // Be sure a mouse release button event will be ignored when creating the canvas
     // if the mouse click was not made inside the canvas (can happen sometimes, when
diff --git a/eeschema/sch_draw_panel.h b/eeschema/sch_draw_panel.h
index 8d063794a0..7accc1901c 100644
--- a/eeschema/sch_draw_panel.h
+++ b/eeschema/sch_draw_panel.h
@@ -9,9 +9,11 @@
 #include <class_drawpanel.h>
 
 
-namespace KIGFX {
+namespace KIGFX
+{
     class SCH_VIEW;
-    namespace PREVIEW {
+    namespace PREVIEW
+    {
         class SELECTION_AREA;
     };
 };
@@ -23,16 +25,17 @@ class SCH_SCREEN;
 class COLORS_DESIGN_SETTINGS;
 class SCH_EDIT_FRAME;
 
+
 class SCH_DRAW_PANEL : public EDA_DRAW_PANEL, public EDA_DRAW_PANEL_GAL
 {
 public:
     SCH_DRAW_PANEL( wxWindow* aParentWindow, wxWindowID aWindowId, const wxPoint& aPosition,
-                        const wxSize& aSize, KIGFX::GAL_DISPLAY_OPTIONS& aOptions,
-                        GAL_TYPE aGalType = GAL_TYPE_OPENGL );
+                    const wxSize& aSize, KIGFX::GAL_DISPLAY_OPTIONS& aOptions,
+                    GAL_TYPE aGalType = GAL_TYPE_OPENGL );
 
     ~SCH_DRAW_PANEL();
 
-    virtual wxWindow* GetWindow() override { return this; };
+    virtual wxWindow* GetWindow() override { return this; }
 
     /**
      * Function DisplayBoard FIXME