no changes, just removed the unnecessary inline keywords

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

diff --git a/samples/ipc/client.cpp b/samples/ipc/client.cpp
index 7d0fd7e213442d2f5f55c85768442d853aa7a15d..b13587b74aa570e984d5acbeb90c65bdaafd3ee7 100644 (file)
--- a/samples/ipc/client.cpp
+++ b/samples/ipc/client.cpp
@@ -76,6 +76,9 @@ END_EVENT_TABLE()
 // main frame
 bool MyApp::OnInit()
 {
 // main frame
 bool MyApp::OnInit()
 {

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

     // Create the main frame window
     m_frame = new MyFrame(NULL, _T("Client"));
     m_frame->Show(true);
     // Create the main frame window
     m_frame = new MyFrame(NULL, _T("Client"));
     m_frame->Show(true);


@@ -112,15 +115,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 +195,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 +211,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 != NULL && 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)


@@ -259,7 +264,7 @@ void MyFrame::OnStart(wxCommandEvent& WXUNUSED(event))
         delete m_client;
         m_client = NULL;
     }
         delete m_client;
         m_client = NULL;
     }

-    Enable();
+    EnableControls();

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


@@ -267,7 +272,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 +286,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 +300,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 +311,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;
     m_client = NULL;

-    Enable();
+    EnableControls();

 }
 
 void MyFrame::OnStartAdvise(wxCommandEvent& WXUNUSED(event))
 {
 }
 
 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))


@@ -332,14 +337,13 @@ void MyFrame::OnExecute(wxCommandEvent& WXUNUSED(event))
     {
         wxString s = _T("Date");
 
     {
         wxString s = _T("Date");
 

-        m_client->GetConnection()->Execute((wxChar *)s.c_str());
-        m_client->GetConnection()->Execute((wxChar *)s.c_str(), (s.Length() + 1) * sizeof(wxChar));
-#if wxUSE_DDE_FOR_IPC
-        wxLogMessage(_T("DDE Execute can only be used to send text strings, not arbitrary data.\nThe type argument will be ignored, text truncated, converted to Unicode and null terminated."));
-#endif
+        m_client->GetConnection()->Execute(s);
+        m_client->GetConnection()->Execute((const char *)s.c_str(), s.length() + 1);

         char bytes[3];
         char bytes[3];

-        bytes[0] = '1'; bytes[1] = '2'; bytes[2] = '3';
-        m_client->GetConnection()->Execute((wxChar *)bytes, 3, wxIPC_PRIVATE);
+        bytes[0] = '1';
+        bytes[1] = '2';
+        bytes[2] = '3';
+        m_client->GetConnection()->Execute(bytes, WXSIZEOF(bytes));

     }
 }
 
     }
 }
 


@@ -348,12 +352,12 @@ void MyFrame::OnPoke(wxCommandEvent& WXUNUSED(event))
     if (m_client->IsConnected())
     {
         wxString s = wxDateTime::Now().Format();
     if (m_client->IsConnected())
     {
         wxString s = wxDateTime::Now().Format();

-        m_client->GetConnection()->Poke(_T("Date"), (wxChar *)s.c_str());
+        m_client->GetConnection()->Poke(_T("Date"), s);

         s = wxDateTime::Now().FormatTime() + _T(" ") + wxDateTime::Now().FormatDate();
         s = wxDateTime::Now().FormatTime() + _T(" ") + wxDateTime::Now().FormatDate();

-        m_client->GetConnection()->Poke(_T("Date"), (wxChar *)s.c_str(), (s.Length() + 1) * sizeof(wxChar));
+        m_client->GetConnection()->Poke(_T("Date"), (const char *)s.c_str(), s.length() + 1);

         char bytes[3];
         bytes[0] = '1'; bytes[1] = '2'; bytes[2] = '3';
         char bytes[3];
         bytes[0] = '1'; bytes[1] = '2'; bytes[2] = '3';

-        m_client->GetConnection()->Poke(_T("bytes[3]"), (wxChar *)bytes, 3, wxIPC_PRIVATE);
+        m_client->GetConnection()->Poke(_T("bytes[3]"), bytes, 3, wxIPC_PRIVATE);

     }
 }
 
     }
 }
 


