From b41e4e6947aef12334d0661e7ec501b2a652fda5 Mon Sep 17 00:00:00 2001 From: charras Date: Fri, 15 Jan 2010 13:02:04 +0000 Subject: [PATCH] macOSX: fixed GetMBarHeight( ) problem. --- 3d-viewer/3d_frame.cpp | 7 +++---- common/basicframe.cpp | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/3d-viewer/3d_frame.cpp b/3d-viewer/3d_frame.cpp index 89cf0189b4..0ff65bfb8a 100644 --- a/3d-viewer/3d_frame.cpp +++ b/3d-viewer/3d_frame.cpp @@ -145,11 +145,10 @@ void WinEDA3D_DrawFrame::GetSettings() config->Read( wxT( "BgColor_Blue" ), &g_Parm_3D_Visu.m_BgColor.m_Blue, 0.0 ); } -#if defined( __WXMAC__ ) && !defined( __WXOSX_COCOA__ ) - +#if defined( __WXMAC__ ) // for macOSX, the window must be below system (macOSX) toolbar - if( m_FramePos.y < GetMBarHeight() ) - m_FramePos.y = GetMBarHeight(); + if( m_FramePos.y < 20 ) + m_FramePos.y = 20; #endif } diff --git a/common/basicframe.cpp b/common/basicframe.cpp index 505802204e..67e546fd08 100644 --- a/common/basicframe.cpp +++ b/common/basicframe.cpp @@ -106,10 +106,10 @@ void WinEDA_BasicFrame::LoadSettings() } // Ensure Window title bar is visible -#if defined( __WXMAC__ ) && !defined( __WXOSX_COCOA__ ) - +#if defined( __WXMAC__ ) // for macOSX, the window must be below system (macOSX) toolbar - Ypos_min = GetMBarHeight(); +// Ypos_min = GetMBarHeight(); seems no more exist in ne API (subject to change) + Ypos_min = 20; #else Ypos_min = 0; #endif