From 25bfd82240dd8448f36863a939c8d6891cb02944 Mon Sep 17 00:00:00 2001
From: jean-pierre charras <jp.charras@wanadoo.fr>
Date: Sun, 17 Nov 2013 17:48:47 +0100
Subject: [PATCH] Fix a compatibility issue for wxWidgets 3.0, when moving
 cursor by arrow keys. Fix a very minor bug (2 duplicate lines when copying
 version informations to the clipboard)

---
 common/basicframe.cpp | 14 --------------
 common/drawpanel.cpp  |  2 ++
 common/eda_text.cpp   |  4 +---
 3 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/common/basicframe.cpp b/common/basicframe.cpp
index 42f25d9456..d513ac5839 100644
--- a/common/basicframe.cpp
+++ b/common/basicframe.cpp
@@ -552,20 +552,6 @@ void EDA_BASE_FRAME::CopyVersionInfoToClipboard( wxCommandEvent&  event )
     tmp << wxT( "OFF\n" );
 #endif
 
-    tmp << wxT( "         KICAD_SCRIPTING_WXPYTHON=" );
-#ifdef KICAD_SCRIPTING_WXPYTHON
-    tmp << wxT( "ON\n" );
-#else
-    tmp << wxT( "OFF\n" );
-#endif
-
-    tmp << wxT( "         USE_FP_LIB_TABLE=" );
-#ifdef USE_FP_LIB_TABLE
-    tmp << wxT( "ON\n" );
-#else
-    tmp << wxT( "OFF\n" );
-#endif
-
     tmp << wxT( "         USE_FP_LIB_TABLE=" );
 #ifdef USE_FP_LIB_TABLE
     tmp << wxT( "ON\n" );
diff --git a/common/drawpanel.cpp b/common/drawpanel.cpp
index d733d49584..030f1328c9 100644
--- a/common/drawpanel.cpp
+++ b/common/drawpanel.cpp
@@ -95,7 +95,9 @@ EDA_DRAW_PANEL::EDA_DRAW_PANEL( EDA_DRAW_FRAME* parent, int id,
 
 #if wxCHECK_VERSION( 2, 9, 5 )
     ShowScrollbars( wxSHOW_SB_ALWAYS, wxSHOW_SB_ALWAYS );
+    DisableKeyboardScrolling();
 #endif
+
     m_scrollIncrementX = std::min( size.x / 8, 10 );
     m_scrollIncrementY = std::min( size.y / 8, 10 );
 
diff --git a/common/eda_text.cpp b/common/eda_text.cpp
index 65bebe5764..b1bda567cd 100644
--- a/common/eda_text.cpp
+++ b/common/eda_text.cpp
@@ -32,14 +32,12 @@
 #include <trigo.h>               // RotatePoint
 #include <class_drawpanel.h>     // EDA_DRAW_PANEL
 
-// until bzr rev 4410, Y position of vertical justification
+// until bzr rev 4476, Y position of vertical justification
 // of multiline texts was incorrectly calculated for BOTTOM
 // and CENTER vertical justification. (Only the first line was justified)
 // If this line is left uncommented, the bug is fixed, but
 // creates a (very minor) issue for existing texts, mainly in Pcbnew
 // because the text position is sometimes critical.
-// Currently, this change is broken for rotated or mirrored texts,
-// so keep this line commented until there are fixes
 #define FIX_MULTILINE_VERT_JUSTIF
 
 // Conversion to application internal units defined at build time.