updated <io.h> for open() use G_PI instead of M_PI

2005-07-03  Hans Breuer  <hans@breuer.org>

	* **/makefile.msc[.in] : updated
	* gtk/gtkiconcache.c : <io.h> for open()
	* gtk/gtkstyle.c : use G_PI instead of M_PI

	* gdk/win32/gdkcursor-win32.c : implement gdk_cursor_new_from_name()
	by mapping the lower case win32 api name to the respective cursor.
	E.g. pass "wait" to get the IDC_WAIT cursor. Also allows to load
	cursors from named resources in the executable.
	(gdk_cursor_get_image) : just return NULL for now.

	* gdk/win32/gdkgeometry-win32.c : implement gdk_window_move_region()
	by delegation to ScollWindowEx(), untested.

	* gdk/win32/gdkwindow-win32.c : stub for gdk_window_set_urgency_hint()

4 files changed, 21 insertions, 3 deletions

diff --git a/gtk/gtkiconcache.c b/gtk/gtkiconcache.c
index afe96cecf7..8faca64a64 100644
--- a/gtk/gtkiconcache.c
+++ b/gtk/gtkiconcache.c
@@ -27,6 +27,9 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
+#ifdef G_OS_WIN32
+#include <io.h>
+#endif
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c
index 8fa082a6b3..0ab80a0b62 100644
--- a/gtk/gtkstyle.c
+++ b/gtk/gtkstyle.c
@@ -4858,7 +4858,7 @@ gtk_default_draw_expander (GtkStyle        *style,
   y_double = y + 0.5;
   
   cairo_translate (cr, x_double, y_double);
-  cairo_rotate (cr, degrees * M_PI / 180);
+  cairo_rotate (cr, degrees * G_PI / 180);
 
   cairo_move_to (cr, - radius / 2., - radius);
   cairo_line_to (cr,   radius / 2.,   0);
diff --git a/gtk/makefile.msc.in b/gtk/makefile.msc.in
index 3381c2c6d7..27c126e37f 100644
--- a/gtk/makefile.msc.in
+++ b/gtk/makefile.msc.in
@@ -436,7 +436,7 @@ gtk_extra_sources = \
 GENERATED = \
 	gtktypebuiltins.h gtktypebuiltins.c \
 	gtkmarshal.h gtkmarshal.c gtkmarshalers.h gtkmarshalers.c \
-	gtk.def gtkalias.h
+	gtk.def gtkalias.h gtkaliasdef.c
 
 #
 # Generated source files:
@@ -446,11 +446,14 @@ generated : $(GENERATED)
 
 gtk.def: gtk.symbols makefile.msc
 	echo EXPORTS > gtk.def
-	cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 gtk.symbols >> gtk.def
+	cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 -DALL_FILES gtk.symbols >> gtk.def
 
 gtkalias.h: gtk.symbols
 	cl /EP -DG_OS_WIN32 -DGTK_WINDOWING_WIN32 -DINCLUDE_INTERNAL_SYMBOLS gtk.symbols | $(PERL) makegtkalias.pl > gtkalias.h
 
+gtkaliasdef.c: gtk.symbols
+	 perl makegtkalias.pl -def < gtk.symbols > gtkaliasdef.c
+
 # generate type identifier header (GTK_TYPE_WIDGET_FLAGS)
 # use 'echo' to work around 'command line too long'
 gtktypebuiltins.h: $(gtk_public_h_sources) makefile.msc
@@ -502,6 +505,7 @@ gtk-win32.res : gtk-win32.rc
 libgtk-win32-$(GTK_VER)-0.dll : $(gtk_OBJECTS) gtk.def gtk-win32.res
 	$(CC) $(CFLAGS) -LD -Fm -Fe$@ $(gtk_OBJECTS) gtk-win32.res \
 	$(GDK_LIBS) $(GDK_PIXBUF_LIBS) $(PANGO_LIBS) $(INTL_LIBS) $(GLIB_LIBS) $(GMODULE_LIBS) \
+	$(CAIRO_LIBS) $(PANGOCAIRO_LIBS) \
 	gdi32.lib user32.lib advapi32.lib wsock32.lib shell32.lib ole32.lib \
 	$(LDFLAGS) /implib:gtk-win32-$(GTK_VER).lib /def:gtk.def
 
diff --git a/gtk/stock-icons/makefile.msc b/gtk/stock-icons/makefile.msc
index 3382ff3c02..b27a387f18 100644
--- a/gtk/stock-icons/makefile.msc
+++ b/gtk/stock-icons/makefile.msc
@@ -57,13 +57,18 @@ VARIABLES = \
 	stock_first_24		stock_first_24.png	\
 	stock_font_16		stock_font_16.png	\
 	stock_font_24		stock_font_24.png	\
+	stock_fullscreen_16	stock_fullscreen_16.png \
+	stock_fullscreen_24	stock_fullscreen_24.png \
 	stock_harddisk_16		stock_harddisk_16.png	\
 	stock_harddisk_24		stock_harddisk_24.png	\
 	stock_help_16		stock_help_16.png	\
 	stock_help_24		stock_help_24.png	\
 	stock_home_16		stock_home_16.png	\
 	stock_home_24		stock_home_24.png	\
+	stock_index_16		stock_index_16.png \
 	stock_index_24		stock_index_24.png	\
+	stock_info_16		stock_info_16.png \
+	stock_info_24		stock_info_24.png \
 	stock_insert_image_16		stock_insert_image_16.png	\
 	stock_insert_image_24		stock_insert_image_24.png	\
 	stock_insert_object_16		stock_insert_object_16.png	\
@@ -74,6 +79,8 @@ VARIABLES = \
 	stock_jump_to_rtl_24		stock_jump_to_rtl_24.png	\
 	stock_last_16		stock_last_16.png	\
 	stock_last_24		stock_last_24.png	\
+	stock_leave_fullscreen_16	stock_leave_fullscreen_16.png \
+	stock_leave_fullscreen_24	stock_leave_fullscreen_24.png \
 	stock_left_arrow_16		stock_left_arrow_16.png	\
 	stock_left_arrow_24		stock_left_arrow_24.png	\
 	stock_media_forward_16		stock_media_forward_16.png	\
@@ -172,9 +179,13 @@ VARIABLES2 = \
 	stock_up_arrow_24		stock_up_arrow_24.png	\
 	stock_wizard_24		stock_wizard_24.png	\
 	stock_yes_20		stock_yes_20.png	\
+	stock_zoom_1_16		stock_zoom_1_16.png \
 	stock_zoom_1_24		stock_zoom_1_24.png	\
+	stock_zoom_fit_16		stock_zoom_fit_16.png	\
 	stock_zoom_fit_24		stock_zoom_fit_24.png	\
+	stock_zoom_in_16		stock_zoom_in_16.png \
 	stock_zoom_in_24		stock_zoom_in_24.png	\
+	stock_zoom_out_16		stock_zoom_out_16.png	\
 	stock_zoom_out_24		stock_zoom_out_24.png	\