Remove wxPGClipperWindow, use wxBORDER_NONE instead of wxNO_BORDER

[wxWidgets.git] / samples / sockets / client.cpp

diff --git a/samples/sockets/client.cpp b/samples/sockets/client.cpp
index 805ff140fbb576b589bf668451987485e2719805..ce196d8cd632bfdced3efa10170519b521e3787f 100644 (file)
--- a/samples/sockets/client.cpp
+++ b/samples/sockets/client.cpp
@@ -17,11 +17,6 @@
 // headers
 // --------------------------------------------------------------------------
 
 // headers
 // --------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-#  pragma implementation "client.cpp"
-#  pragma interface "client.cpp"
-#endif
-

 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 


@@ -29,7 +24,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


@@ -43,9 +38,7 @@
 // --------------------------------------------------------------------------
 
 // the application icon
 // --------------------------------------------------------------------------
 
 // the application icon

-#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__)
-#  include "mondrian.xpm"
-#endif
+#include "mondrian.xpm"

 
 // --------------------------------------------------------------------------
 // classes
 
 // --------------------------------------------------------------------------
 // classes


@@ -76,8 +69,15 @@ public:
   void OnTest3(wxCommandEvent& event);
   void OnCloseConnection(wxCommandEvent& event);
 
   void OnTest3(wxCommandEvent& event);
   void OnCloseConnection(wxCommandEvent& event);
 

+#if wxUSE_URL

   // event handlers for Protocols menu
   void OnTestURL(wxCommandEvent& event);
   // event handlers for Protocols menu
   void OnTestURL(wxCommandEvent& event);

+#endif
+#if wxUSE_IPV6
+  void OnOpenConnectionIPv6(wxCommandEvent& event);
+#endif
+
+  void OpenConnection(int family = AF_INET);

 
   // event handlers for DatagramSocket menu (stub)
   void OnDatagram(wxCommandEvent& event);
 
   // event handlers for DatagramSocket menu (stub)
   void OnDatagram(wxCommandEvent& event);


