typo

[wxWidgets.git] / samples / ipc / server.cpp

diff --git a/samples/ipc/server.cpp b/samples/ipc/server.cpp
index bf1aa5a70a86c1ca6f6652d9784d1c9c8d2b7fd6..11b50b40538d95403ebc637c2c4096127c9fccaf 100644 (file)
--- a/samples/ipc/server.cpp
+++ b/samples/ipc/server.cpp
@@ -66,6 +66,9 @@ END_EVENT_TABLE()
 
 bool MyApp::OnInit()
 {
+    if ( !wxApp::OnInit() )
+        return false;
+
     // Create the main frame window
     m_frame = new MyFrame(NULL, _T("Server"));
     m_frame->Show(true);
@@ -165,7 +168,7 @@ void MyFrame::Enable()
     GetStart()->Enable(m_server == NULL);
     GetServername()->Enable(m_server == NULL);
     GetAdvise()->Enable(m_server && m_server->CanAdvise());
-    GetDisconnect()->Enable(m_server && m_server->IsConnected() != NULL);
+    GetDisconnect()->Enable(m_server && m_server->IsConnected());
 }
 
 void MyFrame::OnClose(wxCloseEvent& event)
@@ -252,7 +255,7 @@ MyServer::~MyServer()
 
 wxConnectionBase *MyServer::OnAcceptConnection(const wxString& topic)
 {
-    wxLogMessage(_T("OnAcceptConnection(\"%s\")"), topic);
+    wxLogMessage(_T("OnAcceptConnection(\"%s\")"), topic.c_str());
 
     if ( topic == IPC_TOPIC )
     {
@@ -282,9 +285,9 @@ void MyServer::Advise()
     if (CanAdvise())
     {
         wxString s = wxDateTime::Now().Format();
-        m_connection->Advise(m_connection->m_sAdvise, (wxChar *)s.c_str());
+        m_connection->Advise(m_connection->m_sAdvise, s.c_str());
         s = wxDateTime::Now().FormatTime() + _T(" ") + wxDateTime::Now().FormatDate();
-        m_connection->Advise(m_connection->m_sAdvise, (wxChar *)s.c_str(), (s.Length() + 1) * sizeof(wxChar));
+        m_connection->Advise(m_connection->m_sAdvise, s.c_str(), (s.Length() + 1) * sizeof(wxChar));
 
 #if wxUSE_DDE_FOR_IPC
         wxLogMessage(_T("DDE Advise type argument cannot be wxIPC_PRIVATE. The client will receive it as wxIPC_TEXT, and receive the correct no of bytes, but not print a correct log entry."));
@@ -324,25 +327,25 @@ bool MyConnection::OnPoke(const wxString& topic,
     return wxConnection::OnPoke(topic, item, data, size, format);
 }
 
-wxChar *MyConnection::OnRequest(const wxString& topic,
+const wxChar *MyConnection::OnRequest(const wxString& topic,
     const wxString& item, int * size, wxIPCFormat format)
 {
-    wxChar *data;
+    const wxChar *data;
     if (item == _T("Date"))
     {
         m_sRequestDate = wxDateTime::Now().Format();
-        data = (wxChar *)m_sRequestDate.c_str();
+        data = m_sRequestDate.c_str();
         *size = -1;
     }    
     else if (item == _T("Date+len"))
     {
         m_sRequestDate = wxDateTime::Now().FormatTime() + _T(" ") + wxDateTime::Now().FormatDate();
-        data = (wxChar *)m_sRequestDate.c_str();
+        data = m_sRequestDate.c_str();
         *size = (m_sRequestDate.Length() + 1) * sizeof(wxChar);
     }    
     else if (item == _T("bytes[3]"))
     {
-        data = (wxChar *)m_achRequestBytes;
+        data = m_achRequestBytes;
         m_achRequestBytes[0] = '1'; m_achRequestBytes[1] = '2'; m_achRequestBytes[2] = '3';
         *size = 3;
     }
@@ -358,7 +361,7 @@ wxChar *MyConnection::OnRequest(const wxString& topic,
 bool MyConnection::OnStartAdvise(const wxString& topic,
                                  const wxString& item)
 {
-    wxLogMessage(_T("OnStartAdvise(\"%s\",\"%s\")"), topic, item);
+    wxLogMessage(_T("OnStartAdvise(\"%s\",\"%s\")"), topic.c_str(), item.c_str());
     wxLogMessage(_T("Returning true"));
     m_sAdvise = item;
     wxGetApp().GetFrame()->Enable();
@@ -368,7 +371,7 @@ bool MyConnection::OnStartAdvise(const wxString& topic,
 bool MyConnection::OnStopAdvise(const wxString& topic,
                                  const wxString& item)
 {
-    wxLogMessage(_T("OnStopAdvise(\"%s\",\"%s\")"), topic, item);
+    wxLogMessage(_T("OnStopAdvise(\"%s\",\"%s\")"), topic.c_str(), item.c_str());
     wxLogMessage(_T("Returning true"));
     m_sAdvise.Empty();
     wxGetApp().GetFrame()->Enable();
@@ -376,35 +379,35 @@ bool MyConnection::OnStopAdvise(const wxString& topic,
 }
 
 void MyConnection::Log(const wxString& command, const wxString& topic,
-    const wxString& item, wxChar *data, int size, wxIPCFormat format)
+    const wxString& item, const wxChar *data, int size, wxIPCFormat format)
 {
     wxString s;
     if (topic.IsEmpty() && item.IsEmpty())
-        s.Printf(_T("%s("), command);
+        s.Printf(_T("%s("), command.c_str());
     else if (topic.IsEmpty())
-        s.Printf(_T("%s(\"%s\","), command, item);
+        s.Printf(_T("%s(\"%s\","), command.c_str(), item.c_str());
     else if (item.IsEmpty())
-        s.Printf(_T("%s(\"%s\","), command, topic);
+        s.Printf(_T("%s(\"%s\","), command.c_str(), topic.c_str());
     else
-        s.Printf(_T("%s(\"%s\",\"%s\","), command, topic, item);
+        s.Printf(_T("%s(\"%s\",\"%s\","), command.c_str(), topic.c_str(), item.c_str());
 
     if (format == wxIPC_TEXT || format == wxIPC_UNICODETEXT) 
-        wxLogMessage(_T("%s\"%s\",%d)"), s, data, size);
+        wxLogMessage(_T("%s\"%s\",%d)"), s.c_str(), data, size);
     else if (format == wxIPC_PRIVATE)
     {
         if (size == 3)
         {
             char *bytes = (char *)data;
-            wxLogMessage(_T("%s'%c%c%c',%d)"), s, bytes[0], bytes[1], bytes[2], size);
+            wxLogMessage(_T("%s'%c%c%c',%d)"), s.c_str(), bytes[0], bytes[1], bytes[2], size);
         }
         else
-            wxLogMessage(_T("%s...,%d)"), s, size);
+            wxLogMessage(_T("%s...,%d)"), s.c_str(), size);
     }
     else if (format == wxIPC_INVALID) 
-        wxLogMessage(_T("%s[invalid data],%d)"), s, size);
+        wxLogMessage(_T("%s[invalid data],%d)"), s.c_str(), size);
 }
 
-bool MyConnection::Advise(const wxString& item, wxChar *data, int size, wxIPCFormat format)
+bool MyConnection::Advise(const wxString& item, const wxChar *data, int size, wxIPCFormat format)
 {
     Log(_T("Advise"), _T(""), item, data, size, format);
     return wxConnection::Advise(item, data, size, format);