diff options
author | Tor Lillqvist <tml@novell.com> | 2009-02-15 22:51:56 +0000 |
---|---|---|
committer | Tor Lillqvist <tml@src.gnome.org> | 2009-02-15 22:51:56 +0000 |
commit | b62e3113e663fe170c85b228f5ec298f2a87f977 (patch) | |
tree | 7cbf80fc94f33d3da3f0528b2e51fc6a397bcc53 /gdk/win32 | |
parent | 99af7a8059e53f7046b14035629f85e8f4e39b76 (diff) | |
download | gtk+-b62e3113e663fe170c85b228f5ec298f2a87f977.tar.gz |
Bug 571873 - Compile error with gdk/win32/gdkselection-win32.c
2009-02-16 Tor Lillqvist <tml@novell.com>
Bug 571873 - Compile error with gdk/win32/gdkselection-win32.c
* gdk/win32/gdkselection-win32.c (gdk_selection_convert): Cast
gpointer to char * before pointer arithmetic to avoid compilation
error with MSVC.
(_gdk_selection_property_delete): Remove unused variable.
svn path=/trunk/; revision=22337
Diffstat (limited to 'gdk/win32')
-rw-r--r-- | gdk/win32/gdkselection-win32.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/gdk/win32/gdkselection-win32.c b/gdk/win32/gdkselection-win32.c index 73588b8d90..bf87ad7040 100644 --- a/gdk/win32/gdkselection-win32.c +++ b/gdk/win32/gdkselection-win32.c @@ -686,7 +686,7 @@ gdk_selection_convert (GdkWindow *requestor, if (make_dibv5) { - BITMAPV5HEADER *bV5 = data + sizeof (BITMAPFILEHEADER); + BITMAPV5HEADER *bV5 = (BITMAPV5HEADER *) ((char *) data + sizeof (BITMAPFILEHEADER)); guchar *p; int i; @@ -741,7 +741,7 @@ gdk_selection_convert (GdkWindow *requestor, bi->biSize + bi->biClrUsed * sizeof (RGBQUAD)); - memcpy (data + sizeof (BITMAPFILEHEADER), + memcpy ((char *) data + sizeof (BITMAPFILEHEADER), bi, data_length); } @@ -877,8 +877,6 @@ gdk_selection_property_get (GdkWindow *requestor, void _gdk_selection_property_delete (GdkWindow *window) { - GdkSelProp *prop; - GDK_NOTE (DND, g_print ("_gdk_selection_property_delete: %p (no-op)\n", GDK_WINDOW_HWND (window))); |