populating both serial port lists for Win32

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

diff --git a/fdmdv2/src/dlg_ptt.cpp b/fdmdv2/src/dlg_ptt.cpp
index 97f888cd98afa8835dd28c75c9ded86c9ea5eb14..e62debc981e8bd11ee69cab1efb3c3b66c9feb56 100644 (file)
--- a/fdmdv2/src/dlg_ptt.cpp
+++ b/fdmdv2/src/dlg_ptt.cpp
@@ -211,6 +211,7 @@ void ComPortsDlg::populatePortList()
 {
 #ifdef __WXMSW__
     m_listCtrlPorts->Clear();
+    m_cbSerialPort->Clear();
     wxArrayString aStr;
     wxRegKey key(wxRegKey::HKLM, _T("HARDWARE\\DEVICEMAP\\SERIALCOMM"));
     if(!key.Exists())
@@ -248,6 +249,7 @@ void ComPortsDlg::populatePortList()
         }
     }
     m_listCtrlPorts->Append(aStr);
+    m_cbSerialPort->Append(aStr);
 #endif
 #ifdef __WXGTK__
     /* TODO(Joel): http://stackoverflow.com/questions/2530096/how-to-find-all-serial-devices-ttys-ttyusb-on-linux-without-opening-them */
@@ -256,6 +258,13 @@ void ComPortsDlg::populatePortList()
     m_cbSerialPort->Append("/dev/ttyUSB1");
     m_cbSerialPort->Append("/dev/ttyS0");
     m_cbSerialPort->Append("/dev/ttyS1");
+    /*
+    m_txtCtlDevicePath->Clear();
+    m_txtCtlDevicePath->Append("/dev/ttyUSB0");
+    m_txtCtlDevicePath->Append("/dev/ttyUSB1");
+    m_txtCtlDevicePath->Append("/dev/ttyS0");
+    m_txtCtlDevicePath->Append("/dev/ttyS1");
+    */
 #endif
 }