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

[Win32] Bypass libtool, use -Wl,-luuid. This avoids a libtool warning as

Browse Source 
2005-07-18  Tor Lillqvist  <tml@novell.com>

	* configure.in (GDK_EXTRA_LIBS): [Win32] Bypass libtool, use
	-Wl,-luuid. This avoids a libtool warning as libuuid is static.

	* gdk/win32/gdkgc-win32.c (gdk_win32_hdc_get): Be sure to remove
	any possible leftover clipping region in the DC if we don't want
	any clipping. Thanks to Robert Ögren. (#309823)
This commit is contained in:
Tor Lillqvist
2005-07-18 15:20:28 +00:00
committed by Tor Lillqvist
parent a8b97834de
commit 80d2565d1c
5 changed files with 33 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,12 @@
2005-07-18 Tor Lillqvist <tml@novell.com>
* gdk/win32/gdkgc-win32.c (gdk_win32_hdc_get): Be sure to remove
any possible leftover clipping region in the DC if we don't want
any clipping. Thanks to Robert Ögren. (#309823)
* configure.in (GDK_EXTRA_LIBS): [Win32] Bypass libtool, use
-Wl,-luuid. This avoids a libtool warning as libuuid is static.
2005-07-18 Matthias Clasen <mclasen@redhat.com> 2005-07-18 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkcombobox.c (gtk_combo_box_set_focus_on_click): Propagate * gtk/gtkcombobox.c (gtk_combo_box_set_focus_on_click): Propagate
@ -180,7 +189,7 @@
* configure.in: Check that we have a new enough Cairo. * configure.in: Check that we have a new enough Cairo.
2005-07-13 Robert <EFBFBD>gren <gtk@roboros.com> 2005-07-13 Robert Ögren <gtk@roboros.com>
Fix handling of Aiptek and Aiptek-like graphical tablets such as Trust Fix handling of Aiptek and Aiptek-like graphical tablets such as Trust
on Windows. (#167004, thanks to "pnohant" for testing) on Windows. (#167004, thanks to "pnohant" for testing)

11
ChangeLog.pre-2-10
View File

@ -1,3 +1,12 @@
2005-07-18 Tor Lillqvist <tml@novell.com>
* gdk/win32/gdkgc-win32.c (gdk_win32_hdc_get): Be sure to remove
any possible leftover clipping region in the DC if we don't want
any clipping. Thanks to Robert Ögren. (#309823)
* configure.in (GDK_EXTRA_LIBS): [Win32] Bypass libtool, use
-Wl,-luuid. This avoids a libtool warning as libuuid is static.
2005-07-18 Matthias Clasen <mclasen@redhat.com> 2005-07-18 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkcombobox.c (gtk_combo_box_set_focus_on_click): Propagate * gtk/gtkcombobox.c (gtk_combo_box_set_focus_on_click): Propagate
@ -180,7 +189,7 @@
* configure.in: Check that we have a new enough Cairo. * configure.in: Check that we have a new enough Cairo.
2005-07-13 Robert <EFBFBD>gren <gtk@roboros.com> 2005-07-13 Robert Ögren <gtk@roboros.com>
Fix handling of Aiptek and Aiptek-like graphical tablets such as Trust Fix handling of Aiptek and Aiptek-like graphical tablets such as Trust
on Windows. (#167004, thanks to "pnohant" for testing) on Windows. (#167004, thanks to "pnohant" for testing)

11
ChangeLog.pre-2-8
View File

@ -1,3 +1,12 @@
2005-07-18 Tor Lillqvist <tml@novell.com>
* gdk/win32/gdkgc-win32.c (gdk_win32_hdc_get): Be sure to remove
any possible leftover clipping region in the DC if we don't want
any clipping. Thanks to Robert Ögren. (#309823)
* configure.in (GDK_EXTRA_LIBS): [Win32] Bypass libtool, use
-Wl,-luuid. This avoids a libtool warning as libuuid is static.
2005-07-18 Matthias Clasen <mclasen@redhat.com> 2005-07-18 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkcombobox.c (gtk_combo_box_set_focus_on_click): Propagate * gtk/gtkcombobox.c (gtk_combo_box_set_focus_on_click): Propagate
@ -180,7 +189,7 @@
* configure.in: Check that we have a new enough Cairo. * configure.in: Check that we have a new enough Cairo.
2005-07-13 Robert <EFBFBD>gren <gtk@roboros.com> 2005-07-13 Robert Ögren <gtk@roboros.com>
Fix handling of Aiptek and Aiptek-like graphical tablets such as Trust Fix handling of Aiptek and Aiptek-like graphical tablets such as Trust
on Windows. (#167004, thanks to "pnohant" for testing) on Windows. (#167004, thanks to "pnohant" for testing)

2
configure.in
View File

@ -1366,7 +1366,7 @@ if test "x$gdktarget" = "xwin32"; then
AC_SUBST(GDK_WIN32_EXTRA_CFLAGS) AC_SUBST(GDK_WIN32_EXTRA_CFLAGS)
fi fi
GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -user32 -limm32 -lshell32 -lole32 -luuid" GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -user32 -limm32 -lshell32 -lole32 -Wl,-luuid"
AM_CONDITIONAL(USE_WIN32, true) AM_CONDITIONAL(USE_WIN32, true)
else else
AM_CONDITIONAL(USE_WIN32, false) AM_CONDITIONAL(USE_WIN32, false)

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

@ -925,6 +925,8 @@ gdk_win32_hdc_get (GdkDrawable *drawable,
win32_gc->values_mask & GDK_GC_CLIP_Y_ORIGIN ? gc->clip_y_origin : 0) == ERROR) win32_gc->values_mask & GDK_GC_CLIP_Y_ORIGIN ? gc->clip_y_origin : 0) == ERROR)
WIN32_API_FAILED ("OffsetClipRgn"), ok = FALSE; WIN32_API_FAILED ("OffsetClipRgn"), ok = FALSE;
} }
else if (ok)
SelectClipRgn (win32_gc->hdc, NULL);
GDK_NOTE (GC, (g_print ("gdk_win32_hdc_get: %p (%s): ", GDK_NOTE (GC, (g_print ("gdk_win32_hdc_get: %p (%s): ",
win32_gc, _gdk_win32_gcvalues_mask_to_string (usage)), win32_gc, _gdk_win32_gcvalues_mask_to_string (usage)),