Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2024-10-22 07:21:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove wxWidgets 2.6 compatiblity options

Browse Source 
mmg requires wxWidgets 2.8 now which defines wxFD_OPEN etc. No need to check for it in configure.
This commit is contained in:
Moritz Bunkus 2009-03-22 00:14:27 +01:00
parent 1e88b396e1
commit 5693b3d73a
2 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ac/wxwidgets.m4
View File

@ -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 <wx/filedlg.h>
], [
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"

12
src/common/wxcommon.h
View File

@ -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 <wx/bmpcbox.h>