@@ -361,7 +365,7 @@ void MyFrame::OnRequest(wxCommandEvent& WXUNUSED(event))
 {
     if (m_client->IsConnected())
     {
 {
     if (m_client->IsConnected())
     {

-        int size;
+        size_t size;

         m_client->GetConnection()->Request(_T("Date"));
         m_client->GetConnection()->Request(_T("Date+len"), &size);
         m_client->GetConnection()->Request(_T("bytes[3]"), &size, wxIPC_PRIVATE);
         m_client->GetConnection()->Request(_T("Date"));
         m_client->GetConnection()->Request(_T("Date+len"), &size);
         m_client->GetConnection()->Request(_T("bytes[3]"), &size, wxIPC_PRIVATE);


@@ -380,7 +384,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;
 }


@@ -397,7 +401,7 @@ void MyClient::Disconnect()
         m_connection->Disconnect();
         delete m_connection;
         m_connection = NULL;
         m_connection->Disconnect();
         delete m_connection;
         m_connection = NULL;

-        wxGetApp().GetFrame()->Enable();
+        wxGetApp().GetFrame()->EnableControls();

         wxLogMessage(_T("Client disconnected from server"));
     }
 }
         wxLogMessage(_T("Client disconnected from server"));
     }
 }


@@ -411,37 +415,8 @@ MyClient::~MyClient()
 // MyConnection
 // ----------------------------------------------------------------------------
 
 // MyConnection
 // ----------------------------------------------------------------------------
 

-void MyConnection::Log(const wxString& command, const wxString& topic,
-    const wxString& item, wxChar *data, int size, wxIPCFormat format)
-{
-    wxString s;
-    if (topic.IsEmpty() && item.IsEmpty())
-        s.Printf(_T("%s("), command);
-    else if (topic.IsEmpty())
-        s.Printf(_T("%s(item=\"%s\","), command, item);
-    else if (item.IsEmpty())
-        s.Printf(_T("%s(topic=\"%s\","), command, topic);
-    else
-        s.Printf(_T("%s(topic=\"%s\",item=\"%s\","), command, topic, item);
-
-    if (format == wxIPC_TEXT || format == wxIPC_UNICODETEXT) 
-        wxLogMessage(_T("%s\"%s\",%d)"), s, 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);
-        }
-        else
-            wxLogMessage(_T("%s...,%d)"), s, size);
-    }
-    else if (format == wxIPC_INVALID) 
-        wxLogMessage(_T("%s[invalid data],%d)"), s, size);
-}
-
-bool MyConnection::OnAdvise(const wxString& topic, const wxString& item, wxChar *data,
-    int size, wxIPCFormat format)
+bool MyConnection::OnAdvise(const wxString& topic, const wxString& item, const void *data,
+    size_t size, wxIPCFormat format)

 {
     Log(_T("OnAdvise"), topic, item, data, size, format);
     return true;
 {
     Log(_T("OnAdvise"), topic, item, data, size, format);
     return true;


@@ -454,25 +429,24 @@ bool MyConnection::OnDisconnect()
     return true;
 }
 
     return true;
 }
 

-bool MyConnection::Execute(const wxChar *data, int size, wxIPCFormat format)
+bool MyConnection::DoExecute(const void *data, size_t size, wxIPCFormat format)

 {
 {

-    Log(_T("Execute"), _T(""), _T(""), (wxChar *)data, size, format);
-    bool retval = wxConnection::Execute(data, size, format);
+    Log(_T("Execute"), wxEmptyString, wxEmptyString, data, size, format);
+    bool retval = wxConnection::DoExecute(data, size, format);

     if (!retval)
         wxLogMessage(_T("Execute failed!"));
     return retval;
 }
 
     if (!retval)
         wxLogMessage(_T("Execute failed!"));
     return retval;
 }
 

-wxChar *MyConnection::Request(const wxString& item, int *size, wxIPCFormat format)
+const void *MyConnection::Request(const wxString& item, size_t *size, wxIPCFormat format)

 {
 {

-    wxChar *data =  wxConnection::Request(item, size, format);
-    Log(_T("Request"), _T(""), item, data, size ? *size : -1, format);
+    const void *data =  wxConnection::Request(item, size, format);
+    Log(_T("Request"), wxEmptyString, item, data, size ? *size : wxNO_LEN, format);

     return data;
 }
 
     return data;
 }
 

-bool MyConnection::Poke(const wxString& item, wxChar *data, int size, wxIPCFormat format)
+bool MyConnection::DoPoke(const wxString& item, const void *data, size_t size, wxIPCFormat format)

 {
 {

-    Log(_T("Poke"), _T(""), item, data, size, format);
-    return wxConnection::Poke(item, data, size, format);
+    Log(_T("Poke"), wxEmptyString, item, data, size, format);
+    return wxConnection::DoPoke(item, data, size, format);

 }
 }

-