From 5693b3d73ad8c2e36f3648e9135e249e741256de Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Sun, 22 Mar 2009 00:14:27 +0100 Subject: [PATCH] Remove wxWidgets 2.6 compatiblity options mmg requires wxWidgets 2.8 now which defines wxFD_OPEN etc. No need to check for it in configure. --- ac/wxwidgets.m4 | 12 ------------ src/common/wxcommon.h | 12 +----------- 2 files changed, 1 insertion(+), 23 deletions(-) diff --git a/ac/wxwidgets.m4 b/ac/wxwidgets.m4 index f093d19e8..25a1f1a4b 100644 --- a/ac/wxwidgets.m4 +++ b/ac/wxwidgets.m4 @@ -134,18 +134,6 @@ wxBitmapComboBox bitmap_combobox(NULL, -1); AC_DEFINE(HAVE_WXBITMAPCOMBOBOX, 1, [Define if the wxWindows class wxBitmapComboBox is present]) fi - AC_CACHE_CHECK([for the name of wxWidgets file dialog enums], [ac_cv_wx_fd_enum_prefix], [ - AC_TRY_COMPILE([ -#include -], [ -int i = (int)wxFD_SAVE; -], [ ac_cv_wx_fd_enum_prefix=wxFD_xyz ], [ ac_cv_wx_fd_enum_prefix=wx_xyz ]) - ]) - - if test x"$ac_cv_wx_fd_enum_prefix" = "xwxFD_xyz" ; then - AC_DEFINE(HAVE_WX_FILEDIALOG_ENUM_WITH_FD_PREFIX, 1, [Define if the wxWindows file dialog enums are named wxFD_xyz instead of wx_xyz]) - fi - AC_LANG_POP() CXXFLAGS="$ac_save_CXXFLAGS" LIBS="$ac_save_LIBS" diff --git a/src/common/wxcommon.h b/src/common/wxcommon.h index 515ec464d..25b704046 100644 --- a/src/common/wxcommon.h +++ b/src/common/wxcommon.h @@ -41,20 +41,10 @@ # endif #endif -// Some of these constants are not defined in wxWidgets 2.6, -// but the old ones are outdated in 2.8 and not present if -// it was compiled without 2.6 compatibility. -#if !defined(HAVE_WX_FILEDIALOG_ENUM_WITH_FD_PREFIX) -# define wxFD_OPEN wxOPEN -# define wxFD_SAVE wxSAVE -# define wxFD_MULTIPLE wxMULTIPLE -# define wxFD_OVERWRITE_PROMPT wxOVERWRITE_PROMPT -#endif - // Use wxComboBox on non-Windows builds with wxWidgets 2.8.0 and newer // because GTK's combo box has serious problems (see bug 339). #if !defined(wxMTX_COMBOBOX_TYPE) -# if !defined(SYS_WINDOWS) && !defined(SYS_APPLE) && wxCHECK_VERSION(2, 8, 0) && defined(HAVE_WXBITMAPCOMBOBOX) && HAVE_WXBITMAPCOMBOBOX +# if !defined(SYS_WINDOWS) && !defined(SYS_APPLE) && defined(HAVE_WXBITMAPCOMBOBOX) && HAVE_WXBITMAPCOMBOBOX # define USE_WXBITMAPCOMBOBOX # define wxMTX_COMBOBOX_TYPE wxBitmapComboBox # include