From 3e883fecdf5762044057490fbcd485ae3e5fb58c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Wed, 13 Jul 2022 13:40:11 +0200 Subject: [PATCH] Remove leftover wxABI_VERSION checks Remove forgotten wxABI_VERSION checks from version 3.0.1. --- include/wx/defs.h | 4 ---- include/wx/osx/menu.h | 2 -- 2 files changed, 6 deletions(-) diff --git a/include/wx/defs.h b/include/wx/defs.h index f5511bf1be..cc6a73f6d8 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -2044,12 +2044,8 @@ enum wxStandardID wxID_OSX_HIDE = wxID_OSX_MENU_FIRST, wxID_OSX_HIDEOTHERS, wxID_OSX_SHOWALL, -#if wxABI_VERSION >= 30001 wxID_OSX_SERVICES, wxID_OSX_MENU_LAST = wxID_OSX_SERVICES, -#else - wxID_OSX_MENU_LAST = wxID_OSX_SHOWALL, -#endif /* IDs used by generic file dialog (13 consecutive starting from this value) */ wxID_FILEDLGG = 5900, diff --git a/include/wx/osx/menu.h b/include/wx/osx/menu.h index 96e3515b2a..2fd9d09aa8 100644 --- a/include/wx/osx/menu.h +++ b/include/wx/osx/menu.h @@ -158,9 +158,7 @@ public: // call this function to update it (m_menuBarFrame should be !NULL) void Refresh(bool eraseBackground = true, const wxRect *rect = NULL) wxOVERRIDE; -#if wxABI_VERSION >= 30001 wxMenu *OSXGetAppleMenu() const { return m_appleMenu; } -#endif static void SetAutoWindowMenu( bool enable ) { s_macAutoWindowMenu = enable ; } static bool GetAutoWindowMenu() { return s_macAutoWindowMenu ; }