git-svn-id: https://svn.code.sf.net/p/freetel/code@793 01035d8c-6547-0410-b346-abe4f9...

diff --git a/fdmdv2/build/fdmdv2.mk b/fdmdv2/build/fdmdv2.mk
index ed1b8c408a9f4b1f61aa1bccc11ae134027c5e59..3df229a2ea8173a7a6eb33829a7004f69c404082 100644 (file)
--- a/fdmdv2/build/fdmdv2.mk
+++ b/fdmdv2/build/fdmdv2.mk
@@ -50,8 +50,8 @@ LibPath                := $(LibraryPathSwitch). $(LibraryPathSwitch)/bin/Project
 AR       := ar rcus\r
 CXX      := g++\r
 CC       := gcc\r
-CXXFLAGS :=  -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes)  -DSVN_REVISION=\"789\"  $(Preprocessors)\r
-CFLAGS   :=  -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes)  -DSVN_REVISION=\"789\"  $(Preprocessors)\r
+CXXFLAGS :=  -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes)  -DSVN_REVISION=\"791\"  $(Preprocessors)\r
+CFLAGS   :=  -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes)  -DSVN_REVISION=\"791\"  $(Preprocessors)\r
 \r
 \r
 ##\r

diff --git a/fdmdv2/src/fdmdv2_main.cpp b/fdmdv2/src/fdmdv2_main.cpp
index d9967f349b000aded82ab83d034dda064b9827bf..2d536713ee73f6410ab0dc595bd20394ee5688d9 100644 (file)
--- 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 63ae9023484137e01210f3d6b604c7c56151f49e..14e6e8ef17b176deec3331cc277ba2ca429cd084 100644 (file)
--- 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 3f4d603a060292a73e5cbd77a4bcb5987b4505e1..5e9fdb91b897435c9839562925815b638449a695 100644 (file)
--- 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 1ebc1bd4fc6bc8828b2af61bc5cd857c73124e00..b931a9da412b8dc722fae294a8f1d7ecddb6ec33 100644 (file)
--- 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(); }