callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gdk/win32/gdkdrawable-win32.c Use correct casts in debugging output.

Browse Source 
2001-03-19  Tor Lillqvist  <tml@iki.fi>

	* gdk/win32/gdkdrawable-win32.c
	* gdk/win32/gdkimage-win32.c: Use correct casts in debugging
	output.

	* demos/testpixbuf-drawable.c: If GDK_WINDOWING_WIN32, include
	gdkwin32.h.

2001-03-19  Tor Lillqvist  <tml@iki.fi>

	* makefile.mingw.in: Handle gdk-pixbuf-marshal.c.

	* gdk_pixbuf.def: Update.

	* pixbufloader_*.def: Just export the fill_vtable functions now.
This commit is contained in:
Tor Lillqvist
2001-03-19 19:37:59 +00:00
committed by Tor Lillqvist
parent 4f81f119e4
commit c5f68d2527
24 changed files with 103 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2001-03-19 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkdrawable-win32.c
* gdk/win32/gdkimage-win32.c: Use correct casts in debugging
output.
* demos/testpixbuf-drawable.c: If GDK_WINDOWING_WIN32, include
gdkwin32.h.
2001-03-18 Tor Lillqvist <tml@iki.fi> 2001-03-18 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkevents-win32.c (print_window_state): New function. * gdk/win32/gdkevents-win32.c (print_window_state): New function.

9
ChangeLog.pre-2-0
View File

@ -1,3 +1,12 @@
2001-03-19 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkdrawable-win32.c
* gdk/win32/gdkimage-win32.c: Use correct casts in debugging
output.
* demos/testpixbuf-drawable.c: If GDK_WINDOWING_WIN32, include
gdkwin32.h.
2001-03-18 Tor Lillqvist <tml@iki.fi> 2001-03-18 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkevents-win32.c (print_window_state): New function. * gdk/win32/gdkevents-win32.c (print_window_state): New function.

9
ChangeLog.pre-2-10
View File

@ -1,3 +1,12 @@
2001-03-19 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkdrawable-win32.c
* gdk/win32/gdkimage-win32.c: Use correct casts in debugging
output.
* demos/testpixbuf-drawable.c: If GDK_WINDOWING_WIN32, include
gdkwin32.h.
2001-03-18 Tor Lillqvist <tml@iki.fi> 2001-03-18 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkevents-win32.c (print_window_state): New function. * gdk/win32/gdkevents-win32.c (print_window_state): New function.

9
ChangeLog.pre-2-2
View File

@ -1,3 +1,12 @@
2001-03-19 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkdrawable-win32.c
* gdk/win32/gdkimage-win32.c: Use correct casts in debugging
output.
* demos/testpixbuf-drawable.c: If GDK_WINDOWING_WIN32, include
gdkwin32.h.
2001-03-18 Tor Lillqvist <tml@iki.fi> 2001-03-18 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkevents-win32.c (print_window_state): New function. * gdk/win32/gdkevents-win32.c (print_window_state): New function.

9
ChangeLog.pre-2-4
View File

@ -1,3 +1,12 @@
2001-03-19 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkdrawable-win32.c
* gdk/win32/gdkimage-win32.c: Use correct casts in debugging
output.
* demos/testpixbuf-drawable.c: If GDK_WINDOWING_WIN32, include
gdkwin32.h.
2001-03-18 Tor Lillqvist <tml@iki.fi> 2001-03-18 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkevents-win32.c (print_window_state): New function. * gdk/win32/gdkevents-win32.c (print_window_state): New function.

9
ChangeLog.pre-2-6
View File

@ -1,3 +1,12 @@
2001-03-19 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkdrawable-win32.c
* gdk/win32/gdkimage-win32.c: Use correct casts in debugging
output.
* demos/testpixbuf-drawable.c: If GDK_WINDOWING_WIN32, include
gdkwin32.h.
2001-03-18 Tor Lillqvist <tml@iki.fi> 2001-03-18 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkevents-win32.c (print_window_state): New function. * gdk/win32/gdkevents-win32.c (print_window_state): New function.

9
ChangeLog.pre-2-8
View File

@ -1,3 +1,12 @@
2001-03-19 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkdrawable-win32.c
* gdk/win32/gdkimage-win32.c: Use correct casts in debugging
output.
* demos/testpixbuf-drawable.c: If GDK_WINDOWING_WIN32, include
gdkwin32.h.
2001-03-18 Tor Lillqvist <tml@iki.fi> 2001-03-18 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkevents-win32.c (print_window_state): New function. * gdk/win32/gdkevents-win32.c (print_window_state): New function.

4
demos/testpixbuf-drawable.c
View File

