2 files changed, 10 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 3875f081c8b..cbba8f5d3d5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-27  Jason Rumney  <jasonr@gnu.org>
+
+        * makefile.w32-in (LIBS): Add COMCTL32.
+
+        * w32fns.c (globals_of_w32fns): Init common controls.
+
 2007-09-21  Richard Stallman  <rms@gnu.org>
 
         * image.c (our_memory_buffer): Renamed from omfib_buffer.
diff --git a/src/w32fns.c b/src/w32fns.c
index be3570231dc..d260b0d9be9 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -48,6 +48,7 @@ Boston, MA 02110-1301, USA.  */
 
 #include "bitmaps/gray.xbm"
 
+#include <commctrl.h>
 #include <commdlg.h>
 #include <shellapi.h>
 #include <ctype.h>
@@ -9073,6 +9074,9 @@ void globals_of_w32fns ()
               &w32_ansi_code_page,
               doc: /* The ANSI code page used by the system.  */);
   w32_ansi_code_page = GetACP ();
+
+  /* MessageBox does not work without this when linked to comctl32.dll 6.0.  */
+  InitCommonControls ();
 }
 
 #undef abort