diff options
| author | Dan Gudmundsson <[email protected]> | 2013-08-29 10:27:50 +0200 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2013-08-29 10:27:50 +0200 |
| commit | 3bda52be882c0e3888cc571067cd7350b4ac2cfd (patch) | |
| tree | 01b4d32dede084b166626fb7bc12623514940e95 /lib/wx/src/gen/wxGrid.erl | |
| parent | 62fd1f53269d988ce4b978dbe49857e4d20509cf (diff) | |
| parent | f910a7e636df45678c3f075172d4da5540e1b664 (diff) | |
| download | otp-3bda52be882c0e3888cc571067cd7350b4ac2cfd.tar.gz otp-3bda52be882c0e3888cc571067cd7350b4ac2cfd.tar.bz2 otp-3bda52be882c0e3888cc571067cd7350b4ac2cfd.zip | |
Merge branch 'dgud/wx/update-doxygen/OTP-11279' into maint
* dgud/wx/update-doxygen/OTP-11279:
wx: Add toolbar testcase
wx: Add character event test/example
wx: Add wxPanel:setFocusIgnoringChildren/1
wx: Add wxClipboardTextEvent
wx: Fix bug in wxStatusBar:getFieldRect/2
wx: Fix api generator
Diffstat (limited to 'lib/wx/src/gen/wxGrid.erl')
| -rw-r--r-- | lib/wx/src/gen/wxGrid.erl | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/lib/wx/src/gen/wxGrid.erl b/lib/wx/src/gen/wxGrid.erl index 2f4b45b1bc..39cb084e2f 100644 --- a/lib/wx/src/gen/wxGrid.erl +++ b/lib/wx/src/gen/wxGrid.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2012. All Rights Reserved. +%% Copyright Ericsson AB 2008-2013. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -112,13 +112,13 @@ scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2, setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2, setClientSize/3,setContainingSizer/2,setCursor/2,setDropTarget/2, - setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,setForegroundColour/2, - setHelpText/2,setId/2,setLabel/2,setMaxSize/2,setMinSize/2,setName/2, - setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,setPalette/2, - setScrollPos/3,setScrollPos/4,setScrollRate/3,setScrollbar/5,setScrollbar/6, - setScrollbars/5,setScrollbars/6,setSize/2,setSize/3,setSize/5,setSize/6, - setSizeHints/2,setSizeHints/3,setSizeHints/4,setSizer/2,setSizer/3, - setSizerAndFit/2,setSizerAndFit/3,setTargetWindow/2,setThemeEnabled/2, + setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFocusIgnoringChildren/1, + setFont/2,setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2, + setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2, + setPalette/2,setScrollPos/3,setScrollPos/4,setScrollRate/3,setScrollbar/5, + setScrollbar/6,setScrollbars/5,setScrollbars/6,setSize/2,setSize/3, + setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,setSizer/2, + setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setTargetWindow/2,setThemeEnabled/2, setToolTip/2,setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2, setVirtualSizeHints/3,setVirtualSizeHints/4,setWindowStyle/2,setWindowStyleFlag/2, setWindowVariant/2,shouldInheritColours/1,show/1,show/2,thaw/1,transferDataFromWindow/1, @@ -2151,6 +2151,8 @@ calcScrolledPosition(This,X,Y) -> wxScrolledWindow:calcScrolledPosition(This,X,Y calcScrolledPosition(This,Pt) -> wxScrolledWindow:calcScrolledPosition(This,Pt). %% From wxPanel %% @hidden +setFocusIgnoringChildren(This) -> wxPanel:setFocusIgnoringChildren(This). +%% @hidden initDialog(This) -> wxPanel:initDialog(This). %% From wxWindow %% @hidden |