Add more missing destructor event cleanups
This commit is contained in:
parent
eaa3ee43e9
commit
6d3b846eb5
|
@ -75,8 +75,8 @@ PANEL_HOTKEYS_EDITOR::PANEL_HOTKEYS_EDITOR( EDA_BASE_FRAME* aFrame, wxWindow* aW
|
||||||
wxBoxSizer* mainSizer = new wxBoxSizer( wxVERTICAL );
|
wxBoxSizer* mainSizer = new wxBoxSizer( wxVERTICAL );
|
||||||
wxBoxSizer* bMargins = new wxBoxSizer( wxVERTICAL );
|
wxBoxSizer* bMargins = new wxBoxSizer( wxVERTICAL );
|
||||||
|
|
||||||
wxSearchCtrl* filterSearch = CreateTextFilterBox( this, _( "Type filter text" ) );
|
m_filterSearch = CreateTextFilterBox( this, _( "Type filter text" ) );
|
||||||
bMargins->Add( filterSearch, 0, wxEXPAND, 0 );
|
bMargins->Add( m_filterSearch, 0, wxEXPAND, 0 );
|
||||||
|
|
||||||
m_hotkeyListCtrl = new WIDGET_HOTKEY_LIST( this, m_hotkeyStore, m_readOnly );
|
m_hotkeyListCtrl = new WIDGET_HOTKEY_LIST( this, m_hotkeyStore, m_readOnly );
|
||||||
bMargins->Add( m_hotkeyListCtrl, 1, wxEXPAND, 0 );
|
bMargins->Add( m_hotkeyListCtrl, 1, wxEXPAND, 0 );
|
||||||
|
@ -88,15 +88,22 @@ PANEL_HOTKEYS_EDITOR::PANEL_HOTKEYS_EDITOR( EDA_BASE_FRAME* aFrame, wxWindow* aW
|
||||||
|
|
||||||
#ifdef __WXGTK__
|
#ifdef __WXGTK__
|
||||||
// Work around a bug that clips the text vertically in the wxSearchCtrl on GTK
|
// Work around a bug that clips the text vertically in the wxSearchCtrl on GTK
|
||||||
filterSearch->SetMinSize( wxSize( filterSearch->GetSize().x,
|
m_filterSearch->SetMinSize(
|
||||||
int( filterSearch->GetSize().y * 1.6 ) ) );
|
wxSize( m_filterSearch->GetSize().x, int( m_filterSearch->GetSize().y * 1.6 ) ) );
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
SetSizer( mainSizer );
|
SetSizer( mainSizer );
|
||||||
Layout();
|
Layout();
|
||||||
|
|
||||||
// Connect Events
|
// Connect Events
|
||||||
filterSearch->Bind( wxEVT_COMMAND_TEXT_UPDATED, &PANEL_HOTKEYS_EDITOR::OnFilterSearch, this );
|
m_filterSearch->Bind( wxEVT_COMMAND_TEXT_UPDATED, &PANEL_HOTKEYS_EDITOR::OnFilterSearch, this );
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
PANEL_HOTKEYS_EDITOR::~PANEL_HOTKEYS_EDITOR()
|
||||||
|
{
|
||||||
|
m_filterSearch->Unbind( wxEVT_COMMAND_TEXT_UPDATED, &PANEL_HOTKEYS_EDITOR::OnFilterSearch,
|
||||||
|
this );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -72,6 +72,16 @@ DIALOG_MIGRATE_BUSES::DIALOG_MIGRATE_BUSES( SCH_EDIT_FRAME* aParent )
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
DIALOG_MIGRATE_BUSES::~DIALOG_MIGRATE_BUSES()
|
||||||
|
{
|
||||||
|
m_migration_list->Unbind( wxEVT_LIST_ITEM_SELECTED, &DIALOG_MIGRATE_BUSES::onItemSelected,
|
||||||
|
this );
|
||||||
|
|
||||||
|
m_btn_accept->Unbind( wxEVT_COMMAND_BUTTON_CLICKED, &DIALOG_MIGRATE_BUSES::onAcceptClicked,
|
||||||
|
this );
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
void DIALOG_MIGRATE_BUSES::loadGraphData()
|
void DIALOG_MIGRATE_BUSES::loadGraphData()
|
||||||
{
|
{
|
||||||
m_items.clear();
|
m_items.clear();
|
||||||
|
|
|
@ -49,6 +49,7 @@ class DIALOG_MIGRATE_BUSES : public DIALOG_MIGRATE_BUSES_BASE
|
||||||
public:
|
public:
|
||||||
|
|
||||||
DIALOG_MIGRATE_BUSES( SCH_EDIT_FRAME* aParent );
|
DIALOG_MIGRATE_BUSES( SCH_EDIT_FRAME* aParent );
|
||||||
|
~DIALOG_MIGRATE_BUSES();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
|
|
|
@ -88,6 +88,12 @@ DIALOG_SCH_FIND::DIALOG_SCH_FIND( SCH_EDIT_FRAME* aParent, SCH_SEARCH_DATA* aDat
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
DIALOG_SCH_FIND::~DIALOG_SCH_FIND()
|
||||||
|
{
|
||||||
|
Disconnect( wxEVT_CHAR, wxKeyEventHandler( DIALOG_SCH_FIND::OnChar ), nullptr, this );
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
void DIALOG_SCH_FIND::OnClose( wxCloseEvent& aEvent )
|
void DIALOG_SCH_FIND::OnClose( wxCloseEvent& aEvent )
|
||||||
{
|
{
|
||||||
// Notify the SCH_EDIT_FRAME
|
// Notify the SCH_EDIT_FRAME
|
||||||
|
|
|
@ -39,6 +39,7 @@ public:
|
||||||
DIALOG_SCH_FIND( SCH_EDIT_FRAME* aParent, SCH_SEARCH_DATA* aData,
|
DIALOG_SCH_FIND( SCH_EDIT_FRAME* aParent, SCH_SEARCH_DATA* aData,
|
||||||
const wxPoint& aPosition = wxDefaultPosition,
|
const wxPoint& aPosition = wxDefaultPosition,
|
||||||
const wxSize& aSize = wxDefaultSize, int aStyle = 0 );
|
const wxSize& aSize = wxDefaultSize, int aStyle = 0 );
|
||||||
|
~DIALOG_SCH_FIND();
|
||||||
|
|
||||||
void SetFindEntries( const wxArrayString& aEntries, const wxString& aFindString );
|
void SetFindEntries( const wxArrayString& aEntries, const wxString& aFindString );
|
||||||
wxArrayString GetFindEntries() const;
|
wxArrayString GetFindEntries() const;
|
||||||
|
|
|
@ -36,12 +36,14 @@
|
||||||
class wxPanel;
|
class wxPanel;
|
||||||
class wxSizer;
|
class wxSizer;
|
||||||
class TOOL_MANAGER;
|
class TOOL_MANAGER;
|
||||||
|
class wxSearchCtrl;
|
||||||
|
|
||||||
|
|
||||||
class PANEL_HOTKEYS_EDITOR : public RESETTABLE_PANEL
|
class PANEL_HOTKEYS_EDITOR : public RESETTABLE_PANEL
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
PANEL_HOTKEYS_EDITOR( EDA_BASE_FRAME* aFrame, wxWindow* aWindow, bool aReadOnly );
|
PANEL_HOTKEYS_EDITOR( EDA_BASE_FRAME* aFrame, wxWindow* aWindow, bool aReadOnly );
|
||||||
|
~PANEL_HOTKEYS_EDITOR();
|
||||||
|
|
||||||
std::vector<TOOL_ACTION*>& ActionsList() { return m_actions; }
|
std::vector<TOOL_ACTION*>& ActionsList() { return m_actions; }
|
||||||
|
|
||||||
|
@ -84,6 +86,8 @@ private:
|
||||||
*/
|
*/
|
||||||
void dumpHotkeys();
|
void dumpHotkeys();
|
||||||
|
|
||||||
|
wxSearchCtrl* m_filterSearch;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
EDA_BASE_FRAME* m_frame;
|
EDA_BASE_FRAME* m_frame;
|
||||||
bool m_readOnly;
|
bool m_readOnly;
|
||||||
|
|
|
@ -45,7 +45,7 @@ class DIALOG_PRINT_PCBNEW : public DIALOG_PRINT_GENERIC
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
DIALOG_PRINT_PCBNEW( PCB_BASE_EDIT_FRAME* aParent, PCBNEW_PRINTOUT_SETTINGS* aSettings );
|
DIALOG_PRINT_PCBNEW( PCB_BASE_EDIT_FRAME* aParent, PCBNEW_PRINTOUT_SETTINGS* aSettings );
|
||||||
~DIALOG_PRINT_PCBNEW() {}
|
~DIALOG_PRINT_PCBNEW();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
enum
|
enum
|
||||||
|
@ -127,6 +127,17 @@ DIALOG_PRINT_PCBNEW::DIALOG_PRINT_PCBNEW( PCB_BASE_EDIT_FRAME* aParent,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
DIALOG_PRINT_PCBNEW::~DIALOG_PRINT_PCBNEW()
|
||||||
|
{
|
||||||
|
m_popMenu->Unbind( wxEVT_COMMAND_MENU_SELECTED,
|
||||||
|
wxCommandEventHandler( DIALOG_PRINT_PCBNEW::onPopUpLayers ), this,
|
||||||
|
ID_SELECT_FIRST, ID_SELECT_LAST );
|
||||||
|
|
||||||
|
m_outputMode->Unbind( wxEVT_COMMAND_CHOICE_SELECTED, &DIALOG_PRINT_PCBNEW::onColorModeClicked,
|
||||||
|
this );
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
bool DIALOG_PRINT_PCBNEW::TransferDataToWindow()
|
bool DIALOG_PRINT_PCBNEW::TransferDataToWindow()
|
||||||
{
|
{
|
||||||
if( !DIALOG_PRINT_GENERIC::TransferDataToWindow() )
|
if( !DIALOG_PRINT_GENERIC::TransferDataToWindow() )
|
||||||
|
|
|
@ -451,6 +451,14 @@ PANEL_FP_LIB_TABLE::PANEL_FP_LIB_TABLE( DIALOG_EDIT_LIBRARY_TABLES* aParent, PRO
|
||||||
|
|
||||||
PANEL_FP_LIB_TABLE::~PANEL_FP_LIB_TABLE()
|
PANEL_FP_LIB_TABLE::~PANEL_FP_LIB_TABLE()
|
||||||
{
|
{
|
||||||
|
wxMenu* browseMenu = m_browseButton->GetSplitButtonMenu();
|
||||||
|
for( auto& [type, desc] : m_supportedFpFiles )
|
||||||
|
{
|
||||||
|
browseMenu->Unbind( wxEVT_COMMAND_MENU_SELECTED,
|
||||||
|
&PANEL_FP_LIB_TABLE::browseLibrariesHandler, this, type );
|
||||||
|
}
|
||||||
|
m_browseButton->Unbind( wxEVT_BUTTON, &PANEL_FP_LIB_TABLE::browseLibrariesHandler, this );
|
||||||
|
|
||||||
// Delete the GRID_TRICKS.
|
// Delete the GRID_TRICKS.
|
||||||
// Any additional event handlers should be popped before the window is deleted.
|
// Any additional event handlers should be popped before the window is deleted.
|
||||||
m_global_grid->PopEventHandler( true );
|
m_global_grid->PopEventHandler( true );
|
||||||
|
|
|
@ -77,6 +77,10 @@ PANEL_SETUP_RULES::PANEL_SETUP_RULES( wxWindow* aParentWindow, PCB_EDIT_FRAME* a
|
||||||
|
|
||||||
PANEL_SETUP_RULES::~PANEL_SETUP_RULES( )
|
PANEL_SETUP_RULES::~PANEL_SETUP_RULES( )
|
||||||
{
|
{
|
||||||
|
m_textEditor->Unbind( wxEVT_STC_CHARADDED, &PANEL_SETUP_RULES::onScintillaCharAdded, this );
|
||||||
|
m_textEditor->Unbind( wxEVT_STC_AUTOCOMP_CHAR_DELETED, &PANEL_SETUP_RULES::onScintillaCharAdded,
|
||||||
|
this );
|
||||||
|
m_textEditor->Unbind( wxEVT_CHAR_HOOK, &PANEL_SETUP_RULES::onCharHook, this );
|
||||||
Pgm().GetCommonSettings()->m_Appearance.text_editor_zoom = m_textEditor->GetZoom();
|
Pgm().GetCommonSettings()->m_Appearance.text_editor_zoom = m_textEditor->GetZoom();
|
||||||
|
|
||||||
delete m_scintillaTricks;
|
delete m_scintillaTricks;
|
||||||
|
|
Loading…
Reference in New Issue