Rewrite wx, use wxWidgets 3 as base and use nif interface

Complete overhaul of wx.
Use nif interface instead of erlang driver interface.
Use wxWidgets interface files as base for doxygen and code generation.
This upgrades the base to 3.1.4.

Change the interface files so we can generate code that is backward
as compatible as possible.

Compatibility with the old 2.8 API

Reduce incompatibility with the old API as much as possible.

Changes to the old API include:
 wxNotebookEvent have been replaced by the wxBookctrlEvent  (NOTE)

 wxWindowDC default creators have been removed
 wxClientDC default creators have been removed
 wxPaintDC default creators have been removed
 wxWindow:setVirtualSizeHints(..) have been deprecated
 wxWindow:makeModal(..) have been deprecated
 wxWindow:makeModal(..) have been deprecated
 wxToolBar add/insertTool without label have been deprecated
 wxStyledTextCtrl some functions have changed args from boolean to int
 wxSizerItem:new() Some args have become options
 Removed depr wxSizerItem:setWindow() use assignWindow
 Removed depr wxSizerItem:setSpacer() use assignSpacer
 Removed depr wxSizerItem:setSpacer() use assignSpacer
 Removed depr wxSizerItem:setSizer() use assignSizer
 wxMenu append/insert/prepend have changed return value and lost IsCheckable argument
 wxListCtrl:setItem/4 changed return value
 wxListCtrl:setItem/4 changed return value
 wxImage::convertToGreyscale opts incompatible
 wxGridSizer::wxGridSizer opts incompatible
 wxGrid API have many changes
 wxGraphicsRenderer:create*GradientBrush(..) uses GradientStops now
 wxGraphicsRenderer:createPen(..) have been removed
 wxGraphicsRenderer:create*GradientBrush(..) uses GradientStops now
 wxGLCanvas API is incompatible
 wxFlexGridSizer::wxFlexGridSizer opts incompatible
 wxDisplay::wxDisplay opts incompatible
 wxCalendarDateAttr:new(ColText [,OptList]) have been removed
 wxBitmapButton:[g|s]etBitmapSelected have been removed

1 files changed, 78 insertions, 96 deletions

diff --git a/lib/wx/src/gen/wxDirDialog.erl b/lib/wx/src/gen/wxDirDialog.erl
index 5defc77a73..6e88719a5f 100644
--- a/lib/wx/src/gen/wxDirDialog.erl
+++ b/lib/wx/src/gen/wxDirDialog.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2019. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2020. 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.
@@ -42,11 +42,11 @@
   createButtonSizer/2,createStdDialogButtonSizer/2,destroyChildren/1,
   disable/1,disconnect/1,disconnect/2,disconnect/3,dragAcceptFiles/2,
   enable/1,enable/2,endModal/2,findWindow/2,fit/1,fitInside/1,freeze/1,
-  fromDIP/2,getAcceleratorTable/1,getAffirmativeId/1,getBackgroundColour/1,
-  getBackgroundStyle/1,getBestSize/1,getCaret/1,getCharHeight/1,getCharWidth/1,
-  getChildren/1,getClientSize/1,getContainingSizer/1,getContentScaleFactor/1,
-  getCursor/1,getDPI/1,getDropTarget/1,getEventHandler/1,getExtraStyle/1,
-  getFont/1,getForegroundColour/1,getGrandParent/1,getHandle/1,getHelpText/1,
+  getAcceleratorTable/1,getAffirmativeId/1,getBackgroundColour/1,getBackgroundStyle/1,
+  getBestSize/1,getCaret/1,getCharHeight/1,getCharWidth/1,getChildren/1,
+  getClientSize/1,getContainingSizer/1,getContentScaleFactor/1,getCursor/1,
+  getDPI/1,getDropTarget/1,getEventHandler/1,getExtraStyle/1,getFont/1,
+  getForegroundColour/1,getGrandParent/1,getHandle/1,getHelpText/1,
   getIcon/1,getIcons/1,getId/1,getLabel/1,getMaxSize/1,getMinSize/1,getName/1,
   getParent/1,getPosition/1,getRect/1,getReturnCode/1,getScreenPosition/1,
   getScreenRect/1,getScrollPos/2,getScrollRange/2,getScrollThumb/2,
