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

Remove disappearing-preferences hack in favour of fix in wxWidgets. 

This has been patched in our local OSX wxWidgets branch.
This commit is contained in:
Jeff Young 2019-08-10 11:11:53 +01:00
parent 039bd92ea5
commit 3a2c39b0f8
2 changed files with 0 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
common/eda_draw_frame.cpp
View File

@ -159,9 +159,6 @@ EDA_DRAW_FRAME::EDA_DRAW_FRAME( KIWAY* aKiway, wxWindow* aParent, FRAME_T aFrame
wxSize( m_FrameSize.x, m_MsgFrameHeight ) ); wxSize( m_FrameSize.x, m_MsgFrameHeight ) );
m_messagePanel->SetBackgroundColour( COLOR4D( LIGHTGRAY ).ToColour() ); m_messagePanel->SetBackgroundColour( COLOR4D( LIGHTGRAY ).ToColour() );
Connect( wxEVT_ACTIVATE, wxActivateEventHandler( EDA_DRAW_FRAME::onActivate ), NULL, this );
Connect( wxEVT_IDLE, wxIdleEventHandler( EDA_DRAW_FRAME::onIdle ), NULL, this );
} }
@ -190,29 +187,6 @@ EDA_DRAW_FRAME::~EDA_DRAW_FRAME()
m_auimgr.UnInit(); m_auimgr.UnInit();
ReleaseFile(); ReleaseFile();
Disconnect( wxEVT_ACTIVATE, wxActivateEventHandler( EDA_DRAW_FRAME::onActivate ), NULL, this );
Disconnect( wxEVT_IDLE, wxIdleEventHandler( EDA_DRAW_FRAME::onIdle ), NULL, this );
}
void EDA_DRAW_FRAME::onActivate( wxActivateEvent& event )
{
#ifdef __WXMAC__
// Work around wxWidgets bug where the OSX Preferences item gets lost when reactivating
// a draw frame...
m_menuBarDirty = true;
#endif
}
void EDA_DRAW_FRAME::onIdle( wxIdleEvent& event )
{
if( m_menuBarDirty )
{
m_menuBarDirty = false;
ReCreateMenuBar();
}
} }

4
include/eda_draw_frame.h
View File

@ -114,7 +114,6 @@ protected:
bool m_showBorderAndTitleBlock; // Show the worksheet (border and title block). bool m_showBorderAndTitleBlock; // Show the worksheet (border and title block).
long m_firstRunDialogSetting; // Show first run dialog on startup long m_firstRunDialogSetting; // Show first run dialog on startup
bool m_menuBarDirty;
wxChoice* m_gridSelectBox; wxChoice* m_gridSelectBox;
wxChoice* m_zoomSelectBox; wxChoice* m_zoomSelectBox;
@ -133,9 +132,6 @@ protected:
/// The current canvas type /// The current canvas type
EDA_DRAW_PANEL_GAL::GAL_TYPE m_canvasType; EDA_DRAW_PANEL_GAL::GAL_TYPE m_canvasType;
void onActivate( wxActivateEvent& event );
void onIdle( wxIdleEvent& event );
virtual void SetScreen( BASE_SCREEN* aScreen ) { m_currentScreen = aScreen; } virtual void SetScreen( BASE_SCREEN* aScreen ) { m_currentScreen = aScreen; }
double bestZoom( double sizeX, double sizeY, double scaleFactor, wxPoint centre ); double bestZoom( double sizeX, double sizeY, double scaleFactor, wxPoint centre );