@ -1,6 +1,10 @@
#include <config.h> #include <config.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#ifdef GDK_WINDOWING_X11
#include <gdk/x11/gdkx.h> #include <gdk/x11/gdkx.h>
#elif defined (GDK_WINDOWING_WIN32)
#include <gdk/win32/gdkwin32.h>
#endif
int close_app(GtkWidget *widget, gpointer data) int close_app(GtkWidget *widget, gpointer data)
{ {

8
gdk-pixbuf/ChangeLog
View File

@ -1,3 +1,11 @@
2001-03-19 Tor Lillqvist <tml@iki.fi>
* makefile.mingw.in: Handle gdk-pixbuf-marshal.c.
* gdk_pixbuf.def: Update.
* pixbufloader_*.def: Just export the fill_vtable functions now.
2001-03-18 Mike Kestner <mkestner@ameritech.net> 2001-03-18 Mike Kestner <mkestner@ameritech.net>
* make-inline-pixbuf.c (main): Added logic to remove output when * make-inline-pixbuf.c (main): Added logic to remove output when

9
gdk-pixbuf/gdk_pixbuf.def
View File

@ -1,4 +1,7 @@
EXPORTS EXPORTS
_gdk_pixbuf_get_module
_gdk_pixbuf_get_named_module
_gdk_pixbuf_load_module
gdk_pixbuf_add_alpha gdk_pixbuf_add_alpha
gdk_pixbuf_animation_get_frames gdk_pixbuf_animation_get_frames
gdk_pixbuf_animation_get_height gdk_pixbuf_animation_get_height
@ -26,23 +29,17 @@ EXPORTS
gdk_pixbuf_get_colorspace gdk_pixbuf_get_colorspace
gdk_pixbuf_get_has_alpha gdk_pixbuf_get_has_alpha
gdk_pixbuf_get_height gdk_pixbuf_get_height
gdk_pixbuf_get_module
gdk_pixbuf_get_n_channels gdk_pixbuf_get_n_channels
gdk_pixbuf_get_named_module
gdk_pixbuf_get_pixels gdk_pixbuf_get_pixels
gdk_pixbuf_get_rowstride gdk_pixbuf_get_rowstride
gdk_pixbuf_get_type gdk_pixbuf_get_type
gdk_pixbuf_get_width gdk_pixbuf_get_width
gdk_pixbuf_init
gdk_pixbuf_load_module
gdk_pixbuf_new gdk_pixbuf_new
gdk_pixbuf_new_from_data gdk_pixbuf_new_from_data
gdk_pixbuf_new_from_file gdk_pixbuf_new_from_file
gdk_pixbuf_new_from_inline gdk_pixbuf_new_from_inline
gdk_pixbuf_new_from_xpm_data gdk_pixbuf_new_from_xpm_data
gdk_pixbuf_new_subpixbuf gdk_pixbuf_new_subpixbuf
gdk_pixbuf_postinit
gdk_pixbuf_preinit
gdk_pixbuf_ref gdk_pixbuf_ref
gdk_pixbuf_saturate_and_pixelate gdk_pixbuf_saturate_and_pixelate
gdk_pixbuf_save gdk_pixbuf_save

9
gdk-pixbuf/makefile.mingw.in
View File

@ -28,7 +28,7 @@ all : \
pixbufloader-xpm.dll \ pixbufloader-xpm.dll \
make-inline-pixbuf.exe \ make-inline-pixbuf.exe \
test-gdk-pixbuf.exe test-gdk-pixbuf.exe
gdk_pixbuf_OBJECTS = \ gdk_pixbuf_OBJECTS = \
gdk-pixbuf.o \ gdk-pixbuf.o \
gdk-pixbuf-animation.o \ gdk-pixbuf-animation.o \
@ -44,6 +44,11 @@ gdk_pixbuf_OBJECTS = \
gdk_pixbuf-$(GDK_PIXBUF_VER).dll : $(gdk_pixbuf_OBJECTS) gdk_pixbuf.def gdk_pixbuf-$(GDK_PIXBUF_VER).dll : $(gdk_pixbuf_OBJECTS) gdk_pixbuf.def
$(GLIB)/build-dll gdk_pixbuf $(GDK_PIXBUF_VER) gdk_pixbuf.def $(gdk_pixbuf_OBJECTS) -L ../gdk -lgdk-$(GTK_VER) $(GLIB_LIBS) $(INTL_LIBS) $(GLIB)/build-dll gdk_pixbuf $(GDK_PIXBUF_VER) gdk_pixbuf.def $(gdk_pixbuf_OBJECTS) -L ../gdk -lgdk-$(GTK_VER) $(GLIB_LIBS) $(INTL_LIBS)
gdk-pixbuf.o:: gdk-pixbuf-marshal.c
gdk-pixbuf-marshal.c :
$(GLIB_GENMARSHAL) --prefix=gdk_pixbuf_marshal gdk-pixbuf-marshal.list --header >$@
pixops/libpixops.a : pixops/libpixops.a :
cd pixops && $(MAKE) -f makefile.mingw libpixops.a cd pixops && $(MAKE) -f makefile.mingw libpixops.a
@ -112,8 +117,10 @@ make-inline-pixbuf.exe : make-inline-pixbuf.o gdk_pixbuf-$(GDK_PIXBUF_VER).dll
test-gdk-pixbuf.exe : test-gdk-pixbuf.o gdk_pixbuf-$(GDK_PIXBUF_VER).dll test-gdk-pixbuf.exe : test-gdk-pixbuf.o gdk_pixbuf-$(GDK_PIXBUF_VER).dll
$(CC) $(CFLAGS) -o $@ test-gdk-pixbuf.o -L . -lgdk_pixbuf-$(GDK_PIXBUF_VER) $(GTK_LIBS) $(GLIB_LIBS) $(CC) $(CFLAGS) -o $@ test-gdk-pixbuf.o -L . -lgdk_pixbuf-$(GDK_PIXBUF_VER) $(GTK_LIBS) $(GLIB_LIBS)
ifeq ($(wildcard makefile.mingw.in),makefile.mingw.in)
# Hack to get an updated makefile.mingw automatically after updating # Hack to get an updated makefile.mingw automatically after updating
# makefile.mingw.in. Only for developer use. # makefile.mingw.in. Only for developer use.
makefile.mingw: makefile.mingw.in makefile.mingw: makefile.mingw.in
sed -e 's,@GDK_PIXBUF[_]MAJOR@,@GDK_PIXBUF_MAJOR@,' \ sed -e 's,@GDK_PIXBUF[_]MAJOR@,@GDK_PIXBUF_MAJOR@,' \
-e 's,@GDK_PIXBUF[_]MINOR@,@GDK_PIXBUF_MINOR@,' <$< >$@ -e 's,@GDK_PIXBUF[_]MINOR@,@GDK_PIXBUF_MINOR@,' <$< >$@
endif

5
gdk-pixbuf/pixbufloader_bmp.def
View File

@ -1,5 +1,2 @@
EXPORTS EXPORTS
gdk_pixbuf__bmp_image_load gdk_pixbuf__bmp_fill_vtable
gdk_pixbuf__bmp_image_begin_load
gdk_pixbuf__bmp_image_stop_load
gdk_pixbuf__bmp_image_load_increment

6
gdk-pixbuf/pixbufloader_gif.def
View File

@ -1,6 +1,2 @@
EXPORTS EXPORTS
gdk_pixbuf__gif_image_load gdk_pixbuf__gif_fill_vtable
gdk_pixbuf__gif_image_begin_load
gdk_pixbuf__gif_image_stop_load
gdk_pixbuf__gif_image_load_increment
gdk_pixbuf__gif_image_load_animation

5
gdk-pixbuf/pixbufloader_ico.def
View File

@ -1,5 +1,2 @@
EXPORTS EXPORTS
gdk_pixbuf__ico_image_load gdk_pixbuf__ico_fill_vtable
gdk_pixbuf__ico_image_begin_load
gdk_pixbuf__ico_image_stop_load
gdk_pixbuf__ico_image_load_increment

7
gdk-pixbuf/pixbufloader_jpeg.def
View File

@ -1,7 +1,2 @@
EXPORTS EXPORTS
gdk_pixbuf__jpeg_image_load gdk_pixbuf__jpeg_fill_vtable
gdk_pixbuf__jpeg_image_begin_load
gdk_pixbuf__jpeg_image_stop_load
gdk_pixbuf__jpeg_image_load_increment
gdk_pixbuf__jpeg_image_save

6
gdk-pixbuf/pixbufloader_png.def
View File

@ -1,6 +1,2 @@
EXPORTS EXPORTS
gdk_pixbuf__png_image_load gdk_pixbuf__png_fill_vtable
gdk_pixbuf__png_image_begin_load
gdk_pixbuf__png_image_stop_load
gdk_pixbuf__png_image_load_increment
gdk_pixbuf__png_image_save

5
gdk-pixbuf/pixbufloader_pnm.def
View File

@ -1,5 +1,2 @@
EXPORTS EXPORTS
gdk_pixbuf__pnm_image_load gdk_pixbuf__pnm_fill_vtable
gdk_pixbuf__pnm_image_begin_load
gdk_pixbuf__pnm_image_stop_load
gdk_pixbuf__pnm_image_load_increment

5
gdk-pixbuf/pixbufloader_ras.def
View File

@ -1,5 +1,2 @@
EXPORTS EXPORTS
gdk_pixbuf__ras_image_load gdk_pixbuf__ras_fill_vtable
gdk_pixbuf__ras_image_begin_load
gdk_pixbuf__ras_image_stop_load
gdk_pixbuf__ras_image_load_increment

5
gdk-pixbuf/pixbufloader_tiff.def
View File

@ -1,5 +1,2 @@
EXPORTS EXPORTS
gdk_pixbuf__tiff_image_load gdk_pixbuf__tiff_fill_vtable
gdk_pixbuf__tiff_image_begin_load
gdk_pixbuf__tiff_image_stop_load
gdk_pixbuf__tiff_image_load_increment

5
gdk-pixbuf/pixbufloader_wbmp.def
View File

@ -1,5 +1,2 @@
EXPORTS EXPORTS
gdk_pixbuf__wbmp_image_load gdk_pixbuf__wbmp_fill_vtable
gdk_pixbuf__wbmp_image_begin_load
gdk_pixbuf__wbmp_image_stop_load
gdk_pixbuf__wbmp_image_load_increment

5
gdk-pixbuf/pixbufloader_xbm.def
View File

@ -1,5 +1,2 @@
EXPORTS EXPORTS
gdk_pixbuf__xbm_image_load gdk_pixbuf__xbm_fill_vtable
gdk_pixbuf__xbm_image_begin_load
gdk_pixbuf__xbm_image_stop_load
gdk_pixbuf__xbm_image_load_increment

3
gdk-pixbuf/pixbufloader_xpm.def
View File

@ -1,3 +1,2 @@
EXPORTS EXPORTS
gdk_pixbuf__xpm_image_load gdk_pixbuf__xpm_fill_vtable
gdk_pixbuf__xpm_image_load_xpm_data

10
gdk/win32/gdkdrawable-win32.c
View File

@ -228,7 +228,7 @@ gdk_win32_draw_rectangle (GdkDrawable *drawable,
gboolean ok = TRUE; gboolean ok = TRUE;
GDK_NOTE (MISC, g_print ("gdk_win32_draw_rectangle: %#x (%p) %s%dx%d@+%d+%d\n", GDK_NOTE (MISC, g_print ("gdk_win32_draw_rectangle: %#x (%p) %s%dx%d@+%d+%d\n",
(guint) GDK_DRAWABLE_HANDLE (drawable), (guint) GDK_DRAWABLE_IMPL_WIN32 (drawable)->handle,
gc_private, gc_private,
(filled ? "fill " : ""), (filled ? "fill " : ""),
width, height, x, y)); width, height, x, y));
@ -616,11 +616,11 @@ gdk_win32_draw_drawable (GdkDrawable *drawable,
else else
src_handle = GDK_DRAWABLE_HANDLE (src); src_handle = GDK_DRAWABLE_HANDLE (src);
GDK_NOTE (MISC, g_print ("gdk_draw_pixmap: dest: %#x @+%d+%d" GDK_NOTE (MISC, g_print ("gdk_win32_draw_drawable: dest: %#x @+%d+%d"
"src: %#x %dx%d@+%d+%d\n", " src: %#x %dx%d@+%d+%d\n",
(guint) GDK_DRAWABLE_HANDLE (drawable), (guint) impl->handle,
xdest, ydest, xdest, ydest,
(guint) GDK_PIXMAP_HBITMAP (src), (guint) src_handle,
width, height, xsrc, ysrc)); width, height, xsrc, ysrc));
hdc = gdk_win32_hdc_get (drawable, gc, 0); hdc = gdk_win32_hdc_get (drawable, gc, 0);

2
gdk/win32/gdkimage-win32.c
View File

@ -348,7 +348,7 @@ _gdk_win32_get_image (GdkDrawable *drawable,
g_return_val_if_fail (GDK_IS_DRAWABLE_IMPL_WIN32 (drawable), NULL); g_return_val_if_fail (GDK_IS_DRAWABLE_IMPL_WIN32 (drawable), NULL);
GDK_NOTE (MISC, g_print ("_gdk_win32_get_image: %#x %dx%d@+%d+%d\n", GDK_NOTE (MISC, g_print ("_gdk_win32_get_image: %#x %dx%d@+%d+%d\n",
(guint) GDK_DRAWABLE_HANDLE (drawable), (guint) GDK_DRAWABLE_IMPL_WIN32 (drawable)->handle,
width, height, x, y)); width, height, x, y));
impl = GDK_DRAWABLE_IMPL_WIN32 (drawable); impl = GDK_DRAWABLE_IMPL_WIN32 (drawable);