// Author: Julian Smart
// Modified by: Jurgen Doornik
// Created: 25/01/99
-// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// we're using TCP/IP or real DDE.
#include "ipcsetup.h"
-#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__)
-#include "mondrian.xpm"
-#endif
-
#include "wx/datetime.h"
#include "client.h"
+#ifndef wxHAS_IMAGES_IN_RESOURCES
+ #include "../sample.xpm"
+#endif
+
// ----------------------------------------------------------------------------
// wxWin macros
// ----------------------------------------------------------------------------
return false;
// Create the main frame window
- m_frame = new MyFrame(NULL, _T("Client"));
+ m_frame = new MyFrame(NULL, wxT("Client"));
m_frame->Show(true);
return true;
: wxFrame(frame, wxID_ANY, title, wxDefaultPosition, wxSize(400, 300))
{
// Give it an icon
- SetIcon(wxICON(mondrian));
+ SetIcon(wxICON(sample));
// Make a menubar
wxMenu *file_menu = new wxMenu;
- file_menu->Append(wxID_EXIT, _T("&Quit\tCtrl-Q"));
+ file_menu->Append(wxID_EXIT, wxT("&Quit\tCtrl-Q"));
wxMenuBar *menu_bar = new wxMenuBar;
- menu_bar->Append(file_menu, _T("&File"));
+ menu_bar->Append(file_menu, wxT("&File"));
// Associate the menu bar with the frame
SetMenuBar(menu_bar);
// add the controls to the frame
wxString strs4[] =
{
- IPC_SERVICE, _T("...")
+ IPC_SERVICE, wxT("...")
};
wxString strs5[] =
{
- IPC_HOST, _T("...")
+ IPC_HOST, wxT("...")
};
wxString strs6[] =
{
- IPC_TOPIC, _T("...")
+ IPC_TOPIC, wxT("...")
};
wxBoxSizer *item0 = new wxBoxSizer( wxVERTICAL );
GetTopic()->SetSelection(0);
wxLogTextCtrl *logWindow = new wxLogTextCtrl(GetLog());
delete wxLog::SetActiveTarget(logWindow);
- wxLogMessage(_T("Click on Connect to connect to the server"));
+ wxLogMessage(wxT("Click on Connect to connect to the server"));
EnableControls();
}
void MyFrame::OnClose(wxCloseEvent& event)
{
- if (m_client)
- {
- delete m_client;
- m_client = NULL;
- }
+ wxDELETE(m_client);
+
event.Skip();
}
m_client = new MyClient;
bool retval = m_client->Connect(hostname, servername, topic);
- wxLogMessage(_T("Client host=\"%s\" port=\"%s\" topic=\"%s\" %s"),
+ wxLogMessage(wxT("Client host=\"%s\" port=\"%s\" topic=\"%s\" %s"),
hostname.c_str(), servername.c_str(), topic.c_str(),
- retval ? _T("connected") : _T("failed to connect"));
+ retval ? wxT("connected") : wxT("failed to connect"));
if (!retval)
{
- delete m_client;
- m_client = NULL;
+ wxDELETE(m_client);
}
EnableControls();
}
void MyFrame::OnServername( wxCommandEvent& WXUNUSED(event) )
{
- if (GetServername()->GetStringSelection() == _T("..."))
+ if (GetServername()->GetStringSelection() == wxT("..."))
{
- wxString s = wxGetTextFromUser(_T("Specify the name of the server"),
- _T("Server Name"), wxEmptyString, this);
+ wxString s = wxGetTextFromUser(wxT("Specify the name of the server"),
+ wxT("Server Name"), wxEmptyString, this);
if (!s.IsEmpty() && s != IPC_SERVICE)
{
GetServername()->Insert(s, 0);
void MyFrame::OnHostname( wxCommandEvent& WXUNUSED(event) )
{
- if (GetHostname()->GetStringSelection() == _T("..."))
+ if (GetHostname()->GetStringSelection() == wxT("..."))
{
- wxString s = wxGetTextFromUser(_T("Specify the name of the host (ignored under DDE)"),
- _T("Host Name"), wxEmptyString, this);
+ wxString s = wxGetTextFromUser(wxT("Specify the name of the host (ignored under DDE)"),
+ wxT("Host Name"), wxEmptyString, this);
if (!s.IsEmpty() && s != IPC_HOST)
{
GetHostname()->Insert(s, 0);
void MyFrame::OnTopic( wxCommandEvent& WXUNUSED(event) )
{
- if (GetTopic()->GetStringSelection() == _T("..."))
+ if (GetTopic()->GetStringSelection() == wxT("..."))
{
- wxString s = wxGetTextFromUser(_T("Specify the name of the topic"),
- _T("Topic Name"), wxEmptyString, this);
+ wxString s = wxGetTextFromUser(wxT("Specify the name of the topic"),
+ wxT("Topic Name"), wxEmptyString, this);
if (!s.IsEmpty() && s != IPC_TOPIC)
{
GetTopic()->Insert(s, 0);
void MyFrame::Disconnect()
{
- delete m_client;
- m_client = NULL;
+ wxDELETE(m_client);
EnableControls();
}
void MyFrame::OnStartAdvise(wxCommandEvent& WXUNUSED(event))
{
- m_client->GetConnection()->StartAdvise(_T("something"));
+ m_client->GetConnection()->StartAdvise(wxT("something"));
}
void MyFrame::OnStopAdvise(wxCommandEvent& WXUNUSED(event))
{
- m_client->GetConnection()->StopAdvise(_T("something"));
+ m_client->GetConnection()->StopAdvise(wxT("something"));
}
void MyFrame::OnExecute(wxCommandEvent& WXUNUSED(event))
{
if (m_client->IsConnected())
{
- wxString s = _T("Date");
+ wxString s = wxT("Date");
- m_client->GetConnection()->Execute((const wxChar *)s.c_str());
- m_client->GetConnection()->Execute((const wxChar *)s.c_str(), (s.Length() + 1) * sizeof(wxChar));
-#if wxUSE_DDE_FOR_IPC
- wxLogMessage(_T("DDE Execute can only be used to send text strings, not arbitrary data.\nThe type argument will be ignored, text truncated, converted to Unicode and null terminated."));
-#endif
+ m_client->GetConnection()->Execute(s);
+ m_client->GetConnection()->Execute((const char *)s.c_str(), s.length() + 1);
char bytes[3];
- bytes[0] = '1'; bytes[1] = '2'; bytes[2] = '3';
- m_client->GetConnection()->Execute((wxChar *)bytes, 3, wxIPC_PRIVATE);
+ bytes[0] = '1';
+ bytes[1] = '2';
+ bytes[2] = '3';
+ m_client->GetConnection()->Execute(bytes, WXSIZEOF(bytes));
}
}
if (m_client->IsConnected())
{
wxString s = wxDateTime::Now().Format();
- m_client->GetConnection()->Poke(_T("Date"), (const wxChar *)s.c_str());
- s = wxDateTime::Now().FormatTime() + _T(" ") + wxDateTime::Now().FormatDate();
- m_client->GetConnection()->Poke(_T("Date"), (const wxChar *)s.c_str(), (s.Length() + 1) * sizeof(wxChar));
+ m_client->GetConnection()->Poke(wxT("Date"), s);
+ s = wxDateTime::Now().FormatTime() + wxT(" ") + wxDateTime::Now().FormatDate();
+ m_client->GetConnection()->Poke(wxT("Date"), (const char *)s.c_str(), s.length() + 1);
char bytes[3];
bytes[0] = '1'; bytes[1] = '2'; bytes[2] = '3';
- m_client->GetConnection()->Poke(_T("bytes[3]"), (wxChar *)bytes, 3, wxIPC_PRIVATE);
+ m_client->GetConnection()->Poke(wxT("bytes[3]"), bytes, 3, wxIPC_PRIVATE);
}
}
{
if (m_client->IsConnected())
{
- int size;
- m_client->GetConnection()->Request(_T("Date"));
- m_client->GetConnection()->Request(_T("Date+len"), &size);
- m_client->GetConnection()->Request(_T("bytes[3]"), &size, wxIPC_PRIVATE);
+ size_t size;
+ m_client->GetConnection()->Request(wxT("Date"));
+ m_client->GetConnection()->Request(wxT("Date+len"), &size);
+ m_client->GetConnection()->Request(wxT("bytes[3]"), &size, wxIPC_PRIVATE);
}
}
if (m_connection)
{
m_connection->Disconnect();
- delete m_connection;
- m_connection = NULL;
+ wxDELETE(m_connection);
wxGetApp().GetFrame()->EnableControls();
- wxLogMessage(_T("Client disconnected from server"));
+ wxLogMessage(wxT("Client disconnected from server"));
}
}
// MyConnection
// ----------------------------------------------------------------------------
-void MyConnection::Log(const wxString& command, const wxString& topic,
- const wxString& item, const wxChar *data, int size, wxIPCFormat format)
+bool MyConnection::OnAdvise(const wxString& topic, const wxString& item, const void *data,
+ size_t size, wxIPCFormat format)
{
- wxString s;
- if (topic.IsEmpty() && item.IsEmpty())
- s.Printf(_T("%s("), command.c_str());
- else if (topic.IsEmpty())
- s.Printf(_T("%s(item=\"%s\","), command.c_str(), item.c_str());
- else if (item.IsEmpty())
- s.Printf(_T("%s(topic=\"%s\","), command.c_str(), topic.c_str());
- else
- 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.c_str(), data, size);
- else if (format == wxIPC_PRIVATE)
- {
- if (size == 3)
- {
- char *bytes = (char *)data;
- wxLogMessage(_T("%s'%c%c%c',%d)"), s.c_str(), bytes[0], bytes[1], bytes[2], size);
- }
- else
- wxLogMessage(_T("%s...,%d)"), s.c_str(), 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,
- int size, wxIPCFormat format)
-{
- Log(_T("OnAdvise"), topic, item, data, size, format);
+ Log(wxT("OnAdvise"), topic, item, data, size, format);
return true;
}
bool MyConnection::OnDisconnect()
{
- wxLogMessage(_T("OnDisconnect()"));
+ wxLogMessage(wxT("OnDisconnect()"));
wxGetApp().GetFrame()->Disconnect();
return true;
}
-bool MyConnection::Execute(const wxChar *data, int size, wxIPCFormat format)
+bool MyConnection::DoExecute(const void *data, size_t size, wxIPCFormat format)
{
- Log(_T("Execute"), wxEmptyString, wxEmptyString, (wxChar *)data, size, format);
- bool retval = wxConnection::Execute(data, size, format);
+ Log(wxT("Execute"), wxEmptyString, wxEmptyString, data, size, format);
+ bool retval = wxConnection::DoExecute(data, size, format);
if (!retval)
- wxLogMessage(_T("Execute failed!"));
+ {
+ wxLogMessage(wxT("Execute failed!"));
+ }
return retval;
}
-wxChar *MyConnection::Request(const wxString& item, int *size, wxIPCFormat format)
+const void *MyConnection::Request(const wxString& item, size_t *size, wxIPCFormat format)
{
- wxChar *data = wxConnection::Request(item, size, format);
- Log(_T("Request"), wxEmptyString, item, data, size ? *size : -1, format);
+ const void *data = wxConnection::Request(item, size, format);
+ Log(wxT("Request"), wxEmptyString, item, data, size ? *size : wxNO_LEN, format);
return data;
}
-bool MyConnection::Poke(const wxString& item, const wxChar *data, int size, wxIPCFormat format)
+bool MyConnection::DoPoke(const wxString& item, const void *data, size_t size, wxIPCFormat format)
{
- Log(_T("Poke"), wxEmptyString, item, data, size, format);
- return wxConnection::Poke(item, data, size, format);
+ Log(wxT("Poke"), wxEmptyString, item, data, size, format);
+ return wxConnection::DoPoke(item, data, size, format);
}
projects / wxWidgets.git / blobdiff