Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Get rid of inline C compatibility methods

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28683 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
2004-08-06 22:30:51 +00:00
parent 85431efa68
commit d6d6a882d4
3 changed files with 0 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
include/wx/mac/carbon/gsockmac.h
View File

@@ -96,52 +96,6 @@ public:
int m_takesEvents ;
};
/* Compatibility methods to support old C API (from gsocket.h) */
inline void GSocket_Shutdown(GSocket *socket)
{ socket->Shutdown(); }
inline GSocketError GSocket_SetLocal(GSocket *socket, GAddress *address)
{ return socket->SetLocal(address); }
inline GSocketError GSocket_SetPeer(GSocket *socket, GAddress *address)
{ return socket->SetPeer(address); }
inline GAddress *GSocket_GetLocal(GSocket *socket)
{ return socket->GetLocal(); }
inline GAddress *GSocket_GetPeer(GSocket *socket)
{ return socket->GetPeer(); }
inline GSocketError GSocket_SetServer(GSocket *socket)
{ return socket->SetServer(); }
inline GSocket *GSocket_WaitConnection(GSocket *socket)
{ return socket->WaitConnection(); }
inline int GSocket_SetReusable(GSocket *socket)
{ return socket->SetReusable(); }
inline GSocketError GSocket_Connect(GSocket *socket, GSocketStream stream)
{ return socket->Connect(stream); }
inline GSocketError GSocket_SetNonOriented(GSocket *socket)
{ return socket->SetNonOriented(); }
inline int GSocket_Read(GSocket *socket, char *buffer, int size)
{ return socket->Read(buffer,size); }
inline int GSocket_Write(GSocket *socket, const char *buffer, int size)
{ return socket->Write(buffer,size); }
inline GSocketEventFlags GSocket_Select(GSocket *socket, GSocketEventFlags flags)
{ return socket->Select(flags); }
inline void GSocket_SetNonBlocking(GSocket *socket, int non_block)
{ socket->SetNonBlocking(non_block); }
inline void GSocket_SetTimeout(GSocket *socket, unsigned long millisec)
{ socket->SetTimeout(millisec); }
inline GSocketError GSocket_GetError(GSocket *socket)
{ return socket->GetError(); }
inline void GSocket_SetCallback(GSocket *socket, GSocketEventFlags flags,
GSocketCallback fallback, char *cdata)
{ socket->SetCallback(flags,fallback,cdata); }
inline void GSocket_UnsetCallback(GSocket *socket, GSocketEventFlags flags)
{ socket->UnsetCallback(flags); }
inline GSocketError GSocket_GetSockOpt(GSocket *socket, int level, int optname,
void *optval, int *optlen)
{ return socket->GetSockOpt(level,optname,optval,optlen); }
inline GSocketError GSocket_SetSockOpt(GSocket *socket, int level, int optname,
const void *optval, int optlen)
{ return socket->SetSockOpt(level,optname,optval,optlen); }
inline void GSocket_destroy(GSocket *socket)
{ delete socket; }
#ifdef __cplusplus
extern "C" {

47
include/wx/msw/gsockmsw.h
View File

@@ -106,53 +106,6 @@ public:
int m_msgnumber;
};
/* TODO: Fix src/common/socket.cpp to use the new API */
inline void GSocket_Shutdown(GSocket *socket)
{ socket->Shutdown(); }
inline GSocketError GSocket_SetLocal(GSocket *socket, GAddress *address)
{ return socket->SetLocal(address); }
inline GSocketError GSocket_SetPeer(GSocket *socket, GAddress *address)
{ return socket->SetPeer(address); }
inline GAddress *GSocket_GetLocal(GSocket *socket)
{ return socket->GetLocal(); }
inline GAddress *GSocket_GetPeer(GSocket *socket)
{ return socket->GetPeer(); }
inline GSocketError GSocket_SetServer(GSocket *socket)
{ return socket->SetServer(); }
inline GSocket *GSocket_WaitConnection(GSocket *socket)
{ return socket->WaitConnection(); }
inline int GSocket_SetReusable(GSocket *socket)
{ return socket->SetReusable(); }
inline GSocketError GSocket_Connect(GSocket *socket, GSocketStream stream)
{ return socket->Connect(stream); }
inline GSocketError GSocket_SetNonOriented(GSocket *socket)
{ return socket->SetNonOriented(); }
inline int GSocket_Read(GSocket *socket, char *buffer, int size)
{ return socket->Read(buffer,size); }
inline int GSocket_Write(GSocket *socket, const char *buffer, int size)
{ return socket->Write(buffer,size); }
inline GSocketEventFlags GSocket_Select(GSocket *socket, GSocketEventFlags flags)
{ return socket->Select(flags); }
inline void GSocket_SetNonBlocking(GSocket *socket, int non_block)
{ socket->SetNonBlocking(non_block != 0); }
inline void GSocket_SetTimeout(GSocket *socket, unsigned long millisec)
{ socket->SetTimeout(millisec); }
inline GSocketError GSocket_GetError(GSocket *socket)
{ return socket->GetError(); }
inline void GSocket_SetCallback(GSocket *socket, GSocketEventFlags flags,
GSocketCallback fallback, char *cdata)
{ socket->SetCallback(flags,fallback,cdata); }
inline void GSocket_UnsetCallback(GSocket *socket, GSocketEventFlags flags)
{ socket->UnsetCallback(flags); }
inline GSocketError GSocket_GetSockOpt(GSocket *socket, int level, int optname,
void *optval, int *optlen)
{ return socket->GetSockOpt(level,optname,optval,optlen); }
inline GSocketError GSocket_SetSockOpt(GSocket *socket, int level, int optname,
const void *optval, int optlen)
{ return socket->SetSockOpt(level,optname,optval,optlen); }
inline void GSocket_destroy(GSocket *socket)
{ delete socket; }
#ifdef __cplusplus
extern "C" {
#endif

47
include/wx/unix/gsockunx.h
View File

@@ -129,53 +129,6 @@ struct _GAddress
}
#endif /* __cplusplus */
/* Compatibility methods to support old C API (from gsocket.h) */
inline void GSocket_Shutdown(GSocket *socket)
{ socket->Shutdown(); }
inline GSocketError GSocket_SetLocal(GSocket *socket, GAddress *address)
{ return socket->SetLocal(address); }
inline GSocketError GSocket_SetPeer(GSocket *socket, GAddress *address)
{ return socket->SetPeer(address); }
inline GAddress *GSocket_GetLocal(GSocket *socket)
{ return socket->GetLocal(); }
inline GAddress *GSocket_GetPeer(GSocket *socket)
{ return socket->GetPeer(); }
inline GSocketError GSocket_SetServer(GSocket *socket)
{ return socket->SetServer(); }
inline GSocket *GSocket_WaitConnection(GSocket *socket)
{ return socket->WaitConnection(); }
inline int GSocket_SetReusable(GSocket *socket)
{ return socket->SetReusable(); }
inline GSocketError GSocket_Connect(GSocket *socket, GSocketStream stream)
{ return socket->Connect(stream); }
inline GSocketError GSocket_SetNonOriented(GSocket *socket)
{ return socket->SetNonOriented(); }
inline int GSocket_Read(GSocket *socket, char *buffer, int size)
{ return socket->Read(buffer,size); }
inline int GSocket_Write(GSocket *socket, const char *buffer, int size)
{ return socket->Write(buffer,size); }
inline GSocketEventFlags GSocket_Select(GSocket *socket, GSocketEventFlags flags)
{ return socket->Select(flags); }
inline void GSocket_SetNonBlocking(GSocket *socket, int non_block)
{ socket->SetNonBlocking(non_block); }
inline void GSocket_SetTimeout(GSocket *socket, unsigned long millisec)
{ socket->SetTimeout(millisec); }
inline GSocketError GSocket_GetError(GSocket *socket)
{ return socket->GetError(); }
inline void GSocket_SetCallback(GSocket *socket, GSocketEventFlags flags,
GSocketCallback fallback, char *cdata)
{ socket->SetCallback(flags,fallback,cdata); }
inline void GSocket_UnsetCallback(GSocket *socket, GSocketEventFlags flags)
{ socket->UnsetCallback(flags); }
inline GSocketError GSocket_GetSockOpt(GSocket *socket, int level, int optname,
void *optval, int *optlen)
{ return socket->GetSockOpt(level,optname,optval,optlen); }
inline GSocketError GSocket_SetSockOpt(GSocket *socket, int level, int optname,
const void *optval, int optlen)
{ return socket->SetSockOpt(level,optname,optval,optlen); }
inline void GSocket_destroy(GSocket *socket)
{ delete socket; }
#ifdef __cplusplus
extern "C" {