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

Nullptr safety. KICAD-7DM

This commit is contained in:
Jeff Young 2024-02-07 14:21:44 +00:00
parent 1e6986d2f5
commit 98bc03919d
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/dialogs/panel_setup_netclasses.cpp
View File

@ -114,7 +114,6 @@ PANEL_SETUP_NETCLASSES::PANEL_SETUP_NETCLASSES( wxWindow* aParentWindow, EDA_DRA
m_splitter->SetMinimumPaneSize( FromDIP( m_splitter->GetMinimumPaneSize() ) ); m_splitter->SetMinimumPaneSize( FromDIP( m_splitter->GetMinimumPaneSize() ) );
m_originalColWidths = new int[ m_netclassGrid->GetNumberCols() ];
// Calculate a min best size to handle longest usual numeric values: // Calculate a min best size to handle longest usual numeric values:
int const min_best_width = m_netclassGrid->GetTextExtent( "555,555555 mils" ).x; int const min_best_width = m_netclassGrid->GetTextExtent( "555,555555 mils" ).x;
@ -249,8 +248,6 @@ PANEL_SETUP_NETCLASSES::~PANEL_SETUP_NETCLASSES()
COMMON_SETTINGS* cfg = Pgm().GetCommonSettings(); COMMON_SETTINGS* cfg = Pgm().GetCommonSettings();
cfg->m_NetclassPanel.sash_pos = m_splitter->GetSashPosition(); cfg->m_NetclassPanel.sash_pos = m_splitter->GetSashPosition();
delete [] m_originalColWidths;
// Delete the GRID_TRICKS. // Delete the GRID_TRICKS.
m_netclassGrid->PopEventHandler( true ); m_netclassGrid->PopEventHandler( true );
m_assignmentGrid->PopEventHandler( true ); m_assignmentGrid->PopEventHandler( true );

2
include/dialogs/panel_setup_netclasses.h
View File

@ -83,7 +83,7 @@ private:
std::map<wxString, std::shared_ptr<NETCLASS>> m_lastLoaded; std::map<wxString, std::shared_ptr<NETCLASS>> m_lastLoaded;
int m_lastCheckedTicker; int m_lastCheckedTicker;
int* m_originalColWidths; std::vector<int> m_originalColWidths;
bool m_netclassesDirty; // The netclass drop-down menus need rebuilding bool m_netclassesDirty; // The netclass drop-down menus need rebuilding
int m_hoveredCol; // Column being hovered over, for tooltips int m_hoveredCol; // Column being hovered over, for tooltips
wxString m_lastPattern; wxString m_lastPattern;