projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Typo
[wxWidgets.git]
/
samples
/
sockets
/
server.cpp
diff --git
a/samples/sockets/server.cpp
b/samples/sockets/server.cpp
index 678e6685516f2115d6b388c8671a55e6c028a095..548ad955b699eec263e9a1831734d5534f8e2f35 100644
(file)
--- a/
samples/sockets/server.cpp
+++ b/
samples/sockets/server.cpp
@@
-17,9
+17,9
@@
// headers
// --------------------------------------------------------------------------
// headers
// --------------------------------------------------------------------------
-#if
def __GNUG__
-# pragma implementation "server.cpp"
-# pragma interface "server.cpp"
+#if
defined(__GNUG__) && !defined(__APPLE__)
+ #pragma implementation
+ #pragma interface
#endif
// For compilers that support precompilation, includes "wx/wx.h".
#endif
// For compilers that support precompilation, includes "wx/wx.h".
@@
-29,7
+29,7
@@
# pragma hdrstop
#endif
# pragma hdrstop
#endif
-// for all others, include the necessary headers
+// for all others, include the necessary headers
#ifndef WX_PRECOMP
# include "wx/wx.h"
#endif
#ifndef WX_PRECOMP
# include "wx/wx.h"
#endif
@@
-41,7
+41,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
@@
-84,7
+84,7
@@
private:
bool m_busy;
int m_numClients;
bool m_busy;
int m_numClients;
- // any class wishing to process wxWi
ndow
s events must use this macro
+ // any class wishing to process wxWi
dget
s events must use this macro
DECLARE_EVENT_TABLE()
};
DECLARE_EVENT_TABLE()
};
@@
-96,16
+96,16
@@
private:
enum
{
// menu items
enum
{
// menu items
- SERVER_QUIT =
1000
,
- SERVER_ABOUT,
+ SERVER_QUIT =
wxID_EXIT
,
+ SERVER_ABOUT
= wxID_ABOUT
,
// id for sockets
// id for sockets
- SERVER_ID,
+ SERVER_ID
= 100
,
SOCKET_ID
};
// --------------------------------------------------------------------------
SOCKET_ID
};
// --------------------------------------------------------------------------
-// event tables and other macros for wxWi
ndow
s
+// event tables and other macros for wxWi
dget
s
// --------------------------------------------------------------------------
BEGIN_EVENT_TABLE(MyFrame, wxFrame)
// --------------------------------------------------------------------------
BEGIN_EVENT_TABLE(MyFrame, wxFrame)
@@
-132,11
+132,11
@@
bool MyApp::OnInit()
MyFrame *frame = new MyFrame();
// Show it and tell the application that it's our main window
MyFrame *frame = new MyFrame();
// Show it and tell the application that it's our main window
- frame->Show(
TRUE
);
+ frame->Show(
true
);
SetTopWindow(frame);
// Success
SetTopWindow(frame);
// Success
- return
TRUE
;
+ return
true
;
}
// --------------------------------------------------------------------------
}
// --------------------------------------------------------------------------
@@
-145,7
+145,7
@@
bool MyApp::OnInit()
// frame constructor
// frame constructor
-MyFrame::MyFrame() : wxFrame((wxFrame *)NULL,
-1
,
+MyFrame::MyFrame() : wxFrame((wxFrame *)NULL,
wxID_ANY
,
_("wxSocket demo: Server"),
wxDefaultPosition, wxSize(300, 200))
{
_("wxSocket demo: Server"),
wxDefaultPosition, wxSize(300, 200))
{
@@
-163,11
+163,13
@@
MyFrame::MyFrame() : wxFrame((wxFrame *)NULL, -1,
m_menuBar->Append(m_menuFile, _("&File"));
SetMenuBar(m_menuBar);
m_menuBar->Append(m_menuFile, _("&File"));
SetMenuBar(m_menuBar);
+#if wxUSE_STATUSBAR
// Status bar
CreateStatusBar(2);
// Status bar
CreateStatusBar(2);
+#endif // wxUSE_STATUSBAR
// Make a textctrl for logging
// Make a textctrl for logging
- m_text = new wxTextCtrl(this,
-1
,
+ m_text = new wxTextCtrl(this,
wxID_ANY
,
_("Welcome to wxSocket demo: Server\n"),
wxDefaultPosition, wxDefaultSize,
wxTE_MULTILINE | wxTE_READONLY);
_("Welcome to wxSocket demo: Server\n"),
wxDefaultPosition, wxDefaultSize,
wxTE_MULTILINE | wxTE_READONLY);
@@
-193,9
+195,9
@@
MyFrame::MyFrame() : wxFrame((wxFrame *)NULL, -1,
// Setup the event handler and subscribe to connection events
m_server->SetEventHandler(*this, SERVER_ID);
m_server->SetNotify(wxSOCKET_CONNECTION_FLAG);
// Setup the event handler and subscribe to connection events
m_server->SetEventHandler(*this, SERVER_ID);
m_server->SetNotify(wxSOCKET_CONNECTION_FLAG);
- m_server->Notify(
TRUE
);
+ m_server->Notify(
true
);
- m_busy =
FALSE
;
+ m_busy =
false
;
m_numClients = 0;
UpdateStatusBar();
}
m_numClients = 0;
UpdateStatusBar();
}
@@
-210,14
+212,13
@@
MyFrame::~MyFrame()
void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
{
void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
{
- //
TRUE
is to force the frame to close
- Close(
TRUE
);
+ //
true
is to force the frame to close
+ Close(
true
);
}
void MyFrame::OnAbout(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);
}
_("About Server"),
wxOK | wxICON_INFORMATION, this);
}
@@
-237,14
+238,19
@@
void MyFrame::Test1(wxSocketBase *sock)
sock->SetFlags(wxSOCKET_WAITALL);
sock->SetFlags(wxSOCKET_WAITALL);
- sock->Read((char *)&len, 1);
-
+ // Read the size
+ sock->Read(&len, 1);
buf = new char[len];
buf = new char[len];
+
+ // Read the data
sock->Read(buf, len);
sock->Read(buf, len);
+ m_text->AppendText(_("Got the data, sending it back\n"));
+
+ // Write it back
sock->Write(buf, len);
delete[] buf;
sock->Write(buf, len);
delete[] buf;
- m_text->AppendText(_("Test 1 ends\n"));
+ m_text->AppendText(_("Test 1 ends\n
\n
"));
}
void MyFrame::Test2(wxSocketBase *sock)
}
void MyFrame::Test2(wxSocketBase *sock)
@@
-252,7
+258,7
@@
void MyFrame::Test2(wxSocketBase *sock)
#define MAX_MSG_SIZE 10000
wxString s;
#define MAX_MSG_SIZE 10000
wxString s;
-
char *buf = new c
har[MAX_MSG_SIZE];
+
wxChar *buf = new wxC
har[MAX_MSG_SIZE];
wxUint32 len;
m_text->AppendText(_("Test 2 begins\n"));
wxUint32 len;
m_text->AppendText(_("Test 2 begins\n"));
@@
-260,16
+266,17
@@
void MyFrame::Test2(wxSocketBase *sock)
// We don't need to set flags because ReadMsg and WriteMsg
// are not affected by them anyway.
// We don't need to set flags because ReadMsg and WriteMsg
// are not affected by them anyway.
- len = sock->ReadMsg(buf, MAX_MSG_SIZE).LastCount();
-
+ // Read the message
+ 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"));
s.Printf(_("Client says: %s\n"), buf);
m_text->AppendText(s);
m_text->AppendText(_("Sending the data back\n"));
+ // Write it back
sock->WriteMsg(buf, len);
delete[] buf;
sock->WriteMsg(buf, len);
delete[] buf;
- m_text->AppendText(_("Test 2 ends\n"));
+ m_text->AppendText(_("Test 2 ends\n
\n
"));
#undef MAX_MSG_SIZE
}
#undef MAX_MSG_SIZE
}
@@
-281,18
+288,24
@@
void MyFrame::Test3(wxSocketBase *sock)
m_text->AppendText(_("Test 3 begins\n"));
m_text->AppendText(_("Test 3 begins\n"));
- // This test is similar to the first one, but the len is
+ // This test is similar to the first one, but the len is
// expressed in kbytes - this tests large data transfers.
sock->SetFlags(wxSOCKET_WAITALL);
// expressed in kbytes - this tests large data transfers.
sock->SetFlags(wxSOCKET_WAITALL);
- sock->Read((char *)&len, 1);
+ // Read the size
+ sock->Read(&len, 1);
buf = new char[len * 1024];
buf = new char[len * 1024];
+
+ // Read the data
sock->Read(buf, len * 1024);
sock->Read(buf, len * 1024);
+ m_text->AppendText(_("Got the data, sending it back\n"));
+
+ // Write it back
sock->Write(buf, len * 1024);
delete[] buf;
sock->Write(buf, len * 1024);
delete[] buf;
- m_text->AppendText(_("Test 3 ends\n"));
+ m_text->AppendText(_("Test 3 ends\n
\n
"));
}
void MyFrame::OnServerEvent(wxSocketEvent& event)
}
void MyFrame::OnServerEvent(wxSocketEvent& event)
@@
-300,7
+313,7
@@
void MyFrame::OnServerEvent(wxSocketEvent& event)
wxString s = _("OnServerEvent: ");
wxSocketBase *sock;
wxString s = _("OnServerEvent: ");
wxSocketBase *sock;
- switch(event.SocketEvent())
+ switch(event.
Get
SocketEvent())
{
case wxSOCKET_CONNECTION : s.Append(_("wxSOCKET_CONNECTION\n")); break;
default : s.Append(_("Unexpected event !\n")); break;
{
case wxSOCKET_CONNECTION : s.Append(_("wxSOCKET_CONNECTION\n")); break;
default : s.Append(_("Unexpected event !\n")); break;
@@
-309,25
+322,25
@@
void MyFrame::OnServerEvent(wxSocketEvent& event)
m_text->AppendText(s);
// Accept new connection if there is one in the pending
m_text->AppendText(s);
// Accept new connection if there is one in the pending
- // connections queue, else exit. We use Accept(
FALSE
) for
+ // connections queue, else exit. We use Accept(
false
) for
// non-blocking accept (although if we got here, there
// should ALWAYS be a pending connection).
// non-blocking accept (although if we got here, there
// should ALWAYS be a pending connection).
- sock = m_server->Accept(
FALSE
);
+ sock = m_server->Accept(
false
);
if (sock)
{
if (sock)
{
- m_text->AppendText(_("New client connection accepted\n"));
+ m_text->AppendText(_("New client connection accepted\n
\n
"));
}
else
{
}
else
{
- m_text->AppendText(_("Error: couldn't accept a new connection"));
+ m_text->AppendText(_("Error: couldn't accept a new connection
\n\n
"));
return;
}
sock->SetEventHandler(*this, SOCKET_ID);
sock->SetNotify(wxSOCKET_INPUT_FLAG | wxSOCKET_LOST_FLAG);
return;
}
sock->SetEventHandler(*this, SOCKET_ID);
sock->SetNotify(wxSOCKET_INPUT_FLAG | wxSOCKET_LOST_FLAG);
- sock->Notify(
TRUE
);
+ sock->Notify(
true
);
m_numClients++;
UpdateStatusBar();
m_numClients++;
UpdateStatusBar();
@@
-335,21
+348,21
@@
void MyFrame::OnServerEvent(wxSocketEvent& event)
void MyFrame::OnSocketEvent(wxSocketEvent& event)
{
void MyFrame::OnSocketEvent(wxSocketEvent& event)
{
- wxSocketBase *sock = event.Socket();
wxString s = _("OnSocketEvent: ");
wxString s = _("OnSocketEvent: ");
+ wxSocketBase *sock = event.GetSocket();
- //
We first print a msg
- switch(event.SocketEvent())
+ //
First, print a message
+ switch(event.
Get
SocketEvent())
{
{
- case wxSOCKET_INPUT: s.Append(_("wxSOCKET_INPUT\n")); break;
- case wxSOCKET_LOST
:
s.Append(_("wxSOCKET_LOST\n")); break;
- default
: s.Append(_("unexpected event !\n"))
;
+ case wxSOCKET_INPUT
: s.Append(_("wxSOCKET_INPUT\n")); break;
+ case wxSOCKET_LOST
:
s.Append(_("wxSOCKET_LOST\n")); break;
+ default
: s.Append(_("Unexpected event !\n")); break
;
}
m_text->AppendText(s);
// Now we process the event
}
m_text->AppendText(s);
// Now we process the event
- switch(event.SocketEvent())
+ switch(event.
Get
SocketEvent())
{
case wxSOCKET_INPUT:
{
{
case wxSOCKET_INPUT:
{
@@
-359,14
+372,15
@@
void MyFrame::OnSocketEvent(wxSocketEvent& event)
// Which test are we going to run?
unsigned char c;
// Which test are we going to run?
unsigned char c;
- sock->Read(
(char *)&c ,
1);
+ sock->Read(
&c,
1);
switch (c)
{
case 0xBE: Test1(sock); break;
case 0xCE: Test2(sock); break;
case 0xDE: Test3(sock); break;
switch (c)
{
case 0xBE: Test1(sock); break;
case 0xCE: Test2(sock); break;
case 0xDE: Test3(sock); break;
- default: s.Append(_("Unknown test id received from client\n"));
+ default:
+ m_text->AppendText(_("Unknown test id received from client\n\n"));
}
// Enable input events again.
}
// Enable input events again.
@@
-384,11
+398,9
@@
void MyFrame::OnSocketEvent(wxSocketEvent& event)
// has been deleted. Also, we might be doing some other thing with
// the socket at the same time; for example, we might be in the
// middle of a test or something. Destroy() takes care of all
// has been deleted. Also, we might be doing some other thing with
// the socket at the same time; for example, we might be in the
// middle of a test or something. Destroy() takes care of all
- // this for us. The only case where delete should be used instead
- // is when the event handler itself is also being destroyed; for
- // example, see the frame dtor above.
+ // this for us.
- m_text->AppendText(_("Deleting socket.\n"));
+ m_text->AppendText(_("Deleting socket.\n
\n
"));
sock->Destroy();
break;
}
sock->Destroy();
break;
}
@@
-402,7
+414,9
@@
void MyFrame::OnSocketEvent(wxSocketEvent& event)
void MyFrame::UpdateStatusBar()
{
void MyFrame::UpdateStatusBar()
{
+#if wxUSE_STATUSBAR
wxString s;
s.Printf(_("%d clients connected"), m_numClients);
SetStatusText(s, 1);
wxString s;
s.Printf(_("%d clients connected"), m_numClients);
SetStatusText(s, 1);
+#endif // wxUSE_STATUSBAR
}
}