diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2013-05-14 14:23:37 +0200 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@redhat.com> | 2013-05-14 14:40:03 +0200 |
| commit | ece9df86a81e425821f513df258c0f40c6faf214 (patch) | |
| tree | c1a6e2ddaa0a49bd67725c8b62e4eabb2211dda2 | |
| parent | 90d3f3aac8080077064de54f571dce2f859d9788 (diff) | |
Build fixes for gtk+2
| -rw-r--r-- | gtk/spice-widget.c | 9 | ||||
| -rw-r--r-- | gtk/vncdisplaykeymap.c | 5 |
2 files changed, 9 insertions, 5 deletions
diff --git a/gtk/spice-widget.c b/gtk/spice-widget.c index 3694da3..7eb9e64 100644 --- a/gtk/spice-widget.c +++ b/gtk/spice-widget.c @@ -46,17 +46,16 @@ /* Some compatibility defines to let us build on both Gtk2 and Gtk3 */ #if GTK_CHECK_VERSION (2, 91, 0) - static inline void gdk_drawable_get_size(GdkWindow *w, gint *ww, gint *wh) { *ww = gdk_window_get_width(w); *wh = gdk_window_get_height(w); } +#endif -#define GtkObject GtkWidget -#define GtkObjectClass GtkWidgetClass -#define GTK_OBJECT_CLASS(c) GTK_WIDGET_CLASS(c) - +#if !GTK_CHECK_VERSION (2, 91, 0) +#define GDK_IS_X11_DISPLAY(D) TRUE +#define gdk_window_get_display(W) gdk_drawable_get_display(GDK_DRAWABLE(W)) #endif #if !GTK_CHECK_VERSION(2, 20, 0) diff --git a/gtk/vncdisplaykeymap.c b/gtk/vncdisplaykeymap.c index d901811..543761d 100644 --- a/gtk/vncdisplaykeymap.c +++ b/gtk/vncdisplaykeymap.c @@ -48,6 +48,11 @@ #define GDK_Tab GDK_KEY_Tab #endif +#if !GLIB_CHECK_VERSION(3,0,0) +#define gdk_window_get_display(W) gdk_drawable_get_display(GDK_DRAWABLE(W)) +#endif + + /* keycode translation for sending ISO_Left_Send * to vncserver */ |