Fix discrepancy between different ways of measuring text extents under Mac.

[wxWidgets.git] / samples / ipc / connection.h

diff --git a/samples/ipc/connection.h b/samples/ipc/connection.h
index 42d1816a0714d66d9e0eec355aa54cec63545e5e..bf01ab5d3e5fe387350e85d914bb2ceb58f33db4 100644 (file)
--- a/samples/ipc/connection.h
+++ b/samples/ipc/connection.h
@@ -36,23 +36,23 @@ protected:
         switch (format)
         {
           case wxIPC_TEXT:
         switch (format)
         {
           case wxIPC_TEXT:

-              s += wxString(wx_static_cast(const char *, data), size);
+              s += wxString(static_cast<const char *>(data), size);

               break;
 
 #if wxUSE_UNICODE
           case wxIPC_UNICODETEXT:
               break;
 
 #if wxUSE_UNICODE
           case wxIPC_UNICODETEXT:

-              s += wxString(wx_static_cast(const wchar_t *, data), size);
+              s += wxString(static_cast<const wchar_t *>(data), size);

               break;
 #endif // wxUSE_UNICODE
 
           case wxIPC_UTF8TEXT:
               break;
 #endif // wxUSE_UNICODE
 
           case wxIPC_UTF8TEXT:

-              s += wxString::FromUTF8(wx_static_cast(const char *, data), size);
+              s += wxString::FromUTF8(static_cast<const char *>(data), size);

               break;
 
           case wxIPC_PRIVATE:
               if ( size == 3 )
               {
               break;
 
           case wxIPC_PRIVATE:
               if ( size == 3 )
               {

-                  const char *bytes = wx_static_cast(const char *, data);
+                  const char *bytes = static_cast<const char *>(data);

                   s << '"' << bytes[0] << bytes[1] << bytes[2] << '"';
               }
               else
                   s << '"' << bytes[0] << bytes[1] << bytes[2] << '"';
               }
               else