diff --git a/ChangeLog b/ChangeLog index 58d0759b0f..2e672970f8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,33 @@ +2001-01-06 Hans Breuer + + * gdk/gdk.def : updated exports + + * gdk/win32/makefile.msc : -DGDK_ENABLE_BROKEN otherwise + gdk won't compile anymore + + * gdk/win32/gdkevents-win32.c : initialize ret_val when + processing GDK_FILTER functions, initialize event.key->hardware_keycode. + Improved gdk_flush () to not only do pending drawing operations + but also process all currently pending events. This should make + the behaviour more similar to the X11 version. + + * gdk/win32/gdkgc-win32.c (predraw_set_background) : a background + option needs to be set even if there is no GDK_GC_BACKGROUND. + (gdk_win32_hdc_get) : use predraw_set_background () independent + of value_mask. This allows to draw dashed lines leaving the original + background intact. + + * gdk/win32/gdkimage-win32.c (gdk_image_new_bitamp) : free data + after processing, because we can't reuse it as the X11 version does. + + * gtk/gtk.def : updated exports + + * gtk/makefile.msc.in : added ATK, removed all test apps. (I + would like to get rid of this file again, and use straight + makefile.msc again, as the other Gtk+ subdirs do) + + * test/makefile.msc (new file) : build the test apps here + Sat May 5 10:06:24 2001 Owen Taylor * Release 1.3.5 diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 58d0759b0f..2e672970f8 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,33 @@ +2001-01-06 Hans Breuer + + * gdk/gdk.def : updated exports + + * gdk/win32/makefile.msc : -DGDK_ENABLE_BROKEN otherwise + gdk won't compile anymore + + * gdk/win32/gdkevents-win32.c : initialize ret_val when + processing GDK_FILTER functions, initialize event.key->hardware_keycode. + Improved gdk_flush () to not only do pending drawing operations + but also process all currently pending events. This should make + the behaviour more similar to the X11 version. + + * gdk/win32/gdkgc-win32.c (predraw_set_background) : a background + option needs to be set even if there is no GDK_GC_BACKGROUND. + (gdk_win32_hdc_get) : use predraw_set_background () independent + of value_mask. This allows to draw dashed lines leaving the original + background intact. + + * gdk/win32/gdkimage-win32.c (gdk_image_new_bitamp) : free data + after processing, because we can't reuse it as the X11 version does. + + * gtk/gtk.def : updated exports + + * gtk/makefile.msc.in : added ATK, removed all test apps. (I + would like to get rid of this file again, and use straight + makefile.msc again, as the other Gtk+ subdirs do) + + * test/makefile.msc (new file) : build the test apps here + Sat May 5 10:06:24 2001 Owen Taylor * Release 1.3.5 diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 58d0759b0f..2e672970f8 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,33 @@ +2001-01-06 Hans Breuer + + * gdk/gdk.def : updated exports + + * gdk/win32/makefile.msc : -DGDK_ENABLE_BROKEN otherwise + gdk won't compile anymore + + * gdk/win32/gdkevents-win32.c : initialize ret_val when + processing GDK_FILTER functions, initialize event.key->hardware_keycode. + Improved gdk_flush () to not only do pending drawing operations + but also process all currently pending events. This should make + the behaviour more similar to the X11 version. + + * gdk/win32/gdkgc-win32.c (predraw_set_background) : a background + option needs to be set even if there is no GDK_GC_BACKGROUND. + (gdk_win32_hdc_get) : use predraw_set_background () independent + of value_mask. This allows to draw dashed lines leaving the original + background intact. + + * gdk/win32/gdkimage-win32.c (gdk_image_new_bitamp) : free data + after processing, because we can't reuse it as the X11 version does. + + * gtk/gtk.def : updated exports + + * gtk/makefile.msc.in : added ATK, removed all test apps. (I + would like to get rid of this file again, and use straight + makefile.msc again, as the other Gtk+ subdirs do) + + * test/makefile.msc (new file) : build the test apps here + Sat May 5 10:06:24 2001 Owen Taylor * Release 1.3.5 diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 58d0759b0f..2e672970f8 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,33 @@ +2001-01-06 Hans Breuer + + * gdk/gdk.def : updated exports + + * gdk/win32/makefile.msc : -DGDK_ENABLE_BROKEN otherwise + gdk won't compile anymore + + * gdk/win32/gdkevents-win32.c : initialize ret_val when + processing GDK_FILTER functions, initialize event.key->hardware_keycode. + Improved gdk_flush () to not only do pending drawing operations + but also process all currently pending events. This should make + the behaviour more similar to the X11 version. + + * gdk/win32/gdkgc-win32.c (predraw_set_background) : a background + option needs to be set even if there is no GDK_GC_BACKGROUND. + (gdk_win32_hdc_get) : use predraw_set_background () independent + of value_mask. This allows to draw dashed lines leaving the original + background intact. + + * gdk/win32/gdkimage-win32.c (gdk_image_new_bitamp) : free data + after processing, because we can't reuse it as the X11 version does. + + * gtk/gtk.def : updated exports + + * gtk/makefile.msc.in : added ATK, removed all test apps. (I + would like to get rid of this file again, and use straight + makefile.msc again, as the other Gtk+ subdirs do) + + * test/makefile.msc (new file) : build the test apps here + Sat May 5 10:06:24 2001 Owen Taylor * Release 1.3.5 diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 58d0759b0f..2e672970f8 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,33 @@ +2001-01-06 Hans Breuer + + * gdk/gdk.def : updated exports + + * gdk/win32/makefile.msc : -DGDK_ENABLE_BROKEN otherwise + gdk won't compile anymore + + * gdk/win32/gdkevents-win32.c : initialize ret_val when + processing GDK_FILTER functions, initialize event.key->hardware_keycode. + Improved gdk_flush () to not only do pending drawing operations + but also process all currently pending events. This should make + the behaviour more similar to the X11 version. + + * gdk/win32/gdkgc-win32.c (predraw_set_background) : a background + option needs to be set even if there is no GDK_GC_BACKGROUND. + (gdk_win32_hdc_get) : use predraw_set_background () independent + of value_mask. This allows to draw dashed lines leaving the original + background intact. + + * gdk/win32/gdkimage-win32.c (gdk_image_new_bitamp) : free data + after processing, because we can't reuse it as the X11 version does. + + * gtk/gtk.def : updated exports + + * gtk/makefile.msc.in : added ATK, removed all test apps. (I + would like to get rid of this file again, and use straight + makefile.msc again, as the other Gtk+ subdirs do) + + * test/makefile.msc (new file) : build the test apps here + Sat May 5 10:06:24 2001 Owen Taylor * Release 1.3.5 diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 58d0759b0f..2e672970f8 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,33 @@ +2001-01-06 Hans Breuer + + * gdk/gdk.def : updated exports + + * gdk/win32/makefile.msc : -DGDK_ENABLE_BROKEN otherwise + gdk won't compile anymore + + * gdk/win32/gdkevents-win32.c : initialize ret_val when + processing GDK_FILTER functions, initialize event.key->hardware_keycode. + Improved gdk_flush () to not only do pending drawing operations + but also process all currently pending events. This should make + the behaviour more similar to the X11 version. + + * gdk/win32/gdkgc-win32.c (predraw_set_background) : a background + option needs to be set even if there is no GDK_GC_BACKGROUND. + (gdk_win32_hdc_get) : use predraw_set_background () independent + of value_mask. This allows to draw dashed lines leaving the original + background intact. + + * gdk/win32/gdkimage-win32.c (gdk_image_new_bitamp) : free data + after processing, because we can't reuse it as the X11 version does. + + * gtk/gtk.def : updated exports + + * gtk/makefile.msc.in : added ATK, removed all test apps. (I + would like to get rid of this file again, and use straight + makefile.msc again, as the other Gtk+ subdirs do) + + * test/makefile.msc (new file) : build the test apps here + Sat May 5 10:06:24 2001 Owen Taylor * Release 1.3.5 diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 58d0759b0f..2e672970f8 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,33 @@ +2001-01-06 Hans Breuer + + * gdk/gdk.def : updated exports + + * gdk/win32/makefile.msc : -DGDK_ENABLE_BROKEN otherwise + gdk won't compile anymore + + * gdk/win32/gdkevents-win32.c : initialize ret_val when + processing GDK_FILTER functions, initialize event.key->hardware_keycode. + Improved gdk_flush () to not only do pending drawing operations + but also process all currently pending events. This should make + the behaviour more similar to the X11 version. + + * gdk/win32/gdkgc-win32.c (predraw_set_background) : a background + option needs to be set even if there is no GDK_GC_BACKGROUND. + (gdk_win32_hdc_get) : use predraw_set_background () independent + of value_mask. This allows to draw dashed lines leaving the original + background intact. + + * gdk/win32/gdkimage-win32.c (gdk_image_new_bitamp) : free data + after processing, because we can't reuse it as the X11 version does. + + * gtk/gtk.def : updated exports + + * gtk/makefile.msc.in : added ATK, removed all test apps. (I + would like to get rid of this file again, and use straight + makefile.msc again, as the other Gtk+ subdirs do) + + * test/makefile.msc (new file) : build the test apps here + Sat May 5 10:06:24 2001 Owen Taylor * Release 1.3.5 diff --git a/gdk/gdk.def b/gdk/gdk.def index 673a3628c9..0c1068ff0f 100644 --- a/gdk/gdk.def +++ b/gdk/gdk.def @@ -313,6 +313,7 @@ EXPORTS gdk_window_clear_area_e gdk_window_constrain_size gdk_window_destroy + gdk_window_destroy_notify gdk_window_end_paint gdk_window_foreign_new gdk_window_get_children diff --git a/gdk/makefile.msc b/gdk/makefile.msc index 72d4736ad4..7866cd2455 100644 --- a/gdk/makefile.msc +++ b/gdk/makefile.msc @@ -41,7 +41,7 @@ PERL = perl !ENDIF CFLAGS = -I . -I .. $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I ../gdk-pixbuf \ - -DG_ENABLE_DEBUG -DHAVE_CONFIG_H -DGDK_VERSION=\"$(GTK_VER)\" + -DG_ENABLE_DEBUG -DHAVE_CONFIG_H -DGDK_ENABLE_BROKEN -DGDK_VERSION=\"$(GTK_VER)\" EXTRALIBS = $(WTKIT)\lib\i386\wntab32x.lib $(GLIB_LIBS) \ ..\gdk-pixbuf\gdk_pixbuf-$(GDK_PIXBUF_VER).lib $(PANGOWIN32_LIBS) diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c index 3193827362..c4ded42a71 100644 --- a/gdk/win32/gdkevents-win32.c +++ b/gdk/win32/gdkevents-win32.c @@ -1623,6 +1623,8 @@ gdk_event_translate (GdkEvent *event, if (result != GDK_FILTER_CONTINUE) { return_val = (result == GDK_FILTER_TRANSLATE) ? TRUE : FALSE; + *ret_val_flagp = TRUE; + *ret_valp = return_val; goto done; } } @@ -1748,6 +1750,8 @@ gdk_event_translate (GdkEvent *event, switch (result) { case GDK_FILTER_REMOVE: + *ret_val_flagp = TRUE; + *ret_valp = 0; return_val = FALSE; break; @@ -1756,6 +1760,8 @@ gdk_event_translate (GdkEvent *event, break; case GDK_FILTER_CONTINUE: + *ret_val_flagp = TRUE; + *ret_valp = 1; return_val = TRUE; event->client.type = GDK_CLIENT_EVENT; event->client.window = window; @@ -1828,6 +1834,8 @@ gdk_event_translate (GdkEvent *event, keyup_or_down: event->key.window = window; + event->key.hardware_keycode = msg->wParam; + switch (msg->wParam) { case VK_LBUTTON: @@ -3130,6 +3138,14 @@ gdk_event_send_clientmessage_toall (GdkEvent *event) void gdk_flush (void) { + MSG msg; + + /* Process all messages currently available */ + while (PeekMessage (&msg, NULL, 0, 0, PM_REMOVE)) + { + TranslateMessage (&msg); /* Translate virt. key codes */ + DispatchMessage (&msg); /* Dispatch msg. to window */ + } GdiFlush (); } diff --git a/gdk/win32/gdkgc-win32.c b/gdk/win32/gdkgc-win32.c index a51ef61c36..417f9d254b 100644 --- a/gdk/win32/gdkgc-win32.c +++ b/gdk/win32/gdkgc-win32.c @@ -645,7 +645,7 @@ gdk_win32_gc_set_dashes (GdkGC *gc, return; } - /* win32_gc->pen_style = PS_COSMETIC; ??? */ + win32_gc->pen_style = PS_COSMETIC; /* ??? */ if (2 == n) { if ((dash_list[0] == dash_list[1]) && (dash_list[0] > 2)) @@ -946,10 +946,19 @@ predraw_set_background (GdkGC *gc, gboolean *ok) { GdkGCWin32 *win32_gc = (GdkGCWin32 *) gc; - COLORREF bg = gdk_colormap_color (colormap, win32_gc->background); - if (SetBkColor (win32_gc->hdc, bg) == CLR_INVALID) - WIN32_GDI_FAILED ("SetBkColor"), *ok = FALSE; + if (win32_gc->values_mask & GDK_GC_BACKGROUND) + { + COLORREF bg = gdk_colormap_color (colormap, win32_gc->background); + + if (SetBkColor (win32_gc->hdc, bg) == CLR_INVALID) + WIN32_GDI_FAILED ("SetBkColor"), *ok = FALSE; + } + else + { + if (0 == SetBkMode (win32_gc->hdc, TRANSPARENT)) + WIN32_GDI_FAILED ("SetBkMode"), *ok = FALSE; + } } HDC @@ -998,7 +1007,7 @@ gdk_win32_hdc_get (GdkDrawable *drawable, if (ok && (usage & GDK_GC_BACKGROUND) - && (win32_gc->values_mask & GDK_GC_BACKGROUND)) + /* && (win32_gc->values_mask & GDK_GC_BACKGROUND) */) predraw_set_background (gc, impl->colormap, &ok); if (ok && (usage & GDK_GC_FONT)) diff --git a/gdk/win32/gdkimage-win32.c b/gdk/win32/gdkimage-win32.c index 4c87a57420..86f90ebf78 100644 --- a/gdk/win32/gdkimage-win32.c +++ b/gdk/win32/gdkimage-win32.c @@ -182,6 +182,11 @@ gdk_image_new_bitmap (GdkVisual *visual, image->bits_per_pixel = 1; image->bpp = 1; + + /* free data right now, in contrast to the X11 version we have made + * our own copy. Use free, it was malloc()ed. + */ + free (data); return(image); } /* gdk_image_new_bitmap() */