Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2025-02-26 08:22:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed checks for wxWidgets version/Unicode builds that are not supported anymore.

Browse Source
This commit is contained in:
Moritz Bunkus 2009-12-05 13:07:05 +01:00
parent 4ab69abe7a
commit 16cd2e5c2e
3 changed files with 7 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/common/wx.h
View File

@ -17,17 +17,16 @@
#include <wx/version.h>
#if defined(wxUSE_UNICODE) && wxUSE_UNICODE
# define wxU(s) wxString(s, wxConvUTF8)
# define wxCS(s) ((const wchar_t *)(s).c_str())
# define wxMB(s) ((const char *)(s).mb_str(wxConvUTF8))
# define wxUCS(s) wxU(s).c_str()
# define wxCS2WS(s) wxUCS((s).c_str())
# define WXUNICODE 1
#else
#if !defined(wxUSE_UNICODE) || !wxUSE_UNICODE
# error wxWidgets was not compiled with Unicode support.
#endif
#define wxU(s) wxString(s, wxConvUTF8)
#define wxCS(s) ((const wchar_t *)(s).c_str())
#define wxMB(s) ((const char *)(s).mb_str(wxConvUTF8))
#define wxUCS(s) wxU(s).c_str()
#define wxCS2WS(s) wxUCS((s).c_str())
/* i18n stuff */
#if defined(HAVE_LIBINTL_H)
# include <libintl.h>

9
src/info/gui.cpp
View File

@ -31,10 +31,6 @@
using namespace libebml;
using namespace libmatroska;
#if ! wxCHECK_VERSION(2,4,2)
# define wxTreeItemIdValue long
#endif
mi_frame *frame;
enum {
@ -53,14 +49,9 @@ mi_app::OnInit() {
setup();
#if WXUNICODE
int i;
for (i = 1; i < argc; i++)
args.push_back(std::string(wxMB(wxString(argv[i]))));
#else
args = command_line_utf8(argc, argv);
#endif
parse_args(args, initial_file);

9
src/info/wxwidgets_ui.cpp
View File

@ -35,10 +35,6 @@
using namespace libebml;
using namespace libmatroska;
#if ! wxCHECK_VERSION(2,4,2)
# define wxTreeItemIdValue long
#endif
static mi_frame *frame;
enum {
@ -81,14 +77,9 @@ mi_app::OnInit() {
setup(get_ui_locale());
#if WXUNICODE
int i;
for (i = 1; i < argc; i++)
args.push_back(std::string(wxMB(wxString(argv[i]))));
#else
args = command_line_utf8(argc, argv);
#endif
parse_args(args, initial_file);