aboutsummaryrefslogtreecommitdiffstats
path: root/lib/wx/src/gen/wxPreviewCanvas.erl
diff options
context:
space:
mode:
authorDan Gudmundsson <[email protected]>2016-10-05 16:05:08 +0200
committerDan Gudmundsson <[email protected]>2016-10-05 16:05:08 +0200
commit1de609cb262ff34216dce8fbefdb9a153bdd2c93 (patch)
tree1d852d320dc26d002263e8fef4eda72e5291b021 /lib/wx/src/gen/wxPreviewCanvas.erl
parent497330a828089b465ac026551edf33fb947ae2f6 (diff)
parentb8339d7edf63c8745be4be092e63f46bc4e63b91 (diff)
downloadotp-1de609cb262ff34216dce8fbefdb9a153bdd2c93.tar.gz
otp-1de609cb262ff34216dce8fbefdb9a153bdd2c93.tar.bz2
otp-1de609cb262ff34216dce8fbefdb9a153bdd2c93.zip
Merge branch 'dgud/wx/drop-files/OTP-13933' into maint
* dgud/wx/drop-files/OTP-13933: wx: add wxWindowDragAcceptFiles wx: Add simple dropfiles support
Diffstat (limited to 'lib/wx/src/gen/wxPreviewCanvas.erl')
-rw-r--r--lib/wx/src/gen/wxPreviewCanvas.erl6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/wx/src/gen/wxPreviewCanvas.erl b/lib/wx/src/gen/wxPreviewCanvas.erl
index 67357dbd65..b1c6832aa9 100644
--- a/lib/wx/src/gen/wxPreviewCanvas.erl
+++ b/lib/wx/src/gen/wxPreviewCanvas.erl
@@ -40,8 +40,8 @@
centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
- doPrepareDC/2,enable/1,enable/2,enableScrolling/3,findWindow/2,fit/1,
- fitInside/1,freeze/1,getAcceleratorTable/1,getBackgroundColour/1,
+ doPrepareDC/2,dragAcceptFiles/2,enable/1,enable/2,enableScrolling/3,
+ findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,getBackgroundColour/1,
getBackgroundStyle/1,getBestSize/1,getCaret/1,getCharHeight/1,getCharWidth/1,
getChildren/1,getClientSize/1,getContainingSizer/1,getCursor/1,getDropTarget/1,
getEventHandler/1,getExtraStyle/1,getFont/1,getForegroundColour/1,
@@ -439,6 +439,8 @@ enable(This, Options) -> wxWindow:enable(This, Options).
%% @hidden
enable(This) -> wxWindow:enable(This).
%% @hidden
+dragAcceptFiles(This,Accept) -> wxWindow:dragAcceptFiles(This,Accept).
+%% @hidden
disable(This) -> wxWindow:disable(This).
%% @hidden
destroyChildren(This) -> wxWindow:destroyChildren(This).