diff --git a/common/kiway.cpp b/common/kiway.cpp index f7b240542e..fef1689389 100644 --- a/common/kiway.cpp +++ b/common/kiway.cpp @@ -302,7 +302,6 @@ KIWAY_PLAYER* KIWAY::Player( FRAME_T aFrameType, bool doCreate, KIWAY_PLAYER* aP return NULL; } - printf("Player %d\n", aFrameType); // return the previously opened window KIWAY_PLAYER* frame = GetPlayerFrame( aFrameType ); diff --git a/eeschema/dialogs/dialog_sim_settings_base.cpp b/eeschema/dialogs/dialog_sim_settings_base.cpp index 64231f41a7..bc947e3169 100644 --- a/eeschema/dialogs/dialog_sim_settings_base.cpp +++ b/eeschema/dialogs/dialog_sim_settings_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 24 2016) +// C++ code generated with wxFormBuilder (version May 6 2016) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -24,9 +24,9 @@ DIALOG_SIM_SETTINGS_BASE::DIALOG_SIM_SETTINGS_BASE( wxWindow* parent, wxWindowID bSizer3->Add( 0, 0, 1, wxEXPAND, 5 ); - wxString m_acScaleChoices[] = { wxT("Decade"), wxT("Octave"), wxT("Linear") }; + wxString m_acScaleChoices[] = { _("Decade"), _("Octave"), _("Linear") }; int m_acScaleNChoices = sizeof( m_acScaleChoices ) / sizeof( wxString ); - m_acScale = new wxRadioBox( m_pgAC, wxID_ANY, wxT("Frequency scale"), wxDefaultPosition, wxDefaultSize, m_acScaleNChoices, m_acScaleChoices, 1, wxRA_SPECIFY_COLS ); + m_acScale = new wxRadioBox( m_pgAC, wxID_ANY, _("Frequency scale"), wxDefaultPosition, wxDefaultSize, m_acScaleNChoices, m_acScaleChoices, 1, wxRA_SPECIFY_COLS ); m_acScale->SetSelection( 0 ); m_acScale->Hide(); @@ -40,21 +40,21 @@ DIALOG_SIM_SETTINGS_BASE::DIALOG_SIM_SETTINGS_BASE( wxWindow* parent, wxWindowID fgSizer1->SetFlexibleDirection( wxBOTH ); fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - m_staticText1 = new wxStaticText( m_pgAC, wxID_ANY, wxT("Number of points"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText1 = new wxStaticText( m_pgAC, wxID_ANY, _("Number of points"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText1->Wrap( -1 ); fgSizer1->Add( m_staticText1, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_acPointsNumber = new wxTextCtrl( m_pgAC, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer1->Add( m_acPointsNumber, 0, wxALL|wxEXPAND, 5 ); - m_staticText2 = new wxStaticText( m_pgAC, wxID_ANY, wxT("Start frequency [Hz]"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText2 = new wxStaticText( m_pgAC, wxID_ANY, _("Start frequency [Hz]"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText2->Wrap( -1 ); fgSizer1->Add( m_staticText2, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_acFreqStart = new wxTextCtrl( m_pgAC, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer1->Add( m_acFreqStart, 0, wxALL|wxEXPAND, 5 ); - m_staticText3 = new wxStaticText( m_pgAC, wxID_ANY, wxT("Stop frequency [Hz]"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText3 = new wxStaticText( m_pgAC, wxID_ANY, _("Stop frequency [Hz]"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText3->Wrap( -1 ); fgSizer1->Add( m_staticText3, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); @@ -71,15 +71,15 @@ DIALOG_SIM_SETTINGS_BASE::DIALOG_SIM_SETTINGS_BASE( wxWindow* parent, wxWindowID m_pgAC->SetSizer( bSizer3 ); m_pgAC->Layout(); bSizer3->Fit( m_pgAC ); - m_simPages->AddPage( m_pgAC, wxT("AC"), true ); + m_simPages->AddPage( m_pgAC, _("AC"), false ); m_pgDC = new wxPanel( m_simPages, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* bSizer4; bSizer4 = new wxBoxSizer( wxVERTICAL ); wxStaticBoxSizer* sbSizer21; - sbSizer21 = new wxStaticBoxSizer( new wxStaticBox( m_pgDC, wxID_ANY, wxT("DC sweep source 1") ), wxVERTICAL ); + sbSizer21 = new wxStaticBoxSizer( new wxStaticBox( m_pgDC, wxID_ANY, _("DC sweep source 1") ), wxVERTICAL ); - m_dcEnable1 = new wxCheckBox( sbSizer21->GetStaticBox(), wxID_ANY, wxT("Enable"), wxDefaultPosition, wxDefaultSize, 0 ); + m_dcEnable1 = new wxCheckBox( sbSizer21->GetStaticBox(), wxID_ANY, _("Enable"), wxDefaultPosition, wxDefaultSize, 0 ); sbSizer21->Add( m_dcEnable1, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 ); wxFlexGridSizer* fgSizer21; @@ -87,28 +87,28 @@ DIALOG_SIM_SETTINGS_BASE::DIALOG_SIM_SETTINGS_BASE( wxWindow* parent, wxWindowID fgSizer21->SetFlexibleDirection( wxBOTH ); fgSizer21->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - m_staticText41 = new wxStaticText( sbSizer21->GetStaticBox(), wxID_ANY, wxT("DC source"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText41 = new wxStaticText( sbSizer21->GetStaticBox(), wxID_ANY, _("DC source"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText41->Wrap( -1 ); fgSizer21->Add( m_staticText41, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_dcSource1 = new wxComboBox( sbSizer21->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); fgSizer21->Add( m_dcSource1, 0, wxALL, 5 ); - m_staticText51 = new wxStaticText( sbSizer21->GetStaticBox(), wxID_ANY, wxT("Starting voltage [V]"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText51 = new wxStaticText( sbSizer21->GetStaticBox(), wxID_ANY, _("Starting voltage [V]"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText51->Wrap( -1 ); fgSizer21->Add( m_staticText51, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_dcStart1 = new wxTextCtrl( sbSizer21->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer21->Add( m_dcStart1, 0, wxALL, 5 ); - m_staticText61 = new wxStaticText( sbSizer21->GetStaticBox(), wxID_ANY, wxT("Final voltage [V]"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText61 = new wxStaticText( sbSizer21->GetStaticBox(), wxID_ANY, _("Final voltage [V]"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText61->Wrap( -1 ); fgSizer21->Add( m_staticText61, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_dcStop1 = new wxTextCtrl( sbSizer21->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer21->Add( m_dcStop1, 0, wxALL, 5 ); - m_staticText71 = new wxStaticText( sbSizer21->GetStaticBox(), wxID_ANY, wxT("Increment step [V]"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText71 = new wxStaticText( sbSizer21->GetStaticBox(), wxID_ANY, _("Increment step [V]"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText71->Wrap( -1 ); fgSizer21->Add( m_staticText71, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); @@ -122,9 +122,9 @@ DIALOG_SIM_SETTINGS_BASE::DIALOG_SIM_SETTINGS_BASE( wxWindow* parent, wxWindowID bSizer4->Add( sbSizer21, 1, wxEXPAND, 5 ); wxStaticBoxSizer* sbSizer2; - sbSizer2 = new wxStaticBoxSizer( new wxStaticBox( m_pgDC, wxID_ANY, wxT("DC sweep source 2") ), wxVERTICAL ); + sbSizer2 = new wxStaticBoxSizer( new wxStaticBox( m_pgDC, wxID_ANY, _("DC sweep source 2") ), wxVERTICAL ); - m_dcEnable2 = new wxCheckBox( sbSizer2->GetStaticBox(), wxID_ANY, wxT("Enable"), wxDefaultPosition, wxDefaultSize, 0 ); + m_dcEnable2 = new wxCheckBox( sbSizer2->GetStaticBox(), wxID_ANY, _("Enable"), wxDefaultPosition, wxDefaultSize, 0 ); sbSizer2->Add( m_dcEnable2, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 ); wxFlexGridSizer* fgSizer2; @@ -132,28 +132,28 @@ DIALOG_SIM_SETTINGS_BASE::DIALOG_SIM_SETTINGS_BASE( wxWindow* parent, wxWindowID fgSizer2->SetFlexibleDirection( wxBOTH ); fgSizer2->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - m_staticText4 = new wxStaticText( sbSizer2->GetStaticBox(), wxID_ANY, wxT("DC source"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText4 = new wxStaticText( sbSizer2->GetStaticBox(), wxID_ANY, _("DC source"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText4->Wrap( -1 ); fgSizer2->Add( m_staticText4, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_dcSource2 = new wxComboBox( sbSizer2->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); fgSizer2->Add( m_dcSource2, 0, wxALL, 5 ); - m_staticText5 = new wxStaticText( sbSizer2->GetStaticBox(), wxID_ANY, wxT("Starting voltage [V]"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText5 = new wxStaticText( sbSizer2->GetStaticBox(), wxID_ANY, _("Starting voltage [V]"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText5->Wrap( -1 ); fgSizer2->Add( m_staticText5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_dcStart2 = new wxTextCtrl( sbSizer2->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer2->Add( m_dcStart2, 0, wxALL, 5 ); - m_staticText6 = new wxStaticText( sbSizer2->GetStaticBox(), wxID_ANY, wxT("Final voltage [V]"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText6 = new wxStaticText( sbSizer2->GetStaticBox(), wxID_ANY, _("Final voltage [V]"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText6->Wrap( -1 ); fgSizer2->Add( m_staticText6, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_dcStop2 = new wxTextCtrl( sbSizer2->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer2->Add( m_dcStop2, 0, wxALL, 5 ); - m_staticText7 = new wxStaticText( sbSizer2->GetStaticBox(), wxID_ANY, wxT("Increment step [V]"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText7 = new wxStaticText( sbSizer2->GetStaticBox(), wxID_ANY, _("Increment step [V]"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText7->Wrap( -1 ); fgSizer2->Add( m_staticText7, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); @@ -170,11 +170,11 @@ DIALOG_SIM_SETTINGS_BASE::DIALOG_SIM_SETTINGS_BASE( wxWindow* parent, wxWindowID m_pgDC->SetSizer( bSizer4 ); m_pgDC->Layout(); bSizer4->Fit( m_pgDC ); - m_simPages->AddPage( m_pgDC, wxT("DC Transfer"), false ); + m_simPages->AddPage( m_pgDC, _("DC Transfer"), false ); m_pgDistortion = new wxPanel( m_simPages, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_pgDistortion->Hide(); - m_simPages->AddPage( m_pgDistortion, wxT("Distortion"), false ); + m_simPages->AddPage( m_pgDistortion, _("Distortion"), false ); m_pgNoise = new wxPanel( m_simPages, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_pgNoise->Hide(); @@ -189,7 +189,7 @@ DIALOG_SIM_SETTINGS_BASE::DIALOG_SIM_SETTINGS_BASE( wxWindow* parent, wxWindowID fgSizer7->SetFlexibleDirection( wxBOTH ); fgSizer7->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - m_staticText14 = new wxStaticText( m_pgNoise, wxID_ANY, wxT("Measured node"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText14 = new wxStaticText( m_pgNoise, wxID_ANY, _("Measured node"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText14->Wrap( -1 ); fgSizer7->Add( m_staticText14, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); @@ -199,18 +199,18 @@ DIALOG_SIM_SETTINGS_BASE::DIALOG_SIM_SETTINGS_BASE( wxWindow* parent, wxWindowID fgSizer7->Add( 0, 0, 1, wxEXPAND, 5 ); - m_staticText15 = new wxStaticText( m_pgNoise, wxID_ANY, wxT("Reference node"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText15 = new wxStaticText( m_pgNoise, wxID_ANY, _("Reference node"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText15->Wrap( -1 ); fgSizer7->Add( m_staticText15, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_noiseRef = new wxComboBox( m_pgNoise, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); fgSizer7->Add( m_noiseRef, 0, wxALL, 5 ); - m_staticText23 = new wxStaticText( m_pgNoise, wxID_ANY, wxT("(optional; default GND)"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText23 = new wxStaticText( m_pgNoise, wxID_ANY, _("(optional; default GND)"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText23->Wrap( -1 ); fgSizer7->Add( m_staticText23, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - m_staticText16 = new wxStaticText( m_pgNoise, wxID_ANY, wxT("Noise source"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText16 = new wxStaticText( m_pgNoise, wxID_ANY, _("Noise source"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText16->Wrap( -1 ); fgSizer7->Add( m_staticText16, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); @@ -226,9 +226,9 @@ DIALOG_SIM_SETTINGS_BASE::DIALOG_SIM_SETTINGS_BASE( wxWindow* parent, wxWindowID bSizer15->Add( 0, 0, 1, wxEXPAND, 5 ); - wxString m_noiseScaleChoices[] = { wxT("Decade"), wxT("Octave"), wxT("Linear") }; + wxString m_noiseScaleChoices[] = { _("Decade"), _("Octave"), _("Linear") }; int m_noiseScaleNChoices = sizeof( m_noiseScaleChoices ) / sizeof( wxString ); - m_noiseScale = new wxRadioBox( m_pgNoise, wxID_ANY, wxT("Frequency scale"), wxDefaultPosition, wxDefaultSize, m_noiseScaleNChoices, m_noiseScaleChoices, 1, wxRA_SPECIFY_COLS ); + m_noiseScale = new wxRadioBox( m_pgNoise, wxID_ANY, _("Frequency scale"), wxDefaultPosition, wxDefaultSize, m_noiseScaleNChoices, m_noiseScaleChoices, 1, wxRA_SPECIFY_COLS ); m_noiseScale->SetSelection( 0 ); bSizer15->Add( m_noiseScale, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 ); @@ -240,21 +240,21 @@ DIALOG_SIM_SETTINGS_BASE::DIALOG_SIM_SETTINGS_BASE( wxWindow* parent, wxWindowID fgSizer11->SetFlexibleDirection( wxBOTH ); fgSizer11->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - m_staticText11 = new wxStaticText( m_pgNoise, wxID_ANY, wxT("Number of points"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText11 = new wxStaticText( m_pgNoise, wxID_ANY, _("Number of points"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText11->Wrap( -1 ); fgSizer11->Add( m_staticText11, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_noisePointsNumber = new wxTextCtrl( m_pgNoise, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer11->Add( m_noisePointsNumber, 0, wxALL, 5 ); - m_staticText21 = new wxStaticText( m_pgNoise, wxID_ANY, wxT("Start frequency [Hz]"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText21 = new wxStaticText( m_pgNoise, wxID_ANY, _("Start frequency [Hz]"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText21->Wrap( -1 ); fgSizer11->Add( m_staticText21, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_noiseFreqStart = new wxTextCtrl( m_pgNoise, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer11->Add( m_noiseFreqStart, 0, wxALL, 5 ); - m_staticText31 = new wxStaticText( m_pgNoise, wxID_ANY, wxT("Stop frequency [Hz]"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText31 = new wxStaticText( m_pgNoise, wxID_ANY, _("Stop frequency [Hz]"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText31->Wrap( -1 ); fgSizer11->Add( m_staticText31, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); @@ -271,7 +271,7 @@ DIALOG_SIM_SETTINGS_BASE::DIALOG_SIM_SETTINGS_BASE( wxWindow* parent, wxWindowID m_pgNoise->SetSizer( bSizer15 ); m_pgNoise->Layout(); bSizer15->Fit( m_pgNoise ); - m_simPages->AddPage( m_pgNoise, wxT("Noise"), false ); + m_simPages->AddPage( m_pgNoise, _("Noise"), false ); m_pgOP = new wxPanel( m_simPages, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_pgOP->Hide(); @@ -281,7 +281,7 @@ DIALOG_SIM_SETTINGS_BASE::DIALOG_SIM_SETTINGS_BASE( wxWindow* parent, wxWindowID bSizer8->Add( 0, 0, 1, wxEXPAND, 5 ); - m_staticText13 = new wxStaticText( m_pgOP, wxID_ANY, wxT("This tab has no settings"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText13 = new wxStaticText( m_pgOP, wxID_ANY, _("This tab has no settings"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText13->Wrap( -1 ); bSizer8->Add( m_staticText13, 0, wxALIGN_CENTER, 5 ); @@ -292,19 +292,19 @@ DIALOG_SIM_SETTINGS_BASE::DIALOG_SIM_SETTINGS_BASE( wxWindow* parent, wxWindowID m_pgOP->SetSizer( bSizer8 ); m_pgOP->Layout(); bSizer8->Fit( m_pgOP ); - m_simPages->AddPage( m_pgOP, wxT("Operating Point"), false ); + m_simPages->AddPage( m_pgOP, _("Operating Point"), false ); m_pgPoleZero = new wxPanel( m_simPages, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_pgPoleZero->Hide(); - m_simPages->AddPage( m_pgPoleZero, wxT("Pole-Zero"), false ); + m_simPages->AddPage( m_pgPoleZero, _("Pole-Zero"), false ); m_pgSensitivity = new wxPanel( m_simPages, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_pgSensitivity->Hide(); - m_simPages->AddPage( m_pgSensitivity, wxT("Sensitvity"), false ); + m_simPages->AddPage( m_pgSensitivity, _("Sensitivity"), true ); m_pgTransferFunction = new wxPanel( m_simPages, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_pgTransferFunction->Hide(); - m_simPages->AddPage( m_pgTransferFunction, wxT("Transfer Function"), false ); + m_simPages->AddPage( m_pgTransferFunction, _("Transfer Function"), false ); m_pgTransient = new wxPanel( m_simPages, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* bSizer81; bSizer81 = new wxBoxSizer( wxVERTICAL ); @@ -317,7 +317,7 @@ DIALOG_SIM_SETTINGS_BASE::DIALOG_SIM_SETTINGS_BASE( wxWindow* parent, wxWindowID fgSizer6->SetFlexibleDirection( wxBOTH ); fgSizer6->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - m_staticText151 = new wxStaticText( m_pgTransient, wxID_ANY, wxT("Time step [s]"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText151 = new wxStaticText( m_pgTransient, wxID_ANY, _("Time step [s]"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText151->Wrap( -1 ); fgSizer6->Add( m_staticText151, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); @@ -327,7 +327,7 @@ DIALOG_SIM_SETTINGS_BASE::DIALOG_SIM_SETTINGS_BASE( wxWindow* parent, wxWindowID fgSizer6->Add( 0, 0, 1, wxEXPAND, 5 ); - m_staticText161 = new wxStaticText( m_pgTransient, wxID_ANY, wxT("Final time [s]"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText161 = new wxStaticText( m_pgTransient, wxID_ANY, _("Final time [s]"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText161->Wrap( -1 ); fgSizer6->Add( m_staticText161, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); @@ -337,14 +337,14 @@ DIALOG_SIM_SETTINGS_BASE::DIALOG_SIM_SETTINGS_BASE( wxWindow* parent, wxWindowID fgSizer6->Add( 0, 0, 1, wxEXPAND, 5 ); - m_staticText17 = new wxStaticText( m_pgTransient, wxID_ANY, wxT("Initial time [s]"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText17 = new wxStaticText( m_pgTransient, wxID_ANY, _("Initial time [s]"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText17->Wrap( -1 ); fgSizer6->Add( m_staticText17, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_transInitial = new wxTextCtrl( m_pgTransient, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer6->Add( m_transInitial, 0, wxALL, 5 ); - m_staticText24 = new wxStaticText( m_pgTransient, wxID_ANY, wxT("(optional; default 0)"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText24 = new wxStaticText( m_pgTransient, wxID_ANY, _("(optional; default 0)"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText24->Wrap( -1 ); fgSizer6->Add( m_staticText24, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); @@ -358,12 +358,12 @@ DIALOG_SIM_SETTINGS_BASE::DIALOG_SIM_SETTINGS_BASE( wxWindow* parent, wxWindowID m_pgTransient->SetSizer( bSizer81 ); m_pgTransient->Layout(); bSizer81->Fit( m_pgTransient ); - m_simPages->AddPage( m_pgTransient, wxT("Transient"), false ); + m_simPages->AddPage( m_pgTransient, _("Transient"), false ); m_pgCustom = new wxPanel( m_simPages, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* bSizer2; bSizer2 = new wxBoxSizer( wxVERTICAL ); - m_staticText18 = new wxStaticText( m_pgCustom, wxID_ANY, wxT("Spice directives:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText18 = new wxStaticText( m_pgCustom, wxID_ANY, _("Spice directives:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText18->Wrap( -1 ); bSizer2->Add( m_staticText18, 0, wxALL, 5 ); @@ -372,21 +372,21 @@ DIALOG_SIM_SETTINGS_BASE::DIALOG_SIM_SETTINGS_BASE( wxWindow* parent, wxWindowID bSizer2->Add( m_customTxt, 1, wxALL|wxEXPAND, 5 ); - m_loadDirectives = new wxButton( m_pgCustom, wxID_ANY, wxT("Load directives from schematic"), wxDefaultPosition, wxDefaultSize, 0 ); + m_loadDirectives = new wxButton( m_pgCustom, wxID_ANY, _("Load directives from schematic"), wxDefaultPosition, wxDefaultSize, 0 ); bSizer2->Add( m_loadDirectives, 0, wxALL|wxEXPAND, 5 ); m_pgCustom->SetSizer( bSizer2 ); m_pgCustom->Layout(); bSizer2->Fit( m_pgCustom ); - m_simPages->AddPage( m_pgCustom, wxT("Custom"), false ); + m_simPages->AddPage( m_pgCustom, _("Custom"), false ); bSizer1->Add( m_simPages, 1, wxEXPAND | wxALL, 5 ); - m_fixPassiveVals = new wxCheckBox( this, wxID_ANY, wxT("Adjust passive component values (e.g. M -> Meg; 100 nF -> 100n)"), wxDefaultPosition, wxDefaultSize, 0 ); + m_fixPassiveVals = new wxCheckBox( this, wxID_ANY, _("Adjust passive component values (e.g. M -> Meg; 100 nF -> 100n)"), wxDefaultPosition, wxDefaultSize, 0 ); bSizer1->Add( m_fixPassiveVals, 0, wxALL, 5 ); - m_fixIncludePaths = new wxCheckBox( this, wxID_ANY, wxT("Add full path for .include library directives"), wxDefaultPosition, wxDefaultSize, 0 ); + m_fixIncludePaths = new wxCheckBox( this, wxID_ANY, _("Add full path for .include library directives"), wxDefaultPosition, wxDefaultSize, 0 ); m_fixIncludePaths->SetValue(true); bSizer1->Add( m_fixIncludePaths, 0, wxALL, 5 ); @@ -397,7 +397,7 @@ DIALOG_SIM_SETTINGS_BASE::DIALOG_SIM_SETTINGS_BASE( wxWindow* parent, wxWindowID m_sdbSizer->AddButton( m_sdbSizerCancel ); m_sdbSizer->Realize(); - bSizer1->Add( m_sdbSizer, 0, wxALL|wxEXPAND, 5 ); + bSizer1->Add( m_sdbSizer, 0, wxALL|wxEXPAND|wxALIGN_RIGHT, 5 ); this->SetSizer( bSizer1 ); diff --git a/eeschema/dialogs/dialog_sim_settings_base.fbp b/eeschema/dialogs/dialog_sim_settings_base.fbp index 1312b87579..b55769e9f8 100644 --- a/eeschema/dialogs/dialog_sim_settings_base.fbp +++ b/eeschema/dialogs/dialog_sim_settings_base.fbp @@ -14,7 +14,7 @@ dialog_sim_settings_base 1000 none - 0 + 1 DIALOG_SIM_SETTINGS_BASE . @@ -44,9 +44,9 @@ DIALOG_SIM_SETTINGS_BASE - 450,700 - wxDEFAULT_DIALOG_STYLE - + 692,535 + wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER + ; Simulation settings @@ -178,7 +178,7 @@ AC - 1 + 0 1 1 @@ -368,11 +368,11 @@ 0 - + 5 wxALIGN_CENTER_HORIZONTAL 1 - + 2 wxBOTH @@ -502,7 +502,7 @@ 0 - + 0 0 @@ -676,7 +676,7 @@ 0 - + 0 0 @@ -850,7 +850,7 @@ 0 - + 0 0 @@ -1413,7 +1413,7 @@ 0 - + 0 0 @@ -1587,7 +1587,7 @@ 0 - + 0 0 @@ -1761,7 +1761,7 @@ 0 - + 0 0 @@ -2230,7 +2230,7 @@ 0 - + 0 0 @@ -2404,7 +2404,7 @@ 0 - + 0 0 @@ -2578,7 +2578,7 @@ 0 - + 0 0 @@ -3701,7 +3701,7 @@ 0 - + 0 0 @@ -3875,7 +3875,7 @@ 0 - + 0 0 @@ -4049,7 +4049,7 @@ 0 - + 0 0 @@ -4391,8 +4391,8 @@ - Sensitvity - 0 + Sensitivity + 1 1 1 @@ -4776,7 +4776,7 @@ 0 - + 0 0 @@ -4960,7 +4960,7 @@ 0 - + 0 0 @@ -5144,7 +5144,7 @@ 0 - + 0 0 @@ -5499,7 +5499,7 @@ 0 - + 0 0 @@ -5826,7 +5826,7 @@ 5 - wxALL|wxEXPAND + wxALL|wxEXPAND|wxALIGN_RIGHT 0 0 diff --git a/eeschema/dialogs/dialog_sim_settings_base.h b/eeschema/dialogs/dialog_sim_settings_base.h index c010e6aab5..0b51cd9941 100644 --- a/eeschema/dialogs/dialog_sim_settings_base.h +++ b/eeschema/dialogs/dialog_sim_settings_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 24 2016) +// C++ code generated with wxFormBuilder (version May 6 2016) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -10,6 +10,7 @@ #include #include +#include #include #include #include @@ -115,7 +116,7 @@ class DIALOG_SIM_SETTINGS_BASE : public wxDialog public: - DIALOG_SIM_SETTINGS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Simulation settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 450,700 ), long style = wxDEFAULT_DIALOG_STYLE ); + DIALOG_SIM_SETTINGS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Simulation settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 692,535 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_SIM_SETTINGS_BASE(); }; diff --git a/eeschema/dialogs/dialog_spice_model_base.cpp b/eeschema/dialogs/dialog_spice_model_base.cpp index c888c6f210..bebcb7fa41 100644 --- a/eeschema/dialogs/dialog_spice_model_base.cpp +++ b/eeschema/dialogs/dialog_spice_model_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 24 2016) +// C++ code generated with wxFormBuilder (version May 6 2016) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -20,7 +20,7 @@ DIALOG_SPICE_MODEL_BASE::DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID i m_passive = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxFlexGridSizer* fgSizer1; fgSizer1 = new wxFlexGridSizer( 0, 2, 0, 0 ); - fgSizer1->AddGrowableCol( 0 ); + fgSizer1->AddGrowableCol( 1 ); fgSizer1->SetFlexibleDirection( wxBOTH ); fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); @@ -51,7 +51,7 @@ DIALOG_SPICE_MODEL_BASE::DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID i m_semiconductor = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxFlexGridSizer* fgSizer3; fgSizer3 = new wxFlexGridSizer( 0, 3, 0, 0 ); - fgSizer3->AddGrowableCol( 0 ); + fgSizer3->AddGrowableCol( 1 ); fgSizer3->SetFlexibleDirection( wxBOTH ); fgSizer3->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); @@ -96,7 +96,7 @@ DIALOG_SPICE_MODEL_BASE::DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID i m_ic = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxFlexGridSizer* fgSizer4; fgSizer4 = new wxFlexGridSizer( 0, 3, 0, 0 ); - fgSizer4->AddGrowableCol( 0 ); + fgSizer4->AddGrowableCol( 1 ); fgSizer4->SetFlexibleDirection( wxBOTH ); fgSizer4->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); @@ -136,7 +136,8 @@ DIALOG_SPICE_MODEL_BASE::DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID i wxFlexGridSizer* fgSizer6; fgSizer6 = new wxFlexGridSizer( 0, 4, 0, 0 ); - fgSizer6->AddGrowableCol( 0 ); + fgSizer6->AddGrowableCol( 1 ); + fgSizer6->AddGrowableCol( 3 ); fgSizer6->SetFlexibleDirection( wxBOTH ); fgSizer6->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); @@ -147,7 +148,7 @@ DIALOG_SPICE_MODEL_BASE::DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID i m_genDc = new wxTextCtrl( sbSizer1->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_genDc->SetMinSize( wxSize( 60,-1 ) ); - fgSizer6->Add( m_genDc, 0, wxALL, 5 ); + fgSizer6->Add( m_genDc, 0, wxALL|wxEXPAND, 5 ); fgSizer6->Add( 0, 0, 1, wxEXPAND, 5 ); @@ -186,7 +187,7 @@ DIALOG_SPICE_MODEL_BASE::DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID i m_pwrPulse = new wxPanel( m_powerNotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxFlexGridSizer* fgSizer7; fgSizer7 = new wxFlexGridSizer( 0, 2, 0, 0 ); - fgSizer7->AddGrowableCol( 0 ); + fgSizer7->AddGrowableCol( 1 ); fgSizer7->SetFlexibleDirection( wxBOTH ); fgSizer7->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); @@ -245,11 +246,11 @@ DIALOG_SPICE_MODEL_BASE::DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID i m_pwrPulse->SetSizer( fgSizer7 ); m_pwrPulse->Layout(); fgSizer7->Fit( m_pwrPulse ); - m_powerNotebook->AddPage( m_pwrPulse, _("Pulse"), true ); + m_powerNotebook->AddPage( m_pwrPulse, _("Pulse"), false ); m_pwrSin = new wxPanel( m_powerNotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxFlexGridSizer* fgSizer8; fgSizer8 = new wxFlexGridSizer( 0, 2, 0, 0 ); - fgSizer8->AddGrowableCol( 0 ); + fgSizer8->AddGrowableCol( 1 ); fgSizer8->SetFlexibleDirection( wxBOTH ); fgSizer8->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); @@ -260,7 +261,7 @@ DIALOG_SPICE_MODEL_BASE::DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID i m_sinOffset = new wxTextCtrl( m_pwrSin, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_sinOffset->SetMinSize( wxSize( 100,-1 ) ); - fgSizer8->Add( m_sinOffset, 0, wxALL, 5 ); + fgSizer8->Add( m_sinOffset, 0, wxALL|wxEXPAND, 5 ); m_staticText22 = new wxStaticText( m_pwrSin, wxID_ANY, _("Amplitude [V/A]"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText22->Wrap( -1 ); @@ -298,7 +299,7 @@ DIALOG_SPICE_MODEL_BASE::DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID i m_pwrExp = new wxPanel( m_powerNotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxFlexGridSizer* fgSizer9; fgSizer9 = new wxFlexGridSizer( 0, 2, 0, 0 ); - fgSizer9->AddGrowableCol( 0 ); + fgSizer9->AddGrowableCol( 1 ); fgSizer9->SetFlexibleDirection( wxBOTH ); fgSizer9->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); @@ -350,7 +351,7 @@ DIALOG_SPICE_MODEL_BASE::DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID i m_pwrExp->SetSizer( fgSizer9 ); m_pwrExp->Layout(); fgSizer9->Fit( m_pwrExp ); - m_powerNotebook->AddPage( m_pwrExp, _("Exponential"), false ); + m_powerNotebook->AddPage( m_pwrExp, _("Exponential"), true ); m_pwrPwl = new wxPanel( m_powerNotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_pwrPwl->SetToolTip( _("Piece-wise linear") ); @@ -363,7 +364,7 @@ DIALOG_SPICE_MODEL_BASE::DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID i wxFlexGridSizer* fgSizer10; fgSizer10 = new wxFlexGridSizer( 0, 2, 0, 0 ); - fgSizer10->AddGrowableCol( 0 ); + fgSizer10->AddGrowableCol( 1 ); fgSizer10->SetFlexibleDirection( wxBOTH ); fgSizer10->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); @@ -454,7 +455,7 @@ DIALOG_SPICE_MODEL_BASE::DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID i m_nodeSeqVal = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_nodeSeqVal->SetMinSize( wxSize( 200,-1 ) ); - bSizer2->Add( m_nodeSeqVal, 0, wxALL, 5 ); + bSizer2->Add( m_nodeSeqVal, 1, wxALL, 5 ); bSizer1->Add( bSizer2, 0, wxEXPAND, 5 ); diff --git a/eeschema/dialogs/dialog_spice_model_base.fbp b/eeschema/dialogs/dialog_spice_model_base.fbp index 7171827c58..8d9fdb34b5 100644 --- a/eeschema/dialogs/dialog_spice_model_base.fbp +++ b/eeschema/dialogs/dialog_spice_model_base.fbp @@ -44,8 +44,8 @@ DIALOG_SPICE_MODEL_BASE - 500,768 - wxDEFAULT_DIALOG_STYLE + 552,621 + wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER DIALOG_SHIM; dialog_shim.h @@ -175,11 +175,11 @@ - + Passive 0 - + 1 1 1 @@ -253,10 +253,10 @@ - + 2 wxBOTH - 0 + 1 0 @@ -557,7 +557,7 @@ 0 - + 0 0 200,-1 @@ -616,11 +616,11 @@ - + Semiconductor 0 - + 1 1 1 @@ -694,10 +694,10 @@ - + 3 wxBOTH - 0 + 1 0 @@ -1192,7 +1192,7 @@ 0 - + 0 0 @@ -1420,7 +1420,7 @@ 3 wxBOTH - 0 + 1 0 @@ -1731,7 +1731,7 @@ 0 - + 0 0 @@ -1981,7 +1981,7 @@ 4 wxBOTH - 0 + 1,3 0 @@ -2075,7 +2075,7 @@ 5 - wxALL + wxALL|wxEXPAND 0 1 @@ -2108,7 +2108,7 @@ 0 - + 0 0 60,-1 @@ -2302,7 +2302,7 @@ 0 - + 0 0 60,-1 @@ -2476,7 +2476,7 @@ 0 - + 0 0 60,-1 @@ -2634,7 +2634,7 @@ Pulse - 1 + 0 1 1 @@ -2712,7 +2712,7 @@ 2 wxBOTH - 0 + 1 0 @@ -2839,7 +2839,7 @@ 0 - + 0 0 100,-1 @@ -3013,7 +3013,7 @@ 0 - + 0 0 @@ -3187,7 +3187,7 @@ 0 - + 0 0 @@ -3361,7 +3361,7 @@ 0 - + 0 0 @@ -3535,7 +3535,7 @@ 0 - + 0 0 @@ -3709,7 +3709,7 @@ 0 - + 0 0 @@ -3883,7 +3883,7 @@ 0 - + 0 0 @@ -3942,11 +3942,11 @@ - + Sinusoidal 0 - + 1 1 1 @@ -4023,7 +4023,7 @@ 2 wxBOTH - 0 + 1 0 @@ -4117,7 +4117,7 @@ 5 - wxALL + wxALL|wxEXPAND 0 1 @@ -4150,7 +4150,7 @@ 0 - + 0 0 100,-1 @@ -4324,7 +4324,7 @@ 0 - + 0 0 @@ -4498,7 +4498,7 @@ 0 - + 0 0 @@ -4672,7 +4672,7 @@ 0 - + 0 0 @@ -4846,7 +4846,7 @@ 0 - + 0 0 @@ -4908,7 +4908,7 @@ Exponential - 0 + 1 1 1 @@ -4986,7 +4986,7 @@ 2 wxBOTH - 0 + 1 0 @@ -5113,7 +5113,7 @@ 0 - + 0 0 100,-1 @@ -5287,7 +5287,7 @@ 0 - + 0 0 @@ -5461,7 +5461,7 @@ 0 - + 0 0 @@ -5635,7 +5635,7 @@ 0 - + 0 0 @@ -5809,7 +5809,7 @@ 0 - + 0 0 @@ -5983,7 +5983,7 @@ 0 - + 0 0 @@ -6139,7 +6139,7 @@ 2 wxBOTH - 0 + 1 0 @@ -6266,7 +6266,7 @@ 0 - + 0 0 100,-1 @@ -6440,7 +6440,7 @@ 0 - + 0 0 @@ -7469,7 +7469,7 @@ 5 wxALL - 0 + 1 1 1 @@ -7501,7 +7501,7 @@ 0 - + 0 0 200,-1 diff --git a/eeschema/dialogs/dialog_spice_model_base.h b/eeschema/dialogs/dialog_spice_model_base.h index e299d60baa..6aa956935b 100644 --- a/eeschema/dialogs/dialog_spice_model_base.h +++ b/eeschema/dialogs/dialog_spice_model_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 24 2016) +// C++ code generated with wxFormBuilder (version May 6 2016) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -143,7 +143,7 @@ class DIALOG_SPICE_MODEL_BASE : public DIALOG_SHIM public: - DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,768 ), long style = wxDEFAULT_DIALOG_STYLE ); + DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 552,621 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_SPICE_MODEL_BASE(); }; diff --git a/eeschema/eeschema.cpp b/eeschema/eeschema.cpp index e9bbfbf34f..301280e020 100644 --- a/eeschema/eeschema.cpp +++ b/eeschema/eeschema.cpp @@ -71,8 +71,6 @@ static struct IFACE : public KIFACE_I wxWindow* CreateWindow( wxWindow* aParent, int aClassId, KIWAY* aKiway, int aCtlBits = 0 ) { - printf("Create class %d\n", aClassId); - switch( aClassId ) { case FRAME_SCH: