diff options
| author | Matthias Clasen <matthiasc@src.gnome.org> | 2005-04-10 01:01:18 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2005-04-10 01:01:18 +0000 |
| commit | 324872e3b4682974d5c925a96217c461441a3f83 (patch) | |
| tree | eb01d41f06b87393c609b30a08471610ff4ec79c | |
| parent | 136ec5c222a4cf5da740df940e23adc96c65d4e9 (diff) | |
| download | gtk+-324872e3b4682974d5c925a96217c461441a3f83.tar.gz | |
Some more fixes necessary to make building with gcc 4 work.
* gdk/x11/gdkinput-xfree.c:
* gdk/x11/gdkinput-none.c:
* gdk/gtk.symbols: Some more fixes necessary to
make building with gcc 4 work.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 5 | ||||
| -rw-r--r-- | gdk/gdk.symbols | 12 | ||||
| -rw-r--r-- | gdk/x11/gdkinput-none.c | 2 | ||||
| -rw-r--r-- | gdk/x11/gdkinput-xfree.c | 2 |
6 files changed, 29 insertions, 2 deletions
@@ -1,5 +1,10 @@ 2005-04-09 Matthias Clasen <mclasen@redhat.com> + * gdk/x11/gdkinput-xfree.c: + * gdk/x11/gdkinput-none.c: + * gdk/gtk.symbols: Some more fixes necessary to + make building with gcc 4 work. + Add 16x16 versions of the zoom icons and of GTK_STOCK_INDEX. Some of the images were taken from the hicolor icon theme, and were originally created diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c2d63b70e3..25cd9acc65 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,10 @@ 2005-04-09 Matthias Clasen <mclasen@redhat.com> + * gdk/x11/gdkinput-xfree.c: + * gdk/x11/gdkinput-none.c: + * gdk/gtk.symbols: Some more fixes necessary to + make building with gcc 4 work. + Add 16x16 versions of the zoom icons and of GTK_STOCK_INDEX. Some of the images were taken from the hicolor icon theme, and were originally created diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index c2d63b70e3..25cd9acc65 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,10 @@ 2005-04-09 Matthias Clasen <mclasen@redhat.com> + * gdk/x11/gdkinput-xfree.c: + * gdk/x11/gdkinput-none.c: + * gdk/gtk.symbols: Some more fixes necessary to + make building with gcc 4 work. + Add 16x16 versions of the zoom icons and of GTK_STOCK_INDEX. Some of the images were taken from the hicolor icon theme, and were originally created diff --git a/gdk/gdk.symbols b/gdk/gdk.symbols index 34a9f7e027..b5904f0960 100644 --- a/gdk/gdk.symbols +++ b/gdk/gdk.symbols @@ -372,6 +372,18 @@ gdk_device_get_core_pointer #if IN_HEADER(__GDK_INPUT_H__) #if IN_FILE(__GDK_INPUT_X11_C__) gdk_device_get_state +#endif +#endif + +#if IN_HEADER(__GDK_INPUT_H__) +#if IN_FILE(__GDK_INPUT_XFREE_C__) +gdk_device_set_mode +#endif +#endif + +#if IN_HEADER(__GDK_INPUT_H__) +#if IN_FILE(__GDK_INPUT_NONE_C__) +gdk_device_get_state gdk_device_set_mode #endif #endif diff --git a/gdk/x11/gdkinput-none.c b/gdk/x11/gdkinput-none.c index 0e8cc2c971..91554b378d 100644 --- a/gdk/x11/gdkinput-none.c +++ b/gdk/x11/gdkinput-none.c @@ -127,5 +127,5 @@ gdk_device_set_mode (GdkDevice *device, return FALSE; } -#define __GDK_INPUT_X11_C__ +#define __GDK_INPUT_NONE_C__ #include "gdkaliasdef.c" diff --git a/gdk/x11/gdkinput-xfree.c b/gdk/x11/gdkinput-xfree.c index e384d13863..fcebbca69e 100644 --- a/gdk/x11/gdkinput-xfree.c +++ b/gdk/x11/gdkinput-xfree.c @@ -359,5 +359,5 @@ _gdk_input_ungrab_pointer (GdkDisplay *display, } } -#define __GDK_INPUT_X11_C__ +#define __GDK_INPUT_XFREE_C__ #include "gdkaliasdef.c" |