From 8312497d6c71362fca1cdb735d18f73fc860d857 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Mon, 22 Apr 2013 11:07:38 +0200
Subject: [PATCH] Modified way of switching canvas

---
 common/drawframe.cpp | 18 ++++++++----------
 pcbnew/pcbframe.cpp  |  1 -
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/common/drawframe.cpp b/common/drawframe.cpp
index 92f7a495eb..52a4e42057 100644
--- a/common/drawframe.cpp
+++ b/common/drawframe.cpp
@@ -966,11 +966,6 @@ void EDA_DRAW_FRAME::UseGalCanvas( bool aEnable )
         view->SetScale( zoom );
 
         view->SetCenter( VECTOR2D( m_canvas->GetScreenCenterLogicalPosition() ) );
-
-        // Switch panes
-        m_auimgr.GetPane( wxT( "DrawFrame" ) ).Hide();
-        m_auimgr.GetPane( wxT( "DrawFrameGal" ) ).Show();
-        m_auimgr.Update();
     }
     else
     {
@@ -979,13 +974,16 @@ void EDA_DRAW_FRAME::UseGalCanvas( bool aEnable )
 
         VECTOR2D center = view->GetCenter();
         RedrawScreen( wxPoint( center.x, center.y ), false );
-
-        // Switch panes
-        m_auimgr.GetPane( wxT( "DrawFrameGal" ) ).Hide();
-        m_auimgr.GetPane( wxT( "DrawFrame" ) ).Show();
-        m_auimgr.Update();
     }
 
+    m_canvas->SetEvtHandlerEnabled( !aEnable );
+    m_galCanvas->SetEvtHandlerEnabled( aEnable );
+
+    // Switch panes
+    m_auimgr.GetPane( wxT( "DrawFrame" ) ).Show( !aEnable );
+    m_auimgr.GetPane( wxT( "DrawFrameGal" ) ).Show( aEnable );
+    m_auimgr.Update();
+
     m_galCanvasActive = aEnable;
 #endif /* KICAD_GAL */
 }
diff --git a/pcbnew/pcbframe.cpp b/pcbnew/pcbframe.cpp
index bfbfe9d2fe..58aeaf1724 100644
--- a/pcbnew/pcbframe.cpp
+++ b/pcbnew/pcbframe.cpp
@@ -595,7 +595,6 @@ void PCB_EDIT_FRAME::SwitchCanvas( wxCommandEvent& aEvent )
 }
 
 
-
 void PCB_EDIT_FRAME::ShowDesignRulesEditor( wxCommandEvent& event )
 {
     DIALOG_DESIGN_RULES dR_editor( this );