diff options
| author | Thales1330 <thaleslima.ufu@gmail.com> | 2016-12-09 16:35:34 -0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-09 16:35:34 -0200 |
| commit | cff8d90d61be4d34f5e84e8dd0933f678e6214be (patch) | |
| tree | 077fdde43d69c248f518fc22978796d8f16e03f3 /Project/ElementForm.cpp | |
| parent | e282ec268db0d17a1d53f813c5fff9473d25e797 (diff) | |
| parent | ac671068f32849807728b4c2844a4cda995a73c8 (diff) | |
| download | PSP.git-cff8d90d61be4d34f5e84e8dd0933f678e6214be.tar.gz PSP.git-cff8d90d61be4d34f5e84e8dd0933f678e6214be.tar.xz PSP.git-cff8d90d61be4d34f5e84e8dd0933f678e6214be.zip | |
Merge pull request #2 from Thales1330/wip/currentState
Wip currentstate
Diffstat (limited to 'Project/ElementForm.cpp')
| -rw-r--r-- | Project/ElementForm.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Project/ElementForm.cpp b/Project/ElementForm.cpp index 89ef491..a8960d9 100644 --- a/Project/ElementForm.cpp +++ b/Project/ElementForm.cpp @@ -2623,7 +2623,6 @@ TextFormBase::TextFormBase(wxWindow* parent, wxWindowID id, const wxString& titl m_choiceElementArr.Add(wxT("Synchronous compensator")); m_choiceElementArr.Add(wxT("Induction motor")); m_choiceElement = new wxChoice(m_panelGeneral, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(m_panelGeneral, wxSize(-1,-1)), m_choiceElementArr, 0); - m_choiceElement->SetSelection(0); boxSizerLvl4_1->Add(m_choiceElement, 0, wxLEFT|wxRIGHT|wxBOTTOM|wxEXPAND, WXC_FROM_DIP(5)); @@ -2766,6 +2765,7 @@ TextFormBase::TextFormBase(wxWindow* parent, wxWindowID id, const wxString& titl m_choiceTextType->Connect(wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler(TextFormBase::OnTypeChoiceSelected), NULL, this); m_choiceTextFromBus->Connect(wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler(TextFormBase::OnFromBusChoiceSelected), NULL, this); m_choiceTextToBus->Connect(wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler(TextFormBase::OnToBusChoiceSelected), NULL, this); + m_choiceTextUnit->Connect(wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler(TextFormBase::OnUnitChoiceSelected), NULL, this); m_textCtrlDecimal->Connect(wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler(TextFormBase::OnTextEnter), NULL, this); m_buttonOK->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(TextFormBase::OnOKButtonClick), NULL, this); m_ButtonCancel->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(TextFormBase::OnCancelButtonClick), NULL, this); @@ -2779,6 +2779,7 @@ TextFormBase::~TextFormBase() m_choiceTextType->Disconnect(wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler(TextFormBase::OnTypeChoiceSelected), NULL, this); m_choiceTextFromBus->Disconnect(wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler(TextFormBase::OnFromBusChoiceSelected), NULL, this); m_choiceTextToBus->Disconnect(wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler(TextFormBase::OnToBusChoiceSelected), NULL, this); + m_choiceTextUnit->Disconnect(wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler(TextFormBase::OnUnitChoiceSelected), NULL, this); m_textCtrlDecimal->Disconnect(wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler(TextFormBase::OnTextEnter), NULL, this); m_buttonOK->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(TextFormBase::OnOKButtonClick), NULL, this); m_ButtonCancel->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(TextFormBase::OnCancelButtonClick), NULL, this); |