From e143dfa4a0fde8a48cf239df3d988e762c84693f Mon Sep 17 00:00:00 2001 From: wittend99 Date: Fri, 14 Dec 2012 21:36:21 +0000 Subject: [PATCH] Comment out the event handlers which were connected to the wrong check boxes in the PTT dialog. This _should_ have no effect on behavior because the event handlers in question were unused in the current code. git-svn-id: https://svn.code.sf.net/p/freetel/code@1134 01035d8c-6547-0410-b346-abe4f91aad63 --- fdmdv2/src/dlg_comports.cpp | 23 ++++++++++++----------- fdmdv2/src/dlg_comports.h | 4 ++-- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/fdmdv2/src/dlg_comports.cpp b/fdmdv2/src/dlg_comports.cpp index e0ffddc0..e00fc8f0 100644 --- a/fdmdv2/src/dlg_comports.cpp +++ b/fdmdv2/src/dlg_comports.cpp @@ -146,9 +146,9 @@ ComPortsDlg::ComPortsDlg(wxWindow* parent, wxWindowID id, const wxString& title, // m_listCtrlPorts->Connect(wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler(ComPortsDlg::PTTPortSlelcted), NULL, this); m_ckUseSerialPTT->Connect(wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler(ComPortsDlg::PTTUseSerialClicked), NULL, this); m_rbUseDTR->Connect(wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler(ComPortsDlg::UseDTRCliched), NULL, this); - m_ckRTSPos->Connect(wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler(ComPortsDlg::DTRVPlusClicked), NULL, this); m_rbUseRTS->Connect(wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler(ComPortsDlg::UseRTSClicked), NULL, this); - m_ckDTRPos->Connect(wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler(ComPortsDlg::RTSVPlusClicked), NULL, this); +// m_ckRTSPos->Connect(wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler(ComPortsDlg::DTRVPlusClicked), NULL, this); +// m_ckDTRPos->Connect(wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler(ComPortsDlg::RTSVPlusClicked), NULL, this); m_buttonOK->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(ComPortsDlg::OnOK), NULL, this); m_buttonCancel->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(ComPortsDlg::OnCancel), NULL, this); m_buttonApply->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(ComPortsDlg::OnApply), NULL, this); @@ -165,9 +165,9 @@ ComPortsDlg::~ComPortsDlg() // m_listCtrlPorts->Disconnect(wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler(ComPortsDlg::PTTPortSlelcted), NULL, this); m_ckUseSerialPTT->Disconnect(wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler(ComPortsDlg::PTTUseSerialClicked), NULL, this); m_rbUseDTR->Disconnect(wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler(ComPortsDlg::UseDTRCliched), NULL, this); - m_ckRTSPos->Disconnect(wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler(ComPortsDlg::DTRVPlusClicked), NULL, this); m_rbUseRTS->Disconnect(wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler(ComPortsDlg::UseRTSClicked), NULL, this); - m_ckDTRPos->Disconnect(wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler(ComPortsDlg::RTSVPlusClicked), NULL, this); +// m_ckRTSPos->Disconnect(wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler(ComPortsDlg::DTRVPlusClicked), NULL, this); +// m_ckDTRPos->Disconnect(wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler(ComPortsDlg::RTSVPlusClicked), NULL, this); m_buttonOK->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(ComPortsDlg::OnOK), NULL, this); m_buttonCancel->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(ComPortsDlg::OnCancel), NULL, this); m_buttonApply->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(ComPortsDlg::OnApply), NULL, this); @@ -301,13 +301,6 @@ void ComPortsDlg::ExchangeData(int inout) delete wxConfigBase::Set((wxConfigBase *) NULL); } -//------------------------------------------------------------------------- -// DTRVPlusClicked() -//------------------------------------------------------------------------- -void ComPortsDlg::DTRVPlusClicked(wxCommandEvent& event) -{ -} - //------------------------------------------------------------------------- // PTTAudioClick() //------------------------------------------------------------------------- @@ -321,6 +314,13 @@ void ComPortsDlg::PTTAudioClick(wxCommandEvent& event) void ComPortsDlg::PTTUseSerialClicked(wxCommandEvent& event) { } +/* +//------------------------------------------------------------------------- +// DTRVPlusClicked() +//------------------------------------------------------------------------- +void ComPortsDlg::DTRVPlusClicked(wxCommandEvent& event) +{ +} //------------------------------------------------------------------------- // RTSVPlusClicked() @@ -328,6 +328,7 @@ void ComPortsDlg::PTTUseSerialClicked(wxCommandEvent& event) void ComPortsDlg::RTSVPlusClicked(wxCommandEvent& event) { } +*/ //------------------------------------------------------------------------- // OnCancel() diff --git a/fdmdv2/src/dlg_comports.h b/fdmdv2/src/dlg_comports.h index 952d4b50..70eb4c3c 100644 --- a/fdmdv2/src/dlg_comports.h +++ b/fdmdv2/src/dlg_comports.h @@ -67,9 +67,9 @@ protected: // void PTTPortSlelcted(wxCommandEvent& event); void PTTUseSerialClicked(wxCommandEvent& event); void UseDTRCliched(wxCommandEvent& event); - void DTRVPlusClicked(wxCommandEvent& event); + //void DTRVPlusClicked(wxCommandEvent& event); void UseRTSClicked(wxCommandEvent& event); - void RTSVPlusClicked(wxCommandEvent& event); + //void RTSVPlusClicked(wxCommandEvent& event); void OnOK(wxCommandEvent& event); void OnCancel(wxCommandEvent& event); void OnApply(wxCommandEvent& event); -- 2.25.1