From: wittend99 <wittend99@01035d8c-6547-0410-b346-abe4f91aad63>
Date: Wed, 5 Dec 2012 15:22:25 +0000 (+0000)
Subject: More work on PTT button.
X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=fa315d5320b5f9082da8d0d704c6178e5c1809f6;p=freetel-svn-tracking.git

More work on PTT button.

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

diff --git a/fdmdv2/build/fdmdv2.mk b/fdmdv2/build/fdmdv2.mk
index d1060da1..e6ce0125 100644
--- a/fdmdv2/build/fdmdv2.mk
+++ b/fdmdv2/build/fdmdv2.mk
@@ -13,7 +13,7 @@ CurrentFileName        :=
 CurrentFilePath        :=
 CurrentFileFullPath    :=
 User                   :=wittend
-Date                   :=12/4/2012
+Date                   :=12/5/2012
 CodeLitePath           :="D:\bin\CodeLite"
 LinkerName             :=g++
 SharedObjectLinkerName :=g++ -shared -fPIC
@@ -52,8 +52,8 @@ LibPath                := $(LibraryPathSwitch). $(LibraryPathSwitch)d:/Projects/
 AR       := ar rcus
 CXX      := g++
 CC       := gcc
-CXXFLAGS :=  -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes)  -DSVN_REVISION=\"1114\"  $(Preprocessors)
-CFLAGS   :=  -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes)  -DSVN_REVISION=\"1114\"  $(Preprocessors)
+CXXFLAGS :=  -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes)  -DSVN_REVISION=\"1119\"  $(Preprocessors)
+CFLAGS   :=  -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes)  -DSVN_REVISION=\"1119\"  $(Preprocessors)
 
 
 ##
diff --git a/fdmdv2/src/dlg_comports.cpp b/fdmdv2/src/dlg_comports.cpp
index e6dba5a1..3fffeab1 100644
--- a/fdmdv2/src/dlg_comports.cpp
+++ b/fdmdv2/src/dlg_comports.cpp
@@ -54,7 +54,7 @@ ComPortsDlg::ComPortsDlg(wxWindow* parent, wxWindowID id, const wxString& title,
     staticBoxSizer31->Add(m_ckUseSerialPTT, 0, wxALIGN_LEFT, 20);
 
     wxArrayString m_listCtrlPortsArr;
-    m_listCtrlPorts = new wxListBox(this, wxID_ANY, wxDefaultPosition, wxSize(-1,45), m_listCtrlPortsArr, wxLB_SINGLE);
+    m_listCtrlPorts = new wxListBox(this, wxID_ANY, wxDefaultPosition, wxSize(-1,45), m_listCtrlPortsArr, wxLB_SINGLE | wxLB_SORT);
     staticBoxSizer31->Add(m_listCtrlPorts, 1, wxALIGN_CENTER, 0);
 #endif
 #ifdef __WXGTK__
diff --git a/fdmdv2/src/fdmdv2_main.cpp b/fdmdv2/src/fdmdv2_main.cpp
index f92d4eaf..4f6b6d90 100644
--- a/fdmdv2/src/fdmdv2_main.cpp
+++ b/fdmdv2/src/fdmdv2_main.cpp
@@ -1411,7 +1411,7 @@ void MainFrame::OnToolsComCfg(wxCommandEvent& event)
     int rv = 0;
     int  iLineState  = 0;
     //bool bPTTEnabled = m_btnTogPTT->IsEnabled();
-    bool bPTTState   = m_btnTogPTT->GetValue();
+    //bool bPTTState   = m_btnTogPTT->GetValue();
 
     if(m_serialPort != NULL)
     {
@@ -1447,7 +1447,7 @@ void MainFrame::OnToolsComCfg(wxCommandEvent& event)
                 m_serialPort->ClrLineState(ctb::LinestateDtr);
             }
         // m_btnTogPTT->Enable(bPTTEnabled);
-            m_btnTogPTT->SetValue(bPTTState);
+        // m_btnTogPTT->SetValue(bPTTState);
         }
  }
     delete dlg;
@@ -2716,6 +2716,6 @@ void MainFrame::CloseSerialPort(void)
         m_serialPort = NULL;
         m_device     = NULL; 
         //m_btnTogPTT->SetLabel(wxT("PTT"));
-        m_btnTogPTT->Enable(false);
+        //m_btnTogPTT->Enable(false);
     }
 }