set m_encoding in wxCSConv ctor from name

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

diff --git a/samples/ipc/client.cpp b/samples/ipc/client.cpp
index 7d0fd7e213442d2f5f55c85768442d853aa7a15d..c405fce06205c2f72e79b4cf55a1308e58747f18 100644 (file)
--- a/samples/ipc/client.cpp
+++ b/samples/ipc/client.cpp
@@ -112,15 +112,15 @@ MyFrame::MyFrame(wxFrame *frame, const wxString& title)
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE));
 
     // add the controls to the frame
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE));
 
     // add the controls to the frame

-    wxString strs4[] = 
+    wxString strs4[] =

     {
         IPC_SERVICE, _T("...")
     };
     {
         IPC_SERVICE, _T("...")
     };

-    wxString strs5[] = 
+    wxString strs5[] =

     {
         IPC_HOST, _T("...")
     };
     {
         IPC_HOST, _T("...")
     };

-    wxString strs6[] = 
+    wxString strs6[] =

     {
         IPC_TOPIC, _T("...")
     };
     {
         IPC_TOPIC, _T("...")
     };


@@ -192,7 +192,7 @@ MyFrame::MyFrame(wxFrame *frame, const wxString& title)
     wxStaticBox *item14 = new wxStaticBox( this, -1, wxT("Client log") );
     wxStaticBoxSizer *item13 = new wxStaticBoxSizer( item14, wxVERTICAL );
 
     wxStaticBox *item14 = new wxStaticBox( this, -1, wxT("Client log") );
     wxStaticBoxSizer *item13 = new wxStaticBoxSizer( item14, wxVERTICAL );
 

