mirror of
https://gitlab.com/kicad/code/kicad.git
synced 2025-09-14 02:03:12 +02:00
Fix compil warning and issue.
This commit is contained in:
parent
8fd175dd22
commit
ddcf3f9855
@ -146,8 +146,8 @@ bool DIALOG_SHEET_PROPERTIES::TransferDataToWindow()
|
||||
SCH_FIELD field_copy( field );
|
||||
|
||||
#ifdef __WINDOWS__
|
||||
// Filenames are stored using unix notation
|
||||
if( field_copy.GetId() == SHEETFILENAME )
|
||||
// Filenames are stored using unix notation, so convert to Windows notation
|
||||
if( field_copy.GetId() == FIELD_T::SHEET_FILENAME )
|
||||
{
|
||||
wxString filename = field_copy.GetText();
|
||||
filename.Replace( wxT( "/" ), wxT( "\\" ) );
|
||||
|
@ -37,12 +37,13 @@ DIALOG_TABLECELL_PROPERTIES::DIALOG_TABLECELL_PROPERTIES( SCH_EDIT_FRAME*
|
||||
std::vector<SCH_TABLECELL*> aCells ) :
|
||||
DIALOG_TABLECELL_PROPERTIES_BASE( aFrame ), m_frame( aFrame ), m_table( nullptr ),
|
||||
m_cells( std::move( aCells ) ),
|
||||
m_scintillaTricks( nullptr ),
|
||||
m_textSize( aFrame, m_textSizeLabel, m_textSizeCtrl, m_textSizeUnits ),
|
||||
m_marginLeft( aFrame, nullptr, m_marginLeftCtrl, nullptr ),
|
||||
m_marginTop( aFrame, nullptr, m_marginTopCtrl, m_marginTopUnits ),
|
||||
m_marginRight( aFrame, nullptr, m_marginRightCtrl, nullptr ),
|
||||
m_marginBottom( aFrame, nullptr, m_marginBottomCtrl, nullptr ),
|
||||
m_scintillaTricks( nullptr ), m_cellText( m_cellTextCtrl ),
|
||||
m_cellText( m_cellTextCtrl ),
|
||||
m_returnValue( TABLECELL_PROPS_CANCEL )
|
||||
{
|
||||
wxASSERT( m_cells.size() > 0 && m_cells[0] );
|
||||
|
Loading…
x
Reference in New Issue
Block a user