X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9d86099269660fb9eab4d146e625cb2a5fff9c14..0bf36922c8a60f19dccc3889c15b281fc94d69c5:/samples/ipc/server.cpp

diff --git a/samples/ipc/server.cpp b/samples/ipc/server.cpp
index bf1aa5a70a..a4f01ac0a5 100644
--- 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 )
     {
@@ -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();
@@ -380,28 +383,28 @@ void MyConnection::Log(const wxString& command, const wxString& topic,
 {
     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)