-    wxTextCtrl *item15 = new wxTextCtrl( this, ID_LOG, wxT(""), wxDefaultPosition, wxSize(500,140), wxTE_MULTILINE );
+    wxTextCtrl *item15 = new wxTextCtrl( this, ID_LOG, wxEmptyString, wxDefaultPosition, wxSize(500,140), wxTE_MULTILINE );

     item13->Add( item15, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
     item0->Add( item13, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
     item13->Add( item15, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
     item0->Add( item13, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );


@@ -208,21 +208,23 @@ MyFrame::MyFrame(wxFrame *frame, const wxString& title)
     wxLogTextCtrl *logWindow = new wxLogTextCtrl(GetLog());
     delete wxLog::SetActiveTarget(logWindow);
     wxLogMessage(_T("Click on Connect to connect to the server"));
     wxLogTextCtrl *logWindow = new wxLogTextCtrl(GetLog());
     delete wxLog::SetActiveTarget(logWindow);
     wxLogMessage(_T("Click on Connect to connect to the server"));

-    Enable();
+    EnableControls();

 }
 
 }
 

-void MyFrame::Enable()
+void MyFrame::EnableControls()

 {
     GetStart()->Enable(m_client == NULL);
     GetServername()->Enable(m_client == NULL);
     GetHostname()->Enable(m_client == NULL);
     GetTopic()->Enable(m_client == NULL);
 {
     GetStart()->Enable(m_client == NULL);
     GetServername()->Enable(m_client == NULL);
     GetHostname()->Enable(m_client == NULL);
     GetTopic()->Enable(m_client == NULL);

-    GetDisconnect()->Enable(m_client && m_client->IsConnected() != NULL);
-    GetStartAdvise()->Enable(m_client && m_client->IsConnected() != NULL);
-    GetStopAdvise()->Enable(m_client && m_client->IsConnected() != NULL);
-    GetExecute()->Enable(m_client && m_client->IsConnected() != NULL);
-    GetPoke()->Enable(m_client && m_client->IsConnected() != NULL);
-    GetRequest()->Enable(m_client && m_client->IsConnected() != NULL);
+
+    const bool isConnected = m_client->IsConnected();
+    GetDisconnect()->Enable(m_client != NULL && isConnected);
+    GetStartAdvise()->Enable(m_client != NULL && isConnected);
+    GetStopAdvise()->Enable(m_client != NULL && isConnected);
+    GetExecute()->Enable(m_client != NULL && isConnected);
+    GetPoke()->Enable(m_client != NULL && isConnected);
+    GetRequest()->Enable(m_client != NULL && isConnected);

 }
 
 void MyFrame::OnClose(wxCloseEvent& event)
 }
 
 void MyFrame::OnClose(wxCloseEvent& event)


@@ -267,7 +269,7 @@ void MyFrame::OnServername( wxCommandEvent& WXUNUSED(event) )
     if (GetServername()->GetStringSelection() == _T("..."))
     {
         wxString s = wxGetTextFromUser(_T("Specify the name of the server"),
     if (GetServername()->GetStringSelection() == _T("..."))
     {
         wxString s = wxGetTextFromUser(_T("Specify the name of the server"),

-            _T("Server Name"), _(""), this);
+            _T("Server Name"), wxEmptyString, this);

         if (!s.IsEmpty() && s != IPC_SERVICE)
         {
             GetServername()->Insert(s, 0);
         if (!s.IsEmpty() && s != IPC_SERVICE)
         {
             GetServername()->Insert(s, 0);


@@ -281,7 +283,7 @@ void MyFrame::OnHostname( wxCommandEvent& WXUNUSED(event) )
     if (GetHostname()->GetStringSelection() == _T("..."))
     {
         wxString s = wxGetTextFromUser(_T("Specify the name of the host (ignored under DDE)"),
     if (GetHostname()->GetStringSelection() == _T("..."))
     {
         wxString s = wxGetTextFromUser(_T("Specify the name of the host (ignored under DDE)"),

-            _T("Host Name"), _(""), this);
+            _T("Host Name"), wxEmptyString, this);

         if (!s.IsEmpty() && s != IPC_HOST)
         {
             GetHostname()->Insert(s, 0);
         if (!s.IsEmpty() && s != IPC_HOST)
         {
             GetHostname()->Insert(s, 0);


@@ -295,7 +297,7 @@ void MyFrame::OnTopic( wxCommandEvent& WXUNUSED(event) )
     if (GetTopic()->GetStringSelection() == _T("..."))
     {
         wxString s = wxGetTextFromUser(_T("Specify the name of the topic"),
     if (GetTopic()->GetStringSelection() == _T("..."))
     {
         wxString s = wxGetTextFromUser(_T("Specify the name of the topic"),

-            _T("Topic Name"), _(""), this);
+            _T("Topic Name"), wxEmptyString, this);

         if (!s.IsEmpty() && s != IPC_TOPIC)
         {
             GetTopic()->Insert(s, 0);
         if (!s.IsEmpty() && s != IPC_TOPIC)
         {
             GetTopic()->Insert(s, 0);


@@ -306,24 +308,24 @@ void MyFrame::OnTopic( wxCommandEvent& WXUNUSED(event) )
 
 void MyFrame::OnDisconnect(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnDisconnect(wxCommandEvent& WXUNUSED(event))
 {

-    Disconnect();    
+    Disconnect();

 }
 
 void MyFrame::Disconnect()
 {
 }
 
 void MyFrame::Disconnect()
 {

-    delete m_client;    
+    delete m_client;

     m_client = NULL;
     Enable();
 }
 
 void MyFrame::OnStartAdvise(wxCommandEvent& WXUNUSED(event))
 {
     m_client = NULL;
     Enable();
 }
 
 void MyFrame::OnStartAdvise(wxCommandEvent& WXUNUSED(event))
 {

-    m_client->GetConnection()->StartAdvise(_T("something"));    
+    m_client->GetConnection()->StartAdvise(_T("something"));

 }
 
 void MyFrame::OnStopAdvise(wxCommandEvent& WXUNUSED(event))
 {
 }
 
 void MyFrame::OnStopAdvise(wxCommandEvent& WXUNUSED(event))
 {

-    m_client->GetConnection()->StopAdvise(_T("something"));    
+    m_client->GetConnection()->StopAdvise(_T("something"));

 }
 
 void MyFrame::OnExecute(wxCommandEvent& WXUNUSED(event))
 }
 
 void MyFrame::OnExecute(wxCommandEvent& WXUNUSED(event))


@@ -380,7 +382,7 @@ bool MyClient::Connect(const wxString& sHost, const wxString& sService, const wx
 {
     // suppress the log messages from MakeConnection()
     wxLogNull nolog;
 {
     // suppress the log messages from MakeConnection()
     wxLogNull nolog;

-    
+

     m_connection = (MyConnection *)MakeConnection(sHost, sService, sTopic);
     return m_connection    != NULL;
 }
     m_connection = (MyConnection *)MakeConnection(sHost, sService, sTopic);
     return m_connection    != NULL;
 }


@@ -416,28 +418,28 @@ void MyConnection::Log(const wxString& command, const wxString& topic,
 {
     wxString s;
     if (topic.IsEmpty() && item.IsEmpty())
 {
     wxString s;
     if (topic.IsEmpty() && item.IsEmpty())

-        s.Printf(_T("%s("), command);
+        s.Printf(_T("%s("), command.c_str());

     else if (topic.IsEmpty())
     else if (topic.IsEmpty())

-        s.Printf(_T("%s(item=\"%s\","), command, item);
+        s.Printf(_T("%s(item=\"%s\","), command.c_str(), item.c_str());

     else if (item.IsEmpty())
     else if (item.IsEmpty())

-        s.Printf(_T("%s(topic=\"%s\","), command, topic);
+        s.Printf(_T("%s(topic=\"%s\","), command.c_str(), topic.c_str());

     else
     else

-        s.Printf(_T("%s(topic=\"%s\",item=\"%s\","), command, topic, item);
+        s.Printf(_T("%s(topic=\"%s\",item=\"%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);
+    if (format == wxIPC_TEXT || format == wxIPC_UNICODETEXT)
+        wxLogMessage(_T("%s\"%s\",%d)"), s.c_str(), data, size);

     else if (format == wxIPC_PRIVATE)
     {
         if (size == 3)
         {
             char *bytes = (char *)data;
     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
         }
         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);
+    else if (format == wxIPC_INVALID)
+        wxLogMessage(_T("%s[invalid data],%d)"), s.c_str(), size);

 }
 
 bool MyConnection::OnAdvise(const wxString& topic, const wxString& item, wxChar *data,
 }
 
 bool MyConnection::OnAdvise(const wxString& topic, const wxString& item, wxChar *data,


@@ -456,7 +458,7 @@ bool MyConnection::OnDisconnect()
 
 bool MyConnection::Execute(const wxChar *data, int size, wxIPCFormat format)
 {
 
 bool MyConnection::Execute(const wxChar *data, int size, wxIPCFormat format)
 {

-    Log(_T("Execute"), _T(""), _T(""), (wxChar *)data, size, format);
+    Log(_T("Execute"), wxEmptyString, wxEmptyString, (wxChar *)data, size, format);

     bool retval = wxConnection::Execute(data, size, format);
     if (!retval)
         wxLogMessage(_T("Execute failed!"));
     bool retval = wxConnection::Execute(data, size, format);
     if (!retval)
         wxLogMessage(_T("Execute failed!"));


@@ -466,13 +468,12 @@ bool MyConnection::Execute(const wxChar *data, int size, wxIPCFormat format)
 wxChar *MyConnection::Request(const wxString& item, int *size, wxIPCFormat format)
 {
     wxChar *data =  wxConnection::Request(item, size, format);
 wxChar *MyConnection::Request(const wxString& item, int *size, wxIPCFormat format)
 {
     wxChar *data =  wxConnection::Request(item, size, format);

-    Log(_T("Request"), _T(""), item, data, size ? *size : -1, format);
+    Log(_T("Request"), wxEmptyString, item, data, size ? *size : -1, format);

     return data;
 }
 
 bool MyConnection::Poke(const wxString& item, wxChar *data, int size, wxIPCFormat format)
 {
     return data;
 }
 
 bool MyConnection::Poke(const wxString& item, wxChar *data, int size, wxIPCFormat format)
 {

-    Log(_T("Poke"), _T(""), item, data, size, format);
+    Log(_T("Poke"), wxEmptyString, item, data, size, format);

     return wxConnection::Poke(item, data, size, format);
 }
     return wxConnection::Poke(item, data, size, format);
 }

-