|
Line
Link Here
|
| 0 |
-- wxPython-src-2.6.4.0-orig/src/gtk/gsockgtk.cpp |
0 |
++ wxPython-src-2.6.4.0/src/gtk/gsockgtk.cpp |
|
Lines 14-21
Link Here
|
| 14 |
#include <stdlib.h> |
14 |
#include <stdlib.h> |
| 15 |
#include <stdio.h> |
15 |
#include <stdio.h> |
| 16 |
|
16 |
|
| 17 |
#include <gdk/gdk.h> |
17 |
// Cannot include full gdk.h as it pulls in giotypes.h with |
| 18 |
#include <glib.h> |
18 |
// new GSocket conflicts since 2.21/2.22 |
|
|
19 |
#include <gdk/gdkinput.h> |
| 20 |
// deprecated, copy from gdk.h |
| 21 |
gint gdk_input_add (gint source, |
| 22 |
GdkInputCondition condition, |
| 23 |
GdkInputFunction function, |
| 24 |
gpointer data); |
| 25 |
void gdk_input_remove (gint tag); |
| 26 |
#include <glib/gtypes.h> |
| 19 |
|
27 |
|
| 20 |
#include "wx/gsocket.h" |
28 |
#include "wx/gsocket.h" |
| 21 |
#include "wx/unix/gsockunx.h" |
29 |
#include "wx/unix/gsockunx.h" |
