projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added headers that didn't get installed.
[wxWidgets.git]
/
samples
/
sockets
/
client.cpp
diff --git
a/samples/sockets/client.cpp
b/samples/sockets/client.cpp
index 2bbe2a99492cb9f4c43e7ff9e316daee1b219713..3ba76e9bf276ac112d581ccab46e6f628632aa3b 100644
(file)
--- a/
samples/sockets/client.cpp
+++ b/
samples/sockets/client.cpp
@@
-17,7
+17,7
@@
// headers
// --------------------------------------------------------------------------
// headers
// --------------------------------------------------------------------------
-#if
def __GNUG__
+#if
defined(__GNUG__) && !defined(__APPLE__)
# pragma implementation "client.cpp"
# pragma interface "client.cpp"
#endif
# pragma implementation "client.cpp"
# pragma interface "client.cpp"
#endif
@@
-43,7
+43,7
@@
// --------------------------------------------------------------------------
// the application icon
// --------------------------------------------------------------------------
// the application icon
-#if defined(__WXGTK__) || defined(__WX
MOTIF
__)
+#if defined(__WXGTK__) || defined(__WX
X11__) || defined(__WXMOTIF__) || defined(__WXMAC
__)
# include "mondrian.xpm"
#endif
# include "mondrian.xpm"
#endif
@@
-210,8
+210,7
@@
MyFrame::MyFrame() : wxFrame((wxFrame *)NULL, -1,
// Make a textctrl for logging
m_text = new wxTextCtrl(this, -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);
wxDefaultPosition, wxDefaultSize,
wxTE_MULTILINE | wxTE_READONLY);
@@
-245,8
+244,7
@@
void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
void MyFrame::OnAbout(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);
}
_("About Client"),
wxOK | wxICON_INFORMATION, this);
}
@@
-334,8
+332,8
@@
void MyFrame::OnOpenConnection(wxCommandEvent& WXUNUSED(event))
void MyFrame::OnTest1(wxCommandEvent& WXUNUSED(event))
{
void MyFrame::OnTest1(wxCommandEvent& WXUNUSED(event))
{
- const
c
har *buf1;
-
c
har *buf2;
+ const
wxC
har *buf1;
+
wxC
har *buf2;
unsigned char len;
// Disable socket menu entries (exception: Close Session)
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!)");
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);
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))
{
void MyFrame::OnTest2(wxCommandEvent& WXUNUSED(event))
{
- char *msg1;
-
c
har *msg2;
+ c
onst wxC
har *msg1;
+
wxC
har *msg2;
size_t len;
// Disable socket menu entries (exception: Close Session)
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!"));
_("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);
m_text->AppendText(_("Sending the string with WriteMsg ..."));
m_sock->WriteMsg(msg1, len);
@@
-486,7
+484,6
@@
void MyFrame::OnTest3(wxCommandEvent& WXUNUSED(event))
m_sock->SetFlags(wxSOCKET_WAITALL);
// Note that len is in kbytes here!
m_sock->SetFlags(wxSOCKET_WAITALL);
// Note that len is in kbytes here!
- // Also note that Linux kernel 2.0.36 gives up at len > 27.
len = 32;
buf1 = new char[len * 1024];
buf2 = new char[len * 1024];
len = 32;
buf1 = new char[len * 1024];
buf2 = new char[len * 1024];
@@
-567,16
+564,14
@@
void MyFrame::OnTestURL(wxCommandEvent& WXUNUSED(event))
// Print the contents type and file size
wxString s;
// 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);
wxYield();
// Get the data
url.GetProtocol().GetContentType().c_str(),
data->GetSize());
m_text->AppendText(s);
wxYield();
// Get the data
- wxFileOutputStream sout(
wxString("test.url")
);
+ wxFileOutputStream sout(
wxT("test.url")
);
if (!sout.Ok())
{
m_text->AppendText(_("Error: couldn't open file for output\n"));
if (!sout.Ok())
{
m_text->AppendText(_("Error: couldn't open file for output\n"));