don't compare bools with NULL

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

diff --git a/samples/ipc/client.cpp b/samples/ipc/client.cpp
index 8b4dc3bff3c940b88a76a0433dfb4bc2ac1ff219..e0380dd666c6e6ee64a8bf553d8f2066e9d14e0c 100644 (file)
--- a/samples/ipc/client.cpp
+++ b/samples/ipc/client.cpp
@@ -217,12 +217,14 @@ void MyFrame::Enable()
     GetServername()->Enable(m_client == NULL);
     GetHostname()->Enable(m_client == NULL);
     GetTopic()->Enable(m_client == NULL);
     GetServername()->Enable(m_client == NULL);
     GetHostname()->Enable(m_client == NULL);
     GetTopic()->Enable(m_client == NULL);

-    GetDisconnect()->Enable(m_client != NULL && m_client->IsConnected());
-    GetStartAdvise()->Enable(m_client != NULL && m_client->IsConnected());
-    GetStopAdvise()->Enable(m_client != NULL && m_client->IsConnected());
-    GetExecute()->Enable(m_client != NULL && m_client->IsConnected());
-    GetPoke()->Enable(m_client != NULL && m_client->IsConnected());
-    GetRequest()->Enable(m_client != NULL && m_client->IsConnected());
+
+    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)

diff --git a/samples/ipc/server.cpp b/samples/ipc/server.cpp
index 4b735d96ed62d512e9d00fc95fc9906660f47136..9680d222f8c621933687686455cea3cf13e0007c 100644 (file)
--- a/samples/ipc/server.cpp
+++ b/samples/ipc/server.cpp
@@ -165,7 +165,7 @@ void MyFrame::Enable()
     GetStart()->Enable(m_server == NULL);
     GetServername()->Enable(m_server == NULL);
     GetAdvise()->Enable(m_server && m_server->CanAdvise());
     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)
 }
 
 void MyFrame::OnClose(wxCloseEvent& event)