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

Fix warning due to NONE enum member mixing

This commit is contained in:
Marek Roszko 2023-11-13 20:13:29 -05:00
parent 1900000371
commit 0054b64143
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
eeschema/dialogs/dialog_lib_symbol_properties.cpp
View File

@ -44,8 +44,8 @@
int DIALOG_LIB_SYMBOL_PROPERTIES::m_lastOpenedPage = 0; int DIALOG_LIB_SYMBOL_PROPERTIES::m_lastOpenedPage = 0;
DIALOG_LIB_SYMBOL_PROPERTIES::LAST_LAYOUT DIALOG_LIB_SYMBOL_PROPERTIES::LAST_LAYOUT DIALOG_LIB_SYMBOL_PROPERTIES::m_lastLayout =
DIALOG_LIB_SYMBOL_PROPERTIES::m_lastLayout = DIALOG_LIB_SYMBOL_PROPERTIES::NONE; DIALOG_LIB_SYMBOL_PROPERTIES::LAST_LAYOUT::NONE;
DIALOG_LIB_SYMBOL_PROPERTIES::DIALOG_LIB_SYMBOL_PROPERTIES( SYMBOL_EDIT_FRAME* aParent, DIALOG_LIB_SYMBOL_PROPERTIES::DIALOG_LIB_SYMBOL_PROPERTIES( SYMBOL_EDIT_FRAME* aParent,
@ -104,17 +104,19 @@ DIALOG_LIB_SYMBOL_PROPERTIES::DIALOG_LIB_SYMBOL_PROPERTIES( SYMBOL_EDIT_FRAME* a
wxGridEventHandler( DIALOG_LIB_SYMBOL_PROPERTIES::OnGridCellChanging ), wxGridEventHandler( DIALOG_LIB_SYMBOL_PROPERTIES::OnGridCellChanging ),
nullptr, this ); nullptr, this );
if( m_lastLayout != DIALOG_LIB_SYMBOL_PROPERTIES::NONE ) if( m_lastLayout != DIALOG_LIB_SYMBOL_PROPERTIES::LAST_LAYOUT::NONE )
{ {
if( ( m_lastLayout == DIALOG_LIB_SYMBOL_PROPERTIES::ALIAS && aLibEntry->IsRoot() ) if( ( m_lastLayout == DIALOG_LIB_SYMBOL_PROPERTIES::LAST_LAYOUT::ALIAS
|| ( m_lastLayout == DIALOG_LIB_SYMBOL_PROPERTIES::PARENT && aLibEntry->IsAlias() ) ) && aLibEntry->IsRoot() )
|| ( m_lastLayout == DIALOG_LIB_SYMBOL_PROPERTIES::LAST_LAYOUT::PARENT
&& aLibEntry->IsAlias() ) )
{ {
resetSize(); resetSize();
} }
} }
m_lastLayout = ( aLibEntry->IsAlias() ) ? DIALOG_LIB_SYMBOL_PROPERTIES::ALIAS m_lastLayout = ( aLibEntry->IsAlias() ) ? DIALOG_LIB_SYMBOL_PROPERTIES::LAST_LAYOUT::ALIAS
: DIALOG_LIB_SYMBOL_PROPERTIES::PARENT; : DIALOG_LIB_SYMBOL_PROPERTIES::LAST_LAYOUT::PARENT;
m_grid->GetParent()->Layout(); m_grid->GetParent()->Layout();
syncControlStates( m_libEntry->IsAlias() ); syncControlStates( m_libEntry->IsAlias() );

2
eeschema/dialogs/dialog_lib_symbol_properties.h
View File

@ -95,7 +95,7 @@ public:
private: private:
static int m_lastOpenedPage; // To remember the last notebook selection static int m_lastOpenedPage; // To remember the last notebook selection
enum LAST_LAYOUT { enum class LAST_LAYOUT {
NONE, NONE,
ALIAS, ALIAS,
PARENT PARENT