Commit c8940d6f authored by Tor Lillqvist's avatar Tor Lillqvist Committed by Tor Lillqvist

Append EXEEXT to ../gdk-pixbuf/gdk-pixbuf-csource.

2002-01-01  Tor Lillqvist  <tml@iki.fi>

	* demos/Makefile.am (test-inline-pixbufs.h): Append EXEEXT to
	../gdk-pixbuf/gdk-pixbuf-csource.

2001-12-31  Tor Lillqvist  <tml@iki.fi>

	* gdk/win32/gdkgc-win32.c (predraw_set_foreground): Improved error
	handling.
	(gdk_win32_hdc_get,gdk_win32_hdc_release): Silence gcc -Wall.

	* gdk/win32/gdkimage-win32.c (_gdk_win32_get_image): Silence gcc
	-Wall.  Use GDK_IS_PIXMAP_IMPL_WIN32 instead of GDK_IS_PIXMAP in
	one more place.

	* gdk/win32/gdkinput-win32.c (_gdk_input_other_event): Silence gcc
	-Wall.

	* gtk/Makefile.am (libgtk_win32_1_3_la_LDFLAGS): Add -lwsock32.
parent 77b8bac9
2002-01-01 Tor Lillqvist <tml@iki.fi>
* demos/Makefile.am (test-inline-pixbufs.h): Append EXEEXT to
../gdk-pixbuf/gdk-pixbuf-csource.
2001-12-31 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkgc-win32.c (predraw_set_foreground): Improved error
handling.
(gdk_win32_hdc_get,gdk_win32_hdc_release): Silence gcc -Wall.
* gdk/win32/gdkimage-win32.c (_gdk_win32_get_image): Silence gcc
-Wall. Use GDK_IS_PIXMAP_IMPL_WIN32 instead of GDK_IS_PIXMAP in
one more place.
* gdk/win32/gdkinput-win32.c (_gdk_input_other_event): Silence gcc
-Wall.
* gtk/Makefile.am (libgtk_win32_1_3_la_LDFLAGS): Add -lwsock32.
2002-01-01 Havoc Pennington <hp@pobox.com>
* gtk/gtktextview.c (gtk_text_view_get_default_attributes): doc
......
2002-01-01 Tor Lillqvist <tml@iki.fi>
* demos/Makefile.am (test-inline-pixbufs.h): Append EXEEXT to
../gdk-pixbuf/gdk-pixbuf-csource.
2001-12-31 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkgc-win32.c (predraw_set_foreground): Improved error
handling.
(gdk_win32_hdc_get,gdk_win32_hdc_release): Silence gcc -Wall.
* gdk/win32/gdkimage-win32.c (_gdk_win32_get_image): Silence gcc
-Wall. Use GDK_IS_PIXMAP_IMPL_WIN32 instead of GDK_IS_PIXMAP in
one more place.
* gdk/win32/gdkinput-win32.c (_gdk_input_other_event): Silence gcc
-Wall.
* gtk/Makefile.am (libgtk_win32_1_3_la_LDFLAGS): Add -lwsock32.
2002-01-01 Havoc Pennington <hp@pobox.com>
* gtk/gtktextview.c (gtk_text_view_get_default_attributes): doc
......
2002-01-01 Tor Lillqvist <tml@iki.fi>
* demos/Makefile.am (test-inline-pixbufs.h): Append EXEEXT to
../gdk-pixbuf/gdk-pixbuf-csource.
2001-12-31 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkgc-win32.c (predraw_set_foreground): Improved error
handling.
(gdk_win32_hdc_get,gdk_win32_hdc_release): Silence gcc -Wall.
* gdk/win32/gdkimage-win32.c (_gdk_win32_get_image): Silence gcc
-Wall. Use GDK_IS_PIXMAP_IMPL_WIN32 instead of GDK_IS_PIXMAP in
one more place.
* gdk/win32/gdkinput-win32.c (_gdk_input_other_event): Silence gcc
-Wall.
* gtk/Makefile.am (libgtk_win32_1_3_la_LDFLAGS): Add -lwsock32.
2002-01-01 Havoc Pennington <hp@pobox.com>
* gtk/gtktextview.c (gtk_text_view_get_default_attributes): doc
......
2002-01-01 Tor Lillqvist <tml@iki.fi>
* demos/Makefile.am (test-inline-pixbufs.h): Append EXEEXT to
../gdk-pixbuf/gdk-pixbuf-csource.
2001-12-31 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkgc-win32.c (predraw_set_foreground): Improved error
handling.
(gdk_win32_hdc_get,gdk_win32_hdc_release): Silence gcc -Wall.
* gdk/win32/gdkimage-win32.c (_gdk_win32_get_image): Silence gcc
-Wall. Use GDK_IS_PIXMAP_IMPL_WIN32 instead of GDK_IS_PIXMAP in
one more place.
* gdk/win32/gdkinput-win32.c (_gdk_input_other_event): Silence gcc
-Wall.
* gtk/Makefile.am (libgtk_win32_1_3_la_LDFLAGS): Add -lwsock32.
2002-01-01 Havoc Pennington <hp@pobox.com>
* gtk/gtktextview.c (gtk_text_view_get_default_attributes): doc
......
2002-01-01 Tor Lillqvist <tml@iki.fi>
* demos/Makefile.am (test-inline-pixbufs.h): Append EXEEXT to
../gdk-pixbuf/gdk-pixbuf-csource.
2001-12-31 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkgc-win32.c (predraw_set_foreground): Improved error
handling.
(gdk_win32_hdc_get,gdk_win32_hdc_release): Silence gcc -Wall.
* gdk/win32/gdkimage-win32.c (_gdk_win32_get_image): Silence gcc
-Wall. Use GDK_IS_PIXMAP_IMPL_WIN32 instead of GDK_IS_PIXMAP in
one more place.
* gdk/win32/gdkinput-win32.c (_gdk_input_other_event): Silence gcc
-Wall.
* gtk/Makefile.am (libgtk_win32_1_3_la_LDFLAGS): Add -lwsock32.
2002-01-01 Havoc Pennington <hp@pobox.com>
* gtk/gtktextview.c (gtk_text_view_get_default_attributes): doc
......
2002-01-01 Tor Lillqvist <tml@iki.fi>
* demos/Makefile.am (test-inline-pixbufs.h): Append EXEEXT to
../gdk-pixbuf/gdk-pixbuf-csource.
2001-12-31 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkgc-win32.c (predraw_set_foreground): Improved error
handling.
(gdk_win32_hdc_get,gdk_win32_hdc_release): Silence gcc -Wall.
* gdk/win32/gdkimage-win32.c (_gdk_win32_get_image): Silence gcc
-Wall. Use GDK_IS_PIXMAP_IMPL_WIN32 instead of GDK_IS_PIXMAP in
one more place.
* gdk/win32/gdkinput-win32.c (_gdk_input_other_event): Silence gcc
-Wall.
* gtk/Makefile.am (libgtk_win32_1_3_la_LDFLAGS): Add -lwsock32.
2002-01-01 Havoc Pennington <hp@pobox.com>
* gtk/gtktextview.c (gtk_text_view_get_default_attributes): doc
......
2002-01-01 Tor Lillqvist <tml@iki.fi>
* demos/Makefile.am (test-inline-pixbufs.h): Append EXEEXT to
../gdk-pixbuf/gdk-pixbuf-csource.
2001-12-31 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkgc-win32.c (predraw_set_foreground): Improved error
handling.
(gdk_win32_hdc_get,gdk_win32_hdc_release): Silence gcc -Wall.
* gdk/win32/gdkimage-win32.c (_gdk_win32_get_image): Silence gcc
-Wall. Use GDK_IS_PIXMAP_IMPL_WIN32 instead of GDK_IS_PIXMAP in
one more place.
* gdk/win32/gdkinput-win32.c (_gdk_input_other_event): Silence gcc
-Wall.
* gtk/Makefile.am (libgtk_win32_1_3_la_LDFLAGS): Add -lwsock32.
2002-01-01 Havoc Pennington <hp@pobox.com>
* gtk/gtktextview.c (gtk_text_view_get_default_attributes): doc
......
......@@ -31,7 +31,7 @@ noinst_PROGRAMS = \
testpixbuf-scale \
pixbuf-demo
test-inline-pixbufs.h: $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource apple-red.png gnome-foot.png
test-inline-pixbufs.h: $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource$(EXEEXT) apple-red.png gnome-foot.png
(topdir=`cd $(top_builddir) && pwd` ; curdir=`pwd` ; \
cd $(srcdir) && \
GDK_PIXBUF_MODULEDIR=$$topdir/gdk-pixbuf/.libs \
......
......@@ -927,9 +927,9 @@ predraw_set_foreground (GdkGC *gc,
if (*ok && (hpen = ExtCreatePen (win32_gc->pen_style,
(win32_gc->pen_width > 0 ? win32_gc->pen_width : 1),
&logbrush, 0, NULL)) == NULL)
WIN32_GDI_FAILED ("ExtCreatePen");
WIN32_GDI_FAILED ("ExtCreatePen"), *ok = FALSE;
if (SelectObject (win32_gc->hdc, hpen) == NULL)
if (*ok && SelectObject (win32_gc->hdc, hpen) == NULL)
WIN32_GDI_FAILED ("SelectObject"), *ok = FALSE;
switch (win32_gc->fill_style)
......@@ -979,7 +979,7 @@ gdk_win32_hdc_get (GdkDrawable *drawable,
GdkGCValuesMask usage)
{
GdkGCWin32 *win32_gc = (GdkGCWin32 *) gc;
GdkDrawableImplWin32 *impl;
GdkDrawableImplWin32 *impl = NULL;
gboolean ok = TRUE;
int flag;
......@@ -991,6 +991,8 @@ gdk_win32_hdc_get (GdkDrawable *drawable,
impl = GDK_DRAWABLE_IMPL_WIN32 ((GDK_WINDOW_OBJECT (drawable))->impl);
else if (GDK_IS_PIXMAP (drawable))
impl = GDK_DRAWABLE_IMPL_WIN32 ((GDK_PIXMAP_OBJECT (drawable))->impl);
else
g_assert_not_reached ();
win32_gc->hwnd = impl->handle;
......@@ -1199,7 +1201,7 @@ gdk_win32_hdc_release (GdkDrawable *drawable,
GdkGCValuesMask usage)
{
GdkGCWin32 *win32_gc = (GdkGCWin32 *) gc;
GdkDrawableImplWin32 *impl;
GdkDrawableImplWin32 *impl = NULL;
HGDIOBJ hpen = NULL;
HGDIOBJ hbr = NULL;
......@@ -1209,6 +1211,8 @@ gdk_win32_hdc_release (GdkDrawable *drawable,
impl = GDK_DRAWABLE_IMPL_WIN32 ((GDK_WINDOW_OBJECT (drawable))->impl);
else if (GDK_IS_PIXMAP (drawable))
impl = GDK_DRAWABLE_IMPL_WIN32 ((GDK_PIXMAP_OBJECT (drawable))->impl);
else
g_assert_not_reached ();
if (usage & GDK_GC_FOREGROUND)
{
......
......@@ -339,7 +339,7 @@ _gdk_win32_get_image (GdkDrawable *drawable,
RGBQUAD bmiColors[256];
} u;
} bmi;
HGDIOBJ oldbitmap1, oldbitmap2;
HGDIOBJ oldbitmap1 = NULL, oldbitmap2;
UINT iUsage;
BITMAP bm;
int i;
......@@ -414,7 +414,7 @@ _gdk_win32_get_image (GdkDrawable *drawable,
if ((memdc = CreateCompatibleDC (hdc)) == NULL)
{
WIN32_GDI_FAILED ("CreateCompatibleDC");
if (GDK_IS_PIXMAP (drawable))
if (GDK_IS_PIXMAP_IMPL_WIN32 (drawable))
{
SelectObject (hdc, oldbitmap1);
if (!DeleteDC (hdc))
......@@ -547,7 +547,7 @@ _gdk_win32_get_image (GdkDrawable *drawable,
image->bpp = 4;
break;
default:
g_warning ("gdk_image_get: image->depth = %d", image->depth);
g_warning ("_gdk_win32_get_image: image->depth = %d", image->depth);
g_assert_not_reached ();
}
image->bits_per_pixel = image->depth;
......@@ -568,7 +568,7 @@ gdk_image_get_pixel (GdkImage *image,
gint x,
gint y)
{
guint32 pixel;
guint32 pixel = 0;
g_return_val_if_fail (GDK_IS_IMAGE (image), 0);
......@@ -599,6 +599,10 @@ gdk_image_get_pixel (GdkImage *image,
case 4:
pixel = pixelp[0] | (pixelp[1] << 8) | (pixelp[2] << 16);
break;
default:
g_warning ("gdk_image_get_pixel(): bpp = %d", image->bpp);
g_assert_not_reached ();
}
}
......
......@@ -699,7 +699,7 @@ _gdk_input_other_event (GdkEvent *event,
GdkWindowObject *obj;
GdkWindowImplWin32 *impl;
GdkInputWindow *input_window;
GdkDevicePrivate *gdkdev;
GdkDevicePrivate *gdkdev = NULL;
GdkEventMask masktest;
POINT pt;
......
......@@ -1592,6 +1592,7 @@ gdk_window_set_back_pixmap (GdkWindow *window,
if (parent_relative)
{
private->bg_pixmap = GDK_PARENT_RELATIVE_BG;
GDK_NOTE (MISC, g_print (G_STRLOC ": setting background pixmap to parent_relative\n"));
}
else
{
......@@ -2564,8 +2565,6 @@ gdk_window_shape_combine_region (GdkWindow *window,
gint offset_x,
gint offset_y)
{
gint xoffset, yoffset;
g_return_if_fail (GDK_IS_WINDOW (window));
if (GDK_WINDOW_DESTROYED (window))
......
......@@ -28,7 +28,7 @@ endif
if OS_WIN32
gtk_def = gtk.def
gtk_win32_symbols = -export-symbols $(gtk_def) -lwsock32
gtk_win32_symbols = -export-symbols $(gtk_def)
gtk_win32res_lo = gtk-win32res.lo
......@@ -72,7 +72,6 @@ LDFLAGS = @STRIP_BEGIN@ \
@LIBTOOL_EXPORT_OPTIONS@ \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la \
$(top_builddir)/gdk/@gdktargetlib@ \
$(gtk_win32_symbols) \
@GTK_DEP_LIBS@ \
@STRIP_END@
......@@ -580,7 +579,8 @@ libgtk_win32_includedir = $(includedir)/gtk-2.0/gtk
libgtk_win32_include_HEADERS = $(gtk_target_headers)
libgtk_win32_1_3_la_SOURCES = $(gtk_target_sources)
libgtk_win32_1_3_la_LIBADD = $(gtk_win32res_lo)
libgtk_win32_1_3_la_DEPENDENCIES = $(gtk_def) $(gtk_win32res_lo)
libgtk_win32_1_3_la_DEPENDENCIES = $(gtk_def)
libgtk_win32_1_3_la_LDFLAGS = $(gtk_win32_symbols) -lwsock32
endif
EXTRA_LTLIBRARIES = libgtk-x11-1.3.la libgtk-linux-fb-1.3.la libgtk-win32-1.3.la
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment