|
 |
c6df5af |
diff -up iaxclient-2.1beta3/simpleclient/iaxcomm/calls.cc.wx3 iaxclient-2.1beta3/simpleclient/iaxcomm/calls.cc
|
|
|
c6df5af |
--- iaxclient-2.1beta3/simpleclient/iaxcomm/calls.cc.wx3 2008-04-07 12:05:34.000000000 -0400
|
|
|
c6df5af |
+++ iaxclient-2.1beta3/simpleclient/iaxcomm/calls.cc 2018-08-28 20:17:29.496494108 -0400
|
|
|
c6df5af |
@@ -274,7 +274,7 @@ int CallList::HandleStateEvent(struct ia
|
|
|
c6df5af |
if(!str.IsSameAs(ws)) {
|
|
|
c6df5af |
// Add to phone book if not there already
|
|
|
c6df5af |
str.Printf(_T("%s/Extension"), wxString(c.remote_name, *(wxGetApp().ConvIax)).c_str());
|
|
|
c6df5af |
- config->Write(str, c.remote);
|
|
|
c6df5af |
+ config->Write(str, wxString(c.remote));
|
|
|
c6df5af |
} else {
|
|
|
c6df5af |
// Since they're in the phone book, look for ringtone
|
|
|
c6df5af |
str.Printf(_T("%s/RingTone"), wxString(c.remote_name, *(wxGetApp().ConvIax)).c_str());
|
|
|
c6df5af |
diff -up iaxclient-2.1beta3/simpleclient/iaxcomm/devices.cc.wx3 iaxclient-2.1beta3/simpleclient/iaxcomm/devices.cc
|
|
|
c6df5af |
--- iaxclient-2.1beta3/simpleclient/iaxcomm/devices.cc.wx3 2008-04-07 12:05:34.000000000 -0400
|
|
|
c6df5af |
+++ iaxclient-2.1beta3/simpleclient/iaxcomm/devices.cc 2018-08-28 19:56:46.175797499 -0400
|
|
|
c6df5af |
@@ -141,12 +141,12 @@ void DevicesDialog::GetAudioDevices()
|
|
|
c6df5af |
// validated). Invalid input to SetAudioDevices selects defaults
|
|
|
c6df5af |
|
|
|
c6df5af |
devname = wxGetApp().SpkInputDevice;
|
|
|
c6df5af |
- if(devname) {
|
|
|
c6df5af |
+ if(!devname.IsEmpty()) {
|
|
|
c6df5af |
SpkInputDevice->SetSelection(SpkInputDevice->FindString(devname));
|
|
|
c6df5af |
}
|
|
|
c6df5af |
|
|
|
c6df5af |
devname = wxGetApp().SpkOutputDevice;
|
|
|
c6df5af |
- if(devname) {
|
|
|
c6df5af |
+ if(!devname.IsEmpty()) {
|
|
|
c6df5af |
SpkOutputDevice->SetSelection(SpkOutputDevice->FindString(devname));
|
|
|
c6df5af |
}
|
|
|
c6df5af |
|
|
|
c6df5af |
diff -up iaxclient-2.1beta3/simpleclient/iaxcomm/directory.cc.wx3 iaxclient-2.1beta3/simpleclient/iaxcomm/directory.cc
|
|
|
c6df5af |
--- iaxclient-2.1beta3/simpleclient/iaxcomm/directory.cc.wx3 2008-04-07 12:05:34.000000000 -0400
|
|
|
c6df5af |
+++ iaxclient-2.1beta3/simpleclient/iaxcomm/directory.cc 2018-08-28 20:00:58.154154971 -0400
|
|
|
c6df5af |
@@ -373,7 +373,7 @@ void AddPhoneListDialog::OnBrowse(wxComm
|
|
|
c6df5af |
wxString dirHome;
|
|
|
c6df5af |
wxGetHomeDir(&dirHome);
|
|
|
c6df5af |
|
|
|
c6df5af |
- wxFileDialog where(NULL, _("Raw sound file"), dirHome, _T(""), _T("*.*"), wxOPEN );
|
|
|
c6df5af |
+ wxFileDialog where(NULL, _("Raw sound file"), dirHome, _T(""), _T("*.*"), wxFD_OPEN );
|
|
|
c6df5af |
where.ShowModal();
|
|
|
c6df5af |
|
|
|
c6df5af |
RingTone->SetValue(where.GetPath());
|
|
|
c6df5af |
diff -up iaxclient-2.1beta3/simpleclient/iaxcomm/Makefile.am.wx3 iaxclient-2.1beta3/simpleclient/iaxcomm/Makefile.am
|
|
|
c6df5af |
--- iaxclient-2.1beta3/simpleclient/iaxcomm/Makefile.am.wx3 2008-04-07 12:05:34.000000000 -0400
|
|
|
c6df5af |
+++ iaxclient-2.1beta3/simpleclient/iaxcomm/Makefile.am 2018-08-28 20:30:57.926972522 -0400
|
|
|
c6df5af |
@@ -30,7 +30,7 @@ rc/logo.xpm $(XRCS)
|
|
|
c6df5af |
|
|
|
c6df5af |
CLEANFILES = $(BUILT_SOURCES)
|
|
|
c6df5af |
|
|
|
c6df5af |
-AM_CPPFLAGS = -I$(top_srcdir)/lib $(WX_CPPFLAGS) -DIAXCOMM_VERSION=\"$(IAXCOMM_VERSION)\" -DXRCDIRECTORY=\"$(iaxcommdatadir)/rc\" -DDATADIR=\"$(iaxcommdatadir)\"
|
|
|
c6df5af |
+AM_CPPFLAGS = -I$(top_srcdir)/lib $(WX_CPPFLAGS) -DIAXCOMM_VERSION=\"$(IAXCOMM_VERSION)\" -DXRCDIRECTORY=\"$(iaxcommdatadir)/rc\" -DDATADIR=\"$(iaxcommdatadir)\" -DNDEBUG
|
|
|
c6df5af |
AM_CXXFLAGS = $(GDK2_CFLAGS) $(GTK_CFLAGS) $(WX_CXXFLAGS_ONLY)
|
|
|
c6df5af |
|
|
|
c6df5af |
LDADD = $(top_builddir)/lib/libiaxclient.la $(GTK_LIBS) $(WX_LIBS) \
|
|
|
c6df5af |
diff -up iaxclient-2.1beta3/simpleclient/iaxcomm/prefs.cc.wx3 iaxclient-2.1beta3/simpleclient/iaxcomm/prefs.cc
|
|
|
c6df5af |
--- iaxclient-2.1beta3/simpleclient/iaxcomm/prefs.cc.wx3 2008-04-07 12:05:34.000000000 -0400
|
|
|
c6df5af |
+++ iaxclient-2.1beta3/simpleclient/iaxcomm/prefs.cc 2018-08-28 20:00:27.769991328 -0400
|
|
|
c6df5af |
@@ -318,7 +318,7 @@ void PrefsDialog::OnBrowse(wxCommandEven
|
|
|
c6df5af |
wxString dirHome;
|
|
|
c6df5af |
wxGetHomeDir(&dirHome);
|
|
|
c6df5af |
|
|
|
c6df5af |
- wxFileDialog where(NULL, _("Raw sound file"), dirHome, _T(""), _T("*.*"), wxOPEN );
|
|
|
c6df5af |
+ wxFileDialog where(NULL, _("Raw sound file"), dirHome, _T(""), _T("*.*"), wxFD_OPEN );
|
|
|
c6df5af |
where.ShowModal();
|
|
|
c6df5af |
|
|
|
c6df5af |
if(event.GetId() == XRCID("BrowseRingBack"))
|
|
|
c6df5af |
diff -up iaxclient-2.1beta3/simpleclient/iaxcomm/rc/panel.xrc.wx3 iaxclient-2.1beta3/simpleclient/iaxcomm/rc/panel.xrc
|
|
|
c6df5af |
--- iaxclient-2.1beta3/simpleclient/iaxcomm/rc/panel.xrc.wx3 2008-04-07 12:05:32.000000000 -0400
|
|
|
c6df5af |
+++ iaxclient-2.1beta3/simpleclient/iaxcomm/rc/panel.xrc 2018-08-28 22:13:26.791498044 -0400
|
|
|
c6df5af |
@@ -889,7 +889,7 @@
|
|
|
c6df5af |
</object>
|
|
|
c6df5af |
<minsize>44,30</minsize>
|
|
|
c6df5af |
</object>
|
|
|
c6df5af |
- <growablecols>0,1,2,3</growablecols>
|
|
|
c6df5af |
+ <growablecols>0,1</growablecols>
|
|
|
c6df5af |
</object>
|
|
|
c6df5af |
<flag>wxGROW</flag>
|
|
|
c6df5af |
</object>
|
|
|
c6df5af |
@@ -904,7 +904,7 @@
|
|
|
c6df5af |
</object>
|
|
|
c6df5af |
<minsize>64,30</minsize>
|
|
|
c6df5af |
</object>
|
|
|
c6df5af |
- <growablecols>0,1,2,3</growablecols>
|
|
|
c6df5af |
+ <growablecols>0,1,2</growablecols>
|
|
|
c6df5af |
<object class="sizeritem">
|
|
|
c6df5af |
<flag>wxALL|wxGROW|wxALIGN_CENTRE</flag>
|
|
|
c6df5af |
<border>1</border>
|
|
|
c6df5af |
@@ -1032,11 +1032,11 @@
|
|
|
c6df5af |
<object class="sizeritem">
|
|
|
c6df5af |
<object class="wxFlexGridSizer">
|
|
|
c6df5af |
<cols>2</cols>
|
|
|
c6df5af |
- <growablecols>0,1,2,3</growablecols>
|
|
|
c6df5af |
+ <growablecols>0,1</growablecols>
|
|
|
c6df5af |
<object class="sizeritem">
|
|
|
c6df5af |
<object class="wxFlexGridSizer">
|
|
|
c6df5af |
<cols>1</cols>
|
|
|
c6df5af |
- <growablecols>0,1,2,3</growablecols>
|
|
|
c6df5af |
+ <growablecols>0</growablecols>
|
|
|
c6df5af |
<object class="sizeritem">
|
|
|
c6df5af |
<object class="wxButton" name="0">
|
|
|
c6df5af |
<label> </label>
|
|
|
c6df5af |
@@ -1083,7 +1083,7 @@
|
|
|
c6df5af |
<object class="sizeritem">
|
|
|
c6df5af |
<object class="wxFlexGridSizer">
|
|
|
c6df5af |
<cols>1</cols>
|
|
|
c6df5af |
- <growablecols>0,1,2,3</growablecols>
|
|
|
c6df5af |
+ <growablecols>0</growablecols>
|
|
|
c6df5af |
<object class="sizeritem">
|
|
|
c6df5af |
<object class="wxButton" name="5">
|
|
|
c6df5af |
<label></label>
|
|
|
c6df5af |
@@ -1138,4 +1138,4 @@
|
|
|
c6df5af |
<growablerows>1</growablerows>
|
|
|
c6df5af |
</object>
|
|
|
c6df5af |
</object>
|
|
|
c6df5af |
-</resource>
|
|
|
c6df5af |
\ No newline at end of file
|
|
|
c6df5af |
+</resource>
|
|
|
c6df5af |
diff -up iaxclient-2.1beta3/simpleclient/iaxphone/iaxphone.cc.wx3 iaxclient-2.1beta3/simpleclient/iaxphone/iaxphone.cc
|
|
|
c6df5af |
--- iaxclient-2.1beta3/simpleclient/iaxphone/iaxphone.cc.wx3 2018-08-22 23:48:33.066285080 -0400
|
|
|
c6df5af |
+++ iaxclient-2.1beta3/simpleclient/iaxphone/iaxphone.cc 2018-08-24 20:46:02.494650605 -0400
|
|
|
c6df5af |
@@ -424,7 +424,7 @@ void IAXFrame::CheckPTT()
|
|
|
c6df5af |
|
|
|
c6df5af |
void IAXFrame::OnDTMF(wxCommandEvent &evt)
|
|
|
c6df5af |
{
|
|
|
c6df5af |
- iaxc_send_dtmf(*buttonlabels[evt.m_id]);
|
|
|
c6df5af |
+ iaxc_send_dtmf(*buttonlabels[evt.GetId()]);
|
|
|
c6df5af |
}
|
|
|
c6df5af |
|
|
|
c6df5af |
void IAXFrame::OnDial(wxCommandEvent &evt)
|
|
|
c6df5af |
@@ -643,7 +643,7 @@ void IAXFrame::DialBySpeedDialName(wxStr
|
|
|
c6df5af |
} else {
|
|
|
c6df5af |
Destination = name;
|
|
|
c6df5af |
}
|
|
|
c6df5af |
- iaxc_call((char *)Destination.c_str());
|
|
|
c6df5af |
+ iaxc_call((const char *)Destination.c_str());
|
|
|
c6df5af |
}
|
|
|
c6df5af |
|
|
|
c6df5af |
BEGIN_EVENT_TABLE(IAXFrame, wxFrame)
|
|
|
c6df5af |
@@ -763,7 +763,7 @@ bool IAXClient::OnInit()
|
|
|
c6df5af |
}
|
|
|
c6df5af |
|
|
|
c6df5af |
if(!optDestination.IsEmpty())
|
|
|
c6df5af |
- iaxc_call((char *)optDestination.c_str());
|
|
|
c6df5af |
+ iaxc_call((const char *)optDestination.c_str());
|
|
|
c6df5af |
|
|
|
c6df5af |
return true;
|
|
|
c6df5af |
}
|
|
|
c6df5af |
@@ -818,7 +818,7 @@ extern "C" {
|
|
|
c6df5af |
AudioDialog::AudioDialog(wxWindow *parent, const wxString& title,
|
|
|
c6df5af |
const wxPoint& pos, const wxSize& size, const long WXUNUSED(style)) :
|
|
|
c6df5af |
wxDialog(parent, ID_AUDIO, title,
|
|
|
c6df5af |
- pos, size, wxDEFAULT_DIALOG_STYLE|wxDIALOG_MODAL)
|
|
|
c6df5af |
+ pos, size, wxDEFAULT_DIALOG_STYLE)
|
|
|
c6df5af |
{
|
|
|
c6df5af |
wxBoxSizer *dialogSizer = new wxBoxSizer(wxHORIZONTAL);
|
|
|
c6df5af |
wxFlexGridSizer *controlSizer = new wxFlexGridSizer(3,3,10,10);
|
|
|
c6df5af |
@@ -968,7 +968,7 @@ END_EVENT_TABLE()
|
|
|
c6df5af |
ServerDialog::ServerDialog(wxWindow *parent, const wxString& title,
|
|
|
c6df5af |
const wxPoint& pos, const wxSize& size, const long WXUNUSED(style)) :
|
|
|
c6df5af |
wxDialog(parent, ID_SERVER, title,
|
|
|
c6df5af |
- pos, size, wxDEFAULT_DIALOG_STYLE|wxDIALOG_MODAL)
|
|
|
c6df5af |
+ pos, size, wxDEFAULT_DIALOG_STYLE)
|
|
|
c6df5af |
{
|
|
|
c6df5af |
wxBoxSizer *dialogSizer = new wxBoxSizer(wxHORIZONTAL);
|
|
|
c6df5af |
wxFlexGridSizer *controlSizer = new wxFlexGridSizer(3,3,10,10);
|
|
|
c6df5af |
@@ -1099,7 +1099,7 @@ END_EVENT_TABLE()
|
|
|
c6df5af |
DialDialog::DialDialog(wxWindow *parent, const wxString& title,
|
|
|
c6df5af |
const wxPoint& pos, const wxSize& size, const long WXUNUSED(style)) :
|
|
|
c6df5af |
wxDialog(parent, ID_DIAL, title,
|
|
|
c6df5af |
- pos, size, wxDEFAULT_DIALOG_STYLE|wxDIALOG_MODAL)
|
|
|
c6df5af |
+ pos, size, wxDEFAULT_DIALOG_STYLE)
|
|
|
c6df5af |
{
|
|
|
c6df5af |
|
|
|
c6df5af |
wxBoxSizer *dialogSizer = new wxBoxSizer(wxHORIZONTAL);
|
|
|
c6df5af |
diff -up iaxclient-2.1beta3/simpleclient/wx/wx.cc.wx3 iaxclient-2.1beta3/simpleclient/wx/wx.cc
|
|
|
c6df5af |
--- iaxclient-2.1beta3/simpleclient/wx/wx.cc.wx3 2008-04-07 12:05:35.000000000 -0400
|
|
|
c6df5af |
+++ iaxclient-2.1beta3/simpleclient/wx/wx.cc 2018-08-28 19:49:23.491412552 -0400
|
|
|
c6df5af |
@@ -556,7 +556,7 @@ void IAXFrame::CheckPTT()
|
|
|
c6df5af |
void IAXFrame::OnDTMF(wxCommandEvent &evt)
|
|
|
c6df5af |
{
|
|
|
c6df5af |
|
|
|
c6df5af |
- iaxc_send_dtmf(*buttonlabels[evt.m_id]);
|
|
|
c6df5af |
+ iaxc_send_dtmf(*buttonlabels[evt.GetId()]);
|
|
|
c6df5af |
}
|
|
|
c6df5af |
|
|
|
c6df5af |
void IAXFrame::OnDial(wxCommandEvent& evt)
|
|
|
c6df5af |
@@ -607,7 +607,7 @@ void IAXFrame::OnRegisterMenu(wxCommandE
|
|
|
c6df5af |
wxTextEntryDialog dialog(this,
|
|
|
c6df5af |
wxString("Register with a remote asterisk server",wxConvUTF8),
|
|
|
c6df5af |
wxString("Format is user:password@hostname",wxConvUTF8),
|
|
|
c6df5af |
- wxString(wxGetApp().optRegistration,wxConvUTF8),
|
|
|
c6df5af |
+ wxGetApp().optRegistration,
|
|
|
c6df5af |
wxOK | wxCANCEL);
|
|
|
c6df5af |
|
|
|
c6df5af |
if(dialog.ShowModal() == wxID_OK)
|
|
|
c6df5af |
@@ -813,7 +813,7 @@ bool IAXClient::OnInit()
|
|
|
c6df5af |
}
|
|
|
c6df5af |
|
|
|
c6df5af |
if(!optDestination.IsEmpty())
|
|
|
c6df5af |
- iaxc_call((char *)optDestination.c_str());
|
|
|
c6df5af |
+ iaxc_call((const char *)optDestination.c_str());
|
|
|
c6df5af |
|
|
|
c6df5af |
|
|
|
c6df5af |
return true;
|