From 0a6476912577c0ce870b1d2a829825bad45d35a8 Mon Sep 17 00:00:00 2001 From: David Elliott Date: Wed, 4 Aug 2004 03:04:53 +0000 Subject: [PATCH] C->C++ conversion git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28611 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/gsockgtk.cpp | 31 +++++++++++++++------------ src/gtk1/gsockgtk.cpp | 31 +++++++++++++++------------ src/mac/carbon/gsockosx.cpp | 27 ++++++++++++----------- src/mac/corefoundation/gsockosx.cpp | 27 ++++++++++++----------- src/motif/gsockmot.cpp | 33 ++++++++++++++++------------- src/x11/gsockx11.cpp | 31 +++++++++++++++------------ 6 files changed, 99 insertions(+), 81 deletions(-) diff --git a/src/gtk/gsockgtk.cpp b/src/gtk/gsockgtk.cpp index 0115e520db..ffcd57563c 100644 --- a/src/gtk/gsockgtk.cpp +++ b/src/gtk/gsockgtk.cpp @@ -28,21 +28,24 @@ void _GSocket_GDK_Input(gpointer data, GSocket *socket = (GSocket *)data; if (condition & GDK_INPUT_READ) - socket->m_functions->Detected_Read(socket); + socket->Detected_Read(); if (condition & GDK_INPUT_WRITE) - socket->m_functions->Detected_Write(socket); + socket->Detected_Write(); } -int _GSocket_GUI_Init(void) +bool GSocketGUIFunctionsTableConcrete::CanUseEventLoop() +{ return true; } + +bool GSocketGUIFunctionsTableConcrete::OnInit(void) { return 1; } -void _GSocket_GUI_Cleanup(void) +void GSocketGUIFunctionsTableConcrete::OnExit(void) { } -int _GSocket_GUI_Init_Socket(GSocket *socket) +bool GSocketGUIFunctionsTableConcrete::Init_Socket(GSocket *socket) { gint *m_id; @@ -55,12 +58,12 @@ int _GSocket_GUI_Init_Socket(GSocket *socket) return TRUE; } -void _GSocket_GUI_Destroy_Socket(GSocket *socket) +void GSocketGUIFunctionsTableConcrete::Destroy_Socket(GSocket *socket) { free(socket->m_gui_dependent); } -void _GSocket_Install_Callback(GSocket *socket, GSocketEvent event) +void GSocketGUIFunctionsTableConcrete::Install_Callback(GSocket *socket, GSocketEvent event) { gint *m_id = (gint *)(socket->m_gui_dependent); int c; @@ -86,7 +89,7 @@ void _GSocket_Install_Callback(GSocket *socket, GSocketEvent event) (gpointer)socket); } -void _GSocket_Uninstall_Callback(GSocket *socket, GSocketEvent event) +void GSocketGUIFunctionsTableConcrete::Uninstall_Callback(GSocket *socket, GSocketEvent event) { gint *m_id = (gint *)(socket->m_gui_dependent); int c; @@ -108,16 +111,16 @@ void _GSocket_Uninstall_Callback(GSocket *socket, GSocketEvent event) m_id[c] = -1; } -void _GSocket_Enable_Events(GSocket *socket) +void GSocketGUIFunctionsTableConcrete::Enable_Events(GSocket *socket) { - _GSocket_Install_Callback(socket, GSOCK_INPUT); - _GSocket_Install_Callback(socket, GSOCK_OUTPUT); + Install_Callback(socket, GSOCK_INPUT); + Install_Callback(socket, GSOCK_OUTPUT); } -void _GSocket_Disable_Events(GSocket *socket) +void GSocketGUIFunctionsTableConcrete::Disable_Events(GSocket *socket) { - _GSocket_Uninstall_Callback(socket, GSOCK_INPUT); - _GSocket_Uninstall_Callback(socket, GSOCK_OUTPUT); + Uninstall_Callback(socket, GSOCK_INPUT); + Uninstall_Callback(socket, GSOCK_OUTPUT); } #else /* !wxUSE_SOCKETS */ diff --git a/src/gtk1/gsockgtk.cpp b/src/gtk1/gsockgtk.cpp index 0115e520db..ffcd57563c 100644 --- a/src/gtk1/gsockgtk.cpp +++ b/src/gtk1/gsockgtk.cpp @@ -28,21 +28,24 @@ void _GSocket_GDK_Input(gpointer data, GSocket *socket = (GSocket *)data; if (condition & GDK_INPUT_READ) - socket->m_functions->Detected_Read(socket); + socket->Detected_Read(); if (condition & GDK_INPUT_WRITE) - socket->m_functions->Detected_Write(socket); + socket->Detected_Write(); } -int _GSocket_GUI_Init(void) +bool GSocketGUIFunctionsTableConcrete::CanUseEventLoop() +{ return true; } + +bool GSocketGUIFunctionsTableConcrete::OnInit(void) { return 1; } -void _GSocket_GUI_Cleanup(void) +void GSocketGUIFunctionsTableConcrete::OnExit(void) { } -int _GSocket_GUI_Init_Socket(GSocket *socket) +bool GSocketGUIFunctionsTableConcrete::Init_Socket(GSocket *socket) { gint *m_id; @@ -55,12 +58,12 @@ int _GSocket_GUI_Init_Socket(GSocket *socket) return TRUE; } -void _GSocket_GUI_Destroy_Socket(GSocket *socket) +void GSocketGUIFunctionsTableConcrete::Destroy_Socket(GSocket *socket) { free(socket->m_gui_dependent); } -void _GSocket_Install_Callback(GSocket *socket, GSocketEvent event) +void GSocketGUIFunctionsTableConcrete::Install_Callback(GSocket *socket, GSocketEvent event) { gint *m_id = (gint *)(socket->m_gui_dependent); int c; @@ -86,7 +89,7 @@ void _GSocket_Install_Callback(GSocket *socket, GSocketEvent event) (gpointer)socket); } -void _GSocket_Uninstall_Callback(GSocket *socket, GSocketEvent event) +void GSocketGUIFunctionsTableConcrete::Uninstall_Callback(GSocket *socket, GSocketEvent event) { gint *m_id = (gint *)(socket->m_gui_dependent); int c; @@ -108,16 +111,16 @@ void _GSocket_Uninstall_Callback(GSocket *socket, GSocketEvent event) m_id[c] = -1; } -void _GSocket_Enable_Events(GSocket *socket) +void GSocketGUIFunctionsTableConcrete::Enable_Events(GSocket *socket) { - _GSocket_Install_Callback(socket, GSOCK_INPUT); - _GSocket_Install_Callback(socket, GSOCK_OUTPUT); + Install_Callback(socket, GSOCK_INPUT); + Install_Callback(socket, GSOCK_OUTPUT); } -void _GSocket_Disable_Events(GSocket *socket) +void GSocketGUIFunctionsTableConcrete::Disable_Events(GSocket *socket) { - _GSocket_Uninstall_Callback(socket, GSOCK_INPUT); - _GSocket_Uninstall_Callback(socket, GSOCK_OUTPUT); + Uninstall_Callback(socket, GSOCK_INPUT); + Uninstall_Callback(socket, GSOCK_OUTPUT); } #else /* !wxUSE_SOCKETS */ diff --git a/src/mac/carbon/gsockosx.cpp b/src/mac/carbon/gsockosx.cpp index b9df39196e..a68578e1c9 100644 --- a/src/mac/carbon/gsockosx.cpp +++ b/src/mac/carbon/gsockosx.cpp @@ -35,13 +35,13 @@ void Mac_Socket_Callback(CFSocketRef s, CFSocketCallBackType callbackType, { case kCFSocketConnectCallBack: assert(!socket->m_server); - socket->m_functions->Detected_Write(socket); + socket->Detected_Write(); break; case kCFSocketReadCallBack: - socket->m_functions->Detected_Read(socket); + socket->Detected_Read(); break; case kCFSocketWriteCallBack: - socket->m_functions->Detected_Write(socket); + socket->Detected_Write(); break; default: break; /* We shouldn't get here. */ @@ -76,16 +76,19 @@ struct MacGSocketData* _GSocket_Get_Mac_Socket(GSocket *socket) return data; } -int _GSocket_GUI_Init(void) +bool GSocketGUIFunctionsTableConcrete::CanUseEventLoop() +{ return true; } + +bool GSocketGUIFunctionsTableConcrete::OnInit(void) { - return 1; + return true; } -void _GSocket_GUI_Cleanup(void) +void GSocketGUIFunctionsTableConcrete::OnExit(void) { } -int _GSocket_GUI_Init_Socket(GSocket *socket) +bool GSocketGUIFunctionsTableConcrete::Init_Socket(GSocket *socket) { struct MacGSocketData *data = (struct MacGSocketData *)malloc(sizeof(struct MacGSocketData)); if (data) @@ -98,7 +101,7 @@ int _GSocket_GUI_Init_Socket(GSocket *socket) return 0; } -void _GSocket_GUI_Destroy_Socket(GSocket *socket) +void GSocketGUIFunctionsTableConcrete::Destroy_Socket(GSocket *socket) { struct MacGSocketData *data = (struct MacGSocketData*)(socket->m_gui_dependent); if (data) @@ -108,7 +111,7 @@ void _GSocket_GUI_Destroy_Socket(GSocket *socket) } } -void _GSocket_Install_Callback(GSocket *socket, GSocketEvent event) +void GSocketGUIFunctionsTableConcrete::Install_Callback(GSocket *socket, GSocketEvent event) { int c; struct MacGSocketData* data = _GSocket_Get_Mac_Socket(socket); @@ -134,7 +137,7 @@ void _GSocket_Install_Callback(GSocket *socket, GSocketEvent event) CFSocketEnableCallBacks(data->socket, c); } -void _GSocket_Uninstall_Callback(GSocket *socket, GSocketEvent event) +void GSocketGUIFunctionsTableConcrete::Uninstall_Callback(GSocket *socket, GSocketEvent event) { int c; struct MacGSocketData* data = _GSocket_Get_Mac_Socket(socket); @@ -160,7 +163,7 @@ void _GSocket_Uninstall_Callback(GSocket *socket, GSocketEvent event) CFSocketDisableCallBacks(data->socket, c); } -void _GSocket_Enable_Events(GSocket *socket) +void GSocketGUIFunctionsTableConcrete::Enable_Events(GSocket *socket) { struct MacGSocketData* data = _GSocket_Get_Mac_Socket(socket); if (!data) return; @@ -168,7 +171,7 @@ void _GSocket_Enable_Events(GSocket *socket) CFRunLoopAddSource(CFRunLoopGetCurrent(), data->source, kCFRunLoopDefaultMode); } -void _GSocket_Disable_Events(GSocket *socket) +void GSocketGUIFunctionsTableConcrete::Disable_Events(GSocket *socket) { struct MacGSocketData* data = _GSocket_Get_Mac_Socket(socket); if (!data) return; diff --git a/src/mac/corefoundation/gsockosx.cpp b/src/mac/corefoundation/gsockosx.cpp index b9df39196e..a68578e1c9 100644 --- a/src/mac/corefoundation/gsockosx.cpp +++ b/src/mac/corefoundation/gsockosx.cpp @@ -35,13 +35,13 @@ void Mac_Socket_Callback(CFSocketRef s, CFSocketCallBackType callbackType, { case kCFSocketConnectCallBack: assert(!socket->m_server); - socket->m_functions->Detected_Write(socket); + socket->Detected_Write(); break; case kCFSocketReadCallBack: - socket->m_functions->Detected_Read(socket); + socket->Detected_Read(); break; case kCFSocketWriteCallBack: - socket->m_functions->Detected_Write(socket); + socket->Detected_Write(); break; default: break; /* We shouldn't get here. */ @@ -76,16 +76,19 @@ struct MacGSocketData* _GSocket_Get_Mac_Socket(GSocket *socket) return data; } -int _GSocket_GUI_Init(void) +bool GSocketGUIFunctionsTableConcrete::CanUseEventLoop() +{ return true; } + +bool GSocketGUIFunctionsTableConcrete::OnInit(void) { - return 1; + return true; } -void _GSocket_GUI_Cleanup(void) +void GSocketGUIFunctionsTableConcrete::OnExit(void) { } -int _GSocket_GUI_Init_Socket(GSocket *socket) +bool GSocketGUIFunctionsTableConcrete::Init_Socket(GSocket *socket) { struct MacGSocketData *data = (struct MacGSocketData *)malloc(sizeof(struct MacGSocketData)); if (data) @@ -98,7 +101,7 @@ int _GSocket_GUI_Init_Socket(GSocket *socket) return 0; } -void _GSocket_GUI_Destroy_Socket(GSocket *socket) +void GSocketGUIFunctionsTableConcrete::Destroy_Socket(GSocket *socket) { struct MacGSocketData *data = (struct MacGSocketData*)(socket->m_gui_dependent); if (data) @@ -108,7 +111,7 @@ void _GSocket_GUI_Destroy_Socket(GSocket *socket) } } -void _GSocket_Install_Callback(GSocket *socket, GSocketEvent event) +void GSocketGUIFunctionsTableConcrete::Install_Callback(GSocket *socket, GSocketEvent event) { int c; struct MacGSocketData* data = _GSocket_Get_Mac_Socket(socket); @@ -134,7 +137,7 @@ void _GSocket_Install_Callback(GSocket *socket, GSocketEvent event) CFSocketEnableCallBacks(data->socket, c); } -void _GSocket_Uninstall_Callback(GSocket *socket, GSocketEvent event) +void GSocketGUIFunctionsTableConcrete::Uninstall_Callback(GSocket *socket, GSocketEvent event) { int c; struct MacGSocketData* data = _GSocket_Get_Mac_Socket(socket); @@ -160,7 +163,7 @@ void _GSocket_Uninstall_Callback(GSocket *socket, GSocketEvent event) CFSocketDisableCallBacks(data->socket, c); } -void _GSocket_Enable_Events(GSocket *socket) +void GSocketGUIFunctionsTableConcrete::Enable_Events(GSocket *socket) { struct MacGSocketData* data = _GSocket_Get_Mac_Socket(socket); if (!data) return; @@ -168,7 +171,7 @@ void _GSocket_Enable_Events(GSocket *socket) CFRunLoopAddSource(CFRunLoopGetCurrent(), data->source, kCFRunLoopDefaultMode); } -void _GSocket_Disable_Events(GSocket *socket) +void GSocketGUIFunctionsTableConcrete::Disable_Events(GSocket *socket) { struct MacGSocketData* data = _GSocket_Get_Mac_Socket(socket); if (!data) return; diff --git a/src/motif/gsockmot.cpp b/src/motif/gsockmot.cpp index e4904f6610..d047899ae4 100644 --- a/src/motif/gsockmot.cpp +++ b/src/motif/gsockmot.cpp @@ -15,14 +15,14 @@ #include "wx/gsocket.h" #include "wx/unix/gsockunx.h" -extern XtAppContext wxGetAppContext(); +extern "C" XtAppContext wxGetAppContext(); static void _GSocket_Motif_Input(XtPointer data, int *fid, XtInputId *id) { GSocket *socket = (GSocket *)data; - socket->m_functions->Detected_Read(socket); + socket->Detected_Read(); } static void _GSocket_Motif_Output(XtPointer data, int *fid, @@ -30,19 +30,22 @@ static void _GSocket_Motif_Output(XtPointer data, int *fid, { GSocket *socket = (GSocket *)data; - socket->m_functions->Detected_Write(socket); + socket->Detected_Write(); } -int _GSocket_GUI_Init(void) +bool GSocketGUIFunctionsTableConcrete::CanUseEventLoop() +{ return true; } + +bool GSocketGUIFunctionsTableConcrete::OnInit(void) { return 1; } -void _GSocket_GUI_Cleanup(void) +void GSocketGUIFunctionsTableConcrete::OnExit(void) { } -int _GSocket_GUI_Init_Socket(GSocket *socket) +bool GSocketGUIFunctionsTableConcrete::Init_Socket(GSocket *socket) { int *m_id; @@ -55,12 +58,12 @@ int _GSocket_GUI_Init_Socket(GSocket *socket) return TRUE; } -void _GSocket_GUI_Destroy_Socket(GSocket *socket) +void GSocketGUIFunctionsTableConcrete::Destroy_Socket(GSocket *socket) { free(socket->m_gui_dependent); } -void _GSocket_Install_Callback(GSocket *socket, GSocketEvent event) +void GSocketGUIFunctionsTableConcrete::Install_Callback(GSocket *socket, GSocketEvent event) { int *m_id = (int *)(socket->m_gui_dependent); int c; @@ -96,7 +99,7 @@ void _GSocket_Install_Callback(GSocket *socket, GSocketEvent event) } } -void _GSocket_Uninstall_Callback(GSocket *socket, GSocketEvent event) +void GSocketGUIFunctionsTableConcrete::Uninstall_Callback(GSocket *socket, GSocketEvent event) { int *m_id = (int *)(socket->m_gui_dependent); int c; @@ -116,16 +119,16 @@ void _GSocket_Uninstall_Callback(GSocket *socket, GSocketEvent event) m_id[c] = -1; } -void _GSocket_Enable_Events(GSocket *socket) +void GSocketGUIFunctionsTableConcrete::Enable_Events(GSocket *socket) { - _GSocket_Install_Callback(socket, GSOCK_INPUT); - _GSocket_Install_Callback(socket, GSOCK_OUTPUT); + Install_Callback(socket, GSOCK_INPUT); + Install_Callback(socket, GSOCK_OUTPUT); } -void _GSocket_Disable_Events(GSocket *socket) +void GSocketGUIFunctionsTableConcrete::Disable_Events(GSocket *socket) { - _GSocket_Uninstall_Callback(socket, GSOCK_INPUT); - _GSocket_Uninstall_Callback(socket, GSOCK_OUTPUT); + Uninstall_Callback(socket, GSOCK_INPUT); + Uninstall_Callback(socket, GSOCK_OUTPUT); } #else /* !wxUSE_SOCKETS */ diff --git a/src/x11/gsockx11.cpp b/src/x11/gsockx11.cpp index e42fd4942b..e3a1f470d0 100644 --- a/src/x11/gsockx11.cpp +++ b/src/x11/gsockx11.cpp @@ -32,26 +32,29 @@ static void _GSocket_X11_Input(int *fid, void* data) { GSocket *socket = (GSocket *)data; - socket->m_functions->Detected_Read(socket); + socket->Detected_Read(); } static void _GSocket_X11_Output(int *fid, void* data) { GSocket *socket = (GSocket *)data; - socket->m_functions->Detected_Write(socket); + socket->Detected_Write(); } -int _GSocket_GUI_Init(void) +bool GSocketGUIFunctionsTableConcrete::CanUseEventLoop() +{ return true; } + +bool GSocketGUIFunctionsTableConcrete::OnInit(void) { return 1; } -void _GSocket_GUI_Cleanup(void) +void GSocketGUIFunctionsTableConcrete::OnExit(void) { } -int _GSocket_GUI_Init_Socket(GSocket *socket) +bool GSocketGUIFunctionsTableConcrete::Init_Socket(GSocket *socket) { int *m_id; @@ -64,12 +67,12 @@ int _GSocket_GUI_Init_Socket(GSocket *socket) return TRUE; } -void _GSocket_GUI_Destroy_Socket(GSocket *socket) +void GSocketGUIFunctionsTableConcrete::Destroy_Socket(GSocket *socket) { free(socket->m_gui_dependent); } -void _GSocket_Install_Callback(GSocket *socket, GSocketEvent event) +void GSocketGUIFunctionsTableConcrete::Install_Callback(GSocket *socket, GSocketEvent event) { int *m_id = (int *)(socket->m_gui_dependent); int c; @@ -107,7 +110,7 @@ void _GSocket_Install_Callback(GSocket *socket, GSocketEvent event) } } -void _GSocket_Uninstall_Callback(GSocket *socket, GSocketEvent event) +void GSocketGUIFunctionsTableConcrete::Uninstall_Callback(GSocket *socket, GSocketEvent event) { int *m_id = (int *)(socket->m_gui_dependent); int c; @@ -132,16 +135,16 @@ void _GSocket_Uninstall_Callback(GSocket *socket, GSocketEvent event) m_id[c] = -1; } -void _GSocket_Enable_Events(GSocket *socket) +void GSocketGUIFunctionsTableConcrete::Enable_Events(GSocket *socket) { - _GSocket_Install_Callback(socket, GSOCK_INPUT); - _GSocket_Install_Callback(socket, GSOCK_OUTPUT); + Install_Callback(socket, GSOCK_INPUT); + Install_Callback(socket, GSOCK_OUTPUT); } -void _GSocket_Disable_Events(GSocket *socket) +void GSocketGUIFunctionsTableConcrete::Disable_Events(GSocket *socket) { - _GSocket_Uninstall_Callback(socket, GSOCK_INPUT); - _GSocket_Uninstall_Callback(socket, GSOCK_OUTPUT); + Uninstall_Callback(socket, GSOCK_INPUT); + Uninstall_Callback(socket, GSOCK_OUTPUT); } #else /* !wxUSE_SOCKETS */ -- 2.47.2