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

Fixed linkage errors (C linkage vs. C++ linkage) caused by switching gsocket

Browse Source 
from C to C++ code.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28714 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis
2004-08-08 20:44:14 +00:00
parent c39ee0ad46
commit 621b457432
2 changed files with 8 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/os2/app.cpp
View File

@@ -115,35 +115,10 @@ struct GsocketCallbackInfo{
void* gsock;
};
// These defines and wrapper functions are used here and in gsockpm.c
// These defines are used here and in gsockpm.cpp
#define wxSockReadMask 0x01
#define wxSockWriteMask 0x02
#ifdef __EMX__
extern "C"
int wxAppAddSocketHandler(int handle, int mask,
void (*callback)(void*), void * gsock)
{
return wxTheApp->AddSocketHandler(handle, mask, callback, gsock);
}
extern "C"
void wxAppRemoveSocketHandler(int handle)
{
wxTheApp->RemoveSocketHandler(handle);
}
#else
// Linkage mode problems using callbacks with extern C in a .cpp module
int wxAppAddSocketHandler(int handle, int mask,
void (*callback)(void*), void * gsock)
{
return wxTheApp->AddSocketHandler(handle, mask, callback, gsock);
}
void wxAppRemoveSocketHandler(int handle)
{
wxTheApp->RemoveSocketHandler(handle);
}
#endif
void wxApp::HandleSockets()
{
bool pendingEvent = FALSE;

14
src/os2/gsockpm.cpp
View File

@@ -13,11 +13,7 @@
#include <stdlib.h>
#include "wx/unix/gsockunx.h"
#include "wx/gsocket.h"
extern int wxAppAddSocketHandler(int handle, int mask,
void (*callback)(void*), void * gsock);
extern void wxAppRemoveSocketHandler(int handle);
#include "wx/app.h"
#define wxSockReadMask 0x01
#define wxSockWriteMask 0x02
@@ -80,16 +76,16 @@ void GSocketGUIFunctionsTableConcrete::Install_Callback(GSocket *socket, GSocket
}
if (m_id[c] != -1)
wxAppRemoveSocketHandler(m_id[c]);
wxTheApp->RemoveSocketHandler(m_id[c]);
if (c == 0)
{
m_id[0] = wxAppAddSocketHandler(socket->m_fd, wxSockReadMask,
m_id[0] = wxTheApp->AddSocketHandler(socket->m_fd, wxSockReadMask,
_GSocket_PM_Input, (void *)socket);
}
else
{
m_id[1] = wxAppAddSocketHandler(socket->m_fd, wxSockWriteMask,
m_id[1] = wxTheApp->AddSocketHandler(socket->m_fd, wxSockWriteMask,
_GSocket_PM_Output, (void *)socket);
}
}
@@ -107,7 +103,7 @@ void GSocketGUIFunctionsTableConcrete::Uninstall_Callback(GSocket *socket, GSock
default: return;
}
if (m_id[c] != -1)
wxAppRemoveSocketHandler(m_id[c]);
wxTheApp->RemoveSocketHandler(m_id[c]);
m_id[c] = -1;
}