@@ -110,14 +110,19 @@ private:
 enum
 {
   // menu items
 enum
 {
   // menu items

-  CLIENT_QUIT = 1000,
-  CLIENT_ABOUT,
-  CLIENT_OPEN,
+  CLIENT_QUIT = wxID_EXIT,
+  CLIENT_ABOUT = wxID_ABOUT,
+  CLIENT_OPEN = 100,
+#if wxUSE_IPV6
+  CLIENT_OPENIPV6,
+#endif

   CLIENT_TEST1,
   CLIENT_TEST2,
   CLIENT_TEST3,
   CLIENT_CLOSE,
   CLIENT_TEST1,
   CLIENT_TEST2,
   CLIENT_TEST3,
   CLIENT_CLOSE,

+#if wxUSE_URL

   CLIENT_TESTURL,
   CLIENT_TESTURL,

+#endif

   CLIENT_DGRAM,
 
   // id for socket
   CLIENT_DGRAM,
 
   // id for socket


@@ -132,12 +137,17 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
   EVT_MENU(CLIENT_QUIT,     MyFrame::OnQuit)
   EVT_MENU(CLIENT_ABOUT,    MyFrame::OnAbout)
   EVT_MENU(CLIENT_OPEN,     MyFrame::OnOpenConnection)
   EVT_MENU(CLIENT_QUIT,     MyFrame::OnQuit)
   EVT_MENU(CLIENT_ABOUT,    MyFrame::OnAbout)
   EVT_MENU(CLIENT_OPEN,     MyFrame::OnOpenConnection)

+#if wxUSE_IPV6
+  EVT_MENU(CLIENT_OPENIPV6, MyFrame::OnOpenConnectionIPv6)
+#endif

   EVT_MENU(CLIENT_TEST1,    MyFrame::OnTest1)
   EVT_MENU(CLIENT_TEST2,    MyFrame::OnTest2)
   EVT_MENU(CLIENT_TEST3,    MyFrame::OnTest3)
   EVT_MENU(CLIENT_CLOSE,    MyFrame::OnCloseConnection)
   EVT_MENU(CLIENT_DGRAM,    MyFrame::OnDatagram)
   EVT_MENU(CLIENT_TEST1,    MyFrame::OnTest1)
   EVT_MENU(CLIENT_TEST2,    MyFrame::OnTest2)
   EVT_MENU(CLIENT_TEST3,    MyFrame::OnTest3)
   EVT_MENU(CLIENT_CLOSE,    MyFrame::OnCloseConnection)
   EVT_MENU(CLIENT_DGRAM,    MyFrame::OnDatagram)

+#if wxUSE_URL

   EVT_MENU(CLIENT_TESTURL,  MyFrame::OnTestURL)
   EVT_MENU(CLIENT_TESTURL,  MyFrame::OnTestURL)

+#endif

   EVT_SOCKET(SOCKET_ID,     MyFrame::OnSocketEvent)
 END_EVENT_TABLE()
 
   EVT_SOCKET(SOCKET_ID,     MyFrame::OnSocketEvent)
 END_EVENT_TABLE()
 


@@ -153,6 +163,9 @@ IMPLEMENT_APP(MyApp)
 
 bool MyApp::OnInit()
 {
 
 bool MyApp::OnInit()
 {

+  if ( !wxApp::OnInit() )
+      return false;
+

   // Create the main application window
   MyFrame *frame = new MyFrame();
 
   // Create the main application window
   MyFrame *frame = new MyFrame();
 


@@ -184,6 +197,9 @@ MyFrame::MyFrame() : wxFrame((wxFrame *)NULL, wxID_ANY,
 
   m_menuSocket = new wxMenu();
   m_menuSocket->Append(CLIENT_OPEN, _("&Open session"), _("Connect to server"));
 
   m_menuSocket = new wxMenu();
   m_menuSocket->Append(CLIENT_OPEN, _("&Open session"), _("Connect to server"));

+#if wxUSE_IPV6
+  m_menuSocket->Append(CLIENT_OPENIPV6, _("&Open session(IPv6)"), _("Connect to server(IPv6)"));
+#endif

   m_menuSocket->AppendSeparator();
   m_menuSocket->Append(CLIENT_TEST1, _("Test &1"), _("Test basic functionality"));
   m_menuSocket->Append(CLIENT_TEST2, _("Test &2"), _("Test ReadMsg and WriteMsg"));
   m_menuSocket->AppendSeparator();
   m_menuSocket->Append(CLIENT_TEST1, _("Test &1"), _("Test basic functionality"));
   m_menuSocket->Append(CLIENT_TEST2, _("Test &2"), _("Test ReadMsg and WriteMsg"));


@@ -194,15 +210,19 @@ MyFrame::MyFrame() : wxFrame((wxFrame *)NULL, wxID_ANY,
   m_menuDatagramSocket = new wxMenu();
   m_menuDatagramSocket->Append(CLIENT_DGRAM, _("Send Datagram"), _("Test UDP sockets"));
 
   m_menuDatagramSocket = new wxMenu();
   m_menuDatagramSocket->Append(CLIENT_DGRAM, _("Send Datagram"), _("Test UDP sockets"));
 

+#if wxUSE_URL

   m_menuProtocols = new wxMenu();
   m_menuProtocols->Append(CLIENT_TESTURL, _("Test URL"), _("Get data from the specified URL"));
   m_menuProtocols = new wxMenu();
   m_menuProtocols->Append(CLIENT_TESTURL, _("Test URL"), _("Get data from the specified URL"));

+#endif

 
   // Append menus to the menubar
   m_menuBar = new wxMenuBar();
   m_menuBar->Append(m_menuFile, _("&File"));
   m_menuBar->Append(m_menuSocket, _("&SocketClient"));
   m_menuBar->Append(m_menuDatagramSocket, _("&DatagramSocket"));
 
   // Append menus to the menubar
   m_menuBar = new wxMenuBar();
   m_menuBar->Append(m_menuFile, _("&File"));
   m_menuBar->Append(m_menuSocket, _("&SocketClient"));
   m_menuBar->Append(m_menuDatagramSocket, _("&DatagramSocket"));

+#if wxUSE_URL

   m_menuBar->Append(m_menuProtocols, _("&Protocols"));
   m_menuBar->Append(m_menuProtocols, _("&Protocols"));

+#endif

   SetMenuBar(m_menuBar);
 
 #if wxUSE_STATUSBAR
   SetMenuBar(m_menuBar);
 
 #if wxUSE_STATUSBAR


@@ -253,9 +273,34 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnOpenConnection(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnOpenConnection(wxCommandEvent& WXUNUSED(event))
 {

-  wxIPV4address addr;
+    OpenConnection(AF_INET);
+}
+#if wxUSE_IPV6
+void MyFrame::OnOpenConnectionIPv6(wxCommandEvent& WXUNUSED(event))
+{
+    OpenConnection(AF_INET6);
+}
+#endif // wxUSE_IPV6
+
+void MyFrame::OpenConnection(int family)
+{
+  wxIPaddress * addr;
+  wxIPV4address addr4;
+#if wxUSE_IPV6
+  wxIPV6address addr6;
+  if ( family==AF_INET6 )
+    addr = &addr6;
+  else
+    addr = &addr4;
+#else
+  wxUnusedVar(family);
+  addr = &addr4;
+#endif

 
   m_menuSocket->Enable(CLIENT_OPEN, false);
 
   m_menuSocket->Enable(CLIENT_OPEN, false);

+#if wxUSE_IPV6
+  m_menuSocket->Enable(CLIENT_OPENIPV6, false);
+#endif

   m_menuSocket->Enable(CLIENT_CLOSE, false);
 
   // Ask user for server address
   m_menuSocket->Enable(CLIENT_CLOSE, false);
 
   // Ask user for server address


@@ -264,8 +309,8 @@ void MyFrame::OnOpenConnection(wxCommandEvent& WXUNUSED(event))
     _("Connect ..."),
     _("localhost"));
 
     _("Connect ..."),
     _("localhost"));
 

-  addr.Hostname(hostname);
-  addr.Service(3000);
+  addr->Hostname(hostname);
+  addr->Service(3000);

 
   // Mini-tutorial for Connect() :-)
   // ---------------------------
 
   // Mini-tutorial for Connect() :-)
   // ---------------------------


@@ -280,7 +325,7 @@ void MyFrame::OnOpenConnection(wxCommandEvent& WXUNUSED(event))
   //
   // Connect(addr, false) will issue a nonblocking connection request
   // and return immediately. If the return value is true, then the
   //
   // Connect(addr, false) will issue a nonblocking connection request
   // and return immediately. If the return value is true, then the

-  // connection has been already succesfully established. If it is
+  // connection has been already successfully established. If it is

   // false, you must wait for the request to complete, either with
   // WaitOnConnect() or by watching wxSOCKET_CONNECTION / LOST
   // events (please read the documentation).
   // false, you must wait for the request to complete, either with
   // WaitOnConnect() or by watching wxSOCKET_CONNECTION / LOST
   // events (please read the documentation).


@@ -313,11 +358,11 @@ void MyFrame::OnOpenConnection(wxCommandEvent& WXUNUSED(event))
   //     // update waitmore if needed.
   //   }
   //   bool success = client->IsConnected();
   //     // update waitmore if needed.
   //   }
   //   bool success = client->IsConnected();

-  // 
+  //

   // And that's all :-)
 
   m_text->AppendText(_("\nTrying to connect (timeout = 10 sec) ...\n"));
   // And that's all :-)
 
   m_text->AppendText(_("\nTrying to connect (timeout = 10 sec) ...\n"));

-  m_sock->Connect(addr, false);
+  m_sock->Connect(*addr, false);

   m_sock->WaitOnConnect(10);
 
   if (m_sock->IsConnected())
   m_sock->WaitOnConnect(10);
 
   if (m_sock->IsConnected())


@@ -328,16 +373,12 @@ void MyFrame::OnOpenConnection(wxCommandEvent& WXUNUSED(event))
     m_text->AppendText(_("Failed ! Unable to connect\n"));
     wxMessageBox(_("Can't connect to the specified host"), _("Alert !"));
   }
     m_text->AppendText(_("Failed ! Unable to connect\n"));
     wxMessageBox(_("Can't connect to the specified host"), _("Alert !"));
   }

-  
+

   UpdateStatusBar();
 }
 
 void MyFrame::OnTest1(wxCommandEvent& WXUNUSED(event))
 {
   UpdateStatusBar();
 }
 
 void MyFrame::OnTest1(wxCommandEvent& WXUNUSED(event))
 {

-  const wxChar *buf1;
-  wxChar       *buf2;
-  unsigned char len;
-

   // Disable socket menu entries (exception: Close Session)
   m_busy = true;
   UpdateStatusBar();
   // Disable socket menu entries (exception: Close Session)
   m_busy = true;
   UpdateStatusBar();


@@ -362,9 +403,9 @@ void MyFrame::OnTest1(wxCommandEvent& WXUNUSED(event))
 
   m_sock->SetFlags(wxSOCKET_WAITALL);
 
 
   m_sock->SetFlags(wxSOCKET_WAITALL);
 

-  buf1 = _("Test string (less than 256 chars!)");
-  len  = (wxStrlen(buf1) + 1) * sizeof(wxChar);
-  buf2 = new wxChar[wxStrlen(buf1) + 1];
+  const wxChar *buf1 = _T("Test string (less than 256 chars!)");
+  unsigned char len  = (unsigned char)((wxStrlen(buf1) + 1)*sizeof(wxChar));
+  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);


@@ -443,7 +484,7 @@ void MyFrame::OnTest2(wxCommandEvent& WXUNUSED(event))
     m_text->AppendText(_("Comparing the two buffers ..."));
     if (memcmp(msg1, msg2, len) != 0)
     {
     m_text->AppendText(_("Comparing the two buffers ..."));
     if (memcmp(msg1, msg2, len) != 0)
     {

-      m_text->AppendText(_("failed!\n"));  
+      m_text->AppendText(_("failed!\n"));

       m_text->AppendText(_("Test 2 failed !\n"));
     }
     else
       m_text->AppendText(_("Test 2 failed !\n"));
     }
     else


@@ -533,6 +574,8 @@ void MyFrame::OnDatagram(wxCommandEvent& WXUNUSED(event))
   m_text->AppendText(_("=== Datagram test ends ===\n"));
 }
 
   m_text->AppendText(_("=== Datagram test ends ===\n"));
 }
 

+#if wxUSE_URL
+

 void MyFrame::OnTestURL(wxCommandEvent& WXUNUSED(event))
 {
   // Note that we are creating a new socket here, so this
 void MyFrame::OnTestURL(wxCommandEvent& WXUNUSED(event))
 {
   // Note that we are creating a new socket here, so this


@@ -573,7 +616,7 @@ void MyFrame::OnTestURL(wxCommandEvent& WXUNUSED(event))
   wxYield();
 
   // Get the data
   wxYield();
 
   // Get the data

-  wxFile fileTest(wxT("test.url"));
+  wxFile fileTest(wxT("test.url"), wxFile::write);

   wxFileOutputStream sout(fileTest);
   if (!sout.Ok())
   {
   wxFileOutputStream sout(fileTest);
   if (!sout.Ok())
   {


@@ -590,6 +633,8 @@ void MyFrame::OnTestURL(wxCommandEvent& WXUNUSED(event))
   delete data;
 }
 
   delete data;
 }
 

+#endif
+

 void MyFrame::OnSocketEvent(wxSocketEvent& event)
 {
   wxString s = _("OnSocketEvent: ");
 void MyFrame::OnSocketEvent(wxSocketEvent& event)
 {
   wxString s = _("OnSocketEvent: ");


@@ -618,7 +663,11 @@ void MyFrame::UpdateStatusBar()
   }
   else
   {
   }
   else
   {

+#if wxUSE_IPV6
+    wxIPV6address addr;
+#else

     wxIPV4address addr;
     wxIPV4address addr;

+#endif

 
     m_sock->GetPeer(addr);
     s.Printf(_("%s : %d"), (addr.Hostname()).c_str(), addr.Service());
 
     m_sock->GetPeer(addr);
     s.Printf(_("%s : %d"), (addr.Hostname()).c_str(), addr.Service());


@@ -629,6 +678,9 @@ void MyFrame::UpdateStatusBar()
 #endif // wxUSE_STATUSBAR
 
   m_menuSocket->Enable(CLIENT_OPEN, !m_sock->IsConnected() && !m_busy);
 #endif // wxUSE_STATUSBAR
 
   m_menuSocket->Enable(CLIENT_OPEN, !m_sock->IsConnected() && !m_busy);

+#if wxUSE_IPV6
+  m_menuSocket->Enable(CLIENT_OPENIPV6, !m_sock->IsConnected() && !m_busy);
+#endif

   m_menuSocket->Enable(CLIENT_TEST1, m_sock->IsConnected() && !m_busy);
   m_menuSocket->Enable(CLIENT_TEST2, m_sock->IsConnected() && !m_busy);
   m_menuSocket->Enable(CLIENT_TEST3, m_sock->IsConnected() && !m_busy);
   m_menuSocket->Enable(CLIENT_TEST1, m_sock->IsConnected() && !m_busy);
   m_menuSocket->Enable(CLIENT_TEST2, m_sock->IsConnected() && !m_busy);
   m_menuSocket->Enable(CLIENT_TEST3, m_sock->IsConnected() && !m_busy);