2006-06-05 Arnaud Charlet * gdk/win32/gdkgc-win32.c (_gdk_win32_gdkregion_to_hrgn): Disable harmless warning which is occurring often with Gtk+ 2.8.18. 2006-02-20 Arnaud Charlet * gtk/stock-icons/Makefile.in, demos/Makefile.in, gdk-pixbuf/Makefile.in, modules/input/Makefile.in: Force call to gdk-pixbuf-csource., gdk-pixbuf-query-loaders. and gtk-query-immodules-2.0. to work around cygwin ambiguity. 2002-11-25 Arnaud Charlet * gdk/Makefile.in: Remove gdk-win32res.o dependency, since we do not want to use the default Gtk+ icon. 2003-03-27 Arnaud Charlet * gdk/win32/gdkwindow-win32.c: Bring parent window on top when destroying a modal window. Fixes unexpected lost focus. 2002-09-12 Florent Duguet * gdk/win32/gdkevents-win32.c: Force an update when paint message is received, otherwise windows in background are not immediately refreshed when moving a modal window on top of them. Add handling of WM_NCPAINT message to refresh some areas when a window from another application is moved on top of the current app. --- gdk/win32/gdkevents-win32.c.old 2006-02-21 10:02:58.000000000 +0100 +++ gdk/win32/gdkevents-win32.c 2006-02-21 10:08:22.000000000 +0100 @@ -2125,6 +2125,12 @@ handle_wm_paint (MSG *msg, _gdk_window_process_expose (window, update_region); gdk_region_destroy (update_region); + /* Force a process_updates to refresh visible windows + * when receiving a paint message. */ + + if (!GDK_WINDOW_DESTROYED (window) && gdk_window_is_visible (window)) + gdk_window_process_updates (window, FALSE); + DeleteObject (hrgn); } @@ -2964,6 +2970,35 @@ gdk_event_translate (MSG *msg, *ret_valp = 1; break; + case WM_NCPAINT: + if (msg->wParam < 1) + break; + + { + HRGN hrgn; + + hrgn = CreateRectRgn (0, 0, 0, 0); + if (GetUpdateRgn (msg->hwnd, hrgn, FALSE) == ERROR) + { + WIN32_GDI_FAILED ("GetUpdateRgn"); + break; + } + + { + GdkRegion *update_region = _gdk_win32_hrgn_to_region (hrgn); + + _gdk_windowing_window_get_offsets (window, &xoffset, &yoffset); + gdk_region_offset (update_region, xoffset, yoffset); + + _gdk_window_process_expose (window, update_region); + gdk_region_destroy (update_region); + + DeleteObject (hrgn); + return_val = FALSE; + } + } + break; + case WM_PAINT: handle_wm_paint (msg, window, FALSE, NULL); break; --- gdk/win32/gdkwindow-win32.c.old 2006-02-21 10:09:41.000000000 +0100 +++ gdk/win32/gdkwindow-win32.c 2006-02-21 10:10:19.000000000 +0100 @@ -837,6 +837,15 @@ _gdk_windowing_window_destroy (GdkWindow GDK_NOTE (MISC, g_print ("_gdk_windowing_window_destroy: %p\n", GDK_WINDOW_HWND (window))); + if (private->modal_hint) + { + HWND parent = (HWND) GetWindowLong + (GDK_WINDOW_HWND (window), GWL_HWNDPARENT); + + if ((long)parent > 1 && !BringWindowToTop (parent)) + WIN32_API_FAILED ("BringWindowToTop"); + } + if (private->extension_events != 0) _gdk_input_window_destroy (window); --- gdk/Makefile.in.old 2006-02-21 10:46:12.000000000 +0100 +++ gdk/Makefile.in 2006-02-21 10:46:33.000000000 +0100 @@ -437,8 +437,8 @@ libgdk_win32_2_0_la_LIBADD = win32/libgdk-win32.la $(GDK_DEP_LIBS) \ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la\ $(am__append_1) $(am__append_2) -libgdk_win32_2_0_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.o gdk.def -libgdk_win32_2_0_la_LDFLAGS = -Wl,win32/rc/gdk-win32-res.o -export-symbols gdk.def $(LDADD) +libgdk_win32_2_0_la_DEPENDENCIES = win32/libgdk-win32.la gdk.def +libgdk_win32_2_0_la_LDFLAGS = -export-symbols gdk.def $(LDADD) @MS_LIB_AVAILABLE_TRUE@noinst_DATA = gdk-win32-$(GTK_API_VERSION).lib --- gdk-pixbuf/Makefile.in.old 2006-02-21 09:00:26.000000000 +0100 +++ gdk-pixbuf/Makefile.in 2006-02-21 08:58:57.000000000 +0100 @@ -1603,7 +1603,7 @@ distclean-local: install-data-hook: install-ms-lib install-def-file @if $(RUN_QUERY_LOADER_TEST) ; then \ $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \ - $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders > $(DESTDIR)$(sysconfdir)/gtk-2.0/gdk-pixbuf.loaders ; \ + $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders. > $(DESTDIR)$(sysconfdir)/gtk-2.0/gdk-pixbuf.loaders ; \ else \ echo "***" ; \ echo "*** Warning: gdk-pixbuf.loaders not built" ; \ @@ -1622,7 +1622,7 @@ uninstall-local: uninstall-ms-lib uninst @BUILD_DYNAMIC_MODULES_TRUE@ LOADERS=`echo libpixbufloader-*.la` ; \ @BUILD_DYNAMIC_MODULES_TRUE@ if test "x$$LOADERS" != 'xlibpixbufloader-*.la' ; then \ @BUILD_DYNAMIC_MODULES_TRUE@ echo "Writing a gdk-pixbuf.loader file to use when running examples before installing gdk-pixbuf."; \ -@BUILD_DYNAMIC_MODULES_TRUE@ $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders $$LOADERS > ./gdk-pixbuf.loaders ;\ +@BUILD_DYNAMIC_MODULES_TRUE@ $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders. $$LOADERS > ./gdk-pixbuf.loaders ;\ @BUILD_DYNAMIC_MODULES_TRUE@ else \ @BUILD_DYNAMIC_MODULES_TRUE@ echo "No dynamic modules found; will use only static modules for uninstalled example programs."; \ @BUILD_DYNAMIC_MODULES_TRUE@ touch gdk-pixbuf.loaders; \ --- gtk/stock-icons/Makefile.in.old 2006-02-20 15:49:26.000000000 +0100 +++ gtk/stock-icons/Makefile.in 2006-02-21 09:03:29.000000000 +0100 @@ -662,9 +662,9 @@ noinst_DATA = gtkstockpixbufs.h CLEANFILES = $(noinst_DATA) @CROSS_COMPILING_TRUE@pixbuf_csource = $(GDK_PIXBUF_CSOURCE) -@CROSS_COMPILING_FALSE@pixbuf_csource = GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource +@CROSS_COMPILING_FALSE@pixbuf_csource = GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource. @CROSS_COMPILING_TRUE@pixbuf_csource_deps = -@CROSS_COMPILING_FALSE@pixbuf_csource_deps = $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource $(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders +@CROSS_COMPILING_FALSE@pixbuf_csource_deps = $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource. $(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders EXTRA_DIST = $(IMAGES) gtkstockpixbufs.h subdir = gtk/stock-icons --- demos/Makefile.in.old 2006-02-20 16:58:02.000000000 +0100 +++ demos/Makefile.in 2006-02-21 09:06:00.000000000 +0100 @@ -317,9 +317,9 @@ $(am__append_1) @HAVE_PNG_TRUE@BUILT_SOURCES = test-inline-pixbufs.h @CROSS_COMPILING_TRUE@pixbuf_csource = $(GDK_PIXBUF_CSOURCE) -@CROSS_COMPILING_FALSE@pixbuf_csource = GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource +@CROSS_COMPILING_FALSE@pixbuf_csource = GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource. @CROSS_COMPILING_TRUE@pixbuf_csource_deps = -@CROSS_COMPILING_FALSE@pixbuf_csource_deps = $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource $(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders +@CROSS_COMPILING_FALSE@pixbuf_csource_deps = $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource. $(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders testpixbuf_DEPENDENCIES = $(DEPS) testpixbuf_drawable_DEPENDENCIES = $(DEPS) --- modules/input/Makefile.in.old 2006-02-21 09:07:45.000000000 +0100 +++ modules/input/Makefile.in 2006-02-21 09:08:12.000000000 +0100 @@ -800,8 +800,8 @@ install-data-hook: @if $(RUN_QUERY_IMMODULES_TEST) ; then \ echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \ $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \ - echo "$(top_builddir)/gtk/gtk-query-immodules-2.0 > $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules" ; \ - $(top_builddir)/gtk/gtk-query-immodules-2.0 > $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules ; \ + echo "$(top_builddir)/gtk/gtk-query-immodules-2.0. > $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules" ; \ + $(top_builddir)/gtk/gtk-query-immodules-2.0. > $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules ; \ else \ echo "***" ; \ echo "*** Warning: gtk.immodules not built" ; \ @@ -815,7 +815,7 @@ uninstall-local: rm -f $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules gtk.immodules: Makefile.am $(module_LTLIBRARIES) - $(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules + $(top_builddir)/gtk/gtk-query-immodules-2.0. $(module_LTLIBRARIES) > gtk.immodules @CROSS_COMPILING_FALSE@all-local: gtk.immodules # Tell versions [3.59,3.63) of GNU make to not export all variables. --- gdk/win32/gdkgc-win32.c.old 2005-07-18 17:20:28.000000000 +0200 +++ gdk/win32/gdkgc-win32.c 2006-06-05 14:56:59.515625000 +0200 @@ -1160,8 +1160,7 @@ _gdk_win32_gdkregion_to_hrgn (GdkRegion if (rect->bottom > rgndata->rdh.rcBound.bottom) rgndata->rdh.rcBound.bottom = rect->bottom; } - if ((hrgn = ExtCreateRegion (NULL, nbytes, rgndata)) == NULL) - WIN32_API_FAILED ("ExtCreateRegion"); + hrgn = ExtCreateRegion (NULL, nbytes, rgndata); g_free (rgndata);