Merge branch 'dgud/wx/event-additions/OTP-12660'

* dgud/wx/event-additions/OTP-12660:
  wx: Add missing data in events

1 files changed, 25 insertions, 19 deletions

diff --git a/lib/wx/api_gen/wxapi.conf b/lib/wx/api_gen/wxapi.conf
index 09f21af0f3..bbf9add59e 100644
--- a/lib/wx/api_gen/wxapi.conf
+++ b/lib/wx/api_gen/wxapi.conf
@@ -1358,7 +1358,8 @@
     wxEVT_SCROLL_THUMBRELEASE,wxEVT_SCROLL_CHANGED]}],
  ['GetOrientation','GetPosition']}.
 {class, wxScrollWinEvent,wxEvent, 
- [{event,
+ [{acc, [{m_commandInt, "GetPosition()"}, {m_extraLong, "GetOrientation()"}]},
+  {event,
    [wxEVT_SCROLLWIN_TOP,wxEVT_SCROLLWIN_BOTTOM,wxEVT_SCROLLWIN_LINEUP,
     wxEVT_SCROLLWIN_LINEDOWN,wxEVT_SCROLLWIN_PAGEUP,
     wxEVT_SCROLLWIN_PAGEDOWN,wxEVT_SCROLLWIN_THUMBTRACK,
@@ -1383,7 +1384,9 @@
   'ShiftDown'
  ]}.
 
-{class, wxSetCursorEvent, wxEvent, [{event,[wxEVT_SET_CURSOR]}],
+{class, wxSetCursorEvent, wxEvent,
+ [{acc, [{m_x, "GetX()"}, {m_y, "GetY()"}, {m_cursor, "GetCursor()"}]},
+  {event,[wxEVT_SET_CURSOR]}],
  ['GetCursor','GetX','GetY','HasCursor','SetCursor']}.
 
 {class, wxKeyEvent, wxEvent, 
@@ -1398,7 +1401,7 @@
 
 {class, wxSizeEvent, wxEvent, [{event,[wxEVT_SIZE]}],
  ['GetSize']}.
-{class, wxMoveEvent, wxEvent, [{event,[wxEVT_MOVE]}],
+{class, wxMoveEvent, wxEvent, [{acc, [{m_pos, "GetPosition()"}, {m_rect, "GetRect()"}]}, {event,[wxEVT_MOVE]}],
  ['GetPosition']}.
 {class, wxPaintEvent, wxEvent, [{event,[wxEVT_PAINT]}],[]}.
 %%{class, wxNcPaintEvent, wxEvent, [{event,[wxEVT_NC_PAINT]}],[]}.
@@ -1407,28 +1410,28 @@
   {event, [wxEVT_ERASE_BACKGROUND]}],
  ['GetDC']}.
 {class, wxFocusEvent, wxEvent,
- [{event,[wxEVT_SET_FOCUS,wxEVT_KILL_FOCUS]}],
+ [{acc, [{m_win, "GetWindow()"}]},
+  {event,[wxEVT_SET_FOCUS,wxEVT_KILL_FOCUS]}],
  ['GetWindow']}.
 {class,wxChildFocusEvent,wxCommandEvent,
  [{event,[wxEVT_CHILD_FOCUS]}],
  ['GetWindow']}.
 
-%% {class, wxActivateEvent, wxEvent, [{event, 
-%%   [wxEVT_ACTIVATE,wxEVT_ACTIVATE_APP,wxEVT_HIBERNATE]}],[]}.
-
-%%{class, wxInitDialogEvent, wxEvent, [{event, []}],[]}.
-
-{class, wxMenuEvent, wxEvent, 
- [{event, [wxEVT_MENU_OPEN,wxEVT_MENU_CLOSE,wxEVT_MENU_HIGHLIGHT]}],
+{class, wxMenuEvent, wxEvent,
+ [{acc, [{m_menuId, "GetMenuId()"}, {m_menu, "GetMenu()"}]},
+  {event, [wxEVT_MENU_OPEN,wxEVT_MENU_CLOSE,wxEVT_MENU_HIGHLIGHT]}],
  ['GetMenu','GetMenuId','IsPopup']}.
 {class, wxCloseEvent, wxEvent, 
  [{event, [wxEVT_CLOSE_WINDOW,wxEVT_END_SESSION,wxEVT_QUERY_END_SESSION]}],
  ['CanVeto','GetLoggingOff','SetCanVeto','SetLoggingOff','Veto']}.
-{class, wxShowEvent, wxEvent, [{event,[wxEVT_SHOW]}],['SetShow','GetShow']}.
-{class, wxIconizeEvent, wxEvent, [{event,[wxEVT_ICONIZE]}],['Iconized']}.
+{class, wxShowEvent, wxEvent, [{acc, [{m_show, "GetShow()"}]},{event,[wxEVT_SHOW]}],['SetShow','GetShow']}.
+{class, wxIconizeEvent, wxEvent, [{acc, [{m_iconized, "Iconized()"}]},{event,[wxEVT_ICONIZE]}],['Iconized']}.
 {class, wxMaximizeEvent, wxEvent, [{event,[wxEVT_MAXIMIZE]}],[]}.
-{class, wxJoystickEvent,  wxEvent, 
- [{event,[wxEVT_JOY_BUTTON_DOWN,wxEVT_JOY_BUTTON_UP,
+{class, wxJoystickEvent,  wxEvent,
+ [{acc, [{m_pos, "GetPosition()"},{m_zPosition, "GetZPosition()"},
+	 {m_buttonChange, "GetButtonChange()"}, {m_buttonState, "GetButtonState()"},
+	 {m_joyStick, "GetJoystick()"}]},
+  {event,[wxEVT_JOY_BUTTON_DOWN,wxEVT_JOY_BUTTON_UP,
 	  wxEVT_JOY_MOVE,wxEVT_JOY_ZMOVE]}],
  ['ButtonDown','ButtonIsDown','ButtonUp','GetButtonChange','GetButtonState',
   'GetJoystick','GetPosition','GetZPosition','IsButton','IsMove','IsZMove']}.
@@ -1466,7 +1469,8 @@
   'SetOrigin',
   'SetPosition']}.
 
-{class, wxContextMenuEvent, wxCommandEvent, [{event,[wxEVT_CONTEXT_MENU]}],
+{class, wxContextMenuEvent, wxCommandEvent,
+ [{acc, [{m_pos, "GetPosition()"}]}, {event,[wxEVT_CONTEXT_MENU]}],
  ['GetPosition','SetPosition']}.
 {enum, wxIdleMode, "wxIDLE_"}.
 {class, wxIdleEvent, wxEvent, [{event,[wxEVT_IDLE]}],
@@ -1525,7 +1529,8 @@
  ]}.
 
 {class, wxCalendarEvent, wxDateEvent, 
- [{event,[wxEVT_CALENDAR_SEL_CHANGED, wxEVT_CALENDAR_DAY_CHANGED,     
+ [{acc, [{m_date, "GetDate()"}, {m_wday, "GetWeekDay()"}]},
+  {event,[wxEVT_CALENDAR_SEL_CHANGED, wxEVT_CALENDAR_DAY_CHANGED,
 	  wxEVT_CALENDAR_MONTH_CHANGED, wxEVT_CALENDAR_YEAR_CHANGED,
 	  wxEVT_CALENDAR_DOUBLECLICKED, wxEVT_CALENDAR_WEEKDAY_CLICKED]}],
  [
@@ -1730,8 +1735,9 @@
  ['GetKeyCode','GetItem','GetKeyEvent','GetLabel','GetOldItem','GetPoint',
   'IsEditCancelled','SetToolTip']}.
 
-{class, wxNotebookEvent, wxNotifyEvent, 
- [{event, [wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED,
+{class, wxNotebookEvent, wxNotifyEvent,
+ [{acc, [{m_nSel, "GetSelection()"}, {m_nOldSel, "GetOldSelection()"}]},
+  {event, [wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED,
 	   wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING]}],
  ['GetOldSelection','GetSelection','SetOldSelection','SetSelection']}.