From 217b327499adff90efc20677b6d3ba2b2fb5f9ec Mon Sep 17 00:00:00 2001 From: wittend99 Date: Fri, 23 Nov 2012 15:59:26 +0000 Subject: [PATCH] git-svn-id: https://svn.code.sf.net/p/freetel/code@1049 01035d8c-6547-0410-b346-abe4f91aad63 --- fdmdv2/build/fdmdv2.mk | 28 ++--- fdmdv2/build/fdmdv2.project | 9 +- fdmdv2/build/fdmdv2.txt | 2 +- fdmdv2/build/fdmdv2_wsp.mk | 2 +- fdmdv2/src/Makefile | 19 +--- fdmdv2/src/Makefile.linux.dmw | 4 +- fdmdv2/src/dlg_about.cpp | 75 ------------- fdmdv2/src/dlg_about.h | 42 -------- fdmdv2/src/dlg_audiooptions.cpp | 4 +- fdmdv2/src/dlg_audiooptions.h | 4 +- fdmdv2/src/dlg_comports.cpp | 4 +- fdmdv2/src/dlg_comports.h | 4 +- fdmdv2/src/dlg_options.cpp | 4 +- fdmdv2/src/dlg_options.h | 4 +- fdmdv2/src/fdmdv2_defines.h | 4 +- fdmdv2/src/fdmdv2_hdw_ports.cpp | 31 +++++- fdmdv2/src/fdmdv2_hdw_ports.h | 4 +- fdmdv2/src/fdmdv2_main.cpp | 4 +- fdmdv2/src/fdmdv2_main.h | 5 +- fdmdv2/src/fdmdv2_pa_wrapper.cpp | 4 +- fdmdv2/src/fdmdv2_pa_wrapper.h | 4 +- fdmdv2/src/fdmdv2_plot.cpp | 4 +- fdmdv2/src/fdmdv2_plot.h | 4 +- fdmdv2/src/fdmdv2_plot_scalar.cpp | 4 +- fdmdv2/src/fdmdv2_plot_scalar.h | 4 +- fdmdv2/src/fdmdv2_plot_scatter.cpp | 4 +- fdmdv2/src/fdmdv2_plot_scatter.h | 4 +- fdmdv2/src/fdmdv2_plot_spectrum.cpp | 4 +- fdmdv2/src/fdmdv2_plot_spectrum.h | 4 +- fdmdv2/src/fdmdv2_plot_waterfall_linux.h | 4 +- fdmdv2/src/topFrame.cpp | 81 +------------- fdmdv2/src/topFrame.h | 130 +---------------------- 32 files changed, 99 insertions(+), 409 deletions(-) delete mode 100644 fdmdv2/src/dlg_about.cpp delete mode 100644 fdmdv2/src/dlg_about.h diff --git a/fdmdv2/build/fdmdv2.mk b/fdmdv2/build/fdmdv2.mk index aac6c79e..bb08072c 100644 --- a/fdmdv2/build/fdmdv2.mk +++ b/fdmdv2/build/fdmdv2.mk @@ -13,7 +13,7 @@ CurrentFileName := CurrentFilePath := CurrentFileFullPath := User :=wittend -Date :=11/19/2012 +Date :=11/23/2012 CodeLitePath :="D:\bin\CodeLite" LinkerName :=g++ SharedObjectLinkerName :=g++ -shared -fPIC @@ -27,8 +27,8 @@ OutputSwitch :=-o LibraryPathSwitch :=-L PreprocessorSwitch :=-D SourceSwitch :=-c -OutputFile :=$(IntermediateDirectory)/$(ProjectName) -Preprocessors :=$(PreprocessorSwitch)__WX__ +OutputFile :=$(IntermediateDirectory)/freeDV +Preprocessors :=$(PreprocessorSwitch)__WX__ $(PreprocessorSwitch)DMW=1 ObjectSwitch :=-o ArchiveOutputSwitch := PreprocessOnlySwitch :=-E @@ -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) $(Preprocessors) -CFLAGS := -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no) $(Preprocessors) +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) ## @@ -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_about$(ObjectSuffix) $(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_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) ## ## Main Build Targets @@ -83,19 +83,14 @@ $(IntermediateDirectory)/.d: @$(MakeDirCommand) "./Release" PreBuild: + @echo Executing Pre Build commands ... + D:\bin\TortiseSVN\bin\svnversion -c D:\Projects\Radio\fdmdv2 + @echo Done ## ## Objects ## -$(IntermediateDirectory)/src_dlg_about$(ObjectSuffix): ../src/dlg_about.cpp $(IntermediateDirectory)/src_dlg_about$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "D:/Projects/Radio/fdmdv2/src/dlg_about.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_dlg_about$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/src_dlg_about$(DependSuffix): ../src/dlg_about.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/src_dlg_about$(ObjectSuffix) -MF$(IntermediateDirectory)/src_dlg_about$(DependSuffix) -MM "D:/Projects/Radio/fdmdv2/src/dlg_about.cpp" - -$(IntermediateDirectory)/src_dlg_about$(PreprocessSuffix): ../src/dlg_about.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_dlg_about$(PreprocessSuffix) "D:/Projects/Radio/fdmdv2/src/dlg_about.cpp" - $(IntermediateDirectory)/src_dlg_comports$(ObjectSuffix): ../src/dlg_comports.cpp $(IntermediateDirectory)/src_dlg_comports$(DependSuffix) $(CXX) $(IncludePCH) $(SourceSwitch) "D:/Projects/Radio/fdmdv2/src/dlg_comports.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_dlg_comports$(ObjectSuffix) $(IncludePath) $(IntermediateDirectory)/src_dlg_comports$(DependSuffix): ../src/dlg_comports.cpp @@ -198,9 +193,6 @@ $(IntermediateDirectory)/src_dlg_audiooptions$(PreprocessSuffix): ../src/dlg_aud ## Clean ## clean: - $(RM) $(IntermediateDirectory)/src_dlg_about$(ObjectSuffix) - $(RM) $(IntermediateDirectory)/src_dlg_about$(DependSuffix) - $(RM) $(IntermediateDirectory)/src_dlg_about$(PreprocessSuffix) $(RM) $(IntermediateDirectory)/src_dlg_comports$(ObjectSuffix) $(RM) $(IntermediateDirectory)/src_dlg_comports$(DependSuffix) $(RM) $(IntermediateDirectory)/src_dlg_comports$(PreprocessSuffix) diff --git a/fdmdv2/build/fdmdv2.project b/fdmdv2/build/fdmdv2.project index a7d73137..07c1296c 100644 --- a/fdmdv2/build/fdmdv2.project +++ b/fdmdv2/build/fdmdv2.project @@ -8,7 +8,6 @@ - @@ -23,7 +22,6 @@ - @@ -119,6 +117,7 @@ + @@ -131,7 +130,7 @@ - + @@ -139,7 +138,9 @@ - + + D:\bin\TortiseSVN\bin\svnversion -c D:\Projects\Radio\fdmdv2 + diff --git a/fdmdv2/build/fdmdv2.txt b/fdmdv2/build/fdmdv2.txt index 85fa679c..e88756f0 100644 --- a/fdmdv2/build/fdmdv2.txt +++ b/fdmdv2/build/fdmdv2.txt @@ -1 +1 @@ -./Release/src_dlg_about.o ./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_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 diff --git a/fdmdv2/build/fdmdv2_wsp.mk b/fdmdv2/build/fdmdv2_wsp.mk index e920a49f..f156d21d 100644 --- a/fdmdv2/build/fdmdv2_wsp.mk +++ b/fdmdv2/build/fdmdv2_wsp.mk @@ -2,7 +2,7 @@ All: @echo "----------Building project:[ fdmdv2 - Release ]----------" - @"$(MAKE)" -f "fdmdv2.mk" + @"$(MAKE)" -f "fdmdv2.mk" PreBuild && "$(MAKE)" -f "fdmdv2.mk" clean: @echo "----------Cleaning project:[ fdmdv2 - Release ]----------" @"$(MAKE)" -f "fdmdv2.mk" clean diff --git a/fdmdv2/src/Makefile b/fdmdv2/src/Makefile index e32c5412..f8f5b7fd 100644 --- a/fdmdv2/src/Makefile +++ b/fdmdv2/src/Makefile @@ -1,20 +1,5 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. -# src/Makefile. Generated from Makefile.in by configure. - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - - +# Dave Witten's Makefile +# pkgdatadir = $(datadir)/fdmdv2 pkgincludedir = $(includedir)/fdmdv2 pkglibdir = $(libdir)/fdmdv2 diff --git a/fdmdv2/src/Makefile.linux.dmw b/fdmdv2/src/Makefile.linux.dmw index e3d1cd62..332d021b 100644 --- a/fdmdv2/src/Makefile.linux.dmw +++ b/fdmdv2/src/Makefile.linux.dmw @@ -11,10 +11,12 @@ CODEC2_PATH=/home/wittend/Projects/codec2-dev WX_CONFIG=$(WX_GTK_PATH)/wx-config WX_CPPFLAGS = $(shell $(WX_CONFIG) --cxxflags) WX_LIBS = $(shell $(WX_CONFIG) --libs core, base, aui) +SVN_REVISION=$(shell svnversion) CODEC2_INC=-I$(CODEC2_PATH)/src CODEC2_LIB=$(CODEC2_PATH)/src/.libs/libcodec2.a -CPP_FLAGS = $(WX_CPPFLAGS) $(CODEC2_INC) -I../extern/include -g -Wall +#CPP_FLAGS = $(WX_CPPFLAGS) $(CODEC2_INC) -I../extern/include -g -Wall +CPP_FLAGS = $(WX_CPPFLAGS) $(CODEC2_INC) -I. -g -Wall -O3 -DSVN_REV=\"$(SVN_REVISION)\" LIBS = $(WX_LIBS) $(CODEC2_LIB) -lm -lportaudiocpp -lpthread -lsndfile -lsamplerate OBJS = topFrame.o \ diff --git a/fdmdv2/src/dlg_about.cpp b/fdmdv2/src/dlg_about.cpp deleted file mode 100644 index 1746ad53..00000000 --- a/fdmdv2/src/dlg_about.cpp +++ /dev/null @@ -1,75 +0,0 @@ -//========================================================================== -// Name: dlg_about.h -// -// Purpose: Creates simple wxWidgets dialog GUI for the -// help/about page. -// -// 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 Lesser 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 Lesser General Public License -// along with this program; if not, see . -// -//========================================================================== -#include "dlg_about.h" - -AboutDlg::AboutDlg( wxWindow* parent ) : DlgAbout( parent ) -{ -} - -void AboutDlg::OnInitDialog( wxInitDialogEvent& event ) -{ -// TODO: Implement OnInitDialog -} - -//------------------------------------------------------------------------- -// ExchangeData() -//------------------------------------------------------------------------- -void AboutDlg::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); -} - -//------------------------------------------------------------------------- -// OnOK() -//------------------------------------------------------------------------- -void AboutDlg::OnOK( wxCommandEvent& event ) -{ - this->EndModal(wxID_OK); -} - diff --git a/fdmdv2/src/dlg_about.h b/fdmdv2/src/dlg_about.h deleted file mode 100644 index cbe73e0c..00000000 --- a/fdmdv2/src/dlg_about.h +++ /dev/null @@ -1,42 +0,0 @@ -//========================================================================== -// Name: dlg_about.h -// -// Purpose: Subclasses dialog GUI for Help/About. -// (DlgAbout 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 Lesser 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 Lesser General Public License -// along with this program; if not, see . -// -//========================================================================== -#ifndef __ABOUT_DIALOG__ -#define __ABOUT_DIALOG__ - -#include "fdmdv2_main.h" - -class AboutDlg : public DlgAbout -{ - protected: - // Handlers for DlgAbout events. - void OnInitDialog( wxInitDialogEvent& event ); - - public: - /** Constructor */ - AboutDlg( wxWindow* parent ); - void ExchangeData(int inout); - void OnOK( wxCommandEvent& event ); -}; - -#endif // __ABOUT_DIALOG__ diff --git a/fdmdv2/src/dlg_audiooptions.cpp b/fdmdv2/src/dlg_audiooptions.cpp index aff255dc..db3d1948 100644 --- a/fdmdv2/src/dlg_audiooptions.cpp +++ b/fdmdv2/src/dlg_audiooptions.cpp @@ -8,14 +8,14 @@ // All rights reserved. // // This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License version 2.1, +// 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 Lesser General Public License +// You should have received a copy of the GNU General Public License // along with this program; if not, see . // //========================================================================= diff --git a/fdmdv2/src/dlg_audiooptions.h b/fdmdv2/src/dlg_audiooptions.h index 2ac5faaa..3b6c5a5b 100644 --- a/fdmdv2/src/dlg_audiooptions.h +++ b/fdmdv2/src/dlg_audiooptions.h @@ -7,14 +7,14 @@ // License: // // This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License version 2.1, +// 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 Lesser General Public License +// You should have received a copy of the GNU General Public License // along with this program; if not, see . // //========================================================================= diff --git a/fdmdv2/src/dlg_comports.cpp b/fdmdv2/src/dlg_comports.cpp index 7d820fe2..578a2593 100644 --- a/fdmdv2/src/dlg_comports.cpp +++ b/fdmdv2/src/dlg_comports.cpp @@ -8,14 +8,14 @@ // License: // // This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License version 2.1, +// 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 Lesser General Public License +// You should have received a copy of the GNU General Public License // along with this program; if not, see . // //========================================================================== diff --git a/fdmdv2/src/dlg_comports.h b/fdmdv2/src/dlg_comports.h index 50521685..29cf8b30 100644 --- a/fdmdv2/src/dlg_comports.h +++ b/fdmdv2/src/dlg_comports.h @@ -8,14 +8,14 @@ // License: // // This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License version 2.1, +// 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 Lesser General Public License +// You should have received a copy of the GNU General Public License // along with this program; if not, see . // //========================================================================== diff --git a/fdmdv2/src/dlg_options.cpp b/fdmdv2/src/dlg_options.cpp index 0a810c60..3f8e0e0f 100644 --- a/fdmdv2/src/dlg_options.cpp +++ b/fdmdv2/src/dlg_options.cpp @@ -9,14 +9,14 @@ // License: // // This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License version 2.1, +// 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 Lesser General Public License +// You should have received a copy of the GNU General Public License // along with this program; if not, see . // //========================================================================== diff --git a/fdmdv2/src/dlg_options.h b/fdmdv2/src/dlg_options.h index 405178d7..8c37afe9 100644 --- a/fdmdv2/src/dlg_options.h +++ b/fdmdv2/src/dlg_options.h @@ -10,14 +10,14 @@ // License: // // This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License version 2.1, +// 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 Lesser General Public License +// You should have received a copy of the GNU General Public License // along with this program; if not, see . // //========================================================================== diff --git a/fdmdv2/src/fdmdv2_defines.h b/fdmdv2/src/fdmdv2_defines.h index 6224d78c..576a7b8f 100644 --- a/fdmdv2/src/fdmdv2_defines.h +++ b/fdmdv2/src/fdmdv2_defines.h @@ -7,14 +7,14 @@ // License: // // This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License version 2.1, +// 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 Lesser General Public License +// You should have received a copy of the GNU General Public License // along with this program; if not, see . // //========================================================================== diff --git a/fdmdv2/src/fdmdv2_hdw_ports.cpp b/fdmdv2/src/fdmdv2_hdw_ports.cpp index 7aa29538..c7498ca7 100644 --- a/fdmdv2/src/fdmdv2_hdw_ports.cpp +++ b/fdmdv2/src/fdmdv2_hdw_ports.cpp @@ -7,19 +7,22 @@ // License: // // This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License version 2.1, +// it under the terms of the GNU General 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 Lesser General Public License +// You should have received a copy of the GNU General Public License // along with this program; if not, see . // //========================================================================== #include "fdmdv2_hdw_ports.h" +//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-= +// class HdwPort() +//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-= HdwPort::HdwPort() { m_device_type = -1; @@ -28,15 +31,24 @@ HdwPort::HdwPort() //#include // This is a magic incantation which must be done! //WX_DEFINE_OBJARRAY(ArrayOfPorts); +//------------------------------------------------------------------------- +// OnClose() +//------------------------------------------------------------------------- HdwPort::~HdwPort() { } +//------------------------------------------------------------------------- +// OnClose() +//------------------------------------------------------------------------- void HdwPort::setType(int portType) { m_device_type = portType; } +//------------------------------------------------------------------------- +// OnClose() +//------------------------------------------------------------------------- int HdwPort::getList() { int rv = 0; @@ -74,30 +86,45 @@ int HdwPort::getList() return rv; } +//------------------------------------------------------------------------- +// getSerialPorts() +//------------------------------------------------------------------------- int HdwPort::getSerialPorts() { int rv = 0; return rv; } +//------------------------------------------------------------------------- +// getUSBPorts() +//------------------------------------------------------------------------- int HdwPort::getUSBPorts() { int rv = 0; return rv; } +//------------------------------------------------------------------------- +// OnClose() +//------------------------------------------------------------------------- int HdwPort::getVirtualPorts() { int rv = 0; return rv; } +//------------------------------------------------------------------------- +// getParallelPorts() +//------------------------------------------------------------------------- int HdwPort::getParallelPorts() { int rv = 0; return rv; } +//------------------------------------------------------------------------- +// getIEEE1394Ports() +//------------------------------------------------------------------------- int HdwPort::getIEEE1394Ports() { int rv = 0; diff --git a/fdmdv2/src/fdmdv2_hdw_ports.h b/fdmdv2/src/fdmdv2_hdw_ports.h index 521a7142..8d2ff9c7 100644 --- a/fdmdv2/src/fdmdv2_hdw_ports.h +++ b/fdmdv2/src/fdmdv2_hdw_ports.h @@ -7,14 +7,14 @@ // License: // // This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License version 2.1, +// 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 Lesser General Public License +// You should have received a copy of the GNU General Public License // along with this program; if not, see . // //========================================================================== diff --git a/fdmdv2/src/fdmdv2_main.cpp b/fdmdv2/src/fdmdv2_main.cpp index 6fe7e604..3d79611e 100644 --- a/fdmdv2/src/fdmdv2_main.cpp +++ b/fdmdv2/src/fdmdv2_main.cpp @@ -8,14 +8,14 @@ // License: // // This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License version 2.1, +// 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 Lesser General Public License +// You should have received a copy of the GNU General Public License // along with this program; if not, see . // //========================================================================== diff --git a/fdmdv2/src/fdmdv2_main.h b/fdmdv2/src/fdmdv2_main.h index 2e326e5c..f083d579 100644 --- a/fdmdv2/src/fdmdv2_main.h +++ b/fdmdv2/src/fdmdv2_main.h @@ -8,14 +8,14 @@ // License: // // This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License version 2.1, +// it under the terms of the GNU General 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 Lesser General Public License +// You should have received a copy of the GNU General License // along with this program; if not, see . // //========================================================================== @@ -49,7 +49,6 @@ #include "fifo.h" #include "topFrame.h" -#include "dlg_about.h" #include "dlg_options.h" #include "dlg_comports.h" #include "fdmdv2_plot.h" diff --git a/fdmdv2/src/fdmdv2_pa_wrapper.cpp b/fdmdv2/src/fdmdv2_pa_wrapper.cpp index 71c4a528..97a58fc3 100644 --- a/fdmdv2/src/fdmdv2_pa_wrapper.cpp +++ b/fdmdv2/src/fdmdv2_pa_wrapper.cpp @@ -7,14 +7,14 @@ // License: // // This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License version 2.1, +// 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 Lesser General Public License +// You should have received a copy of the GNU General Public License // along with this program; if not, see . // //========================================================================== diff --git a/fdmdv2/src/fdmdv2_pa_wrapper.h b/fdmdv2/src/fdmdv2_pa_wrapper.h index fbfc6822..0f2a371e 100644 --- a/fdmdv2/src/fdmdv2_pa_wrapper.h +++ b/fdmdv2/src/fdmdv2_pa_wrapper.h @@ -7,14 +7,14 @@ // License: // // This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License version 2.1, +// 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 Lesser General Public License +// You should have received a copy of the GNU General Public License // along with this program; if not, see . // //========================================================================== diff --git a/fdmdv2/src/fdmdv2_plot.cpp b/fdmdv2/src/fdmdv2_plot.cpp index bc62c8dd..e5987148 100644 --- a/fdmdv2/src/fdmdv2_plot.cpp +++ b/fdmdv2/src/fdmdv2_plot.cpp @@ -7,14 +7,14 @@ // License: // // This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License version 2.1, +// 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 Lesser General Public License +// You should have received a copy of the GNU General Public License // along with this program; if not, see . // //========================================================================== diff --git a/fdmdv2/src/fdmdv2_plot.h b/fdmdv2/src/fdmdv2_plot.h index 9b23f096..453f58b3 100644 --- a/fdmdv2/src/fdmdv2_plot.h +++ b/fdmdv2/src/fdmdv2_plot.h @@ -7,14 +7,14 @@ // License: // // This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License version 2.1, +// 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 Lesser General Public License +// You should have received a copy of the GNU General Public License // along with this program; if not, see . // //========================================================================== diff --git a/fdmdv2/src/fdmdv2_plot_scalar.cpp b/fdmdv2/src/fdmdv2_plot_scalar.cpp index f278c13b..e19ff3d3 100644 --- a/fdmdv2/src/fdmdv2_plot_scalar.cpp +++ b/fdmdv2/src/fdmdv2_plot_scalar.cpp @@ -7,14 +7,14 @@ // License: // // This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License version 2.1, +// 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 Lesser General Public License +// You should have received a copy of the GNU General Public License // along with this program; if not, see . // //========================================================================== diff --git a/fdmdv2/src/fdmdv2_plot_scalar.h b/fdmdv2/src/fdmdv2_plot_scalar.h index b4470ab3..8abded49 100644 --- a/fdmdv2/src/fdmdv2_plot_scalar.h +++ b/fdmdv2/src/fdmdv2_plot_scalar.h @@ -7,14 +7,14 @@ // License: // // This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License version 2.1, +// 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 Lesser General Public License +// You should have received a copy of the GNU General Public License // along with this program; if not, see . // //========================================================================== diff --git a/fdmdv2/src/fdmdv2_plot_scatter.cpp b/fdmdv2/src/fdmdv2_plot_scatter.cpp index 0607def7..c194365f 100644 --- a/fdmdv2/src/fdmdv2_plot_scatter.cpp +++ b/fdmdv2/src/fdmdv2_plot_scatter.cpp @@ -7,14 +7,14 @@ // License: // // This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License version 2.1, +// 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 Lesser General Public License +// You should have received a copy of the GNU General Public License // along with this program; if not, see . // //========================================================================== diff --git a/fdmdv2/src/fdmdv2_plot_scatter.h b/fdmdv2/src/fdmdv2_plot_scatter.h index 23c803b2..86bc54b6 100644 --- a/fdmdv2/src/fdmdv2_plot_scatter.h +++ b/fdmdv2/src/fdmdv2_plot_scatter.h @@ -7,14 +7,14 @@ // License: // // This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License version 2.1, +// 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 Lesser General Public License +// You should have received a copy of the GNU General Public License // along with this program; if not, see . // //========================================================================== diff --git a/fdmdv2/src/fdmdv2_plot_spectrum.cpp b/fdmdv2/src/fdmdv2_plot_spectrum.cpp index 8191ea4d..80fb3793 100644 --- a/fdmdv2/src/fdmdv2_plot_spectrum.cpp +++ b/fdmdv2/src/fdmdv2_plot_spectrum.cpp @@ -7,14 +7,14 @@ // License: // // This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License version 2.1, +// 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 Lesser General Public License +// You should have received a copy of the GNU General Public License // along with this program; if not, see . // //========================================================================== diff --git a/fdmdv2/src/fdmdv2_plot_spectrum.h b/fdmdv2/src/fdmdv2_plot_spectrum.h index eb6e6d43..39173d48 100644 --- a/fdmdv2/src/fdmdv2_plot_spectrum.h +++ b/fdmdv2/src/fdmdv2_plot_spectrum.h @@ -7,14 +7,14 @@ // License: // // This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License version 2.1, +// 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 Lesser General Public License +// You should have received a copy of the GNU General Public License // along with this program; if not, see . // //========================================================================== diff --git a/fdmdv2/src/fdmdv2_plot_waterfall_linux.h b/fdmdv2/src/fdmdv2_plot_waterfall_linux.h index f7769f4e..3efbf3f0 100644 --- a/fdmdv2/src/fdmdv2_plot_waterfall_linux.h +++ b/fdmdv2/src/fdmdv2_plot_waterfall_linux.h @@ -7,14 +7,14 @@ // License: // // This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License version 2.1, +// 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 Lesser General Public License +// You should have received a copy of the GNU General Public License // along with this program; if not, see . // //========================================================================== diff --git a/fdmdv2/src/topFrame.cpp b/fdmdv2/src/topFrame.cpp index 2cf19588..25e0608e 100644 --- a/fdmdv2/src/topFrame.cpp +++ b/fdmdv2/src/topFrame.cpp @@ -8,14 +8,14 @@ // License: // // This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License version 2.1, +// 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 Lesser General Public License +// You should have received a copy of the GNU General Public License // along with this program; if not, see . // //========================================================================== @@ -558,83 +558,6 @@ TopFrame::~TopFrame() } -DlgAbout::DlgAbout(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* bSizer20; - bSizer20 = new wxBoxSizer(wxVERTICAL); - - wxBoxSizer* bSizer21; - bSizer21 = new wxBoxSizer(wxVERTICAL); - - wxBoxSizer* bSizer23; - bSizer23 = new wxBoxSizer(wxVERTICAL); - - wxBoxSizer* bSizer25; - bSizer25 = new wxBoxSizer(wxVERTICAL); - - m_bitmapAbout = new wxStaticBitmap(this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0); - bSizer25->Add(m_bitmapAbout, 1, wxALL|wxEXPAND, 5); - - - bSizer23->Add(bSizer25, 1, wxEXPAND, 5); - - wxBoxSizer* bSizer26; - bSizer26 = new wxBoxSizer(wxVERTICAL); - - m_staticText1 = new wxStaticText(this, wxID_ANY, _("MyLabel"), wxDefaultPosition, wxDefaultSize, 0); - m_staticText1->Wrap(-1); - bSizer26->Add(m_staticText1, 1, wxALL, 5); - - - bSizer23->Add(bSizer26, 0, 0, 5); - - - bSizer21->Add(bSizer23, 1, wxEXPAND, 5); - - wxBoxSizer* bSizer24; - bSizer24 = new wxBoxSizer(wxVERTICAL); - - m_textCtrl2 = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0); - bSizer24->Add(m_textCtrl2, 1, wxALL|wxEXPAND, 5); - - - bSizer21->Add(bSizer24, 1, wxEXPAND, 5); - - - bSizer20->Add(bSizer21, 1, wxEXPAND, 5); - - wxBoxSizer* bSizer22; - bSizer22 = new wxBoxSizer(wxVERTICAL); - - m_button9 = new wxButton(this, wxID_ANY, _("MyButton"), wxDefaultPosition, wxDefaultSize, 0); - bSizer22->Add(m_button9, 0, wxALIGN_BOTTOM|wxALIGN_RIGHT|wxALL, 5); - - - bSizer20->Add(bSizer22, 0, wxALIGN_RIGHT, 5); - - - this->SetSizer(bSizer20); - this->Layout(); - - this->Centre(wxBOTH); - this->Centre(wxBOTH); - - // Connect Events - this->Connect(wxEVT_CLOSE_WINDOW, wxCloseEventHandler(DlgAbout::OnClose)); - this->Connect(wxEVT_INIT_DIALOG, wxInitDialogEventHandler(DlgAbout::OnInitDialog)); -} - -DlgAbout::~DlgAbout() -{ - // Disconnect Events - this->Disconnect(wxEVT_CLOSE_WINDOW, wxCloseEventHandler(DlgAbout::OnClose)); - this->Disconnect(wxEVT_INIT_DIALOG, wxInitDialogEventHandler(DlgAbout::OnInitDialog)); - -} - 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); diff --git a/fdmdv2/src/topFrame.h b/fdmdv2/src/topFrame.h index 5f6eb5ec..fd1cd7ba 100644 --- a/fdmdv2/src/topFrame.h +++ b/fdmdv2/src/topFrame.h @@ -22,6 +22,10 @@ #ifndef __TOPFRAME_H__ #define __TOPFRAME_H__ +#ifdef DMW + #define SVN_REV SVN_REVISION +#endif + #include #include #include @@ -175,90 +179,6 @@ class TopFrame : public wxFrame }; -/////////////////////////////////////////////////////////////////////////////// -/// Class DlgAbout -/////////////////////////////////////////////////////////////////////////////// -class DlgAbout : public wxDialog -{ - private: - - protected: - wxStaticBitmap* m_bitmapAbout; - wxStaticText* m_staticText1; - wxTextCtrl* m_textCtrl2; - wxButton* m_button9; - - // Virtual event handlers, overide them in your derived class - virtual void OnClose( wxCloseEvent& event ) { event.Skip(); } - virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); } - - - public: - - DlgAbout( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("About FreeDV"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 352,343 ), long style = wxDEFAULT_DIALOG_STYLE ); - ~DlgAbout(); - -}; - -/* -/////////////////////////////////////////////////////////////////////////////// -/// Class DlgAudio -/////////////////////////////////////////////////////////////////////////////// -class DlgAudio : public wxDialog -{ - private: - - protected: - wxNotebook* m_nbAudioOptions; - wxPanel* m_panelDevices; - wxRadioButton* m_radioBtnPortAudio; - wxStaticText* m_staticText151; - wxTextCtrl* m_textNumChOut; - wxStaticText* m_staticText141; - wxTextCtrl* m_textNumChIn; - wxStaticText* m_staticText14; - wxComboBox* m_comboAudioCodec; - wxStaticText* m_staticText15; - wxComboBox* m_comboCodecTx; - wxStaticText* m_staticText16; - wxComboBox* m_comboRadioRx; - wxStaticText* m_staticText17; - wxComboBox* m_comboCodecSpkr; - wxRadioButton* m_radioBtnFileOnly; - wxPanel* m_panelSettings; - wxListBox* m_lbRxInput; - wxTextCtrl* m_textRxInput; - wxListBox* m_lbTxOutput; - wxTextCtrl* m_textTxOutput; - wxListBox* m_lbVoiceInput; - wxTextCtrl* m_textVoiceInput; - wxListBox* m_lbVoiceOutput; - wxTextCtrl* m_textVoiceOutput; - wxStdDialogButtonSizer* m_sdbSizer3; - wxButton* m_sdbSizer3OK; - wxButton* m_sdbSizer3Apply; - wxButton* m_sdbSizer3Cancel; - - // Virtual event handlers, overide them in your derived class - virtual void OnClose( wxCloseEvent& event ) { event.Skip(); } - virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); } - virtual void OnRxInputSelect( wxCommandEvent& event ) { event.Skip(); } - virtual void OnTxOutputSelect( wxCommandEvent& event ) { event.Skip(); } - virtual void OnVoiceInputSelect( wxCommandEvent& event ) { event.Skip(); } - virtual void OnVoiceOutputSelect( wxCommandEvent& event ) { event.Skip(); } - virtual void OnApply( wxCommandEvent& event ) { event.Skip(); } - virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); } - virtual void OnOK( wxCommandEvent& event ) { event.Skip(); } - - - public: - - DlgAudio( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Audio Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 555,419 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); - ~DlgAudio(); - -}; -*/ - /////////////////////////////////////////////////////////////////////////////// /// Class DlgOptions /////////////////////////////////////////////////////////////////////////////// @@ -295,47 +215,5 @@ class DlgOptions : public wxDialog }; -/* -/////////////////////////////////////////////////////////////////////////////// -/// Class DlgComPorts -/////////////////////////////////////////////////////////////////////////////// -class DlgComPorts : public wxDialog -{ - private: - - protected: - wxStaticText* m_staticText8; - wxListCtrl* m_listCtrlPortSelect; - wxStaticText* m_staticText9; - wxTextCtrl* m_textRigCtrlPort; - wxStaticText* m_staticText91; - wxTextCtrl* m_textRigCtrlBaud; - wxStaticText* m_staticText911; - wxTextCtrl* m_textRigCtrlDatabits; - wxStaticText* m_staticText912; - wxTextCtrl* m_textRigCtrlStopbits; - wxStaticText* m_staticText913; - wxTextCtrl* m_textRigCtrlParity; - wxStdDialogButtonSizer* m_sdbSizer5; - wxButton* m_sdbSizer5OK; - wxButton* m_sdbSizer5Apply; - wxButton* m_sdbSizer5Cancel; - - // Virtual event handlers, overide them in your derived class - virtual void OnListItemSelected( wxListEvent& event ) { event.Skip(); } - virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); } - virtual void OnOK( wxCommandEvent& event ) { event.Skip(); } - virtual void OnClose( wxCloseEvent& event ) { event.Skip(); } - virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); } - virtual void OnApply( wxCommandEvent& event ) { event.Skip(); } - - - public: - - DlgComPorts( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Select Com Port"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 399,354 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); - ~DlgComPorts(); - -}; -*/ #endif //__TOPFRAME_H__ -- 2.25.1