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

Unicode compilation fixes.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11661 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2001-09-21 20:21:44 +00:00
parent eb71219dd0
commit 4693b20c75
40 changed files with 428 additions and 354 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
samples/sockets/Makefile.in
View File

@@ -28,12 +28,15 @@ include ../../src/make.env
all: client@PROGRAM_EXT@ server@PROGRAM_EXT@
client@PROGRAM_EXT@: client.o ../../lib/@WX_TARGET_LIBRARY@
$(CC) $(LDFLAGS) -o client@PROGRAM_EXT@ client.o $(LDLIBS)
sockets_resources.o: sockets.rc
$(RESCOMP) $(RCINPUTSWITCH) $< $(RCOUTPUTSWITCH) $@ $(RESFLAGS)
client@PROGRAM_EXT@: client.o ../../lib/@WX_TARGET_LIBRARY@ sockets_resources.o
$(CC) $(LDFLAGS) -o client@PROGRAM_EXT@ sockets_resources.o client.o $(LDLIBS)
server@PROGRAM_EXT@: server.o ../../lib/@WX_TARGET_LIBRARY@
$(CC) $(LDFLAGS) -o server@PROGRAM_EXT@ server.o $(LDLIBS)
$(CC) $(LDFLAGS) -o server@PROGRAM_EXT@ sockets_resources.o server.o $(LDLIBS)
clean:
rm -f client@PROGRAM_EXT@ server@PROGRAM_EXT@ client.o server.o core
rm -f client@PROGRAM_EXT@ server@PROGRAM_EXT@ sockets_resources.o client.o server.o core

28
samples/sockets/client.cpp
View File

@@ -210,8 +210,7 @@ MyFrame::MyFrame() : wxFrame((wxFrame *)NULL, -1,
// Make a textctrl for logging
m_text = new wxTextCtrl(this, -1,
_("Welcome to wxSocket demo: Client\n"
"Client ready\n"),
_("Welcome to wxSocket demo: Client\nClient ready\n"),
wxDefaultPosition, wxDefaultSize,
wxTE_MULTILINE | wxTE_READONLY);
@@ -245,8 +244,7 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
{
wxMessageBox(_("wxSocket demo: Client\n"
"(c) 1999 Guillermo Rodriguez Garcia\n"),
wxMessageBox(_("wxSocket demo: Client\n(c) 1999 Guillermo Rodriguez Garcia\n"),
_("About Client"),
wxOK | wxICON_INFORMATION, this);
}
@@ -334,8 +332,8 @@ void MyFrame::OnOpenConnection(wxCommandEvent& WXUNUSED(event))
void MyFrame::OnTest1(wxCommandEvent& WXUNUSED(event))
{
const char *buf1;
char *buf2;
const wxChar *buf1;
wxChar *buf2;
unsigned char len;
// Disable socket menu entries (exception: Close Session)
@@ -363,8 +361,8 @@ void MyFrame::OnTest1(wxCommandEvent& WXUNUSED(event))
m_sock->SetFlags(wxSOCKET_WAITALL);
buf1 = _("Test string (less than 256 chars!)");
len = wxStrlen(buf1) + 1;
buf2 = new char[len];
len = (wxStrlen(buf1) + 1) * sizeof(wxChar);
buf2 = new wxChar[wxStrlen(buf1) + 1];
m_text->AppendText(_("Sending a test buffer to the server ..."));
m_sock->Write(&len, 1);
@@ -395,8 +393,8 @@ void MyFrame::OnTest1(wxCommandEvent& WXUNUSED(event))
void MyFrame::OnTest2(wxCommandEvent& WXUNUSED(event))
{
char *msg1;
char *msg2;
const wxChar *msg1;
wxChar *msg2;
size_t len;
// Disable socket menu entries (exception: Close Session)
@@ -423,9 +421,9 @@ void MyFrame::OnTest2(wxCommandEvent& WXUNUSED(event))
_("Test 2 ..."),
_("Yes I like wxWindows!"));
msg1 = (char *)s.c_str();
len = wxStrlen(msg1) + 1;
msg2 = new char[len];
msg1 = s.c_str();
len = (wxStrlen(msg1) + 1) * sizeof(wxChar);
msg2 = new wxChar[wxStrlen(msg1) + 1];
m_text->AppendText(_("Sending the string with WriteMsg ..."));
m_sock->WriteMsg(msg1, len);
@@ -566,9 +564,7 @@ void MyFrame::OnTestURL(wxCommandEvent& WXUNUSED(event))
// Print the contents type and file size
wxString s;
s.Printf(_("Contents type: %s\n"
"File size: %i\n"
"Starting to download...\n"),
s.Printf(_("Contents type: %s\nFile size: %i\nStarting to download...\n"),
url.GetProtocol().GetContentType().c_str(),
data->GetSize());
m_text->AppendText(s);

4
samples/sockets/makefile.vc
View File

@@ -11,8 +11,8 @@
!include $(WXWIN)/src/makevc.env
all:
nmake -f server.vc FINAL=$(FINAL)
nmake -f client.vc FINAL=$(FINAL)
nmake -f server.vc FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
nmake -f client.vc FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
clean:
nmake -f server.vc clean

7
samples/sockets/server.cpp
View File

@@ -216,8 +216,7 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
{
wxMessageBox(_("wxSocket demo: Server\n"
"(c) 1999 Guillermo Rodriguez Garcia\n"),
wxMessageBox(_("wxSocket demo: Server\n(c) 1999 Guillermo Rodriguez Garcia\n"),
_("About Server"),
wxOK | wxICON_INFORMATION, this);
}
@@ -257,7 +256,7 @@ void MyFrame::Test2(wxSocketBase *sock)
#define MAX_MSG_SIZE 10000
wxString s;
char *buf = new char[MAX_MSG_SIZE];
wxChar *buf = new wxChar[MAX_MSG_SIZE];
wxUint32 len;
m_text->AppendText(_("Test 2 begins\n"));
@@ -266,7 +265,7 @@ void MyFrame::Test2(wxSocketBase *sock)
// are not affected by them anyway.
// Read the message
len = sock->ReadMsg(buf, MAX_MSG_SIZE).LastCount();
len = sock->ReadMsg(buf, MAX_MSG_SIZE * sizeof(wxChar)).LastCount();
s.Printf(_("Client says: %s\n"), buf);
m_text->AppendText(s);
m_text->AppendText(_("Sending the data back\n"));