From: wittend99 Date: Mon, 22 Oct 2012 15:31:13 +0000 (+0000) Subject: git-svn-id: https://svn.code.sf.net/p/freetel/code@793 01035d8c-6547-0410-b346-abe4f9... X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=07c65e163417787c21d72b0922ed8689ed270226;p=freetel-svn-tracking.git git-svn-id: https://svn.code.sf.net/p/freetel/code@793 01035d8c-6547-0410-b346-abe4f91aad63 --- diff --git a/fdmdv2/build/fdmdv2.mk b/fdmdv2/build/fdmdv2.mk index ed1b8c40..3df229a2 100644 --- a/fdmdv2/build/fdmdv2.mk +++ b/fdmdv2/build/fdmdv2.mk @@ -50,8 +50,8 @@ LibPath := $(LibraryPathSwitch). $(LibraryPathSwitch)/bin/Project AR := ar rcus CXX := g++ CC := gcc -CXXFLAGS := -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes) -DSVN_REVISION=\"789\" $(Preprocessors) -CFLAGS := -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes) -DSVN_REVISION=\"789\" $(Preprocessors) +CXXFLAGS := -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes) -DSVN_REVISION=\"791\" $(Preprocessors) +CFLAGS := -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes) -DSVN_REVISION=\"791\" $(Preprocessors) ## diff --git a/fdmdv2/src/fdmdv2_main.cpp b/fdmdv2/src/fdmdv2_main.cpp index d9967f34..2d536713 100644 --- a/fdmdv2/src/fdmdv2_main.cpp +++ b/fdmdv2/src/fdmdv2_main.cpp @@ -598,18 +598,18 @@ void MainFrame::OnPaste(wxCommandEvent& event) //------------------------------------------------------------------------- // OnCaptureRxStream() //------------------------------------------------------------------------- -void MainFrame::OnCaptureRxStream(wxCommandEvent& event) -{ - wxUnusedVar(event); -} +//void MainFrame::OnCaptureRxStream(wxCommandEvent& event) +//{ +// wxUnusedVar(event); +//} //------------------------------------------------------------------------- // OnCaptureTxStream() //------------------------------------------------------------------------- -void MainFrame::OnCaptureTxStream(wxCommandEvent& event) -{ - wxUnusedVar(event); -} +//void MainFrame::OnCaptureTxStream(wxCommandEvent& event) +//{ +// wxUnusedVar(event); +//} /* //------------------------------------------------------------------------- diff --git a/fdmdv2/src/fdmdv2_main.h b/fdmdv2/src/fdmdv2_main.h index 63ae9023..14e6e8ef 100644 --- a/fdmdv2/src/fdmdv2_main.h +++ b/fdmdv2/src/fdmdv2_main.h @@ -232,8 +232,8 @@ class MainFrame : public TopFrame void OnToolsComCfgUI( wxUpdateUIEvent& event ); void OnToolsOptions( wxCommandEvent& event ); void OnToolsOptionsUI( wxUpdateUIEvent& event ); - void OnCaptureRxStream( wxCommandEvent& event ); - void OnCaptureTxStream( wxCommandEvent& event ); + //void OnCaptureRxStream( wxCommandEvent& event ); + // void OnCaptureTxStream( wxCommandEvent& event ); void OnPlayAudioFile( wxCommandEvent& event ); void OnHelpCheckUpdates( wxCommandEvent& event ); void OnHelpCheckUpdatesUI( wxUpdateUIEvent& event ); diff --git a/fdmdv2/src/topFrame.cpp b/fdmdv2/src/topFrame.cpp index 3f4d603a..5e9fdb91 100644 --- a/fdmdv2/src/topFrame.cpp +++ b/fdmdv2/src/topFrame.cpp @@ -414,8 +414,8 @@ TopFrame::~TopFrame() 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)); - this->Disconnect(wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(TopFrame::OnCaptureRxStream)); - this->Disconnect(wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(TopFrame::OnCaptureTxStream)); +// this->Disconnect(wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(TopFrame::OnCaptureRxStream)); +// this->Disconnect(wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(TopFrame::OnCaptureTxStream)); this->Disconnect(wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(TopFrame::OnPlayAudioFile)); this->Disconnect(wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(TopFrame::OnHelpCheckUpdates)); this->Disconnect(wxID_ANY, wxEVT_UPDATE_UI, wxUpdateUIEventHandler(TopFrame::OnHelpCheckUpdatesUI)); diff --git a/fdmdv2/src/topFrame.h b/fdmdv2/src/topFrame.h index 1ebc1bd4..b931a9da 100644 --- a/fdmdv2/src/topFrame.h +++ b/fdmdv2/src/topFrame.h @@ -98,8 +98,8 @@ class TopFrame : public wxFrame virtual void OnToolsComCfgUI( wxUpdateUIEvent& event ) { event.Skip(); } virtual void OnToolsOptions( wxCommandEvent& event ) { event.Skip(); } virtual void OnToolsOptionsUI( wxUpdateUIEvent& event ) { event.Skip(); } - virtual void OnCaptureRxStream( wxCommandEvent& event ) { event.Skip(); } - virtual void OnCaptureTxStream( wxCommandEvent& event ) { event.Skip(); } + //virtual void OnCaptureRxStream( wxCommandEvent& event ) { event.Skip(); } + //virtual void OnCaptureTxStream( wxCommandEvent& event ) { event.Skip(); } virtual void OnPlayAudioFile( wxCommandEvent& event ) { event.Skip(); } virtual void OnHelpCheckUpdates( wxCommandEvent& event ) { event.Skip(); } virtual void OnHelpCheckUpdatesUI( wxUpdateUIEvent& event ) { event.Skip(); }