moved AdjustToClientAreaOrigin to wxWindowBase, needed worldwide for wxUniv

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

diff --git a/src/common/sckaddr.cpp b/src/common/sckaddr.cpp
index d3d0d064840cef51f11caa89caaa5d5a8453ea76..93e0ab3266d5e4304224140b1eda9eef19ed2402 100644 (file)
--- a/src/common/sckaddr.cpp
+++ b/src/common/sckaddr.cpp
@@ -42,7 +42,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxIPV4address, wxSockAddress)
 #ifdef ENABLE_IPV6
 IMPLEMENT_DYNAMIC_CLASS(wxIPV6address, wxSockAddress)
 #endif
 #ifdef ENABLE_IPV6
 IMPLEMENT_DYNAMIC_CLASS(wxIPV6address, wxSockAddress)
 #endif

-#if defined(__UNIX__) && !defined(__WXMAC_X__)
+#if defined(__UNIX__) && !defined(__WXMAC__)

 IMPLEMENT_DYNAMIC_CLASS(wxUNIXaddress, wxSockAddress)
 #endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxUNIXaddress, wxSockAddress)
 #endif
 


@@ -201,7 +201,7 @@ unsigned short wxIPV6address::Service()
 
 #endif
 
 
 #endif
 

-#if defined(__UNIX__) && !defined(__WXMAC_X__)
+#if defined(__UNIX__) && !defined(__WXMAC__)

 // ---------------------------------------------------------------------------
 // wxUNIXaddress
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // wxUNIXaddress
 // ---------------------------------------------------------------------------