Disable wxUSE_ENH_METAFILE for wxGTK builds.

[wxWidgets.git] / src / common / ipcbase.cpp

diff --git a/src/common/ipcbase.cpp b/src/common/ipcbase.cpp
index d96b9374a9463000fdebde9ad368726acecf0ddc..6f6c8c162907f740c641836da4697796c4f1ecb6 100644 (file)
--- a/src/common/ipcbase.cpp
+++ b/src/common/ipcbase.cpp
@@ -21,9 +21,9 @@
 
 #include "wx/ipcbase.h"
 
 
 #include "wx/ipcbase.h"
 

-IMPLEMENT_CLASS(wxServerBase, wxObject)
-IMPLEMENT_CLASS(wxClientBase, wxObject)
-IMPLEMENT_CLASS(wxConnectionBase, wxObject)
+wxIMPLEMENT_ABSTRACT_CLASS(wxServerBase, wxObject)
+wxIMPLEMENT_ABSTRACT_CLASS(wxClientBase, wxObject)
+wxIMPLEMENT_ABSTRACT_CLASS(wxConnectionBase, wxObject)

 
 wxConnectionBase::wxConnectionBase(void *buffer, size_t bytes)
     : m_buffer((char *)buffer),
 
 wxConnectionBase::wxConnectionBase(void *buffer, size_t bytes)
     : m_buffer((char *)buffer),


@@ -55,7 +55,7 @@ wxConnectionBase::wxConnectionBase(const wxConnectionBase& copy)
 
 {
   // copy constructor would require ref-counted pointer to buffer
 
 {
   // copy constructor would require ref-counted pointer to buffer

-  wxFAIL_MSG( _T("Copy constructor of wxConnectionBase not implemented") );
+  wxFAIL_MSG( wxT("Copy constructor of wxConnectionBase not implemented") );

 }
 
 
 }
 
 


@@ -80,7 +80,7 @@ wxString wxConnectionBase::GetTextFromData(const void* data,
             if ( size )
                 size--;
 
             if ( size )
                 size--;
 

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

             break;
 
 #if wxUSE_UNICODE
             break;
 
 #if wxUSE_UNICODE


@@ -94,14 +94,14 @@ wxString wxConnectionBase::GetTextFromData(const void* data,
                 size--;
             }
 
                 size--;
             }
 

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

             break;
 
         case wxIPC_UTF8TEXT:
             if ( size )
                 size--;
 
             break;
 
         case wxIPC_UTF8TEXT:
             if ( size )
                 size--;
 

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

             break;
 #endif // wxUSE_UNICODE
 
             break;
 #endif // wxUSE_UNICODE