haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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)
This commit is contained in:
jean-pierre charras 2013-11-17 17:48:47 +01:00
parent 6aabb9bc38
commit 25bfd82240
3 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
common/basicframe.cpp
View File

@ -552,20 +552,6 @@ void EDA_BASE_FRAME::CopyVersionInfoToClipboard( wxCommandEvent& event )
tmp << wxT( "OFF\n" ); tmp << wxT( "OFF\n" );
#endif #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=" ); tmp << wxT( " USE_FP_LIB_TABLE=" );
#ifdef USE_FP_LIB_TABLE #ifdef USE_FP_LIB_TABLE
tmp << wxT( "ON\n" ); tmp << wxT( "ON\n" );

2
common/drawpanel.cpp
View File

@ -95,7 +95,9 @@ EDA_DRAW_PANEL::EDA_DRAW_PANEL( EDA_DRAW_FRAME* parent, int id,
#if wxCHECK_VERSION( 2, 9, 5 ) #if wxCHECK_VERSION( 2, 9, 5 )
ShowScrollbars( wxSHOW_SB_ALWAYS, wxSHOW_SB_ALWAYS ); ShowScrollbars( wxSHOW_SB_ALWAYS, wxSHOW_SB_ALWAYS );
DisableKeyboardScrolling();
#endif #endif
m_scrollIncrementX = std::min( size.x / 8, 10 ); m_scrollIncrementX = std::min( size.x / 8, 10 );
m_scrollIncrementY = std::min( size.y / 8, 10 ); m_scrollIncrementY = std::min( size.y / 8, 10 );

4
common/eda_text.cpp
View File

@ -32,14 +32,12 @@
#include <trigo.h> // RotatePoint #include <trigo.h> // RotatePoint
#include <class_drawpanel.h> // EDA_DRAW_PANEL #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 // of multiline texts was incorrectly calculated for BOTTOM
// and CENTER vertical justification. (Only the first line was justified) // and CENTER vertical justification. (Only the first line was justified)
// If this line is left uncommented, the bug is fixed, but // If this line is left uncommented, the bug is fixed, but
// creates a (very minor) issue for existing texts, mainly in Pcbnew // creates a (very minor) issue for existing texts, mainly in Pcbnew
// because the text position is sometimes critical. // 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 #define FIX_MULTILINE_VERT_JUSTIF
// Conversion to application internal units defined at build time. // Conversion to application internal units defined at build time.