File 0204-wx-Add-macOS-system-menu-ids.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0204-wx-Add-macOS-system-menu-ids.patch of Package erlang (Revision bc367f930d31276a6b03dd29b658e280)

Currently displaying revision bc367f930d31276a6b03dd29b658e280 , Show latest

From 1db84d6b094ea232b43de38a10a255602b2a9f44 Mon Sep 17 00:00:00 2001
From: Wojtek Mach <wojtek@wojtekmach.pl>
Date: Thu, 17 Mar 2022 12:58:07 +0100
Subject: [PATCH 1/3] wx: Add macOS system menu ids

Ref: https://github.com/wxWidgets/wxWidgets/blob/v3.1.5/include/wx/defs.h#L1938:L1948

Co-authored-by: Dan Gudmundsson <dgud@erlang.org>
---
 lib/wx/c_src/gen/wxe_init.cpp | 8 +++++++-
 lib/wx/include/wx.hrl         | 6 ++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/lib/wx/c_src/gen/wxe_init.cpp b/lib/wx/c_src/gen/wxe_init.cpp
index 12b0b418b0..4153f1e2b9 100644
--- a/lib/wx/c_src/gen/wxe_init.cpp
+++ b/lib/wx/c_src/gen/wxe_init.cpp
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2008-2021. All Rights Reserved.
+ * Copyright Ericsson AB 2008-2022. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -6664,6 +6664,12 @@ void WxeApp::init_consts(wxeMetaCommand& event) {
     { enif_make_atom(rt.env,"wxStandardID"), "wxID_MDI_WINDOW_PREV", rt.make_int(wxID_MDI_WINDOW_PREV) },
     { enif_make_atom(rt.env,"wxStandardID"), "wxID_MDI_WINDOW_NEXT", rt.make_int(wxID_MDI_WINDOW_NEXT) },
     { enif_make_atom(rt.env,"wxStandardID"), "wxID_MDI_WINDOW_LAST", rt.make_int(wxID_MDI_WINDOW_LAST) },
+    { enif_make_atom(rt.env,"wxStandardID"), "wxID_OSX_MENU_FIRST", rt.make_int(wxID_OSX_MENU_FIRST) },
+    { enif_make_atom(rt.env,"wxStandardID"), "wxID_OSX_HIDE", rt.make_int(wxID_OSX_HIDE) },
+    { enif_make_atom(rt.env,"wxStandardID"), "wxID_OSX_HIDEOTHERS", rt.make_int(wxID_OSX_HIDEOTHERS) },
+    { enif_make_atom(rt.env,"wxStandardID"), "wxID_OSX_SHOWALL", rt.make_int(wxID_OSX_SHOWALL) },
+    { enif_make_atom(rt.env,"wxStandardID"), "wxID_OSX_SERVICES", rt.make_int(wxID_OSX_SERVICES) },
+    { enif_make_atom(rt.env,"wxStandardID"), "wxID_OSX_MENU_LAST", rt.make_int(wxID_OSX_MENU_LAST) },
     { enif_make_atom(rt.env,"wxStandardID"), "wxID_FILEDLGG", rt.make_int(wxID_FILEDLGG) },
     { enif_make_atom(rt.env,"wxStandardID"), "wxID_FILECTRL", rt.make_int(wxID_FILECTRL) },
     { enif_make_atom(rt.env,"wxStandardID"), "wxID_HIGHEST", rt.make_int(wxID_HIGHEST) },
diff --git a/lib/wx/include/wx.hrl b/lib/wx/include/wx.hrl
index c2e918bb2d..2aba9e3ff5 100644
--- a/lib/wx/include/wx.hrl
+++ b/lib/wx/include/wx.hrl
@@ -1432,6 +1432,12 @@
 -define(wxID_MDI_WINDOW_PREV, (?wxID_MDI_WINDOW_FIRST+4)).
 -define(wxID_MDI_WINDOW_NEXT, (?wxID_MDI_WINDOW_FIRST+5)).
 -define(wxID_MDI_WINDOW_LAST, ?wxID_MDI_WINDOW_NEXT).
+-define(wxID_OSX_MENU_FIRST, 5250).
+-define(wxID_OSX_HIDE, ?wxID_OSX_MENU_FIRST).
+-define(wxID_OSX_HIDEOTHERS, (?wxID_OSX_MENU_FIRST+1)).
+-define(wxID_OSX_SHOWALL, (?wxID_OSX_MENU_FIRST+2)).
+-define(wxID_OSX_SERVICES, (?wxID_OSX_MENU_FIRST+3)).
+-define(wxID_OSX_MENU_LAST, ?wxID_OSX_SERVICES).
 -define(wxID_FILEDLGG, 5900).
 -define(wxID_FILECTRL, 5950).
 -define(wxID_HIGHEST, 5999).
-- 
2.34.1

Places

File 0204-wx-Add-macOS-system-menu-ids.patch of Package erlang (Revision bc367f930d31276a6b03dd29b658e280)

Places