Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-16 08:09:32 +02:00
Code Issues Releases Wiki Activity

FileDialog: Do not include (private) config.h in public header.

Browse Source
This commit is contained in:
benjamin.drung@gmail.com 2013-11-08 10:51:32 +00:00
parent d282aa07ec
commit ec44019744
3 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib-src/FileDialog/FileDialog.h
View File

@ -17,24 +17,12 @@ custom controls.
#ifndef _FILE_DIALOG_H_ #ifndef _FILE_DIALOG_H_
#define _FILE_DIALOG_H_ #define _FILE_DIALOG_H_
#if defined(__WXGTK__)
#include "config.h"
#endif
#include "wx/defs.h" #include "wx/defs.h"
#include "wx/filedlg.h" #include "wx/filedlg.h"
typedef void (*fdCallback)(void *, int); typedef void (*fdCallback)(void *, int);
#if defined(__WXMAC__) #include "FileDialogPrivate.h"
#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
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: filedlg.h // Name: filedlg.h

1
lib-src/FileDialog/FileDialogPrivate.h.in Normal file
View File

@ -0,0 +1 @@
#include "@IMPLEMENTATION@/FileDialogPrivate.h"

18
lib-src/FileDialog/configure.ac
View File

@ -71,30 +71,36 @@ dnl OS-specific configuration
AC_CANONICAL_HOST AC_CANONICAL_HOST
IMPLEMENTATION="generic"
case "${host_os}" in case "${host_os}" in
darwin*) darwin*)
dnl Mac OS X configuration dnl Mac OS X configuration
mac="yes" IMPLEMENTATION="mac"
;; ;;
cygwin*) cygwin*)
dnl Windows/CygWin configuration dnl Windows/CygWin configuration
windows="yes" IMPLEMENTATION="win"
;; ;;
*) *)
if test "$have_gtk" = "yes"; then if test "$have_gtk" = "yes"; then
AC_DEFINE(HAVE_GTK, 1, [Define to 1 if GTK+ is available.]) AC_DEFINE(HAVE_GTK, 1, [Define to 1 if GTK+ is available.])
IMPLEMENTATION="gtk"
fi fi
;; ;;
esac esac
AM_CONDITIONAL([MAC], test "$mac" = "yes") AC_SUBST([IMPLEMENTATION])
AM_CONDITIONAL([WINDOWS], test "$windows" = "yes") AM_CONDITIONAL([GENERIC], test "$IMPLEMENTATION" = "generic")
AM_CONDITIONAL([GTK], test "$have_gtk" = "yes") 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_HEADERS([config.h])
AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([FileDialogPrivate.h Makefile])
# #
# Write it all out # Write it all out