projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
code cleanup for the pen width condition (patch 1034942 + more)
[wxWidgets.git]
/
src
/
x11
/
gsockx11.cpp
diff --git
a/src/x11/gsockx11.cpp
b/src/x11/gsockx11.cpp
index e42fd4942b43b9a59c7eed0ed205927550cc4f5c..580af78d5bacc702643057bc52279802fb681bd3 100644
(file)
--- 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;
{
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;
}
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;
}
{
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;
{
int *m_id;
@@
-61,15
+64,15
@@
int _GSocket_GUI_Init_Socket(GSocket *socket)
m_id[0] = -1;
m_id[1] = -1;
m_id[0] = -1;
m_id[1] = -1;
- return
TRUE
;
+ return
true
;
}
}
-void
_GSocket_GUI_
Destroy_Socket(GSocket *socket)
+void
GSocketGUIFunctionsTableConcrete::
Destroy_Socket(GSocket *socket)
{
free(socket->m_gui_dependent);
}
{
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;
{
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;
{
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;
}
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 */
}
#else /* !wxUSE_SOCKETS */