diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-0 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 9 | ||||
| -rw-r--r-- | demos/testpixbuf-drawable.c | 4 | ||||
| -rw-r--r-- | gdk-pixbuf/ChangeLog | 8 | ||||
| -rw-r--r-- | gdk-pixbuf/gdk_pixbuf.def | 9 | ||||
| -rw-r--r-- | gdk-pixbuf/makefile.mingw.in | 9 | ||||
| -rw-r--r-- | gdk-pixbuf/pixbufloader_bmp.def | 5 | ||||
| -rw-r--r-- | gdk-pixbuf/pixbufloader_gif.def | 6 | ||||
| -rw-r--r-- | gdk-pixbuf/pixbufloader_ico.def | 5 | ||||
| -rw-r--r-- | gdk-pixbuf/pixbufloader_jpeg.def | 7 | ||||
| -rw-r--r-- | gdk-pixbuf/pixbufloader_png.def | 6 | ||||
| -rw-r--r-- | gdk-pixbuf/pixbufloader_pnm.def | 5 | ||||
| -rw-r--r-- | gdk-pixbuf/pixbufloader_ras.def | 5 | ||||
| -rw-r--r-- | gdk-pixbuf/pixbufloader_tiff.def | 5 | ||||
| -rw-r--r-- | gdk-pixbuf/pixbufloader_wbmp.def | 5 | ||||
| -rw-r--r-- | gdk-pixbuf/pixbufloader_xbm.def | 5 | ||||
| -rw-r--r-- | gdk-pixbuf/pixbufloader_xpm.def | 3 | ||||
| -rw-r--r-- | gdk/win32/gdkdrawable-win32.c | 10 | ||||
| -rw-r--r-- | gdk/win32/gdkimage-win32.c | 2 |
24 files changed, 103 insertions, 59 deletions
@@ -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> * gdk/win32/gdkevents-win32.c (print_window_state): New function. diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 48a4736fe4..c1e33e94f3 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -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> * gdk/win32/gdkevents-win32.c (print_window_state): New function. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 48a4736fe4..c1e33e94f3 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -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> * gdk/win32/gdkevents-win32.c (print_window_state): New function. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 48a4736fe4..c1e33e94f3 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -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> * gdk/win32/gdkevents-win32.c (print_window_state): New function. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 48a4736fe4..c1e33e94f3 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -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> * gdk/win32/gdkevents-win32.c (print_window_state): New function. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 48a4736fe4..c1e33e94f3 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -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> * gdk/win32/gdkevents-win32.c (print_window_state): New function. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 48a4736fe4..c1e33e94f3 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -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> * gdk/win32/gdkevents-win32.c (print_window_state): New function. diff --git a/demos/testpixbuf-drawable.c b/demos/testpixbuf-drawable.c index aee537459b..28b5b7d1b4 100644 --- a/demos/testpixbuf-drawable.c +++ b/demos/testpixbuf-drawable.c @@ -1,6 +1,10 @@ #include <config.h> #include <gtk/gtk.h> +#ifdef GDK_WINDOWING_X11 #include <gdk/x11/gdkx.h> +#elif defined (GDK_WINDOWING_WIN32) +#include <gdk/win32/gdkwin32.h> +#endif int close_app(GtkWidget *widget, gpointer data) { diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index feb54700ec..e0a0f71c24 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -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> * make-inline-pixbuf.c (main): Added logic to remove output when diff --git a/gdk-pixbuf/gdk_pixbuf.def b/gdk-pixbuf/gdk_pixbuf.def index b6f89f1413..dc3ea4e2a2 100644 --- a/gdk-pixbuf/gdk_pixbuf.def +++ b/gdk-pixbuf/gdk_pixbuf.def @@ -1,4 +1,7 @@ EXPORTS + _gdk_pixbuf_get_module + _gdk_pixbuf_get_named_module + _gdk_pixbuf_load_module gdk_pixbuf_add_alpha gdk_pixbuf_animation_get_frames gdk_pixbuf_animation_get_height @@ -26,23 +29,17 @@ EXPORTS gdk_pixbuf_get_colorspace gdk_pixbuf_get_has_alpha gdk_pixbuf_get_height - gdk_pixbuf_get_module gdk_pixbuf_get_n_channels - gdk_pixbuf_get_named_module gdk_pixbuf_get_pixels gdk_pixbuf_get_rowstride gdk_pixbuf_get_type gdk_pixbuf_get_width - gdk_pixbuf_init - gdk_pixbuf_load_module gdk_pixbuf_new gdk_pixbuf_new_from_data gdk_pixbuf_new_from_file gdk_pixbuf_new_from_inline gdk_pixbuf_new_from_xpm_data gdk_pixbuf_new_subpixbuf - gdk_pixbuf_postinit - gdk_pixbuf_preinit gdk_pixbuf_ref gdk_pixbuf_saturate_and_pixelate gdk_pixbuf_save diff --git a/gdk-pixbuf/makefile.mingw.in b/gdk-pixbuf/makefile.mingw.in index 3caef00726..30629261dc 100644 --- a/gdk-pixbuf/makefile.mingw.in +++ b/gdk-pixbuf/makefile.mingw.in @@ -28,7 +28,7 @@ all : \ pixbufloader-xpm.dll \ make-inline-pixbuf.exe \ test-gdk-pixbuf.exe - + gdk_pixbuf_OBJECTS = \ gdk-pixbuf.o \ gdk-pixbuf-animation.o \ @@ -44,6 +44,11 @@ gdk_pixbuf_OBJECTS = \ 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) +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 : 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 $(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 # makefile.mingw.in. Only for developer use. makefile.mingw: makefile.mingw.in sed -e 's,@GDK_PIXBUF[_]MAJOR@,@GDK_PIXBUF_MAJOR@,' \ -e 's,@GDK_PIXBUF[_]MINOR@,@GDK_PIXBUF_MINOR@,' <$< >$@ +endif diff --git a/gdk-pixbuf/pixbufloader_bmp.def b/gdk-pixbuf/pixbufloader_bmp.def index f11d3f3d2a..c71ac26ed8 100644 --- a/gdk-pixbuf/pixbufloader_bmp.def +++ b/gdk-pixbuf/pixbufloader_bmp.def @@ -1,5 +1,2 @@ EXPORTS - gdk_pixbuf__bmp_image_load - gdk_pixbuf__bmp_image_begin_load - gdk_pixbuf__bmp_image_stop_load - gdk_pixbuf__bmp_image_load_increment + gdk_pixbuf__bmp_fill_vtable diff --git a/gdk-pixbuf/pixbufloader_gif.def b/gdk-pixbuf/pixbufloader_gif.def index 28ed9b7105..c27069ea30 100644 --- a/gdk-pixbuf/pixbufloader_gif.def +++ b/gdk-pixbuf/pixbufloader_gif.def @@ -1,6 +1,2 @@ EXPORTS - gdk_pixbuf__gif_image_load - gdk_pixbuf__gif_image_begin_load - gdk_pixbuf__gif_image_stop_load - gdk_pixbuf__gif_image_load_increment - gdk_pixbuf__gif_image_load_animation + gdk_pixbuf__gif_fill_vtable diff --git a/gdk-pixbuf/pixbufloader_ico.def b/gdk-pixbuf/pixbufloader_ico.def index 6bc5257a84..b1d3306de6 100644 --- a/gdk-pixbuf/pixbufloader_ico.def +++ b/gdk-pixbuf/pixbufloader_ico.def @@ -1,5 +1,2 @@ EXPORTS - gdk_pixbuf__ico_image_load - gdk_pixbuf__ico_image_begin_load - gdk_pixbuf__ico_image_stop_load - gdk_pixbuf__ico_image_load_increment + gdk_pixbuf__ico_fill_vtable diff --git a/gdk-pixbuf/pixbufloader_jpeg.def b/gdk-pixbuf/pixbufloader_jpeg.def index ef1b771fa3..60576a1180 100644 --- a/gdk-pixbuf/pixbufloader_jpeg.def +++ b/gdk-pixbuf/pixbufloader_jpeg.def @@ -1,7 +1,2 @@ EXPORTS - gdk_pixbuf__jpeg_image_load - gdk_pixbuf__jpeg_image_begin_load - gdk_pixbuf__jpeg_image_stop_load - gdk_pixbuf__jpeg_image_load_increment - gdk_pixbuf__jpeg_image_save - + gdk_pixbuf__jpeg_fill_vtable diff --git a/gdk-pixbuf/pixbufloader_png.def b/gdk-pixbuf/pixbufloader_png.def index d24b346277..631185ad98 100644 --- a/gdk-pixbuf/pixbufloader_png.def +++ b/gdk-pixbuf/pixbufloader_png.def @@ -1,6 +1,2 @@ EXPORTS - gdk_pixbuf__png_image_load - gdk_pixbuf__png_image_begin_load - gdk_pixbuf__png_image_stop_load - gdk_pixbuf__png_image_load_increment - gdk_pixbuf__png_image_save + gdk_pixbuf__png_fill_vtable diff --git a/gdk-pixbuf/pixbufloader_pnm.def b/gdk-pixbuf/pixbufloader_pnm.def index b708d1cfc3..c322bc184d 100644 --- a/gdk-pixbuf/pixbufloader_pnm.def +++ b/gdk-pixbuf/pixbufloader_pnm.def @@ -1,5 +1,2 @@ EXPORTS - gdk_pixbuf__pnm_image_load - gdk_pixbuf__pnm_image_begin_load - gdk_pixbuf__pnm_image_stop_load - gdk_pixbuf__pnm_image_load_increment + gdk_pixbuf__pnm_fill_vtable diff --git a/gdk-pixbuf/pixbufloader_ras.def b/gdk-pixbuf/pixbufloader_ras.def index a4e3e043bc..24732553b3 100644 --- a/gdk-pixbuf/pixbufloader_ras.def +++ b/gdk-pixbuf/pixbufloader_ras.def @@ -1,5 +1,2 @@ EXPORTS - gdk_pixbuf__ras_image_load - gdk_pixbuf__ras_image_begin_load - gdk_pixbuf__ras_image_stop_load - gdk_pixbuf__ras_image_load_increment + gdk_pixbuf__ras_fill_vtable diff --git a/gdk-pixbuf/pixbufloader_tiff.def b/gdk-pixbuf/pixbufloader_tiff.def index 264d50ae4b..d3371bebb3 100644 --- a/gdk-pixbuf/pixbufloader_tiff.def +++ b/gdk-pixbuf/pixbufloader_tiff.def @@ -1,5 +1,2 @@ EXPORTS - gdk_pixbuf__tiff_image_load - gdk_pixbuf__tiff_image_begin_load - gdk_pixbuf__tiff_image_stop_load - gdk_pixbuf__tiff_image_load_increment + gdk_pixbuf__tiff_fill_vtable diff --git a/gdk-pixbuf/pixbufloader_wbmp.def b/gdk-pixbuf/pixbufloader_wbmp.def index 9be84a5bc2..701a3164e7 100644 --- a/gdk-pixbuf/pixbufloader_wbmp.def +++ b/gdk-pixbuf/pixbufloader_wbmp.def @@ -1,5 +1,2 @@ EXPORTS - gdk_pixbuf__wbmp_image_load - gdk_pixbuf__wbmp_image_begin_load - gdk_pixbuf__wbmp_image_stop_load - gdk_pixbuf__wbmp_image_load_increment + gdk_pixbuf__wbmp_fill_vtable diff --git a/gdk-pixbuf/pixbufloader_xbm.def b/gdk-pixbuf/pixbufloader_xbm.def index c25979ed33..9072d08513 100644 --- a/gdk-pixbuf/pixbufloader_xbm.def +++ b/gdk-pixbuf/pixbufloader_xbm.def @@ -1,5 +1,2 @@ EXPORTS - gdk_pixbuf__xbm_image_load - gdk_pixbuf__xbm_image_begin_load - gdk_pixbuf__xbm_image_stop_load - gdk_pixbuf__xbm_image_load_increment + gdk_pixbuf__xbm_fill_vtable diff --git a/gdk-pixbuf/pixbufloader_xpm.def b/gdk-pixbuf/pixbufloader_xpm.def index 45bf96ce25..4fa66a4957 100644 --- a/gdk-pixbuf/pixbufloader_xpm.def +++ b/gdk-pixbuf/pixbufloader_xpm.def @@ -1,3 +1,2 @@ EXPORTS - gdk_pixbuf__xpm_image_load - gdk_pixbuf__xpm_image_load_xpm_data + gdk_pixbuf__xpm_fill_vtable diff --git a/gdk/win32/gdkdrawable-win32.c b/gdk/win32/gdkdrawable-win32.c index 0eb45ddb8c..e8381b4ce3 100644 --- a/gdk/win32/gdkdrawable-win32.c +++ b/gdk/win32/gdkdrawable-win32.c @@ -228,7 +228,7 @@ gdk_win32_draw_rectangle (GdkDrawable *drawable, gboolean ok = TRUE; 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, (filled ? "fill " : ""), width, height, x, y)); @@ -616,11 +616,11 @@ gdk_win32_draw_drawable (GdkDrawable *drawable, else src_handle = GDK_DRAWABLE_HANDLE (src); - GDK_NOTE (MISC, g_print ("gdk_draw_pixmap: dest: %#x @+%d+%d" - "src: %#x %dx%d@+%d+%d\n", - (guint) GDK_DRAWABLE_HANDLE (drawable), + GDK_NOTE (MISC, g_print ("gdk_win32_draw_drawable: dest: %#x @+%d+%d" + " src: %#x %dx%d@+%d+%d\n", + (guint) impl->handle, xdest, ydest, - (guint) GDK_PIXMAP_HBITMAP (src), + (guint) src_handle, width, height, xsrc, ysrc)); hdc = gdk_win32_hdc_get (drawable, gc, 0); diff --git a/gdk/win32/gdkimage-win32.c b/gdk/win32/gdkimage-win32.c index 32c05702f5..4c87a57420 100644 --- a/gdk/win32/gdkimage-win32.c +++ b/gdk/win32/gdkimage-win32.c @@ -348,7 +348,7 @@ _gdk_win32_get_image (GdkDrawable *drawable, 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", - (guint) GDK_DRAWABLE_HANDLE (drawable), + (guint) GDK_DRAWABLE_IMPL_WIN32 (drawable)->handle, width, height, x, y)); impl = GDK_DRAWABLE_IMPL_WIN32 (drawable); |