fix minor compil warnings
This commit is contained in:
jean-pierre charras
parent
ed0a28769a
commit
eaaa4eb63a
|
|
@ -78,8 +78,8 @@ bool DIALOG_EDIT_LINE_STYLE::TransferDataToWindow()
|
|||
auto first_line = m_lines.front();
|
||||
|
||||
if( std::all_of( m_lines.begin() + 1, m_lines.end(),
|
||||
[&]( const SCH_LINE* r )
|
||||
{
|
||||
[&]( const SCH_LINE* r )
|
||||
{
|
||||
return r->GetPenSize() == first_line->GetPenSize();
|
||||
} ) )
|
||||
{
|
||||
|
|
@ -90,8 +90,8 @@ bool DIALOG_EDIT_LINE_STYLE::TransferDataToWindow()
|
|||
m_width.SetValue( INDETERMINATE );
|
||||
}
|
||||
|
||||
if( std::all_of( m_lines.begin() + 1, m_lines.end(),
|
||||
[&]( const SCH_LINE* r )
|
||||
if( std::all_of( m_lines.begin() + 1, m_lines.end(),
|
||||
[&]( const SCH_LINE* r )
|
||||
{
|
||||
return r->GetLineColor() == first_line->GetLineColor();
|
||||
} ) )
|
||||
|
|
@ -103,14 +103,14 @@ bool DIALOG_EDIT_LINE_STYLE::TransferDataToWindow()
|
|||
setColor( COLOR4D::UNSPECIFIED );
|
||||
}
|
||||
|
||||
if( std::all_of( m_lines.begin() + 1, m_lines.end(),
|
||||
[&]( const SCH_LINE* r )
|
||||
if( std::all_of( m_lines.begin() + 1, m_lines.end(),
|
||||
[&]( const SCH_LINE* r )
|
||||
{
|
||||
return r->GetLineStyle() == first_line->GetLineStyle();
|
||||
} ) )
|
||||
{
|
||||
int style = static_cast<int>( first_line->GetLineStyle() );
|
||||
wxCHECK_MSG( style < lineTypeNames.size(), false,
|
||||
wxCHECK_MSG( style < (int)lineTypeNames.size(), false,
|
||||
"Line type for first line is not found in the type lookup map" );
|
||||
m_typeCombo->SetSelection( style );
|
||||
}
|
||||
|
|
@ -206,7 +206,7 @@ bool DIALOG_EDIT_LINE_STYLE::TransferDataFromWindow()
|
|||
if( m_typeCombo->GetSelection() != wxNOT_FOUND )
|
||||
{
|
||||
int selection = m_typeCombo->GetSelection();
|
||||
wxCHECK_MSG( selection < lineTypeNames.size(), false,
|
||||
wxCHECK_MSG( selection < (int)lineTypeNames.size(), false,
|
||||
"Selected line type index exceeds size of line type lookup map" );
|
||||
|
||||
auto it = lineTypeNames.begin();
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
///////////////////////////////////////////////////////////////////////////
|
||||
// C++ code generated with wxFormBuilder (version Oct 26 2018)
|
||||
// C++ code generated with wxFormBuilder (version Jul 10 2019)
|
||||
// http://www.wxformbuilder.org/
|
||||
//
|
||||
// PLEASE DO *NOT* EDIT THIS FILE!
|
||||
|
|
@ -45,22 +45,21 @@ DIALOG_EDIT_LINE_STYLE_BASE::DIALOG_EDIT_LINE_STYLE_BASE( wxWindow* parent, wxWi
|
|||
|
||||
fgSizerGeneral->Add( m_staticWidthUnits, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 );
|
||||
|
||||
m_staticText5 = new wxStaticText( this, wxID_ANY, _("Color:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_staticText5->Wrap( -1 );
|
||||
fgSizerGeneral->Add( m_staticText5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
|
||||
m_staticTextColor = new wxStaticText( this, wxID_ANY, _("Color:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_staticTextColor->Wrap( -1 );
|
||||
fgSizerGeneral->Add( m_staticTextColor, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
|
||||
|
||||
m_colorButton = new wxBitmapButton( this, idColorBtn, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
|
||||
|
||||
m_colorButton->SetBitmap( wxNullBitmap );
|
||||
fgSizerGeneral->Add( m_colorButton, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 3 );
|
||||
|
||||
m_staticText4 = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_staticText4->Wrap( -1 );
|
||||
fgSizerGeneral->Add( m_staticText4, 0, wxALL, 5 );
|
||||
|
||||
m_staticText51 = new wxStaticText( this, wxID_ANY, _("Type:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_staticText51->Wrap( -1 );
|
||||
fgSizerGeneral->Add( m_staticText51, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
|
||||
fgSizerGeneral->Add( 0, 0, 1, wxEXPAND, 5 );
|
||||
|
||||
m_staticTextStyle = new wxStaticText( this, wxID_ANY, _("Style:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_staticTextStyle->Wrap( -1 );
|
||||
fgSizerGeneral->Add( m_staticTextStyle, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
|
||||
|
||||
m_typeCombo = new wxBitmapComboBox( this, wxID_ANY, _("Combo!"), wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_READONLY );
|
||||
m_typeCombo->SetMinSize( wxSize( 140,-1 ) );
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@
|
|||
<property name="file">dialog_edit_line_style_base</property>
|
||||
<property name="first_id">1000</property>
|
||||
<property name="help_provider">none</property>
|
||||
<property name="image_path_wrapper_function_name"></property>
|
||||
<property name="indent_with_spaces"></property>
|
||||
<property name="internationalize">1</property>
|
||||
<property name="name">dialog_edit_line_style</property>
|
||||
|
|
@ -25,6 +26,7 @@
|
|||
<property name="skip_php_events">1</property>
|
||||
<property name="skip_python_events">1</property>
|
||||
<property name="ui_table">UI</property>
|
||||
<property name="use_array_enum">0</property>
|
||||
<property name="use_enum">1</property>
|
||||
<property name="use_microsoft_bom">0</property>
|
||||
<object class="Dialog" expanded="1">
|
||||
|
|
@ -45,8 +47,8 @@
|
|||
<property name="minimum_size"></property>
|
||||
<property name="name">DIALOG_EDIT_LINE_STYLE_BASE</property>
|
||||
<property name="pos"></property>
|
||||
<property name="size">325,180</property>
|
||||
<property name="style">wxDEFAULT_DIALOG_STYLE</property>
|
||||
<property name="size">349,194</property>
|
||||
<property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>
|
||||
<property name="subclass">DIALOG_SHIM; dialog_shim.h</property>
|
||||
<property name="title">Line Style</property>
|
||||
<property name="tooltip"></property>
|
||||
|
|
@ -311,7 +313,7 @@
|
|||
<property name="minimize_button">0</property>
|
||||
<property name="minimum_size"></property>
|
||||
<property name="moveable">1</property>
|
||||
<property name="name">m_staticText5</property>
|
||||
<property name="name">m_staticTextColor</property>
|
||||
<property name="pane_border">1</property>
|
||||
<property name="pane_position"></property>
|
||||
<property name="pane_size"></property>
|
||||
|
|
@ -406,63 +408,12 @@
|
|||
</object>
|
||||
<object class="sizeritem" expanded="1">
|
||||
<property name="border">5</property>
|
||||
<property name="flag">wxALL</property>
|
||||
<property name="proportion">0</property>
|
||||
<object class="wxStaticText" expanded="1">
|
||||
<property name="BottomDockable">1</property>
|
||||
<property name="LeftDockable">1</property>
|
||||
<property name="RightDockable">1</property>
|
||||
<property name="TopDockable">1</property>
|
||||
<property name="aui_layer"></property>
|
||||
<property name="aui_name"></property>
|
||||
<property name="aui_position"></property>
|
||||
<property name="aui_row"></property>
|
||||
<property name="best_size"></property>
|
||||
<property name="bg"></property>
|
||||
<property name="caption"></property>
|
||||
<property name="caption_visible">1</property>
|
||||
<property name="center_pane">0</property>
|
||||
<property name="close_button">1</property>
|
||||
<property name="context_help"></property>
|
||||
<property name="context_menu">1</property>
|
||||
<property name="default_pane">0</property>
|
||||
<property name="dock">Dock</property>
|
||||
<property name="dock_fixed">0</property>
|
||||
<property name="docking">Left</property>
|
||||
<property name="enabled">1</property>
|
||||
<property name="fg"></property>
|
||||
<property name="floatable">1</property>
|
||||
<property name="font"></property>
|
||||
<property name="gripper">0</property>
|
||||
<property name="hidden">0</property>
|
||||
<property name="id">wxID_ANY</property>
|
||||
<property name="label"></property>
|
||||
<property name="markup">0</property>
|
||||
<property name="max_size"></property>
|
||||
<property name="maximize_button">0</property>
|
||||
<property name="maximum_size"></property>
|
||||
<property name="min_size"></property>
|
||||
<property name="minimize_button">0</property>
|
||||
<property name="minimum_size"></property>
|
||||
<property name="moveable">1</property>
|
||||
<property name="name">m_staticText4</property>
|
||||
<property name="pane_border">1</property>
|
||||
<property name="pane_position"></property>
|
||||
<property name="pane_size"></property>
|
||||
<property name="flag">wxEXPAND</property>
|
||||
<property name="proportion">1</property>
|
||||
<object class="spacer" expanded="1">
|
||||
<property name="height">0</property>
|
||||
<property name="permission">protected</property>
|
||||
<property name="pin_button">1</property>
|
||||
<property name="pos"></property>
|
||||
<property name="resize">Resizable</property>
|
||||
<property name="show">1</property>
|
||||
<property name="size"></property>
|
||||
<property name="style"></property>
|
||||
<property name="subclass">; ; forward_declare</property>
|
||||
<property name="toolbar_pane">0</property>
|
||||
<property name="tooltip"></property>
|
||||
<property name="window_extra_style"></property>
|
||||
<property name="window_name"></property>
|
||||
<property name="window_style"></property>
|
||||
<property name="wrap">-1</property>
|
||||
<property name="width">0</property>
|
||||
</object>
|
||||
</object>
|
||||
<object class="sizeritem" expanded="1">
|
||||
|
|
@ -497,7 +448,7 @@
|
|||
<property name="gripper">0</property>
|
||||
<property name="hidden">0</property>
|
||||
<property name="id">wxID_ANY</property>
|
||||
<property name="label">Type:</property>
|
||||
<property name="label">Style:</property>
|
||||
<property name="markup">0</property>
|
||||
<property name="max_size"></property>
|
||||
<property name="maximize_button">0</property>
|
||||
|
|
@ -506,7 +457,7 @@
|
|||
<property name="minimize_button">0</property>
|
||||
<property name="minimum_size"></property>
|
||||
<property name="moveable">1</property>
|
||||
<property name="name">m_staticText51</property>
|
||||
<property name="name">m_staticTextStyle</property>
|
||||
<property name="pane_border">1</property>
|
||||
<property name="pane_position"></property>
|
||||
<property name="pane_size"></property>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
///////////////////////////////////////////////////////////////////////////
|
||||
// C++ code generated with wxFormBuilder (version Oct 26 2018)
|
||||
// C++ code generated with wxFormBuilder (version Jul 10 2019)
|
||||
// http://www.wxformbuilder.org/
|
||||
//
|
||||
// PLEASE DO *NOT* EDIT THIS FILE!
|
||||
|
|
@ -52,10 +52,9 @@ class DIALOG_EDIT_LINE_STYLE_BASE : public DIALOG_SHIM
|
|||
wxStaticText* m_staticTextWidth;
|
||||
wxTextCtrl* m_lineWidth;
|
||||
wxStaticText* m_staticWidthUnits;
|
||||
wxStaticText* m_staticText5;
|
||||
wxStaticText* m_staticTextColor;
|
||||
wxBitmapButton* m_colorButton;
|
||||
wxStaticText* m_staticText4;
|
||||
wxStaticText* m_staticText51;
|
||||
wxStaticText* m_staticTextStyle;
|
||||
wxBitmapComboBox* m_typeCombo;
|
||||
wxStaticLine* m_staticline;
|
||||
wxStdDialogButtonSizer* m_sdbSizer;
|
||||
|
|
@ -71,7 +70,7 @@ class DIALOG_EDIT_LINE_STYLE_BASE : public DIALOG_SHIM
|
|||
public:
|
||||
bool m_isValid;
|
||||
|
||||
DIALOG_EDIT_LINE_STYLE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Line Style"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 325,180 ), long style = wxDEFAULT_DIALOG_STYLE );
|
||||
DIALOG_EDIT_LINE_STYLE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Line Style"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 349,194 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
|
||||
~DIALOG_EDIT_LINE_STYLE_BASE();
|
||||
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in New Issue