Minor corrections

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42458 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/ipc/client.cpp b/samples/ipc/client.cpp
index c405fce06205c2f72e79b4cf55a1308e58747f18..09ec3059fae607d60a874e9eb7633e13583fa0aa 100644 (file)
--- a/samples/ipc/client.cpp
+++ b/samples/ipc/client.cpp
@@ -218,7 +218,7 @@ void MyFrame::EnableControls()
     GetHostname()->Enable(m_client == NULL);
     GetTopic()->Enable(m_client == NULL);
 
     GetHostname()->Enable(m_client == NULL);
     GetTopic()->Enable(m_client == NULL);
 

-    const bool isConnected = m_client->IsConnected();
+    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);
     GetDisconnect()->Enable(m_client != NULL && isConnected);
     GetStartAdvise()->Enable(m_client != NULL && isConnected);
     GetStopAdvise()->Enable(m_client != NULL && isConnected);


@@ -261,7 +261,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) )


@@ -315,7 +315,7 @@ void MyFrame::Disconnect()
 {
     delete m_client;
     m_client = NULL;
 {
     delete m_client;
     m_client = NULL;

-    Enable();
+    EnableControls();

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


@@ -399,7 +399,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"));
     }
 }