SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE));
// add the controls to the frame
- wxString strs4[] =
+ wxString strs4[] =
{
IPC_SERVICE, _T("...")
};
- wxString strs5[] =
+ wxString strs5[] =
{
IPC_HOST, _T("...")
};
- wxString strs6[] =
+ wxString strs6[] =
{
IPC_TOPIC, _T("...")
};
wxStaticBox *item14 = new wxStaticBox( this, -1, wxT("Client log") );
wxStaticBoxSizer *item13 = new wxStaticBoxSizer( item14, wxVERTICAL );
- wxTextCtrl *item15 = new wxTextCtrl( this, ID_LOG, wxT(""), wxDefaultPosition, wxSize(500,140), wxTE_MULTILINE );
+ wxTextCtrl *item15 = new wxTextCtrl( this, ID_LOG, wxEmptyString, wxDefaultPosition, wxSize(500,140), wxTE_MULTILINE );
item13->Add( item15, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
item0->Add( item13, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
wxLogTextCtrl *logWindow = new wxLogTextCtrl(GetLog());
delete wxLog::SetActiveTarget(logWindow);
wxLogMessage(_T("Click on Connect to connect to the server"));
- Enable();
+ EnableControls();
}
-void MyFrame::Enable()
+void MyFrame::EnableControls()
{
GetStart()->Enable(m_client == NULL);
GetServername()->Enable(m_client == NULL);
GetHostname()->Enable(m_client == NULL);
GetTopic()->Enable(m_client == NULL);
- GetDisconnect()->Enable(m_client && m_client->IsConnected() != NULL);
- GetStartAdvise()->Enable(m_client && m_client->IsConnected() != NULL);
- GetStopAdvise()->Enable(m_client && m_client->IsConnected() != NULL);
- GetExecute()->Enable(m_client && m_client->IsConnected() != NULL);
- GetPoke()->Enable(m_client && m_client->IsConnected() != NULL);
- GetRequest()->Enable(m_client && m_client->IsConnected() != NULL);
+
+ const bool isConnected = (m_client != NULL && m_client->IsConnected());
+ GetDisconnect()->Enable(m_client != NULL && isConnected);
+ GetStartAdvise()->Enable(m_client != NULL && isConnected);
+ GetStopAdvise()->Enable(m_client != NULL && isConnected);
+ GetExecute()->Enable(m_client != NULL && isConnected);
+ GetPoke()->Enable(m_client != NULL && isConnected);
+ GetRequest()->Enable(m_client != NULL && isConnected);
}
void MyFrame::OnClose(wxCloseEvent& event)
delete m_client;
m_client = NULL;
}
- Enable();
+ EnableControls();
}
void MyFrame::OnServername( wxCommandEvent& WXUNUSED(event) )
if (GetServername()->GetStringSelection() == _T("..."))
{
wxString s = wxGetTextFromUser(_T("Specify the name of the server"),
- _T("Server Name"), _(""), this);
+ _T("Server Name"), wxEmptyString, this);
if (!s.IsEmpty() && s != IPC_SERVICE)
{
GetServername()->Insert(s, 0);
if (GetHostname()->GetStringSelection() == _T("..."))
{
wxString s = wxGetTextFromUser(_T("Specify the name of the host (ignored under DDE)"),
- _T("Host Name"), _(""), this);
+ _T("Host Name"), wxEmptyString, this);
if (!s.IsEmpty() && s != IPC_HOST)
{
GetHostname()->Insert(s, 0);
if (GetTopic()->GetStringSelection() == _T("..."))
{
wxString s = wxGetTextFromUser(_T("Specify the name of the topic"),
- _T("Topic Name"), _(""), this);
+ _T("Topic Name"), wxEmptyString, this);
if (!s.IsEmpty() && s != IPC_TOPIC)
{
GetTopic()->Insert(s, 0);
void MyFrame::OnDisconnect(wxCommandEvent& WXUNUSED(event))
{
- Disconnect();
+ Disconnect();
}
void MyFrame::Disconnect()
{
- delete m_client;
+ delete m_client;
m_client = NULL;
- Enable();
+ EnableControls();
}
void MyFrame::OnStartAdvise(wxCommandEvent& WXUNUSED(event))
{
- m_client->GetConnection()->StartAdvise(_T("something"));
+ m_client->GetConnection()->StartAdvise(_T("something"));
}
void MyFrame::OnStopAdvise(wxCommandEvent& WXUNUSED(event))
{
- m_client->GetConnection()->StopAdvise(_T("something"));
+ m_client->GetConnection()->StopAdvise(_T("something"));
}
void MyFrame::OnExecute(wxCommandEvent& WXUNUSED(event))
{
// suppress the log messages from MakeConnection()
wxLogNull nolog;
-
+
m_connection = (MyConnection *)MakeConnection(sHost, sService, sTopic);
return m_connection != NULL;
}
m_connection->Disconnect();
delete m_connection;
m_connection = NULL;
- wxGetApp().GetFrame()->Enable();
+ wxGetApp().GetFrame()->EnableControls();
wxLogMessage(_T("Client disconnected from server"));
}
}
{
wxString s;
if (topic.IsEmpty() && item.IsEmpty())
- s.Printf(_T("%s("), command);
+ s.Printf(_T("%s("), command.c_str());
else if (topic.IsEmpty())
- s.Printf(_T("%s(item=\"%s\","), command, item);
+ s.Printf(_T("%s(item=\"%s\","), command.c_str(), item.c_str());
else if (item.IsEmpty())
- s.Printf(_T("%s(topic=\"%s\","), command, topic);
+ s.Printf(_T("%s(topic=\"%s\","), command.c_str(), topic.c_str());
else
- s.Printf(_T("%s(topic=\"%s\",item=\"%s\","), command, topic, item);
+ s.Printf(_T("%s(topic=\"%s\",item=\"%s\","), command.c_str(), topic.c_str(), item.c_str());
- if (format == wxIPC_TEXT || format == wxIPC_UNICODETEXT)
- wxLogMessage(_T("%s\"%s\",%d)"), s, data, size);
+ if (format == wxIPC_TEXT || format == wxIPC_UNICODETEXT)
+ wxLogMessage(_T("%s\"%s\",%d)"), s.c_str(), data, size);
else if (format == wxIPC_PRIVATE)
{
if (size == 3)
{
char *bytes = (char *)data;
- wxLogMessage(_T("%s'%c%c%c',%d)"), s, bytes[0], bytes[1], bytes[2], size);
+ wxLogMessage(_T("%s'%c%c%c',%d)"), s.c_str(), bytes[0], bytes[1], bytes[2], size);
}
else
- wxLogMessage(_T("%s...,%d)"), s, size);
+ wxLogMessage(_T("%s...,%d)"), s.c_str(), size);
}
- else if (format == wxIPC_INVALID)
- wxLogMessage(_T("%s[invalid data],%d)"), s, size);
+ else if (format == wxIPC_INVALID)
+ wxLogMessage(_T("%s[invalid data],%d)"), s.c_str(), size);
}
bool MyConnection::OnAdvise(const wxString& topic, const wxString& item, wxChar *data,
bool MyConnection::Execute(const wxChar *data, int size, wxIPCFormat format)
{
- Log(_T("Execute"), _T(""), _T(""), (wxChar *)data, size, format);
+ Log(_T("Execute"), wxEmptyString, wxEmptyString, (wxChar *)data, size, format);
bool retval = wxConnection::Execute(data, size, format);
if (!retval)
wxLogMessage(_T("Execute failed!"));
wxChar *MyConnection::Request(const wxString& item, int *size, wxIPCFormat format)
{
wxChar *data = wxConnection::Request(item, size, format);
- Log(_T("Request"), _T(""), item, data, size ? *size : -1, format);
+ Log(_T("Request"), wxEmptyString, item, data, size ? *size : -1, format);
return data;
}
bool MyConnection::Poke(const wxString& item, wxChar *data, int size, wxIPCFormat format)
{
- Log(_T("Poke"), _T(""), item, data, size, format);
+ Log(_T("Poke"), wxEmptyString, item, data, size, format);
return wxConnection::Poke(item, data, size, format);
}
-