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

Minor fix and cleanup. 3D viewer: modify the status bar. (Should be enough to avoid the bug #1467111).

This commit is contained in:
jean-pierre charras 2015-06-21 20:21:20 +02:00
parent 69414684a1
commit 7c8c1d4954
2 changed files with 3 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
3d-viewer/3d_frame.cpp
View File

@ -131,10 +131,10 @@ EDA_3D_FRAME::EDA_3D_FRAME( KIWAY* aKiway, PCB_BASE_FRAME* aParent,
SetSize( m_FramePos.x, m_FramePos.y, m_FrameSize.x, m_FrameSize.y ); SetSize( m_FramePos.x, m_FramePos.y, m_FrameSize.x, m_FrameSize.y );
// Create the status line // Create the status line
static const int dims[5] = { -1, 100, 100, 100, 140 }; static const int status_dims[4] = { -1, 130, 130, 170 };
CreateStatusBar( 5 ); CreateStatusBar( DIM( status_dims ) );
SetStatusWidths( 5, dims ); SetStatusWidths( DIM( status_dims ), status_dims );
CreateMenuBar(); CreateMenuBar();
ReCreateMainToolbar(); ReCreateMainToolbar();
@ -157,15 +157,11 @@ EDA_3D_FRAME::EDA_3D_FRAME( KIWAY* aKiway, PCB_BASE_FRAME* aParent,
// Normal attributes with values: // Normal attributes with values:
WX_GL_DEPTH_SIZE, 16, WX_GL_DEPTH_SIZE, 16,
WX_GL_STENCIL_SIZE, 1, WX_GL_STENCIL_SIZE, 1,
#if wxCHECK_VERSION( 3, 0, 0 )
WX_GL_SAMPLE_BUFFERS, 1, // Enable multisampling support (antialiasing). WX_GL_SAMPLE_BUFFERS, 1, // Enable multisampling support (antialiasing).
WX_GL_SAMPLES, 0, // Disable AA for the start. WX_GL_SAMPLES, 0, // Disable AA for the start.
#endif
0 }; // NULL termination 0 }; // NULL termination
#if wxCHECK_VERSION( 3, 0, 0 )
// Check if the canvas supports multisampling. // Check if the canvas supports multisampling.
if( EDA_3D_CANVAS::IsDisplaySupported( attrs ) ) if( EDA_3D_CANVAS::IsDisplaySupported( attrs ) )
{ {
@ -202,7 +198,6 @@ EDA_3D_FRAME::EDA_3D_FRAME( KIWAY* aKiway, PCB_BASE_FRAME* aParent,
} }
} }
} }
#endif
m_canvas = new EDA_3D_CANVAS( this, attrs ); m_canvas = new EDA_3D_CANVAS( this, attrs );

22
common/basicframe.cpp
View File

@ -520,7 +520,6 @@ void EDA_BASE_FRAME::AddHelpVersionInfoMenuEntry( wxMenu* aMenu )
#define __BO_COMPILER ",unknown" #define __BO_COMPILER ",unknown"
#endif #endif
#if wxCHECK_VERSION( 2, 9, 0 )
static inline const char* KICAD_BUILD_OPTIONS_SIGNATURE() static inline const char* KICAD_BUILD_OPTIONS_SIGNATURE()
{ {
@ -531,31 +530,10 @@ static inline const char* KICAD_BUILD_OPTIONS_SIGNATURE()
" (release," " (release,"
#endif #endif
__WX_BO_UNICODE __ABI_VERSION __BO_COMPILER __WX_BO_STL __WX_BO_UNICODE __ABI_VERSION __BO_COMPILER __WX_BO_STL
#if !wxCHECK_VERSION( 3, 0, 0 )
__WX_BO_WXWIN_COMPAT_2_6
#endif
__WX_BO_WXWIN_COMPAT_2_8 ")" __WX_BO_WXWIN_COMPAT_2_8 ")"
; ;
} }
#else
static inline const char* KICAD_BUILD_OPTIONS_SIGNATURE()
{
return
#ifdef __WXDEBUG__
" (debug,"
#else
" (release,"
#endif
__WX_BO_UNICODE __ABI_VERSION __BO_COMPILER __WX_BO_STL
__WX_BO_WXWIN_COMPAT_2_6 __WX_BO_WXWIN_COMPAT_2_8 ")"
;
}
#endif
void EDA_BASE_FRAME::CopyVersionInfoToClipboard( wxCommandEvent& event ) void EDA_BASE_FRAME::CopyVersionInfoToClipboard( wxCommandEvent& event )
{ {