From bdb13b9e584f1627c2759eeb8c9c62bc6453f80e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Tue, 7 Oct 2014 23:48:21 +0200 Subject: [PATCH] - up to 20141007 snapshot --- gpac-export.patch | 75 ------------------- gpac-ffmpeg2.patch | 119 ------------------------------ gpac-idl_uuid.patch | 10 --- gpac-install.patch | 15 ++-- gpac-js.patch | 16 ++-- gpac-xulrunner.patch | 17 +++-- gpac.spec | 20 +++-- wxWidgets3.patch | 169 +++++++++++++++++++++++-------------------- 8 files changed, 127 insertions(+), 314 deletions(-) delete mode 100644 gpac-export.patch delete mode 100644 gpac-ffmpeg2.patch delete mode 100644 gpac-idl_uuid.patch diff --git a/gpac-export.patch b/gpac-export.patch deleted file mode 100644 index 30c668c..0000000 --- a/gpac-export.patch +++ /dev/null @@ -1,75 +0,0 @@ ---- gpac/src/terminal/terminal.c.orig 2012-05-23 20:57:42.000000000 +0200 -+++ gpac/src/terminal/terminal.c 2012-06-17 09:20:24.582866480 +0200 -@@ -1866,6 +1866,7 @@ u32 gf_term_sample_clocks(GF_Terminal *t - return 0; - } - -+GF_EXPORT - const char *gf_term_get_text_selection(GF_Terminal *term, Bool probe_only) - { - Bool has_text; -@@ -1876,7 +1877,7 @@ const char *gf_term_get_text_selection(G - return gf_sc_get_selected_text(term->compositor); - } - -- -+GF_EXPORT - GF_Err gf_term_paste_text(GF_Terminal *term, const char *txt, Bool probe_only) - { - if (!term) return GF_BAD_PARAM; ---- gpac/src/terminal/object_browser.c.orig 2012-03-27 11:48:05.000000000 +0200 -+++ gpac/src/terminal/object_browser.c 2012-06-17 09:21:02.492864890 +0200 -@@ -102,6 +102,7 @@ u32 gf_term_object_subscene_type(GF_Term - } - - /*select given object when stream selection is available*/ -+GF_EXPORT - void gf_term_select_object(GF_Terminal *term, GF_ObjectManager *odm) - { - if (!term || !odm) return; ---- gpac/src/utils/os_divers.c.orig 2012-04-04 16:47:33.000000000 +0200 -+++ gpac/src/utils/os_divers.c 2012-06-17 09:22:03.782862317 +0200 -@@ -311,6 +311,7 @@ void gf_move_file(const char *fileName, - #endif - } - -+GF_EXPORT - void gf_rand_init(Bool Reset) - { - if (Reset) { -@@ -324,6 +325,7 @@ void gf_rand_init(Bool Reset) - } - } - -+GF_EXPORT - u32 gf_rand() - { - return rand(); ---- gpac/src/isomedia/isom_write.c.orig 2012-03-29 14:36:23.000000000 +0200 -+++ gpac/src/isomedia/isom_write.c 2012-10-02 21:55:13.269904532 +0200 -@@ -1140,6 +1140,7 @@ - return Track_SetStreamDescriptor(trak, StreamDescriptionIndex, entry->dataReferenceIndex, esd, NULL); - } - -+GF_EXPORT - GF_Err gf_isom_set_visual_info(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, u32 Width, u32 Height) - { - GF_Err e; -@@ -1187,6 +1188,7 @@ - } - } - -+GF_EXPORT - GF_Err gf_isom_set_pixel_aspect_ratio(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, u32 hSpacing, u32 vSpacing) - { - GF_Err e; ---- gpac/src/isomedia/avc_ext.c.orig 2012-03-27 11:48:05.000000000 +0200 -+++ gpac/src/isomedia/avc_ext.c 2012-10-02 21:54:35.469905865 +0200 -@@ -170,6 +170,7 @@ - - - #ifndef GPAC_DISABLE_ISOM_WRITE -+GF_EXPORT - GF_Err gf_isom_avc_config_new(GF_ISOFile *the_file, u32 trackNumber, GF_AVCConfig *cfg, char *URLname, char *URNname, u32 *outDescriptionIndex) - { - GF_TrackBox *trak; diff --git a/gpac-ffmpeg2.patch b/gpac-ffmpeg2.patch deleted file mode 100644 index 6c7640d..0000000 --- a/gpac-ffmpeg2.patch +++ /dev/null @@ -1,119 +0,0 @@ -Index: modules/ffmpeg_in/ffmpeg_in.h -=================================================================== ---- modules/ffmpeg_in/ffmpeg_in.h (revision 4282) -+++ modules/ffmpeg_in/ffmpeg_in.h (revision 4451) -@@ -120,7 +120,7 @@ - - /*for audio packed frames*/ - u32 frame_start; -- char audio_buf[AVCODEC_MAX_AUDIO_FRAME_SIZE]; -+ char audio_buf[192000]; - Bool check_h264_isma; - - u32 base_ES_ID; -Index: modules/ffmpeg_in/ffmpeg_demux.c -=================================================================== ---- modules/ffmpeg_in/ffmpeg_demux.c (revision 4282) -+++ modules/ffmpeg_in/ffmpeg_demux.c (revision 4451) -@@ -53,6 +53,18 @@ - #define AVERROR_NOFMT AVERROR(EINVAL) - #endif /* AVERROR_NOFMT */ - -+ -+#if (LIBAVFORMAT_VERSION_MAJOR >= 54) && (LIBAVFORMAT_VERSION_MINOR >= 20) -+ -+#define av_find_stream_info(__c) avformat_find_stream_info(__c, NULL) -+#ifndef FF_API_FORMAT_PARAMETERS -+#define FF_API_FORMAT_PARAMETERS 1 -+#endif -+ -+#endif -+ -+ -+ - static u32 FFDemux_Run(void *par) - { - AVPacket pkt; -Index: modules/ffmpeg_in/ffmpeg_decode.c -=================================================================== ---- modules/ffmpeg_in/ffmpeg_decode.c (revision 4282) -+++ modules/ffmpeg_in/ffmpeg_decode.c (revision 4451) -@@ -38,8 +38,14 @@ - #undef USE_AVCODEC2 - #endif - -+#if (LIBAVCODEC_VERSION_MAJOR >= 55) -+#define USE_AVCTX3 -+#elif (LIBAVCODEC_VERSION_MAJOR >= 54) && (LIBAVCODEC_VERSION_MINOR >= 35) -+#define USE_AVCTX3 -+#endif - - -+ - /** - * Allocates data for FFMPEG decoding - * \param oldBuffer The oldBuffer (freed if not NULL) -@@ -170,7 +176,12 @@ - frame = &ffd->base_frame; - } - if (!(*ctx)){ -+ -+#ifdef USE_AVCTX3 -+ *ctx = avcodec_alloc_context3(NULL); -+#else - *ctx = avcodec_alloc_context(); -+#endif - } - - /*private FFMPEG DSI*/ -@@ -318,7 +329,11 @@ - (*ctx)->pix_fmt = ffd->raw_pix_fmt; - if ((*ctx)->extradata && strstr((*ctx)->extradata, "BottomUp")) ffd->flipped = 1; - } else { -+#ifdef USE_AVCTX3 -+ if (avcodec_open2((*ctx), (*codec), NULL )<0) return GF_NON_COMPLIANT_BITSTREAM; -+#else - if (avcodec_open((*ctx), (*codec) )<0) return GF_NON_COMPLIANT_BITSTREAM; -+#endif - } - - /*setup audio streams*/ -@@ -612,10 +627,11 @@ - if (ffd->frame_start>inBufferLength) ffd->frame_start = 0; - - redecode: -- gotpic = AVCODEC_MAX_AUDIO_FRAME_SIZE; - #ifdef USE_AVCODEC2 -+ gotpic = 0; - len = avcodec_decode_audio3(ctx, (short *)ffd->audio_buf, &gotpic, &pkt); - #else -+ gotpic = AVCODEC_MAX_AUDIO_FRAME_SIZE; - len = avcodec_decode_audio2(ctx, (short *)ffd->audio_buf, &gotpic, inBuffer + ffd->frame_start, inBufferLength - ffd->frame_start); - #endif - if (len<0) { ffd->frame_start = 0; return GF_NON_COMPLIANT_BITSTREAM; } -@@ -755,7 +771,13 @@ - here this means the DSI was broken, so no big deal*/ - avcodec_close(ctx); - *codec = avcodec_find_decoder(CODEC_ID_H263); -+ -+#ifdef USE_AVCTX3 -+ if (! (*codec) || (avcodec_open2(ctx, *codec, NULL)<0)) return GF_NON_COMPLIANT_BITSTREAM; -+#else - if (! (*codec) || (avcodec_open(ctx, *codec)<0)) return GF_NON_COMPLIANT_BITSTREAM; -+#endif -+ - #if USE_AVCODEC2 - if (avcodec_decode_video2(ctx, frame, &gotpic, &pkt) < 0) { - #else -@@ -765,7 +787,11 @@ - avcodec_close(ctx); - *codec = avcodec_find_decoder(old_codec); - assert(*codec); -+#ifdef USE_AVCTX3 -+ avcodec_open2(ctx, *codec, NULL); -+#else - avcodec_open(ctx, *codec); -+#endif - return GF_NON_COMPLIANT_BITSTREAM; - } - } diff --git a/gpac-idl_uuid.patch b/gpac-idl_uuid.patch deleted file mode 100644 index 7729fdb..0000000 --- a/gpac-idl_uuid.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- gpac/applications/osmozilla/nsIOsmozilla.idl~ 2006-07-18 18:55:14.000000000 +0200 -+++ gpac/applications/osmozilla/nsIOsmozilla.idl 2012-01-22 16:48:30.461393267 +0100 -@@ -1,6 +1,6 @@ - #include "nsISupports.idl" - --[scriptable, uuid(d2d536a0-b6fc-11d5-9d10-0060b0fbd8bn)] -+[scriptable, uuid(ce32e3ff-36f8-425f-94be-d85b26e634ee)] - interface nsIOsmozilla : nsISupports { - void Pause(); - void Play(); diff --git a/gpac-install.patch b/gpac-install.patch index 5b4f526..099d77e 100644 --- a/gpac-install.patch +++ b/gpac-install.patch @@ -23,7 +23,7 @@ endif CFLAGS=$(CPPFLAGS) $(XUL_CFLAGS) -I$(SRC_PATH)/include -@@ -75,19 +71,8 @@ +@@ -68,19 +68,8 @@ ifeq ($(CONFIG_WIN32),yes) endif install: @@ -33,15 +33,16 @@ - @echo "*** Exit root mode and reinstall mozilla plugin! ***" -else - $(MAKE) $(LIB) -- install -D -m 755 ../../bin/gcc/$(LIB) "$(HOME)/.mozilla/plugins/$(LIB)" -- install -D -m 755 ../../bin/gcc/nposmozilla.xpt "$(HOME)/.mozilla/components/nposmozilla.xpt" +- $(INSTALL) -D -m 755 ../../bin/gcc/$(LIB) "$(HOME)/.mozilla/plugins/$(LIB)" +- $(INSTALL) -D -m 755 ../../bin/gcc/nposmozilla.xpt "$(HOME)/.mozilla/components/nposmozilla.xpt" -endif -else -- install -D -m 755 ../../bin/gcc/$(LIB) "$(MOZILLA_DIR)/components/$(LIB)" -- install -D -m 755 ../../bin/gcc/nposmozilla.xpt "$(MOZILLA_DIR)/components/nposmozilla.xpt" +- $(INSTALL) -D -m 755 ../../bin/gcc/$(LIB) "$(MOZILLA_DIR)/components/$(LIB)" +- $(INSTALL) -D -m 755 ../../bin/gcc/nposmozilla.xpt "$(MOZILLA_DIR)/components/nposmozilla.xpt" -endif -+ install -D -m 755 ../../bin/gcc/$(LIB) "$(MOZILLA_DIR)/$(LIB)" -+ install -D -m 755 ../../bin/gcc/nposmozilla.xpt "$(MOZILLA_DIR)/nposmozilla.xpt" ++ $(INSTALL) -D -m 755 ../../bin/gcc/$(LIB) "$(MOZILLA_DIR)/$(LIB)" ++ $(INSTALL) -D -m 755 ../../bin/gcc/nposmozilla.xpt "$(MOZILLA_DIR)/nposmozilla.xpt" uninstall: ifeq ($(MOZILLA_DIR), local) + diff --git a/gpac-js.patch b/gpac-js.patch index d1863af..f0e6498 100644 --- a/gpac-js.patch +++ b/gpac-js.patch @@ -1,14 +1,20 @@ --- gpac/configure.orig 2012-06-15 21:26:23.188290228 +0200 +++ gpac/configure 2012-06-15 22:10:36.141512228 +0200 -@@ -691,7 +691,7 @@ +@@ -727,11 +727,11 @@ EOF #dc added - else + elif test "$pkg_config" != "no"; then #try pkg-config - if $pkg_config --exists mozilla-js 2> /dev/null ; then + if $pkg_config --exists nomozilla-js 2> /dev/null ; then - js_flags=`$pkg_config --cflags mozilla-js` - js_lib_pkg=`$pkg_config --libs mozilla-js` - if $cc -o $TMPO $TMPC $js_flags $js_lib_pkg $LDFLAGS -lpthread 2> /dev/null ; then + mozjs_pkgcfg="mozilla-js" +- elif $pkg_config --exists mozjs 2> /dev/null ; then ++ elif $pkg_config --exists nomozjs 2> /dev/null ; then + mozjs_pkgcfg="mozjs" +- elif $pkg_config --exists mozjs185 2> /dev/null ; then ++ elif $pkg_config --exists nomozjs185 2> /dev/null ; then + mozjs_pkgcfg="mozjs185" + fi + @@ -699,29 +699,13 @@ js_lib=`$pkg_config --libs mozilla-js` fi diff --git a/gpac-xulrunner.patch b/gpac-xulrunner.patch index f12bf1a..7139b0c 100644 --- a/gpac-xulrunner.patch +++ b/gpac-xulrunner.patch @@ -1,11 +1,12 @@ --- gpac/applications/osmozilla/osmo_npapi.cpp.orig 2012-04-04 17:04:39.000000000 +0200 +++ gpac/applications/osmozilla/osmo_npapi.cpp 2012-06-17 07:42:36.879779391 +0200 @@ -372,7 +372,7 @@ - /* explicit plugin call */ \ - "application/x-gpac::GPAC plugin;" \ - --char * NP_GetMIMEDescription(void) -+const char * NP_GetMIMEDescription(void) - { - return (char *) GPAC_PLUGIN_MIMETYPES; - } + /* explicit plugin call */ \ + "application/x-gpac::GPAC plugin;" \ + +-char * NP_GetMIMEDescription(void) ++const char * NP_GetMIMEDescription(void) + { + return (char *) GPAC_PLUGIN_MIMETYPES; + } + diff --git a/gpac.spec b/gpac.spec index e284bae..a03bbdd 100644 --- a/gpac.spec +++ b/gpac.spec @@ -17,26 +17,26 @@ %bcond_without xvid # xvid support %bcond_without wx # wxWidgets support # +%define snap 20141007 +# Summary: GPAC - an implementation of the MPEG-4 Systems standard (ISO/IEC 14496-1) Summary(pl.UTF-8): GPAC - implementacja standardu MPEG-4 Systems (ISO/IEC 14496-1) Name: gpac Version: 0.5.0 -Release: 14 +Release: 14.%{snap}.1 License: LGPL v2+ Group: Applications/Multimedia -Source0: http://downloads.sourceforge.net/gpac/%{name}-%{version}.tar.gz -# Source0-md5: 19f7bb7c16913c22bdd453db1e653ca0 +# Source0: http://downloads.sourceforge.net/gpac/%{name}-%{version}.tar.gz +Source0: %{name}-%{snap}.tar.bz2 +# Source0-md5: 9e37b324e490d3118622d77bf238cb16 Patch0: %{name}-install.patch Patch1: %{name}-xulrunner.patch Patch2: %{name}-amr.patch Patch3: %{name}-install-is-not-clean.patch Patch4: %{name}-flags.patch -Patch5: %{name}-idl_uuid.patch +Patch5: wxWidgets3.patch Patch6: %{name}-js.patch Patch7: %{name}-apps.patch -Patch8: %{name}-export.patch -Patch9: %{name}-ffmpeg2.patch -Patch10: wxWidgets3.patch URL: http://gpac.sourceforge.net/ %{?with_directfb:BuildRequires: DirectFB-devel} BuildRequires: OpenGL-GLU-devel @@ -164,9 +164,6 @@ Wtyczka GPAC dla przeglądarek WWW zgodnych z Netscape. %patch5 -p1 %patch6 -p1 %patch7 -p1 -%patch8 -p1 -%patch9 -p0 -%patch10 -p1 sed -i -e 's/wx-config/wx-gtk2-unicode-config/' configure chmod a+x configure @@ -233,7 +230,7 @@ fi %attr(755,root,root) %{_bindir}/MP4Box %attr(755,root,root) %{_bindir}/MP4Client %attr(755,root,root) %{_libdir}/libgpac.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libgpac.so.2 +%attr(755,root,root) %ghost %{_libdir}/libgpac.so.3 %dir %{_libdir}/gpac %attr(755,root,root) %{_libdir}/gpac/gm_*.so %{_datadir}/gpac @@ -254,6 +251,7 @@ fi %if %{with wx} %files gui %defattr(644,root,root,755) +%attr(755,root,root) %{_bindir}/DashCast %attr(755,root,root) %{_bindir}/Osmo4 %endif diff --git a/wxWidgets3.patch b/wxWidgets3.patch index 98c8b17..e17c6ca 100644 --- a/wxWidgets3.patch +++ b/wxWidgets3.patch @@ -1,78 +1,3 @@ -diff -ur gpac/applications/osmo4_wx/menubtn.cpp gpac.wx3/applications/osmo4_wx/menubtn.cpp ---- gpac/applications/osmo4_wx/menubtn.cpp 2010-07-28 17:53:09.000000000 +0200 -+++ gpac.wx3/applications/osmo4_wx/menubtn.cpp 2014-01-18 19:05:19.802057643 +0100 -@@ -86,7 +86,7 @@ - - wxSize bestSize = DoGetBestSize(); - SetSize(wxSize(size.x<0 ? bestSize.x:size.x, size.y<0 ? bestSize.y:size.y)); --#if (wxMINOR_VERSION<8) -+#if (wxMINOR_VERSION<8) && (wxMAJOR_VERSION < 3) - SetBestSize(GetSize()); - #else - SetInitialSize(GetSize()); -@@ -161,7 +161,7 @@ - - m_eventType = wxEVT_LEFT_UP; - --#if (wxMINOR_VERSION<8) -+#if (wxMINOR_VERSION<8) && (wxMAJOR_VERSION < 3) - if (wxRect(wxPoint(0,0), GetSize()).Inside(event.GetPosition())) - #else - if (wxRect(wxPoint(0,0), GetSize()).Contains(event.GetPosition())) -@@ -200,7 +200,7 @@ - - m_eventType = wxEVT_RIGHT_UP; - --#if (wxMINOR_VERSION<8) -+#if (wxMINOR_VERSION<8) && (wxMAJOR_VERSION < 3) - if (wxRect(wxPoint(0,0), GetSize()).Inside(event.GetPosition())) - #else - if (wxRect(wxPoint(0,0), GetSize()).Contains(event.GetPosition())) -@@ -319,7 +319,7 @@ - - void wxCustomButton::Paint( wxDC &dc ) - { --#if (wxMINOR_VERSION<8) -+#if (wxMINOR_VERSION<8) && (wxMAJOR_VERSION < 3) - dc.BeginDrawing(); - #endif - -@@ -401,7 +401,7 @@ - dc.SetBackground(wxNullBrush); - dc.SetBrush(wxNullBrush); - dc.SetPen(wxNullPen); --#if (wxMINOR_VERSION<8) -+#if (wxMINOR_VERSION<8) && (wxMAJOR_VERSION < 3) - dc.EndDrawing(); - #endif - } -@@ -573,7 +573,7 @@ - { - wxPoint p = GetParent()->ScreenToClient(wxGetMousePosition()); - --#if (wxMINOR_VERSION<8) -+#if (wxMINOR_VERSION<8) && (wxMAJOR_VERSION < 3) - if (GetRect().Inside(p) || labelBut->GetRect().Inside(p)) - #else - if (GetRect().Contains(p) || labelBut->GetRect().Contains(p)) -@@ -621,7 +621,7 @@ - { - wxPoint p = GetParent()->ScreenToClient(wxGetMousePosition()); - --#if (wxMINOR_VERSION<8) -+#if (wxMINOR_VERSION<8) && (wxMAJOR_VERSION < 3) - if (GetRect().Inside(p) || dropBut->GetRect().Inside(p)) - #else - if (GetRect().Contains(p) || dropBut->GetRect().Contains(p)) -@@ -699,7 +699,7 @@ - SetSize( wxSize(size.x < 0 ? bestSize.x : size.x, - size.y < 0 ? bestSize.y : size.y) ); - --#if (wxMINOR_VERSION<8) -+#if (wxMINOR_VERSION<8) && (wxMAJOR_VERSION < 3) - SetBestSize(GetSize()); - #else - SetInitialSize(GetSize()); diff -ur gpac/applications/osmo4_wx/Playlist.cpp gpac.wx3/applications/osmo4_wx/Playlist.cpp --- gpac/applications/osmo4_wx/Playlist.cpp 2010-07-28 17:53:09.000000000 +0200 +++ gpac.wx3/applications/osmo4_wx/Playlist.cpp 2014-01-18 19:00:08.102059900 +0100 @@ -206,13 +131,13 @@ diff -ur gpac/applications/osmo4_wx/wxOsmo4.cpp gpac.wx3/applications/osmo4_wx/w } return 1; } -@@ -874,7 +874,7 @@ +@@ -877,7 +877,7 @@ wxOsmo4Frame::wxOsmo4Frame() : sOpt = gf_cfg_get_key(m_user.config, "Audio", "DriverName"); if (!strcmp(sOpt, "No Audio Output Available")) { -- ::wxLogMessage(wxT("WARNING: no audio output availble - make sure no other program is locking the sound card")); -+ wxLogMessage(wxT("WARNING: no audio output availble - make sure no other program is locking the sound card")); - SetStatus(wxT("No audio ouput available")); +- ::wxLogMessage(wxT("WARNING: no audio output availble - make sure no other program is locking the sound card")); ++ wxLogMessage(wxT("WARNING: no audio output availble - make sure no other program is locking the sound card")); + SetStatus(wxT("No audio ouput available")); } else { @@ -1137,7 +1137,7 @@ @@ -242,3 +167,89 @@ diff -ur gpac/applications/osmo4_wx/wxOsmo4.cpp gpac.wx3/applications/osmo4_wx/w if (dlg.ShowModal() == wxID_OK) { AddSubtitle(dlg.GetPath().mb_str(wxConvUTF8), 1); +--- gpac/applications/osmo4_wx/wxGPACControl.cpp~ 2014-10-07 23:09:59.000000000 +0200 ++++ gpac/applications/osmo4_wx/wxGPACControl.cpp 2014-10-07 23:36:33.313608359 +0200 +@@ -398,7 +398,7 @@ + + /*audio dec enum*/ + sOpt = gf_cfg_get_key(cfg, "Systems", "DefAudioDec"); +- u32 count = gf_modules_get_count(m_pApp->m_user.modules); ++ count = gf_modules_get_count(m_pApp->m_user.modules); + GF_BaseDecoder *ifc_d; + select = 0; + s32 to_sel = 0; + +--- gpac/applications/osmo4_wx/menubtn.cpp~ 2014-10-07 23:09:59.000000000 +0200 ++++ gpac/applications/osmo4_wx/menubtn.cpp 2014-10-07 23:42:37.356710868 +0200 +@@ -86,7 +86,7 @@ bool wxCustomButton::Create(wxWindow* pa + + wxSize bestSize = DoGetBestSize(); + SetSize(wxSize(size.x<0 ? bestSize.x:size.x, size.y<0 ? bestSize.y:size.y)); +-#if (wxMINOR_VERSION<8) ++#if (wxMINOR_VERSION<8) && (wxMAJOR_VERSION < 3) + SetBestSize(GetSize()); + #else + SetInitialSize(GetSize()); +@@ -161,7 +161,7 @@ void wxCustomButton::OnMouseEvents(wxMou + + m_eventType = wxEVT_LEFT_UP; + +-#if (wxMINOR_VERSION<8) ++#if (wxMINOR_VERSION<8) && (wxMAJOR_VERSION < 3) + if (wxRect(wxPoint(0,0), GetSize()).Inside(event.GetPosition())) + #else + if (wxRect(wxPoint(0,0), GetSize()).Contains(event.GetPosition())) +@@ -200,7 +200,7 @@ void wxCustomButton::OnMouseEvents(wxMou + + m_eventType = wxEVT_RIGHT_UP; + +-#if (wxMINOR_VERSION<8) ++#if (wxMINOR_VERSION<8) && (wxMAJOR_VERSION < 3) + if (wxRect(wxPoint(0,0), GetSize()).Inside(event.GetPosition())) + #else + if (wxRect(wxPoint(0,0), GetSize()).Contains(event.GetPosition())) +@@ -319,7 +319,7 @@ void wxCustomButton::Redraw() + + void wxCustomButton::Paint( wxDC &dc ) + { +-#if (wxMINOR_VERSION<8) ++#if (wxMINOR_VERSION<8) && (wxMAJOR_VERSION < 3) + dc.BeginDrawing(); + #endif + +@@ -407,7 +407,7 @@ void wxCustomButton::Paint( wxDC &dc ) + dc.SetBackground(wxNullBrush); + dc.SetBrush(wxNullBrush); + dc.SetPen(wxNullPen); +-#if (wxMINOR_VERSION<8) ++#if (wxMINOR_VERSION<8) && (wxMAJOR_VERSION < 3) + dc.EndDrawing(); + #endif + } +@@ -580,7 +580,7 @@ public: + { + wxPoint p = GetParent()->ScreenToClient(wxGetMousePosition()); + +-#if (wxMINOR_VERSION<8) ++#if (wxMINOR_VERSION<8) && (wxMAJOR_VERSION < 3) + if (GetRect().Inside(p) || labelBut->GetRect().Inside(p)) + #else + if (GetRect().Contains(p) || labelBut->GetRect().Contains(p)) +@@ -628,7 +628,7 @@ public: + { + wxPoint p = GetParent()->ScreenToClient(wxGetMousePosition()); + +-#if (wxMINOR_VERSION<8) ++#if (wxMINOR_VERSION<8) && (wxMAJOR_VERSION < 3) + if (GetRect().Inside(p) || dropBut->GetRect().Inside(p)) + #else + if (GetRect().Contains(p) || dropBut->GetRect().Contains(p)) +@@ -706,7 +706,7 @@ bool wxMenuButton::Create( wxWindow* par + SetSize( wxSize(size.x < 0 ? bestSize.x : size.x, + size.y < 0 ? bestSize.y : size.y) ); + +-#if (wxMINOR_VERSION<8) ++#if (wxMINOR_VERSION<8) && (wxMAJOR_VERSION < 3) + SetBestSize(GetSize()); + #else + SetInitialSize(GetSize()); -- 2.44.0