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 d1060da14f641c5c2118d9e069972be9e869d568..e6ce01255036256e042590c29f7beeba8ce62b6e 100644 (file)
--- a/fdmdv2/build/fdmdv2.mk
+++ b/fdmdv2/build/fdmdv2.mk
@@ -13,7 +13,7 @@ CurrentFileName        :=
 CurrentFilePath        :=\r
 CurrentFileFullPath    :=\r
 User                   :=wittend\r
-Date                   :=12/4/2012\r
+Date                   :=12/5/2012\r
 CodeLitePath           :="D:\bin\CodeLite"\r
 LinkerName             :=g++\r
 SharedObjectLinkerName :=g++ -shared -fPIC\r
@@ -52,8 +52,8 @@ LibPath                := $(LibraryPathSwitch). $(LibraryPathSwitch)d:/Projects/
 AR       := ar rcus\r
 CXX      := g++\r
 CC       := gcc\r
-CXXFLAGS :=  -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes)  -DSVN_REVISION=\"1114\"  $(Preprocessors)\r
-CFLAGS   :=  -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes)  -DSVN_REVISION=\"1114\"  $(Preprocessors)\r
+CXXFLAGS :=  -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes)  -DSVN_REVISION=\"1119\"  $(Preprocessors)\r
+CFLAGS   :=  -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes)  -DSVN_REVISION=\"1119\"  $(Preprocessors)\r
 \r
 \r
 ##\r

diff --git a/fdmdv2/src/dlg_comports.cpp b/fdmdv2/src/dlg_comports.cpp
index e6dba5a1947f349bda2aaa6127103e7e6f3099c2..3fffeab1d5c89083519dcfdd0a49254046219032 100644 (file)
--- 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 f92d4eafc1693a6c85a6ca7504f9426259f6d0bf..4f6b6d909ca9ae68f2cd77539a190deba9bcee60 100644 (file)
--- 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);
     }
 }