@@ -57,28 +57,26 @@
   isDoubleBuffered/1,isEnabled/1,isExposed/2,isExposed/3,isExposed/5,
   isFullScreen/1,isIconized/1,isMaximized/1,isModal/1,isRetained/1,isShown/1,
   isShownOnScreen/1,isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,
-  makeModal/1,makeModal/2,maximize/1,maximize/2,move/2,move/3,move/4,moveAfterInTabOrder/2,
-  moveBeforeInTabOrder/2,navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,
-  popEventHandler/1,popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,
-  raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,
-  removeChild/2,reparent/2,requestUserAttention/1,requestUserAttention/2,
-  screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,
-  scrollWindow/4,setAcceleratorTable/2,setAffirmativeId/2,setAutoLayout/2,
-  setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2,
-  setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2,
-  setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
-  setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2,setId/2,setLabel/2,
-  setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,
-  setOwnForegroundColour/2,setPalette/2,setReturnCode/2,setScrollPos/3,
-  setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2,setSize/2,
-  setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,
-  setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setThemeEnabled/2,
-  setTitle/2,setToolTip/2,setTransparent/2,setVirtualSize/2,setVirtualSize/3,
-  setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
-  setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
-  show/1,show/2,showFullScreen/2,showFullScreen/3,showModal/1,thaw/1,
-  toDIP/2,transferDataFromWindow/1,transferDataToWindow/1,update/1,
-  updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
+  maximize/1,maximize/2,move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
+  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
+  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,
+  refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,
+  reparent/2,requestUserAttention/1,requestUserAttention/2,screenToClient/1,
+  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
+  setAcceleratorTable/2,setAffirmativeId/2,setAutoLayout/2,setBackgroundColour/2,
+  setBackgroundStyle/2,setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,
+  setCursor/2,setDoubleBuffered/2,setDropTarget/2,setExtraStyle/2,setFocus/1,
+  setFocusFromKbd/1,setFont/2,setForegroundColour/2,setHelpText/2,setIcon/2,
+  setIcons/2,setId/2,setLabel/2,setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,
+  setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setReturnCode/2,
+  setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2,
+  setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,
+  setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,
+  setThemeEnabled/2,setTitle/2,setToolTip/2,setTransparent/2,setVirtualSize/2,
+  setVirtualSize/3,setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,
+  shouldInheritColours/1,show/1,show/2,showFullScreen/2,showFullScreen/3,
+  showModal/1,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
+  update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
 
 -export_type([wxDirDialog/0]).
 %% @hidden
@@ -105,60 +103,58 @@ new(Parent)
 		 | {'style', integer()}
 		 | {'pos', {X::integer(), Y::integer()}}
 		 | {'sz', {W::integer(), H::integer()}}.
