Hope this works :)
Based upon SVN r1245.
From: "A. Maitland Bottoms" <aa...@amrad.org>
Date: Wed, 22 May 2013 21:45:23 -0400
Subject: [PATCH] GetItemText 2.8 variation
Description: wx-2.8 has no second column argument
diff --git a/src/dlg_audiooptions.cpp b/src/dlg_audiooptions.cpp
index 4f0baa0..9d784ac 100644
--- a/src/dlg_audiooptions.cpp
+++ b/src/dlg_audiooptions.cpp
@@ -403,11 +403,19 @@ int AudioOptsDialog::setTextCtrlIfDevNumValid(wxTextCtrl
*textCtrl, wxListCtrl *
found_devNum = 0;
for(i=0; i<listCtrl->GetItemCount()-1; i++) {
+#ifdef FUTURE_WXWIN_COMPATIBILITY_3_0
aDevNum = wxAtoi(listCtrl->GetItemText(i, 1));
+#else
+ aDevNum = wxAtoi(listCtrl->GetItemText(i));
+#endif
//printf("aDevNum: %d devNum: %d\n", aDevNum, devNum);
if (aDevNum == devNum) {
found_devNum = 1;
+#ifdef FUTURE_WXWIN_COMPATIBILITY_3_0
textCtrl->SetValue(listCtrl->GetItemText(i, 0) + " (" +
wxString::Format(wxT("%i"),devNum) + ")");
+#else
+ textCtrl->SetValue(listCtrl->GetItemText(i) + wxT(" (") +
wxString::Format(wxT("%i"),devNum) + wxT(")"));
+#endif
printf("setting focus of %d\n", i);
listCtrl->SetItemState(i, wxLIST_STATE_FOCUSED,
wxLIST_STATE_FOCUSED);
}
@@ -705,7 +713,7 @@ void AudioOptsDialog::showAPIInfo()
int apiCount = 0;
int numDevices = 0;
- strval = Pa_GetVersionText();
+ strval = wxString::FromAscii(Pa_GetVersionText());
m_textStringVer->SetLabel(strval);
apiVersion = Pa_GetVersion();
@@ -842,18 +850,30 @@ void AudioOptsDialog::OnDeviceSelect(wxComboBox
*cbSampleRate,
int in_out)
{
+#ifdef FUTURE_WXWIN_COMPATIBILITY_3_0
wxString devName = listCtrlDevices->GetItemText(index, 0);
+#else
+ wxString devName = listCtrlDevices->GetItemText(index);
+#endif
if (devName.IsSameAs(wxT("none"))) {
*devNum = -1;
textCtrl->SetValue(wxT("none"));
}
else {
+#ifdef FUTURE_WXWIN_COMPATIBILITY_3_0
*devNum = wxAtoi(listCtrlDevices->GetItemText(index, 1));
+#else
+ *devNum = wxAtoi(listCtrlDevices->GetItemText(index));
+#endif
textCtrl->SetValue(devName + wxT(" (") +
wxString::Format(wxT("%i"),*devNum) + wxT(")"));
int numSampleRates = buildListOfSupportedSampleRates(cbSampleRate,
*devNum, in_out);
if (numSampleRates) {
+#ifdef FUTURE_WXWIN_COMPATIBILITY_3_0
wxString defSampleRate = listCtrlDevices->GetItemText(index, 3);
+#else
+ wxString defSampleRate = listCtrlDevices->GetItemText(index);
+#endif
cbSampleRate->SetValue(defSampleRate);
}
else {
--
1.7.10.4
------------------------------------------------------------------------------
Try New Relic Now & We'll Send You this Cool Shirt
New Relic is the only SaaS-based application performance monitoring service
that delivers powerful full stack analytics. Optimize and monitor your
browser, app, & servers with just a few lines of code. Try New Relic
and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may
_______________________________________________
Freetel-codec2 mailing list
Freetel-codec2@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/freetel-codec2
