[gtk+/gtk-2-16] Prefer MessageBeep() over Beep()

[Hans Breuer <hans src gnome org>]

commit 5e59db1554a9ee5138c1e9a5e1c21a4f196d476a
Author: Hans Breuer <hans breuer org>
Date:   Fri Jun 11 20:47:28 2010 +0200

    Prefer MessageBeep() over Beep()
    
    Only the former respects the sound volume setting. If MessageBeep() fails fall back to the latter.

 gdk/win32/gdkmain-win32.c |    3 ++-
 gtk/makefile.msc.in       |    5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/gdk/win32/gdkmain-win32.c b/gdk/win32/gdkmain-win32.c
index 891a791..1ba1bff 100644
--- a/gdk/win32/gdkmain-win32.c
+++ b/gdk/win32/gdkmain-win32.c
@@ -180,7 +180,8 @@ void
 gdk_display_beep (GdkDisplay *display)
 {
   g_return_if_fail (display == gdk_display_get_default());
-  Beep(1000, 50);
+  if (!MessageBeep (-1))
+    Beep (1000, 50);
 }
 
 void
diff --git a/gtk/makefile.msc.in b/gtk/makefile.msc.in
index 83aa1b8..3245530 100644
--- a/gtk/makefile.msc.in
+++ b/gtk/makefile.msc.in
@@ -101,6 +101,7 @@ gtk_OBJECTS_deprecated = \
 	gtklistitem.obj \
 	gtkprogress.obj \
 	gtktipsquery.obj \
+	gtkshow.obj \
 	gtksignal.obj \
 	gtkpixmap.obj \
 	gtkpreview.obj \
@@ -144,7 +145,6 @@ gtk_OBJECTS_file = \
 	gtkfilefilter.obj \
 	gtkfilesystem.obj \
 	gtkfilesystemmodel.obj \
-	gtkfilesystemwin32.obj \
 
 gtk_OBJECTS_print = \
 	gtkprint-win32.obj \
@@ -193,6 +193,7 @@ gtk_OBJECTS = \
 	gtkaccessible.obj \
 	gtkaction.obj \
 	gtkactiongroup.obj \
+	gtkactivatable.obj \
 	gtkadjustment.obj \
 	gtkalignment.obj \
 	gtkarrow.obj \
@@ -273,6 +274,7 @@ gtk_OBJECTS = \
 	gtkmountoperation.obj \
 	gtknotebook.obj \
 	gtkobject.obj \
+	gtkorientable.obj \
 	gtkpagesetup.obj \
 	gtkpaned.obj \
 	gtkpapersize.obj \
@@ -347,6 +349,7 @@ gtk_public_h_sources =		\
 	gtkaccessible.h		\
 	gtkaction.h		\
 	gtkactiongroup.h	\
+	gtkactivatable.h	\
 	gtkadjustment.h		\
 	gtkalignment.h		\
 	gtkarrow.h		\