Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed all remaining samples/Unicode compilation errors.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18241 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2002-12-15 17:25:36 +00:00
parent ee682a94cb
commit 600683ca05
22 changed files with 480 additions and 482 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
samples/ipc/client.cpp
View File

@@ -76,7 +76,7 @@ bool MyApp::OnInit()
wxString service = IPC_SERVICE;
// ignored under DDE, host name in TCP/IP based classes
wxString hostName = "localhost";
wxString hostName = _T("localhost");
if (argc > 1)
service = argv[1];
@@ -94,23 +94,23 @@ bool MyApp::OnInit()
while ( !the_connection )
{
if ( wxMessageBox("Failed to make connection to server.\nRetry?",
"Client Demo Error",
if ( wxMessageBox(_T("Failed to make connection to server.\nRetry?"),
_T("Client Demo Error"),
wxICON_ERROR | wxYES_NO | wxCANCEL ) != wxYES )
{
// no server
return FALSE;
}
the_connection = (MyConnection *)my_client->MakeConnection(hostName, service, "IPC TEST");
the_connection = (MyConnection *)my_client->MakeConnection(hostName, service, _T("IPC TEST"));
}
}
if (!the_connection->StartAdvise(IPC_ADVISE_NAME))
wxMessageBox("StartAdvise failed", "Client Demo Error");
wxMessageBox(_T("StartAdvise failed"), _T("Client Demo Error"));
// Create the main frame window
(new MyFrame(NULL, "Client"))->Show(TRUE);
(new MyFrame(NULL, _T("Client")))->Show(TRUE);
return TRUE;
}
@@ -139,50 +139,50 @@ MyFrame::MyFrame(wxFrame *frame, const wxString& title)
// Make a menubar
wxMenu *file_menu = new wxMenu;
file_menu->Append(CLIENT_EXECUTE, "&Execute\tCtrl-E");
file_menu->Append(CLIENT_REQUEST, "&Request\tCtrl-R");
file_menu->Append(CLIENT_POKE, "&Poke\tCtrl-P");
file_menu->Append(CLIENT_QUIT, "&Quit\tCtrl-Q");
file_menu->Append(CLIENT_EXECUTE, _T("&Execute\tCtrl-E"));
file_menu->Append(CLIENT_REQUEST, _T("&Request\tCtrl-R"));
file_menu->Append(CLIENT_POKE, _T("&Poke\tCtrl-P"));
file_menu->Append(CLIENT_QUIT, _T("&Quit\tCtrl-Q"));
wxMenuBar *menu_bar = new wxMenuBar;
menu_bar->Append(file_menu, "&File");
menu_bar->Append(file_menu, _T("&File"));
// Associate the menu bar with the frame
SetMenuBar(menu_bar);
// Make a listbox which shows the choices made in the server
the_list = new wxListBox(this, CLIENT_LISTBOX, wxPoint(5, 5));
the_list->Append("Apple");
the_list->Append("Pear");
the_list->Append("Orange");
the_list->Append("Banana");
the_list->Append("Fruit");
the_list->Append(_T("Apple"));
the_list->Append(_T("Pear"));
the_list->Append(_T("Orange"));
the_list->Append(_T("Banana"));
the_list->Append(_T("Fruit"));
}
void MyFrame::OnExecute(wxCommandEvent& event)
{
if (the_connection)
if (!the_connection->Execute("Hello from the client!"))
wxMessageBox("Execute failed", "Client Demo Error");
if (!the_connection->Execute(_T("Hello from the client!")))
wxMessageBox(_T("Execute failed"), _T("Client Demo Error"));
}
void MyFrame::OnPoke(wxCommandEvent& event)
{
if (the_connection)
if (!the_connection->Poke("An item", "Some data to poke at the server!"))
wxMessageBox("Poke failed", "Client Demo Error");
if (!the_connection->Poke(_T("An item"), _T("Some data to poke at the server!")))
wxMessageBox(_T("Poke failed"), _T("Client Demo Error"));
}
void MyFrame::OnRequest(wxCommandEvent& event)
{
if (the_connection)
{
char *data = the_connection->Request("An item");
wxChar *data = the_connection->Request(_T("An item"));
if (data)
wxMessageBox(data, "Client: Request", wxOK);
wxMessageBox(data, _T("Client: Request"), wxOK);
else
wxMessageBox("Request failed", "Client Demo Error");
wxMessageBox(_T("Request failed"), _T("Client Demo Error"));
}
}
@@ -196,7 +196,7 @@ wxConnectionBase *MyClient::OnMakeConnection()
return new MyConnection;
}
bool MyConnection::OnAdvise(const wxString& topic, const wxString& item, char *data, int size, wxIPCFormat format)
bool MyConnection::OnAdvise(const wxString& topic, const wxString& item, wxChar *data, int size, wxIPCFormat format)
{
if (the_list)
{

2
samples/ipc/client.h
View File

@@ -37,7 +37,7 @@ private:
class MyConnection: public wxConnection
{
public:
bool OnAdvise(const wxString& topic, const wxString& item, char *data, int size, wxIPCFormat format);
bool OnAdvise(const wxString& topic, const wxString& item, wxChar *data, int size, wxIPCFormat format);
bool OnDisconnect();
};

6
samples/ipc/ddesetup.h
View File

@@ -15,10 +15,10 @@
#include <wx/ipc.h>
// the default service name
#define IPC_SERVICE "4242"
#define IPC_SERVICE _T("4242")
// the IPC topic
#define IPC_TOPIC "IPC TEST"
#define IPC_TOPIC _T("IPC TEST")
// the name of the item we're being advised about
#define IPC_ADVISE_NAME "Item"
#define IPC_ADVISE_NAME _T("Item")

30
samples/ipc/server.cpp
View File

@@ -70,7 +70,7 @@ MyConnection *the_connection = NULL;
bool MyApp::OnInit()
{
// Create the main frame window
(new MyFrame(NULL, "Server"))->Show(TRUE);
(new MyFrame(NULL, _T("Server")))->Show(TRUE);
// service name (DDE classes) or port number (TCP/IP based classes)
wxString service = IPC_SERVICE;
@@ -108,22 +108,22 @@ MyFrame::MyFrame(wxFrame *frame, const wxString& title)
// Make a menubar
wxMenu *file_menu = new wxMenu;
file_menu->Append(SERVER_EXIT, "&Quit\tCtrl-Q");
file_menu->Append(SERVER_EXIT, _T("&Quit\tCtrl-Q"));
wxMenuBar *menu_bar = new wxMenuBar;
menu_bar->Append(file_menu, "&File");
menu_bar->Append(file_menu, _T("&File"));
// Associate the menu bar with the frame
SetMenuBar(menu_bar);
// Make a listbox
wxListBox *list = new wxListBox(this, SERVER_LISTBOX, wxPoint(5, 5));
list->Append("Apple");
list->Append("Pear");
list->Append("Orange");
list->Append("Banana");
list->Append("Fruit");
list->Append(_T("Apple"));
list->Append(_T("Pear"));
list->Append(_T("Orange"));
list->Append(_T("Banana"));
list->Append(_T("Fruit"));
}
// Set the client process's listbox to this item
@@ -138,7 +138,7 @@ void MyFrame::OnListBoxClick(wxCommandEvent& WXUNUSED(event))
one connection can receive advise messages */
if (the_connection)
{
the_connection->Advise(IPC_ADVISE_NAME, (wxChar *)value.c_str());
the_connection->Advise(IPC_ADVISE_NAME, (wxChar*)value.c_str());
}
}
}
@@ -158,7 +158,7 @@ IPCDialogBox::IPCDialogBox(wxWindow *parent, const wxString& title,
: wxDialog(parent, -1, title, pos, size)
{
m_connection = connection;
(void)new wxButton(this, SERVER_QUIT_BUTTON, "Quit this connection",
(void)new wxButton(this, SERVER_QUIT_BUTTON, _T("Quit this connection"),
wxPoint(5, 5));
Fit();
}
@@ -197,7 +197,7 @@ wxConnectionBase *MyServer::OnAcceptConnection(const wxString& topic)
MyConnection::MyConnection()
: wxConnection()
{
dialog = new IPCDialogBox(wxTheApp->GetTopWindow(), "Connection",
dialog = new IPCDialogBox(wxTheApp->GetTopWindow(), _T("Connection"),
wxPoint(100, 100), wxSize(500, 500), this);
dialog->Show(TRUE);
the_connection = this;
@@ -217,7 +217,7 @@ MyConnection::~MyConnection()
}
bool MyConnection::OnExecute(const wxString& WXUNUSED(topic),
char *data,
wxChar *data,
int WXUNUSED(size),
wxIPCFormat WXUNUSED(format))
{
@@ -227,7 +227,7 @@ bool MyConnection::OnExecute(const wxString& WXUNUSED(topic),
bool MyConnection::OnPoke(const wxString& WXUNUSED(topic),
const wxString& item,
char *data,
wxChar *data,
int WXUNUSED(size),
wxIPCFormat WXUNUSED(format))
{
@@ -235,12 +235,12 @@ bool MyConnection::OnPoke(const wxString& WXUNUSED(topic),
return TRUE;
}
char *MyConnection::OnRequest(const wxString& WXUNUSED(topic),
wxChar *MyConnection::OnRequest(const wxString& WXUNUSED(topic),
const wxString& WXUNUSED(item),
int * WXUNUSED(size),
wxIPCFormat WXUNUSED(format))
{
return "Here, have your data, client!";
return _T("Here, have your data, client!");
}
bool MyConnection::OnStartAdvise(const wxString& WXUNUSED(topic),

6
samples/ipc/server.h
View File

@@ -45,9 +45,9 @@ public:
MyConnection();
~MyConnection();
bool OnExecute(const wxString& topic, char *data, int size, wxIPCFormat format);
char *OnRequest(const wxString& topic, const wxString& item, int *size, wxIPCFormat format);
bool OnPoke(const wxString& topic, const wxString& item, char *data, int size, wxIPCFormat format);
bool OnExecute(const wxString& topic, wxChar *data, int size, wxIPCFormat format);
wxChar *OnRequest(const wxString& topic, const wxString& item, int *size, wxIPCFormat format);
bool OnPoke(const wxString& topic, const wxString& item, wxChar *data, int size, wxIPCFormat format);
bool OnStartAdvise(const wxString& topic, const wxString& item);
IPCDialogBox *dialog;