-new(#wx_ref{type=ParentT,ref=ParentRef}, Options)
+new(#wx_ref{type=ParentT}=Parent, Options)
  when is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
-  MOpts = fun({title, Title}, Acc) ->   Title_UC = unicode:characters_to_binary([Title,0]),[<<1:32/?UI,(byte_size(Title_UC)):32/?UI,(Title_UC)/binary, 0:(((8- ((0+byte_size(Title_UC)) band 16#7)) band 16#7))/unit:8>>|Acc];
-          ({defaultPath, DefaultPath}, Acc) ->   DefaultPath_UC = unicode:characters_to_binary([DefaultPath,0]),[<<2:32/?UI,(byte_size(DefaultPath_UC)):32/?UI,(DefaultPath_UC)/binary, 0:(((8- ((0+byte_size(DefaultPath_UC)) band 16#7)) band 16#7))/unit:8>>|Acc];
-          ({style, Style}, Acc) -> [<<3:32/?UI,Style:32/?UI>>|Acc];
-          ({pos, {PosX,PosY}}, Acc) -> [<<4:32/?UI,PosX:32/?UI,PosY:32/?UI,0:32>>|Acc];
-          ({sz, {SzW,SzH}}, Acc) -> [<<5:32/?UI,SzW:32/?UI,SzH:32/?UI,0:32>>|Acc];
-          (BadOpt, _) -> erlang:error({badoption, BadOpt}) end,
-  BinOpt = list_to_binary(lists:foldl(MOpts, [<<0:32>>], Options)),
-  wxe_util:construct(?wxDirDialog_new,
-  <<ParentRef:32/?UI, 0:32,BinOpt/binary>>).
+  MOpts = fun({title, Title}) ->   Title_UC = unicode:characters_to_binary(Title),{title,Title_UC};
+          ({defaultPath, DefaultPath}) ->   DefaultPath_UC = unicode:characters_to_binary(DefaultPath),{defaultPath,DefaultPath_UC};
+          ({style, _style} = Arg) -> Arg;
+          ({pos, {_posX,_posY}} = Arg) -> Arg;
+          ({sz, {_szW,_szH}} = Arg) -> Arg;
+          (BadOpt) -> erlang:error({badoption, BadOpt}) end,
+  Opts = lists:map(MOpts, Options),
+  wxe_util:queue_cmd(Parent, Opts,?get_env(),?wxDirDialog_new),
+  wxe_util:rec(?wxDirDialog_new).
 
 %% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdirdialog.html#wxdirdialoggetpath">external documentation</a>.
 -spec getPath(This) -> unicode:charlist() when
 	This::wxDirDialog().
-getPath(#wx_ref{type=ThisT,ref=ThisRef}) ->
+getPath(#wx_ref{type=ThisT}=This) ->
   ?CLASS(ThisT,wxDirDialog),
-  wxe_util:call(?wxDirDialog_GetPath,
-  <<ThisRef:32/?UI>>).
+  wxe_util:queue_cmd(This,?get_env(),?wxDirDialog_GetPath),
+  wxe_util:rec(?wxDirDialog_GetPath).
 
 %% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdirdialog.html#wxdirdialoggetmessage">external documentation</a>.
 -spec getMessage(This) -> unicode:charlist() when
 	This::wxDirDialog().
-getMessage(#wx_ref{type=ThisT,ref=ThisRef}) ->
+getMessage(#wx_ref{type=ThisT}=This) ->
   ?CLASS(ThisT,wxDirDialog),
-  wxe_util:call(?wxDirDialog_GetMessage,
-  <<ThisRef:32/?UI>>).
+  wxe_util:queue_cmd(This,?get_env(),?wxDirDialog_GetMessage),
+  wxe_util:rec(?wxDirDialog_GetMessage).
 
 %% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdirdialog.html#wxdirdialogsetmessage">external documentation</a>.
 -spec setMessage(This, Message) -> 'ok' when
 	This::wxDirDialog(), Message::unicode:chardata().
-setMessage(#wx_ref{type=ThisT,ref=ThisRef},Message)
+setMessage(#wx_ref{type=ThisT}=This,Message)
  when ?is_chardata(Message) ->
   ?CLASS(ThisT,wxDirDialog),
-  Message_UC = unicode:characters_to_binary([Message,0]),
-  wxe_util:cast(?wxDirDialog_SetMessage,
-  <<ThisRef:32/?UI,(byte_size(Message_UC)):32/?UI,(Message_UC)/binary, 0:(((8- ((0+byte_size(Message_UC)) band 16#7)) band 16#7))/unit:8>>).
+  Message_UC = unicode:characters_to_binary(Message),
+  wxe_util:queue_cmd(This,Message_UC,?get_env(),?wxDirDialog_SetMessage).
 
 %% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdirdialog.html#wxdirdialogsetpath">external documentation</a>.
 -spec setPath(This, Path) -> 'ok' when
 	This::wxDirDialog(), Path::unicode:chardata().
-setPath(#wx_ref{type=ThisT,ref=ThisRef},Path)
+setPath(#wx_ref{type=ThisT}=This,Path)
  when ?is_chardata(Path) ->
   ?CLASS(ThisT,wxDirDialog),
-  Path_UC = unicode:characters_to_binary([Path,0]),
-  wxe_util:cast(?wxDirDialog_SetPath,
-  <<ThisRef:32/?UI,(byte_size(Path_UC)):32/?UI,(Path_UC)/binary, 0:(((8- ((0+byte_size(Path_UC)) band 16#7)) band 16#7))/unit:8>>).
+  Path_UC = unicode:characters_to_binary(Path),
+  wxe_util:queue_cmd(This,Path_UC,?get_env(),?wxDirDialog_SetPath).
 
 %% @doc Destroys this object, do not use object again
 -spec destroy(This::wxDirDialog()) -> 'ok'.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxDirDialog),
-  wxe_util:destroy(?DESTROY_OBJECT,Obj),
+  wxe_util:queue_cmd(Obj, ?get_env(), ?DESTROY_OBJECT),
   ok.
  %% From wxDialog
 %% @hidden
@@ -168,9 +164,9 @@ show(This, Options) -> wxDialog:show(This, Options).
 %% @hidden
 show(This) -> wxDialog:show(This).
 %% @hidden
-setReturnCode(This,ReturnCode) -> wxDialog:setReturnCode(This,ReturnCode).
+setReturnCode(This,RetCode) -> wxDialog:setReturnCode(This,RetCode).
 %% @hidden
-setAffirmativeId(This,AffirmativeId) -> wxDialog:setAffirmativeId(This,AffirmativeId).
+setAffirmativeId(This,Id) -> wxDialog:setAffirmativeId(This,Id).
 %% @hidden
 isModal(This) -> wxDialog:isModal(This).
 %% @hidden
@@ -193,14 +189,14 @@ setTitle(This,Title) -> wxTopLevelWindow:setTitle(This,Title).
 %% @hidden
 setShape(This,Region) -> wxTopLevelWindow:setShape(This,Region).
 %% @hidden
-centreOnScreen(This, Options) -> wxTopLevelWindow:centreOnScreen(This, Options).
-%% @hidden
-centreOnScreen(This) -> wxTopLevelWindow:centreOnScreen(This).
-%% @hidden
 centerOnScreen(This, Options) -> wxTopLevelWindow:centerOnScreen(This, Options).
 %% @hidden
+centreOnScreen(This, Options) -> wxTopLevelWindow:centreOnScreen(This, Options).
+%% @hidden
 centerOnScreen(This) -> wxTopLevelWindow:centerOnScreen(This).
 %% @hidden
+centreOnScreen(This) -> wxTopLevelWindow:centreOnScreen(This).
+%% @hidden
 setIcons(This,Icons) -> wxTopLevelWindow:setIcons(This,Icons).
 %% @hidden
 setIcon(This,Icon) -> wxTopLevelWindow:setIcon(This,Icon).
@@ -232,10 +228,6 @@ getIcons(This) -> wxTopLevelWindow:getIcons(This).
 getIcon(This) -> wxTopLevelWindow:getIcon(This).
  %% From wxWindow
 %% @hidden
-toDIP(This,Sz) -> wxWindow:toDIP(This,Sz).
-%% @hidden
-fromDIP(This,Sz) -> wxWindow:fromDIP(This,Sz).
-%% @hidden
 getDPI(This) -> wxWindow:getDPI(This).
 %% @hidden
 getContentScaleFactor(This) -> wxWindow:getContentScaleFactor(This).
@@ -272,19 +264,13 @@ setWindowStyleFlag(This,Style) -> wxWindow:setWindowStyleFlag(This,Style).
 %% @hidden
 setWindowStyle(This,Style) -> wxWindow:setWindowStyle(This,Style).
 %% @hidden
-setVirtualSizeHints(This,MinW,MinH, Options) -> wxWindow:setVirtualSizeHints(This,MinW,MinH, Options).
-%% @hidden
-setVirtualSizeHints(This,MinW,MinH) -> wxWindow:setVirtualSizeHints(This,MinW,MinH).
-%% @hidden
-setVirtualSizeHints(This,MinSize) -> wxWindow:setVirtualSizeHints(This,MinSize).
-%% @hidden
-setVirtualSize(This,X,Y) -> wxWindow:setVirtualSize(This,X,Y).
+setVirtualSize(This,Width,Height) -> wxWindow:setVirtualSize(This,Width,Height).
 %% @hidden
 setVirtualSize(This,Size) -> wxWindow:setVirtualSize(This,Size).
 %% @hidden
-setToolTip(This,Tip) -> wxWindow:setToolTip(This,Tip).
+setToolTip(This,TipString) -> wxWindow:setToolTip(This,TipString).
 %% @hidden
-setThemeEnabled(This,EnableTheme) -> wxWindow:setThemeEnabled(This,EnableTheme).
+setThemeEnabled(This,Enable) -> wxWindow:setThemeEnabled(This,Enable).
 %% @hidden
 setSizerAndFit(This,Sizer, Options) -> wxWindow:setSizerAndFit(This,Sizer, Options).
 %% @hidden
@@ -308,13 +294,13 @@ setSize(This,Width,Height) -> wxWindow:setSize(This,Width,Height).
 %% @hidden
 setSize(This,Rect) -> wxWindow:setSize(This,Rect).
 %% @hidden
-setScrollPos(This,Orient,Pos, Options) -> wxWindow:setScrollPos(This,Orient,Pos, Options).
+setScrollPos(This,Orientation,Pos, Options) -> wxWindow:setScrollPos(This,Orientation,Pos, Options).
 %% @hidden
-setScrollPos(This,Orient,Pos) -> wxWindow:setScrollPos(This,Orient,Pos).
+setScrollPos(This,Orientation,Pos) -> wxWindow:setScrollPos(This,Orientation,Pos).
 %% @hidden
-setScrollbar(This,Orient,Pos,ThumbVisible,Range, Options) -> wxWindow:setScrollbar(This,Orient,Pos,ThumbVisible,Range, Options).
+setScrollbar(This,Orientation,Position,ThumbSize,Range, Options) -> wxWindow:setScrollbar(This,Orientation,Position,ThumbSize,Range, Options).
 %% @hidden
-setScrollbar(This,Orient,Pos,ThumbVisible,Range) -> wxWindow:setScrollbar(This,Orient,Pos,ThumbVisible,Range).
+setScrollbar(This,Orientation,Position,ThumbSize,Range) -> wxWindow:setScrollbar(This,Orientation,Position,ThumbSize,Range).
 %% @hidden
 setPalette(This,Pal) -> wxWindow:setPalette(This,Pal).
 %% @hidden
@@ -324,7 +310,7 @@ setLabel(This,Label) -> wxWindow:setLabel(This,Label).
 %% @hidden
 setId(This,Winid) -> wxWindow:setId(This,Winid).
 %% @hidden
-setHelpText(This,Text) -> wxWindow:setHelpText(This,Text).
+setHelpText(This,HelpText) -> wxWindow:setHelpText(This,HelpText).
 %% @hidden
 setForegroundColour(This,Colour) -> wxWindow:setForegroundColour(This,Colour).
 %% @hidden
@@ -336,7 +322,7 @@ setFocus(This) -> wxWindow:setFocus(This).
 %% @hidden
 setExtraStyle(This,ExStyle) -> wxWindow:setExtraStyle(This,ExStyle).
 %% @hidden
-setDropTarget(This,DropTarget) -> wxWindow:setDropTarget(This,DropTarget).
+setDropTarget(This,Target) -> wxWindow:setDropTarget(This,Target).
 %% @hidden
 setOwnForegroundColour(This,Colour) -> wxWindow:setOwnForegroundColour(This,Colour).
 %% @hidden
@@ -344,9 +330,9 @@ setOwnFont(This,Font) -> wxWindow:setOwnFont(This,Font).
 %% @hidden
 setOwnBackgroundColour(This,Colour) -> wxWindow:setOwnBackgroundColour(This,Colour).
 %% @hidden
-setMinSize(This,MinSize) -> wxWindow:setMinSize(This,MinSize).
+setMinSize(This,Size) -> wxWindow:setMinSize(This,Size).
 %% @hidden
-setMaxSize(This,MaxSize) -> wxWindow:setMaxSize(This,MaxSize).
+setMaxSize(This,Size) -> wxWindow:setMaxSize(This,Size).
 %% @hidden
 setCursor(This,Cursor) -> wxWindow:setCursor(This,Cursor).
 %% @hidden
@@ -422,10 +408,6 @@ move(This,X,Y) -> wxWindow:move(This,X,Y).
 %% @hidden
 move(This,Pt) -> wxWindow:move(This,Pt).
 %% @hidden
-makeModal(This, Options) -> wxWindow:makeModal(This, Options).
-%% @hidden
-makeModal(This) -> wxWindow:makeModal(This).
-%% @hidden
 lower(This) -> wxWindow:lower(This).
 %% @hidden
 lineUp(This) -> wxWindow:lineUp(This).
@@ -482,11 +464,11 @@ getSizer(This) -> wxWindow:getSizer(This).
 %% @hidden
 getSize(This) -> wxWindow:getSize(This).
 %% @hidden
-getScrollThumb(This,Orient) -> wxWindow:getScrollThumb(This,Orient).
+getScrollThumb(This,Orientation) -> wxWindow:getScrollThumb(This,Orientation).
 %% @hidden
-getScrollRange(This,Orient) -> wxWindow:getScrollRange(This,Orient).
+getScrollRange(This,Orientation) -> wxWindow:getScrollRange(This,Orientation).
 %% @hidden
-getScrollPos(This,Orient) -> wxWindow:getScrollPos(This,Orient).
+getScrollPos(This,Orientation) -> wxWindow:getScrollPos(This,Orientation).
 %% @hidden
 getScreenRect(This) -> wxWindow:getScreenRect(This).
 %% @hidden
@@ -552,7 +534,7 @@ fitInside(This) -> wxWindow:fitInside(This).
 %% @hidden
 fit(This) -> wxWindow:fit(This).
 %% @hidden
-findWindow(This,Winid) -> wxWindow:findWindow(This,Winid).
+findWindow(This,Id) -> wxWindow:findWindow(This,Id).
 %% @hidden
 enable(This, Options) -> wxWindow:enable(This, Options).
 %% @hidden
@@ -578,22 +560,22 @@ clientToScreen(This,Pt) -> wxWindow:clientToScreen(This,Pt).
 %% @hidden
 clearBackground(This) -> wxWindow:clearBackground(This).
 %% @hidden
-centreOnParent(This, Options) -> wxWindow:centreOnParent(This, Options).
-%% @hidden
-centreOnParent(This) -> wxWindow:centreOnParent(This).
-%% @hidden
-centre(This, Options) -> wxWindow:centre(This, Options).
-%% @hidden
-centre(This) -> wxWindow:centre(This).
-%% @hidden
 centerOnParent(This, Options) -> wxWindow:centerOnParent(This, Options).
 %% @hidden
+centreOnParent(This, Options) -> wxWindow:centreOnParent(This, Options).
+%% @hidden
 centerOnParent(This) -> wxWindow:centerOnParent(This).
 %% @hidden
+centreOnParent(This) -> wxWindow:centreOnParent(This).
+%% @hidden
 center(This, Options) -> wxWindow:center(This, Options).
 %% @hidden
+centre(This, Options) -> wxWindow:centre(This, Options).
+%% @hidden
 center(This) -> wxWindow:center(This).
 %% @hidden
+centre(This) -> wxWindow:centre(This).
+%% @hidden
 captureMouse(This) -> wxWindow:captureMouse(This).
 %% @hidden
 cacheBestSize(This,Size) -> wxWindow:cacheBestSize(This,Size).