AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

workaround for bug #137496, the real fix would involve just another small

Browse Source 
2004-04-11  Hans Breuer  <hans@breuer.org>

	* gdk/win32/gdkspawn-win32.c : workaround for bug #137496,
	the real fix would involve just another small API breakage,
	i.e. gdk_spawn_* using GPid not just gint.

	* gtk/makefile.msc.in : build gtk-win32.res, not gtk.res
This commit is contained in:
Hans Breuer 2004-04-11 15:25:06 +00:00 committed by Hans Breuer
parent 4a70394213
commit e9ec1e81b1
7 changed files with 47 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2004-04-11 Hans Breuer <hans@breuer.org>
* gdk/win32/gdkspawn-win32.c : workaround for bug #137496,
the real fix would involve just another small API breakage,
i.e. gdk_spawn_* using GPid not just gint.
* gtk/makefile.msc.in : build gtk-win32.res, not gtk.res
2004-04-10 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkkeys-win32.c (gdk_keymap_translate_keyboard_state):

8
ChangeLog.pre-2-10
View File

@ -1,3 +1,11 @@
2004-04-11 Hans Breuer <hans@breuer.org>
* gdk/win32/gdkspawn-win32.c : workaround for bug #137496,
the real fix would involve just another small API breakage,
i.e. gdk_spawn_* using GPid not just gint.
* gtk/makefile.msc.in : build gtk-win32.res, not gtk.res
2004-04-10 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkkeys-win32.c (gdk_keymap_translate_keyboard_state):

8
ChangeLog.pre-2-4
View File

@ -1,3 +1,11 @@
2004-04-11 Hans Breuer <hans@breuer.org>
* gdk/win32/gdkspawn-win32.c : workaround for bug #137496,
the real fix would involve just another small API breakage,
i.e. gdk_spawn_* using GPid not just gint.
* gtk/makefile.msc.in : build gtk-win32.res, not gtk.res
2004-04-10 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkkeys-win32.c (gdk_keymap_translate_keyboard_state):

8
ChangeLog.pre-2-6
View File

@ -1,3 +1,11 @@
2004-04-11 Hans Breuer <hans@breuer.org>
* gdk/win32/gdkspawn-win32.c : workaround for bug #137496,
the real fix would involve just another small API breakage,
i.e. gdk_spawn_* using GPid not just gint.
* gtk/makefile.msc.in : build gtk-win32.res, not gtk.res
2004-04-10 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkkeys-win32.c (gdk_keymap_translate_keyboard_state):

8
ChangeLog.pre-2-8
View File

@ -1,3 +1,11 @@
2004-04-11 Hans Breuer <hans@breuer.org>
* gdk/win32/gdkspawn-win32.c : workaround for bug #137496,
the real fix would involve just another small API breakage,
i.e. gdk_spawn_* using GPid not just gint.
* gtk/makefile.msc.in : build gtk-win32.res, not gtk.res
2004-04-10 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkkeys-win32.c (gdk_keymap_translate_keyboard_state):

6
gdk/win32/gdkspawn-win32.c
View File

@ -38,6 +38,7 @@ gdk_spawn_on_screen (GdkScreen *screen,
GError **error)
{
g_return_val_if_fail (GDK_IS_SCREEN (screen), FALSE);
g_assert (sizeof(GPid) == sizeof(int));
return g_spawn_async (working_directory,
argv,
@ -45,7 +46,7 @@ gdk_spawn_on_screen (GdkScreen *screen,
flags,
child_setup,
user_data,
child_pid,
(GPid*)child_pid,
error);
}
@ -64,6 +65,7 @@ gdk_spawn_on_screen_with_pipes (GdkScreen *screen,
GError **error)
{
g_return_val_if_fail (GDK_IS_SCREEN (screen), FALSE);
g_assert (sizeof(GPid) == sizeof(int));
return g_spawn_async_with_pipes (working_directory,
argv,
@ -71,7 +73,7 @@ gdk_spawn_on_screen_with_pipes (GdkScreen *screen,
flags,
child_setup,
user_data,
child_pid,
(GPid*)child_pid,
standard_input,
standard_output,
standard_error,

6
gtk/makefile.msc.in
View File

@ -484,13 +484,13 @@ gtkmarshal.c : gtkmarshal.list
gtksignal.obj : gtksignal.c gtkmarshal.c gtkmarshal.h
$(CC) $(CFLAGS) -GD -c -DGTK_COMPILATION -DG_LOG_DOMAIN=\"Gtk\" gtksignal.c
gtk.res : gtk.rc
rc -DBUILDNUMBER=0 -r -fo gtk.res gtk.rc
gtk-win32.res : gtk-win32.rc
rc -DBUILDNUMBER=0 -r -fo gtk-win32.res gtk-win32.rc
#
# Linking:
#
libgtk-win32-$(GTK_VER)-0.dll : $(gtk_OBJECTS) gtk.def gtk.res
libgtk-win32-$(GTK_VER)-0.dll : $(gtk_OBJECTS) gtk.def gtk-win32.res
$(CC) $(CFLAGS) -LD -Fm -Fe$@ $(gtk_OBJECTS) gtk.res \
$(GDK_LIBS) $(GDK_PIXBUF_LIBS) $(PANGO_LIBS) $(INTL_LIBS) $(GLIB_LIBS) \
gdi32.lib user32.lib advapi32.lib wsock32.lib shell32.lib \