From: wittend99 Date: Fri, 23 Nov 2012 16:24:35 +0000 (+0000) Subject: Removed unnecessary or distracting Files, C++ Classes, members, and unimplemented... X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=3e5c3c85da56509465fe26049aa4e5708de94a01;p=freetel-svn-tracking.git Removed unnecessary or distracting Files, C++ Classes, members, and unimplemented code. git-svn-id: https://svn.code.sf.net/p/freetel/code@1051 01035d8c-6547-0410-b346-abe4f91aad63 --- diff --git a/fdmdv2/build/fdmdv2.mk b/fdmdv2/build/fdmdv2.mk index bb08072c..3a51438d 100644 --- a/fdmdv2/build/fdmdv2.mk +++ b/fdmdv2/build/fdmdv2.mk @@ -52,8 +52,8 @@ LibPath := $(LibraryPathSwitch). $(LibraryPathSwitch)d:/Projects/ AR := ar rcus CXX := g++ CC := gcc -CXXFLAGS := -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no) -DSVN_REVISION=\"1046\" $(Preprocessors) -CFLAGS := -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no) -DSVN_REVISION=\"1046\" $(Preprocessors) +CXXFLAGS := -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no) -DSVN_REVISION=\"1048\" $(Preprocessors) +CFLAGS := -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no) -DSVN_REVISION=\"1048\" $(Preprocessors) ## @@ -64,8 +64,8 @@ WXWIN:=D:\bin\wxWidgets-2.9.4 PATH:=$(WXWIN)\lib\gcc_dll;$(PATH) WXCFG:=gcc_dll\mswu UNIT_TEST_PP_SRC_DIR:=D:\bin\UnitTest++-1.3 -Objects=$(IntermediateDirectory)/src_dlg_comports$(ObjectSuffix) $(IntermediateDirectory)/src_dlg_options$(ObjectSuffix) $(IntermediateDirectory)/src_fdmdv2_main$(ObjectSuffix) $(IntermediateDirectory)/src_fdmdv2_plot$(ObjectSuffix) $(IntermediateDirectory)/src_topFrame$(ObjectSuffix) $(IntermediateDirectory)/src_fdmdv2_plot_scatter$(ObjectSuffix) $(IntermediateDirectory)/src_fdmdv2_plot_spectrum$(ObjectSuffix) $(IntermediateDirectory)/src_fdmdv2_pa_wrapper$(ObjectSuffix) $(IntermediateDirectory)/src_fdmdv2_plot_scalar$(ObjectSuffix) $(IntermediateDirectory)/src_fdmdv2_hdw_ports$(ObjectSuffix) \ - $(IntermediateDirectory)/src_fdmdv2_plot_waterfall_linux$(ObjectSuffix) $(IntermediateDirectory)/src_dlg_audiooptions$(ObjectSuffix) +Objects=$(IntermediateDirectory)/src_dlg_comports$(ObjectSuffix) $(IntermediateDirectory)/src_fdmdv2_main$(ObjectSuffix) $(IntermediateDirectory)/src_fdmdv2_plot$(ObjectSuffix) $(IntermediateDirectory)/src_topFrame$(ObjectSuffix) $(IntermediateDirectory)/src_fdmdv2_plot_scatter$(ObjectSuffix) $(IntermediateDirectory)/src_fdmdv2_plot_spectrum$(ObjectSuffix) $(IntermediateDirectory)/src_fdmdv2_pa_wrapper$(ObjectSuffix) $(IntermediateDirectory)/src_fdmdv2_plot_scalar$(ObjectSuffix) $(IntermediateDirectory)/src_fdmdv2_hdw_ports$(ObjectSuffix) $(IntermediateDirectory)/src_fdmdv2_plot_waterfall_linux$(ObjectSuffix) \ + $(IntermediateDirectory)/src_dlg_audiooptions$(ObjectSuffix) ## ## Main Build Targets @@ -99,14 +99,6 @@ $(IntermediateDirectory)/src_dlg_comports$(DependSuffix): ../src/dlg_comports.cp $(IntermediateDirectory)/src_dlg_comports$(PreprocessSuffix): ../src/dlg_comports.cpp @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_dlg_comports$(PreprocessSuffix) "D:/Projects/Radio/fdmdv2/src/dlg_comports.cpp" -$(IntermediateDirectory)/src_dlg_options$(ObjectSuffix): ../src/dlg_options.cpp $(IntermediateDirectory)/src_dlg_options$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "D:/Projects/Radio/fdmdv2/src/dlg_options.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_dlg_options$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/src_dlg_options$(DependSuffix): ../src/dlg_options.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/src_dlg_options$(ObjectSuffix) -MF$(IntermediateDirectory)/src_dlg_options$(DependSuffix) -MM "D:/Projects/Radio/fdmdv2/src/dlg_options.cpp" - -$(IntermediateDirectory)/src_dlg_options$(PreprocessSuffix): ../src/dlg_options.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_dlg_options$(PreprocessSuffix) "D:/Projects/Radio/fdmdv2/src/dlg_options.cpp" - $(IntermediateDirectory)/src_fdmdv2_main$(ObjectSuffix): ../src/fdmdv2_main.cpp $(IntermediateDirectory)/src_fdmdv2_main$(DependSuffix) $(CXX) $(IncludePCH) $(SourceSwitch) "D:/Projects/Radio/fdmdv2/src/fdmdv2_main.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_fdmdv2_main$(ObjectSuffix) $(IncludePath) $(IntermediateDirectory)/src_fdmdv2_main$(DependSuffix): ../src/fdmdv2_main.cpp @@ -196,9 +188,6 @@ clean: $(RM) $(IntermediateDirectory)/src_dlg_comports$(ObjectSuffix) $(RM) $(IntermediateDirectory)/src_dlg_comports$(DependSuffix) $(RM) $(IntermediateDirectory)/src_dlg_comports$(PreprocessSuffix) - $(RM) $(IntermediateDirectory)/src_dlg_options$(ObjectSuffix) - $(RM) $(IntermediateDirectory)/src_dlg_options$(DependSuffix) - $(RM) $(IntermediateDirectory)/src_dlg_options$(PreprocessSuffix) $(RM) $(IntermediateDirectory)/src_fdmdv2_main$(ObjectSuffix) $(RM) $(IntermediateDirectory)/src_fdmdv2_main$(DependSuffix) $(RM) $(IntermediateDirectory)/src_fdmdv2_main$(PreprocessSuffix) diff --git a/fdmdv2/build/fdmdv2.project b/fdmdv2/build/fdmdv2.project index 07c1296c..b3b121b4 100644 --- a/fdmdv2/build/fdmdv2.project +++ b/fdmdv2/build/fdmdv2.project @@ -9,7 +9,6 @@ - @@ -23,7 +22,6 @@ - diff --git a/fdmdv2/build/fdmdv2.txt b/fdmdv2/build/fdmdv2.txt index e88756f0..ee31e47e 100644 --- a/fdmdv2/build/fdmdv2.txt +++ b/fdmdv2/build/fdmdv2.txt @@ -1 +1 @@ -./Release/src_dlg_comports.o ./Release/src_dlg_options.o ./Release/src_fdmdv2_main.o ./Release/src_fdmdv2_plot.o ./Release/src_topFrame.o ./Release/src_fdmdv2_plot_scatter.o ./Release/src_fdmdv2_plot_spectrum.o ./Release/src_fdmdv2_pa_wrapper.o ./Release/src_fdmdv2_plot_scalar.o ./Release/src_fdmdv2_hdw_ports.o ./Release/src_fdmdv2_plot_waterfall_linux.o ./Release/src_dlg_audiooptions.o +./Release/src_dlg_comports.o ./Release/src_fdmdv2_main.o ./Release/src_fdmdv2_plot.o ./Release/src_topFrame.o ./Release/src_fdmdv2_plot_scatter.o ./Release/src_fdmdv2_plot_spectrum.o ./Release/src_fdmdv2_pa_wrapper.o ./Release/src_fdmdv2_plot_scalar.o ./Release/src_fdmdv2_hdw_ports.o ./Release/src_fdmdv2_plot_waterfall_linux.o ./Release/src_dlg_audiooptions.o diff --git a/fdmdv2/src/dlg_options.cpp b/fdmdv2/src/dlg_options.cpp deleted file mode 100644 index 3f8e0e0f..00000000 --- a/fdmdv2/src/dlg_options.cpp +++ /dev/null @@ -1,102 +0,0 @@ -//========================================================================== -// Name: dlg_options.cpp -// -// Purpose: Creates simple wxWidgets dialog GUI general program -// devices/options. -// -// Date: May 06 2012 -// Authors: David Rowe, David Witten -// License: -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License version 2.1, -// as published by the Free Software Foundation. This program is -// distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public -// License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, see . -// -//========================================================================== -#include "dlg_options.h" - -//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-= -// Class OptionsDlg -//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-= -OptionsDlg::OptionsDlg( wxWindow* parent ) : DlgOptions( parent ) -{ -} - -//------------------------------------------------------------------------- -// OnClose() -//------------------------------------------------------------------------- -void OptionsDlg::OnClose( wxCloseEvent& event ) -{ -} - -//------------------------------------------------------------------------- -// OnInitDialog() -//------------------------------------------------------------------------- -void OptionsDlg::OnInitDialog( wxInitDialogEvent& event ) -{ - ExchangeData(EXCHANGE_DATA_IN); -} - -//------------------------------------------------------------------------- -// ExchangeData() -//------------------------------------------------------------------------- -void OptionsDlg::ExchangeData(int inout) -{ -// wxConfigBase *pConfig = wxConfigBase::Get(); - if(inout == EXCHANGE_DATA_IN) - { -// m_textRigCtrlPort->SetValue(wxGetApp().m_strRigCtrlPort); -// m_textRigCtrlBaud->SetValue(wxGetApp().m_strRigCtrlBaud); -// m_textRigCtrlDatabits->SetValue(wxGetApp().m_strRigCtrlDatabits); -// m_textRigCtrlStopbits->SetValue(wxGetApp().m_strRigCtrlStopbits); -// m_textRigCtrlParity->SetValue(wxGetApp().m_strRigCtrlParity); - } - if(inout == EXCHANGE_DATA_OUT) - { -// wxGetApp().m_strRigCtrlPort = m_textRigCtrlPort->GetValue(); -// wxGetApp().m_strRigCtrlBaud = m_textRigCtrlBaud->GetValue(); -// wxGetApp().m_strRigCtrlDatabits = m_textRigCtrlDatabits->GetValue(); -// wxGetApp().m_strRigCtrlStopbits = m_textRigCtrlStopbits->GetValue(); -// wxGetApp().m_strRigCtrlParity = m_textRigCtrlParity->GetValue(); - -// pConfig->Write(wxT("/Rig/Port"), wxGetApp().m_strRigCtrlPort); -// pConfig->Write(wxT("/Rig/Baud"), wxGetApp().m_strRigCtrlBaud); -// pConfig->Write(wxT("/Rig/DataBits"), wxGetApp().m_strRigCtrlDatabits); -// pConfig->Write(wxT("/Rig/StopBits"), wxGetApp().m_strRigCtrlStopbits); -// pConfig->Write(wxT("/Rig/Parity"), wxGetApp().m_strRigCtrlParity); - -// pConfig->Flush(); - } -// delete wxConfigBase::Set((wxConfigBase *) NULL); -} - -//------------------------------------------------------------------------- -// OnCancel() -//------------------------------------------------------------------------- -void OptionsDlg::OnCancel( wxCommandEvent& event ) -{ - this->EndModal(wxID_CANCEL); -} - -//------------------------------------------------------------------------- -// OnOK() -//------------------------------------------------------------------------- -void OptionsDlg::OnOK( wxCommandEvent& event ) -{ - this->EndModal(wxID_OK); -} - -//------------------------------------------------------------------------- -// OnApply() -//------------------------------------------------------------------------- -void OptionsDlg::OnApply( wxCommandEvent& event ) -{ - ExchangeData(EXCHANGE_DATA_OUT); -} diff --git a/fdmdv2/src/dlg_options.h b/fdmdv2/src/dlg_options.h deleted file mode 100644 index 8c37afe9..00000000 --- a/fdmdv2/src/dlg_options.h +++ /dev/null @@ -1,47 +0,0 @@ -//========================================================================== -// Name: dlg_options.h -// -// Purpose: Subclasses dialog GUI for general program options. -// (DlgOptions from topFrame.h) -// -// Date: May 05 2012 -// Authors: David Rowe, David Witten -// -// License: -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License version 2.1, -// as published by the Free Software Foundation. This program is -// distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public -// License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, see . -// -//========================================================================== -#ifndef __OPTIONS_DIALOG__ -#define __OPTIONS_DIALOG__ - -#include "fdmdv2_main.h" - -//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-= -// Class OptionsDlg -//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-= -class OptionsDlg : public DlgOptions -{ - protected: - // Handlers for DlgOptions events. - void OnClose( wxCloseEvent& event ); - void OnInitDialog( wxInitDialogEvent& event ); - public: - /** Constructor */ - OptionsDlg( wxWindow* parent ); - void ExchangeData(int inout); - void OnCancel( wxCommandEvent& event ); - void OnOK( wxCommandEvent& event ); - void OnApply( wxCommandEvent& event ); -}; - -#endif // __OPTIONS_DIALOG__ diff --git a/fdmdv2/src/fdmdv2_main.cpp b/fdmdv2/src/fdmdv2_main.cpp index 3d79611e..a8602723 100644 --- a/fdmdv2/src/fdmdv2_main.cpp +++ b/fdmdv2/src/fdmdv2_main.cpp @@ -957,12 +957,15 @@ void MainFrame::OnRecFileFromRadio(wxCommandEvent& event) } //------------------------------------------------------------------------- -// OnClose() +// OnExit() //------------------------------------------------------------------------- -void MainFrame::OnClose(wxCommandEvent& event) +void MainFrame::OnExit(wxCommandEvent& event) { wxUnusedVar(event); - + if(m_RxRunning) + { + stopRxStream(); + } #ifdef _USE_TIMER m_plotTimer.Stop(); #endif // _USE_TIMER @@ -986,105 +989,8 @@ void MainFrame::OnClose(wxCommandEvent& event) m_togBtnAnalog->Disable(); //m_togBtnALC->Disable(); m_btnTogTX->Disable(); - -} - -//------------------------------------------------------------------------- -// OnExit() -//------------------------------------------------------------------------- -void MainFrame::OnExit(wxCommandEvent& event) -{ - if(m_RxRunning) - { - stopRxStream(); - } - Close(); -} - -//------------------------------------------------------------------------- -// OnCopy() -//------------------------------------------------------------------------- -void MainFrame::OnCopy(wxCommandEvent& event) -{ - event.Skip(); -} - -//------------------------------------------------------------------------- -// OnCut() -//------------------------------------------------------------------------- -void MainFrame::OnCut(wxCommandEvent& event) -{ - event.Skip(); -} - -//------------------------------------------------------------------------- -// OnPaste() -//------------------------------------------------------------------------- -void MainFrame::OnPaste(wxCommandEvent& event) -{ - event.Skip(); -} - -//------------------------------------------------------------------------- -// OnCaptureRxStream() -//------------------------------------------------------------------------- -//void MainFrame::OnCaptureRxStream(wxCommandEvent& event) -//{ -// wxUnusedVar(event); -//} - -//------------------------------------------------------------------------- -// OnCaptureTxStream() -//------------------------------------------------------------------------- -//void MainFrame::OnCaptureTxStream(wxCommandEvent& event) -//{ -// wxUnusedVar(event); -//} - -/* -//------------------------------------------------------------------------- -// OnSaveUpdateUI() -//------------------------------------------------------------------------- -void MainFrame::OnSaveUpdateUI(wxUpdateUIEvent& event) -{ -// wxUnusedVar(event); - event.Enable(false); } -//------------------------------------------------------------------------- -// OnCloseUpdateUI() -//------------------------------------------------------------------------- -void MainFrame::OnCloseUpdateUI(wxUpdateUIEvent& event) -{ -// event.Enable(false); -} - -//------------------------------------------------------------------------- -// OnCutUpdateUI() -//------------------------------------------------------------------------- -void MainFrame::OnCutUpdateUI(wxUpdateUIEvent& event) -{ -// wxUnusedVar(event); - event.Enable(false); -} - -//------------------------------------------------------------------------- -// OnCopyUpdateUI() -//------------------------------------------------------------------------- -void MainFrame::OnCopyUpdateUI(wxUpdateUIEvent& event) -{ - event.Enable(false); -} - -//------------------------------------------------------------------------- -// OnPasteUpdateUI() -//------------------------------------------------------------------------- -void MainFrame::OnPasteUpdateUI(wxUpdateUIEvent& event) -{ - event.Enable(false); -} -*/ - //------------------------------------------------------------------------- // OnToolsAudio() //------------------------------------------------------------------------- @@ -1133,33 +1039,6 @@ void MainFrame::OnToolsComCfgUI(wxUpdateUIEvent& event) event.Enable(!m_RxRunning); } -//------------------------------------------------------------------------- -// OnToolsOptions() -//------------------------------------------------------------------------- -void MainFrame::OnToolsOptions(wxCommandEvent& event) -{ - wxUnusedVar(event); - int rv = 0; - OptionsDlg *dlg = new OptionsDlg(NULL); - rv = dlg->ShowModal(); - if(rv == wxID_OK) - { - dlg->ExchangeData(EXCHANGE_DATA_OUT); - } - delete dlg; -} - -//------------------------------------------------------------------------- -// OnToolsOptionsUI() -//------------------------------------------------------------------------- -void MainFrame::OnToolsOptionsUI(wxUpdateUIEvent& event) -{ -// wxUnusedVar(event); - event.Enable(false); - // wxMessageBox("Got Click!", "OnToolsOptionsUI", wxOK); - //event.Skip(); -} - //------------------------------------------------------------------------- // OnHelpCheckUpdates() //------------------------------------------------------------------------- @@ -1185,7 +1064,6 @@ void MainFrame::OnHelpAbout(wxCommandEvent& event) wxString svnLatestRev("Can't determine latest SVN revision."); // Try to determine current SVN revision from the Internet - wxURL url(wxT("http://freetel.svn.sourceforge.net/svnroot/freetel/fdmdv2/")); if(url.GetError() == wxURL_NOERR) @@ -1206,8 +1084,7 @@ void MainFrame::OnHelpAbout(wxCommandEvent& event) svnLatestRev = wxT("Latest svn revision: ") + htmldata.SubString(startIndex, endIndex-1); //printf("startIndex: %d endIndex: %d\n", startIndex, endIndex); } - - delete in; + delete in; } wxString msg; @@ -1219,27 +1096,6 @@ void MainFrame::OnHelpAbout(wxCommandEvent& event) wxMessageBox(msg, wxT("About"), wxOK | wxICON_INFORMATION, this); } -/* -//------------------------------------------------------------------------- -// LoadUserImage() -//------------------------------------------------------------------------- -wxString MainFrame::LoadUserImage(wxImage& image) -{ - wxString filename; - - filename = wxLoadFileSelector(wxT("image"), wxEmptyString); - if(!filename.empty()) - { - if(!image.LoadFile(filename)) - { - wxLogError(wxT("Couldn't load image from '%s'."), filename.c_str()); - return wxEmptyString; - } - } - return filename; -} -*/ - //------------------------------------------------------------------------- // OnTogBtnOnOff() diff --git a/fdmdv2/src/fdmdv2_main.h b/fdmdv2/src/fdmdv2_main.h index f083d579..766815d5 100644 --- a/fdmdv2/src/fdmdv2_main.h +++ b/fdmdv2/src/fdmdv2_main.h @@ -49,7 +49,6 @@ #include "fifo.h" #include "topFrame.h" -#include "dlg_options.h" #include "dlg_comports.h" #include "fdmdv2_plot.h" #include "fdmdv2_plot_scalar.h" @@ -230,7 +229,6 @@ class MainFrame : public TopFrame bool m_RxRunning; - // PortAudio variables PortAudioWrap *m_rxPa; PortAudioWrap *m_txPa; @@ -276,7 +274,6 @@ class MainFrame : public TopFrame // protected event handlers virtual void OnCloseFrame(wxCloseEvent& event); virtual void OnExitClick(wxCommandEvent& event); - //void OnQuit(wxCommandEvent& event); void startTxStream(); void startRxStream(); @@ -285,27 +282,11 @@ class MainFrame : public TopFrame void abortTxStream(); void abortRxStream(); - void OnOpen( wxCommandEvent& event ); -// void OnOpenUpdateUI( wxUpdateUIEvent& event ); - void OnSave( wxCommandEvent& event ); -// void OnSaveUpdateUI( wxUpdateUIEvent& event ); - void OnClose( wxCommandEvent& event ); -// void OnCloseUpdateUI( wxUpdateUIEvent& event ); void OnExit( wxCommandEvent& event ); - void OnCopy( wxCommandEvent& event ); -// void OnCopyUpdateUI( wxUpdateUIEvent& event ); - void OnCut( wxCommandEvent& event ); -// void OnCutUpdateUI( wxUpdateUIEvent& event ); - void OnPaste( wxCommandEvent& event ); -// void OnPasteUpdateUI( wxUpdateUIEvent& event ); void OnToolsAudio( wxCommandEvent& event ); void OnToolsAudioUI( wxUpdateUIEvent& event ); void OnToolsComCfg( wxCommandEvent& event ); void OnToolsComCfgUI( wxUpdateUIEvent& event ); - void OnToolsOptions( wxCommandEvent& event ); - void OnToolsOptionsUI( wxUpdateUIEvent& event ); - //void OnCaptureRxStream( wxCommandEvent& event ); - // void OnCaptureTxStream( wxCommandEvent& event ); void OnPlayFileToMicIn( wxCommandEvent& event ); void OnRecFileFromRadio( wxCommandEvent& event ); @@ -323,23 +304,13 @@ class MainFrame : public TopFrame // Toggle Buttons void OnTogBtnSplitClick(wxCommandEvent& event); void OnTogBtnAnalogClick(wxCommandEvent& event); - //void OnTogBtnALCClick(wxCommandEvent& event); void OnTogBtnRxID( wxCommandEvent& event ); void OnTogBtnTxID( wxCommandEvent& event ); void OnTogBtnTXClick( wxCommandEvent& event ); void OnTogBtnOnOff( wxCommandEvent& event ); -// void OnTogBtnSplitClickUI(wxUpdateUIEvent& event); -// void OnTogBtnAnalogClickUI(wxUpdateUIEvent& event); -// void OnTogBtnALCClickUI(wxUpdateUIEvent& event); -// void OnTogBtnRxIDUI(wxUpdateUIEvent& event ); -// void OnTogBtnTxIDUI(wxUpdateUIEvent& event ); -// void OnTogBtnTXClickUI(wxUpdateUIEvent& event ); -// void OnTogBtnOnOffUI(wxUpdateUIEvent& event ); - //System Events void OnPaint(wxPaintEvent& event); - void OnClose( wxCloseEvent& event ); void OnSize( wxSizeEvent& event ); void OnUpdateUI( wxUpdateUIEvent& event ); void OnDeleteConfig(wxCommandEvent&); @@ -349,15 +320,12 @@ class MainFrame : public TopFrame #ifdef _USE_ONIDLE void OnIdle(wxIdleEvent &evt); #endif -// wxString LoadUserImage(wxImage& image); private: #ifdef __WXMSW__ -// wxString m_soundRes; #endif // __WXMSW__ bool m_useMemory; wxTextCtrl* m_tc; int m_zoom; - float m_snrBeta; }; diff --git a/fdmdv2/src/topFrame.cpp b/fdmdv2/src/topFrame.cpp index 25e0608e..08c2ffa3 100644 --- a/fdmdv2/src/topFrame.cpp +++ b/fdmdv2/src/topFrame.cpp @@ -40,48 +40,12 @@ TopFrame::TopFrame(wxWindow* parent, wxWindowID id, const wxString& title, const m_menubarMain = new wxMenuBar(wxMB_DOCKABLE); file = new wxMenu(); -#ifdef UNIMPLEMENTED - wxMenuItem* m_menuItemOpen; - m_menuItemOpen = new wxMenuItem(file, ID_OPEN, wxString(_("&Open")) , _("Open File"), wxITEM_NORMAL); - file->Append(m_menuItemOpen); - - wxMenuItem* m_menuItemSave; - m_menuItemSave = new wxMenuItem(file, ID_SAVE, wxString(_("&Save")) , _("Save current file"), wxITEM_NORMAL); - file->Append(m_menuItemSave); - - wxMenuItem* m_menuItemClose; - m_menuItemClose = new wxMenuItem(file, ID_CLOSE, wxString(_("&Close")) , _("Close current file"), wxITEM_NORMAL); - file->Append(m_menuItemClose); - - file->AppendSeparator(); -#endif - wxMenuItem* m_menuItemExit; m_menuItemExit = new wxMenuItem(file, ID_EXIT, wxString(_("E&xit")) , _("Exit Program"), wxITEM_NORMAL); file->Append(m_menuItemExit); m_menubarMain->Append(file, _("&File")); -#ifdef UNIMPLEMENTED - edit = new wxMenu(); - wxMenuItem* m_menuItemCopy; - m_menuItemCopy = new wxMenuItem(edit, ID_COPY, wxString(_("&Copy")) , _("Copy selection"), wxITEM_NORMAL); - edit->Append(m_menuItemCopy); - m_menuItemCopy->Enable(false); - - wxMenuItem* m_menuItemCut; - m_menuItemCut = new wxMenuItem(edit, ID_CUT, wxString(_("Cut")) , _("Cut Selection"), wxITEM_NORMAL); - edit->Append(m_menuItemCut); - m_menuItemCut->Enable(false); - - wxMenuItem* m_menuItemPaste; - m_menuItemPaste = new wxMenuItem(edit, ID_PASTE, wxString(_("&Paste")) , _("Paste selection"), wxITEM_NORMAL); - edit->Append(m_menuItemPaste); - m_menuItemPaste->Enable(false); - - m_menubarMain->Append(edit, _("&Edit")); -#endif - tools = new wxMenu(); wxMenuItem* m_menuItemAudio; m_menuItemAudio = new wxMenuItem(tools, wxID_ANY, wxString(_("&Audio Config")) , wxEmptyString, wxITEM_NORMAL); @@ -91,53 +55,9 @@ TopFrame::TopFrame(wxWindow* parent, wxWindowID id, const wxString& title, const m_menuItemRigCtrlCfg = new wxMenuItem(tools, wxID_ANY, wxString(_("Rig Control Config")) , wxEmptyString, wxITEM_NORMAL); tools->Append(m_menuItemRigCtrlCfg); - wxMenuItem* m_menuItemOptions; - m_menuItemOptions = new wxMenuItem(tools, ID_OPTIONS, wxString(_("Other Program &Options")) , _("Set preferences"), wxITEM_NORMAL); - tools->Append(m_menuItemOptions); - - tools->AppendSeparator(); - -#ifdef UNIMPLEMENTED - wxMenuItem* m_menuItemCaptRxInStream; - m_menuItemCaptRxInStream = new wxMenuItem(tools, wxID_ANY, wxString(_("Capture Rx Input Stream")), wxEmptyString, wxITEM_NORMAL); -#ifdef __WXMSW__ - m_menuItemCaptRxInStream->SetBitmaps(wxNullBitmap); -#elif defined(__WXGTK__) - m_menuItemCaptRxInStream->SetBitmap(wxNullBitmap); -#endif - tools->Append(m_menuItemCaptRxInStream); - wxMenuItem* m_menuItemCaptTxInStream; m_menuItemCaptTxInStream = new wxMenuItem(tools, wxID_ANY, wxString(_("Capture Tx Input Stream")), wxEmptyString, wxITEM_NORMAL); -#ifdef __WXMSW__ - m_menuItemCaptTxInStream->SetBitmaps(wxNullBitmap); -#elif defined(__WXGTK__) - m_menuItemCaptTxInStream->SetBitmap(wxNullBitmap); -#endif - tools->Append(m_menuItemCaptTxInStream); - - wxMenuItem* m_menuItemCaptRxOutStream; - m_menuItemCaptRxOutStream = new wxMenuItem(tools, wxID_ANY, wxString(_("Capture Rx Output Stream")), wxEmptyString, wxITEM_NORMAL); -#ifdef __WXMSW__ - m_menuItemCaptRxOutStream->SetBitmaps(wxNullBitmap); -#elif defined(__WXGTK__) - m_menuItemCaptRxOutStream->SetBitmap(wxNullBitmap); -#endif - tools->Append(m_menuItemCaptRxOutStream); - - wxMenuItem* m_menuItemCaptTxOutStream; - m_menuItemCaptTxOutStream = new wxMenuItem(tools, wxID_ANY, wxString(_("Capture Tx Output Stream")), wxEmptyString, wxITEM_NORMAL); -#ifdef __WXMSW__ - m_menuItemCaptTxOutStream->SetBitmaps(wxNullBitmap); -#elif defined(__WXGTK__) - m_menuItemCaptTxOutStream->SetBitmap(wxNullBitmap); -#endif - tools->Append(m_menuItemCaptTxOutStream); - - tools->AppendSeparator(); -#endif - wxMenuItem* m_menuItemPlayFileToMicIn; m_menuItemPlayFileToMicIn = new wxMenuItem(tools, wxID_ANY, wxString(_("Start/Stop Play File to Mic In")) , wxEmptyString, wxITEM_NORMAL); g_playFileToMicInEventId = m_menuItemPlayFileToMicIn->GetId(); @@ -420,33 +340,11 @@ TopFrame::TopFrame(wxWindow* parent, wxWindowID id, const wxString& title, const this->Connect(wxEVT_PAINT, wxPaintEventHandler(TopFrame::topFrame_OnPaint)); this->Connect(wxEVT_SIZE, wxSizeEventHandler(TopFrame::topFrame_OnSize)); this->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(TopFrame::topFrame_OnUpdateUI)); -#ifdef UNIMPLEMENTED - this->Connect(m_menuItemOpen->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(TopFrame::OnOpen)); - this->Connect(m_menuItemOpen->GetId(), wxEVT_UPDATE_UI, wxUpdateUIEventHandler(TopFrame::OnOpenUpdateUI)); - this->Connect(m_menuItemSave->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(TopFrame::OnSave)); - this->Connect(m_menuItemSave->GetId(), wxEVT_UPDATE_UI, wxUpdateUIEventHandler(TopFrame::OnSaveUpdateUI)); - this->Connect(m_menuItemClose->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(TopFrame::OnClose)); - this->Connect(m_menuItemClose->GetId(), wxEVT_UPDATE_UI, wxUpdateUIEventHandler(TopFrame::OnCloseUpdateUI)); -#endif this->Connect(m_menuItemExit->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(TopFrame::OnExit)); -#ifdef UNIMPLEMENTED - this->Connect(m_menuItemCopy->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(TopFrame::OnCopy)); - this->Connect(m_menuItemCopy->GetId(), wxEVT_UPDATE_UI, wxUpdateUIEventHandler(TopFrame::OnCopyUpdateUI)); - this->Connect(m_menuItemCut->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(TopFrame::OnCut)); - this->Connect(m_menuItemCut->GetId(), wxEVT_UPDATE_UI, wxUpdateUIEventHandler(TopFrame::OnCutUpdateUI)); - this->Connect(m_menuItemPaste->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(TopFrame::OnPaste)); - this->Connect(m_menuItemPaste->GetId(), wxEVT_UPDATE_UI, wxUpdateUIEventHandler(TopFrame::OnPasteUpdateUI)); -#endif this->Connect(m_menuItemAudio->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(TopFrame::OnToolsAudio)); this->Connect(m_menuItemAudio->GetId(), wxEVT_UPDATE_UI, wxUpdateUIEventHandler(TopFrame::OnToolsAudioUI)); this->Connect(m_menuItemRigCtrlCfg->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(TopFrame::OnToolsComCfg)); this->Connect(m_menuItemRigCtrlCfg->GetId(), wxEVT_UPDATE_UI, wxUpdateUIEventHandler(TopFrame::OnToolsComCfgUI)); - this->Connect(m_menuItemOptions->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(TopFrame::OnToolsOptions)); - this->Connect(m_menuItemOptions->GetId(), wxEVT_UPDATE_UI, wxUpdateUIEventHandler(TopFrame::OnToolsOptionsUI)); -#ifdef UNIMPLEMENTED -// this->Connect(m_menuItemCaptRxStream->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(TopFrame::OnCaptureRxStream)); -// this->Connect(m_menuItemCaptTxStream->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(TopFrame::OnCaptureTxStream)); -#endif this->Connect(m_menuItemPlayFileToMicIn->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(TopFrame::OnPlayFileToMicIn)); this->Connect(m_menuItemRecFileFromRadio->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(TopFrame::OnRecFileFromRadio)); @@ -473,10 +371,6 @@ TopFrame::TopFrame(wxWindow* parent, wxWindowID id, const wxString& title, const m_ckboxSNR->Connect(wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler(TopFrame::OnCheckSNRClick), NULL, this); m_togBtnOnOff->Connect(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler(TopFrame::OnTogBtnOnOff), NULL, this); -#ifdef UNIMPLEMENTED - m_togBtnLoopRx->Connect(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler(TopFrame::OnTogBtnLoopRx), NULL, this); - m_togBtnLoopTx->Connect(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler(TopFrame::OnTogBtnLoopTx), NULL, this); -#endif m_togBtnSplit->Connect(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler(TopFrame::OnTogBtnSplitClick), NULL, this); m_togBtnAnalog->Connect(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler(TopFrame::OnTogBtnAnalogClick), NULL, this); #ifdef ALC @@ -494,33 +388,11 @@ TopFrame::~TopFrame() this->Disconnect(wxEVT_PAINT, wxPaintEventHandler(TopFrame::topFrame_OnPaint)); this->Disconnect(wxEVT_SIZE, wxSizeEventHandler(TopFrame::topFrame_OnSize)); this->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(TopFrame::topFrame_OnUpdateUI)); -#ifdef UNIMPLEMENTED - this->Disconnect(ID_OPEN, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(TopFrame::OnOpen)); - this->Disconnect(ID_OPEN, wxEVT_UPDATE_UI, wxUpdateUIEventHandler(TopFrame::OnOpenUpdateUI)); - this->Disconnect(ID_SAVE, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(TopFrame::OnSave)); - this->Disconnect(ID_SAVE, wxEVT_UPDATE_UI, wxUpdateUIEventHandler(TopFrame::OnSaveUpdateUI)); - this->Disconnect(ID_CLOSE, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(TopFrame::OnClose)); - this->Disconnect(ID_CLOSE, wxEVT_UPDATE_UI, wxUpdateUIEventHandler(TopFrame::OnCloseUpdateUI)); -#endif this->Disconnect(ID_EXIT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(TopFrame::OnExit)); -#ifdef UNIMPLEMENTED - this->Disconnect(ID_COPY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(TopFrame::OnCopy)); - this->Disconnect(ID_COPY, wxEVT_UPDATE_UI, wxUpdateUIEventHandler(TopFrame::OnCopyUpdateUI)); - this->Disconnect(ID_CUT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(TopFrame::OnCut)); - this->Disconnect(ID_CUT, wxEVT_UPDATE_UI, wxUpdateUIEventHandler(TopFrame::OnCutUpdateUI)); - this->Disconnect(ID_PASTE, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(TopFrame::OnPaste)); - this->Disconnect(ID_PASTE, wxEVT_UPDATE_UI, wxUpdateUIEventHandler(TopFrame::OnPasteUpdateUI)); -#endif this->Disconnect(wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(TopFrame::OnToolsAudio)); this->Disconnect(wxID_ANY, wxEVT_UPDATE_UI, wxUpdateUIEventHandler(TopFrame::OnToolsAudioUI)); this->Disconnect(wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(TopFrame::OnToolsComCfg)); this->Disconnect(wxID_ANY, wxEVT_UPDATE_UI, wxUpdateUIEventHandler(TopFrame::OnToolsComCfgUI)); - this->Disconnect(ID_OPTIONS, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(TopFrame::OnToolsOptions)); - this->Disconnect(ID_OPTIONS, wxEVT_UPDATE_UI, wxUpdateUIEventHandler(TopFrame::OnToolsOptionsUI)); -#ifdef UNIMPLEMENTED -// this->Disconnect(wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(TopFrame::OnCaptureRxStream)); -// this->Disconnect(wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(TopFrame::OnCaptureTxStream)); -#endif this->Disconnect(wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(TopFrame::OnPlayFileToMicIn)); this->Disconnect(wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(TopFrame::OnRecFileFromRadio)); @@ -545,10 +417,6 @@ TopFrame::~TopFrame() m_ckboxSQ->Disconnect(wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler(TopFrame::OnCheckSQClick), NULL, this); m_togBtnOnOff->Disconnect(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler(TopFrame::OnTogBtnOnOff), NULL, this); -#ifdef UNIMPLEMENTED - m_togBtnLoopRx->Disconnect(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler(TopFrame::OnTogBtnLoopRx), NULL, this); - m_togBtnLoopTx->Disconnect(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler(TopFrame::OnTogBtnLoopTx), NULL, this); -#endif m_togBtnSplit->Disconnect(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler(TopFrame::OnTogBtnSplitClick), NULL, this); m_togBtnAnalog->Disconnect(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler(TopFrame::OnTogBtnAnalogClick), NULL, this); #ifdef ALC @@ -558,94 +426,3 @@ TopFrame::~TopFrame() } -DlgOptions::DlgOptions(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style) : wxDialog(parent, id, title, pos, size, style) -{ - this->SetSizeHints(wxDefaultSize, wxDefaultSize); - this->SetSizeHints(wxDefaultSize, wxDefaultSize); - - wxBoxSizer* bSizer30; - bSizer30 = new wxBoxSizer(wxVERTICAL); - - wxStaticBoxSizer* sbSizer5; - sbSizer5 = new wxStaticBoxSizer(new wxStaticBox(this, wxID_ANY, _("Config Options")), wxHORIZONTAL); - - wxGridSizer* gSizer2; - gSizer2 = new wxGridSizer(6, 2, 0, 0); - - m_staticText2 = new wxStaticText(this, wxID_ANY, _("Option #1:"), wxDefaultPosition, wxDefaultSize, 0); - m_staticText2->Wrap(-1); - gSizer2->Add(m_staticText2, 1, wxALIGN_RIGHT|wxALL, 5); - - m_textCtrl3 = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0); - gSizer2->Add(m_textCtrl3, 1, wxALL, 5); - - m_staticText3 = new wxStaticText(this, wxID_ANY, _("Option #2:"), wxDefaultPosition, wxDefaultSize, 0); - m_staticText3->Wrap(-1); - gSizer2->Add(m_staticText3, 1, wxALIGN_RIGHT|wxALL, 5); - - m_textCtrl4 = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0); - gSizer2->Add(m_textCtrl4, 1, wxALL, 5); - - m_staticText4 = new wxStaticText(this, wxID_ANY, _("Option #3:"), wxDefaultPosition, wxDefaultSize, 0); - m_staticText4->Wrap(-1); - gSizer2->Add(m_staticText4, 1, wxALIGN_RIGHT|wxALL, 5); - - m_textCtrl5 = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0); - gSizer2->Add(m_textCtrl5, 1, wxALL, 5); - - m_staticText5 = new wxStaticText(this, wxID_ANY, _("Option #4:"), wxDefaultPosition, wxDefaultSize, 0); - m_staticText5->Wrap(-1); - gSizer2->Add(m_staticText5, 1, wxALIGN_RIGHT|wxALL, 5); - - m_textCtrl6 = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0); - gSizer2->Add(m_textCtrl6, 1, wxALL, 5); - - m_staticText6 = new wxStaticText(this, wxID_ANY, _("Option #5:"), wxDefaultPosition, wxDefaultSize, 0); - m_staticText6->Wrap(-1); - gSizer2->Add(m_staticText6, 1, wxALIGN_RIGHT|wxALL, 5); - - m_textCtrl7 = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0); - gSizer2->Add(m_textCtrl7, 1, wxALL, 5); - - m_staticText7 = new wxStaticText(this, wxID_ANY, _("Option #6:"), wxDefaultPosition, wxDefaultSize, 0); - m_staticText7->Wrap(-1); - gSizer2->Add(m_staticText7, 1, wxALIGN_RIGHT|wxALL, 5); - - m_textCtrl8 = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0); - gSizer2->Add(m_textCtrl8, 1, wxALL, 5); - - - sbSizer5->Add(gSizer2, 1, wxEXPAND, 5); - - - bSizer30->Add(sbSizer5, 1, wxEXPAND, 5); - - m_sdbSizer4 = new wxStdDialogButtonSizer(); - m_sdbSizer4OK = new wxButton(this, wxID_OK); - m_sdbSizer4->AddButton(m_sdbSizer4OK); - m_sdbSizer4Cancel = new wxButton(this, wxID_CANCEL); - m_sdbSizer4->AddButton(m_sdbSizer4Cancel); - m_sdbSizer4->Realize(); - - bSizer30->Add(m_sdbSizer4, 0, wxALIGN_RIGHT, 5); - - - this->SetSizer(bSizer30); - this->Layout(); - - this->Centre(wxBOTH); - this->Centre(wxBOTH); - - // Connect Events - this->Connect(wxEVT_CLOSE_WINDOW, wxCloseEventHandler(DlgOptions::OnClose)); - this->Connect(wxEVT_INIT_DIALOG, wxInitDialogEventHandler(DlgOptions::OnInitDialog)); -} - -DlgOptions::~DlgOptions() -{ - // Disconnect Events - this->Disconnect(wxEVT_CLOSE_WINDOW, wxCloseEventHandler(DlgOptions::OnClose)); - this->Disconnect(wxEVT_INIT_DIALOG, wxInitDialogEventHandler(DlgOptions::OnInitDialog)); - -} - diff --git a/fdmdv2/src/topFrame.h b/fdmdv2/src/topFrame.h index fd1cd7ba..890e103d 100644 --- a/fdmdv2/src/topFrame.h +++ b/fdmdv2/src/topFrame.h @@ -102,33 +102,11 @@ class TopFrame : public wxFrame virtual void topFrame_OnSize( wxSizeEvent& event ) { event.Skip(); } virtual void topFrame_OnUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); } -#ifdef UNIMPLEMENTED - virtual void OnOpen( wxCommandEvent& event ) { event.Skip(); } - virtual void OnOpenUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); } - virtual void OnSave( wxCommandEvent& event ) { event.Skip(); } - virtual void OnSaveUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); } - virtual void OnClose( wxCommandEvent& event ) { event.Skip(); } - virtual void OnCloseUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); } -#endif virtual void OnExit( wxCommandEvent& event ) { event.Skip(); } -#ifdef UNIMPLEMENTED - virtual void OnCopy( wxCommandEvent& event ) { event.Skip(); } - virtual void OnCopyUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); } - virtual void OnCut( wxCommandEvent& event ) { event.Skip(); } - virtual void OnCutUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); } - virtual void OnPaste( wxCommandEvent& event ) { event.Skip(); } - virtual void OnPasteUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); } -#endif virtual void OnToolsAudio( wxCommandEvent& event ) { event.Skip(); } virtual void OnToolsAudioUI( wxUpdateUIEvent& event ) { event.Skip(); } virtual void OnToolsComCfg( wxCommandEvent& event ) { event.Skip(); } virtual void OnToolsComCfgUI( wxUpdateUIEvent& event ) { event.Skip(); } - virtual void OnToolsOptions( wxCommandEvent& event ) { event.Skip(); } - virtual void OnToolsOptionsUI( wxUpdateUIEvent& event ) { event.Skip(); } -#ifdef UNIMPLEMENTED - //virtual void OnCaptureRxStream( wxCommandEvent& event ) { event.Skip(); } - //virtual void OnCaptureTxStream( wxCommandEvent& event ) { event.Skip(); } -#endif virtual void OnPlayFileToMicIn( wxCommandEvent& event ) { event.Skip(); } virtual void OnRecFileFromRadio( wxCommandEvent& event ) { event.Skip(); } @@ -179,41 +157,4 @@ class TopFrame : public wxFrame }; -/////////////////////////////////////////////////////////////////////////////// -/// Class DlgOptions -/////////////////////////////////////////////////////////////////////////////// -class DlgOptions : public wxDialog -{ - private: - - protected: - wxStaticText* m_staticText2; - wxTextCtrl* m_textCtrl3; - wxStaticText* m_staticText3; - wxTextCtrl* m_textCtrl4; - wxStaticText* m_staticText4; - wxTextCtrl* m_textCtrl5; - wxStaticText* m_staticText5; - wxTextCtrl* m_textCtrl6; - wxStaticText* m_staticText6; - wxTextCtrl* m_textCtrl7; - wxStaticText* m_staticText7; - wxTextCtrl* m_textCtrl8; - wxStdDialogButtonSizer* m_sdbSizer4; - wxButton* m_sdbSizer4OK; - wxButton* m_sdbSizer4Cancel; - - // Virtual event handlers, overide them in your derived class - virtual void OnClose( wxCloseEvent& event ) { event.Skip(); } - virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); } - - - public: - - DlgOptions( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Program Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 332,364 ), long style = wxDEFAULT_DIALOG_STYLE ); - ~DlgOptions(); - -}; - - #endif //__TOPFRAME_H__