aboutsummaryrefslogtreecommitdiffstats
path: root/lib/wx/api_gen/wxapi.conf
diff options
context:
space:
mode:
authorDan Gudmundsson <[email protected]>2016-10-05 16:06:11 +0200
committerDan Gudmundsson <[email protected]>2016-10-05 16:06:11 +0200
commit0bac72a18e8a5f6a46baae9c9ac73bde32948ff6 (patch)
tree8aaca3b6bc3ebc2c220e0c3786f5645e92898729 /lib/wx/api_gen/wxapi.conf
parent7af3910bb06433f7c9182db11d853823f202c2b6 (diff)
parent1de609cb262ff34216dce8fbefdb9a153bdd2c93 (diff)
downloadotp-0bac72a18e8a5f6a46baae9c9ac73bde32948ff6.tar.gz
otp-0bac72a18e8a5f6a46baae9c9ac73bde32948ff6.tar.bz2
otp-0bac72a18e8a5f6a46baae9c9ac73bde32948ff6.zip
Merge branch 'maint'
* maint: wx: add wxWindowDragAcceptFiles wx: Add simple dropfiles support
Diffstat (limited to 'lib/wx/api_gen/wxapi.conf')
-rw-r--r--lib/wx/api_gen/wxapi.conf12
1 files changed, 9 insertions, 3 deletions
diff --git a/lib/wx/api_gen/wxapi.conf b/lib/wx/api_gen/wxapi.conf
index 786e536f93..4300ffe734 100644
--- a/lib/wx/api_gen/wxapi.conf
+++ b/lib/wx/api_gen/wxapi.conf
@@ -104,7 +104,8 @@
'Center','CenterOnParent','Centre','CentreOnParent','ClearBackground',
{'ClientToScreen',[{"x",both},{"y",both}]}, 'Close',
'ConvertDialogToPixels','ConvertPixelsToDialog','Destroy','DestroyChildren',
- 'Disable',%%'DoGetBestSize','DoUpdateWindowUI', 'DragAcceptFiles',
+ 'Disable',%%'DoGetBestSize','DoUpdateWindowUI',
+ {'DragAcceptFiles', [{test_if, "wxCHECK_VERSION(2,8,10)"}]},
'Enable',
'FindFocus','FindWindow','FindWindowById','FindWindowByName','FindWindowByLabel',
'Fit','FitInside','Freeze', 'GetAcceleratorTable', % 'GetAccessible',
@@ -1490,8 +1491,6 @@
['ButtonDown','ButtonIsDown','ButtonUp','GetButtonChange','GetButtonState',
'GetJoystick','GetPosition','GetZPosition','IsButton','IsMove','IsZMove']}.
-%% {class, wxDropFilesEvent, wxEvent, [{event,[wxEVT_DROP_FILES]}],[]}. %FIXME
-
{enum, wxUpdateUIMode, "wxUPDATE_UI_"}.
{class, wxUpdateUIEvent, wxCommandEvent,
@@ -1988,3 +1987,10 @@
{class, wxDCOverlay, root, [],
['wxDCOverlay', '~wxDCOverlay', 'Clear']}.
+
+{class, wxDropFilesEvent, wxEvent,
+ [{acc, [{m_files, [{single, {list, 'm_noFiles'}}]}]},
+ {event,[wxEVT_DROP_FILES]}],
+ ['GetPosition', 'GetNumberOfFiles',
+ {'GetFiles', [{return, [{single, {list, 'm_noFiles'}}]}]}
+ ]}.