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

Allow using socket from both wxBase and wxCore (adopting to changes from r50831)

Browse Source 
Use Unix' gsocketiohandler files for wxBase.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51055 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis
2008-01-06 22:47:01 +00:00
parent 2c24e7adf0
commit f90913e2ac
4 changed files with 27 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/bakefiles/files.bkl
View File

@@ -269,6 +269,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<set var="BASE_OS2_SRC" hints="files">
src/common/fdiodispatcher.cpp
src/common/selectdispatcher.cpp
src/common/gsocketiohandler.cpp
src/unix/appunix.cpp
src/unix/evtloopunix.cpp
src/unix/timerunx.cpp
@@ -284,6 +285,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<set var="BASE_OS2_HDR" hints="files">
wx/private/fdiodispatcher.h
wx/private/selectdispatcher.h
wx/private/gsocketiohandler.h
wx/unix/app.h
wx/os2/apptbase.h
wx/os2/apptrait.h

6
include/wx/os2/apptbase.h
View File

@@ -27,6 +27,12 @@ public:
// Clean up message queue.
virtual void TerminateGui(unsigned long ulHab);
#if wxUSE_SOCKETS
// returns the select()-based socket manager for console applications which
// is also used by some ports (wxX11, wxDFB) in the GUI build (hence it is
// here and not in wxConsoleAppTraits)
virtual GSocketManager *GetSocketManager();
#endif
};
#endif // _WX_OS2_APPTBASE_H_

3
include/wx/os2/apptrait.h
View File

@@ -47,6 +47,9 @@ public:
#ifdef __WXGTK__
virtual wxString GetDesktopEnvironment() const;
#endif
#if wxUSE_SOCKETS
virtual GSocketManager *GetSocketManager();
#endif
};
#endif // wxUSE_GUI

67
src/os2/gsockpm.cpp
View File

@@ -31,67 +31,32 @@ static void _GSocket_PM_Output(void *data)
socket->Detected_Write();
}
void GSocketGUIFunctionsTableConcrete::Install_Callback(GSocket *socket, GSocketEvent event)
class PMSocketManager : public GSocketInputBasedManager
{
int *m_id = (int *)(socket->m_gui_dependent);
int c;
if (socket->m_fd == -1)
return;
switch (event)
public:
virtual int AddInput(GSocket *socket, SocketDir d)
{
case GSOCK_LOST: /* fall-through */
case GSOCK_INPUT: c = 0; break;
case GSOCK_OUTPUT: c = 1; break;
case GSOCK_CONNECTION: c = ((socket->m_server) ? 0 : 1); break;
default: return;
if (d == FD_OUTPUT)
return wxTheApp->AddSocketHandler(socket->m_fd, wxSockWriteMask,
_GSocket_PM_Output, (void *)socket);
else
return wxTheApp->AddSocketHandler(socket->m_fd, wxSockReadMask,
_GSocket_PM_Input, (void *)socket);
}
if (m_id[c] != -1)
wxTheApp->RemoveSocketHandler(m_id[c]);
if (c == 0)
virtual void RemoveInput(int fd)
{
m_id[0] = wxTheApp->AddSocketHandler(socket->m_fd, wxSockReadMask,
_GSocket_PM_Input, (void *)socket);
wxTheApp->RemoveSocketHandler(fd);
}
else
{
m_id[1] = wxTheApp->AddSocketHandler(socket->m_fd, wxSockWriteMask,
_GSocket_PM_Output, (void *)socket);
}
}
};
void GSocketGUIFunctionsTableConcrete::Uninstall_Callback(GSocket *socket, GSocketEvent event)
GSocketManager *wxGUIAppTraits::GetSocketManager()
{
int *m_id = (int *)(socket->m_gui_dependent);
int c;
switch (event)
{
case GSOCK_LOST: /* fall-through */
case GSOCK_INPUT: c = 0; break;
case GSOCK_OUTPUT: c = 1; break;
case GSOCK_CONNECTION: c = ((socket->m_server) ? 0 : 1); break;
default: return;
}
if (m_id[c] != -1)
wxTheApp->RemoveSocketHandler(m_id[c]);
m_id[c] = -1;
static GTKSocketManager s_manager;
return &s_manager;
}
void GSocketGUIFunctionsTableConcrete::Enable_Events(GSocket *socket)
{
Install_Callback(socket, GSOCK_INPUT);
Install_Callback(socket, GSOCK_OUTPUT);
}
void GSocketGUIFunctionsTableConcrete::Disable_Events(GSocket *socket)
{
Uninstall_Callback(socket, GSOCK_INPUT);
Uninstall_Callback(socket, GSOCK_OUTPUT);
}
#else /* !wxUSE_SOCKETS */