diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-10-12 17:24:23 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-10-12 17:24:23 +0100 |
| commit | 046936ed7179cfa413dfb2668b03d7e684bb7dbd (patch) | |
| tree | 48e7b42ee75bd201de31a7ab455455f9cee3c8f2 /include | |
| parent | a73549f99612f758dec0fdea6ae1c30b6c709a0b (diff) | |
| parent | 58296cb61866195297510e946a51acc5f0b9639e (diff) | |
| download | qemu-046936ed7179cfa413dfb2668b03d7e684bb7dbd.zip qemu-046936ed7179cfa413dfb2668b03d7e684bb7dbd.tar.gz qemu-046936ed7179cfa413dfb2668b03d7e684bb7dbd.tar.bz2 | |
Merge remote-tracking branch 'remotes/kraxel/tags/ui2-20181012-pull-request' into staging
ui: drop gtk2 support.
# gpg: Signature made Fri 12 Oct 2018 15:05:25 BST
# gpg: using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/ui2-20181012-pull-request:
ui: increase min required GTK3 version to 3.14.0
ui: remove support for GTK2 in favour of GTK3
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/ui/gtk.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/include/ui/gtk.h b/include/ui/gtk.h index a79780a..99edd3c 100644 --- a/include/ui/gtk.h +++ b/include/ui/gtk.h @@ -27,15 +27,6 @@ #include "ui/egl-context.h" #endif -/* Compatibility define to let us build on both Gtk2 and Gtk3 */ -#if GTK_CHECK_VERSION(3, 0, 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 - typedef struct GtkDisplayState GtkDisplayState; typedef struct VirtualGfxConsole { |