diff --git a/common/eda_draw_frame.cpp b/common/eda_draw_frame.cpp index 4adb28ca60..0371015355 100644 --- a/common/eda_draw_frame.cpp +++ b/common/eda_draw_frame.cpp @@ -159,9 +159,6 @@ EDA_DRAW_FRAME::EDA_DRAW_FRAME( KIWAY* aKiway, wxWindow* aParent, FRAME_T aFrame wxSize( m_FrameSize.x, m_MsgFrameHeight ) ); 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(); 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(); - } } diff --git a/include/eda_draw_frame.h b/include/eda_draw_frame.h index b35fac09b6..0857a862b3 100644 --- a/include/eda_draw_frame.h +++ b/include/eda_draw_frame.h @@ -114,7 +114,6 @@ protected: bool m_showBorderAndTitleBlock; // Show the worksheet (border and title block). long m_firstRunDialogSetting; // Show first run dialog on startup - bool m_menuBarDirty; wxChoice* m_gridSelectBox; wxChoice* m_zoomSelectBox; @@ -133,9 +132,6 @@ protected: /// The current canvas type 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; } double bestZoom( double sizeX, double sizeY, double scaleFactor, wxPoint centre );