From ec4401974494286d9accaa7ff75be43a127d6baa Mon Sep 17 00:00:00 2001
From: "benjamin.drung@gmail.com"
 <benjamin.drung@gmail.com@47890b92-0858-11df-a26f-8b716316a5bc>
Date: Fri, 8 Nov 2013 10:51:32 +0000
Subject: [PATCH] FileDialog: Do not include (private) config.h in public
 header.

---
 lib-src/FileDialog/FileDialog.h           | 14 +-------------
 lib-src/FileDialog/FileDialogPrivate.h.in |  1 +
 lib-src/FileDialog/configure.ac           | 18 ++++++++++++------
 3 files changed, 14 insertions(+), 19 deletions(-)
 create mode 100644 lib-src/FileDialog/FileDialogPrivate.h.in

diff --git a/lib-src/FileDialog/FileDialog.h b/lib-src/FileDialog/FileDialog.h
index 37e112616..827edd69e 100644
--- a/lib-src/FileDialog/FileDialog.h
+++ b/lib-src/FileDialog/FileDialog.h
@@ -17,24 +17,12 @@ custom controls.
 #ifndef _FILE_DIALOG_H_
 #define _FILE_DIALOG_H_
 
-#if defined(__WXGTK__)
-#include "config.h"
-#endif
-
 #include "wx/defs.h"
 #include "wx/filedlg.h"
 
 typedef void (*fdCallback)(void *, int);
 
-#if defined(__WXMAC__)
-#include "mac/FileDialogPrivate.h"
-#elif defined(__WXMSW__)
-#include "win/FileDialogPrivate.h"
-#elif defined(__WXGTK__) && defined(HAVE_GTK)
-#include "gtk/FileDialogPrivate.h"
-#else
-#include "generic/FileDialogPrivate.h"
-#endif
+#include "FileDialogPrivate.h"
 
 /////////////////////////////////////////////////////////////////////////////
 // Name:        filedlg.h
diff --git a/lib-src/FileDialog/FileDialogPrivate.h.in b/lib-src/FileDialog/FileDialogPrivate.h.in
new file mode 100644
index 000000000..e7c9bff64
--- /dev/null
+++ b/lib-src/FileDialog/FileDialogPrivate.h.in
@@ -0,0 +1 @@
+#include "@IMPLEMENTATION@/FileDialogPrivate.h"
diff --git a/lib-src/FileDialog/configure.ac b/lib-src/FileDialog/configure.ac
index 14e2b47d7..f5a936509 100644
--- a/lib-src/FileDialog/configure.ac
+++ b/lib-src/FileDialog/configure.ac
@@ -71,30 +71,36 @@ dnl OS-specific configuration
 
 AC_CANONICAL_HOST
 
+IMPLEMENTATION="generic"
 case "${host_os}" in
    darwin*)
       dnl Mac OS X configuration
-      mac="yes"
+      IMPLEMENTATION="mac"
    ;;
 
    cygwin*)
       dnl Windows/CygWin configuration
-      windows="yes"
+      IMPLEMENTATION="win"
    ;;
 
    *)
       if test "$have_gtk" = "yes"; then
          AC_DEFINE(HAVE_GTK, 1, [Define to 1 if GTK+ is available.])
+         IMPLEMENTATION="gtk"
       fi
    ;;
 esac
 
-AM_CONDITIONAL([MAC], test "$mac" = "yes")
-AM_CONDITIONAL([WINDOWS], test "$windows" = "yes")
-AM_CONDITIONAL([GTK], test "$have_gtk" = "yes")
+AC_SUBST([IMPLEMENTATION])
+AM_CONDITIONAL([GENERIC], test "$IMPLEMENTATION" = "generic")
+AM_CONDITIONAL([GTK], test "$IMPLEMENTATION" = "gtk")
+AM_CONDITIONAL([MAC], test "$IMPLEMENTATION" = "mac")
+AM_CONDITIONAL([WINDOWS], test "$IMPLEMENTATION" = "win")
+
+echo "Implementation to use: $IMPLEMENTATION"
 
 AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([FileDialogPrivate.h Makefile])
 
 #
 # Write it all out