From e2cc1a80f09b7b33665be2ae14ef20673f9d6f7b Mon Sep 17 00:00:00 2001
From: Ian MacArthur <imacarthur@gmail.com>
Date: Thu, 28 Jan 2016 11:18:01 +0000
Subject: [PATCH] Some trivial adjustments to support building under
 Win32/mingw with the configure/make on Win7 with Msys.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11073 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 FL/Fl_Native_File_Chooser.H                   |  8 ++++++++
 src/Fl_Native_File_Chooser_WIN32.cxx          |  4 ++--
 .../GDI/Fl_GDI_Graphics_Driver_color.cxx      |  5 ++++-
 src/fl_color.cxx                              | 19 +++++++++++--------
 4 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/FL/Fl_Native_File_Chooser.H b/FL/Fl_Native_File_Chooser.H
index 0bf4b11ab..2fdb8b555 100644
--- a/FL/Fl_Native_File_Chooser.H
+++ b/FL/Fl_Native_File_Chooser.H
@@ -27,8 +27,16 @@
 #ifdef WIN32
 
 // #define _WIN32_WINNT	0x0501	// needed for OPENFILENAME's 'FlagsEx'
+#if defined(FL_LIBRARY)
+#  include <windows.h>
+#  include <commdlg.h>		// OPENFILENAMEW, GetOpenFileName()
+#  include <shlobj.h>		// BROWSEINFOW, SHBrowseForFolder()
+typedef OPENFILENAMEW fl_OPENFILENAMEW;
+typedef BROWSEINFOW fl_BROWSEINFOW;
+#else
 typedef void fl_OPENFILENAMEW;
 typedef void fl_BROWSEINFOW;
+#endif
 #  include <FL/filename.H>	// FL_EXPORT
 
 // Use Apple's chooser
diff --git a/src/Fl_Native_File_Chooser_WIN32.cxx b/src/Fl_Native_File_Chooser_WIN32.cxx
index 2f36635bc..560dc8002 100644
--- a/src/Fl_Native_File_Chooser_WIN32.cxx
+++ b/src/Fl_Native_File_Chooser_WIN32.cxx
@@ -29,8 +29,8 @@
 #define _binf_ptr (&_binf)
 #endif
 
-#  include <stdlib.h>		// malloc
-#  include <stdio.h>		// sprintf
+#include <stdlib.h>		// malloc
+#include <stdio.h>		// sprintf
 #include <wchar.h>
 
 #include "Fl_Native_File_Chooser_common.cxx"		// strnew/strfree/strapp/chrcat
diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver_color.cxx b/src/drivers/GDI/Fl_GDI_Graphics_Driver_color.cxx
index 24744a927..4991c9ccd 100644
--- a/src/drivers/GDI/Fl_GDI_Graphics_Driver_color.cxx
+++ b/src/drivers/GDI/Fl_GDI_Graphics_Driver_color.cxx
@@ -33,6 +33,9 @@
 // to co-exist, creating conflicts with multipe mapping.
 
 // FIXME: maybe we can forget about color mapping and assume RGB?
+//static unsigned fl_cmap[256] = {
+//#include "../../fl_cmap.h" // this is a file produced by "cmap.cxx":
+//};
 
 // Translations to win32 data structures:
 Fl_XMap fl_xmap[256];
@@ -150,7 +153,7 @@ HBRUSH fl_brush_action(int action) {
       for (int j=0; j<FL_N_BRUSH; j++) {
 	if (brushes[j].usage>16000)
 	  brushes[j].usage -= 16000;
-	else 
+	else
 	  brushes[j].usage = 0;
       }
     }
diff --git a/src/fl_color.cxx b/src/fl_color.cxx
index bf448b6d3..d98db309e 100644
--- a/src/fl_color.cxx
+++ b/src/fl_color.cxx
@@ -29,6 +29,17 @@
 #include <config.h>
 #include "config_lib.h"
 
+// fl_cmap needs to be defined *before* we include Fl_GDI_Graphics_Driver_color.cxx
+
+/** \addtogroup  fl_attributes
+ @{ */
+
+/* static */
+unsigned fl_cmap[256] = {
+#include "fl_cmap.h" // this is a file produced by "cmap.cxx":
+};
+
+
 // Remove #ifndef FL_LIBRARY_CMAKE and the entire block of #include
 // statements when the new build system is ready:
 #ifndef FL_LIBRARY_CMAKE
@@ -60,14 +71,6 @@
 
 // -----------------------------------------------------------------------------
 
-/** \addtogroup  fl_attributes
- @{ */
-
-/* static */
-unsigned fl_cmap[256] = {
-#include "fl_cmap.h" // this is a file produced by "cmap.cxx":
-};
-
 /**
  Returns the RGB value(s) for the given FLTK color index.