[wx] Generated types for all wx classes

215 files changed, 9202 insertions, 5145 deletions

diff --git a/lib/wx/src/gen/wxAcceleratorEntry.erl b/lib/wx/src/gen/wxAcceleratorEntry.erl
index d76299b300..6185a1891b 100644
--- a/lib/wx/src/gen/wxAcceleratorEntry.erl
+++ b/lib/wx/src/gen/wxAcceleratorEntry.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -29,24 +29,25 @@
 %% inherited exports
 -export([parent_class/1]).
 
+-export_type([wxAcceleratorEntry/0]).
 %% @hidden
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxAcceleratorEntry()
+-type wxAcceleratorEntry() :: wx:wx_object().
 %% @equiv new([])
+-spec new() -> wxAcceleratorEntry().
+
 new() ->
   new([]).
 
-%% @spec (X::term()|wxAcceleratorEntry()) -> wxAcceleratorEntry()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxacceleratorentry.html#wxacceleratorentrywxacceleratorentry">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% new([Option]) -> wxAcceleratorEntry() </c>
-%%<br /> Option = {flags, integer()} | {keyCode, integer()} | {cmd, integer()} | {item, wxMenuItem:wxMenuItem()}
-%% </p>
-%% <p><c>
-%% new(Entry::wxAcceleratorEntry()) -> wxAcceleratorEntry() </c>
-%% </p>
+-spec new([Option]) -> wxAcceleratorEntry() when
+	Option :: {flags, integer()}
+		 | {keyCode, integer()}
+		 | {cmd, integer()}
+		 | {item, wxMenuItem:wxMenuItem()};
+      (Entry) -> wxAcceleratorEntry() when
+	Entry::wxAcceleratorEntry().
 new(Options)
  when is_list(Options) ->
   MOpts = fun({flags, Flags}, Acc) -> [<<1:32/?UI,Flags:32/?UI>>|Acc];
@@ -62,36 +63,42 @@ new(#wx_ref{type=EntryT,ref=EntryRef}) ->
   wxe_util:construct(?wxAcceleratorEntry_new_1_1,
   <<EntryRef:32/?UI>>).
 
-%% @spec (This::wxAcceleratorEntry()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxacceleratorentry.html#wxacceleratorentrygetcommand">external documentation</a>.
+-spec getCommand(This) -> integer() when
+	This::wxAcceleratorEntry().
 getCommand(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxAcceleratorEntry),
   wxe_util:call(?wxAcceleratorEntry_GetCommand,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxAcceleratorEntry()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxacceleratorentry.html#wxacceleratorentrygetflags">external documentation</a>.
+-spec getFlags(This) -> integer() when
+	This::wxAcceleratorEntry().
 getFlags(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxAcceleratorEntry),
   wxe_util:call(?wxAcceleratorEntry_GetFlags,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxAcceleratorEntry()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxacceleratorentry.html#wxacceleratorentrygetkeycode">external documentation</a>.
+-spec getKeyCode(This) -> integer() when
+	This::wxAcceleratorEntry().
 getKeyCode(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxAcceleratorEntry),
   wxe_util:call(?wxAcceleratorEntry_GetKeyCode,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxAcceleratorEntry(), Flags::integer(), KeyCode::integer(), Cmd::integer()) -> ok
 %% @equiv set(This,Flags,KeyCode,Cmd, [])
+-spec set(This, Flags, KeyCode, Cmd) -> ok when
+	This::wxAcceleratorEntry(), Flags::integer(), KeyCode::integer(), Cmd::integer().
+
 set(This,Flags,KeyCode,Cmd)
  when is_record(This, wx_ref),is_integer(Flags),is_integer(KeyCode),is_integer(Cmd) ->
   set(This,Flags,KeyCode,Cmd, []).
 
-%% @spec (This::wxAcceleratorEntry(), Flags::integer(), KeyCode::integer(), Cmd::integer(), [Option]) -> ok
-%% Option = {item, wxMenuItem:wxMenuItem()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxacceleratorentry.html#wxacceleratorentryset">external documentation</a>.
+-spec set(This, Flags, KeyCode, Cmd, [Option]) -> ok when
+	This::wxAcceleratorEntry(), Flags::integer(), KeyCode::integer(), Cmd::integer(),
+	Option :: {item, wxMenuItem:wxMenuItem()}.
 set(#wx_ref{type=ThisT,ref=ThisRef},Flags,KeyCode,Cmd, Options)
  when is_integer(Flags),is_integer(KeyCode),is_integer(Cmd),is_list(Options) ->
   ?CLASS(ThisT,wxAcceleratorEntry),
@@ -101,8 +108,8 @@ set(#wx_ref{type=ThisT,ref=ThisRef},Flags,KeyCode,Cmd, Options)
   wxe_util:cast(?wxAcceleratorEntry_Set,
   <<ThisRef:32/?UI,Flags:32/?UI,KeyCode:32/?UI,Cmd:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxAcceleratorEntry()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxAcceleratorEntry) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxAcceleratorEntry),
   wxe_util:destroy(?wxAcceleratorEntry_destroy,Obj),
diff --git a/lib/wx/src/gen/wxAcceleratorTable.erl b/lib/wx/src/gen/wxAcceleratorTable.erl
index 5d070294e2..15915daa5a 100644
--- a/lib/wx/src/gen/wxAcceleratorTable.erl
+++ b/lib/wx/src/gen/wxAcceleratorTable.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -29,17 +29,20 @@
 %% inherited exports
 -export([parent_class/1]).
 
+-export_type([wxAcceleratorTable/0]).
 %% @hidden
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxAcceleratorTable()
+-type wxAcceleratorTable() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxacceleratortable.html#wxacceleratortablewxacceleratortable">external documentation</a>.
+-spec new() -> wxAcceleratorTable().
 new() ->
   wxe_util:construct(?wxAcceleratorTable_new_0,
   <<>>).
 
-%% @spec (N::integer(), Entries::[wxAcceleratorEntry:wxAcceleratorEntry()]) -> wxAcceleratorTable()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxacceleratortable.html#wxacceleratortablewxacceleratortable">external documentation</a>.
+-spec new(N, Entries) -> wxAcceleratorTable() when
+	N::integer(), Entries::[wxAcceleratorEntry:wxAcceleratorEntry()].
 new(N,Entries)
  when is_integer(N),is_list(Entries) ->
   [?CLASS(EntriesT,wxAcceleratorEntry) || #wx_ref{type=EntriesT} <- Entries],
@@ -47,15 +50,16 @@ new(N,Entries)
   <<N:32/?UI,(length(Entries)):32/?UI,
      (<< <<(C#wx_ref.ref):32/?UI>> || C <- Entries>>)/binary, 0:(((0+length(Entries)) rem 2)*32)>>).
 
-%% @spec (This::wxAcceleratorTable()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxacceleratortable.html#wxacceleratortableok">external documentation</a>.
+-spec ok(This) -> boolean() when
+	This::wxAcceleratorTable().
 ok(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxAcceleratorTable),
   wxe_util:call(?wxAcceleratorTable_Ok,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxAcceleratorTable()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxAcceleratorTable) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxAcceleratorTable),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxArtProvider.erl b/lib/wx/src/gen/wxArtProvider.erl
index 1955bd2e29..584e240879 100644
--- a/lib/wx/src/gen/wxArtProvider.erl
+++ b/lib/wx/src/gen/wxArtProvider.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -29,18 +29,24 @@
 %% inherited exports
 -export([parent_class/1]).
 
+-export_type([wxArtProvider/0]).
 %% @hidden
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (Id::string()) -> wxBitmap:wxBitmap()
+-type wxArtProvider() :: wx:wx_object().
 %% @equiv getBitmap(Id, [])
+-spec getBitmap(Id) -> wxBitmap:wxBitmap() when
+	Id::string().
+
 getBitmap(Id)
  when is_list(Id) ->
   getBitmap(Id, []).
 
-%% @spec (Id::string(), [Option]) -> wxBitmap:wxBitmap()
-%% Option = {client, string()} | {size, {W::integer(), H::integer()}}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxartprovider.html#wxartprovidergetbitmap">external documentation</a>.
+-spec getBitmap(Id, [Option]) -> wxBitmap:wxBitmap() when
+	Id::string(),
+	Option :: {client, string()}
+		 | {size, {W::integer(), H::integer()}}.
 getBitmap(Id, Options)
  when is_list(Id),is_list(Options) ->
   Id_UC = unicode:characters_to_binary([Id,0]),
@@ -51,15 +57,19 @@ getBitmap(Id, Options)
   wxe_util:call(?wxArtProvider_GetBitmap,
   <<(byte_size(Id_UC)):32/?UI,(Id_UC)/binary, 0:(((8- ((4+byte_size(Id_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (Id::string()) -> wxIcon:wxIcon()
 %% @equiv getIcon(Id, [])
+-spec getIcon(Id) -> wxIcon:wxIcon() when
+	Id::string().
+
 getIcon(Id)
  when is_list(Id) ->
   getIcon(Id, []).
 
-%% @spec (Id::string(), [Option]) -> wxIcon:wxIcon()
-%% Option = {client, string()} | {size, {W::integer(), H::integer()}}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxartprovider.html#wxartprovidergeticon">external documentation</a>.
+-spec getIcon(Id, [Option]) -> wxIcon:wxIcon() when
+	Id::string(),
+	Option :: {client, string()}
+		 | {size, {W::integer(), H::integer()}}.
 getIcon(Id, Options)
  when is_list(Id),is_list(Options) ->
   Id_UC = unicode:characters_to_binary([Id,0]),
diff --git a/lib/wx/src/gen/wxAuiDockArt.erl b/lib/wx/src/gen/wxAuiDockArt.erl
index f2be643dd9..d3cf1ebd0d 100644
--- a/lib/wx/src/gen/wxAuiDockArt.erl
+++ b/lib/wx/src/gen/wxAuiDockArt.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -29,6 +29,8 @@
 %% inherited exports
 -export([parent_class/1]).
 
+-export_type([wxAuiDockArt/0]).
 %% @hidden
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
+-type wxAuiDockArt() :: wx:wx_object().
diff --git a/lib/wx/src/gen/wxAuiManager.erl b/lib/wx/src/gen/wxAuiManager.erl
index 893867cec1..456c435a8c 100644
--- a/lib/wx/src/gen/wxAuiManager.erl
+++ b/lib/wx/src/gen/wxAuiManager.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -37,18 +37,22 @@
 %% inherited exports
 -export([connect/2,connect/3,disconnect/1,disconnect/2,disconnect/3,parent_class/1]).
 
+-export_type([wxAuiManager/0]).
 %% @hidden
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxAuiManager()
+-type wxAuiManager() :: wx:wx_object().
 %% @equiv new([])
+-spec new() -> wxAuiManager().
+
 new() ->
   new([]).
 
-%% @spec ([Option]) -> wxAuiManager()
-%% Option = {managed_wnd, wxWindow:wxWindow()} | {flags, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanager.html#wxauimanagerwxauimanager">external documentation</a>.
+-spec new([Option]) -> wxAuiManager() when
+	Option :: {managed_wnd, wxWindow:wxWindow()}
+		 | {flags, integer()}.
 new(Options)
  when is_list(Options) ->
   MOpts = fun({managed_wnd, #wx_ref{type=Managed_wndT,ref=Managed_wndRef}}, Acc) ->   ?CLASS(Managed_wndT,wxWindow),[<<1:32/?UI,Managed_wndRef:32/?UI>>|Acc];
@@ -58,22 +62,21 @@ new(Options)
   wxe_util:construct(?wxAuiManager_new,
   <<BinOpt/binary>>).
 
-%% @spec (This::wxAuiManager(), Window::wxWindow:wxWindow()) -> bool()
 %% @equiv addPane(This,Window, [])
+-spec addPane(This, Window) -> boolean() when
+	This::wxAuiManager(), Window::wxWindow:wxWindow().
+
 addPane(This,Window)
  when is_record(This, wx_ref),is_record(Window, wx_ref) ->
   addPane(This,Window, []).
 
-%% @spec (This::wxAuiManager(),Window::wxWindow:wxWindow(),X::term()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanager.html#wxauimanageraddpane">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% addPane(This::wxAuiManager(), Window::wxWindow:wxWindow(), [Option]) -> bool() </c>
-%%<br /> Option = {direction, integer()} | {caption, string()}
-%% </p>
-%% <p><c>
-%% addPane(This::wxAuiManager(), Window::wxWindow:wxWindow(), Pane_info::wxAuiPaneInfo:wxAuiPaneInfo()) -> bool() </c>
-%% </p>
+-spec addPane(This, Window, [Option]) -> boolean() when
+	This::wxAuiManager(), Window::wxWindow:wxWindow(),
+	Option :: {direction, integer()}
+		 | {caption, string()};
+      (This, Window, Pane_info) -> boolean() when
+	This::wxAuiManager(), Window::wxWindow:wxWindow(), Pane_info::wxAuiPaneInfo:wxAuiPaneInfo().
 addPane(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxAuiManager),
@@ -91,8 +94,9 @@ addPane(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef},#wx_
   wxe_util:call(?wxAuiManager_AddPane_2_1,
   <<ThisRef:32/?UI,WindowRef:32/?UI,Pane_infoRef:32/?UI>>).
 
-%% @spec (This::wxAuiManager(), Window::wxWindow:wxWindow(), Pane_info::wxAuiPaneInfo:wxAuiPaneInfo(), Drop_pos::{X::integer(), Y::integer()}) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanager.html#wxauimanageraddpane">external documentation</a>.
+-spec addPane(This, Window, Pane_info, Drop_pos) -> boolean() when
+	This::wxAuiManager(), Window::wxWindow:wxWindow(), Pane_info::wxAuiPaneInfo:wxAuiPaneInfo(), Drop_pos::{X::integer(), Y::integer()}.
 addPane(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef},#wx_ref{type=Pane_infoT,ref=Pane_infoRef},{Drop_posX,Drop_posY})
  when is_integer(Drop_posX),is_integer(Drop_posY) ->
   ?CLASS(ThisT,wxAuiManager),
@@ -101,65 +105,68 @@ addPane(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef},#wx_
   wxe_util:call(?wxAuiManager_AddPane_3,
   <<ThisRef:32/?UI,WindowRef:32/?UI,Pane_infoRef:32/?UI,Drop_posX:32/?UI,Drop_posY:32/?UI>>).
 
-%% @spec (This::wxAuiManager(), Window::wxWindow:wxWindow()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanager.html#wxauimanagerdetachpane">external documentation</a>.
+-spec detachPane(This, Window) -> boolean() when
+	This::wxAuiManager(), Window::wxWindow:wxWindow().
 detachPane(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef}) ->
   ?CLASS(ThisT,wxAuiManager),
   ?CLASS(WindowT,wxWindow),
   wxe_util:call(?wxAuiManager_DetachPane,
   <<ThisRef:32/?UI,WindowRef:32/?UI>>).
 
-%% @spec (This::wxAuiManager()) -> wxAuiPaneInfoArray:wxAuiPaneInfoArray()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanager.html#wxauimanagergetallpanes">external documentation</a>.
+-spec getAllPanes(This) -> wxAuiPaneInfoArray:wxAuiPaneInfoArray() when
+	This::wxAuiManager().
 getAllPanes(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxAuiManager),
   wxe_util:call(?wxAuiManager_GetAllPanes,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxAuiManager()) -> wxAuiDockArt:wxAuiDockArt()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanager.html#wxauimanagergetartprovider">external documentation</a>.
+-spec getArtProvider(This) -> wxAuiDockArt:wxAuiDockArt() when
+	This::wxAuiManager().
 getArtProvider(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxAuiManager),
   wxe_util:call(?wxAuiManager_GetArtProvider,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxAuiManager()) -> {Width_pct::float(), Height_pct::float()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanager.html#wxauimanagergetdocksizeconstraint">external documentation</a>.
+-spec getDockSizeConstraint(This) -> {Width_pct::float(), Height_pct::float()} when
+	This::wxAuiManager().
 getDockSizeConstraint(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxAuiManager),
   wxe_util:call(?wxAuiManager_GetDockSizeConstraint,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxAuiManager()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanager.html#wxauimanagergetflags">external documentation</a>.
+-spec getFlags(This) -> integer() when
+	This::wxAuiManager().
 getFlags(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxAuiManager),
   wxe_util:call(?wxAuiManager_GetFlags,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxAuiManager()) -> wxWindow:wxWindow()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanager.html#wxauimanagergetmanagedwindow">external documentation</a>.
+-spec getManagedWindow(This) -> wxWindow:wxWindow() when
+	This::wxAuiManager().
 getManagedWindow(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxAuiManager),
   wxe_util:call(?wxAuiManager_GetManagedWindow,
   <<ThisRef:32/?UI>>).
 
-%% @spec (Window::wxWindow:wxWindow()) -> wxAuiManager()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanager.html#wxauimanagergetmanager">external documentation</a>.
+-spec getManager(Window) -> wxAuiManager() when
+	Window::wxWindow:wxWindow().
 getManager(#wx_ref{type=WindowT,ref=WindowRef}) ->
   ?CLASS(WindowT,wxWindow),
   wxe_util:call(?wxAuiManager_GetManager,
   <<WindowRef:32/?UI>>).
 
-%% @spec (This::wxAuiManager(),X::string()|term()) -> wxAuiPaneInfo:wxAuiPaneInfo()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanager.html#wxauimanagergetpane">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% getPane(This::wxAuiManager(), Name::string()) -> wxAuiPaneInfo:wxAuiPaneInfo() </c>
-%% </p>
-%% <p><c>
-%% getPane(This::wxAuiManager(), Window::wxWindow:wxWindow()) -> wxAuiPaneInfo:wxAuiPaneInfo() </c>
-%% </p>
+-spec getPane(This, Name) -> wxAuiPaneInfo:wxAuiPaneInfo() when
+	This::wxAuiManager(), Name::string();
+      (This, Window) -> wxAuiPaneInfo:wxAuiPaneInfo() when
+	This::wxAuiManager(), Window::wxWindow:wxWindow().
 getPane(#wx_ref{type=ThisT,ref=ThisRef},Name)
  when is_list(Name) ->
   ?CLASS(ThisT,wxAuiManager),
@@ -172,22 +179,26 @@ getPane(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef}) ->
   wxe_util:call(?wxAuiManager_GetPane_1_1,
   <<ThisRef:32/?UI,WindowRef:32/?UI>>).
 
-%% @spec (This::wxAuiManager()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanager.html#wxauimanagerhidehint">external documentation</a>.
+-spec hideHint(This) -> ok when
+	This::wxAuiManager().
 hideHint(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxAuiManager),
   wxe_util:cast(?wxAuiManager_HideHint,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxAuiManager(), Window::wxWindow:wxWindow(), Insert_location::wxAuiPaneInfo:wxAuiPaneInfo()) -> bool()
 %% @equiv insertPane(This,Window,Insert_location, [])
+-spec insertPane(This, Window, Insert_location) -> boolean() when
+	This::wxAuiManager(), Window::wxWindow:wxWindow(), Insert_location::wxAuiPaneInfo:wxAuiPaneInfo().
+
 insertPane(This,Window,Insert_location)
  when is_record(This, wx_ref),is_record(Window, wx_ref),is_record(Insert_location, wx_ref) ->
   insertPane(This,Window,Insert_location, []).
 
-%% @spec (This::wxAuiManager(), Window::wxWindow:wxWindow(), Insert_location::wxAuiPaneInfo:wxAuiPaneInfo(), [Option]) -> bool()
-%% Option = {insert_level, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanager.html#wxauimanagerinsertpane">external documentation</a>.
+-spec insertPane(This, Window, Insert_location, [Option]) -> boolean() when
+	This::wxAuiManager(), Window::wxWindow:wxWindow(), Insert_location::wxAuiPaneInfo:wxAuiPaneInfo(),
+	Option :: {insert_level, integer()}.
 insertPane(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef},#wx_ref{type=Insert_locationT,ref=Insert_locationRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxAuiManager),
@@ -199,8 +210,9 @@ insertPane(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef},#
   wxe_util:call(?wxAuiManager_InsertPane,
   <<ThisRef:32/?UI,WindowRef:32/?UI,Insert_locationRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxAuiManager(), Pane_part::string(), Pane::wxAuiPaneInfo:wxAuiPaneInfo()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanager.html#wxauimanagerloadpaneinfo">external documentation</a>.
+-spec loadPaneInfo(This, Pane_part, Pane) -> ok when
+	This::wxAuiManager(), Pane_part::string(), Pane::wxAuiPaneInfo:wxAuiPaneInfo().
 loadPaneInfo(#wx_ref{type=ThisT,ref=ThisRef},Pane_part,#wx_ref{type=PaneT,ref=PaneRef})
  when is_list(Pane_part) ->
   ?CLASS(ThisT,wxAuiManager),
@@ -209,15 +221,18 @@ loadPaneInfo(#wx_ref{type=ThisT,ref=ThisRef},Pane_part,#wx_ref{type=PaneT,ref=Pa
   wxe_util:cast(?wxAuiManager_LoadPaneInfo,
   <<ThisRef:32/?UI,(byte_size(Pane_part_UC)):32/?UI,(Pane_part_UC)/binary, 0:(((8- ((0+byte_size(Pane_part_UC)) band 16#7)) band 16#7))/unit:8,PaneRef:32/?UI>>).
 
-%% @spec (This::wxAuiManager(), Perspective::string()) -> bool()
 %% @equiv loadPerspective(This,Perspective, [])
+-spec loadPerspective(This, Perspective) -> boolean() when
+	This::wxAuiManager(), Perspective::string().
+
 loadPerspective(This,Perspective)
  when is_record(This, wx_ref),is_list(Perspective) ->
   loadPerspective(This,Perspective, []).
 
-%% @spec (This::wxAuiManager(), Perspective::string(), [Option]) -> bool()
-%% Option = {update, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanager.html#wxauimanagerloadperspective">external documentation</a>.
+-spec loadPerspective(This, Perspective, [Option]) -> boolean() when
+	This::wxAuiManager(), Perspective::string(),
+	Option :: {update, boolean()}.
 loadPerspective(#wx_ref{type=ThisT,ref=ThisRef},Perspective, Options)
  when is_list(Perspective),is_list(Options) ->
   ?CLASS(ThisT,wxAuiManager),
@@ -228,77 +243,86 @@ loadPerspective(#wx_ref{type=ThisT,ref=ThisRef},Perspective, Options)
   wxe_util:call(?wxAuiManager_LoadPerspective,
   <<ThisRef:32/?UI,(byte_size(Perspective_UC)):32/?UI,(Perspective_UC)/binary, 0:(((8- ((0+byte_size(Perspective_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxAuiManager(), Pane::wxAuiPaneInfo:wxAuiPaneInfo()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanager.html#wxauimanagersavepaneinfo">external documentation</a>.
+-spec savePaneInfo(This, Pane) -> string() when
+	This::wxAuiManager(), Pane::wxAuiPaneInfo:wxAuiPaneInfo().
 savePaneInfo(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PaneT,ref=PaneRef}) ->
   ?CLASS(ThisT,wxAuiManager),
   ?CLASS(PaneT,wxAuiPaneInfo),
   wxe_util:call(?wxAuiManager_SavePaneInfo,
   <<ThisRef:32/?UI,PaneRef:32/?UI>>).
 
-%% @spec (This::wxAuiManager()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanager.html#wxauimanagersaveperspective">external documentation</a>.
+-spec savePerspective(This) -> string() when
+	This::wxAuiManager().
 savePerspective(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxAuiManager),
   wxe_util:call(?wxAuiManager_SavePerspective,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxAuiManager(), Art_provider::wxAuiDockArt:wxAuiDockArt()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanager.html#wxauimanagersetartprovider">external documentation</a>.
+-spec setArtProvider(This, Art_provider) -> ok when
+	This::wxAuiManager(), Art_provider::wxAuiDockArt:wxAuiDockArt().
 setArtProvider(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=Art_providerT,ref=Art_providerRef}) ->
   ?CLASS(ThisT,wxAuiManager),
   ?CLASS(Art_providerT,wxAuiDockArt),
   wxe_util:cast(?wxAuiManager_SetArtProvider,
   <<ThisRef:32/?UI,Art_providerRef:32/?UI>>).
 
-%% @spec (This::wxAuiManager(), Width_pct::float(), Height_pct::float()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanager.html#wxauimanagersetdocksizeconstraint">external documentation</a>.
+-spec setDockSizeConstraint(This, Width_pct, Height_pct) -> ok when
+	This::wxAuiManager(), Width_pct::float(), Height_pct::float().
 setDockSizeConstraint(#wx_ref{type=ThisT,ref=ThisRef},Width_pct,Height_pct)
  when is_float(Width_pct),is_float(Height_pct) ->
   ?CLASS(ThisT,wxAuiManager),
   wxe_util:cast(?wxAuiManager_SetDockSizeConstraint,
   <<ThisRef:32/?UI,0:32,Width_pct:64/?F,Height_pct:64/?F>>).
 
-%% @spec (This::wxAuiManager(), Flags::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanager.html#wxauimanagersetflags">external documentation</a>.
+-spec setFlags(This, Flags) -> ok when
+	This::wxAuiManager(), Flags::integer().
 setFlags(#wx_ref{type=ThisT,ref=ThisRef},Flags)
  when is_integer(Flags) ->
   ?CLASS(ThisT,wxAuiManager),
   wxe_util:cast(?wxAuiManager_SetFlags,
   <<ThisRef:32/?UI,Flags:32/?UI>>).
 
-%% @spec (This::wxAuiManager(), Managed_wnd::wxWindow:wxWindow()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanager.html#wxauimanagersetmanagedwindow">external documentation</a>.
+-spec setManagedWindow(This, Managed_wnd) -> ok when
+	This::wxAuiManager(), Managed_wnd::wxWindow:wxWindow().
 setManagedWindow(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=Managed_wndT,ref=Managed_wndRef}) ->
   ?CLASS(ThisT,wxAuiManager),
   ?CLASS(Managed_wndT,wxWindow),
   wxe_util:cast(?wxAuiManager_SetManagedWindow,
   <<ThisRef:32/?UI,Managed_wndRef:32/?UI>>).
 
-%% @spec (This::wxAuiManager(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanager.html#wxauimanagershowhint">external documentation</a>.
+-spec showHint(This, Rect) -> ok when
+	This::wxAuiManager(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}.
 showHint(#wx_ref{type=ThisT,ref=ThisRef},{RectX,RectY,RectW,RectH})
  when is_integer(RectX),is_integer(RectY),is_integer(RectW),is_integer(RectH) ->
   ?CLASS(ThisT,wxAuiManager),
   wxe_util:cast(?wxAuiManager_ShowHint,
   <<ThisRef:32/?UI,RectX:32/?UI,RectY:32/?UI,RectW:32/?UI,RectH:32/?UI>>).
 
-%% @spec (This::wxAuiManager()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanager.html#wxauimanageruninit">external documentation</a>.
+-spec unInit(This) -> ok when
+	This::wxAuiManager().
 unInit(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxAuiManager),
   wxe_util:cast(?wxAuiManager_UnInit,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxAuiManager()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanager.html#wxauimanagerupdate">external documentation</a>.
+-spec update(This) -> ok when
+	This::wxAuiManager().
 update(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxAuiManager),
   wxe_util:cast(?wxAuiManager_Update,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxAuiManager()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxAuiManager) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxAuiManager),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxAuiManagerEvent.erl b/lib/wx/src/gen/wxAuiManagerEvent.erl
index b5e45f1860..feb3931696 100644
--- a/lib/wx/src/gen/wxAuiManagerEvent.erl
+++ b/lib/wx/src/gen/wxAuiManagerEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2012. 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
@@ -38,79 +38,92 @@
 -export([getId/1,getSkipped/1,getTimestamp/1,isCommandEvent/1,parent_class/1,
   resumePropagation/2,shouldPropagate/1,skip/1,skip/2,stopPropagation/1]).
 
+-export_type([wxAuiManagerEvent/0]).
 %% @hidden
 parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (This::wxAuiManagerEvent(), Mgr::wxAuiManager:wxAuiManager()) -> ok
+-type wxAuiManagerEvent() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanagerevent.html#wxauimanagereventsetmanager">external documentation</a>.
+-spec setManager(This, Mgr) -> ok when
+	This::wxAuiManagerEvent(), Mgr::wxAuiManager:wxAuiManager().
 setManager(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=MgrT,ref=MgrRef}) ->
   ?CLASS(ThisT,wxAuiManagerEvent),
   ?CLASS(MgrT,wxAuiManager),
   wxe_util:cast(?wxAuiManagerEvent_SetManager,
   <<ThisRef:32/?UI,MgrRef:32/?UI>>).
 
-%% @spec (This::wxAuiManagerEvent()) -> wxAuiManager:wxAuiManager()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanagerevent.html#wxauimanagereventgetmanager">external documentation</a>.
+-spec getManager(This) -> wxAuiManager:wxAuiManager() when
+	This::wxAuiManagerEvent().
 getManager(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxAuiManagerEvent),
   wxe_util:call(?wxAuiManagerEvent_GetManager,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxAuiManagerEvent(), P::wxAuiPaneInfo:wxAuiPaneInfo()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanagerevent.html#wxauimanagereventsetpane">external documentation</a>.
+-spec setPane(This, P) -> ok when
+	This::wxAuiManagerEvent(), P::wxAuiPaneInfo:wxAuiPaneInfo().
 setPane(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PT,ref=PRef}) ->
   ?CLASS(ThisT,wxAuiManagerEvent),
   ?CLASS(PT,wxAuiPaneInfo),
   wxe_util:cast(?wxAuiManagerEvent_SetPane,
   <<ThisRef:32/?UI,PRef:32/?UI>>).
 
-%% @spec (This::wxAuiManagerEvent()) -> wxAuiPaneInfo:wxAuiPaneInfo()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanagerevent.html#wxauimanagereventgetpane">external documentation</a>.
+-spec getPane(This) -> wxAuiPaneInfo:wxAuiPaneInfo() when
+	This::wxAuiManagerEvent().
 getPane(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxAuiManagerEvent),
   wxe_util:call(?wxAuiManagerEvent_GetPane,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxAuiManagerEvent(), B::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanagerevent.html#wxauimanagereventsetbutton">external documentation</a>.
+-spec setButton(This, B) -> ok when
+	This::wxAuiManagerEvent(), B::integer().
 setButton(#wx_ref{type=ThisT,ref=ThisRef},B)
  when is_integer(B) ->
   ?CLASS(ThisT,wxAuiManagerEvent),
   wxe_util:cast(?wxAuiManagerEvent_SetButton,
   <<ThisRef:32/?UI,B:32/?UI>>).
 
-%% @spec (This::wxAuiManagerEvent()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanagerevent.html#wxauimanagereventgetbutton">external documentation</a>.
+-spec getButton(This) -> integer() when
+	This::wxAuiManagerEvent().
 getButton(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxAuiManagerEvent),
   wxe_util:call(?wxAuiManagerEvent_GetButton,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxAuiManagerEvent(), Pdc::wxDC:wxDC()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanagerevent.html#wxauimanagereventsetdc">external documentation</a>.
+-spec setDC(This, Pdc) -> ok when
+	This::wxAuiManagerEvent(), Pdc::wxDC:wxDC().
 setDC(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PdcT,ref=PdcRef}) ->
   ?CLASS(ThisT,wxAuiManagerEvent),
   ?CLASS(PdcT,wxDC),
   wxe_util:cast(?wxAuiManagerEvent_SetDC,
   <<ThisRef:32/?UI,PdcRef:32/?UI>>).
 
-%% @spec (This::wxAuiManagerEvent()) -> wxDC:wxDC()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanagerevent.html#wxauimanagereventgetdc">external documentation</a>.
+-spec getDC(This) -> wxDC:wxDC() when
+	This::wxAuiManagerEvent().
 getDC(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxAuiManagerEvent),
   wxe_util:call(?wxAuiManagerEvent_GetDC,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxAuiManagerEvent()) -> ok
 %% @equiv veto(This, [])
+-spec veto(This) -> ok when
+	This::wxAuiManagerEvent().
+
 veto(This)
  when is_record(This, wx_ref) ->
   veto(This, []).
 
-%% @spec (This::wxAuiManagerEvent(), [Option]) -> ok
-%% Option = {veto, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanagerevent.html#wxauimanagereventveto">external documentation</a>.
+-spec veto(This, [Option]) -> ok when
+	This::wxAuiManagerEvent(),
+	Option :: {veto, boolean()}.
 veto(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxAuiManagerEvent),
@@ -120,23 +133,26 @@ veto(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxAuiManagerEvent_Veto,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxAuiManagerEvent()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanagerevent.html#wxauimanagereventgetveto">external documentation</a>.
+-spec getVeto(This) -> boolean() when
+	This::wxAuiManagerEvent().
 getVeto(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxAuiManagerEvent),
   wxe_util:call(?wxAuiManagerEvent_GetVeto,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxAuiManagerEvent(), Can_veto::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanagerevent.html#wxauimanagereventsetcanveto">external documentation</a>.
+-spec setCanVeto(This, Can_veto) -> ok when
+	This::wxAuiManagerEvent(), Can_veto::boolean().
 setCanVeto(#wx_ref{type=ThisT,ref=ThisRef},Can_veto)
  when is_boolean(Can_veto) ->
   ?CLASS(ThisT,wxAuiManagerEvent),
   wxe_util:cast(?wxAuiManagerEvent_SetCanVeto,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Can_veto)):32/?UI>>).
 
-%% @spec (This::wxAuiManagerEvent()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanagerevent.html#wxauimanagereventcanveto">external documentation</a>.
+-spec canVeto(This) -> boolean() when
+	This::wxAuiManagerEvent().
 canVeto(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxAuiManagerEvent),
   wxe_util:call(?wxAuiManagerEvent_CanVeto,
diff --git a/lib/wx/src/gen/wxAuiNotebook.erl b/lib/wx/src/gen/wxAuiNotebook.erl
index 5862bb26c7..6741feccb9 100644
--- a/lib/wx/src/gen/wxAuiNotebook.erl
+++ b/lib/wx/src/gen/wxAuiNotebook.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -73,27 +73,35 @@
   transferDataToWindow/1,update/1,updateWindowUI/1,updateWindowUI/2,
   validate/1,warpPointer/3]).
 
+-export_type([wxAuiNotebook/0]).
 %% @hidden
 parent_class(wxControl) -> true;
 parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxAuiNotebook()
+-type wxAuiNotebook() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauinotebook.html#wxauinotebookwxauinotebook">external documentation</a>.
+-spec new() -> wxAuiNotebook().
 new() ->
   wxe_util:construct(?wxAuiNotebook_new_0,
   <<>>).
 
-%% @spec (Parent::wxWindow:wxWindow()) -> wxAuiNotebook()
 %% @equiv new(Parent, [])
+-spec new(Parent) -> wxAuiNotebook() when
+	Parent::wxWindow:wxWindow().
+
 new(Parent)
  when is_record(Parent, wx_ref) ->
   new(Parent, []).
 
-%% @spec (Parent::wxWindow:wxWindow(), [Option]) -> wxAuiNotebook()
-%% Option = {id, integer()} | {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauinotebook.html#wxauinotebookwxauinotebook">external documentation</a>.
+-spec new(Parent, [Option]) -> wxAuiNotebook() when
+	Parent::wxWindow:wxWindow(),
+	Option :: {id, integer()}
+		 | {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}.
 new(#wx_ref{type=ParentT,ref=ParentRef}, Options)
  when is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -106,15 +114,19 @@ new(#wx_ref{type=ParentT,ref=ParentRef}, Options)
   wxe_util:construct(?wxAuiNotebook_new_2,
   <<ParentRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxAuiNotebook(), Page::wxWindow:wxWindow(), Caption::string()) -> bool()
 %% @equiv addPage(This,Page,Caption, [])
+-spec addPage(This, Page, Caption) -> boolean() when
+	This::wxAuiNotebook(), Page::wxWindow:wxWindow(), Caption::string().
+
 addPage(This,Page,Caption)
  when is_record(This, wx_ref),is_record(Page, wx_ref),is_list(Caption) ->
   addPage(This,Page,Caption, []).
 
-%% @spec (This::wxAuiNotebook(), Page::wxWindow:wxWindow(), Caption::string(), [Option]) -> bool()
-%% Option = {select, bool()} | {bitmap, wxBitmap:wxBitmap()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauinotebook.html#wxauinotebookaddpage">external documentation</a>.
+-spec addPage(This, Page, Caption, [Option]) -> boolean() when
+	This::wxAuiNotebook(), Page::wxWindow:wxWindow(), Caption::string(),
+	Option :: {select, boolean()}
+		 | {bitmap, wxBitmap:wxBitmap()}.
 addPage(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PageT,ref=PageRef},Caption, Options)
  when is_list(Caption),is_list(Options) ->
   ?CLASS(ThisT,wxAuiNotebook),
@@ -127,15 +139,21 @@ addPage(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PageT,ref=PageRef},Caption,
   wxe_util:call(?wxAuiNotebook_AddPage,
   <<ThisRef:32/?UI,PageRef:32/?UI,(byte_size(Caption_UC)):32/?UI,(Caption_UC)/binary, 0:(((8- ((4+byte_size(Caption_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxAuiNotebook(), Parent::wxWindow:wxWindow()) -> bool()
 %% @equiv create(This,Parent, [])
+-spec create(This, Parent) -> boolean() when
+	This::wxAuiNotebook(), Parent::wxWindow:wxWindow().
+
 create(This,Parent)
  when is_record(This, wx_ref),is_record(Parent, wx_ref) ->
   create(This,Parent, []).
 
-%% @spec (This::wxAuiNotebook(), Parent::wxWindow:wxWindow(), [Option]) -> bool()
-%% Option = {id, integer()} | {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauinotebook.html#wxauinotebookcreate">external documentation</a>.
+-spec create(This, Parent, [Option]) -> boolean() when
+	This::wxAuiNotebook(), Parent::wxWindow:wxWindow(),
+	Option :: {id, integer()}
+		 | {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}.
 create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxAuiNotebook),
@@ -149,76 +167,88 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef}, Opti
   wxe_util:call(?wxAuiNotebook_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxAuiNotebook(), Page::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauinotebook.html#wxauinotebookdeletepage">external documentation</a>.
+-spec deletePage(This, Page) -> boolean() when
+	This::wxAuiNotebook(), Page::integer().
 deletePage(#wx_ref{type=ThisT,ref=ThisRef},Page)
  when is_integer(Page) ->
   ?CLASS(ThisT,wxAuiNotebook),
   wxe_util:call(?wxAuiNotebook_DeletePage,
   <<ThisRef:32/?UI,Page:32/?UI>>).
 
-%% @spec (This::wxAuiNotebook()) -> wxAuiTabArt:wxAuiTabArt()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauinotebook.html#wxauinotebookgetartprovider">external documentation</a>.
+-spec getArtProvider(This) -> wxAuiTabArt:wxAuiTabArt() when
+	This::wxAuiNotebook().
 getArtProvider(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxAuiNotebook),
   wxe_util:call(?wxAuiNotebook_GetArtProvider,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxAuiNotebook(), Page_idx::integer()) -> wxWindow:wxWindow()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauinotebook.html#wxauinotebookgetpage">external documentation</a>.
+-spec getPage(This, Page_idx) -> wxWindow:wxWindow() when
+	This::wxAuiNotebook(), Page_idx::integer().
 getPage(#wx_ref{type=ThisT,ref=ThisRef},Page_idx)
  when is_integer(Page_idx) ->
   ?CLASS(ThisT,wxAuiNotebook),
   wxe_util:call(?wxAuiNotebook_GetPage,
   <<ThisRef:32/?UI,Page_idx:32/?UI>>).
 
-%% @spec (This::wxAuiNotebook(), Page_idx::integer()) -> wxBitmap:wxBitmap()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauinotebook.html#wxauinotebookgetpagebitmap">external documentation</a>.
+-spec getPageBitmap(This, Page_idx) -> wxBitmap:wxBitmap() when
+	This::wxAuiNotebook(), Page_idx::integer().
 getPageBitmap(#wx_ref{type=ThisT,ref=ThisRef},Page_idx)
  when is_integer(Page_idx) ->
   ?CLASS(ThisT,wxAuiNotebook),
   wxe_util:call(?wxAuiNotebook_GetPageBitmap,
   <<ThisRef:32/?UI,Page_idx:32/?UI>>).
 
-%% @spec (This::wxAuiNotebook()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauinotebook.html#wxauinotebookgetpagecount">external documentation</a>.
+-spec getPageCount(This) -> integer() when
+	This::wxAuiNotebook().
 getPageCount(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxAuiNotebook),
   wxe_util:call(?wxAuiNotebook_GetPageCount,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxAuiNotebook(), Page_wnd::wxWindow:wxWindow()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauinotebook.html#wxauinotebookgetpageindex">external documentation</a>.
+-spec getPageIndex(This, Page_wnd) -> integer() when
+	This::wxAuiNotebook(), Page_wnd::wxWindow:wxWindow().
 getPageIndex(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=Page_wndT,ref=Page_wndRef}) ->
   ?CLASS(ThisT,wxAuiNotebook),
   ?CLASS(Page_wndT,wxWindow),
   wxe_util:call(?wxAuiNotebook_GetPageIndex,
   <<ThisRef:32/?UI,Page_wndRef:32/?UI>>).
 
-%% @spec (This::wxAuiNotebook(), Page_idx::integer()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauinotebook.html#wxauinotebookgetpagetext">external documentation</a>.
+-spec getPageText(This, Page_idx) -> string() when
+	This::wxAuiNotebook(), Page_idx::integer().
 getPageText(#wx_ref{type=ThisT,ref=ThisRef},Page_idx)
  when is_integer(Page_idx) ->
   ?CLASS(ThisT,wxAuiNotebook),
   wxe_util:call(?wxAuiNotebook_GetPageText,
   <<ThisRef:32/?UI,Page_idx:32/?UI>>).
 
-%% @spec (This::wxAuiNotebook()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauinotebook.html#wxauinotebookgetselection">external documentation</a>.
+-spec getSelection(This) -> integer() when
+	This::wxAuiNotebook().
 getSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxAuiNotebook),
   wxe_util:call(?wxAuiNotebook_GetSelection,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxAuiNotebook(), Page_idx::integer(), Page::wxWindow:wxWindow(), Caption::string()) -> bool()
 %% @equiv insertPage(This,Page_idx,Page,Caption, [])
+-spec insertPage(This, Page_idx, Page, Caption) -> boolean() when
+	This::wxAuiNotebook(), Page_idx::integer(), Page::wxWindow:wxWindow(), Caption::string().
+
 insertPage(This,Page_idx,Page,Caption)
  when is_record(This, wx_ref),is_integer(Page_idx),is_record(Page, wx_ref),is_list(Caption) ->
   insertPage(This,Page_idx,Page,Caption, []).
 
-%% @spec (This::wxAuiNotebook(), Page_idx::integer(), Page::wxWindow:wxWindow(), Caption::string(), [Option]) -> bool()
-%% Option = {select, bool()} | {bitmap, wxBitmap:wxBitmap()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauinotebook.html#wxauinotebookinsertpage">external documentation</a>.
+-spec insertPage(This, Page_idx, Page, Caption, [Option]) -> boolean() when
+	This::wxAuiNotebook(), Page_idx::integer(), Page::wxWindow:wxWindow(), Caption::string(),
+	Option :: {select, boolean()}
+		 | {bitmap, wxBitmap:wxBitmap()}.
 insertPage(#wx_ref{type=ThisT,ref=ThisRef},Page_idx,#wx_ref{type=PageT,ref=PageRef},Caption, Options)
  when is_integer(Page_idx),is_list(Caption),is_list(Options) ->
   ?CLASS(ThisT,wxAuiNotebook),
@@ -231,32 +261,36 @@ insertPage(#wx_ref{type=ThisT,ref=ThisRef},Page_idx,#wx_ref{type=PageT,ref=PageR
   wxe_util:call(?wxAuiNotebook_InsertPage,
   <<ThisRef:32/?UI,Page_idx:32/?UI,PageRef:32/?UI,(byte_size(Caption_UC)):32/?UI,(Caption_UC)/binary, 0:(((8- ((0+byte_size(Caption_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxAuiNotebook(), Page::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauinotebook.html#wxauinotebookremovepage">external documentation</a>.
+-spec removePage(This, Page) -> boolean() when
+	This::wxAuiNotebook(), Page::integer().
 removePage(#wx_ref{type=ThisT,ref=ThisRef},Page)
  when is_integer(Page) ->
   ?CLASS(ThisT,wxAuiNotebook),
   wxe_util:call(?wxAuiNotebook_RemovePage,
   <<ThisRef:32/?UI,Page:32/?UI>>).
 
-%% @spec (This::wxAuiNotebook(), Art::wxAuiTabArt:wxAuiTabArt()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauinotebook.html#wxauinotebooksetartprovider">external documentation</a>.
+-spec setArtProvider(This, Art) -> ok when
+	This::wxAuiNotebook(), Art::wxAuiTabArt:wxAuiTabArt().
 setArtProvider(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ArtT,ref=ArtRef}) ->
   ?CLASS(ThisT,wxAuiNotebook),
   ?CLASS(ArtT,wxAuiTabArt),
   wxe_util:cast(?wxAuiNotebook_SetArtProvider,
   <<ThisRef:32/?UI,ArtRef:32/?UI>>).
 
-%% @spec (This::wxAuiNotebook(), Font::wxFont:wxFont()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauinotebook.html#wxauinotebooksetfont">external documentation</a>.
+-spec setFont(This, Font) -> boolean() when
+	This::wxAuiNotebook(), Font::wxFont:wxFont().
 setFont(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FontT,ref=FontRef}) ->
   ?CLASS(ThisT,wxAuiNotebook),
   ?CLASS(FontT,wxFont),
   wxe_util:call(?wxAuiNotebook_SetFont,
   <<ThisRef:32/?UI,FontRef:32/?UI>>).
 
-%% @spec (This::wxAuiNotebook(), Page::integer(), Bitmap::wxBitmap:wxBitmap()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauinotebook.html#wxauinotebooksetpagebitmap">external documentation</a>.
+-spec setPageBitmap(This, Page, Bitmap) -> boolean() when
+	This::wxAuiNotebook(), Page::integer(), Bitmap::wxBitmap:wxBitmap().
 setPageBitmap(#wx_ref{type=ThisT,ref=ThisRef},Page,#wx_ref{type=BitmapT,ref=BitmapRef})
  when is_integer(Page) ->
   ?CLASS(ThisT,wxAuiNotebook),
@@ -264,8 +298,9 @@ setPageBitmap(#wx_ref{type=ThisT,ref=ThisRef},Page,#wx_ref{type=BitmapT,ref=Bitm
   wxe_util:call(?wxAuiNotebook_SetPageBitmap,
   <<ThisRef:32/?UI,Page:32/?UI,BitmapRef:32/?UI>>).
 
-%% @spec (This::wxAuiNotebook(), Page::integer(), Text::string()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauinotebook.html#wxauinotebooksetpagetext">external documentation</a>.
+-spec setPageText(This, Page, Text) -> boolean() when
+	This::wxAuiNotebook(), Page::integer(), Text::string().
 setPageText(#wx_ref{type=ThisT,ref=ThisRef},Page,Text)
  when is_integer(Page),is_list(Text) ->
   ?CLASS(ThisT,wxAuiNotebook),
@@ -273,32 +308,35 @@ setPageText(#wx_ref{type=ThisT,ref=ThisRef},Page,Text)
   wxe_util:call(?wxAuiNotebook_SetPageText,
   <<ThisRef:32/?UI,Page:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((4+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxAuiNotebook(), New_page::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauinotebook.html#wxauinotebooksetselection">external documentation</a>.
+-spec setSelection(This, New_page) -> integer() when
+	This::wxAuiNotebook(), New_page::integer().
 setSelection(#wx_ref{type=ThisT,ref=ThisRef},New_page)
  when is_integer(New_page) ->
   ?CLASS(ThisT,wxAuiNotebook),
   wxe_util:call(?wxAuiNotebook_SetSelection,
   <<ThisRef:32/?UI,New_page:32/?UI>>).
 
-%% @spec (This::wxAuiNotebook(), Height::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauinotebook.html#wxauinotebooksettabctrlheight">external documentation</a>.
+-spec setTabCtrlHeight(This, Height) -> ok when
+	This::wxAuiNotebook(), Height::integer().
 setTabCtrlHeight(#wx_ref{type=ThisT,ref=ThisRef},Height)
  when is_integer(Height) ->
   ?CLASS(ThisT,wxAuiNotebook),
   wxe_util:cast(?wxAuiNotebook_SetTabCtrlHeight,
   <<ThisRef:32/?UI,Height:32/?UI>>).
 
-%% @spec (This::wxAuiNotebook(), Size::{W::integer(), H::integer()}) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauinotebook.html#wxauinotebooksetuniformbitmapsize">external documentation</a>.
+-spec setUniformBitmapSize(This, Size) -> ok when
+	This::wxAuiNotebook(), Size::{W::integer(), H::integer()}.
 setUniformBitmapSize(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH})
  when is_integer(SizeW),is_integer(SizeH) ->
   ?CLASS(ThisT,wxAuiNotebook),
   wxe_util:cast(?wxAuiNotebook_SetUniformBitmapSize,
   <<ThisRef:32/?UI,SizeW:32/?UI,SizeH:32/?UI>>).
 
-%% @spec (This::wxAuiNotebook()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxAuiNotebook) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxAuiNotebook),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxAuiNotebookEvent.erl b/lib/wx/src/gen/wxAuiNotebookEvent.erl
index 09a2abf214..6a86464369 100644
--- a/lib/wx/src/gen/wxAuiNotebookEvent.erl
+++ b/lib/wx/src/gen/wxAuiNotebookEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2012. 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
@@ -42,52 +42,60 @@
   isSelection/1,parent_class/1,resumePropagation/2,setInt/2,setString/2,
   shouldPropagate/1,skip/1,skip/2,stopPropagation/1,veto/1]).
 
+-export_type([wxAuiNotebookEvent/0]).
 %% @hidden
 parent_class(wxNotifyEvent) -> true;
 parent_class(wxCommandEvent) -> true;
 parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (This::wxAuiNotebookEvent(), S::integer()) -> ok
+-type wxAuiNotebookEvent() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauinotebookevent.html#wxauinotebookeventsetselection">external documentation</a>.
+-spec setSelection(This, S) -> ok when
+	This::wxAuiNotebookEvent(), S::integer().
 setSelection(#wx_ref{type=ThisT,ref=ThisRef},S)
  when is_integer(S) ->
   ?CLASS(ThisT,wxAuiNotebookEvent),
   wxe_util:cast(?wxAuiNotebookEvent_SetSelection,
   <<ThisRef:32/?UI,S:32/?UI>>).
 
-%% @spec (This::wxAuiNotebookEvent()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauinotebookevent.html#wxauinotebookeventgetselection">external documentation</a>.
+-spec getSelection(This) -> integer() when
+	This::wxAuiNotebookEvent().
 getSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxAuiNotebookEvent),
   wxe_util:call(?wxAuiNotebookEvent_GetSelection,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxAuiNotebookEvent(), S::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauinotebookevent.html#wxauinotebookeventsetoldselection">external documentation</a>.
+-spec setOldSelection(This, S) -> ok when
+	This::wxAuiNotebookEvent(), S::integer().
 setOldSelection(#wx_ref{type=ThisT,ref=ThisRef},S)
  when is_integer(S) ->
   ?CLASS(ThisT,wxAuiNotebookEvent),
   wxe_util:cast(?wxAuiNotebookEvent_SetOldSelection,
   <<ThisRef:32/?UI,S:32/?UI>>).
 
-%% @spec (This::wxAuiNotebookEvent()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauinotebookevent.html#wxauinotebookeventgetoldselection">external documentation</a>.
+-spec getOldSelection(This) -> integer() when
+	This::wxAuiNotebookEvent().
 getOldSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxAuiNotebookEvent),
   wxe_util:call(?wxAuiNotebookEvent_GetOldSelection,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxAuiNotebookEvent(), S::wxAuiNotebook:wxAuiNotebook()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauinotebookevent.html#wxauinotebookeventsetdragsource">external documentation</a>.
+-spec setDragSource(This, S) -> ok when
+	This::wxAuiNotebookEvent(), S::wxAuiNotebook:wxAuiNotebook().
 setDragSource(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ST,ref=SRef}) ->
   ?CLASS(ThisT,wxAuiNotebookEvent),
   ?CLASS(ST,wxAuiNotebook),
   wxe_util:cast(?wxAuiNotebookEvent_SetDragSource,
   <<ThisRef:32/?UI,SRef:32/?UI>>).
 
-%% @spec (This::wxAuiNotebookEvent()) -> wxAuiNotebook:wxAuiNotebook()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauinotebookevent.html#wxauinotebookeventgetdragsource">external documentation</a>.
+-spec getDragSource(This) -> wxAuiNotebook:wxAuiNotebook() when
+	This::wxAuiNotebookEvent().
 getDragSource(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxAuiNotebookEvent),
   wxe_util:call(?wxAuiNotebookEvent_GetDragSource,
diff --git a/lib/wx/src/gen/wxAuiPaneInfo.erl b/lib/wx/src/gen/wxAuiPaneInfo.erl
index b15f91c675..47e86947d4 100644
--- a/lib/wx/src/gen/wxAuiPaneInfo.erl
+++ b/lib/wx/src/gen/wxAuiPaneInfo.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -44,54 +44,63 @@
 %% inherited exports
 -export([parent_class/1]).
 
+-export_type([wxAuiPaneInfo/0]).
 %% @hidden
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxAuiPaneInfo()
+-type wxAuiPaneInfo() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfowxauipaneinfo">external documentation</a>.
+-spec new() -> wxAuiPaneInfo().
 new() ->
   wxe_util:construct(?wxAuiPaneInfo_new_0,
   <<>>).
 
-%% @spec (C::wxAuiPaneInfo()) -> wxAuiPaneInfo()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfowxauipaneinfo">external documentation</a>.
+-spec new(C) -> wxAuiPaneInfo() when
+	C::wxAuiPaneInfo().
 new(#wx_ref{type=CT,ref=CRef}) ->
   ?CLASS(CT,wxAuiPaneInfo),
   wxe_util:construct(?wxAuiPaneInfo_new_1,
   <<CRef:32/?UI>>).
 
-%% @spec (This::wxAuiPaneInfo(), Size::{W::integer(), H::integer()}) -> wxAuiPaneInfo()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfobestsize">external documentation</a>.
+-spec bestSize(This, Size) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo(), Size::{W::integer(), H::integer()}.
 bestSize(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH})
  when is_integer(SizeW),is_integer(SizeH) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
   wxe_util:call(?wxAuiPaneInfo_BestSize_1,
   <<ThisRef:32/?UI,SizeW:32/?UI,SizeH:32/?UI>>).
 
-%% @spec (This::wxAuiPaneInfo(), X::integer(), Y::integer()) -> wxAuiPaneInfo()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfobestsize">external documentation</a>.
+-spec bestSize(This, X, Y) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo(), X::integer(), Y::integer().
 bestSize(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
  when is_integer(X),is_integer(Y) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
   wxe_util:call(?wxAuiPaneInfo_BestSize_2,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI>>).
 
-%% @spec (This::wxAuiPaneInfo()) -> wxAuiPaneInfo()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfobottom">external documentation</a>.
+-spec bottom(This) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo().
 bottom(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
   wxe_util:call(?wxAuiPaneInfo_Bottom,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxAuiPaneInfo()) -> wxAuiPaneInfo()
 %% @equiv bottomDockable(This, [])
+-spec bottomDockable(This) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo().
+
 bottomDockable(This)
  when is_record(This, wx_ref) ->
   bottomDockable(This, []).
 
-%% @spec (This::wxAuiPaneInfo(), [Option]) -> wxAuiPaneInfo()
-%% Option = {b, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfobottomdockable">external documentation</a>.
+-spec bottomDockable(This, [Option]) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo(),
+	Option :: {b, boolean()}.
 bottomDockable(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
@@ -101,8 +110,9 @@ bottomDockable(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxAuiPaneInfo_BottomDockable,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxAuiPaneInfo(), C::string()) -> wxAuiPaneInfo()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfocaption">external documentation</a>.
+-spec caption(This, C) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo(), C::string().
 caption(#wx_ref{type=ThisT,ref=ThisRef},C)
  when is_list(C) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
@@ -110,15 +120,18 @@ caption(#wx_ref{type=ThisT,ref=ThisRef},C)
   wxe_util:call(?wxAuiPaneInfo_Caption,
   <<ThisRef:32/?UI,(byte_size(C_UC)):32/?UI,(C_UC)/binary, 0:(((8- ((0+byte_size(C_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxAuiPaneInfo()) -> wxAuiPaneInfo()
 %% @equiv captionVisible(This, [])
+-spec captionVisible(This) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo().
+
 captionVisible(This)
  when is_record(This, wx_ref) ->
   captionVisible(This, []).
 
-%% @spec (This::wxAuiPaneInfo(), [Option]) -> wxAuiPaneInfo()
-%% Option = {visible, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfocaptionvisible">external documentation</a>.
+-spec captionVisible(This, [Option]) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo(),
+	Option :: {visible, boolean()}.
 captionVisible(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
@@ -128,29 +141,34 @@ captionVisible(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxAuiPaneInfo_CaptionVisible,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxAuiPaneInfo()) -> wxAuiPaneInfo()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfocentre">external documentation</a>.
+-spec centre(This) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo().
 centre(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
   wxe_util:call(?wxAuiPaneInfo_Centre,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxAuiPaneInfo()) -> wxAuiPaneInfo()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfocentrepane">external documentation</a>.
+-spec centrePane(This) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo().
 centrePane(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
   wxe_util:call(?wxAuiPaneInfo_CentrePane,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxAuiPaneInfo()) -> wxAuiPaneInfo()
 %% @equiv closeButton(This, [])
+-spec closeButton(This) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo().
+
 closeButton(This)
  when is_record(This, wx_ref) ->
   closeButton(This, []).
 
-%% @spec (This::wxAuiPaneInfo(), [Option]) -> wxAuiPaneInfo()
-%% Option = {visible, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfoclosebutton">external documentation</a>.
+-spec closeButton(This, [Option]) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo(),
+	Option :: {visible, boolean()}.
 closeButton(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
@@ -160,22 +178,26 @@ closeButton(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxAuiPaneInfo_CloseButton,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxAuiPaneInfo()) -> wxAuiPaneInfo()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfodefaultpane">external documentation</a>.
+-spec defaultPane(This) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo().
 defaultPane(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
   wxe_util:call(?wxAuiPaneInfo_DefaultPane,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxAuiPaneInfo()) -> wxAuiPaneInfo()
 %% @equiv destroyOnClose(This, [])
+-spec destroyOnClose(This) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo().
+
 destroyOnClose(This)
  when is_record(This, wx_ref) ->
   destroyOnClose(This, []).
 
-%% @spec (This::wxAuiPaneInfo(), [Option]) -> wxAuiPaneInfo()
-%% Option = {b, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfodestroyonclose">external documentation</a>.
+-spec destroyOnClose(This, [Option]) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo(),
+	Option :: {b, boolean()}.
 destroyOnClose(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
@@ -185,30 +207,35 @@ destroyOnClose(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxAuiPaneInfo_DestroyOnClose,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxAuiPaneInfo(), Direction::integer()) -> wxAuiPaneInfo()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfodirection">external documentation</a>.
+-spec direction(This, Direction) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo(), Direction::integer().
 direction(#wx_ref{type=ThisT,ref=ThisRef},Direction)
  when is_integer(Direction) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
   wxe_util:call(?wxAuiPaneInfo_Direction,
   <<ThisRef:32/?UI,Direction:32/?UI>>).
 
-%% @spec (This::wxAuiPaneInfo()) -> wxAuiPaneInfo()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfodock">external documentation</a>.
+-spec dock(This) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo().
 dock(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
   wxe_util:call(?wxAuiPaneInfo_Dock,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxAuiPaneInfo()) -> wxAuiPaneInfo()
 %% @equiv dockable(This, [])
+-spec dockable(This) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo().
+
 dockable(This)
  when is_record(This, wx_ref) ->
   dockable(This, []).
 
-%% @spec (This::wxAuiPaneInfo(), [Option]) -> wxAuiPaneInfo()
-%% Option = {b, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfodockable">external documentation</a>.
+-spec dockable(This, [Option]) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo(),
+	Option :: {b, boolean()}.
 dockable(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
@@ -218,29 +245,34 @@ dockable(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxAuiPaneInfo_Dockable,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxAuiPaneInfo()) -> wxAuiPaneInfo()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfofixed">external documentation</a>.
+-spec fixed(This) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo().
 fixed(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
   wxe_util:call(?wxAuiPaneInfo_Fixed,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxAuiPaneInfo()) -> wxAuiPaneInfo()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfofloat">external documentation</a>.
+-spec float(This) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo().
 float(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
   wxe_util:call(?wxAuiPaneInfo_Float,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxAuiPaneInfo()) -> wxAuiPaneInfo()
 %% @equiv floatable(This, [])
+-spec floatable(This) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo().
+
 floatable(This)
  when is_record(This, wx_ref) ->
   floatable(This, []).
 
-%% @spec (This::wxAuiPaneInfo(), [Option]) -> wxAuiPaneInfo()
-%% Option = {b, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfofloatable">external documentation</a>.
+-spec floatable(This, [Option]) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo(),
+	Option :: {b, boolean()}.
 floatable(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
@@ -250,47 +282,54 @@ floatable(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxAuiPaneInfo_Floatable,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxAuiPaneInfo(), Pos::{X::integer(), Y::integer()}) -> wxAuiPaneInfo()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfofloatingposition">external documentation</a>.
+-spec floatingPosition(This, Pos) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo(), Pos::{X::integer(), Y::integer()}.
 floatingPosition(#wx_ref{type=ThisT,ref=ThisRef},{PosX,PosY})
  when is_integer(PosX),is_integer(PosY) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
   wxe_util:call(?wxAuiPaneInfo_FloatingPosition_1,
   <<ThisRef:32/?UI,PosX:32/?UI,PosY:32/?UI>>).
 
-%% @spec (This::wxAuiPaneInfo(), X::integer(), Y::integer()) -> wxAuiPaneInfo()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfofloatingposition">external documentation</a>.
+-spec floatingPosition(This, X, Y) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo(), X::integer(), Y::integer().
 floatingPosition(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
  when is_integer(X),is_integer(Y) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
   wxe_util:call(?wxAuiPaneInfo_FloatingPosition_2,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI>>).
 
-%% @spec (This::wxAuiPaneInfo(), Size::{W::integer(), H::integer()}) -> wxAuiPaneInfo()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfofloatingsize">external documentation</a>.
+-spec floatingSize(This, Size) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo(), Size::{W::integer(), H::integer()}.
 floatingSize(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH})
  when is_integer(SizeW),is_integer(SizeH) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
   wxe_util:call(?wxAuiPaneInfo_FloatingSize_1,
   <<ThisRef:32/?UI,SizeW:32/?UI,SizeH:32/?UI>>).
 
-%% @spec (This::wxAuiPaneInfo(), X::integer(), Y::integer()) -> wxAuiPaneInfo()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfofloatingsize">external documentation</a>.
+-spec floatingSize(This, X, Y) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo(), X::integer(), Y::integer().
 floatingSize(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
  when is_integer(X),is_integer(Y) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
   wxe_util:call(?wxAuiPaneInfo_FloatingSize_2,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI>>).
 
-%% @spec (This::wxAuiPaneInfo()) -> wxAuiPaneInfo()
 %% @equiv gripper(This, [])
+-spec gripper(This) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo().
+
 gripper(This)
  when is_record(This, wx_ref) ->
   gripper(This, []).
 
-%% @spec (This::wxAuiPaneInfo(), [Option]) -> wxAuiPaneInfo()
-%% Option = {visible, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfogripper">external documentation</a>.
+-spec gripper(This, [Option]) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo(),
+	Option :: {visible, boolean()}.
 gripper(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
@@ -300,15 +339,18 @@ gripper(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxAuiPaneInfo_Gripper,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxAuiPaneInfo()) -> wxAuiPaneInfo()
 %% @equiv gripperTop(This, [])
+-spec gripperTop(This) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo().
+
 gripperTop(This)
  when is_record(This, wx_ref) ->
   gripperTop(This, []).
 
-%% @spec (This::wxAuiPaneInfo(), [Option]) -> wxAuiPaneInfo()
-%% Option = {attop, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfogrippertop">external documentation</a>.
+-spec gripperTop(This, [Option]) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo(),
+	Option :: {attop, boolean()}.
 gripperTop(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
@@ -318,192 +360,220 @@ gripperTop(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxAuiPaneInfo_GripperTop,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxAuiPaneInfo()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfohasborder">external documentation</a>.
+-spec hasBorder(This) -> boolean() when
+	This::wxAuiPaneInfo().
 hasBorder(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
   wxe_util:call(?wxAuiPaneInfo_HasBorder,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxAuiPaneInfo()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfohascaption">external documentation</a>.
+-spec hasCaption(This) -> boolean() when
+	This::wxAuiPaneInfo().
 hasCaption(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
   wxe_util:call(?wxAuiPaneInfo_HasCaption,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxAuiPaneInfo()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfohasclosebutton">external documentation</a>.
+-spec hasCloseButton(This) -> boolean() when
+	This::wxAuiPaneInfo().
 hasCloseButton(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
   wxe_util:call(?wxAuiPaneInfo_HasCloseButton,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxAuiPaneInfo(), Flag::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfohasflag">external documentation</a>.
+-spec hasFlag(This, Flag) -> boolean() when
+	This::wxAuiPaneInfo(), Flag::integer().
 hasFlag(#wx_ref{type=ThisT,ref=ThisRef},Flag)
  when is_integer(Flag) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
   wxe_util:call(?wxAuiPaneInfo_HasFlag,
   <<ThisRef:32/?UI,Flag:32/?UI>>).
 
-%% @spec (This::wxAuiPaneInfo()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfohasgripper">external documentation</a>.
+-spec hasGripper(This) -> boolean() when
+	This::wxAuiPaneInfo().
 hasGripper(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
   wxe_util:call(?wxAuiPaneInfo_HasGripper,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxAuiPaneInfo()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfohasgrippertop">external documentation</a>.
+-spec hasGripperTop(This) -> boolean() when
+	This::wxAuiPaneInfo().
 hasGripperTop(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
   wxe_util:call(?wxAuiPaneInfo_HasGripperTop,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxAuiPaneInfo()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfohasmaximizebutton">external documentation</a>.
+-spec hasMaximizeButton(This) -> boolean() when
+	This::wxAuiPaneInfo().
 hasMaximizeButton(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
   wxe_util:call(?wxAuiPaneInfo_HasMaximizeButton,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxAuiPaneInfo()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfohasminimizebutton">external documentation</a>.
+-spec hasMinimizeButton(This) -> boolean() when
+	This::wxAuiPaneInfo().
 hasMinimizeButton(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
   wxe_util:call(?wxAuiPaneInfo_HasMinimizeButton,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxAuiPaneInfo()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfohaspinbutton">external documentation</a>.
+-spec hasPinButton(This) -> boolean() when
+	This::wxAuiPaneInfo().
 hasPinButton(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
   wxe_util:call(?wxAuiPaneInfo_HasPinButton,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxAuiPaneInfo()) -> wxAuiPaneInfo()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfohide">external documentation</a>.
+-spec hide(This) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo().
 hide(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
   wxe_util:call(?wxAuiPaneInfo_Hide,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxAuiPaneInfo()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfoisbottomdockable">external documentation</a>.
+-spec isBottomDockable(This) -> boolean() when
+	This::wxAuiPaneInfo().
 isBottomDockable(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
   wxe_util:call(?wxAuiPaneInfo_IsBottomDockable,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxAuiPaneInfo()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfoisdocked">external documentation</a>.
+-spec isDocked(This) -> boolean() when
+	This::wxAuiPaneInfo().
 isDocked(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
   wxe_util:call(?wxAuiPaneInfo_IsDocked,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxAuiPaneInfo()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfoisfixed">external documentation</a>.
+-spec isFixed(This) -> boolean() when
+	This::wxAuiPaneInfo().
 isFixed(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
   wxe_util:call(?wxAuiPaneInfo_IsFixed,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxAuiPaneInfo()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfoisfloatable">external documentation</a>.
+-spec isFloatable(This) -> boolean() when
+	This::wxAuiPaneInfo().
 isFloatable(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
   wxe_util:call(?wxAuiPaneInfo_IsFloatable,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxAuiPaneInfo()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfoisfloating">external documentation</a>.
+-spec isFloating(This) -> boolean() when
+	This::wxAuiPaneInfo().
 isFloating(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
   wxe_util:call(?wxAuiPaneInfo_IsFloating,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxAuiPaneInfo()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfoisleftdockable">external documentation</a>.
+-spec isLeftDockable(This) -> boolean() when
+	This::wxAuiPaneInfo().
 isLeftDockable(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
   wxe_util:call(?wxAuiPaneInfo_IsLeftDockable,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxAuiPaneInfo()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfoismovable">external documentation</a>.
+-spec isMovable(This) -> boolean() when
+	This::wxAuiPaneInfo().
 isMovable(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
   wxe_util:call(?wxAuiPaneInfo_IsMovable,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxAuiPaneInfo()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfoisok">external documentation</a>.
+-spec isOk(This) -> boolean() when
+	This::wxAuiPaneInfo().
 isOk(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
   wxe_util:call(?wxAuiPaneInfo_IsOk,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxAuiPaneInfo()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfoisresizable">external documentation</a>.
+-spec isResizable(This) -> boolean() when
+	This::wxAuiPaneInfo().
 isResizable(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
   wxe_util:call(?wxAuiPaneInfo_IsResizable,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxAuiPaneInfo()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfoisrightdockable">external documentation</a>.
+-spec isRightDockable(This) -> boolean() when
+	This::wxAuiPaneInfo().
 isRightDockable(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
   wxe_util:call(?wxAuiPaneInfo_IsRightDockable,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxAuiPaneInfo()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfoisshown">external documentation</a>.
+-spec isShown(This) -> boolean() when
+	This::wxAuiPaneInfo().
 isShown(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
   wxe_util:call(?wxAuiPaneInfo_IsShown,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxAuiPaneInfo()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfoistoolbar">external documentation</a>.
+-spec isToolbar(This) -> boolean() when
+	This::wxAuiPaneInfo().
 isToolbar(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
   wxe_util:call(?wxAuiPaneInfo_IsToolbar,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxAuiPaneInfo()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfoistopdockable">external documentation</a>.
+-spec isTopDockable(This) -> boolean() when
+	This::wxAuiPaneInfo().
 isTopDockable(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
   wxe_util:call(?wxAuiPaneInfo_IsTopDockable,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxAuiPaneInfo(), Layer::integer()) -> wxAuiPaneInfo()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfolayer">external documentation</a>.
+-spec layer(This, Layer) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo(), Layer::integer().
 layer(#wx_ref{type=ThisT,ref=ThisRef},Layer)
  when is_integer(Layer) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
   wxe_util:call(?wxAuiPaneInfo_Layer,
   <<ThisRef:32/?UI,Layer:32/?UI>>).
 
-%% @spec (This::wxAuiPaneInfo()) -> wxAuiPaneInfo()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfoleft">external documentation</a>.
+-spec left(This) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo().
 left(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
   wxe_util:call(?wxAuiPaneInfo_Left,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxAuiPaneInfo()) -> wxAuiPaneInfo()
 %% @equiv leftDockable(This, [])
+-spec leftDockable(This) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo().
+
 leftDockable(This)
  when is_record(This, wx_ref) ->
   leftDockable(This, []).
 
-%% @spec (This::wxAuiPaneInfo(), [Option]) -> wxAuiPaneInfo()
-%% Option = {b, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfoleftdockable">external documentation</a>.
+-spec leftDockable(This, [Option]) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo(),
+	Option :: {b, boolean()}.
 leftDockable(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
@@ -513,31 +583,36 @@ leftDockable(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxAuiPaneInfo_LeftDockable,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxAuiPaneInfo(), Size::{W::integer(), H::integer()}) -> wxAuiPaneInfo()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfomaxsize">external documentation</a>.
+-spec maxSize(This, Size) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo(), Size::{W::integer(), H::integer()}.
 maxSize(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH})
  when is_integer(SizeW),is_integer(SizeH) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
   wxe_util:call(?wxAuiPaneInfo_MaxSize_1,
   <<ThisRef:32/?UI,SizeW:32/?UI,SizeH:32/?UI>>).
 
-%% @spec (This::wxAuiPaneInfo(), X::integer(), Y::integer()) -> wxAuiPaneInfo()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfomaxsize">external documentation</a>.
+-spec maxSize(This, X, Y) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo(), X::integer(), Y::integer().
 maxSize(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
  when is_integer(X),is_integer(Y) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
   wxe_util:call(?wxAuiPaneInfo_MaxSize_2,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI>>).
 
-%% @spec (This::wxAuiPaneInfo()) -> wxAuiPaneInfo()
 %% @equiv maximizeButton(This, [])
+-spec maximizeButton(This) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo().
+
 maximizeButton(This)
  when is_record(This, wx_ref) ->
   maximizeButton(This, []).
 
-%% @spec (This::wxAuiPaneInfo(), [Option]) -> wxAuiPaneInfo()
-%% Option = {visible, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfomaximizebutton">external documentation</a>.
+-spec maximizeButton(This, [Option]) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo(),
+	Option :: {visible, boolean()}.
 maximizeButton(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
@@ -547,31 +622,36 @@ maximizeButton(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxAuiPaneInfo_MaximizeButton,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxAuiPaneInfo(), Size::{W::integer(), H::integer()}) -> wxAuiPaneInfo()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfominsize">external documentation</a>.
+-spec minSize(This, Size) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo(), Size::{W::integer(), H::integer()}.
 minSize(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH})
  when is_integer(SizeW),is_integer(SizeH) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
   wxe_util:call(?wxAuiPaneInfo_MinSize_1,
   <<ThisRef:32/?UI,SizeW:32/?UI,SizeH:32/?UI>>).
 
-%% @spec (This::wxAuiPaneInfo(), X::integer(), Y::integer()) -> wxAuiPaneInfo()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfominsize">external documentation</a>.
+-spec minSize(This, X, Y) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo(), X::integer(), Y::integer().
 minSize(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
  when is_integer(X),is_integer(Y) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
   wxe_util:call(?wxAuiPaneInfo_MinSize_2,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI>>).
 
-%% @spec (This::wxAuiPaneInfo()) -> wxAuiPaneInfo()
 %% @equiv minimizeButton(This, [])
+-spec minimizeButton(This) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo().
+
 minimizeButton(This)
  when is_record(This, wx_ref) ->
   minimizeButton(This, []).
 
-%% @spec (This::wxAuiPaneInfo(), [Option]) -> wxAuiPaneInfo()
-%% Option = {visible, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfominimizebutton">external documentation</a>.
+-spec minimizeButton(This, [Option]) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo(),
+	Option :: {visible, boolean()}.
 minimizeButton(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
@@ -581,15 +661,18 @@ minimizeButton(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxAuiPaneInfo_MinimizeButton,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxAuiPaneInfo()) -> wxAuiPaneInfo()
 %% @equiv movable(This, [])
+-spec movable(This) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo().
+
 movable(This)
  when is_record(This, wx_ref) ->
   movable(This, []).
 
-%% @spec (This::wxAuiPaneInfo(), [Option]) -> wxAuiPaneInfo()
-%% Option = {b, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfomovable">external documentation</a>.
+-spec movable(This, [Option]) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo(),
+	Option :: {b, boolean()}.
 movable(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
@@ -599,8 +682,9 @@ movable(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxAuiPaneInfo_Movable,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxAuiPaneInfo(), N::string()) -> wxAuiPaneInfo()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfoname">external documentation</a>.
+-spec name(This, N) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo(), N::string().
 name(#wx_ref{type=ThisT,ref=ThisRef},N)
  when is_list(N) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
@@ -608,15 +692,18 @@ name(#wx_ref{type=ThisT,ref=ThisRef},N)
   wxe_util:call(?wxAuiPaneInfo_Name,
   <<ThisRef:32/?UI,(byte_size(N_UC)):32/?UI,(N_UC)/binary, 0:(((8- ((0+byte_size(N_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxAuiPaneInfo()) -> wxAuiPaneInfo()
 %% @equiv paneBorder(This, [])
+-spec paneBorder(This) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo().
+
 paneBorder(This)
  when is_record(This, wx_ref) ->
   paneBorder(This, []).
 
-%% @spec (This::wxAuiPaneInfo(), [Option]) -> wxAuiPaneInfo()
-%% Option = {visible, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfopaneborder">external documentation</a>.
+-spec paneBorder(This, [Option]) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo(),
+	Option :: {visible, boolean()}.
 paneBorder(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
@@ -626,15 +713,18 @@ paneBorder(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxAuiPaneInfo_PaneBorder,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxAuiPaneInfo()) -> wxAuiPaneInfo()
 %% @equiv pinButton(This, [])
+-spec pinButton(This) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo().
+
 pinButton(This)
  when is_record(This, wx_ref) ->
   pinButton(This, []).
 
-%% @spec (This::wxAuiPaneInfo(), [Option]) -> wxAuiPaneInfo()
-%% Option = {visible, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfopinbutton">external documentation</a>.
+-spec pinButton(This, [Option]) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo(),
+	Option :: {visible, boolean()}.
 pinButton(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
@@ -644,23 +734,27 @@ pinButton(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxAuiPaneInfo_PinButton,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxAuiPaneInfo(), Pos::integer()) -> wxAuiPaneInfo()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfoposition">external documentation</a>.
+-spec position(This, Pos) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo(), Pos::integer().
 position(#wx_ref{type=ThisT,ref=ThisRef},Pos)
  when is_integer(Pos) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
   wxe_util:call(?wxAuiPaneInfo_Position,
   <<ThisRef:32/?UI,Pos:32/?UI>>).
 
-%% @spec (This::wxAuiPaneInfo()) -> wxAuiPaneInfo()
 %% @equiv resizable(This, [])
+-spec resizable(This) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo().
+
 resizable(This)
  when is_record(This, wx_ref) ->
   resizable(This, []).
 
-%% @spec (This::wxAuiPaneInfo(), [Option]) -> wxAuiPaneInfo()
-%% Option = {resizable, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinforesizable">external documentation</a>.
+-spec resizable(This, [Option]) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo(),
+	Option :: {resizable, boolean()}.
 resizable(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
@@ -670,22 +764,26 @@ resizable(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxAuiPaneInfo_Resizable,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxAuiPaneInfo()) -> wxAuiPaneInfo()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinforight">external documentation</a>.
+-spec right(This) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo().
 right(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
   wxe_util:call(?wxAuiPaneInfo_Right,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxAuiPaneInfo()) -> wxAuiPaneInfo()
 %% @equiv rightDockable(This, [])
+-spec rightDockable(This) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo().
+
 rightDockable(This)
  when is_record(This, wx_ref) ->
   rightDockable(This, []).
 
-%% @spec (This::wxAuiPaneInfo(), [Option]) -> wxAuiPaneInfo()
-%% Option = {b, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinforightdockable">external documentation</a>.
+-spec rightDockable(This, [Option]) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo(),
+	Option :: {b, boolean()}.
 rightDockable(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
@@ -695,39 +793,45 @@ rightDockable(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxAuiPaneInfo_RightDockable,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxAuiPaneInfo(), Row::integer()) -> wxAuiPaneInfo()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinforow">external documentation</a>.
+-spec row(This, Row) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo(), Row::integer().
 row(#wx_ref{type=ThisT,ref=ThisRef},Row)
  when is_integer(Row) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
   wxe_util:call(?wxAuiPaneInfo_Row,
   <<ThisRef:32/?UI,Row:32/?UI>>).
 
-%% @spec (This::wxAuiPaneInfo(), Source::wxAuiPaneInfo()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfosafeset">external documentation</a>.
+-spec safeSet(This, Source) -> ok when
+	This::wxAuiPaneInfo(), Source::wxAuiPaneInfo().
 safeSet(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=SourceT,ref=SourceRef}) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
   ?CLASS(SourceT,wxAuiPaneInfo),
   wxe_util:cast(?wxAuiPaneInfo_SafeSet,
   <<ThisRef:32/?UI,SourceRef:32/?UI>>).
 
-%% @spec (This::wxAuiPaneInfo(), Flag::integer(), Option_state::bool()) -> wxAuiPaneInfo()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfosetflag">external documentation</a>.
+-spec setFlag(This, Flag, Option_state) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo(), Flag::integer(), Option_state::boolean().
 setFlag(#wx_ref{type=ThisT,ref=ThisRef},Flag,Option_state)
  when is_integer(Flag),is_boolean(Option_state) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
   wxe_util:call(?wxAuiPaneInfo_SetFlag,
   <<ThisRef:32/?UI,Flag:32/?UI,(wxe_util:from_bool(Option_state)):32/?UI>>).
 
-%% @spec (This::wxAuiPaneInfo()) -> wxAuiPaneInfo()
 %% @equiv show(This, [])
+-spec show(This) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo().
+
 show(This)
  when is_record(This, wx_ref) ->
   show(This, []).
 
-%% @spec (This::wxAuiPaneInfo(), [Option]) -> wxAuiPaneInfo()
-%% Option = {show, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfoshow">external documentation</a>.
+-spec show(This, [Option]) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo(),
+	Option :: {show, boolean()}.
 show(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
@@ -737,29 +841,34 @@ show(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxAuiPaneInfo_Show,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxAuiPaneInfo()) -> wxAuiPaneInfo()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfotoolbarpane">external documentation</a>.
+-spec toolbarPane(This) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo().
 toolbarPane(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
   wxe_util:call(?wxAuiPaneInfo_ToolbarPane,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxAuiPaneInfo()) -> wxAuiPaneInfo()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfotop">external documentation</a>.
+-spec top(This) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo().
 top(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
   wxe_util:call(?wxAuiPaneInfo_Top,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxAuiPaneInfo()) -> wxAuiPaneInfo()
 %% @equiv topDockable(This, [])
+-spec topDockable(This) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo().
+
 topDockable(This)
  when is_record(This, wx_ref) ->
   topDockable(This, []).
 
-%% @spec (This::wxAuiPaneInfo(), [Option]) -> wxAuiPaneInfo()
-%% Option = {b, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfotopdockable">external documentation</a>.
+-spec topDockable(This, [Option]) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo(),
+	Option :: {b, boolean()}.
 topDockable(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
@@ -769,16 +878,17 @@ topDockable(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxAuiPaneInfo_TopDockable,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxAuiPaneInfo(), W::wxWindow:wxWindow()) -> wxAuiPaneInfo()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfowindow">external documentation</a>.
+-spec window(This, W) -> wxAuiPaneInfo() when
+	This::wxAuiPaneInfo(), W::wxWindow:wxWindow().
 window(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WT,ref=WRef}) ->
   ?CLASS(ThisT,wxAuiPaneInfo),
   ?CLASS(WT,wxWindow),
   wxe_util:call(?wxAuiPaneInfo_Window,
   <<ThisRef:32/?UI,WRef:32/?UI>>).
 
-%% @spec (This::wxAuiPaneInfo()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxAuiPaneInfo) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxAuiPaneInfo),
   wxe_util:destroy(?wxAuiPaneInfo_destruct,Obj),
diff --git a/lib/wx/src/gen/wxAuiTabArt.erl b/lib/wx/src/gen/wxAuiTabArt.erl
index 725bac9664..a65c6dc8cf 100644
--- a/lib/wx/src/gen/wxAuiTabArt.erl
+++ b/lib/wx/src/gen/wxAuiTabArt.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -29,6 +29,8 @@
 %% inherited exports
 -export([parent_class/1]).
 
+-export_type([wxAuiTabArt/0]).
 %% @hidden
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
+-type wxAuiTabArt() :: wx:wx_object().
diff --git a/lib/wx/src/gen/wxBitmap.erl b/lib/wx/src/gen/wxBitmap.erl
index bd2f83c6eb..ac16700011 100644
--- a/lib/wx/src/gen/wxBitmap.erl
+++ b/lib/wx/src/gen/wxBitmap.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -32,22 +32,22 @@
 %% inherited exports
 -export([parent_class/1]).
 
+-export_type([wxBitmap/0]).
 %% @hidden
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxBitmap()
+-type wxBitmap() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmap.html#wxbitmapwxbitmap">external documentation</a>.
+-spec new() -> wxBitmap().
 new() ->
   wxe_util:construct(?wxBitmap_new_0,
   <<>>).
 
-%% @spec (X::string()|term()) -> wxBitmap()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmap.html#wxbitmapwxbitmap">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% new(Filename::string()) -> new(Filename, []) </c></p>
-%% <p><c>
-%% new(Image::wxImage:wxImage()) -> new(Image, []) </c></p>
+-spec new(Filename) -> wxBitmap() when
+	Filename::string();
+      (Image) -> wxBitmap() when
+	Image::wxImage:wxImage().
 
 new(Filename)
  when is_list(Filename) ->
@@ -57,21 +57,15 @@ new(Image)
  when is_record(Image, wx_ref) ->
   new(Image, []).
 
-%% @spec (X::integer()|string()|term(),X::integer()|term()) -> wxBitmap()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmap.html#wxbitmapwxbitmap">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% new(Width::integer(), Height::integer()) -> new(Width,Height, []) </c></p>
-%% <p><c>
-%% new(Filename::string(), [Option]) -> wxBitmap() </c>
-%%<br /> Option = {type, WxBitmapType}
-%%<br /> WxBitmapType = integer()
-%%<br /> WxBitmapType is one of ?wxBITMAP_TYPE_INVALID | ?wxBITMAP_TYPE_BMP | ?wxBITMAP_TYPE_BMP_RESOURCE | ?wxBITMAP_TYPE_RESOURCE | ?wxBITMAP_TYPE_ICO | ?wxBITMAP_TYPE_ICO_RESOURCE | ?wxBITMAP_TYPE_CUR | ?wxBITMAP_TYPE_CUR_RESOURCE | ?wxBITMAP_TYPE_XBM | ?wxBITMAP_TYPE_XBM_DATA | ?wxBITMAP_TYPE_XPM | ?wxBITMAP_TYPE_XPM_DATA | ?wxBITMAP_TYPE_TIF | ?wxBITMAP_TYPE_TIF_RESOURCE | ?wxBITMAP_TYPE_GIF | ?wxBITMAP_TYPE_GIF_RESOURCE | ?wxBITMAP_TYPE_PNG | ?wxBITMAP_TYPE_PNG_RESOURCE | ?wxBITMAP_TYPE_JPEG | ?wxBITMAP_TYPE_JPEG_RESOURCE | ?wxBITMAP_TYPE_PNM | ?wxBITMAP_TYPE_PNM_RESOURCE | ?wxBITMAP_TYPE_PCX | ?wxBITMAP_TYPE_PCX_RESOURCE | ?wxBITMAP_TYPE_PICT | ?wxBITMAP_TYPE_PICT_RESOURCE | ?wxBITMAP_TYPE_ICON | ?wxBITMAP_TYPE_ICON_RESOURCE | ?wxBITMAP_TYPE_ANI | ?wxBITMAP_TYPE_IFF | ?wxBITMAP_TYPE_TGA | ?wxBITMAP_TYPE_MACCURSOR | ?wxBITMAP_TYPE_MACCURSOR_RESOURCE | ?wxBITMAP_TYPE_ANY
-%% </p>
-%% <p><c>
-%% new(Image::wxImage:wxImage(), [Option]) -> wxBitmap() </c>
-%%<br /> Option = {depth, integer()}
-%% </p>
+-spec new(Width, Height) -> wxBitmap() when
+	Width::integer(), Height::integer();
+      (Filename, [Option]) -> wxBitmap() when
+	Filename::string(),
+	Option :: {type, wx:wx_enum()};
+      (Image, [Option]) -> wxBitmap() when
+	Image::wxImage:wxImage(),
+	Option :: {depth, integer()}.
 
 new(Width,Height)
  when is_integer(Width),is_integer(Height) ->
@@ -93,15 +87,12 @@ new(#wx_ref{type=ImageT,ref=ImageRef}, Options)
   wxe_util:construct(?wxBitmap_new_2_1,
   <<ImageRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (X::binary()|integer(),X::integer(),X::integer()|term()) -> wxBitmap()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmap.html#wxbitmapwxbitmap">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% new(Bits::binary(), Width::integer(), Height::integer()) -> new(Bits,Width,Height, []) </c></p>
-%% <p><c>
-%% new(Width::integer(), Height::integer(), [Option]) -> wxBitmap() </c>
-%%<br /> Option = {depth, integer()}
-%% </p>
+-spec new(Bits, Width, Height) -> wxBitmap() when
+	Bits::binary(), Width::integer(), Height::integer();
+      (Width, Height, [Option]) -> wxBitmap() when
+	Width::integer(), Height::integer(),
+	Option :: {depth, integer()}.
 
 new(Bits,Width,Height)
  when is_binary(Bits),is_integer(Width),is_integer(Height) ->
@@ -114,9 +105,10 @@ new(Width,Height, Options)
   wxe_util:construct(?wxBitmap_new_3,
   <<Width:32/?UI,Height:32/?UI, BinOpt/binary>>).
 
-%% @spec (Bits::binary(), Width::integer(), Height::integer(), [Option]) -> wxBitmap()
-%% Option = {depth, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmap.html#wxbitmapwxbitmap">external documentation</a>.
+-spec new(Bits, Width, Height, [Option]) -> wxBitmap() when
+	Bits::binary(), Width::integer(), Height::integer(),
+	Option :: {depth, integer()}.
 new(Bits,Width,Height, Options)
  when is_binary(Bits),is_integer(Width),is_integer(Height),is_list(Options) ->
   wxe_util:send_bin(Bits),
@@ -126,30 +118,35 @@ new(Bits,Width,Height, Options)
   wxe_util:construct(?wxBitmap_new_4,
   <<Width:32/?UI,Height:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxBitmap()) -> wxImage:wxImage()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmap.html#wxbitmapconverttoimage">external documentation</a>.
+-spec convertToImage(This) -> wxImage:wxImage() when
+	This::wxBitmap().
 convertToImage(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxBitmap),
   wxe_util:call(?wxBitmap_ConvertToImage,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxBitmap(), Icon::wxIcon:wxIcon()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmap.html#wxbitmapcopyfromicon">external documentation</a>.
+-spec copyFromIcon(This, Icon) -> boolean() when
+	This::wxBitmap(), Icon::wxIcon:wxIcon().
 copyFromIcon(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=IconT,ref=IconRef}) ->
   ?CLASS(ThisT,wxBitmap),
   ?CLASS(IconT,wxIcon),
   wxe_util:call(?wxBitmap_CopyFromIcon,
   <<ThisRef:32/?UI,IconRef:32/?UI>>).
 
-%% @spec (This::wxBitmap(), Width::integer(), Height::integer()) -> bool()
 %% @equiv create(This,Width,Height, [])
+-spec create(This, Width, Height) -> boolean() when
+	This::wxBitmap(), Width::integer(), Height::integer().
+
 create(This,Width,Height)
  when is_record(This, wx_ref),is_integer(Width),is_integer(Height) ->
   create(This,Width,Height, []).
 
-%% @spec (This::wxBitmap(), Width::integer(), Height::integer(), [Option]) -> bool()
-%% Option = {depth, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmap.html#wxbitmapcreate">external documentation</a>.
+-spec create(This, Width, Height, [Option]) -> boolean() when
+	This::wxBitmap(), Width::integer(), Height::integer(),
+	Option :: {depth, integer()}.
 create(#wx_ref{type=ThisT,ref=ThisRef},Width,Height, Options)
  when is_integer(Width),is_integer(Height),is_list(Options) ->
   ?CLASS(ThisT,wxBitmap),
@@ -159,60 +156,68 @@ create(#wx_ref{type=ThisT,ref=ThisRef},Width,Height, Options)
   wxe_util:call(?wxBitmap_Create,
   <<ThisRef:32/?UI,Width:32/?UI,Height:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxBitmap()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmap.html#wxbitmapgetdepth">external documentation</a>.
+-spec getDepth(This) -> integer() when
+	This::wxBitmap().
 getDepth(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxBitmap),
   wxe_util:call(?wxBitmap_GetDepth,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxBitmap()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmap.html#wxbitmapgetheight">external documentation</a>.
+-spec getHeight(This) -> integer() when
+	This::wxBitmap().
 getHeight(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxBitmap),
   wxe_util:call(?wxBitmap_GetHeight,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxBitmap()) -> wxPalette:wxPalette()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmap.html#wxbitmapgetpalette">external documentation</a>.
+-spec getPalette(This) -> wxPalette:wxPalette() when
+	This::wxBitmap().
 getPalette(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxBitmap),
   wxe_util:call(?wxBitmap_GetPalette,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxBitmap()) -> wxMask:wxMask()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmap.html#wxbitmapgetmask">external documentation</a>.
+-spec getMask(This) -> wxMask:wxMask() when
+	This::wxBitmap().
 getMask(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxBitmap),
   wxe_util:call(?wxBitmap_GetMask,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxBitmap()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmap.html#wxbitmapgetwidth">external documentation</a>.
+-spec getWidth(This) -> integer() when
+	This::wxBitmap().
 getWidth(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxBitmap),
   wxe_util:call(?wxBitmap_GetWidth,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxBitmap(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}) -> wxBitmap()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmap.html#wxbitmapgetsubbitmap">external documentation</a>.
+-spec getSubBitmap(This, Rect) -> wxBitmap() when
+	This::wxBitmap(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}.
 getSubBitmap(#wx_ref{type=ThisT,ref=ThisRef},{RectX,RectY,RectW,RectH})
  when is_integer(RectX),is_integer(RectY),is_integer(RectW),is_integer(RectH) ->
   ?CLASS(ThisT,wxBitmap),
   wxe_util:call(?wxBitmap_GetSubBitmap,
   <<ThisRef:32/?UI,RectX:32/?UI,RectY:32/?UI,RectW:32/?UI,RectH:32/?UI>>).
 
-%% @spec (This::wxBitmap(), Name::string()) -> bool()
 %% @equiv loadFile(This,Name, [])
+-spec loadFile(This, Name) -> boolean() when
+	This::wxBitmap(), Name::string().
+
 loadFile(This,Name)
  when is_record(This, wx_ref),is_list(Name) ->
   loadFile(This,Name, []).
 
-%% @spec (This::wxBitmap(), Name::string(), [Option]) -> bool()
-%% Option = {type, WxBitmapType}
-%% WxBitmapType = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmap.html#wxbitmaploadfile">external documentation</a>.
-%%<br /> WxBitmapType is one of ?wxBITMAP_TYPE_INVALID | ?wxBITMAP_TYPE_BMP | ?wxBITMAP_TYPE_BMP_RESOURCE | ?wxBITMAP_TYPE_RESOURCE | ?wxBITMAP_TYPE_ICO | ?wxBITMAP_TYPE_ICO_RESOURCE | ?wxBITMAP_TYPE_CUR | ?wxBITMAP_TYPE_CUR_RESOURCE | ?wxBITMAP_TYPE_XBM | ?wxBITMAP_TYPE_XBM_DATA | ?wxBITMAP_TYPE_XPM | ?wxBITMAP_TYPE_XPM_DATA | ?wxBITMAP_TYPE_TIF | ?wxBITMAP_TYPE_TIF_RESOURCE | ?wxBITMAP_TYPE_GIF | ?wxBITMAP_TYPE_GIF_RESOURCE | ?wxBITMAP_TYPE_PNG | ?wxBITMAP_TYPE_PNG_RESOURCE | ?wxBITMAP_TYPE_JPEG | ?wxBITMAP_TYPE_JPEG_RESOURCE | ?wxBITMAP_TYPE_PNM | ?wxBITMAP_TYPE_PNM_RESOURCE | ?wxBITMAP_TYPE_PCX | ?wxBITMAP_TYPE_PCX_RESOURCE | ?wxBITMAP_TYPE_PICT | ?wxBITMAP_TYPE_PICT_RESOURCE | ?wxBITMAP_TYPE_ICON | ?wxBITMAP_TYPE_ICON_RESOURCE | ?wxBITMAP_TYPE_ANI | ?wxBITMAP_TYPE_IFF | ?wxBITMAP_TYPE_TGA | ?wxBITMAP_TYPE_MACCURSOR | ?wxBITMAP_TYPE_MACCURSOR_RESOURCE | ?wxBITMAP_TYPE_ANY
+%%<br /> Type = ?wxBITMAP_TYPE_INVALID | ?wxBITMAP_TYPE_BMP | ?wxBITMAP_TYPE_BMP_RESOURCE | ?wxBITMAP_TYPE_RESOURCE | ?wxBITMAP_TYPE_ICO | ?wxBITMAP_TYPE_ICO_RESOURCE | ?wxBITMAP_TYPE_CUR | ?wxBITMAP_TYPE_CUR_RESOURCE | ?wxBITMAP_TYPE_XBM | ?wxBITMAP_TYPE_XBM_DATA | ?wxBITMAP_TYPE_XPM | ?wxBITMAP_TYPE_XPM_DATA | ?wxBITMAP_TYPE_TIF | ?wxBITMAP_TYPE_TIF_RESOURCE | ?wxBITMAP_TYPE_GIF | ?wxBITMAP_TYPE_GIF_RESOURCE | ?wxBITMAP_TYPE_PNG | ?wxBITMAP_TYPE_PNG_RESOURCE | ?wxBITMAP_TYPE_JPEG | ?wxBITMAP_TYPE_JPEG_RESOURCE | ?wxBITMAP_TYPE_PNM | ?wxBITMAP_TYPE_PNM_RESOURCE | ?wxBITMAP_TYPE_PCX | ?wxBITMAP_TYPE_PCX_RESOURCE | ?wxBITMAP_TYPE_PICT | ?wxBITMAP_TYPE_PICT_RESOURCE | ?wxBITMAP_TYPE_ICON | ?wxBITMAP_TYPE_ICON_RESOURCE | ?wxBITMAP_TYPE_ANI | ?wxBITMAP_TYPE_IFF | ?wxBITMAP_TYPE_TGA | ?wxBITMAP_TYPE_MACCURSOR | ?wxBITMAP_TYPE_MACCURSOR_RESOURCE | ?wxBITMAP_TYPE_ANY
+-spec loadFile(This, Name, [Option]) -> boolean() when
+	This::wxBitmap(), Name::string(),
+	Option :: {type, wx:wx_enum()}.
 loadFile(#wx_ref{type=ThisT,ref=ThisRef},Name, Options)
  when is_list(Name),is_list(Options) ->
   ?CLASS(ThisT,wxBitmap),
@@ -223,24 +228,27 @@ loadFile(#wx_ref{type=ThisT,ref=ThisRef},Name, Options)
   wxe_util:call(?wxBitmap_LoadFile,
   <<ThisRef:32/?UI,(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((0+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxBitmap()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmap.html#wxbitmapok">external documentation</a>.
+-spec ok(This) -> boolean() when
+	This::wxBitmap().
 ok(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxBitmap),
   wxe_util:call(?wxBitmap_Ok,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxBitmap(), Name::string(), Type::WxBitmapType) -> bool()
 %% @equiv saveFile(This,Name,Type, [])
+-spec saveFile(This, Name, Type) -> boolean() when
+	This::wxBitmap(), Name::string(), Type::wx:wx_enum().
+
 saveFile(This,Name,Type)
  when is_record(This, wx_ref),is_list(Name),is_integer(Type) ->
   saveFile(This,Name,Type, []).
 
-%% @spec (This::wxBitmap(), Name::string(), Type::WxBitmapType, [Option]) -> bool()
-%% Option = {palette, wxPalette:wxPalette()}
-%% WxBitmapType = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmap.html#wxbitmapsavefile">external documentation</a>.
-%%<br /> WxBitmapType is one of ?wxBITMAP_TYPE_INVALID | ?wxBITMAP_TYPE_BMP | ?wxBITMAP_TYPE_BMP_RESOURCE | ?wxBITMAP_TYPE_RESOURCE | ?wxBITMAP_TYPE_ICO | ?wxBITMAP_TYPE_ICO_RESOURCE | ?wxBITMAP_TYPE_CUR | ?wxBITMAP_TYPE_CUR_RESOURCE | ?wxBITMAP_TYPE_XBM | ?wxBITMAP_TYPE_XBM_DATA | ?wxBITMAP_TYPE_XPM | ?wxBITMAP_TYPE_XPM_DATA | ?wxBITMAP_TYPE_TIF | ?wxBITMAP_TYPE_TIF_RESOURCE | ?wxBITMAP_TYPE_GIF | ?wxBITMAP_TYPE_GIF_RESOURCE | ?wxBITMAP_TYPE_PNG | ?wxBITMAP_TYPE_PNG_RESOURCE | ?wxBITMAP_TYPE_JPEG | ?wxBITMAP_TYPE_JPEG_RESOURCE | ?wxBITMAP_TYPE_PNM | ?wxBITMAP_TYPE_PNM_RESOURCE | ?wxBITMAP_TYPE_PCX | ?wxBITMAP_TYPE_PCX_RESOURCE | ?wxBITMAP_TYPE_PICT | ?wxBITMAP_TYPE_PICT_RESOURCE | ?wxBITMAP_TYPE_ICON | ?wxBITMAP_TYPE_ICON_RESOURCE | ?wxBITMAP_TYPE_ANI | ?wxBITMAP_TYPE_IFF | ?wxBITMAP_TYPE_TGA | ?wxBITMAP_TYPE_MACCURSOR | ?wxBITMAP_TYPE_MACCURSOR_RESOURCE | ?wxBITMAP_TYPE_ANY
+%%<br /> Type = ?wxBITMAP_TYPE_INVALID | ?wxBITMAP_TYPE_BMP | ?wxBITMAP_TYPE_BMP_RESOURCE | ?wxBITMAP_TYPE_RESOURCE | ?wxBITMAP_TYPE_ICO | ?wxBITMAP_TYPE_ICO_RESOURCE | ?wxBITMAP_TYPE_CUR | ?wxBITMAP_TYPE_CUR_RESOURCE | ?wxBITMAP_TYPE_XBM | ?wxBITMAP_TYPE_XBM_DATA | ?wxBITMAP_TYPE_XPM | ?wxBITMAP_TYPE_XPM_DATA | ?wxBITMAP_TYPE_TIF | ?wxBITMAP_TYPE_TIF_RESOURCE | ?wxBITMAP_TYPE_GIF | ?wxBITMAP_TYPE_GIF_RESOURCE | ?wxBITMAP_TYPE_PNG | ?wxBITMAP_TYPE_PNG_RESOURCE | ?wxBITMAP_TYPE_JPEG | ?wxBITMAP_TYPE_JPEG_RESOURCE | ?wxBITMAP_TYPE_PNM | ?wxBITMAP_TYPE_PNM_RESOURCE | ?wxBITMAP_TYPE_PCX | ?wxBITMAP_TYPE_PCX_RESOURCE | ?wxBITMAP_TYPE_PICT | ?wxBITMAP_TYPE_PICT_RESOURCE | ?wxBITMAP_TYPE_ICON | ?wxBITMAP_TYPE_ICON_RESOURCE | ?wxBITMAP_TYPE_ANI | ?wxBITMAP_TYPE_IFF | ?wxBITMAP_TYPE_TGA | ?wxBITMAP_TYPE_MACCURSOR | ?wxBITMAP_TYPE_MACCURSOR_RESOURCE | ?wxBITMAP_TYPE_ANY
+-spec saveFile(This, Name, Type, [Option]) -> boolean() when
+	This::wxBitmap(), Name::string(), Type::wx:wx_enum(),
+	Option :: {palette, wxPalette:wxPalette()}.
 saveFile(#wx_ref{type=ThisT,ref=ThisRef},Name,Type, Options)
  when is_list(Name),is_integer(Type),is_list(Options) ->
   ?CLASS(ThisT,wxBitmap),
@@ -251,48 +259,53 @@ saveFile(#wx_ref{type=ThisT,ref=ThisRef},Name,Type, Options)
   wxe_util:call(?wxBitmap_SaveFile,
   <<ThisRef:32/?UI,(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((0+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8,Type:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxBitmap(), Depth::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmap.html#wxbitmapsetdepth">external documentation</a>.
+-spec setDepth(This, Depth) -> ok when
+	This::wxBitmap(), Depth::integer().
 setDepth(#wx_ref{type=ThisT,ref=ThisRef},Depth)
  when is_integer(Depth) ->
   ?CLASS(ThisT,wxBitmap),
   wxe_util:cast(?wxBitmap_SetDepth,
   <<ThisRef:32/?UI,Depth:32/?UI>>).
 
-%% @spec (This::wxBitmap(), Height::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmap.html#wxbitmapsetheight">external documentation</a>.
+-spec setHeight(This, Height) -> ok when
+	This::wxBitmap(), Height::integer().
 setHeight(#wx_ref{type=ThisT,ref=ThisRef},Height)
  when is_integer(Height) ->
   ?CLASS(ThisT,wxBitmap),
   wxe_util:cast(?wxBitmap_SetHeight,
   <<ThisRef:32/?UI,Height:32/?UI>>).
 
-%% @spec (This::wxBitmap(), Mask::wxMask:wxMask()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmap.html#wxbitmapsetmask">external documentation</a>.
+-spec setMask(This, Mask) -> ok when
+	This::wxBitmap(), Mask::wxMask:wxMask().
 setMask(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=MaskT,ref=MaskRef}) ->
   ?CLASS(ThisT,wxBitmap),
   ?CLASS(MaskT,wxMask),
   wxe_util:cast(?wxBitmap_SetMask,
   <<ThisRef:32/?UI,MaskRef:32/?UI>>).
 
-%% @spec (This::wxBitmap(), Palette::wxPalette:wxPalette()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmap.html#wxbitmapsetpalette">external documentation</a>.
+-spec setPalette(This, Palette) -> ok when
+	This::wxBitmap(), Palette::wxPalette:wxPalette().
 setPalette(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PaletteT,ref=PaletteRef}) ->
   ?CLASS(ThisT,wxBitmap),
   ?CLASS(PaletteT,wxPalette),
   wxe_util:cast(?wxBitmap_SetPalette,
   <<ThisRef:32/?UI,PaletteRef:32/?UI>>).
 
-%% @spec (This::wxBitmap(), Width::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmap.html#wxbitmapsetwidth">external documentation</a>.
+-spec setWidth(This, Width) -> ok when
+	This::wxBitmap(), Width::integer().
 setWidth(#wx_ref{type=ThisT,ref=ThisRef},Width)
  when is_integer(Width) ->
   ?CLASS(ThisT,wxBitmap),
   wxe_util:cast(?wxBitmap_SetWidth,
   <<ThisRef:32/?UI,Width:32/?UI>>).
 
-%% @spec (This::wxBitmap()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxBitmap) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxBitmap),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxBitmapButton.erl b/lib/wx/src/gen/wxBitmapButton.erl
index d2353466e7..47ba575fb4 100644
--- a/lib/wx/src/gen/wxBitmapButton.erl
+++ b/lib/wx/src/gen/wxBitmapButton.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -72,6 +72,7 @@
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
 
+-export_type([wxBitmapButton/0]).
 %% @hidden
 parent_class(wxButton) -> true;
 parent_class(wxControl) -> true;
@@ -79,21 +80,28 @@ parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxBitmapButton()
+-type wxBitmapButton() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmapbutton.html#wxbitmapbuttonwxbitmapbutton">external documentation</a>.
+-spec new() -> wxBitmapButton().
 new() ->
   wxe_util:construct(?wxBitmapButton_new_0,
   <<>>).
 
-%% @spec (Parent::wxWindow:wxWindow(), Id::integer(), Bitmap::wxBitmap:wxBitmap()) -> wxBitmapButton()
 %% @equiv new(Parent,Id,Bitmap, [])
+-spec new(Parent, Id, Bitmap) -> wxBitmapButton() when
+	Parent::wxWindow:wxWindow(), Id::integer(), Bitmap::wxBitmap:wxBitmap().
+
 new(Parent,Id,Bitmap)
  when is_record(Parent, wx_ref),is_integer(Id),is_record(Bitmap, wx_ref) ->
   new(Parent,Id,Bitmap, []).
 
-%% @spec (Parent::wxWindow:wxWindow(), Id::integer(), Bitmap::wxBitmap:wxBitmap(), [Option]) -> wxBitmapButton()
-%% Option = {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()} | {validator, wx:wx()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmapbutton.html#wxbitmapbuttonwxbitmapbutton">external documentation</a>.
+-spec new(Parent, Id, Bitmap, [Option]) -> wxBitmapButton() when
+	Parent::wxWindow:wxWindow(), Id::integer(), Bitmap::wxBitmap:wxBitmap(),
+	Option :: {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}
+		 | {validator, wx:wx()}.
 new(#wx_ref{type=ParentT,ref=ParentRef},Id,#wx_ref{type=BitmapT,ref=BitmapRef}, Options)
  when is_integer(Id),is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -107,15 +115,21 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Id,#wx_ref{type=BitmapT,ref=BitmapRef},
   wxe_util:construct(?wxBitmapButton_new_4,
   <<ParentRef:32/?UI,Id:32/?UI,BitmapRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxBitmapButton(), Parent::wxWindow:wxWindow(), Id::integer(), Bitmap::wxBitmap:wxBitmap()) -> bool()
 %% @equiv create(This,Parent,Id,Bitmap, [])
+-spec create(This, Parent, Id, Bitmap) -> boolean() when
+	This::wxBitmapButton(), Parent::wxWindow:wxWindow(), Id::integer(), Bitmap::wxBitmap:wxBitmap().
+
 create(This,Parent,Id,Bitmap)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id),is_record(Bitmap, wx_ref) ->
   create(This,Parent,Id,Bitmap, []).
 
-%% @spec (This::wxBitmapButton(), Parent::wxWindow:wxWindow(), Id::integer(), Bitmap::wxBitmap:wxBitmap(), [Option]) -> bool()
-%% Option = {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()} | {validator, wx:wx()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmapbutton.html#wxbitmapbuttoncreate">external documentation</a>.
+-spec create(This, Parent, Id, Bitmap, [Option]) -> boolean() when
+	This::wxBitmapButton(), Parent::wxWindow:wxWindow(), Id::integer(), Bitmap::wxBitmap:wxBitmap(),
+	Option :: {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}
+		 | {validator, wx:wx()}.
 create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id,#wx_ref{type=BitmapT,ref=BitmapRef}, Options)
  when is_integer(Id),is_list(Options) ->
   ?CLASS(ThisT,wxBitmapButton),
@@ -130,68 +144,76 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id,#w
   wxe_util:call(?wxBitmapButton_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI,Id:32/?UI,BitmapRef:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxBitmapButton()) -> wxBitmap:wxBitmap()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmapbutton.html#wxbitmapbuttongetbitmapdisabled">external documentation</a>.
+-spec getBitmapDisabled(This) -> wxBitmap:wxBitmap() when
+	This::wxBitmapButton().
 getBitmapDisabled(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxBitmapButton),
   wxe_util:call(?wxBitmapButton_GetBitmapDisabled,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxBitmapButton()) -> wxBitmap:wxBitmap()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmapbutton.html#wxbitmapbuttongetbitmapfocus">external documentation</a>.
+-spec getBitmapFocus(This) -> wxBitmap:wxBitmap() when
+	This::wxBitmapButton().
 getBitmapFocus(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxBitmapButton),
   wxe_util:call(?wxBitmapButton_GetBitmapFocus,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxBitmapButton()) -> wxBitmap:wxBitmap()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmapbutton.html#wxbitmapbuttongetbitmaplabel">external documentation</a>.
+-spec getBitmapLabel(This) -> wxBitmap:wxBitmap() when
+	This::wxBitmapButton().
 getBitmapLabel(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxBitmapButton),
   wxe_util:call(?wxBitmapButton_GetBitmapLabel,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxBitmapButton()) -> wxBitmap:wxBitmap()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmapbutton.html#wxbitmapbuttongetbitmapselected">external documentation</a>.
+-spec getBitmapSelected(This) -> wxBitmap:wxBitmap() when
+	This::wxBitmapButton().
 getBitmapSelected(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxBitmapButton),
   wxe_util:call(?wxBitmapButton_GetBitmapSelected,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxBitmapButton(), Disabled::wxBitmap:wxBitmap()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmapbutton.html#wxbitmapbuttonsetbitmapdisabled">external documentation</a>.
+-spec setBitmapDisabled(This, Disabled) -> ok when
+	This::wxBitmapButton(), Disabled::wxBitmap:wxBitmap().
 setBitmapDisabled(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=DisabledT,ref=DisabledRef}) ->
   ?CLASS(ThisT,wxBitmapButton),
   ?CLASS(DisabledT,wxBitmap),
   wxe_util:cast(?wxBitmapButton_SetBitmapDisabled,
   <<ThisRef:32/?UI,DisabledRef:32/?UI>>).
 
-%% @spec (This::wxBitmapButton(), Focus::wxBitmap:wxBitmap()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmapbutton.html#wxbitmapbuttonsetbitmapfocus">external documentation</a>.
+-spec setBitmapFocus(This, Focus) -> ok when
+	This::wxBitmapButton(), Focus::wxBitmap:wxBitmap().
 setBitmapFocus(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FocusT,ref=FocusRef}) ->
   ?CLASS(ThisT,wxBitmapButton),
   ?CLASS(FocusT,wxBitmap),
   wxe_util:cast(?wxBitmapButton_SetBitmapFocus,
   <<ThisRef:32/?UI,FocusRef:32/?UI>>).
 
-%% @spec (This::wxBitmapButton(), Bitmap::wxBitmap:wxBitmap()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmapbutton.html#wxbitmapbuttonsetbitmaplabel">external documentation</a>.
+-spec setBitmapLabel(This, Bitmap) -> ok when
+	This::wxBitmapButton(), Bitmap::wxBitmap:wxBitmap().
 setBitmapLabel(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BitmapT,ref=BitmapRef}) ->
   ?CLASS(ThisT,wxBitmapButton),
   ?CLASS(BitmapT,wxBitmap),
   wxe_util:cast(?wxBitmapButton_SetBitmapLabel,
   <<ThisRef:32/?UI,BitmapRef:32/?UI>>).
 
-%% @spec (This::wxBitmapButton(), Sel::wxBitmap:wxBitmap()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmapbutton.html#wxbitmapbuttonsetbitmapselected">external documentation</a>.
+-spec setBitmapSelected(This, Sel) -> ok when
+	This::wxBitmapButton(), Sel::wxBitmap:wxBitmap().
 setBitmapSelected(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=SelT,ref=SelRef}) ->
   ?CLASS(ThisT,wxBitmapButton),
   ?CLASS(SelT,wxBitmap),
   wxe_util:cast(?wxBitmapButton_SetBitmapSelected,
   <<ThisRef:32/?UI,SelRef:32/?UI>>).
 
-%% @spec (This::wxBitmapButton()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxBitmapButton) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxBitmapButton),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxBitmapDataObject.erl b/lib/wx/src/gen/wxBitmapDataObject.erl
index b5207072e3..7f6bc973ef 100644
--- a/lib/wx/src/gen/wxBitmapDataObject.erl
+++ b/lib/wx/src/gen/wxBitmapDataObject.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -32,25 +32,23 @@
 %% inherited exports
 -export([parent_class/1]).
 
+-export_type([wxBitmapDataObject/0]).
 %% @hidden
 parent_class(wxDataObject) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxBitmapDataObject()
+-type wxBitmapDataObject() :: wx:wx_object().
 %% @equiv new([])
+-spec new() -> wxBitmapDataObject().
+
 new() ->
   new([]).
 
-%% @spec (X::term()) -> wxBitmapDataObject()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmapdataobject.html#wxbitmapdataobjectwxbitmapdataobject">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% new([Option]) -> wxBitmapDataObject() </c>
-%%<br /> Option = {bitmap, wxBitmap:wxBitmap()}
-%% </p>
-%% <p><c>
-%% new(Bitmap::wxBitmap:wxBitmap()) -> wxBitmapDataObject() </c>
-%% </p>
+-spec new([Option]) -> wxBitmapDataObject() when
+	Option :: {bitmap, wxBitmap:wxBitmap()};
+      (Bitmap) -> wxBitmapDataObject() when
+	Bitmap::wxBitmap:wxBitmap().
 new(Options)
  when is_list(Options) ->
   MOpts = fun({bitmap, #wx_ref{type=BitmapT,ref=BitmapRef}}, Acc) ->   ?CLASS(BitmapT,wxBitmap),[<<1:32/?UI,BitmapRef:32/?UI>>|Acc];
@@ -63,23 +61,25 @@ new(#wx_ref{type=BitmapT,ref=BitmapRef}) ->
   wxe_util:construct(?wxBitmapDataObject_new_1_1,
   <<BitmapRef:32/?UI>>).
 
-%% @spec (This::wxBitmapDataObject()) -> wxBitmap:wxBitmap()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmapdataobject.html#wxbitmapdataobjectgetbitmap">external documentation</a>.
+-spec getBitmap(This) -> wxBitmap:wxBitmap() when
+	This::wxBitmapDataObject().
 getBitmap(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxBitmapDataObject),
   wxe_util:call(?wxBitmapDataObject_GetBitmap,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxBitmapDataObject(), Bitmap::wxBitmap:wxBitmap()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmapdataobject.html#wxbitmapdataobjectsetbitmap">external documentation</a>.
+-spec setBitmap(This, Bitmap) -> ok when
+	This::wxBitmapDataObject(), Bitmap::wxBitmap:wxBitmap().
 setBitmap(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BitmapT,ref=BitmapRef}) ->
   ?CLASS(ThisT,wxBitmapDataObject),
   ?CLASS(BitmapT,wxBitmap),
   wxe_util:cast(?wxBitmapDataObject_SetBitmap,
   <<ThisRef:32/?UI,BitmapRef:32/?UI>>).
 
-%% @spec (This::wxBitmapDataObject()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxBitmapDataObject) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxBitmapDataObject),
   wxe_util:destroy(?wxBitmapDataObject_destroy,Obj),
diff --git a/lib/wx/src/gen/wxBoxSizer.erl b/lib/wx/src/gen/wxBoxSizer.erl
index e6287945a9..d6d8aadf30 100644
--- a/lib/wx/src/gen/wxBoxSizer.erl
+++ b/lib/wx/src/gen/wxBoxSizer.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -40,26 +40,30 @@
   setMinSize/2,setMinSize/3,setSizeHints/2,setVirtualSizeHints/2,show/2,
   show/3]).
 
+-export_type([wxBoxSizer/0]).
 %% @hidden
 parent_class(wxSizer) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (Orient::integer()) -> wxBoxSizer()
+-type wxBoxSizer() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxboxsizer.html#wxboxsizerwxboxsizer">external documentation</a>.
+-spec new(Orient) -> wxBoxSizer() when
+	Orient::integer().
 new(Orient)
  when is_integer(Orient) ->
   wxe_util:construct(?wxBoxSizer_new,
   <<Orient:32/?UI>>).
 
-%% @spec (This::wxBoxSizer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxboxsizer.html#wxboxsizergetorientation">external documentation</a>.
+-spec getOrientation(This) -> integer() when
+	This::wxBoxSizer().
 getOrientation(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxBoxSizer),
   wxe_util:call(?wxBoxSizer_GetOrientation,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxBoxSizer()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxBoxSizer) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxBoxSizer),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxBrush.erl b/lib/wx/src/gen/wxBrush.erl
index e42edd62e3..5f67d35310 100644
--- a/lib/wx/src/gen/wxBrush.erl
+++ b/lib/wx/src/gen/wxBrush.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -30,23 +30,22 @@
 %% inherited exports
 -export([parent_class/1]).
 
+-export_type([wxBrush/0]).
 %% @hidden
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxBrush()
+-type wxBrush() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbrush.html#wxbrushwxbrush">external documentation</a>.
+-spec new() -> wxBrush().
 new() ->
   wxe_util:construct(?wxBrush_new_0,
   <<>>).
 
-%% @spec (X::term()) -> wxBrush()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbrush.html#wxbrushwxbrush">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% new(Colour::wx:colour()) -> new(Colour, []) </c></p>
-%% <p><c>
-%% new(StippleBitmap::wxBitmap:wxBitmap()) -> wxBrush() </c>
-%% </p>
+-spec new(Colour) -> wxBrush() when
+	Colour::wx:wx_colour();
+      (StippleBitmap) -> wxBrush() when
+	StippleBitmap::wxBitmap:wxBitmap().
 
 new(Colour)
  when tuple_size(Colour) =:= 3; tuple_size(Colour) =:= 4 ->
@@ -56,9 +55,10 @@ new(#wx_ref{type=StippleBitmapT,ref=StippleBitmapRef}) ->
   wxe_util:construct(?wxBrush_new_1,
   <<StippleBitmapRef:32/?UI>>).
 
-%% @spec (Colour::wx:colour(), [Option]) -> wxBrush()
-%% Option = {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbrush.html#wxbrushwxbrush">external documentation</a>.
+-spec new(Colour, [Option]) -> wxBrush() when
+	Colour::wx:wx_colour(),
+	Option :: {style, integer()}.
 new(Colour, Options)
  when tuple_size(Colour) =:= 3; tuple_size(Colour) =:= 4,is_list(Options) ->
   MOpts = fun({style, Style}, Acc) -> [<<1:32/?UI,Style:32/?UI>>|Acc];
@@ -67,75 +67,84 @@ new(Colour, Options)
   wxe_util:construct(?wxBrush_new_2,
   <<(wxe_util:colour_bin(Colour)):16/binary, BinOpt/binary>>).
 
-%% @spec (This::wxBrush()) -> wx:colour()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbrush.html#wxbrushgetcolour">external documentation</a>.
+-spec getColour(This) -> wx:wx_colour() when
+	This::wxBrush().
 getColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxBrush),
   wxe_util:call(?wxBrush_GetColour,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxBrush()) -> wxBitmap:wxBitmap()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbrush.html#wxbrushgetstipple">external documentation</a>.
+-spec getStipple(This) -> wxBitmap:wxBitmap() when
+	This::wxBrush().
 getStipple(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxBrush),
   wxe_util:call(?wxBrush_GetStipple,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxBrush()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbrush.html#wxbrushgetstyle">external documentation</a>.
+-spec getStyle(This) -> integer() when
+	This::wxBrush().
 getStyle(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxBrush),
   wxe_util:call(?wxBrush_GetStyle,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxBrush()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbrush.html#wxbrushishatch">external documentation</a>.
+-spec isHatch(This) -> boolean() when
+	This::wxBrush().
 isHatch(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxBrush),
   wxe_util:call(?wxBrush_IsHatch,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxBrush()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbrush.html#wxbrushisok">external documentation</a>.
+-spec isOk(This) -> boolean() when
+	This::wxBrush().
 isOk(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxBrush),
   wxe_util:call(?wxBrush_IsOk,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxBrush(), Col::wx:colour()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbrush.html#wxbrushsetcolour">external documentation</a>.
+-spec setColour(This, Col) -> ok when
+	This::wxBrush(), Col::wx:wx_colour().
 setColour(#wx_ref{type=ThisT,ref=ThisRef},Col)
  when tuple_size(Col) =:= 3; tuple_size(Col) =:= 4 ->
   ?CLASS(ThisT,wxBrush),
   wxe_util:cast(?wxBrush_SetColour_1,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(Col)):16/binary>>).
 
-%% @spec (This::wxBrush(), R::integer(), G::integer(), B::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbrush.html#wxbrushsetcolour">external documentation</a>.
+-spec setColour(This, R, G, B) -> ok when
+	This::wxBrush(), R::integer(), G::integer(), B::integer().
 setColour(#wx_ref{type=ThisT,ref=ThisRef},R,G,B)
  when is_integer(R),is_integer(G),is_integer(B) ->
   ?CLASS(ThisT,wxBrush),
   wxe_util:cast(?wxBrush_SetColour_3,
   <<ThisRef:32/?UI,R:32/?UI,G:32/?UI,B:32/?UI>>).
 
-%% @spec (This::wxBrush(), Stipple::wxBitmap:wxBitmap()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbrush.html#wxbrushsetstipple">external documentation</a>.
+-spec setStipple(This, Stipple) -> ok when
+	This::wxBrush(), Stipple::wxBitmap:wxBitmap().
 setStipple(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=StippleT,ref=StippleRef}) ->
   ?CLASS(ThisT,wxBrush),
   ?CLASS(StippleT,wxBitmap),
   wxe_util:cast(?wxBrush_SetStipple,
   <<ThisRef:32/?UI,StippleRef:32/?UI>>).
 
-%% @spec (This::wxBrush(), Style::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbrush.html#wxbrushsetstyle">external documentation</a>.
+-spec setStyle(This, Style) -> ok when
+	This::wxBrush(), Style::integer().
 setStyle(#wx_ref{type=ThisT,ref=ThisRef},Style)
  when is_integer(Style) ->
   ?CLASS(ThisT,wxBrush),
   wxe_util:cast(?wxBrush_SetStyle,
   <<ThisRef:32/?UI,Style:32/?UI>>).
 
-%% @spec (This::wxBrush()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxBrush) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxBrush),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxBufferedDC.erl b/lib/wx/src/gen/wxBufferedDC.erl
index 9096f95612..4dc11dcddd 100644
--- a/lib/wx/src/gen/wxBufferedDC.erl
+++ b/lib/wx/src/gen/wxBufferedDC.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -53,32 +53,34 @@
   setMapMode/2,setPalette/2,setPen/2,setTextBackground/2,setTextForeground/2,
   setUserScale/3,startDoc/2,startPage/1]).
 
+-export_type([wxBufferedDC/0]).
 %% @hidden
 parent_class(wxMemoryDC) -> true;
 parent_class(wxDC) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxBufferedDC()
+-type wxBufferedDC() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbuffereddc.html#wxbuffereddcwxbuffereddc">external documentation</a>.
+-spec new() -> wxBufferedDC().
 new() ->
   wxe_util:construct(?wxBufferedDC_new_0,
   <<>>).
 
-%% @spec (Dc::wxDC:wxDC()) -> wxBufferedDC()
 %% @equiv new(Dc, [])
+-spec new(Dc) -> wxBufferedDC() when
+	Dc::wxDC:wxDC().
+
 new(Dc)
  when is_record(Dc, wx_ref) ->
   new(Dc, []).
 
-%% @spec (Dc::wxDC:wxDC(),X::term()) -> wxBufferedDC()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbuffereddc.html#wxbuffereddcwxbuffereddc">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% new(Dc::wxDC:wxDC(), Area::{W::integer(), H::integer()}) -> new(Dc,Area, []) </c></p>
-%% <p><c>
-%% new(Dc::wxDC:wxDC(), [Option]) -> wxBufferedDC() </c>
-%%<br /> Option = {buffer, wxBitmap:wxBitmap()} | {style, integer()}
-%% </p>
+-spec new(Dc, Area) -> wxBufferedDC() when
+	Dc::wxDC:wxDC(), Area::{W::integer(), H::integer()};
+      (Dc, [Option]) -> wxBufferedDC() when
+	Dc::wxDC:wxDC(),
+	Option :: {buffer, wxBitmap:wxBitmap()}
+		 | {style, integer()}.
 
 new(Dc,Area={AreaW,AreaH})
  when is_record(Dc, wx_ref),is_integer(AreaW),is_integer(AreaH) ->
@@ -93,9 +95,10 @@ new(#wx_ref{type=DcT,ref=DcRef}, Options)
   wxe_util:construct(?wxBufferedDC_new_2,
   <<DcRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (Dc::wxDC:wxDC(), Area::{W::integer(), H::integer()}, [Option]) -> wxBufferedDC()
-%% Option = {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbuffereddc.html#wxbuffereddcwxbuffereddc">external documentation</a>.
+-spec new(Dc, Area, [Option]) -> wxBufferedDC() when
+	Dc::wxDC:wxDC(), Area::{W::integer(), H::integer()},
+	Option :: {style, integer()}.
 new(#wx_ref{type=DcT,ref=DcRef},{AreaW,AreaH}, Options)
  when is_integer(AreaW),is_integer(AreaH),is_list(Options) ->
   ?CLASS(DcT,wxDC),
@@ -105,21 +108,21 @@ new(#wx_ref{type=DcT,ref=DcRef},{AreaW,AreaH}, Options)
   wxe_util:construct(?wxBufferedDC_new_3,
   <<DcRef:32/?UI,AreaW:32/?UI,AreaH:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxBufferedDC(), Dc::wxDC:wxDC()) -> ok
 %% @equiv init(This,Dc, [])
+-spec init(This, Dc) -> ok when
+	This::wxBufferedDC(), Dc::wxDC:wxDC().
+
 init(This,Dc)
  when is_record(This, wx_ref),is_record(Dc, wx_ref) ->
   init(This,Dc, []).
 
-%% @spec (This::wxBufferedDC(),Dc::wxDC:wxDC(),X::term()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbuffereddc.html#wxbuffereddcinit">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% init(This::wxBufferedDC(), Dc::wxDC:wxDC(), Area::{W::integer(), H::integer()}) -> init(This,Dc,Area, []) </c></p>
-%% <p><c>
-%% init(This::wxBufferedDC(), Dc::wxDC:wxDC(), [Option]) -> ok </c>
-%%<br /> Option = {buffer, wxBitmap:wxBitmap()} | {style, integer()}
-%% </p>
+-spec init(This, Dc, Area) -> ok when
+	This::wxBufferedDC(), Dc::wxDC:wxDC(), Area::{W::integer(), H::integer()};
+      (This, Dc, [Option]) -> ok when
+	This::wxBufferedDC(), Dc::wxDC:wxDC(),
+	Option :: {buffer, wxBitmap:wxBitmap()}
+		 | {style, integer()}.
 
 init(This,Dc,Area={AreaW,AreaH})
  when is_record(This, wx_ref),is_record(Dc, wx_ref),is_integer(AreaW),is_integer(AreaH) ->
@@ -135,9 +138,10 @@ init(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=DcT,ref=DcRef}, Options)
   wxe_util:cast(?wxBufferedDC_Init_2,
   <<ThisRef:32/?UI,DcRef:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxBufferedDC(), Dc::wxDC:wxDC(), Area::{W::integer(), H::integer()}, [Option]) -> ok
-%% Option = {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbuffereddc.html#wxbuffereddcinit">external documentation</a>.
+-spec init(This, Dc, Area, [Option]) -> ok when
+	This::wxBufferedDC(), Dc::wxDC:wxDC(), Area::{W::integer(), H::integer()},
+	Option :: {style, integer()}.
 init(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=DcT,ref=DcRef},{AreaW,AreaH}, Options)
  when is_integer(AreaW),is_integer(AreaH),is_list(Options) ->
   ?CLASS(ThisT,wxBufferedDC),
@@ -148,8 +152,8 @@ init(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=DcT,ref=DcRef},{AreaW,AreaH},
   wxe_util:cast(?wxBufferedDC_Init_3,
   <<ThisRef:32/?UI,DcRef:32/?UI,AreaW:32/?UI,AreaH:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxBufferedDC()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxBufferedDC) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxBufferedDC),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxBufferedPaintDC.erl b/lib/wx/src/gen/wxBufferedPaintDC.erl
index 2712394dd8..421fa2635d 100644
--- a/lib/wx/src/gen/wxBufferedPaintDC.erl
+++ b/lib/wx/src/gen/wxBufferedPaintDC.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -55,27 +55,28 @@
   setPen/2,setTextBackground/2,setTextForeground/2,setUserScale/3,startDoc/2,
   startPage/1]).
 
+-export_type([wxBufferedPaintDC/0]).
 %% @hidden
 parent_class(wxBufferedDC) -> true;
 parent_class(wxMemoryDC) -> true;
 parent_class(wxDC) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (Window::wxWindow:wxWindow()) -> wxBufferedPaintDC()
+-type wxBufferedPaintDC() :: wx:wx_object().
 %% @equiv new(Window, [])
+-spec new(Window) -> wxBufferedPaintDC() when
+	Window::wxWindow:wxWindow().
+
 new(Window)
  when is_record(Window, wx_ref) ->
   new(Window, []).
 
-%% @spec (Window::wxWindow:wxWindow(),X::term()) -> wxBufferedPaintDC()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbufferedpaintdc.html#wxbufferedpaintdcwxbufferedpaintdc">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% new(Window::wxWindow:wxWindow(), Buffer::wxBitmap:wxBitmap()) -> new(Window,Buffer, []) </c></p>
-%% <p><c>
-%% new(Window::wxWindow:wxWindow(), [Option]) -> wxBufferedPaintDC() </c>
-%%<br /> Option = {style, integer()}
-%% </p>
+-spec new(Window, Buffer) -> wxBufferedPaintDC() when
+	Window::wxWindow:wxWindow(), Buffer::wxBitmap:wxBitmap();
+      (Window, [Option]) -> wxBufferedPaintDC() when
+	Window::wxWindow:wxWindow(),
+	Option :: {style, integer()}.
 
 new(Window,Buffer)
  when is_record(Window, wx_ref),is_record(Buffer, wx_ref) ->
@@ -89,9 +90,10 @@ new(#wx_ref{type=WindowT,ref=WindowRef}, Options)
   wxe_util:construct(?wxBufferedPaintDC_new_2,
   <<WindowRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (Window::wxWindow:wxWindow(), Buffer::wxBitmap:wxBitmap(), [Option]) -> wxBufferedPaintDC()
-%% Option = {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbufferedpaintdc.html#wxbufferedpaintdcwxbufferedpaintdc">external documentation</a>.
+-spec new(Window, Buffer, [Option]) -> wxBufferedPaintDC() when
+	Window::wxWindow:wxWindow(), Buffer::wxBitmap:wxBitmap(),
+	Option :: {style, integer()}.
 new(#wx_ref{type=WindowT,ref=WindowRef},#wx_ref{type=BufferT,ref=BufferRef}, Options)
  when is_list(Options) ->
   ?CLASS(WindowT,wxWindow),
@@ -102,8 +104,8 @@ new(#wx_ref{type=WindowT,ref=WindowRef},#wx_ref{type=BufferT,ref=BufferRef}, Opt
   wxe_util:construct(?wxBufferedPaintDC_new_3,
   <<WindowRef:32/?UI,BufferRef:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxBufferedPaintDC()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxBufferedPaintDC) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxBufferedPaintDC),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxButton.erl b/lib/wx/src/gen/wxButton.erl
index a75c45c5a3..facd885175 100644
--- a/lib/wx/src/gen/wxButton.erl
+++ b/lib/wx/src/gen/wxButton.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -70,27 +70,36 @@
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
 
+-export_type([wxButton/0]).
 %% @hidden
 parent_class(wxControl) -> true;
 parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxButton()
+-type wxButton() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbutton.html#wxbuttonwxbutton">external documentation</a>.
+-spec new() -> wxButton().
 new() ->
   wxe_util:construct(?wxButton_new_0,
   <<>>).
 
-%% @spec (Parent::wxWindow:wxWindow(), Id::integer()) -> wxButton()
 %% @equiv new(Parent,Id, [])
+-spec new(Parent, Id) -> wxButton() when
+	Parent::wxWindow:wxWindow(), Id::integer().
+
 new(Parent,Id)
  when is_record(Parent, wx_ref),is_integer(Id) ->
   new(Parent,Id, []).
 
-%% @spec (Parent::wxWindow:wxWindow(), Id::integer(), [Option]) -> wxButton()
-%% Option = {label, string()} | {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()} | {validator, wx:wx()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbutton.html#wxbuttonwxbutton">external documentation</a>.
+-spec new(Parent, Id, [Option]) -> wxButton() when
+	Parent::wxWindow:wxWindow(), Id::integer(),
+	Option :: {label, string()}
+		 | {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}
+		 | {validator, wx:wx()}.
 new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
  when is_integer(Id),is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -104,15 +113,22 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
   wxe_util:construct(?wxButton_new_3,
   <<ParentRef:32/?UI,Id:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxButton(), Parent::wxWindow:wxWindow(), Id::integer()) -> bool()
 %% @equiv create(This,Parent,Id, [])
+-spec create(This, Parent, Id) -> boolean() when
+	This::wxButton(), Parent::wxWindow:wxWindow(), Id::integer().
+
 create(This,Parent,Id)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id) ->
   create(This,Parent,Id, []).
 
-%% @spec (This::wxButton(), Parent::wxWindow:wxWindow(), Id::integer(), [Option]) -> bool()
-%% Option = {label, string()} | {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()} | {validator, wx:wx()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbutton.html#wxbuttoncreate">external documentation</a>.
+-spec create(This, Parent, Id, [Option]) -> boolean() when
+	This::wxButton(), Parent::wxWindow:wxWindow(), Id::integer(),
+	Option :: {label, string()}
+		 | {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}
+		 | {validator, wx:wx()}.
 create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
  when is_integer(Id),is_list(Options) ->
   ?CLASS(ThisT,wxButton),
@@ -127,21 +143,23 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id, O
   wxe_util:call(?wxButton_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI,Id:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec () -> {W::integer(), H::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbutton.html#wxbuttongetdefaultsize">external documentation</a>.
+-spec getDefaultSize() -> {W::integer(), H::integer()}.
 getDefaultSize() ->
   wxe_util:call(?wxButton_GetDefaultSize,
   <<>>).
 
-%% @spec (This::wxButton()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbutton.html#wxbuttonsetdefault">external documentation</a>.
+-spec setDefault(This) -> ok when
+	This::wxButton().
 setDefault(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxButton),
   wxe_util:cast(?wxButton_SetDefault,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxButton(), Label::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbutton.html#wxbuttonsetlabel">external documentation</a>.
+-spec setLabel(This, Label) -> ok when
+	This::wxButton(), Label::string().
 setLabel(#wx_ref{type=ThisT,ref=ThisRef},Label)
  when is_list(Label) ->
   ?CLASS(ThisT,wxButton),
@@ -149,8 +167,8 @@ setLabel(#wx_ref{type=ThisT,ref=ThisRef},Label)
   wxe_util:cast(?wxButton_SetLabel,
   <<ThisRef:32/?UI,(byte_size(Label_UC)):32/?UI,(Label_UC)/binary, 0:(((8- ((0+byte_size(Label_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxButton()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxButton) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxButton),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxCalendarCtrl.erl b/lib/wx/src/gen/wxCalendarCtrl.erl
index 1bb4ecb1fa..7762e7f318 100644
--- a/lib/wx/src/gen/wxCalendarCtrl.erl
+++ b/lib/wx/src/gen/wxCalendarCtrl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -74,27 +74,35 @@
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
 
+-export_type([wxCalendarCtrl/0]).
 %% @hidden
 parent_class(wxControl) -> true;
 parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxCalendarCtrl()
+-type wxCalendarCtrl() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendarctrl.html#wxcalendarctrlwxcalendarctrl">external documentation</a>.
+-spec new() -> wxCalendarCtrl().
 new() ->
   wxe_util:construct(?wxCalendarCtrl_new_0,
   <<>>).
 
-%% @spec (Parent::wxWindow:wxWindow(), Id::integer()) -> wxCalendarCtrl()
 %% @equiv new(Parent,Id, [])
+-spec new(Parent, Id) -> wxCalendarCtrl() when
+	Parent::wxWindow:wxWindow(), Id::integer().
+
 new(Parent,Id)
  when is_record(Parent, wx_ref),is_integer(Id) ->
   new(Parent,Id, []).
 
-%% @spec (Parent::wxWindow:wxWindow(), Id::integer(), [Option]) -> wxCalendarCtrl()
-%% Option = {date, wx:datetime()} | {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendarctrl.html#wxcalendarctrlwxcalendarctrl">external documentation</a>.
+-spec new(Parent, Id, [Option]) -> wxCalendarCtrl() when
+	Parent::wxWindow:wxWindow(), Id::integer(),
+	Option :: {date, wx:wx_datetime()}
+		 | {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}.
 new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
  when is_integer(Id),is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -107,15 +115,21 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
   wxe_util:construct(?wxCalendarCtrl_new_3,
   <<ParentRef:32/?UI,Id:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxCalendarCtrl(), Parent::wxWindow:wxWindow(), Id::integer()) -> bool()
 %% @equiv create(This,Parent,Id, [])
+-spec create(This, Parent, Id) -> boolean() when
+	This::wxCalendarCtrl(), Parent::wxWindow:wxWindow(), Id::integer().
+
 create(This,Parent,Id)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id) ->
   create(This,Parent,Id, []).
 
-%% @spec (This::wxCalendarCtrl(), Parent::wxWindow:wxWindow(), Id::integer(), [Option]) -> bool()
-%% Option = {date, wx:datetime()} | {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendarctrl.html#wxcalendarctrlcreate">external documentation</a>.
+-spec create(This, Parent, Id, [Option]) -> boolean() when
+	This::wxCalendarCtrl(), Parent::wxWindow:wxWindow(), Id::integer(),
+	Option :: {date, wx:wx_datetime()}
+		 | {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}.
 create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
  when is_integer(Id),is_list(Options) ->
   ?CLASS(ThisT,wxCalendarCtrl),
@@ -129,30 +143,35 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id, O
   wxe_util:call(?wxCalendarCtrl_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI,Id:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxCalendarCtrl(), Date::wx:datetime()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendarctrl.html#wxcalendarctrlsetdate">external documentation</a>.
+-spec setDate(This, Date) -> boolean() when
+	This::wxCalendarCtrl(), Date::wx:wx_datetime().
 setDate(#wx_ref{type=ThisT,ref=ThisRef},Date)
  when tuple_size(Date) =:= 2 ->
   ?CLASS(ThisT,wxCalendarCtrl),
   wxe_util:call(?wxCalendarCtrl_SetDate,
   <<ThisRef:32/?UI,(wxe_util:datetime_bin(Date)):24/binary>>).
 
-%% @spec (This::wxCalendarCtrl()) -> wx:datetime()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendarctrl.html#wxcalendarctrlgetdate">external documentation</a>.
+-spec getDate(This) -> wx:wx_datetime() when
+	This::wxCalendarCtrl().
 getDate(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxCalendarCtrl),
   wxe_util:call(?wxCalendarCtrl_GetDate,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxCalendarCtrl()) -> ok
 %% @equiv enableYearChange(This, [])
+-spec enableYearChange(This) -> ok when
+	This::wxCalendarCtrl().
+
 enableYearChange(This)
  when is_record(This, wx_ref) ->
   enableYearChange(This, []).
 
-%% @spec (This::wxCalendarCtrl(), [Option]) -> ok
-%% Option = {enable, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendarctrl.html#wxcalendarctrlenableyearchange">external documentation</a>.
+-spec enableYearChange(This, [Option]) -> ok when
+	This::wxCalendarCtrl(),
+	Option :: {enable, boolean()}.
 enableYearChange(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxCalendarCtrl),
@@ -162,15 +181,18 @@ enableYearChange(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxCalendarCtrl_EnableYearChange,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxCalendarCtrl()) -> ok
 %% @equiv enableMonthChange(This, [])
+-spec enableMonthChange(This) -> ok when
+	This::wxCalendarCtrl().
+
 enableMonthChange(This)
  when is_record(This, wx_ref) ->
   enableMonthChange(This, []).
 
-%% @spec (This::wxCalendarCtrl(), [Option]) -> ok
-%% Option = {enable, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendarctrl.html#wxcalendarctrlenablemonthchange">external documentation</a>.
+-spec enableMonthChange(This, [Option]) -> ok when
+	This::wxCalendarCtrl(),
+	Option :: {enable, boolean()}.
 enableMonthChange(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxCalendarCtrl),
@@ -180,15 +202,18 @@ enableMonthChange(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxCalendarCtrl_EnableMonthChange,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxCalendarCtrl()) -> ok
 %% @equiv enableHolidayDisplay(This, [])
+-spec enableHolidayDisplay(This) -> ok when
+	This::wxCalendarCtrl().
+
 enableHolidayDisplay(This)
  when is_record(This, wx_ref) ->
   enableHolidayDisplay(This, []).
 
-%% @spec (This::wxCalendarCtrl(), [Option]) -> ok
-%% Option = {display, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendarctrl.html#wxcalendarctrlenableholidaydisplay">external documentation</a>.
+-spec enableHolidayDisplay(This, [Option]) -> ok when
+	This::wxCalendarCtrl(),
+	Option :: {display, boolean()}.
 enableHolidayDisplay(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxCalendarCtrl),
@@ -198,82 +223,93 @@ enableHolidayDisplay(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxCalendarCtrl_EnableHolidayDisplay,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxCalendarCtrl(), ColFg::wx:colour(), ColBg::wx:colour()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendarctrl.html#wxcalendarctrlsetheadercolours">external documentation</a>.
+-spec setHeaderColours(This, ColFg, ColBg) -> ok when
+	This::wxCalendarCtrl(), ColFg::wx:wx_colour(), ColBg::wx:wx_colour().
 setHeaderColours(#wx_ref{type=ThisT,ref=ThisRef},ColFg,ColBg)
  when tuple_size(ColFg) =:= 3; tuple_size(ColFg) =:= 4,tuple_size(ColBg) =:= 3; tuple_size(ColBg) =:= 4 ->
   ?CLASS(ThisT,wxCalendarCtrl),
   wxe_util:cast(?wxCalendarCtrl_SetHeaderColours,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(ColFg)):16/binary,(wxe_util:colour_bin(ColBg)):16/binary>>).
 
-%% @spec (This::wxCalendarCtrl()) -> wx:colour()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendarctrl.html#wxcalendarctrlgetheadercolourfg">external documentation</a>.
+-spec getHeaderColourFg(This) -> wx:wx_colour() when
+	This::wxCalendarCtrl().
 getHeaderColourFg(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxCalendarCtrl),
   wxe_util:call(?wxCalendarCtrl_GetHeaderColourFg,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxCalendarCtrl()) -> wx:colour()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendarctrl.html#wxcalendarctrlgetheadercolourbg">external documentation</a>.
+-spec getHeaderColourBg(This) -> wx:wx_colour() when
+	This::wxCalendarCtrl().
 getHeaderColourBg(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxCalendarCtrl),
   wxe_util:call(?wxCalendarCtrl_GetHeaderColourBg,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxCalendarCtrl(), ColFg::wx:colour(), ColBg::wx:colour()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendarctrl.html#wxcalendarctrlsethighlightcolours">external documentation</a>.
+-spec setHighlightColours(This, ColFg, ColBg) -> ok when
+	This::wxCalendarCtrl(), ColFg::wx:wx_colour(), ColBg::wx:wx_colour().
 setHighlightColours(#wx_ref{type=ThisT,ref=ThisRef},ColFg,ColBg)
  when tuple_size(ColFg) =:= 3; tuple_size(ColFg) =:= 4,tuple_size(ColBg) =:= 3; tuple_size(ColBg) =:= 4 ->
   ?CLASS(ThisT,wxCalendarCtrl),
   wxe_util:cast(?wxCalendarCtrl_SetHighlightColours,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(ColFg)):16/binary,(wxe_util:colour_bin(ColBg)):16/binary>>).
 
-%% @spec (This::wxCalendarCtrl()) -> wx:colour()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendarctrl.html#wxcalendarctrlgethighlightcolourfg">external documentation</a>.
+-spec getHighlightColourFg(This) -> wx:wx_colour() when
+	This::wxCalendarCtrl().
 getHighlightColourFg(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxCalendarCtrl),
   wxe_util:call(?wxCalendarCtrl_GetHighlightColourFg,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxCalendarCtrl()) -> wx:colour()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendarctrl.html#wxcalendarctrlgethighlightcolourbg">external documentation</a>.
+-spec getHighlightColourBg(This) -> wx:wx_colour() when
+	This::wxCalendarCtrl().
 getHighlightColourBg(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxCalendarCtrl),
   wxe_util:call(?wxCalendarCtrl_GetHighlightColourBg,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxCalendarCtrl(), ColFg::wx:colour(), ColBg::wx:colour()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendarctrl.html#wxcalendarctrlsetholidaycolours">external documentation</a>.
+-spec setHolidayColours(This, ColFg, ColBg) -> ok when
+	This::wxCalendarCtrl(), ColFg::wx:wx_colour(), ColBg::wx:wx_colour().
 setHolidayColours(#wx_ref{type=ThisT,ref=ThisRef},ColFg,ColBg)
  when tuple_size(ColFg) =:= 3; tuple_size(ColFg) =:= 4,tuple_size(ColBg) =:= 3; tuple_size(ColBg) =:= 4 ->
   ?CLASS(ThisT,wxCalendarCtrl),
   wxe_util:cast(?wxCalendarCtrl_SetHolidayColours,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(ColFg)):16/binary,(wxe_util:colour_bin(ColBg)):16/binary>>).
 
-%% @spec (This::wxCalendarCtrl()) -> wx:colour()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendarctrl.html#wxcalendarctrlgetholidaycolourfg">external documentation</a>.
+-spec getHolidayColourFg(This) -> wx:wx_colour() when
+	This::wxCalendarCtrl().
 getHolidayColourFg(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxCalendarCtrl),
   wxe_util:call(?wxCalendarCtrl_GetHolidayColourFg,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxCalendarCtrl()) -> wx:colour()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendarctrl.html#wxcalendarctrlgetholidaycolourbg">external documentation</a>.
+-spec getHolidayColourBg(This) -> wx:wx_colour() when
+	This::wxCalendarCtrl().
 getHolidayColourBg(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxCalendarCtrl),
   wxe_util:call(?wxCalendarCtrl_GetHolidayColourBg,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxCalendarCtrl(), Day::integer()) -> wxCalendarDateAttr:wxCalendarDateAttr()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendarctrl.html#wxcalendarctrlgetattr">external documentation</a>.
+-spec getAttr(This, Day) -> wxCalendarDateAttr:wxCalendarDateAttr() when
+	This::wxCalendarCtrl(), Day::integer().
 getAttr(#wx_ref{type=ThisT,ref=ThisRef},Day)
  when is_integer(Day) ->
   ?CLASS(ThisT,wxCalendarCtrl),
   wxe_util:call(?wxCalendarCtrl_GetAttr,
   <<ThisRef:32/?UI,Day:32/?UI>>).
 
-%% @spec (This::wxCalendarCtrl(), Day::integer(), Attr::wxCalendarDateAttr:wxCalendarDateAttr()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendarctrl.html#wxcalendarctrlsetattr">external documentation</a>.
+-spec setAttr(This, Day, Attr) -> ok when
+	This::wxCalendarCtrl(), Day::integer(), Attr::wxCalendarDateAttr:wxCalendarDateAttr().
 setAttr(#wx_ref{type=ThisT,ref=ThisRef},Day,#wx_ref{type=AttrT,ref=AttrRef})
  when is_integer(Day) ->
   ?CLASS(ThisT,wxCalendarCtrl),
@@ -281,36 +317,38 @@ setAttr(#wx_ref{type=ThisT,ref=ThisRef},Day,#wx_ref{type=AttrT,ref=AttrRef})
   wxe_util:cast(?wxCalendarCtrl_SetAttr,
   <<ThisRef:32/?UI,Day:32/?UI,AttrRef:32/?UI>>).
 
-%% @spec (This::wxCalendarCtrl(), Day::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendarctrl.html#wxcalendarctrlsetholiday">external documentation</a>.
+-spec setHoliday(This, Day) -> ok when
+	This::wxCalendarCtrl(), Day::integer().
 setHoliday(#wx_ref{type=ThisT,ref=ThisRef},Day)
  when is_integer(Day) ->
   ?CLASS(ThisT,wxCalendarCtrl),
   wxe_util:cast(?wxCalendarCtrl_SetHoliday,
   <<ThisRef:32/?UI,Day:32/?UI>>).
 
-%% @spec (This::wxCalendarCtrl(), Day::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendarctrl.html#wxcalendarctrlresetattr">external documentation</a>.
+-spec resetAttr(This, Day) -> ok when
+	This::wxCalendarCtrl(), Day::integer().
 resetAttr(#wx_ref{type=ThisT,ref=ThisRef},Day)
  when is_integer(Day) ->
   ?CLASS(ThisT,wxCalendarCtrl),
   wxe_util:cast(?wxCalendarCtrl_ResetAttr,
   <<ThisRef:32/?UI,Day:32/?UI>>).
 
-%% @spec (This::wxCalendarCtrl(), Pos::{X::integer(), Y::integer()}) -> {WxCalendarHitTestResult, Date::wx:datetime(), Wd::WeekDay}
-%% WxCalendarHitTestResult = integer()
-%% WeekDay = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendarctrl.html#wxcalendarctrlhittest">external documentation</a>.
-%%<br /> WxCalendarHitTestResult is one of ?wxCAL_HITTEST_NOWHERE | ?wxCAL_HITTEST_HEADER | ?wxCAL_HITTEST_DAY | ?wxCAL_HITTEST_INCMONTH | ?wxCAL_HITTEST_DECMONTH | ?wxCAL_HITTEST_SURROUNDING_WEEK
-%%<br /> WeekDay is one of ?wxDateTime_Sun | ?wxDateTime_Mon | ?wxDateTime_Tue | ?wxDateTime_Wed | ?wxDateTime_Thu | ?wxDateTime_Fri | ?wxDateTime_Sat | ?wxDateTime_Inv_WeekDay
+%%<br /> Res = ?wxCAL_HITTEST_NOWHERE | ?wxCAL_HITTEST_HEADER | ?wxCAL_HITTEST_DAY | ?wxCAL_HITTEST_INCMONTH | ?wxCAL_HITTEST_DECMONTH | ?wxCAL_HITTEST_SURROUNDING_WEEK
+%%<br /> Wd = ?wxDateTime_Sun | ?wxDateTime_Mon | ?wxDateTime_Tue | ?wxDateTime_Wed | ?wxDateTime_Thu | ?wxDateTime_Fri | ?wxDateTime_Sat | ?wxDateTime_Inv_WeekDay
+-spec hitTest(This, Pos) -> Result when
+	Result ::{Res ::wx:wx_enum(), Date::wx:wx_datetime(), Wd::wx:wx_enum()},
+	This::wxCalendarCtrl(), Pos::{X::integer(), Y::integer()}.
 hitTest(#wx_ref{type=ThisT,ref=ThisRef},{PosX,PosY})
  when is_integer(PosX),is_integer(PosY) ->
   ?CLASS(ThisT,wxCalendarCtrl),
   wxe_util:call(?wxCalendarCtrl_HitTest,
   <<ThisRef:32/?UI,PosX:32/?UI,PosY:32/?UI>>).
 
-%% @spec (This::wxCalendarCtrl()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxCalendarCtrl) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxCalendarCtrl),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxCalendarDateAttr.erl b/lib/wx/src/gen/wxCalendarDateAttr.erl
index aea8abbe54..c674aee8d6 100644
--- a/lib/wx/src/gen/wxCalendarDateAttr.erl
+++ b/lib/wx/src/gen/wxCalendarDateAttr.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -32,22 +32,22 @@
 %% inherited exports
 -export([parent_class/1]).
 
+-export_type([wxCalendarDateAttr/0]).
 %% @hidden
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxCalendarDateAttr()
+-type wxCalendarDateAttr() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendardateattr.html#wxcalendardateattrwxcalendardateattr">external documentation</a>.
+-spec new() -> wxCalendarDateAttr().
 new() ->
   wxe_util:construct(?wxCalendarDateAttr_new_0,
   <<>>).
 
-%% @spec (X::WxCalendarDateBorder|term()) -> wxCalendarDateAttr()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendardateattr.html#wxcalendardateattrwxcalendardateattr">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% new(Border::WxCalendarDateBorder) -> new(Border, []) </c></p>
-%% <p><c>
-%% new(ColText::wx:colour()) -> new(ColText, []) </c></p>
+-spec new(Border) -> wxCalendarDateAttr() when
+	Border::wx:wx_enum();
+      (ColText) -> wxCalendarDateAttr() when
+	ColText::wx:wx_colour().
 
 new(Border)
  when is_integer(Border) ->
@@ -57,21 +57,16 @@ new(ColText)
  when tuple_size(ColText) =:= 3; tuple_size(ColText) =:= 4 ->
   new(ColText, []).
 
-%% @spec (X::WxCalendarDateBorder|term(),[Option]) -> wxCalendarDateAttr()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendardateattr.html#wxcalendardateattrwxcalendardateattr">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% new(Border::WxCalendarDateBorder, [Option]) -> wxCalendarDateAttr() </c>
-%%<br /> Option = {colBorder, wx:colour()}
-%%<br /> WxCalendarDateBorder = integer()
-%%<br /> WxCalendarDateBorder is one of ?wxCAL_BORDER_NONE | ?wxCAL_BORDER_SQUARE | ?wxCAL_BORDER_ROUND
-%% </p>
-%% <p><c>
-%% new(ColText::wx:colour(), [Option]) -> wxCalendarDateAttr() </c>
-%%<br /> Option = {colBack, wx:colour()} | {colBorder, wx:colour()} | {font, wxFont:wxFont()} | {border, WxCalendarDateBorder}
-%%<br /> WxCalendarDateBorder = integer()
-%%<br /> WxCalendarDateBorder is one of ?wxCAL_BORDER_NONE | ?wxCAL_BORDER_SQUARE | ?wxCAL_BORDER_ROUND
-%% </p>
+-spec new(Border, [Option]) -> wxCalendarDateAttr() when
+	Border::wx:wx_enum(),
+	Option :: {colBorder, wx:wx_colour()};
+      (ColText, [Option]) -> wxCalendarDateAttr() when
+	ColText::wx:wx_colour(),
+	Option :: {colBack, wx:wx_colour()}
+		 | {colBorder, wx:wx_colour()}
+		 | {font, wxFont:wxFont()}
+		 | {border, wx:wx_enum()}.
 new(Border, Options)
  when is_integer(Border),is_list(Options) ->
   MOpts = fun({colBorder, ColBorder}, Acc) -> [<<1:32/?UI,(wxe_util:colour_bin(ColBorder)):16/binary,0:32>>|Acc];
@@ -90,137 +85,152 @@ new(ColText, Options)
   wxe_util:construct(?wxCalendarDateAttr_new_2_1,
   <<(wxe_util:colour_bin(ColText)):16/binary, BinOpt/binary>>).
 
-%% @spec (This::wxCalendarDateAttr(), ColText::wx:colour()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendardateattr.html#wxcalendardateattrsettextcolour">external documentation</a>.
+-spec setTextColour(This, ColText) -> ok when
+	This::wxCalendarDateAttr(), ColText::wx:wx_colour().
 setTextColour(#wx_ref{type=ThisT,ref=ThisRef},ColText)
  when tuple_size(ColText) =:= 3; tuple_size(ColText) =:= 4 ->
   ?CLASS(ThisT,wxCalendarDateAttr),
   wxe_util:cast(?wxCalendarDateAttr_SetTextColour,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(ColText)):16/binary>>).
 
-%% @spec (This::wxCalendarDateAttr(), ColBack::wx:colour()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendardateattr.html#wxcalendardateattrsetbackgroundcolour">external documentation</a>.
+-spec setBackgroundColour(This, ColBack) -> ok when
+	This::wxCalendarDateAttr(), ColBack::wx:wx_colour().
 setBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef},ColBack)
  when tuple_size(ColBack) =:= 3; tuple_size(ColBack) =:= 4 ->
   ?CLASS(ThisT,wxCalendarDateAttr),
   wxe_util:cast(?wxCalendarDateAttr_SetBackgroundColour,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(ColBack)):16/binary>>).
 
-%% @spec (This::wxCalendarDateAttr(), Col::wx:colour()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendardateattr.html#wxcalendardateattrsetbordercolour">external documentation</a>.
+-spec setBorderColour(This, Col) -> ok when
+	This::wxCalendarDateAttr(), Col::wx:wx_colour().
 setBorderColour(#wx_ref{type=ThisT,ref=ThisRef},Col)
  when tuple_size(Col) =:= 3; tuple_size(Col) =:= 4 ->
   ?CLASS(ThisT,wxCalendarDateAttr),
   wxe_util:cast(?wxCalendarDateAttr_SetBorderColour,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(Col)):16/binary>>).
 
-%% @spec (This::wxCalendarDateAttr(), Font::wxFont:wxFont()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendardateattr.html#wxcalendardateattrsetfont">external documentation</a>.
+-spec setFont(This, Font) -> ok when
+	This::wxCalendarDateAttr(), Font::wxFont:wxFont().
 setFont(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FontT,ref=FontRef}) ->
   ?CLASS(ThisT,wxCalendarDateAttr),
   ?CLASS(FontT,wxFont),
   wxe_util:cast(?wxCalendarDateAttr_SetFont,
   <<ThisRef:32/?UI,FontRef:32/?UI>>).
 
-%% @spec (This::wxCalendarDateAttr(), Border::WxCalendarDateBorder) -> ok
-%% WxCalendarDateBorder = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendardateattr.html#wxcalendardateattrsetborder">external documentation</a>.
-%%<br /> WxCalendarDateBorder is one of ?wxCAL_BORDER_NONE | ?wxCAL_BORDER_SQUARE | ?wxCAL_BORDER_ROUND
+%%<br /> Border = ?wxCAL_BORDER_NONE | ?wxCAL_BORDER_SQUARE | ?wxCAL_BORDER_ROUND
+-spec setBorder(This, Border) -> ok when
+	This::wxCalendarDateAttr(), Border::wx:wx_enum().
 setBorder(#wx_ref{type=ThisT,ref=ThisRef},Border)
  when is_integer(Border) ->
   ?CLASS(ThisT,wxCalendarDateAttr),
   wxe_util:cast(?wxCalendarDateAttr_SetBorder,
   <<ThisRef:32/?UI,Border:32/?UI>>).
 
-%% @spec (This::wxCalendarDateAttr(), Holiday::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendardateattr.html#wxcalendardateattrsetholiday">external documentation</a>.
+-spec setHoliday(This, Holiday) -> ok when
+	This::wxCalendarDateAttr(), Holiday::boolean().
 setHoliday(#wx_ref{type=ThisT,ref=ThisRef},Holiday)
  when is_boolean(Holiday) ->
   ?CLASS(ThisT,wxCalendarDateAttr),
   wxe_util:cast(?wxCalendarDateAttr_SetHoliday,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Holiday)):32/?UI>>).
 
-%% @spec (This::wxCalendarDateAttr()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendardateattr.html#wxcalendardateattrhastextcolour">external documentation</a>.
+-spec hasTextColour(This) -> boolean() when
+	This::wxCalendarDateAttr().
 hasTextColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxCalendarDateAttr),
   wxe_util:call(?wxCalendarDateAttr_HasTextColour,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxCalendarDateAttr()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendardateattr.html#wxcalendardateattrhasbackgroundcolour">external documentation</a>.
+-spec hasBackgroundColour(This) -> boolean() when
+	This::wxCalendarDateAttr().
 hasBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxCalendarDateAttr),
   wxe_util:call(?wxCalendarDateAttr_HasBackgroundColour,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxCalendarDateAttr()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendardateattr.html#wxcalendardateattrhasbordercolour">external documentation</a>.
+-spec hasBorderColour(This) -> boolean() when
+	This::wxCalendarDateAttr().
 hasBorderColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxCalendarDateAttr),
   wxe_util:call(?wxCalendarDateAttr_HasBorderColour,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxCalendarDateAttr()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendardateattr.html#wxcalendardateattrhasfont">external documentation</a>.
+-spec hasFont(This) -> boolean() when
+	This::wxCalendarDateAttr().
 hasFont(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxCalendarDateAttr),
   wxe_util:call(?wxCalendarDateAttr_HasFont,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxCalendarDateAttr()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendardateattr.html#wxcalendardateattrhasborder">external documentation</a>.
+-spec hasBorder(This) -> boolean() when
+	This::wxCalendarDateAttr().
 hasBorder(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxCalendarDateAttr),
   wxe_util:call(?wxCalendarDateAttr_HasBorder,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxCalendarDateAttr()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendardateattr.html#wxcalendardateattrisholiday">external documentation</a>.
+-spec isHoliday(This) -> boolean() when
+	This::wxCalendarDateAttr().
 isHoliday(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxCalendarDateAttr),
   wxe_util:call(?wxCalendarDateAttr_IsHoliday,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxCalendarDateAttr()) -> wx:colour()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendardateattr.html#wxcalendardateattrgettextcolour">external documentation</a>.
+-spec getTextColour(This) -> wx:wx_colour() when
+	This::wxCalendarDateAttr().
 getTextColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxCalendarDateAttr),
   wxe_util:call(?wxCalendarDateAttr_GetTextColour,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxCalendarDateAttr()) -> wx:colour()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendardateattr.html#wxcalendardateattrgetbackgroundcolour">external documentation</a>.
+-spec getBackgroundColour(This) -> wx:wx_colour() when
+	This::wxCalendarDateAttr().
 getBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxCalendarDateAttr),
   wxe_util:call(?wxCalendarDateAttr_GetBackgroundColour,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxCalendarDateAttr()) -> wx:colour()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendardateattr.html#wxcalendardateattrgetbordercolour">external documentation</a>.
+-spec getBorderColour(This) -> wx:wx_colour() when
+	This::wxCalendarDateAttr().
 getBorderColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxCalendarDateAttr),
   wxe_util:call(?wxCalendarDateAttr_GetBorderColour,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxCalendarDateAttr()) -> wxFont:wxFont()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendardateattr.html#wxcalendardateattrgetfont">external documentation</a>.
+-spec getFont(This) -> wxFont:wxFont() when
+	This::wxCalendarDateAttr().
 getFont(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxCalendarDateAttr),
   wxe_util:call(?wxCalendarDateAttr_GetFont,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxCalendarDateAttr()) -> WxCalendarDateBorder
-%% WxCalendarDateBorder = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendardateattr.html#wxcalendardateattrgetborder">external documentation</a>.
-%%<br /> WxCalendarDateBorder is one of ?wxCAL_BORDER_NONE | ?wxCAL_BORDER_SQUARE | ?wxCAL_BORDER_ROUND
+%%<br /> Res = ?wxCAL_BORDER_NONE | ?wxCAL_BORDER_SQUARE | ?wxCAL_BORDER_ROUND
+-spec getBorder(This) -> wx:wx_enum() when
+	This::wxCalendarDateAttr().
 getBorder(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxCalendarDateAttr),
   wxe_util:call(?wxCalendarDateAttr_GetBorder,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxCalendarDateAttr()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxCalendarDateAttr) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxCalendarDateAttr),
   wxe_util:destroy(?wxCalendarDateAttr_destroy,Obj),
diff --git a/lib/wx/src/gen/wxCalendarEvent.erl b/lib/wx/src/gen/wxCalendarEvent.erl
index 40723711af..c062a7fa0d 100644
--- a/lib/wx/src/gen/wxCalendarEvent.erl
+++ b/lib/wx/src/gen/wxCalendarEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -41,16 +41,18 @@
   isSelection/1,parent_class/1,resumePropagation/2,setInt/2,setString/2,
   shouldPropagate/1,skip/1,skip/2,stopPropagation/1]).
 
+-export_type([wxCalendarEvent/0]).
 %% @hidden
 parent_class(wxDateEvent) -> true;
 parent_class(wxCommandEvent) -> true;
 parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (This::wxCalendarEvent()) -> WeekDay
-%% WeekDay = integer()
+-type wxCalendarEvent() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendarevent.html#wxcalendareventgetweekday">external documentation</a>.
-%%<br /> WeekDay is one of ?wxDateTime_Sun | ?wxDateTime_Mon | ?wxDateTime_Tue | ?wxDateTime_Wed | ?wxDateTime_Thu | ?wxDateTime_Fri | ?wxDateTime_Sat | ?wxDateTime_Inv_WeekDay
+%%<br /> Res = ?wxDateTime_Sun | ?wxDateTime_Mon | ?wxDateTime_Tue | ?wxDateTime_Wed | ?wxDateTime_Thu | ?wxDateTime_Fri | ?wxDateTime_Sat | ?wxDateTime_Inv_WeekDay
+-spec getWeekDay(This) -> wx:wx_enum() when
+	This::wxCalendarEvent().
 getWeekDay(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxCalendarEvent),
   wxe_util:call(?wxCalendarEvent_GetWeekDay,
diff --git a/lib/wx/src/gen/wxCaret.erl b/lib/wx/src/gen/wxCaret.erl
index cbd868f388..a1f8c29a7f 100644
--- a/lib/wx/src/gen/wxCaret.erl
+++ b/lib/wx/src/gen/wxCaret.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -31,27 +31,32 @@
 %% inherited exports
 -export([parent_class/1]).
 
+-export_type([wxCaret/0]).
 %% @hidden
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (Window::wxWindow:wxWindow(), Size::{W::integer(), H::integer()}) -> wxCaret()
+-type wxCaret() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcaret.html#wxcaretwxcaret">external documentation</a>.
+-spec new(Window, Size) -> wxCaret() when
+	Window::wxWindow:wxWindow(), Size::{W::integer(), H::integer()}.
 new(#wx_ref{type=WindowT,ref=WindowRef},{SizeW,SizeH})
  when is_integer(SizeW),is_integer(SizeH) ->
   ?CLASS(WindowT,wxWindow),
   wxe_util:construct(?wxCaret_new_2,
   <<WindowRef:32/?UI,SizeW:32/?UI,SizeH:32/?UI>>).
 
-%% @spec (Window::wxWindow:wxWindow(), Width::integer(), Height::integer()) -> wxCaret()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcaret.html#wxcaretwxcaret">external documentation</a>.
+-spec new(Window, Width, Height) -> wxCaret() when
+	Window::wxWindow:wxWindow(), Width::integer(), Height::integer().
 new(#wx_ref{type=WindowT,ref=WindowRef},Width,Height)
  when is_integer(Width),is_integer(Height) ->
   ?CLASS(WindowT,wxWindow),
   wxe_util:construct(?wxCaret_new_3,
   <<WindowRef:32/?UI,Width:32/?UI,Height:32/?UI>>).
 
-%% @spec (This::wxCaret(), Window::wxWindow:wxWindow(), Size::{W::integer(), H::integer()}) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcaret.html#wxcaretcreate">external documentation</a>.
+-spec create(This, Window, Size) -> boolean() when
+	This::wxCaret(), Window::wxWindow:wxWindow(), Size::{W::integer(), H::integer()}.
 create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef},{SizeW,SizeH})
  when is_integer(SizeW),is_integer(SizeH) ->
   ?CLASS(ThisT,wxCaret),
@@ -59,8 +64,9 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef},{Size
   wxe_util:call(?wxCaret_Create_2,
   <<ThisRef:32/?UI,WindowRef:32/?UI,SizeW:32/?UI,SizeH:32/?UI>>).
 
-%% @spec (This::wxCaret(), Window::wxWindow:wxWindow(), Width::integer(), Height::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcaret.html#wxcaretcreate">external documentation</a>.
+-spec create(This, Window, Width, Height) -> boolean() when
+	This::wxCaret(), Window::wxWindow:wxWindow(), Width::integer(), Height::integer().
 create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef},Width,Height)
  when is_integer(Width),is_integer(Height) ->
   ?CLASS(ThisT,wxCaret),
@@ -68,102 +74,116 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef},Width
   wxe_util:call(?wxCaret_Create_3,
   <<ThisRef:32/?UI,WindowRef:32/?UI,Width:32/?UI,Height:32/?UI>>).
 
-%% @spec () -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcaret.html#wxcaretgetblinktime">external documentation</a>.
+-spec getBlinkTime() -> integer().
 getBlinkTime() ->
   wxe_util:call(?wxCaret_GetBlinkTime,
   <<>>).
 
-%% @spec (This::wxCaret()) -> {X::integer(), Y::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcaret.html#wxcaretgetposition">external documentation</a>.
+-spec getPosition(This) -> {X::integer(), Y::integer()} when
+	This::wxCaret().
 getPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxCaret),
   wxe_util:call(?wxCaret_GetPosition,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxCaret()) -> {W::integer(), H::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcaret.html#wxcaretgetsize">external documentation</a>.
+-spec getSize(This) -> {W::integer(), H::integer()} when
+	This::wxCaret().
 getSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxCaret),
   wxe_util:call(?wxCaret_GetSize,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxCaret()) -> wxWindow:wxWindow()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcaret.html#wxcaretgetwindow">external documentation</a>.
+-spec getWindow(This) -> wxWindow:wxWindow() when
+	This::wxCaret().
 getWindow(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxCaret),
   wxe_util:call(?wxCaret_GetWindow,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxCaret()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcaret.html#wxcarethide">external documentation</a>.
+-spec hide(This) -> ok when
+	This::wxCaret().
 hide(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxCaret),
   wxe_util:cast(?wxCaret_Hide,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxCaret()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcaret.html#wxcaretisok">external documentation</a>.
+-spec isOk(This) -> boolean() when
+	This::wxCaret().
 isOk(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxCaret),
   wxe_util:call(?wxCaret_IsOk,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxCaret()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcaret.html#wxcaretisvisible">external documentation</a>.
+-spec isVisible(This) -> boolean() when
+	This::wxCaret().
 isVisible(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxCaret),
   wxe_util:call(?wxCaret_IsVisible,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxCaret(), Pt::{X::integer(), Y::integer()}) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcaret.html#wxcaretmove">external documentation</a>.
+-spec move(This, Pt) -> ok when
+	This::wxCaret(), Pt::{X::integer(), Y::integer()}.
 move(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY})
  when is_integer(PtX),is_integer(PtY) ->
   ?CLASS(ThisT,wxCaret),
   wxe_util:cast(?wxCaret_Move_1,
   <<ThisRef:32/?UI,PtX:32/?UI,PtY:32/?UI>>).
 
-%% @spec (This::wxCaret(), X::integer(), Y::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcaret.html#wxcaretmove">external documentation</a>.
+-spec move(This, X, Y) -> ok when
+	This::wxCaret(), X::integer(), Y::integer().
 move(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
  when is_integer(X),is_integer(Y) ->
   ?CLASS(ThisT,wxCaret),
   wxe_util:cast(?wxCaret_Move_2,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI>>).
 
-%% @spec (Milliseconds::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcaret.html#wxcaretsetblinktime">external documentation</a>.
+-spec setBlinkTime(Milliseconds) -> ok when
+	Milliseconds::integer().
 setBlinkTime(Milliseconds)
  when is_integer(Milliseconds) ->
   wxe_util:cast(?wxCaret_SetBlinkTime,
   <<Milliseconds:32/?UI>>).
 
-%% @spec (This::wxCaret(), Size::{W::integer(), H::integer()}) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcaret.html#wxcaretsetsize">external documentation</a>.
+-spec setSize(This, Size) -> ok when
+	This::wxCaret(), Size::{W::integer(), H::integer()}.
 setSize(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH})
  when is_integer(SizeW),is_integer(SizeH) ->
   ?CLASS(ThisT,wxCaret),
   wxe_util:cast(?wxCaret_SetSize_1,
   <<ThisRef:32/?UI,SizeW:32/?UI,SizeH:32/?UI>>).
 
-%% @spec (This::wxCaret(), Width::integer(), Height::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcaret.html#wxcaretsetsize">external documentation</a>.
+-spec setSize(This, Width, Height) -> ok when
+	This::wxCaret(), Width::integer(), Height::integer().
 setSize(#wx_ref{type=ThisT,ref=ThisRef},Width,Height)
  when is_integer(Width),is_integer(Height) ->
   ?CLASS(ThisT,wxCaret),
   wxe_util:cast(?wxCaret_SetSize_2,
   <<ThisRef:32/?UI,Width:32/?UI,Height:32/?UI>>).
 
-%% @spec (This::wxCaret()) -> ok
 %% @equiv show(This, [])
+-spec show(This) -> ok when
+	This::wxCaret().
+
 show(This)
  when is_record(This, wx_ref) ->
   show(This, []).
 
-%% @spec (This::wxCaret(), [Option]) -> ok
-%% Option = {show, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcaret.html#wxcaretshow">external documentation</a>.
+-spec show(This, [Option]) -> ok when
+	This::wxCaret(),
+	Option :: {show, boolean()}.
 show(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxCaret),
@@ -173,8 +193,8 @@ show(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxCaret_Show,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxCaret()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxCaret) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxCaret),
   wxe_util:destroy(?wxCaret_destruct,Obj),
diff --git a/lib/wx/src/gen/wxCheckBox.erl b/lib/wx/src/gen/wxCheckBox.erl
index 19f01645c1..c629af6488 100644
--- a/lib/wx/src/gen/wxCheckBox.erl
+++ b/lib/wx/src/gen/wxCheckBox.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -71,27 +71,35 @@
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
 
+-export_type([wxCheckBox/0]).
 %% @hidden
 parent_class(wxControl) -> true;
 parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxCheckBox()
+-type wxCheckBox() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcheckbox.html#wxcheckboxwxcheckbox">external documentation</a>.
+-spec new() -> wxCheckBox().
 new() ->
   wxe_util:construct(?wxCheckBox_new_0,
   <<>>).
 
-%% @spec (Parent::wxWindow:wxWindow(), Id::integer(), Label::string()) -> wxCheckBox()
 %% @equiv new(Parent,Id,Label, [])
+-spec new(Parent, Id, Label) -> wxCheckBox() when
+	Parent::wxWindow:wxWindow(), Id::integer(), Label::string().
+
 new(Parent,Id,Label)
  when is_record(Parent, wx_ref),is_integer(Id),is_list(Label) ->
   new(Parent,Id,Label, []).
 
-%% @spec (Parent::wxWindow:wxWindow(), Id::integer(), Label::string(), [Option]) -> wxCheckBox()
-%% Option = {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()} | {validator, wx:wx()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcheckbox.html#wxcheckboxwxcheckbox">external documentation</a>.
+-spec new(Parent, Id, Label, [Option]) -> wxCheckBox() when
+	Parent::wxWindow:wxWindow(), Id::integer(), Label::string(),
+	Option :: {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}
+		 | {validator, wx:wx()}.
 new(#wx_ref{type=ParentT,ref=ParentRef},Id,Label, Options)
  when is_integer(Id),is_list(Label),is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -105,15 +113,21 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Id,Label, Options)
   wxe_util:construct(?wxCheckBox_new_4,
   <<ParentRef:32/?UI,Id:32/?UI,(byte_size(Label_UC)):32/?UI,(Label_UC)/binary, 0:(((8- ((4+byte_size(Label_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxCheckBox(), Parent::wxWindow:wxWindow(), Id::integer(), Label::string()) -> bool()
 %% @equiv create(This,Parent,Id,Label, [])
+-spec create(This, Parent, Id, Label) -> boolean() when
+	This::wxCheckBox(), Parent::wxWindow:wxWindow(), Id::integer(), Label::string().
+
 create(This,Parent,Id,Label)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id),is_list(Label) ->
   create(This,Parent,Id,Label, []).
 
-%% @spec (This::wxCheckBox(), Parent::wxWindow:wxWindow(), Id::integer(), Label::string(), [Option]) -> bool()
-%% Option = {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()} | {validator, wx:wx()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcheckbox.html#wxcheckboxcreate">external documentation</a>.
+-spec create(This, Parent, Id, Label, [Option]) -> boolean() when
+	This::wxCheckBox(), Parent::wxWindow:wxWindow(), Id::integer(), Label::string(),
+	Option :: {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}
+		 | {validator, wx:wx()}.
 create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id,Label, Options)
  when is_integer(Id),is_list(Label),is_list(Options) ->
   ?CLASS(ThisT,wxCheckBox),
@@ -128,63 +142,68 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id,La
   wxe_util:call(?wxCheckBox_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI,Id:32/?UI,(byte_size(Label_UC)):32/?UI,(Label_UC)/binary, 0:(((8- ((0+byte_size(Label_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxCheckBox()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcheckbox.html#wxcheckboxgetvalue">external documentation</a>.
+-spec getValue(This) -> boolean() when
+	This::wxCheckBox().
 getValue(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxCheckBox),
   wxe_util:call(?wxCheckBox_GetValue,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxCheckBox()) -> WxCheckBoxState
-%% WxCheckBoxState = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcheckbox.html#wxcheckboxget3statevalue">external documentation</a>.
-%%<br /> WxCheckBoxState is one of ?wxCHK_UNCHECKED | ?wxCHK_CHECKED | ?wxCHK_UNDETERMINED
+%%<br /> Res = ?wxCHK_UNCHECKED | ?wxCHK_CHECKED | ?wxCHK_UNDETERMINED
+-spec get3StateValue(This) -> wx:wx_enum() when
+	This::wxCheckBox().
 get3StateValue(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxCheckBox),
   wxe_util:call(?wxCheckBox_Get3StateValue,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxCheckBox()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcheckbox.html#wxcheckboxis3rdstateallowedforuser">external documentation</a>.
+-spec is3rdStateAllowedForUser(This) -> boolean() when
+	This::wxCheckBox().
 is3rdStateAllowedForUser(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxCheckBox),
   wxe_util:call(?wxCheckBox_Is3rdStateAllowedForUser,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxCheckBox()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcheckbox.html#wxcheckboxis3state">external documentation</a>.
+-spec is3State(This) -> boolean() when
+	This::wxCheckBox().
 is3State(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxCheckBox),
   wxe_util:call(?wxCheckBox_Is3State,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxCheckBox()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcheckbox.html#wxcheckboxischecked">external documentation</a>.
+-spec isChecked(This) -> boolean() when
+	This::wxCheckBox().
 isChecked(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxCheckBox),
   wxe_util:call(?wxCheckBox_IsChecked,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxCheckBox(), State::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcheckbox.html#wxcheckboxsetvalue">external documentation</a>.
+-spec setValue(This, State) -> ok when
+	This::wxCheckBox(), State::boolean().
 setValue(#wx_ref{type=ThisT,ref=ThisRef},State)
  when is_boolean(State) ->
   ?CLASS(ThisT,wxCheckBox),
   wxe_util:cast(?wxCheckBox_SetValue,
   <<ThisRef:32/?UI,(wxe_util:from_bool(State)):32/?UI>>).
 
-%% @spec (This::wxCheckBox(), State::WxCheckBoxState) -> ok
-%% WxCheckBoxState = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcheckbox.html#wxcheckboxset3statevalue">external documentation</a>.
-%%<br /> WxCheckBoxState is one of ?wxCHK_UNCHECKED | ?wxCHK_CHECKED | ?wxCHK_UNDETERMINED
+%%<br /> State = ?wxCHK_UNCHECKED | ?wxCHK_CHECKED | ?wxCHK_UNDETERMINED
+-spec set3StateValue(This, State) -> ok when
+	This::wxCheckBox(), State::wx:wx_enum().
 set3StateValue(#wx_ref{type=ThisT,ref=ThisRef},State)
  when is_integer(State) ->
   ?CLASS(ThisT,wxCheckBox),
   wxe_util:cast(?wxCheckBox_Set3StateValue,
   <<ThisRef:32/?UI,State:32/?UI>>).
 
-%% @spec (This::wxCheckBox()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxCheckBox) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxCheckBox),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxCheckListBox.erl b/lib/wx/src/gen/wxCheckListBox.erl
index a1a07e1eec..457d58eebc 100644
--- a/lib/wx/src/gen/wxCheckListBox.erl
+++ b/lib/wx/src/gen/wxCheckListBox.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -75,6 +75,7 @@
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
 
+-export_type([wxCheckListBox/0]).
 %% @hidden
 parent_class(wxListBox) -> true;
 parent_class(wxControlWithItems) -> true;
@@ -83,21 +84,29 @@ parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxCheckListBox()
+-type wxCheckListBox() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchecklistbox.html#wxchecklistboxwxchecklistbox">external documentation</a>.
+-spec new() -> wxCheckListBox().
 new() ->
   wxe_util:construct(?wxCheckListBox_new_0,
   <<>>).
 
-%% @spec (Parent::wxWindow:wxWindow(), Id::integer()) -> wxCheckListBox()
 %% @equiv new(Parent,Id, [])
+-spec new(Parent, Id) -> wxCheckListBox() when
+	Parent::wxWindow:wxWindow(), Id::integer().
+
 new(Parent,Id)
  when is_record(Parent, wx_ref),is_integer(Id) ->
   new(Parent,Id, []).
 
-%% @spec (Parent::wxWindow:wxWindow(), Id::integer(), [Option]) -> wxCheckListBox()
-%% Option = {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {choices, [[string()]]} | {style, integer()} | {validator, wx:wx()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchecklistbox.html#wxchecklistboxwxchecklistbox">external documentation</a>.
+-spec new(Parent, Id, [Option]) -> wxCheckListBox() when
+	Parent::wxWindow:wxWindow(), Id::integer(),
+	Option :: {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {choices, [[string()]]}
+		 | {style, integer()}
+		 | {validator, wx:wx()}.
 new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
  when is_integer(Id),is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -111,15 +120,18 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
   wxe_util:construct(?wxCheckListBox_new_3,
   <<ParentRef:32/?UI,Id:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxCheckListBox(), Index::integer()) -> ok
 %% @equiv check(This,Index, [])
+-spec check(This, Index) -> ok when
+	This::wxCheckListBox(), Index::integer().
+
 check(This,Index)
  when is_record(This, wx_ref),is_integer(Index) ->
   check(This,Index, []).
 
-%% @spec (This::wxCheckListBox(), Index::integer(), [Option]) -> ok
-%% Option = {check, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchecklistbox.html#wxchecklistboxcheck">external documentation</a>.
+-spec check(This, Index, [Option]) -> ok when
+	This::wxCheckListBox(), Index::integer(),
+	Option :: {check, boolean()}.
 check(#wx_ref{type=ThisT,ref=ThisRef},Index, Options)
  when is_integer(Index),is_list(Options) ->
   ?CLASS(ThisT,wxCheckListBox),
@@ -129,16 +141,17 @@ check(#wx_ref{type=ThisT,ref=ThisRef},Index, Options)
   wxe_util:cast(?wxCheckListBox_Check,
   <<ThisRef:32/?UI,Index:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxCheckListBox(), Index::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchecklistbox.html#wxchecklistboxischecked">external documentation</a>.
+-spec isChecked(This, Index) -> boolean() when
+	This::wxCheckListBox(), Index::integer().
 isChecked(#wx_ref{type=ThisT,ref=ThisRef},Index)
  when is_integer(Index) ->
   ?CLASS(ThisT,wxCheckListBox),
   wxe_util:call(?wxCheckListBox_IsChecked,
   <<ThisRef:32/?UI,Index:32/?UI>>).
 
-%% @spec (This::wxCheckListBox()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxCheckListBox) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxCheckListBox),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxChildFocusEvent.erl b/lib/wx/src/gen/wxChildFocusEvent.erl
index a20071cbf5..642db88c06 100644
--- a/lib/wx/src/gen/wxChildFocusEvent.erl
+++ b/lib/wx/src/gen/wxChildFocusEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -40,13 +40,16 @@
   parent_class/1,resumePropagation/2,setInt/2,setString/2,shouldPropagate/1,
   skip/1,skip/2,stopPropagation/1]).
 
+-export_type([wxChildFocusEvent/0]).
 %% @hidden
 parent_class(wxCommandEvent) -> true;
 parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (This::wxChildFocusEvent()) -> wxWindow:wxWindow()
+-type wxChildFocusEvent() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchildfocusevent.html#wxchildfocuseventgetwindow">external documentation</a>.
+-spec getWindow(This) -> wxWindow:wxWindow() when
+	This::wxChildFocusEvent().
 getWindow(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxChildFocusEvent),
   wxe_util:call(?wxChildFocusEvent_GetWindow,
diff --git a/lib/wx/src/gen/wxChoice.erl b/lib/wx/src/gen/wxChoice.erl
index fa967d8487..983e74e65a 100644
--- a/lib/wx/src/gen/wxChoice.erl
+++ b/lib/wx/src/gen/wxChoice.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -74,6 +74,7 @@
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
 
+-export_type([wxChoice/0]).
 %% @hidden
 parent_class(wxControlWithItems) -> true;
 parent_class(wxControl) -> true;
@@ -81,21 +82,29 @@ parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxChoice()
+-type wxChoice() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoice.html#wxchoicewxchoice">external documentation</a>.
+-spec new() -> wxChoice().
 new() ->
   wxe_util:construct(?wxChoice_new_0,
   <<>>).
 
-%% @spec (Parent::wxWindow:wxWindow(), Id::integer()) -> wxChoice()
 %% @equiv new(Parent,Id, [])
+-spec new(Parent, Id) -> wxChoice() when
+	Parent::wxWindow:wxWindow(), Id::integer().
+
 new(Parent,Id)
  when is_record(Parent, wx_ref),is_integer(Id) ->
   new(Parent,Id, []).
 
-%% @spec (Parent::wxWindow:wxWindow(), Id::integer(), [Option]) -> wxChoice()
-%% Option = {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {choices, [[string()]]} | {style, integer()} | {validator, wx:wx()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoice.html#wxchoicewxchoice">external documentation</a>.
+-spec new(Parent, Id, [Option]) -> wxChoice() when
+	Parent::wxWindow:wxWindow(), Id::integer(),
+	Option :: {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {choices, [[string()]]}
+		 | {style, integer()}
+		 | {validator, wx:wx()}.
 new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
  when is_integer(Id),is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -109,15 +118,19 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
   wxe_util:construct(?wxChoice_new_3,
   <<ParentRef:32/?UI,Id:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxChoice(), Parent::wxWindow:wxWindow(), Id::integer(), Pos::{X::integer(), Y::integer()}, Size::{W::integer(), H::integer()}, Choices::[[string()]]) -> bool()
 %% @equiv create(This,Parent,Id,Pos,Size,Choices, [])
+-spec create(This, Parent, Id, Pos, Size, Choices) -> boolean() when
+	This::wxChoice(), Parent::wxWindow:wxWindow(), Id::integer(), Pos::{X::integer(), Y::integer()}, Size::{W::integer(), H::integer()}, Choices::[[string()]].
+
 create(This,Parent,Id,Pos={PosX,PosY},Size={SizeW,SizeH},Choices)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id),is_integer(PosX),is_integer(PosY),is_integer(SizeW),is_integer(SizeH),is_list(Choices) ->
   create(This,Parent,Id,Pos,Size,Choices, []).
 
-%% @spec (This::wxChoice(), Parent::wxWindow:wxWindow(), Id::integer(), Pos::{X::integer(), Y::integer()}, Size::{W::integer(), H::integer()}, Choices::[[string()]], [Option]) -> bool()
-%% Option = {style, integer()} | {validator, wx:wx()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoice.html#wxchoicecreate">external documentation</a>.
+-spec create(This, Parent, Id, Pos, Size, Choices, [Option]) -> boolean() when
+	This::wxChoice(), Parent::wxWindow:wxWindow(), Id::integer(), Pos::{X::integer(), Y::integer()}, Size::{W::integer(), H::integer()}, Choices::[[string()]],
+	Option :: {style, integer()}
+		 | {validator, wx:wx()}.
 create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id,{PosX,PosY},{SizeW,SizeH},Choices, Options)
  when is_integer(Id),is_integer(PosX),is_integer(PosY),is_integer(SizeW),is_integer(SizeH),is_list(Choices),is_list(Options) ->
   ?CLASS(ThisT,wxChoice),
@@ -131,30 +144,35 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id,{P
   wxe_util:call(?wxChoice_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI,Id:32/?UI,PosX:32/?UI,PosY:32/?UI,SizeW:32/?UI,SizeH:32/?UI,(length(Choices_UCA)):32/?UI, (<< <<(byte_size(UC_Str)):32/?UI, UC_Str/binary>>|| UC_Str <- Choices_UCA>>)/binary, 0:(((8- ((0 + lists:sum([byte_size(S)+4||S<-Choices_UCA])) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxChoice(), N::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoice.html#wxchoicedelete">external documentation</a>.
+-spec delete(This, N) -> ok when
+	This::wxChoice(), N::integer().
 delete(#wx_ref{type=ThisT,ref=ThisRef},N)
  when is_integer(N) ->
   ?CLASS(ThisT,wxChoice),
   wxe_util:cast(?wxChoice_Delete,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @spec (This::wxChoice()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoice.html#wxchoicegetcolumns">external documentation</a>.
+-spec getColumns(This) -> integer() when
+	This::wxChoice().
 getColumns(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxChoice),
   wxe_util:call(?wxChoice_GetColumns,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxChoice()) -> ok
 %% @equiv setColumns(This, [])
+-spec setColumns(This) -> ok when
+	This::wxChoice().
+
 setColumns(This)
  when is_record(This, wx_ref) ->
   setColumns(This, []).
 
-%% @spec (This::wxChoice(), [Option]) -> ok
-%% Option = {n, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoice.html#wxchoicesetcolumns">external documentation</a>.
+-spec setColumns(This, [Option]) -> ok when
+	This::wxChoice(),
+	Option :: {n, integer()}.
 setColumns(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxChoice),
@@ -164,8 +182,8 @@ setColumns(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxChoice_SetColumns,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxChoice()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxChoice) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxChoice),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxChoicebook.erl b/lib/wx/src/gen/wxChoicebook.erl
index f37457f0ed..556170befa 100644
--- a/lib/wx/src/gen/wxChoicebook.erl
+++ b/lib/wx/src/gen/wxChoicebook.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2012. 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
@@ -74,27 +74,34 @@
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
 
+-export_type([wxChoicebook/0]).
 %% @hidden
 parent_class(wxControl) -> true;
 parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxChoicebook()
+-type wxChoicebook() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoicebook.html#wxchoicebookwxchoicebook">external documentation</a>.
+-spec new() -> wxChoicebook().
 new() ->
   wxe_util:construct(?wxChoicebook_new_0,
   <<>>).
 
-%% @spec (Parent::wxWindow:wxWindow(), Id::integer()) -> wxChoicebook()
 %% @equiv new(Parent,Id, [])
+-spec new(Parent, Id) -> wxChoicebook() when
+	Parent::wxWindow:wxWindow(), Id::integer().
+
 new(Parent,Id)
  when is_record(Parent, wx_ref),is_integer(Id) ->
   new(Parent,Id, []).
 
-%% @spec (Parent::wxWindow:wxWindow(), Id::integer(), [Option]) -> wxChoicebook()
-%% Option = {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoicebook.html#wxchoicebookwxchoicebook">external documentation</a>.
+-spec new(Parent, Id, [Option]) -> wxChoicebook() when
+	Parent::wxWindow:wxWindow(), Id::integer(),
+	Option :: {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}.
 new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
  when is_integer(Id),is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -106,15 +113,19 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
   wxe_util:construct(?wxChoicebook_new_3,
   <<ParentRef:32/?UI,Id:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxChoicebook(), Page::wxWindow:wxWindow(), Text::string()) -> bool()
 %% @equiv addPage(This,Page,Text, [])
+-spec addPage(This, Page, Text) -> boolean() when
+	This::wxChoicebook(), Page::wxWindow:wxWindow(), Text::string().
+
 addPage(This,Page,Text)
  when is_record(This, wx_ref),is_record(Page, wx_ref),is_list(Text) ->
   addPage(This,Page,Text, []).
 
-%% @spec (This::wxChoicebook(), Page::wxWindow:wxWindow(), Text::string(), [Option]) -> bool()
-%% Option = {bSelect, bool()} | {imageId, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoicebook.html#wxchoicebookaddpage">external documentation</a>.
+-spec addPage(This, Page, Text, [Option]) -> boolean() when
+	This::wxChoicebook(), Page::wxWindow:wxWindow(), Text::string(),
+	Option :: {bSelect, boolean()}
+		 | {imageId, integer()}.
 addPage(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PageT,ref=PageRef},Text, Options)
  when is_list(Text),is_list(Options) ->
   ?CLASS(ThisT,wxChoicebook),
@@ -127,15 +138,18 @@ addPage(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PageT,ref=PageRef},Text, Op
   wxe_util:call(?wxChoicebook_AddPage,
   <<ThisRef:32/?UI,PageRef:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((4+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxChoicebook()) -> ok
 %% @equiv advanceSelection(This, [])
+-spec advanceSelection(This) -> ok when
+	This::wxChoicebook().
+
 advanceSelection(This)
  when is_record(This, wx_ref) ->
   advanceSelection(This, []).
 
-%% @spec (This::wxChoicebook(), [Option]) -> ok
-%% Option = {forward, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoicebook.html#wxchoicebookadvanceselection">external documentation</a>.
+-spec advanceSelection(This, [Option]) -> ok when
+	This::wxChoicebook(),
+	Option :: {forward, boolean()}.
 advanceSelection(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxChoicebook),
@@ -145,23 +159,29 @@ advanceSelection(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxChoicebook_AdvanceSelection,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxChoicebook(), ImageList::wxImageList:wxImageList()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoicebook.html#wxchoicebookassignimagelist">external documentation</a>.
+-spec assignImageList(This, ImageList) -> ok when
+	This::wxChoicebook(), ImageList::wxImageList:wxImageList().
 assignImageList(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ImageListT,ref=ImageListRef}) ->
   ?CLASS(ThisT,wxChoicebook),
   ?CLASS(ImageListT,wxImageList),
   wxe_util:cast(?wxChoicebook_AssignImageList,
   <<ThisRef:32/?UI,ImageListRef:32/?UI>>).
 
-%% @spec (This::wxChoicebook(), Parent::wxWindow:wxWindow(), Id::integer()) -> bool()
 %% @equiv create(This,Parent,Id, [])
+-spec create(This, Parent, Id) -> boolean() when
+	This::wxChoicebook(), Parent::wxWindow:wxWindow(), Id::integer().
+
 create(This,Parent,Id)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id) ->
   create(This,Parent,Id, []).
 
-%% @spec (This::wxChoicebook(), Parent::wxWindow:wxWindow(), Id::integer(), [Option]) -> bool()
-%% Option = {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoicebook.html#wxchoicebookcreate">external documentation</a>.
+-spec create(This, Parent, Id, [Option]) -> boolean() when
+	This::wxChoicebook(), Parent::wxWindow:wxWindow(), Id::integer(),
+	Option :: {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}.
 create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
  when is_integer(Id),is_list(Options) ->
   ?CLASS(ThisT,wxChoicebook),
@@ -174,98 +194,114 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id, O
   wxe_util:call(?wxChoicebook_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI,Id:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxChoicebook()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoicebook.html#wxchoicebookdeleteallpages">external documentation</a>.
+-spec deleteAllPages(This) -> boolean() when
+	This::wxChoicebook().
 deleteAllPages(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxChoicebook),
   wxe_util:call(?wxChoicebook_DeleteAllPages,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxChoicebook(), N::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoicebook.html#wxchoicebookdeletepage">external documentation</a>.
+-spec deletePage(This, N) -> boolean() when
+	This::wxChoicebook(), N::integer().
 deletePage(#wx_ref{type=ThisT,ref=ThisRef},N)
  when is_integer(N) ->
   ?CLASS(ThisT,wxChoicebook),
   wxe_util:call(?wxChoicebook_DeletePage,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @spec (This::wxChoicebook(), N::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoicebook.html#wxchoicebookremovepage">external documentation</a>.
+-spec removePage(This, N) -> boolean() when
+	This::wxChoicebook(), N::integer().
 removePage(#wx_ref{type=ThisT,ref=ThisRef},N)
  when is_integer(N) ->
   ?CLASS(ThisT,wxChoicebook),
   wxe_util:call(?wxChoicebook_RemovePage,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @spec (This::wxChoicebook()) -> wxWindow:wxWindow()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoicebook.html#wxchoicebookgetcurrentpage">external documentation</a>.
+-spec getCurrentPage(This) -> wxWindow:wxWindow() when
+	This::wxChoicebook().
 getCurrentPage(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxChoicebook),
   wxe_util:call(?wxChoicebook_GetCurrentPage,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxChoicebook()) -> wxImageList:wxImageList()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoicebook.html#wxchoicebookgetimagelist">external documentation</a>.
+-spec getImageList(This) -> wxImageList:wxImageList() when
+	This::wxChoicebook().
 getImageList(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxChoicebook),
   wxe_util:call(?wxChoicebook_GetImageList,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxChoicebook(), N::integer()) -> wxWindow:wxWindow()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoicebook.html#wxchoicebookgetpage">external documentation</a>.
+-spec getPage(This, N) -> wxWindow:wxWindow() when
+	This::wxChoicebook(), N::integer().
 getPage(#wx_ref{type=ThisT,ref=ThisRef},N)
  when is_integer(N) ->
   ?CLASS(ThisT,wxChoicebook),
   wxe_util:call(?wxChoicebook_GetPage,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @spec (This::wxChoicebook()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoicebook.html#wxchoicebookgetpagecount">external documentation</a>.
+-spec getPageCount(This) -> integer() when
+	This::wxChoicebook().
 getPageCount(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxChoicebook),
   wxe_util:call(?wxChoicebook_GetPageCount,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxChoicebook(), N::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoicebook.html#wxchoicebookgetpageimage">external documentation</a>.
+-spec getPageImage(This, N) -> integer() when
+	This::wxChoicebook(), N::integer().
 getPageImage(#wx_ref{type=ThisT,ref=ThisRef},N)
  when is_integer(N) ->
   ?CLASS(ThisT,wxChoicebook),
   wxe_util:call(?wxChoicebook_GetPageImage,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @spec (This::wxChoicebook(), N::integer()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoicebook.html#wxchoicebookgetpagetext">external documentation</a>.
+-spec getPageText(This, N) -> string() when
+	This::wxChoicebook(), N::integer().
 getPageText(#wx_ref{type=ThisT,ref=ThisRef},N)
  when is_integer(N) ->
   ?CLASS(ThisT,wxChoicebook),
   wxe_util:call(?wxChoicebook_GetPageText,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @spec (This::wxChoicebook()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoicebook.html#wxchoicebookgetselection">external documentation</a>.
+-spec getSelection(This) -> integer() when
+	This::wxChoicebook().
 getSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxChoicebook),
   wxe_util:call(?wxChoicebook_GetSelection,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxChoicebook(), Pt::{X::integer(), Y::integer()}) -> {integer(), Flags::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoicebook.html#wxchoicebookhittest">external documentation</a>.
+-spec hitTest(This, Pt) -> Result when
+	Result ::{Res ::integer(), Flags::integer()},
+	This::wxChoicebook(), Pt::{X::integer(), Y::integer()}.
 hitTest(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY})
  when is_integer(PtX),is_integer(PtY) ->
   ?CLASS(ThisT,wxChoicebook),
   wxe_util:call(?wxChoicebook_HitTest,
   <<ThisRef:32/?UI,PtX:32/?UI,PtY:32/?UI>>).
 
-%% @spec (This::wxChoicebook(), N::integer(), Page::wxWindow:wxWindow(), Text::string()) -> bool()
 %% @equiv insertPage(This,N,Page,Text, [])
+-spec insertPage(This, N, Page, Text) -> boolean() when
+	This::wxChoicebook(), N::integer(), Page::wxWindow:wxWindow(), Text::string().
+
 insertPage(This,N,Page,Text)
  when is_record(This, wx_ref),is_integer(N),is_record(Page, wx_ref),is_list(Text) ->
   insertPage(This,N,Page,Text, []).
 
-%% @spec (This::wxChoicebook(), N::integer(), Page::wxWindow:wxWindow(), Text::string(), [Option]) -> bool()
-%% Option = {bSelect, bool()} | {imageId, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoicebook.html#wxchoicebookinsertpage">external documentation</a>.
+-spec insertPage(This, N, Page, Text, [Option]) -> boolean() when
+	This::wxChoicebook(), N::integer(), Page::wxWindow:wxWindow(), Text::string(),
+	Option :: {bSelect, boolean()}
+		 | {imageId, integer()}.
 insertPage(#wx_ref{type=ThisT,ref=ThisRef},N,#wx_ref{type=PageT,ref=PageRef},Text, Options)
  when is_integer(N),is_list(Text),is_list(Options) ->
   ?CLASS(ThisT,wxChoicebook),
@@ -278,32 +314,36 @@ insertPage(#wx_ref{type=ThisT,ref=ThisRef},N,#wx_ref{type=PageT,ref=PageRef},Tex
   wxe_util:call(?wxChoicebook_InsertPage,
   <<ThisRef:32/?UI,N:32/?UI,PageRef:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxChoicebook(), ImageList::wxImageList:wxImageList()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoicebook.html#wxchoicebooksetimagelist">external documentation</a>.
+-spec setImageList(This, ImageList) -> ok when
+	This::wxChoicebook(), ImageList::wxImageList:wxImageList().
 setImageList(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ImageListT,ref=ImageListRef}) ->
   ?CLASS(ThisT,wxChoicebook),
   ?CLASS(ImageListT,wxImageList),
   wxe_util:cast(?wxChoicebook_SetImageList,
   <<ThisRef:32/?UI,ImageListRef:32/?UI>>).
 
-%% @spec (This::wxChoicebook(), Size::{W::integer(), H::integer()}) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoicebook.html#wxchoicebooksetpagesize">external documentation</a>.
+-spec setPageSize(This, Size) -> ok when
+	This::wxChoicebook(), Size::{W::integer(), H::integer()}.
 setPageSize(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH})
  when is_integer(SizeW),is_integer(SizeH) ->
   ?CLASS(ThisT,wxChoicebook),
   wxe_util:cast(?wxChoicebook_SetPageSize,
   <<ThisRef:32/?UI,SizeW:32/?UI,SizeH:32/?UI>>).
 
-%% @spec (This::wxChoicebook(), N::integer(), ImageId::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoicebook.html#wxchoicebooksetpageimage">external documentation</a>.
+-spec setPageImage(This, N, ImageId) -> boolean() when
+	This::wxChoicebook(), N::integer(), ImageId::integer().
 setPageImage(#wx_ref{type=ThisT,ref=ThisRef},N,ImageId)
  when is_integer(N),is_integer(ImageId) ->
   ?CLASS(ThisT,wxChoicebook),
   wxe_util:call(?wxChoicebook_SetPageImage,
   <<ThisRef:32/?UI,N:32/?UI,ImageId:32/?UI>>).
 
-%% @spec (This::wxChoicebook(), N::integer(), StrText::string()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoicebook.html#wxchoicebooksetpagetext">external documentation</a>.
+-spec setPageText(This, N, StrText) -> boolean() when
+	This::wxChoicebook(), N::integer(), StrText::string().
 setPageText(#wx_ref{type=ThisT,ref=ThisRef},N,StrText)
  when is_integer(N),is_list(StrText) ->
   ?CLASS(ThisT,wxChoicebook),
@@ -311,24 +351,26 @@ setPageText(#wx_ref{type=ThisT,ref=ThisRef},N,StrText)
   wxe_util:call(?wxChoicebook_SetPageText,
   <<ThisRef:32/?UI,N:32/?UI,(byte_size(StrText_UC)):32/?UI,(StrText_UC)/binary, 0:(((8- ((4+byte_size(StrText_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxChoicebook(), N::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoicebook.html#wxchoicebooksetselection">external documentation</a>.
+-spec setSelection(This, N) -> integer() when
+	This::wxChoicebook(), N::integer().
 setSelection(#wx_ref{type=ThisT,ref=ThisRef},N)
  when is_integer(N) ->
   ?CLASS(ThisT,wxChoicebook),
   wxe_util:call(?wxChoicebook_SetSelection,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @spec (This::wxChoicebook(), N::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoicebook.html#wxchoicebookchangeselection">external documentation</a>.
+-spec changeSelection(This, N) -> integer() when
+	This::wxChoicebook(), N::integer().
 changeSelection(#wx_ref{type=ThisT,ref=ThisRef},N)
  when is_integer(N) ->
   ?CLASS(ThisT,wxChoicebook),
   wxe_util:call(?wxChoicebook_ChangeSelection,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @spec (This::wxChoicebook()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxChoicebook) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxChoicebook),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxClientDC.erl b/lib/wx/src/gen/wxClientDC.erl
index c966fb50cc..bdd344ca85 100644
--- a/lib/wx/src/gen/wxClientDC.erl
+++ b/lib/wx/src/gen/wxClientDC.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -53,26 +53,29 @@
   setPen/2,setTextBackground/2,setTextForeground/2,setUserScale/3,startDoc/2,
   startPage/1]).
 
+-export_type([wxClientDC/0]).
 %% @hidden
 parent_class(wxWindowDC) -> true;
 parent_class(wxDC) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxClientDC()
+-type wxClientDC() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxclientdc.html#wxclientdcwxclientdc">external documentation</a>.
+-spec new() -> wxClientDC().
 new() ->
   wxe_util:construct(?wxClientDC_new_0,
   <<>>).
 
-%% @spec (Win::wxWindow:wxWindow()) -> wxClientDC()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxclientdc.html#wxclientdcwxclientdc">external documentation</a>.
+-spec new(Win) -> wxClientDC() when
+	Win::wxWindow:wxWindow().
 new(#wx_ref{type=WinT,ref=WinRef}) ->
   ?CLASS(WinT,wxWindow),
   wxe_util:construct(?wxClientDC_new_1,
   <<WinRef:32/?UI>>).
 
-%% @spec (This::wxClientDC()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxClientDC) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxClientDC),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxClipboard.erl b/lib/wx/src/gen/wxClipboard.erl
index 7ae27b3133..73f57c681e 100644
--- a/lib/wx/src/gen/wxClipboard.erl
+++ b/lib/wx/src/gen/wxClipboard.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -30,83 +30,96 @@
 %% inherited exports
 -export([parent_class/1]).
 
+-export_type([wxClipboard/0]).
 %% @hidden
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxClipboard()
+-type wxClipboard() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxclipboard.html#wxclipboardwxclipboard">external documentation</a>.
+-spec new() -> wxClipboard().
 new() ->
   wxe_util:construct(?wxClipboard_new,
   <<>>).
 
-%% @spec (This::wxClipboard(), Data::wxDataObject:wxDataObject()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxclipboard.html#wxclipboardadddata">external documentation</a>.
+-spec addData(This, Data) -> boolean() when
+	This::wxClipboard(), Data::wxDataObject:wxDataObject().
 addData(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=DataT,ref=DataRef}) ->
   ?CLASS(ThisT,wxClipboard),
   ?CLASS(DataT,wxDataObject),
   wxe_util:call(?wxClipboard_AddData,
   <<ThisRef:32/?UI,DataRef:32/?UI>>).
 
-%% @spec (This::wxClipboard()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxclipboard.html#wxclipboardclear">external documentation</a>.
+-spec clear(This) -> ok when
+	This::wxClipboard().
 clear(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxClipboard),
   wxe_util:cast(?wxClipboard_Clear,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxClipboard()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxclipboard.html#wxclipboardclose">external documentation</a>.
+-spec close(This) -> ok when
+	This::wxClipboard().
 close(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxClipboard),
   wxe_util:cast(?wxClipboard_Close,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxClipboard()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxclipboard.html#wxclipboardflush">external documentation</a>.
+-spec flush(This) -> boolean() when
+	This::wxClipboard().
 flush(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxClipboard),
   wxe_util:call(?wxClipboard_Flush,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxClipboard(), Data::wxDataObject:wxDataObject()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxclipboard.html#wxclipboardgetdata">external documentation</a>.
+-spec getData(This, Data) -> boolean() when
+	This::wxClipboard(), Data::wxDataObject:wxDataObject().
 getData(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=DataT,ref=DataRef}) ->
   ?CLASS(ThisT,wxClipboard),
   ?CLASS(DataT,wxDataObject),
   wxe_util:call(?wxClipboard_GetData,
   <<ThisRef:32/?UI,DataRef:32/?UI>>).
 
-%% @spec (This::wxClipboard()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxclipboard.html#wxclipboardisopened">external documentation</a>.
+-spec isOpened(This) -> boolean() when
+	This::wxClipboard().
 isOpened(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxClipboard),
   wxe_util:call(?wxClipboard_IsOpened,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxClipboard()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxclipboard.html#wxclipboardopen">external documentation</a>.
+-spec open(This) -> boolean() when
+	This::wxClipboard().
 open(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxClipboard),
   wxe_util:call(?wxClipboard_Open,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxClipboard(), Data::wxDataObject:wxDataObject()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxclipboard.html#wxclipboardsetdata">external documentation</a>.
+-spec setData(This, Data) -> boolean() when
+	This::wxClipboard(), Data::wxDataObject:wxDataObject().
 setData(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=DataT,ref=DataRef}) ->
   ?CLASS(ThisT,wxClipboard),
   ?CLASS(DataT,wxDataObject),
   wxe_util:call(?wxClipboard_SetData,
   <<ThisRef:32/?UI,DataRef:32/?UI>>).
 
-%% @spec (This::wxClipboard()) -> ok
 %% @equiv usePrimarySelection(This, [])
+-spec usePrimarySelection(This) -> ok when
+	This::wxClipboard().
+
 usePrimarySelection(This)
  when is_record(This, wx_ref) ->
   usePrimarySelection(This, []).
 
-%% @spec (This::wxClipboard(), [Option]) -> ok
-%% Option = {primary, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxclipboard.html#wxclipboarduseprimaryselection">external documentation</a>.
+-spec usePrimarySelection(This, [Option]) -> ok when
+	This::wxClipboard(),
+	Option :: {primary, boolean()}.
 usePrimarySelection(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxClipboard),
@@ -116,22 +129,23 @@ usePrimarySelection(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxClipboard_UsePrimarySelection,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxClipboard(), Format::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxclipboard.html#wxclipboardissupported">external documentation</a>.
+-spec isSupported(This, Format) -> boolean() when
+	This::wxClipboard(), Format::integer().
 isSupported(#wx_ref{type=ThisT,ref=ThisRef},Format)
  when is_integer(Format) ->
   ?CLASS(ThisT,wxClipboard),
   wxe_util:call(?wxClipboard_IsSupported,
   <<ThisRef:32/?UI,Format:32/?UI>>).
 
-%% @spec () -> wxClipboard()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxclipboard.html#wxclipboardget">external documentation</a>.
+-spec get() -> wxClipboard().
 get() ->
   wxe_util:call(?wxClipboard_Get,
   <<>>).
 
-%% @spec (This::wxClipboard()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxClipboard) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxClipboard),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxCloseEvent.erl b/lib/wx/src/gen/wxCloseEvent.erl
index 706d7701de..4a682c906e 100644
--- a/lib/wx/src/gen/wxCloseEvent.erl
+++ b/lib/wx/src/gen/wxCloseEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -37,49 +37,58 @@
 -export([getId/1,getSkipped/1,getTimestamp/1,isCommandEvent/1,parent_class/1,
   resumePropagation/2,shouldPropagate/1,skip/1,skip/2,stopPropagation/1]).
 
+-export_type([wxCloseEvent/0]).
 %% @hidden
 parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (This::wxCloseEvent()) -> bool()
+-type wxCloseEvent() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcloseevent.html#wxcloseeventcanveto">external documentation</a>.
+-spec canVeto(This) -> boolean() when
+	This::wxCloseEvent().
 canVeto(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxCloseEvent),
   wxe_util:call(?wxCloseEvent_CanVeto,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxCloseEvent()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcloseevent.html#wxcloseeventgetloggingoff">external documentation</a>.
+-spec getLoggingOff(This) -> boolean() when
+	This::wxCloseEvent().
 getLoggingOff(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxCloseEvent),
   wxe_util:call(?wxCloseEvent_GetLoggingOff,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxCloseEvent(), CanVeto::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcloseevent.html#wxcloseeventsetcanveto">external documentation</a>.
+-spec setCanVeto(This, CanVeto) -> ok when
+	This::wxCloseEvent(), CanVeto::boolean().
 setCanVeto(#wx_ref{type=ThisT,ref=ThisRef},CanVeto)
  when is_boolean(CanVeto) ->
   ?CLASS(ThisT,wxCloseEvent),
   wxe_util:cast(?wxCloseEvent_SetCanVeto,
   <<ThisRef:32/?UI,(wxe_util:from_bool(CanVeto)):32/?UI>>).
 
-%% @spec (This::wxCloseEvent(), LogOff::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcloseevent.html#wxcloseeventsetloggingoff">external documentation</a>.
+-spec setLoggingOff(This, LogOff) -> ok when
+	This::wxCloseEvent(), LogOff::boolean().
 setLoggingOff(#wx_ref{type=ThisT,ref=ThisRef},LogOff)
  when is_boolean(LogOff) ->
   ?CLASS(ThisT,wxCloseEvent),
   wxe_util:cast(?wxCloseEvent_SetLoggingOff,
   <<ThisRef:32/?UI,(wxe_util:from_bool(LogOff)):32/?UI>>).
 
-%% @spec (This::wxCloseEvent()) -> ok
 %% @equiv veto(This, [])
+-spec veto(This) -> ok when
+	This::wxCloseEvent().
+
 veto(This)
  when is_record(This, wx_ref) ->
   veto(This, []).
 
-%% @spec (This::wxCloseEvent(), [Option]) -> ok
-%% Option = {veto, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcloseevent.html#wxcloseeventveto">external documentation</a>.
+-spec veto(This, [Option]) -> ok when
+	This::wxCloseEvent(),
+	Option :: {veto, boolean()}.
 veto(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxCloseEvent),
diff --git a/lib/wx/src/gen/wxColourData.erl b/lib/wx/src/gen/wxColourData.erl
index dc77ea043c..01b73a59f0 100644
--- a/lib/wx/src/gen/wxColourData.erl
+++ b/lib/wx/src/gen/wxColourData.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -30,70 +30,79 @@
 %% inherited exports
 -export([parent_class/1]).
 
+-export_type([wxColourData/0]).
 %% @hidden
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxColourData()
+-type wxColourData() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcolourdata.html#wxcolourdatawxcolourdata">external documentation</a>.
+-spec new() -> wxColourData().
 new() ->
   wxe_util:construct(?wxColourData_new_0,
   <<>>).
 
-%% @spec (Data::wxColourData()) -> wxColourData()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcolourdata.html#wxcolourdatawxcolourdata">external documentation</a>.
+-spec new(Data) -> wxColourData() when
+	Data::wxColourData().
 new(#wx_ref{type=DataT,ref=DataRef}) ->
   ?CLASS(DataT,wxColourData),
   wxe_util:construct(?wxColourData_new_1,
   <<DataRef:32/?UI>>).
 
-%% @spec (This::wxColourData()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcolourdata.html#wxcolourdatagetchoosefull">external documentation</a>.
+-spec getChooseFull(This) -> boolean() when
+	This::wxColourData().
 getChooseFull(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxColourData),
   wxe_util:call(?wxColourData_GetChooseFull,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxColourData()) -> wx:colour()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcolourdata.html#wxcolourdatagetcolour">external documentation</a>.
+-spec getColour(This) -> wx:wx_colour() when
+	This::wxColourData().
 getColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxColourData),
   wxe_util:call(?wxColourData_GetColour,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxColourData(), I::integer()) -> wx:colour()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcolourdata.html#wxcolourdatagetcustomcolour">external documentation</a>.
+-spec getCustomColour(This, I) -> wx:wx_colour() when
+	This::wxColourData(), I::integer().
 getCustomColour(#wx_ref{type=ThisT,ref=ThisRef},I)
  when is_integer(I) ->
   ?CLASS(ThisT,wxColourData),
   wxe_util:call(?wxColourData_GetCustomColour,
   <<ThisRef:32/?UI,I:32/?UI>>).
 
-%% @spec (This::wxColourData(), Flag::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcolourdata.html#wxcolourdatasetchoosefull">external documentation</a>.
+-spec setChooseFull(This, Flag) -> ok when
+	This::wxColourData(), Flag::boolean().
 setChooseFull(#wx_ref{type=ThisT,ref=ThisRef},Flag)
  when is_boolean(Flag) ->
   ?CLASS(ThisT,wxColourData),
   wxe_util:cast(?wxColourData_SetChooseFull,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Flag)):32/?UI>>).
 
-%% @spec (This::wxColourData(), Colour::wx:colour()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcolourdata.html#wxcolourdatasetcolour">external documentation</a>.
+-spec setColour(This, Colour) -> ok when
+	This::wxColourData(), Colour::wx:wx_colour().
 setColour(#wx_ref{type=ThisT,ref=ThisRef},Colour)
  when tuple_size(Colour) =:= 3; tuple_size(Colour) =:= 4 ->
   ?CLASS(ThisT,wxColourData),
   wxe_util:cast(?wxColourData_SetColour,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(Colour)):16/binary>>).
 
-%% @spec (This::wxColourData(), I::integer(), Colour::wx:colour()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcolourdata.html#wxcolourdatasetcustomcolour">external documentation</a>.
+-spec setCustomColour(This, I, Colour) -> ok when
+	This::wxColourData(), I::integer(), Colour::wx:wx_colour().
 setCustomColour(#wx_ref{type=ThisT,ref=ThisRef},I,Colour)
  when is_integer(I),tuple_size(Colour) =:= 3; tuple_size(Colour) =:= 4 ->
   ?CLASS(ThisT,wxColourData),
   wxe_util:cast(?wxColourData_SetCustomColour,
   <<ThisRef:32/?UI,I:32/?UI,(wxe_util:colour_bin(Colour)):16/binary>>).
 
-%% @spec (This::wxColourData()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxColourData) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxColourData),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxColourDialog.erl b/lib/wx/src/gen/wxColourDialog.erl
index f5677d00ff..7e9ec1975f 100644
--- a/lib/wx/src/gen/wxColourDialog.erl
+++ b/lib/wx/src/gen/wxColourDialog.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -77,6 +77,7 @@
   transferDataFromWindow/1,transferDataToWindow/1,update/1,updateWindowUI/1,
   updateWindowUI/2,validate/1,warpPointer/3]).
 
+-export_type([wxColourDialog/0]).
 %% @hidden
 parent_class(wxDialog) -> true;
 parent_class(wxTopLevelWindow) -> true;
@@ -84,21 +85,25 @@ parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxColourDialog()
+-type wxColourDialog() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcolourdialog.html#wxcolourdialogwxcolourdialog">external documentation</a>.
+-spec new() -> wxColourDialog().
 new() ->
   wxe_util:construct(?wxColourDialog_new_0,
   <<>>).
 
-%% @spec (Parent::wxWindow:wxWindow()) -> wxColourDialog()
 %% @equiv new(Parent, [])
+-spec new(Parent) -> wxColourDialog() when
+	Parent::wxWindow:wxWindow().
+
 new(Parent)
  when is_record(Parent, wx_ref) ->
   new(Parent, []).
 
-%% @spec (Parent::wxWindow:wxWindow(), [Option]) -> wxColourDialog()
-%% Option = {data, wxColourData:wxColourData()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcolourdialog.html#wxcolourdialogwxcolourdialog">external documentation</a>.
+-spec new(Parent, [Option]) -> wxColourDialog() when
+	Parent::wxWindow:wxWindow(),
+	Option :: {data, wxColourData:wxColourData()}.
 new(#wx_ref{type=ParentT,ref=ParentRef}, Options)
  when is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -108,15 +113,18 @@ new(#wx_ref{type=ParentT,ref=ParentRef}, Options)
   wxe_util:construct(?wxColourDialog_new_2,
   <<ParentRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxColourDialog(), Parent::wxWindow:wxWindow()) -> bool()
 %% @equiv create(This,Parent, [])
+-spec create(This, Parent) -> boolean() when
+	This::wxColourDialog(), Parent::wxWindow:wxWindow().
+
 create(This,Parent)
  when is_record(This, wx_ref),is_record(Parent, wx_ref) ->
   create(This,Parent, []).
 
-%% @spec (This::wxColourDialog(), Parent::wxWindow:wxWindow(), [Option]) -> bool()
-%% Option = {data, wxColourData:wxColourData()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcolourdialog.html#wxcolourdialogcreate">external documentation</a>.
+-spec create(This, Parent, [Option]) -> boolean() when
+	This::wxColourDialog(), Parent::wxWindow:wxWindow(),
+	Option :: {data, wxColourData:wxColourData()}.
 create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxColourDialog),
@@ -127,15 +135,16 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef}, Opti
   wxe_util:call(?wxColourDialog_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxColourDialog()) -> wxColourData:wxColourData()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcolourdialog.html#wxcolourdialoggetcolourdata">external documentation</a>.
+-spec getColourData(This) -> wxColourData:wxColourData() when
+	This::wxColourDialog().
 getColourData(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxColourDialog),
   wxe_util:call(?wxColourDialog_GetColourData,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxColourDialog()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxColourDialog) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxColourDialog),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxColourPickerCtrl.erl b/lib/wx/src/gen/wxColourPickerCtrl.erl
index 60776925b9..91889006f9 100644
--- a/lib/wx/src/gen/wxColourPickerCtrl.erl
+++ b/lib/wx/src/gen/wxColourPickerCtrl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -74,6 +74,7 @@
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
 
+-export_type([wxColourPickerCtrl/0]).
 %% @hidden
 parent_class(wxPickerBase) -> true;
 parent_class(wxControl) -> true;
@@ -81,21 +82,29 @@ parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxColourPickerCtrl()
+-type wxColourPickerCtrl() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcolourpickerctrl.html#wxcolourpickerctrlwxcolourpickerctrl">external documentation</a>.
+-spec new() -> wxColourPickerCtrl().
 new() ->
   wxe_util:construct(?wxColourPickerCtrl_new_0,
   <<>>).
 
-%% @spec (Parent::wxWindow:wxWindow(), Id::integer()) -> wxColourPickerCtrl()
 %% @equiv new(Parent,Id, [])
+-spec new(Parent, Id) -> wxColourPickerCtrl() when
+	Parent::wxWindow:wxWindow(), Id::integer().
+
 new(Parent,Id)
  when is_record(Parent, wx_ref),is_integer(Id) ->
   new(Parent,Id, []).
 
-%% @spec (Parent::wxWindow:wxWindow(), Id::integer(), [Option]) -> wxColourPickerCtrl()
-%% Option = {col, wx:colour()} | {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()} | {validator, wx:wx()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcolourpickerctrl.html#wxcolourpickerctrlwxcolourpickerctrl">external documentation</a>.
+-spec new(Parent, Id, [Option]) -> wxColourPickerCtrl() when
+	Parent::wxWindow:wxWindow(), Id::integer(),
+	Option :: {col, wx:wx_colour()}
+		 | {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}
+		 | {validator, wx:wx()}.
 new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
  when is_integer(Id),is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -109,15 +118,22 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
   wxe_util:construct(?wxColourPickerCtrl_new_3,
   <<ParentRef:32/?UI,Id:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxColourPickerCtrl(), Parent::wxWindow:wxWindow(), Id::integer()) -> bool()
 %% @equiv create(This,Parent,Id, [])
+-spec create(This, Parent, Id) -> boolean() when
+	This::wxColourPickerCtrl(), Parent::wxWindow:wxWindow(), Id::integer().
+
 create(This,Parent,Id)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id) ->
   create(This,Parent,Id, []).
 
-%% @spec (This::wxColourPickerCtrl(), Parent::wxWindow:wxWindow(), Id::integer(), [Option]) -> bool()
-%% Option = {col, wx:colour()} | {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()} | {validator, wx:wx()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcolourpickerctrl.html#wxcolourpickerctrlcreate">external documentation</a>.
+-spec create(This, Parent, Id, [Option]) -> boolean() when
+	This::wxColourPickerCtrl(), Parent::wxWindow:wxWindow(), Id::integer(),
+	Option :: {col, wx:wx_colour()}
+		 | {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}
+		 | {validator, wx:wx()}.
 create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
  when is_integer(Id),is_list(Options) ->
   ?CLASS(ThisT,wxColourPickerCtrl),
@@ -132,22 +148,19 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id, O
   wxe_util:call(?wxColourPickerCtrl_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI,Id:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxColourPickerCtrl()) -> wx:colour()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcolourpickerctrl.html#wxcolourpickerctrlgetcolour">external documentation</a>.
+-spec getColour(This) -> wx:wx_colour() when
+	This::wxColourPickerCtrl().
 getColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxColourPickerCtrl),
   wxe_util:call(?wxColourPickerCtrl_GetColour,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxColourPickerCtrl(),X::string()|term()) -> bool()|ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcolourpickerctrl.html#wxcolourpickerctrlsetcolour">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% setColour(This::wxColourPickerCtrl(), Text::string()) -> bool() </c>
-%% </p>
-%% <p><c>
-%% setColour(This::wxColourPickerCtrl(), Col::wx:colour()) -> ok </c>
-%% </p>
+-spec setColour(This, Text) -> boolean() when
+	This::wxColourPickerCtrl(), Text::string();
+      (This, Col) -> ok when
+	This::wxColourPickerCtrl(), Col::wx:wx_colour().
 setColour(#wx_ref{type=ThisT,ref=ThisRef},Text)
  when is_list(Text) ->
   ?CLASS(ThisT,wxColourPickerCtrl),
@@ -160,8 +173,8 @@ setColour(#wx_ref{type=ThisT,ref=ThisRef},Col)
   wxe_util:cast(?wxColourPickerCtrl_SetColour_1_1,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(Col)):16/binary>>).
 
-%% @spec (This::wxColourPickerCtrl()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxColourPickerCtrl) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxColourPickerCtrl),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxColourPickerEvent.erl b/lib/wx/src/gen/wxColourPickerEvent.erl
index 9ba431b841..fbd34cf9e7 100644
--- a/lib/wx/src/gen/wxColourPickerEvent.erl
+++ b/lib/wx/src/gen/wxColourPickerEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -40,13 +40,16 @@
   parent_class/1,resumePropagation/2,setInt/2,setString/2,shouldPropagate/1,
   skip/1,skip/2,stopPropagation/1]).
 
+-export_type([wxColourPickerEvent/0]).
 %% @hidden
 parent_class(wxCommandEvent) -> true;
 parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (This::wxColourPickerEvent()) -> wx:colour()
+-type wxColourPickerEvent() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcolourpickerevent.html#wxcolourpickereventgetcolour">external documentation</a>.
+-spec getColour(This) -> wx:wx_colour() when
+	This::wxColourPickerEvent().
 getColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxColourPickerEvent),
   wxe_util:call(?wxColourPickerEvent_GetColour,
diff --git a/lib/wx/src/gen/wxComboBox.erl b/lib/wx/src/gen/wxComboBox.erl
index f743df4e93..88cee2e3a4 100644
--- a/lib/wx/src/gen/wxComboBox.erl
+++ b/lib/wx/src/gen/wxComboBox.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -76,6 +76,7 @@
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
 
+-export_type([wxComboBox/0]).
 %% @hidden
 parent_class(wxControlWithItems) -> true;
 parent_class(wxControl) -> true;
@@ -83,21 +84,30 @@ parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxComboBox()
+-type wxComboBox() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcombobox.html#wxcomboboxwxcombobox">external documentation</a>.
+-spec new() -> wxComboBox().
 new() ->
   wxe_util:construct(?wxComboBox_new_0,
   <<>>).
 
-%% @spec (Parent::wxWindow:wxWindow(), Id::integer()) -> wxComboBox()
 %% @equiv new(Parent,Id, [])
+-spec new(Parent, Id) -> wxComboBox() when
+	Parent::wxWindow:wxWindow(), Id::integer().
+
 new(Parent,Id)
  when is_record(Parent, wx_ref),is_integer(Id) ->
   new(Parent,Id, []).
 
-%% @spec (Parent::wxWindow:wxWindow(), Id::integer(), [Option]) -> wxComboBox()
-%% Option = {value, string()} | {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {choices, [[string()]]} | {style, integer()} | {validator, wx:wx()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcombobox.html#wxcomboboxwxcombobox">external documentation</a>.
+-spec new(Parent, Id, [Option]) -> wxComboBox() when
+	Parent::wxWindow:wxWindow(), Id::integer(),
+	Option :: {value, string()}
+		 | {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {choices, [[string()]]}
+		 | {style, integer()}
+		 | {validator, wx:wx()}.
 new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
  when is_integer(Id),is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -112,15 +122,19 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
   wxe_util:construct(?wxComboBox_new_3,
   <<ParentRef:32/?UI,Id:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxComboBox(), Parent::wxWindow:wxWindow(), Id::integer(), Value::string(), Pos::{X::integer(), Y::integer()}, Size::{W::integer(), H::integer()}, Choices::[[string()]]) -> bool()
 %% @equiv create(This,Parent,Id,Value,Pos,Size,Choices, [])
+-spec create(This, Parent, Id, Value, Pos, Size, Choices) -> boolean() when
+	This::wxComboBox(), Parent::wxWindow:wxWindow(), Id::integer(), Value::string(), Pos::{X::integer(), Y::integer()}, Size::{W::integer(), H::integer()}, Choices::[[string()]].
+
 create(This,Parent,Id,Value,Pos={PosX,PosY},Size={SizeW,SizeH},Choices)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id),is_list(Value),is_integer(PosX),is_integer(PosY),is_integer(SizeW),is_integer(SizeH),is_list(Choices) ->
   create(This,Parent,Id,Value,Pos,Size,Choices, []).
 
-%% @spec (This::wxComboBox(), Parent::wxWindow:wxWindow(), Id::integer(), Value::string(), Pos::{X::integer(), Y::integer()}, Size::{W::integer(), H::integer()}, Choices::[[string()]], [Option]) -> bool()
-%% Option = {style, integer()} | {validator, wx:wx()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcombobox.html#wxcomboboxcreate">external documentation</a>.
+-spec create(This, Parent, Id, Value, Pos, Size, Choices, [Option]) -> boolean() when
+	This::wxComboBox(), Parent::wxWindow:wxWindow(), Id::integer(), Value::string(), Pos::{X::integer(), Y::integer()}, Size::{W::integer(), H::integer()}, Choices::[[string()]],
+	Option :: {style, integer()}
+		 | {validator, wx:wx()}.
 create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id,Value,{PosX,PosY},{SizeW,SizeH},Choices, Options)
  when is_integer(Id),is_list(Value),is_integer(PosX),is_integer(PosY),is_integer(SizeW),is_integer(SizeH),is_list(Choices),is_list(Options) ->
   ?CLASS(ThisT,wxComboBox),
@@ -135,92 +149,105 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id,Va
   wxe_util:call(?wxComboBox_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI,Id:32/?UI,(byte_size(Value_UC)):32/?UI,(Value_UC)/binary, 0:(((8- ((0+byte_size(Value_UC)) band 16#7)) band 16#7))/unit:8,PosX:32/?UI,PosY:32/?UI,SizeW:32/?UI,SizeH:32/?UI,(length(Choices_UCA)):32/?UI, (<< <<(byte_size(UC_Str)):32/?UI, UC_Str/binary>>|| UC_Str <- Choices_UCA>>)/binary, 0:(((8- ((4 + lists:sum([byte_size(S)+4||S<-Choices_UCA])) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxComboBox()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcombobox.html#wxcomboboxcancopy">external documentation</a>.
+-spec canCopy(This) -> boolean() when
+	This::wxComboBox().
 canCopy(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxComboBox),
   wxe_util:call(?wxComboBox_CanCopy,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxComboBox()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcombobox.html#wxcomboboxcancut">external documentation</a>.
+-spec canCut(This) -> boolean() when
+	This::wxComboBox().
 canCut(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxComboBox),
   wxe_util:call(?wxComboBox_CanCut,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxComboBox()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcombobox.html#wxcomboboxcanpaste">external documentation</a>.
+-spec canPaste(This) -> boolean() when
+	This::wxComboBox().
 canPaste(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxComboBox),
   wxe_util:call(?wxComboBox_CanPaste,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxComboBox()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcombobox.html#wxcomboboxcanredo">external documentation</a>.
+-spec canRedo(This) -> boolean() when
+	This::wxComboBox().
 canRedo(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxComboBox),
   wxe_util:call(?wxComboBox_CanRedo,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxComboBox()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcombobox.html#wxcomboboxcanundo">external documentation</a>.
+-spec canUndo(This) -> boolean() when
+	This::wxComboBox().
 canUndo(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxComboBox),
   wxe_util:call(?wxComboBox_CanUndo,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxComboBox()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcombobox.html#wxcomboboxcopy">external documentation</a>.
+-spec copy(This) -> ok when
+	This::wxComboBox().
 copy(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxComboBox),
   wxe_util:cast(?wxComboBox_Copy,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxComboBox()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcombobox.html#wxcomboboxcut">external documentation</a>.
+-spec cut(This) -> ok when
+	This::wxComboBox().
 cut(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxComboBox),
   wxe_util:cast(?wxComboBox_Cut,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxComboBox()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcombobox.html#wxcomboboxgetinsertionpoint">external documentation</a>.
+-spec getInsertionPoint(This) -> integer() when
+	This::wxComboBox().
 getInsertionPoint(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxComboBox),
   wxe_util:call(?wxComboBox_GetInsertionPoint,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxComboBox()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcombobox.html#wxcomboboxgetlastposition">external documentation</a>.
+-spec getLastPosition(This) -> integer() when
+	This::wxComboBox().
 getLastPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxComboBox),
   wxe_util:call(?wxComboBox_GetLastPosition,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxComboBox()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcombobox.html#wxcomboboxgetvalue">external documentation</a>.
+-spec getValue(This) -> string() when
+	This::wxComboBox().
 getValue(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxComboBox),
   wxe_util:call(?wxComboBox_GetValue,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxComboBox()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcombobox.html#wxcomboboxpaste">external documentation</a>.
+-spec paste(This) -> ok when
+	This::wxComboBox().
 paste(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxComboBox),
   wxe_util:cast(?wxComboBox_Paste,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxComboBox()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcombobox.html#wxcomboboxredo">external documentation</a>.
+-spec redo(This) -> ok when
+	This::wxComboBox().
 redo(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxComboBox),
   wxe_util:cast(?wxComboBox_Redo,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxComboBox(), From::integer(), To::integer(), Value::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcombobox.html#wxcomboboxreplace">external documentation</a>.
+-spec replace(This, From, To, Value) -> ok when
+	This::wxComboBox(), From::integer(), To::integer(), Value::string().
 replace(#wx_ref{type=ThisT,ref=ThisRef},From,To,Value)
  when is_integer(From),is_integer(To),is_list(Value) ->
   ?CLASS(ThisT,wxComboBox),
@@ -228,47 +255,53 @@ replace(#wx_ref{type=ThisT,ref=ThisRef},From,To,Value)
   wxe_util:cast(?wxComboBox_Replace,
   <<ThisRef:32/?UI,From:32/?UI,To:32/?UI,(byte_size(Value_UC)):32/?UI,(Value_UC)/binary, 0:(((8- ((0+byte_size(Value_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxComboBox(), From::integer(), To::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcombobox.html#wxcomboboxremove">external documentation</a>.
+-spec remove(This, From, To) -> ok when
+	This::wxComboBox(), From::integer(), To::integer().
 remove(#wx_ref{type=ThisT,ref=ThisRef},From,To)
  when is_integer(From),is_integer(To) ->
   ?CLASS(ThisT,wxComboBox),
   wxe_util:cast(?wxComboBox_Remove,
   <<ThisRef:32/?UI,From:32/?UI,To:32/?UI>>).
 
-%% @spec (This::wxComboBox(), Pos::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcombobox.html#wxcomboboxsetinsertionpoint">external documentation</a>.
+-spec setInsertionPoint(This, Pos) -> ok when
+	This::wxComboBox(), Pos::integer().
 setInsertionPoint(#wx_ref{type=ThisT,ref=ThisRef},Pos)
  when is_integer(Pos) ->
   ?CLASS(ThisT,wxComboBox),
   wxe_util:cast(?wxComboBox_SetInsertionPoint,
   <<ThisRef:32/?UI,Pos:32/?UI>>).
 
-%% @spec (This::wxComboBox()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcombobox.html#wxcomboboxsetinsertionpointend">external documentation</a>.
+-spec setInsertionPointEnd(This) -> ok when
+	This::wxComboBox().
 setInsertionPointEnd(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxComboBox),
   wxe_util:cast(?wxComboBox_SetInsertionPointEnd,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxComboBox(), N::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcombobox.html#wxcomboboxsetselection">external documentation</a>.
+-spec setSelection(This, N) -> ok when
+	This::wxComboBox(), N::integer().
 setSelection(#wx_ref{type=ThisT,ref=ThisRef},N)
  when is_integer(N) ->
   ?CLASS(ThisT,wxComboBox),
   wxe_util:cast(?wxComboBox_SetSelection_1,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @spec (This::wxComboBox(), From::integer(), To::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcombobox.html#wxcomboboxsetselection">external documentation</a>.
+-spec setSelection(This, From, To) -> ok when
+	This::wxComboBox(), From::integer(), To::integer().
 setSelection(#wx_ref{type=ThisT,ref=ThisRef},From,To)
  when is_integer(From),is_integer(To) ->
   ?CLASS(ThisT,wxComboBox),
   wxe_util:cast(?wxComboBox_SetSelection_2,
   <<ThisRef:32/?UI,From:32/?UI,To:32/?UI>>).
 
-%% @spec (This::wxComboBox(), Value::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcombobox.html#wxcomboboxsetvalue">external documentation</a>.
+-spec setValue(This, Value) -> ok when
+	This::wxComboBox(), Value::string().
 setValue(#wx_ref{type=ThisT,ref=ThisRef},Value)
  when is_list(Value) ->
   ?CLASS(ThisT,wxComboBox),
@@ -276,15 +309,16 @@ setValue(#wx_ref{type=ThisT,ref=ThisRef},Value)
   wxe_util:cast(?wxComboBox_SetValue,
   <<ThisRef:32/?UI,(byte_size(Value_UC)):32/?UI,(Value_UC)/binary, 0:(((8- ((0+byte_size(Value_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxComboBox()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcombobox.html#wxcomboboxundo">external documentation</a>.
+-spec undo(This) -> ok when
+	This::wxComboBox().
 undo(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxComboBox),
   wxe_util:cast(?wxComboBox_Undo,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxComboBox()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxComboBox) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxComboBox),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxCommandEvent.erl b/lib/wx/src/gen/wxCommandEvent.erl
index 57fb9cecda..16414da4dd 100644
--- a/lib/wx/src/gen/wxCommandEvent.erl
+++ b/lib/wx/src/gen/wxCommandEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -38,69 +38,80 @@
 -export([getId/1,getSkipped/1,getTimestamp/1,isCommandEvent/1,parent_class/1,
   resumePropagation/2,shouldPropagate/1,skip/1,skip/2,stopPropagation/1]).
 
+-export_type([wxCommandEvent/0]).
 %% @hidden
 parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (This::wxCommandEvent()) -> term()
+-type wxCommandEvent() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcommandevent.html#wxcommandeventgetclientobject">external documentation</a>.
+-spec getClientData(This) -> term() when
+	This::wxCommandEvent().
 getClientData(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxCommandEvent),
   wxe_util:call(?wxCommandEvent_getClientData,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxCommandEvent()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcommandevent.html#wxcommandeventgetextralong">external documentation</a>.
+-spec getExtraLong(This) -> integer() when
+	This::wxCommandEvent().
 getExtraLong(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxCommandEvent),
   wxe_util:call(?wxCommandEvent_GetExtraLong,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxCommandEvent()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcommandevent.html#wxcommandeventgetint">external documentation</a>.
+-spec getInt(This) -> integer() when
+	This::wxCommandEvent().
 getInt(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxCommandEvent),
   wxe_util:call(?wxCommandEvent_GetInt,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxCommandEvent()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcommandevent.html#wxcommandeventgetselection">external documentation</a>.
+-spec getSelection(This) -> integer() when
+	This::wxCommandEvent().
 getSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxCommandEvent),
   wxe_util:call(?wxCommandEvent_GetSelection,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxCommandEvent()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcommandevent.html#wxcommandeventgetstring">external documentation</a>.
+-spec getString(This) -> string() when
+	This::wxCommandEvent().
 getString(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxCommandEvent),
   wxe_util:call(?wxCommandEvent_GetString,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxCommandEvent()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcommandevent.html#wxcommandeventischecked">external documentation</a>.
+-spec isChecked(This) -> boolean() when
+	This::wxCommandEvent().
 isChecked(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxCommandEvent),
   wxe_util:call(?wxCommandEvent_IsChecked,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxCommandEvent()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcommandevent.html#wxcommandeventisselection">external documentation</a>.
+-spec isSelection(This) -> boolean() when
+	This::wxCommandEvent().
 isSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxCommandEvent),
   wxe_util:call(?wxCommandEvent_IsSelection,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxCommandEvent(), I::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcommandevent.html#wxcommandeventsetint">external documentation</a>.
+-spec setInt(This, I) -> ok when
+	This::wxCommandEvent(), I::integer().
 setInt(#wx_ref{type=ThisT,ref=ThisRef},I)
  when is_integer(I) ->
   ?CLASS(ThisT,wxCommandEvent),
   wxe_util:cast(?wxCommandEvent_SetInt,
   <<ThisRef:32/?UI,I:32/?UI>>).
 
-%% @spec (This::wxCommandEvent(), S::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcommandevent.html#wxcommandeventsetstring">external documentation</a>.
+-spec setString(This, S) -> ok when
+	This::wxCommandEvent(), S::string().
 setString(#wx_ref{type=ThisT,ref=ThisRef},S)
  when is_list(S) ->
   ?CLASS(ThisT,wxCommandEvent),
diff --git a/lib/wx/src/gen/wxContextMenuEvent.erl b/lib/wx/src/gen/wxContextMenuEvent.erl
index 0050b97b89..9312803e33 100644
--- a/lib/wx/src/gen/wxContextMenuEvent.erl
+++ b/lib/wx/src/gen/wxContextMenuEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -40,20 +40,24 @@
   parent_class/1,resumePropagation/2,setInt/2,setString/2,shouldPropagate/1,
   skip/1,skip/2,stopPropagation/1]).
 
+-export_type([wxContextMenuEvent/0]).
 %% @hidden
 parent_class(wxCommandEvent) -> true;
 parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (This::wxContextMenuEvent()) -> {X::integer(), Y::integer()}
+-type wxContextMenuEvent() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcontextmenuevent.html#wxcontextmenueventgetposition">external documentation</a>.
+-spec getPosition(This) -> {X::integer(), Y::integer()} when
+	This::wxContextMenuEvent().
 getPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxContextMenuEvent),
   wxe_util:call(?wxContextMenuEvent_GetPosition,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxContextMenuEvent(), Pos::{X::integer(), Y::integer()}) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcontextmenuevent.html#wxcontextmenueventsetposition">external documentation</a>.
+-spec setPosition(This, Pos) -> ok when
+	This::wxContextMenuEvent(), Pos::{X::integer(), Y::integer()}.
 setPosition(#wx_ref{type=ThisT,ref=ThisRef},{PosX,PosY})
  when is_integer(PosX),is_integer(PosY) ->
   ?CLASS(ThisT,wxContextMenuEvent),
diff --git a/lib/wx/src/gen/wxControl.erl b/lib/wx/src/gen/wxControl.erl
index e3f602e65a..743ec5151f 100644
--- a/lib/wx/src/gen/wxControl.erl
+++ b/lib/wx/src/gen/wxControl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -68,20 +68,24 @@
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
 
+-export_type([wxControl/0]).
 %% @hidden
 parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (This::wxControl()) -> string()
+-type wxControl() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcontrol.html#wxcontrolgetlabel">external documentation</a>.
+-spec getLabel(This) -> string() when
+	This::wxControl().
 getLabel(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxControl),
   wxe_util:call(?wxControl_GetLabel,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxControl(), Label::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcontrol.html#wxcontrolsetlabel">external documentation</a>.
+-spec setLabel(This, Label) -> ok when
+	This::wxControl(), Label::string().
 setLabel(#wx_ref{type=ThisT,ref=ThisRef},Label)
  when is_list(Label) ->
   ?CLASS(ThisT,wxControl),
diff --git a/lib/wx/src/gen/wxControlWithItems.erl b/lib/wx/src/gen/wxControlWithItems.erl
index 0838b75bad..b57f472b04 100644
--- a/lib/wx/src/gen/wxControlWithItems.erl
+++ b/lib/wx/src/gen/wxControlWithItems.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -72,14 +72,17 @@
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
 
+-export_type([wxControlWithItems/0]).
 %% @hidden
 parent_class(wxControl) -> true;
 parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (This::wxControlWithItems(), Item::string()) -> integer()
+-type wxControlWithItems() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcontrolwithitems.html#wxcontrolwithitemsappend">external documentation</a>.
+-spec append(This, Item) -> integer() when
+	This::wxControlWithItems(), Item::string().
 append(#wx_ref{type=ThisT,ref=ThisRef},Item)
  when is_list(Item) ->
   ?CLASS(ThisT,wxControlWithItems),
@@ -87,8 +90,9 @@ append(#wx_ref{type=ThisT,ref=ThisRef},Item)
   wxe_util:call(?wxControlWithItems_Append_1,
   <<ThisRef:32/?UI,(byte_size(Item_UC)):32/?UI,(Item_UC)/binary, 0:(((8- ((0+byte_size(Item_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxControlWithItems(), Item::string(), ClientData::term()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcontrolwithitems.html#wxcontrolwithitemsappend">external documentation</a>.
+-spec append(This, Item, ClientData) -> integer() when
+	This::wxControlWithItems(), Item::string(), ClientData::term().
 append(#wx_ref{type=ThisT,ref=ThisRef},Item,ClientData)
  when is_list(Item) ->
   ?CLASS(ThisT,wxControlWithItems),
@@ -97,8 +101,9 @@ append(#wx_ref{type=ThisT,ref=ThisRef},Item,ClientData)
   wxe_util:call(?wxControlWithItems_Append_2,
   <<ThisRef:32/?UI,(byte_size(Item_UC)):32/?UI,(Item_UC)/binary, 0:(((8- ((0+byte_size(Item_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxControlWithItems(), Strings::[[string()]]) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcontrolwithitems.html#wxcontrolwithitemsappend">external documentation</a>.
+-spec appendStrings(This, Strings) -> ok when
+	This::wxControlWithItems(), Strings::[[string()]].
 appendStrings(#wx_ref{type=ThisT,ref=ThisRef},Strings)
  when is_list(Strings) ->
   ?CLASS(ThisT,wxControlWithItems),
@@ -107,30 +112,35 @@ appendStrings(#wx_ref{type=ThisT,ref=ThisRef},Strings)
   wxe_util:cast(?wxControlWithItems_appendStrings_1,
   <<ThisRef:32/?UI,(length(Strings_UCA)):32/?UI, (<< <<(byte_size(UC_Str)):32/?UI, UC_Str/binary>>|| UC_Str <- Strings_UCA>>)/binary, 0:(((8- ((0 + lists:sum([byte_size(S)+4||S<-Strings_UCA])) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxControlWithItems()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcontrolwithitems.html#wxcontrolwithitemsclear">external documentation</a>.
+-spec clear(This) -> ok when
+	This::wxControlWithItems().
 clear(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxControlWithItems),
   wxe_util:cast(?wxControlWithItems_Clear,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxControlWithItems(), N::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcontrolwithitems.html#wxcontrolwithitemsdelete">external documentation</a>.
+-spec delete(This, N) -> ok when
+	This::wxControlWithItems(), N::integer().
 delete(#wx_ref{type=ThisT,ref=ThisRef},N)
  when is_integer(N) ->
   ?CLASS(ThisT,wxControlWithItems),
   wxe_util:cast(?wxControlWithItems_Delete,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @spec (This::wxControlWithItems(), S::string()) -> integer()
 %% @equiv findString(This,S, [])
+-spec findString(This, S) -> integer() when
+	This::wxControlWithItems(), S::string().
+
 findString(This,S)
  when is_record(This, wx_ref),is_list(S) ->
   findString(This,S, []).
 
-%% @spec (This::wxControlWithItems(), S::string(), [Option]) -> integer()
-%% Option = {bCase, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcontrolwithitems.html#wxcontrolwithitemsfindstring">external documentation</a>.
+-spec findString(This, S, [Option]) -> integer() when
+	This::wxControlWithItems(), S::string(),
+	Option :: {bCase, boolean()}.
 findString(#wx_ref{type=ThisT,ref=ThisRef},S, Options)
  when is_list(S),is_list(Options) ->
   ?CLASS(ThisT,wxControlWithItems),
@@ -141,16 +151,18 @@ findString(#wx_ref{type=ThisT,ref=ThisRef},S, Options)
   wxe_util:call(?wxControlWithItems_FindString,
   <<ThisRef:32/?UI,(byte_size(S_UC)):32/?UI,(S_UC)/binary, 0:(((8- ((0+byte_size(S_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxControlWithItems(), N::integer()) -> term()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcontrolwithitems.html#wxcontrolwithitemsgetclientobject">external documentation</a>.
+-spec getClientData(This, N) -> term() when
+	This::wxControlWithItems(), N::integer().
 getClientData(#wx_ref{type=ThisT,ref=ThisRef},N)
  when is_integer(N) ->
   ?CLASS(ThisT,wxControlWithItems),
   wxe_util:call(?wxControlWithItems_getClientData,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @spec (This::wxControlWithItems(), N::integer(), ClientData::term()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcontrolwithitems.html#wxcontrolwithitemssetclientobject">external documentation</a>.
+-spec setClientData(This, N, ClientData) -> ok when
+	This::wxControlWithItems(), N::integer(), ClientData::term().
 setClientData(#wx_ref{type=ThisT,ref=ThisRef},N,ClientData)
  when is_integer(N) ->
   ?CLASS(ThisT,wxControlWithItems),
@@ -158,37 +170,42 @@ setClientData(#wx_ref{type=ThisT,ref=ThisRef},N,ClientData)
   wxe_util:cast(?wxControlWithItems_setClientData,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @spec (This::wxControlWithItems()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcontrolwithitems.html#wxcontrolwithitemsgetcount">external documentation</a>.
+-spec getCount(This) -> integer() when
+	This::wxControlWithItems().
 getCount(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxControlWithItems),
   wxe_util:call(?wxControlWithItems_GetCount,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxControlWithItems()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcontrolwithitems.html#wxcontrolwithitemsgetselection">external documentation</a>.
+-spec getSelection(This) -> integer() when
+	This::wxControlWithItems().
 getSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxControlWithItems),
   wxe_util:call(?wxControlWithItems_GetSelection,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxControlWithItems(), N::integer()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcontrolwithitems.html#wxcontrolwithitemsgetstring">external documentation</a>.
+-spec getString(This, N) -> string() when
+	This::wxControlWithItems(), N::integer().
 getString(#wx_ref{type=ThisT,ref=ThisRef},N)
  when is_integer(N) ->
   ?CLASS(ThisT,wxControlWithItems),
   wxe_util:call(?wxControlWithItems_GetString,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @spec (This::wxControlWithItems()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcontrolwithitems.html#wxcontrolwithitemsgetstringselection">external documentation</a>.
+-spec getStringSelection(This) -> string() when
+	This::wxControlWithItems().
 getStringSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxControlWithItems),
   wxe_util:call(?wxControlWithItems_GetStringSelection,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxControlWithItems(), Item::string(), Pos::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcontrolwithitems.html#wxcontrolwithitemsinsert">external documentation</a>.
+-spec insert(This, Item, Pos) -> integer() when
+	This::wxControlWithItems(), Item::string(), Pos::integer().
 insert(#wx_ref{type=ThisT,ref=ThisRef},Item,Pos)
  when is_list(Item),is_integer(Pos) ->
   ?CLASS(ThisT,wxControlWithItems),
@@ -196,8 +213,9 @@ insert(#wx_ref{type=ThisT,ref=ThisRef},Item,Pos)
   wxe_util:call(?wxControlWithItems_Insert_2,
   <<ThisRef:32/?UI,(byte_size(Item_UC)):32/?UI,(Item_UC)/binary, 0:(((8- ((0+byte_size(Item_UC)) band 16#7)) band 16#7))/unit:8,Pos:32/?UI>>).
 
-%% @spec (This::wxControlWithItems(), Item::string(), Pos::integer(), ClientData::term()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcontrolwithitems.html#wxcontrolwithitemsinsert">external documentation</a>.
+-spec insert(This, Item, Pos, ClientData) -> integer() when
+	This::wxControlWithItems(), Item::string(), Pos::integer(), ClientData::term().
 insert(#wx_ref{type=ThisT,ref=ThisRef},Item,Pos,ClientData)
  when is_list(Item),is_integer(Pos) ->
   ?CLASS(ThisT,wxControlWithItems),
@@ -206,31 +224,35 @@ insert(#wx_ref{type=ThisT,ref=ThisRef},Item,Pos,ClientData)
   wxe_util:call(?wxControlWithItems_Insert_3,
   <<ThisRef:32/?UI,(byte_size(Item_UC)):32/?UI,(Item_UC)/binary, 0:(((8- ((0+byte_size(Item_UC)) band 16#7)) band 16#7))/unit:8,Pos:32/?UI>>).
 
-%% @spec (This::wxControlWithItems()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcontrolwithitems.html#wxcontrolwithitemsisempty">external documentation</a>.
+-spec isEmpty(This) -> boolean() when
+	This::wxControlWithItems().
 isEmpty(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxControlWithItems),
   wxe_util:call(?wxControlWithItems_IsEmpty,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxControlWithItems(), N::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcontrolwithitems.html#wxcontrolwithitemsselect">external documentation</a>.
+-spec select(This, N) -> ok when
+	This::wxControlWithItems(), N::integer().
 select(#wx_ref{type=ThisT,ref=ThisRef},N)
  when is_integer(N) ->
   ?CLASS(ThisT,wxControlWithItems),
   wxe_util:cast(?wxControlWithItems_Select,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @spec (This::wxControlWithItems(), N::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcontrolwithitems.html#wxcontrolwithitemssetselection">external documentation</a>.
+-spec setSelection(This, N) -> ok when
+	This::wxControlWithItems(), N::integer().
 setSelection(#wx_ref{type=ThisT,ref=ThisRef},N)
  when is_integer(N) ->
   ?CLASS(ThisT,wxControlWithItems),
   wxe_util:cast(?wxControlWithItems_SetSelection,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @spec (This::wxControlWithItems(), N::integer(), S::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcontrolwithitems.html#wxcontrolwithitemssetstring">external documentation</a>.
+-spec setString(This, N, S) -> ok when
+	This::wxControlWithItems(), N::integer(), S::string().
 setString(#wx_ref{type=ThisT,ref=ThisRef},N,S)
  when is_integer(N),is_list(S) ->
   ?CLASS(ThisT,wxControlWithItems),
@@ -238,8 +260,9 @@ setString(#wx_ref{type=ThisT,ref=ThisRef},N,S)
   wxe_util:cast(?wxControlWithItems_SetString,
   <<ThisRef:32/?UI,N:32/?UI,(byte_size(S_UC)):32/?UI,(S_UC)/binary, 0:(((8- ((4+byte_size(S_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxControlWithItems(), S::string()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcontrolwithitems.html#wxcontrolwithitemssetstringselection">external documentation</a>.
+-spec setStringSelection(This, S) -> boolean() when
+	This::wxControlWithItems(), S::string().
 setStringSelection(#wx_ref{type=ThisT,ref=ThisRef},S)
  when is_list(S) ->
   ?CLASS(ThisT,wxControlWithItems),
diff --git a/lib/wx/src/gen/wxCursor.erl b/lib/wx/src/gen/wxCursor.erl
index beb731fee3..3274e16454 100644
--- a/lib/wx/src/gen/wxCursor.erl
+++ b/lib/wx/src/gen/wxCursor.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -34,25 +34,23 @@
   getSubBitmap/2,getWidth/1,loadFile/2,loadFile/3,parent_class/1,saveFile/3,
   saveFile/4,setDepth/2,setHeight/2,setMask/2,setPalette/2,setWidth/2]).
 
+-export_type([wxCursor/0]).
 %% @hidden
 parent_class(wxBitmap) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxCursor()
+-type wxCursor() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcursor.html#wxcursorwxcursor">external documentation</a>.
+-spec new() -> wxCursor().
 new() ->
   wxe_util:construct(?wxCursor_new_0,
   <<>>).
 
-%% @spec (X::integer()|term()) -> wxCursor()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcursor.html#wxcursorwxcursor">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% new(CursorId::integer()) -> wxCursor() </c>
-%% </p>
-%% <p><c>
-%% new(Image::wxImage:wxImage()) -> wxCursor() </c>
-%% </p>
+-spec new(CursorId) -> wxCursor() when
+	CursorId::integer();
+      (Image) -> wxCursor() when
+	Image::wxImage:wxImage().
 new(CursorId)
  when is_integer(CursorId) ->
   wxe_util:construct(?wxCursor_new_1_0,
@@ -62,15 +60,19 @@ new(#wx_ref{type=ImageT,ref=ImageRef}) ->
   wxe_util:construct(?wxCursor_new_1_1,
   <<ImageRef:32/?UI>>).
 
-%% @spec (Bits::binary(), Width::integer(), Height::integer()) -> wxCursor()
 %% @equiv new(Bits,Width,Height, [])
+-spec new(Bits, Width, Height) -> wxCursor() when
+	Bits::binary(), Width::integer(), Height::integer().
+
 new(Bits,Width,Height)
  when is_binary(Bits),is_integer(Width),is_integer(Height) ->
   new(Bits,Width,Height, []).
 
-%% @spec (Bits::binary(), Width::integer(), Height::integer(), [Option]) -> wxCursor()
-%% Option = {hotSpotX, integer()} | {hotSpotY, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcursor.html#wxcursorwxcursor">external documentation</a>.
+-spec new(Bits, Width, Height, [Option]) -> wxCursor() when
+	Bits::binary(), Width::integer(), Height::integer(),
+	Option :: {hotSpotX, integer()}
+		 | {hotSpotY, integer()}.
 new(Bits,Width,Height, Options)
  when is_binary(Bits),is_integer(Width),is_integer(Height),is_list(Options) ->
   wxe_util:send_bin(Bits),
@@ -81,15 +83,16 @@ new(Bits,Width,Height, Options)
   wxe_util:construct(?wxCursor_new_4,
   <<Width:32/?UI,Height:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxCursor()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcursor.html#wxcursorok">external documentation</a>.
+-spec ok(This) -> boolean() when
+	This::wxCursor().
 ok(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxCursor),
   wxe_util:call(?wxCursor_Ok,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxCursor()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxCursor) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxCursor),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxDC.erl b/lib/wx/src/gen/wxDC.erl
index ba498c651a..25b452ed61 100644
--- a/lib/wx/src/gen/wxDC.erl
+++ b/lib/wx/src/gen/wxDC.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -49,18 +49,25 @@
 %% inherited exports
 -export([parent_class/1]).
 
+-export_type([wxDC/0]).
 %% @hidden
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (This::wxDC(), DestPt::{X::integer(), Y::integer()}, Sz::{W::integer(), H::integer()}, Source::wxDC(), SrcPt::{X::integer(), Y::integer()}) -> bool()
+-type wxDC() :: wx:wx_object().
 %% @equiv blit(This,DestPt,Sz,Source,SrcPt, [])
+-spec blit(This, DestPt, Sz, Source, SrcPt) -> boolean() when
+	This::wxDC(), DestPt::{X::integer(), Y::integer()}, Sz::{W::integer(), H::integer()}, Source::wxDC(), SrcPt::{X::integer(), Y::integer()}.
+
 blit(This,DestPt={DestPtX,DestPtY},Sz={SzW,SzH},Source,SrcPt={SrcPtX,SrcPtY})
  when is_record(This, wx_ref),is_integer(DestPtX),is_integer(DestPtY),is_integer(SzW),is_integer(SzH),is_record(Source, wx_ref),is_integer(SrcPtX),is_integer(SrcPtY) ->
   blit(This,DestPt,Sz,Source,SrcPt, []).
 
-%% @spec (This::wxDC(), DestPt::{X::integer(), Y::integer()}, Sz::{W::integer(), H::integer()}, Source::wxDC(), SrcPt::{X::integer(), Y::integer()}, [Option]) -> bool()
-%% Option = {rop, integer()} | {useMask, bool()} | {srcPtMask, {X::integer(), Y::integer()}}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcblit">external documentation</a>.
+-spec blit(This, DestPt, Sz, Source, SrcPt, [Option]) -> boolean() when
+	This::wxDC(), DestPt::{X::integer(), Y::integer()}, Sz::{W::integer(), H::integer()}, Source::wxDC(), SrcPt::{X::integer(), Y::integer()},
+	Option :: {rop, integer()}
+		 | {useMask, boolean()}
+		 | {srcPtMask, {X::integer(), Y::integer()}}.
 blit(#wx_ref{type=ThisT,ref=ThisRef},{DestPtX,DestPtY},{SzW,SzH},#wx_ref{type=SourceT,ref=SourceRef},{SrcPtX,SrcPtY}, Options)
  when is_integer(DestPtX),is_integer(DestPtY),is_integer(SzW),is_integer(SzH),is_integer(SrcPtX),is_integer(SrcPtY),is_list(Options) ->
   ?CLASS(ThisT,wxDC),
@@ -73,92 +80,105 @@ blit(#wx_ref{type=ThisT,ref=ThisRef},{DestPtX,DestPtY},{SzW,SzH},#wx_ref{type=So
   wxe_util:call(?wxDC_Blit,
   <<ThisRef:32/?UI,DestPtX:32/?UI,DestPtY:32/?UI,SzW:32/?UI,SzH:32/?UI,SourceRef:32/?UI,SrcPtX:32/?UI,SrcPtY:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxDC(), X::integer(), Y::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdccalcboundingbox">external documentation</a>.
+-spec calcBoundingBox(This, X, Y) -> ok when
+	This::wxDC(), X::integer(), Y::integer().
 calcBoundingBox(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
  when is_integer(X),is_integer(Y) ->
   ?CLASS(ThisT,wxDC),
   wxe_util:cast(?wxDC_CalcBoundingBox,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI>>).
 
-%% @spec (This::wxDC()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcclear">external documentation</a>.
+-spec clear(This) -> ok when
+	This::wxDC().
 clear(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxDC),
   wxe_util:cast(?wxDC_Clear,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxDC()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdccomputescaleandorigin">external documentation</a>.
+-spec computeScaleAndOrigin(This) -> ok when
+	This::wxDC().
 computeScaleAndOrigin(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxDC),
   wxe_util:cast(?wxDC_ComputeScaleAndOrigin,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxDC(), Pt::{X::integer(), Y::integer()}) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdccrosshair">external documentation</a>.
+-spec crossHair(This, Pt) -> ok when
+	This::wxDC(), Pt::{X::integer(), Y::integer()}.
 crossHair(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY})
  when is_integer(PtX),is_integer(PtY) ->
   ?CLASS(ThisT,wxDC),
   wxe_util:cast(?wxDC_CrossHair,
   <<ThisRef:32/?UI,PtX:32/?UI,PtY:32/?UI>>).
 
-%% @spec (This::wxDC()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcdestroyclippingregion">external documentation</a>.
+-spec destroyClippingRegion(This) -> ok when
+	This::wxDC().
 destroyClippingRegion(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxDC),
   wxe_util:cast(?wxDC_DestroyClippingRegion,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxDC(), X::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcdevicetologicalx">external documentation</a>.
+-spec deviceToLogicalX(This, X) -> integer() when
+	This::wxDC(), X::integer().
 deviceToLogicalX(#wx_ref{type=ThisT,ref=ThisRef},X)
  when is_integer(X) ->
   ?CLASS(ThisT,wxDC),
   wxe_util:call(?wxDC_DeviceToLogicalX,
   <<ThisRef:32/?UI,X:32/?UI>>).
 
-%% @spec (This::wxDC(), X::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcdevicetologicalxrel">external documentation</a>.
+-spec deviceToLogicalXRel(This, X) -> integer() when
+	This::wxDC(), X::integer().
 deviceToLogicalXRel(#wx_ref{type=ThisT,ref=ThisRef},X)
  when is_integer(X) ->
   ?CLASS(ThisT,wxDC),
   wxe_util:call(?wxDC_DeviceToLogicalXRel,
   <<ThisRef:32/?UI,X:32/?UI>>).
 
-%% @spec (This::wxDC(), Y::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcdevicetologicaly">external documentation</a>.
+-spec deviceToLogicalY(This, Y) -> integer() when
+	This::wxDC(), Y::integer().
 deviceToLogicalY(#wx_ref{type=ThisT,ref=ThisRef},Y)
  when is_integer(Y) ->
   ?CLASS(ThisT,wxDC),
   wxe_util:call(?wxDC_DeviceToLogicalY,
   <<ThisRef:32/?UI,Y:32/?UI>>).
 
-%% @spec (This::wxDC(), Y::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcdevicetologicalyrel">external documentation</a>.
+-spec deviceToLogicalYRel(This, Y) -> integer() when
+	This::wxDC(), Y::integer().
 deviceToLogicalYRel(#wx_ref{type=ThisT,ref=ThisRef},Y)
  when is_integer(Y) ->
   ?CLASS(ThisT,wxDC),
   wxe_util:call(?wxDC_DeviceToLogicalYRel,
   <<ThisRef:32/?UI,Y:32/?UI>>).
 
-%% @spec (This::wxDC(), Pt1::{X::integer(), Y::integer()}, Pt2::{X::integer(), Y::integer()}, Centre::{X::integer(), Y::integer()}) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcdrawarc">external documentation</a>.
+-spec drawArc(This, Pt1, Pt2, Centre) -> ok when
+	This::wxDC(), Pt1::{X::integer(), Y::integer()}, Pt2::{X::integer(), Y::integer()}, Centre::{X::integer(), Y::integer()}.
 drawArc(#wx_ref{type=ThisT,ref=ThisRef},{Pt1X,Pt1Y},{Pt2X,Pt2Y},{CentreX,CentreY})
  when is_integer(Pt1X),is_integer(Pt1Y),is_integer(Pt2X),is_integer(Pt2Y),is_integer(CentreX),is_integer(CentreY) ->
   ?CLASS(ThisT,wxDC),
   wxe_util:cast(?wxDC_DrawArc,
   <<ThisRef:32/?UI,Pt1X:32/?UI,Pt1Y:32/?UI,Pt2X:32/?UI,Pt2Y:32/?UI,CentreX:32/?UI,CentreY:32/?UI>>).
 
-%% @spec (This::wxDC(), Bmp::wxBitmap:wxBitmap(), Pt::{X::integer(), Y::integer()}) -> ok
 %% @equiv drawBitmap(This,Bmp,Pt, [])
+-spec drawBitmap(This, Bmp, Pt) -> ok when
+	This::wxDC(), Bmp::wxBitmap:wxBitmap(), Pt::{X::integer(), Y::integer()}.
+
 drawBitmap(This,Bmp,Pt={PtX,PtY})
  when is_record(This, wx_ref),is_record(Bmp, wx_ref),is_integer(PtX),is_integer(PtY) ->
   drawBitmap(This,Bmp,Pt, []).
 
-%% @spec (This::wxDC(), Bmp::wxBitmap:wxBitmap(), Pt::{X::integer(), Y::integer()}, [Option]) -> ok
-%% Option = {useMask, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcdrawbitmap">external documentation</a>.
+-spec drawBitmap(This, Bmp, Pt, [Option]) -> ok when
+	This::wxDC(), Bmp::wxBitmap:wxBitmap(), Pt::{X::integer(), Y::integer()},
+	Option :: {useMask, boolean()}.
 drawBitmap(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BmpT,ref=BmpRef},{PtX,PtY}, Options)
  when is_integer(PtX),is_integer(PtY),is_list(Options) ->
   ?CLASS(ThisT,wxDC),
@@ -169,48 +189,54 @@ drawBitmap(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BmpT,ref=BmpRef},{PtX,Pt
   wxe_util:cast(?wxDC_DrawBitmap,
   <<ThisRef:32/?UI,BmpRef:32/?UI,PtX:32/?UI,PtY:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxDC(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcdrawcheckmark">external documentation</a>.
+-spec drawCheckMark(This, Rect) -> ok when
+	This::wxDC(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}.
 drawCheckMark(#wx_ref{type=ThisT,ref=ThisRef},{RectX,RectY,RectW,RectH})
  when is_integer(RectX),is_integer(RectY),is_integer(RectW),is_integer(RectH) ->
   ?CLASS(ThisT,wxDC),
   wxe_util:cast(?wxDC_DrawCheckMark,
   <<ThisRef:32/?UI,RectX:32/?UI,RectY:32/?UI,RectW:32/?UI,RectH:32/?UI>>).
 
-%% @spec (This::wxDC(), Pt::{X::integer(), Y::integer()}, Radius::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcdrawcircle">external documentation</a>.
+-spec drawCircle(This, Pt, Radius) -> ok when
+	This::wxDC(), Pt::{X::integer(), Y::integer()}, Radius::integer().
 drawCircle(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY},Radius)
  when is_integer(PtX),is_integer(PtY),is_integer(Radius) ->
   ?CLASS(ThisT,wxDC),
   wxe_util:cast(?wxDC_DrawCircle,
   <<ThisRef:32/?UI,PtX:32/?UI,PtY:32/?UI,Radius:32/?UI>>).
 
-%% @spec (This::wxDC(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcdrawellipse">external documentation</a>.
+-spec drawEllipse(This, Rect) -> ok when
+	This::wxDC(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}.
 drawEllipse(#wx_ref{type=ThisT,ref=ThisRef},{RectX,RectY,RectW,RectH})
  when is_integer(RectX),is_integer(RectY),is_integer(RectW),is_integer(RectH) ->
   ?CLASS(ThisT,wxDC),
   wxe_util:cast(?wxDC_DrawEllipse_1,
   <<ThisRef:32/?UI,RectX:32/?UI,RectY:32/?UI,RectW:32/?UI,RectH:32/?UI>>).
 
-%% @spec (This::wxDC(), Pt::{X::integer(), Y::integer()}, Sz::{W::integer(), H::integer()}) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcdrawellipse">external documentation</a>.
+-spec drawEllipse(This, Pt, Sz) -> ok when
+	This::wxDC(), Pt::{X::integer(), Y::integer()}, Sz::{W::integer(), H::integer()}.
 drawEllipse(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY},{SzW,SzH})
  when is_integer(PtX),is_integer(PtY),is_integer(SzW),is_integer(SzH) ->
   ?CLASS(ThisT,wxDC),
   wxe_util:cast(?wxDC_DrawEllipse_2,
   <<ThisRef:32/?UI,PtX:32/?UI,PtY:32/?UI,SzW:32/?UI,SzH:32/?UI>>).
 
-%% @spec (This::wxDC(), Pt::{X::integer(), Y::integer()}, Sz::{W::integer(), H::integer()}, Sa::float(), Ea::float()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcdrawellipticarc">external documentation</a>.
+-spec drawEllipticArc(This, Pt, Sz, Sa, Ea) -> ok when
+	This::wxDC(), Pt::{X::integer(), Y::integer()}, Sz::{W::integer(), H::integer()}, Sa::float(), Ea::float().
 drawEllipticArc(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY},{SzW,SzH},Sa,Ea)
  when is_integer(PtX),is_integer(PtY),is_integer(SzW),is_integer(SzH),is_float(Sa),is_float(Ea) ->
   ?CLASS(ThisT,wxDC),
   wxe_util:cast(?wxDC_DrawEllipticArc,
   <<ThisRef:32/?UI,PtX:32/?UI,PtY:32/?UI,SzW:32/?UI,SzH:32/?UI,0:32,Sa:64/?F,Ea:64/?F>>).
 
-%% @spec (This::wxDC(), Icon::wxIcon:wxIcon(), Pt::{X::integer(), Y::integer()}) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcdrawicon">external documentation</a>.
+-spec drawIcon(This, Icon, Pt) -> ok when
+	This::wxDC(), Icon::wxIcon:wxIcon(), Pt::{X::integer(), Y::integer()}.
 drawIcon(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=IconT,ref=IconRef},{PtX,PtY})
  when is_integer(PtX),is_integer(PtY) ->
   ?CLASS(ThisT,wxDC),
@@ -218,15 +244,19 @@ drawIcon(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=IconT,ref=IconRef},{PtX,Pt
   wxe_util:cast(?wxDC_DrawIcon,
   <<ThisRef:32/?UI,IconRef:32/?UI,PtX:32/?UI,PtY:32/?UI>>).
 
-%% @spec (This::wxDC(), Text::string(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}) -> ok
 %% @equiv drawLabel(This,Text,Rect, [])
+-spec drawLabel(This, Text, Rect) -> ok when
+	This::wxDC(), Text::string(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}.
+
 drawLabel(This,Text,Rect={RectX,RectY,RectW,RectH})
  when is_record(This, wx_ref),is_list(Text),is_integer(RectX),is_integer(RectY),is_integer(RectW),is_integer(RectH) ->
   drawLabel(This,Text,Rect, []).
 
-%% @spec (This::wxDC(), Text::string(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}, [Option]) -> ok
-%% Option = {alignment, integer()} | {indexAccel, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcdrawlabel">external documentation</a>.
+-spec drawLabel(This, Text, Rect, [Option]) -> ok when
+	This::wxDC(), Text::string(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()},
+	Option :: {alignment, integer()}
+		 | {indexAccel, integer()}.
 drawLabel(#wx_ref{type=ThisT,ref=ThisRef},Text,{RectX,RectY,RectW,RectH}, Options)
  when is_list(Text),is_integer(RectX),is_integer(RectY),is_integer(RectW),is_integer(RectH),is_list(Options) ->
   ?CLASS(ThisT,wxDC),
@@ -238,23 +268,28 @@ drawLabel(#wx_ref{type=ThisT,ref=ThisRef},Text,{RectX,RectY,RectW,RectH}, Option
   wxe_util:cast(?wxDC_DrawLabel,
   <<ThisRef:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8,RectX:32/?UI,RectY:32/?UI,RectW:32/?UI,RectH:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxDC(), Pt1::{X::integer(), Y::integer()}, Pt2::{X::integer(), Y::integer()}) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcdrawline">external documentation</a>.
+-spec drawLine(This, Pt1, Pt2) -> ok when
+	This::wxDC(), Pt1::{X::integer(), Y::integer()}, Pt2::{X::integer(), Y::integer()}.
 drawLine(#wx_ref{type=ThisT,ref=ThisRef},{Pt1X,Pt1Y},{Pt2X,Pt2Y})
  when is_integer(Pt1X),is_integer(Pt1Y),is_integer(Pt2X),is_integer(Pt2Y) ->
   ?CLASS(ThisT,wxDC),
   wxe_util:cast(?wxDC_DrawLine,
   <<ThisRef:32/?UI,Pt1X:32/?UI,Pt1Y:32/?UI,Pt2X:32/?UI,Pt2Y:32/?UI>>).
 
-%% @spec (This::wxDC(), Points::[{X::integer(), Y::integer()}]) -> ok
 %% @equiv drawLines(This,Points, [])
+-spec drawLines(This, Points) -> ok when
+	This::wxDC(), Points::[{X::integer(), Y::integer()}].
+
 drawLines(This,Points)
  when is_record(This, wx_ref),is_list(Points) ->
   drawLines(This,Points, []).
 
-%% @spec (This::wxDC(), Points::[{X::integer(), Y::integer()}], [Option]) -> ok
-%% Option = {xoffset, integer()} | {yoffset, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcdrawlines">external documentation</a>.
+-spec drawLines(This, Points, [Option]) -> ok when
+	This::wxDC(), Points::[{X::integer(), Y::integer()}],
+	Option :: {xoffset, integer()}
+		 | {yoffset, integer()}.
 drawLines(#wx_ref{type=ThisT,ref=ThisRef},Points, Options)
  when is_list(Points),is_list(Options) ->
   ?CLASS(ThisT,wxDC),
@@ -266,15 +301,20 @@ drawLines(#wx_ref{type=ThisT,ref=ThisRef},Points, Options)
   <<ThisRef:32/?UI,(length(Points)):32/?UI,
         (<< <<X:32/?I,Y:32/?I>> || {X,Y} <- Points>>)/binary, BinOpt/binary>>).
 
-%% @spec (This::wxDC(), Points::[{X::integer(), Y::integer()}]) -> ok
 %% @equiv drawPolygon(This,Points, [])
+-spec drawPolygon(This, Points) -> ok when
+	This::wxDC(), Points::[{X::integer(), Y::integer()}].
+
 drawPolygon(This,Points)
  when is_record(This, wx_ref),is_list(Points) ->
   drawPolygon(This,Points, []).
 
-%% @spec (This::wxDC(), Points::[{X::integer(), Y::integer()}], [Option]) -> ok
-%% Option = {xoffset, integer()} | {yoffset, integer()} | {fillStyle, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcdrawpolygon">external documentation</a>.
+-spec drawPolygon(This, Points, [Option]) -> ok when
+	This::wxDC(), Points::[{X::integer(), Y::integer()}],
+	Option :: {xoffset, integer()}
+		 | {yoffset, integer()}
+		 | {fillStyle, integer()}.
 drawPolygon(#wx_ref{type=ThisT,ref=ThisRef},Points, Options)
  when is_list(Points),is_list(Options) ->
   ?CLASS(ThisT,wxDC),
@@ -287,32 +327,36 @@ drawPolygon(#wx_ref{type=ThisT,ref=ThisRef},Points, Options)
   <<ThisRef:32/?UI,(length(Points)):32/?UI,
         (<< <<X:32/?I,Y:32/?I>> || {X,Y} <- Points>>)/binary, BinOpt/binary>>).
 
-%% @spec (This::wxDC(), Pt::{X::integer(), Y::integer()}) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcdrawpoint">external documentation</a>.
+-spec drawPoint(This, Pt) -> ok when
+	This::wxDC(), Pt::{X::integer(), Y::integer()}.
 drawPoint(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY})
  when is_integer(PtX),is_integer(PtY) ->
   ?CLASS(ThisT,wxDC),
   wxe_util:cast(?wxDC_DrawPoint,
   <<ThisRef:32/?UI,PtX:32/?UI,PtY:32/?UI>>).
 
-%% @spec (This::wxDC(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcdrawrectangle">external documentation</a>.
+-spec drawRectangle(This, Rect) -> ok when
+	This::wxDC(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}.
 drawRectangle(#wx_ref{type=ThisT,ref=ThisRef},{RectX,RectY,RectW,RectH})
  when is_integer(RectX),is_integer(RectY),is_integer(RectW),is_integer(RectH) ->
   ?CLASS(ThisT,wxDC),
   wxe_util:cast(?wxDC_DrawRectangle_1,
   <<ThisRef:32/?UI,RectX:32/?UI,RectY:32/?UI,RectW:32/?UI,RectH:32/?UI>>).
 
-%% @spec (This::wxDC(), Pt::{X::integer(), Y::integer()}, Sz::{W::integer(), H::integer()}) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcdrawrectangle">external documentation</a>.
+-spec drawRectangle(This, Pt, Sz) -> ok when
+	This::wxDC(), Pt::{X::integer(), Y::integer()}, Sz::{W::integer(), H::integer()}.
 drawRectangle(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY},{SzW,SzH})
  when is_integer(PtX),is_integer(PtY),is_integer(SzW),is_integer(SzH) ->
   ?CLASS(ThisT,wxDC),
   wxe_util:cast(?wxDC_DrawRectangle_2,
   <<ThisRef:32/?UI,PtX:32/?UI,PtY:32/?UI,SzW:32/?UI,SzH:32/?UI>>).
 
-%% @spec (This::wxDC(), Text::string(), Pt::{X::integer(), Y::integer()}, Angle::float()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcdrawrotatedtext">external documentation</a>.
+-spec drawRotatedText(This, Text, Pt, Angle) -> ok when
+	This::wxDC(), Text::string(), Pt::{X::integer(), Y::integer()}, Angle::float().
 drawRotatedText(#wx_ref{type=ThisT,ref=ThisRef},Text,{PtX,PtY},Angle)
  when is_list(Text),is_integer(PtX),is_integer(PtY),is_float(Angle) ->
   ?CLASS(ThisT,wxDC),
@@ -320,24 +364,27 @@ drawRotatedText(#wx_ref{type=ThisT,ref=ThisRef},Text,{PtX,PtY},Angle)
   wxe_util:cast(?wxDC_DrawRotatedText,
   <<ThisRef:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8,PtX:32/?UI,PtY:32/?UI,Angle:64/?F>>).
 
-%% @spec (This::wxDC(), R::{X::integer(), Y::integer(), W::integer(), H::integer()}, Radius::float()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcdrawroundedrectangle">external documentation</a>.
+-spec drawRoundedRectangle(This, R, Radius) -> ok when
+	This::wxDC(), R::{X::integer(), Y::integer(), W::integer(), H::integer()}, Radius::float().
 drawRoundedRectangle(#wx_ref{type=ThisT,ref=ThisRef},{RX,RY,RW,RH},Radius)
  when is_integer(RX),is_integer(RY),is_integer(RW),is_integer(RH),is_float(Radius) ->
   ?CLASS(ThisT,wxDC),
   wxe_util:cast(?wxDC_DrawRoundedRectangle_2,
   <<ThisRef:32/?UI,RX:32/?UI,RY:32/?UI,RW:32/?UI,RH:32/?UI,0:32,Radius:64/?F>>).
 
-%% @spec (This::wxDC(), Pt::{X::integer(), Y::integer()}, Sz::{W::integer(), H::integer()}, Radius::float()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcdrawroundedrectangle">external documentation</a>.
+-spec drawRoundedRectangle(This, Pt, Sz, Radius) -> ok when
+	This::wxDC(), Pt::{X::integer(), Y::integer()}, Sz::{W::integer(), H::integer()}, Radius::float().
 drawRoundedRectangle(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY},{SzW,SzH},Radius)
  when is_integer(PtX),is_integer(PtY),is_integer(SzW),is_integer(SzH),is_float(Radius) ->
   ?CLASS(ThisT,wxDC),
   wxe_util:cast(?wxDC_DrawRoundedRectangle_3,
   <<ThisRef:32/?UI,PtX:32/?UI,PtY:32/?UI,SzW:32/?UI,SzH:32/?UI,0:32,Radius:64/?F>>).
 
-%% @spec (This::wxDC(), Text::string(), Pt::{X::integer(), Y::integer()}) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcdrawtext">external documentation</a>.
+-spec drawText(This, Text, Pt) -> ok when
+	This::wxDC(), Text::string(), Pt::{X::integer(), Y::integer()}.
 drawText(#wx_ref{type=ThisT,ref=ThisRef},Text,{PtX,PtY})
  when is_list(Text),is_integer(PtX),is_integer(PtY) ->
   ?CLASS(ThisT,wxDC),
@@ -345,29 +392,34 @@ drawText(#wx_ref{type=ThisT,ref=ThisRef},Text,{PtX,PtY})
   wxe_util:cast(?wxDC_DrawText,
   <<ThisRef:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8,PtX:32/?UI,PtY:32/?UI>>).
 
-%% @spec (This::wxDC()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcenddoc">external documentation</a>.
+-spec endDoc(This) -> ok when
+	This::wxDC().
 endDoc(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxDC),
   wxe_util:cast(?wxDC_EndDoc,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxDC()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcendpage">external documentation</a>.
+-spec endPage(This) -> ok when
+	This::wxDC().
 endPage(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxDC),
   wxe_util:cast(?wxDC_EndPage,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxDC(), Pt::{X::integer(), Y::integer()}, Col::wx:colour()) -> bool()
 %% @equiv floodFill(This,Pt,Col, [])
+-spec floodFill(This, Pt, Col) -> boolean() when
+	This::wxDC(), Pt::{X::integer(), Y::integer()}, Col::wx:wx_colour().
+
 floodFill(This,Pt={PtX,PtY},Col)
  when is_record(This, wx_ref),is_integer(PtX),is_integer(PtY),tuple_size(Col) =:= 3; tuple_size(Col) =:= 4 ->
   floodFill(This,Pt,Col, []).
 
-%% @spec (This::wxDC(), Pt::{X::integer(), Y::integer()}, Col::wx:colour(), [Option]) -> bool()
-%% Option = {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcfloodfill">external documentation</a>.
+-spec floodFill(This, Pt, Col, [Option]) -> boolean() when
+	This::wxDC(), Pt::{X::integer(), Y::integer()}, Col::wx:wx_colour(),
+	Option :: {style, integer()}.
 floodFill(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY},Col, Options)
  when is_integer(PtX),is_integer(PtY),tuple_size(Col) =:= 3; tuple_size(Col) =:= 4,is_list(Options) ->
   ?CLASS(ThisT,wxDC),
@@ -377,81 +429,91 @@ floodFill(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY},Col, Options)
   wxe_util:call(?wxDC_FloodFill,
   <<ThisRef:32/?UI,PtX:32/?UI,PtY:32/?UI,(wxe_util:colour_bin(Col)):16/binary, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxDC()) -> wxBrush:wxBrush()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcgetbackground">external documentation</a>.
+-spec getBackground(This) -> wxBrush:wxBrush() when
+	This::wxDC().
 getBackground(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxDC),
   wxe_util:call(?wxDC_GetBackground,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxDC()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcgetbackgroundmode">external documentation</a>.
+-spec getBackgroundMode(This) -> integer() when
+	This::wxDC().
 getBackgroundMode(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxDC),
   wxe_util:call(?wxDC_GetBackgroundMode,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxDC()) -> wxBrush:wxBrush()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcgetbrush">external documentation</a>.
+-spec getBrush(This) -> wxBrush:wxBrush() when
+	This::wxDC().
 getBrush(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxDC),
   wxe_util:call(?wxDC_GetBrush,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxDC()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcgetcharheight">external documentation</a>.
+-spec getCharHeight(This) -> integer() when
+	This::wxDC().
 getCharHeight(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxDC),
   wxe_util:call(?wxDC_GetCharHeight,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxDC()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcgetcharwidth">external documentation</a>.
+-spec getCharWidth(This) -> integer() when
+	This::wxDC().
 getCharWidth(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxDC),
   wxe_util:call(?wxDC_GetCharWidth,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxDC(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcgetclippingbox">external documentation</a>.
+-spec getClippingBox(This, Rect) -> ok when
+	This::wxDC(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}.
 getClippingBox(#wx_ref{type=ThisT,ref=ThisRef},{RectX,RectY,RectW,RectH})
  when is_integer(RectX),is_integer(RectY),is_integer(RectW),is_integer(RectH) ->
   ?CLASS(ThisT,wxDC),
   wxe_util:cast(?wxDC_GetClippingBox,
   <<ThisRef:32/?UI,RectX:32/?UI,RectY:32/?UI,RectW:32/?UI,RectH:32/?UI>>).
 
-%% @spec (This::wxDC()) -> wxFont:wxFont()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcgetfont">external documentation</a>.
+-spec getFont(This) -> wxFont:wxFont() when
+	This::wxDC().
 getFont(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxDC),
   wxe_util:call(?wxDC_GetFont,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxDC()) -> WxLayoutDirection
-%% WxLayoutDirection = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcgetlayoutdirection">external documentation</a>.
-%%<br /> WxLayoutDirection is one of ?wxLayout_Default | ?wxLayout_LeftToRight | ?wxLayout_RightToLeft
+%%<br /> Res = ?wxLayout_Default | ?wxLayout_LeftToRight | ?wxLayout_RightToLeft
+-spec getLayoutDirection(This) -> wx:wx_enum() when
+	This::wxDC().
 getLayoutDirection(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxDC),
   wxe_util:call(?wxDC_GetLayoutDirection,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxDC()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcgetlogicalfunction">external documentation</a>.
+-spec getLogicalFunction(This) -> integer() when
+	This::wxDC().
 getLogicalFunction(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxDC),
   wxe_util:call(?wxDC_GetLogicalFunction,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxDC()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcgetmapmode">external documentation</a>.
+-spec getMapMode(This) -> integer() when
+	This::wxDC().
 getMapMode(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxDC),
   wxe_util:call(?wxDC_GetMapMode,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxDC(), String::string()) -> {W::integer(), H::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcgetmultilinetextextent">external documentation</a>.
+-spec getMultiLineTextExtent(This, String) -> {W::integer(), H::integer()} when
+	This::wxDC(), String::string().
 getMultiLineTextExtent(#wx_ref{type=ThisT,ref=ThisRef},String)
  when is_list(String) ->
   ?CLASS(ThisT,wxDC),
@@ -459,9 +521,10 @@ getMultiLineTextExtent(#wx_ref{type=ThisT,ref=ThisRef},String)
   wxe_util:call(?wxDC_GetMultiLineTextExtent_1,
   <<ThisRef:32/?UI,(byte_size(String_UC)):32/?UI,(String_UC)/binary, 0:(((8- ((0+byte_size(String_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxDC(), String::string(), [Option]) -> {Width::integer(), Height::integer(), HeightLine::integer()}
-%% Option = {font, wxFont:wxFont()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcgetmultilinetextextent">external documentation</a>.
+-spec getMultiLineTextExtent(This, String, [Option]) -> {Width::integer(), Height::integer(), HeightLine::integer()} when
+	This::wxDC(), String::string(),
+	Option :: {font, wxFont:wxFont()}.
 getMultiLineTextExtent(#wx_ref{type=ThisT,ref=ThisRef},String, Options)
  when is_list(String),is_list(Options) ->
   ?CLASS(ThisT,wxDC),
@@ -472,8 +535,9 @@ getMultiLineTextExtent(#wx_ref{type=ThisT,ref=ThisRef},String, Options)
   wxe_util:call(?wxDC_GetMultiLineTextExtent_4,
   <<ThisRef:32/?UI,(byte_size(String_UC)):32/?UI,(String_UC)/binary, 0:(((8- ((0+byte_size(String_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxDC(), Text::string(), Widths::[integer()]) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcgetpartialtextextents">external documentation</a>.
+-spec getPartialTextExtents(This, Text, Widths) -> boolean() when
+	This::wxDC(), Text::string(), Widths::[integer()].
 getPartialTextExtents(#wx_ref{type=ThisT,ref=ThisRef},Text,Widths)
  when is_list(Text),is_list(Widths) ->
   ?CLASS(ThisT,wxDC),
@@ -482,51 +546,58 @@ getPartialTextExtents(#wx_ref{type=ThisT,ref=ThisRef},Text,Widths)
   <<ThisRef:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8,(length(Widths)):32/?UI,
         (<< <<C:32/?I>> || C <- Widths>>)/binary, 0:(((1+length(Widths)) rem 2)*32)>>).
 
-%% @spec (This::wxDC()) -> wxPen:wxPen()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcgetpen">external documentation</a>.
+-spec getPen(This) -> wxPen:wxPen() when
+	This::wxDC().
 getPen(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxDC),
   wxe_util:call(?wxDC_GetPen,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxDC(), Pt::{X::integer(), Y::integer()}, Col::wx:colour()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcgetpixel">external documentation</a>.
+-spec getPixel(This, Pt, Col) -> boolean() when
+	This::wxDC(), Pt::{X::integer(), Y::integer()}, Col::wx:wx_colour().
 getPixel(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY},Col)
  when is_integer(PtX),is_integer(PtY),tuple_size(Col) =:= 3; tuple_size(Col) =:= 4 ->
   ?CLASS(ThisT,wxDC),
   wxe_util:call(?wxDC_GetPixel,
   <<ThisRef:32/?UI,PtX:32/?UI,PtY:32/?UI,(wxe_util:colour_bin(Col)):16/binary>>).
 
-%% @spec (This::wxDC()) -> {W::integer(), H::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcgetppi">external documentation</a>.
+-spec getPPI(This) -> {W::integer(), H::integer()} when
+	This::wxDC().
 getPPI(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxDC),
   wxe_util:call(?wxDC_GetPPI,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxDC()) -> {W::integer(), H::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcgetsize">external documentation</a>.
+-spec getSize(This) -> {W::integer(), H::integer()} when
+	This::wxDC().
 getSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxDC),
   wxe_util:call(?wxDC_GetSize,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxDC()) -> {W::integer(), H::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcgetsizemm">external documentation</a>.
+-spec getSizeMM(This) -> {W::integer(), H::integer()} when
+	This::wxDC().
 getSizeMM(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxDC),
   wxe_util:call(?wxDC_GetSizeMM,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxDC()) -> wx:colour()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcgettextbackground">external documentation</a>.
+-spec getTextBackground(This) -> wx:wx_colour() when
+	This::wxDC().
 getTextBackground(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxDC),
   wxe_util:call(?wxDC_GetTextBackground,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxDC(), String::string()) -> {W::integer(), H::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcgettextextent">external documentation</a>.
+-spec getTextExtent(This, String) -> {W::integer(), H::integer()} when
+	This::wxDC(), String::string().
 getTextExtent(#wx_ref{type=ThisT,ref=ThisRef},String)
  when is_list(String) ->
   ?CLASS(ThisT,wxDC),
@@ -534,9 +605,11 @@ getTextExtent(#wx_ref{type=ThisT,ref=ThisRef},String)
   wxe_util:call(?wxDC_GetTextExtent_1,
   <<ThisRef:32/?UI,(byte_size(String_UC)):32/?UI,(String_UC)/binary, 0:(((8- ((0+byte_size(String_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxDC(), String::string(), [Option]) -> {X::integer(), Y::integer(), Descent::integer(), ExternalLeading::integer()}
-%% Option = {theFont, wxFont:wxFont()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcgettextextent">external documentation</a>.
+-spec getTextExtent(This, String, [Option]) -> Result when
+	Result :: {X::integer(), Y::integer(), Descent::integer(), ExternalLeading::integer()},
+	This::wxDC(), String::string(),
+	Option :: {theFont, wxFont:wxFont()}.
 getTextExtent(#wx_ref{type=ThisT,ref=ThisRef},String, Options)
  when is_list(String),is_list(Options) ->
   ?CLASS(ThisT,wxDC),
@@ -547,47 +620,53 @@ getTextExtent(#wx_ref{type=ThisT,ref=ThisRef},String, Options)
   wxe_util:call(?wxDC_GetTextExtent_4,
   <<ThisRef:32/?UI,(byte_size(String_UC)):32/?UI,(String_UC)/binary, 0:(((8- ((0+byte_size(String_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxDC()) -> wx:colour()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcgettextforeground">external documentation</a>.
+-spec getTextForeground(This) -> wx:wx_colour() when
+	This::wxDC().
 getTextForeground(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxDC),
   wxe_util:call(?wxDC_GetTextForeground,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxDC()) -> {X::float(), Y::float()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcgetuserscale">external documentation</a>.
+-spec getUserScale(This) -> {X::float(), Y::float()} when
+	This::wxDC().
 getUserScale(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxDC),
   wxe_util:call(?wxDC_GetUserScale,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxDC(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}, InitialColour::wx:colour(), DestColour::wx:colour()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcgradientfillconcentric">external documentation</a>.
+-spec gradientFillConcentric(This, Rect, InitialColour, DestColour) -> ok when
+	This::wxDC(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}, InitialColour::wx:wx_colour(), DestColour::wx:wx_colour().
 gradientFillConcentric(#wx_ref{type=ThisT,ref=ThisRef},{RectX,RectY,RectW,RectH},InitialColour,DestColour)
  when is_integer(RectX),is_integer(RectY),is_integer(RectW),is_integer(RectH),tuple_size(InitialColour) =:= 3; tuple_size(InitialColour) =:= 4,tuple_size(DestColour) =:= 3; tuple_size(DestColour) =:= 4 ->
   ?CLASS(ThisT,wxDC),
   wxe_util:cast(?wxDC_GradientFillConcentric_3,
   <<ThisRef:32/?UI,RectX:32/?UI,RectY:32/?UI,RectW:32/?UI,RectH:32/?UI,(wxe_util:colour_bin(InitialColour)):16/binary,(wxe_util:colour_bin(DestColour)):16/binary>>).
 
-%% @spec (This::wxDC(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}, InitialColour::wx:colour(), DestColour::wx:colour(), CircleCenter::{X::integer(), Y::integer()}) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcgradientfillconcentric">external documentation</a>.
+-spec gradientFillConcentric(This, Rect, InitialColour, DestColour, CircleCenter) -> ok when
+	This::wxDC(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}, InitialColour::wx:wx_colour(), DestColour::wx:wx_colour(), CircleCenter::{X::integer(), Y::integer()}.
 gradientFillConcentric(#wx_ref{type=ThisT,ref=ThisRef},{RectX,RectY,RectW,RectH},InitialColour,DestColour,{CircleCenterX,CircleCenterY})
  when is_integer(RectX),is_integer(RectY),is_integer(RectW),is_integer(RectH),tuple_size(InitialColour) =:= 3; tuple_size(InitialColour) =:= 4,tuple_size(DestColour) =:= 3; tuple_size(DestColour) =:= 4,is_integer(CircleCenterX),is_integer(CircleCenterY) ->
   ?CLASS(ThisT,wxDC),
   wxe_util:cast(?wxDC_GradientFillConcentric_4,
   <<ThisRef:32/?UI,RectX:32/?UI,RectY:32/?UI,RectW:32/?UI,RectH:32/?UI,(wxe_util:colour_bin(InitialColour)):16/binary,(wxe_util:colour_bin(DestColour)):16/binary,CircleCenterX:32/?UI,CircleCenterY:32/?UI>>).
 
-%% @spec (This::wxDC(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}, InitialColour::wx:colour(), DestColour::wx:colour()) -> ok
 %% @equiv gradientFillLinear(This,Rect,InitialColour,DestColour, [])
+-spec gradientFillLinear(This, Rect, InitialColour, DestColour) -> ok when
+	This::wxDC(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}, InitialColour::wx:wx_colour(), DestColour::wx:wx_colour().
+
 gradientFillLinear(This,Rect={RectX,RectY,RectW,RectH},InitialColour,DestColour)
  when is_record(This, wx_ref),is_integer(RectX),is_integer(RectY),is_integer(RectW),is_integer(RectH),tuple_size(InitialColour) =:= 3; tuple_size(InitialColour) =:= 4,tuple_size(DestColour) =:= 3; tuple_size(DestColour) =:= 4 ->
   gradientFillLinear(This,Rect,InitialColour,DestColour, []).
 
-%% @spec (This::wxDC(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}, InitialColour::wx:colour(), DestColour::wx:colour(), [Option]) -> ok
-%% Option = {nDirection, WxDirection}
-%% WxDirection = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcgradientfilllinear">external documentation</a>.
-%%<br /> WxDirection is one of ?wxLEFT | ?wxRIGHT | ?wxUP | ?wxDOWN | ?wxTOP | ?wxBOTTOM | ?wxNORTH | ?wxSOUTH | ?wxWEST | ?wxEAST | ?wxALL
+%%<br /> NDirection = ?wxLEFT | ?wxRIGHT | ?wxUP | ?wxDOWN | ?wxTOP | ?wxBOTTOM | ?wxNORTH | ?wxSOUTH | ?wxWEST | ?wxEAST | ?wxALL
+-spec gradientFillLinear(This, Rect, InitialColour, DestColour, [Option]) -> ok when
+	This::wxDC(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}, InitialColour::wx:wx_colour(), DestColour::wx:wx_colour(),
+	Option :: {nDirection, wx:wx_enum()}.
 gradientFillLinear(#wx_ref{type=ThisT,ref=ThisRef},{RectX,RectY,RectW,RectH},InitialColour,DestColour, Options)
  when is_integer(RectX),is_integer(RectY),is_integer(RectW),is_integer(RectH),tuple_size(InitialColour) =:= 3; tuple_size(InitialColour) =:= 4,tuple_size(DestColour) =:= 3; tuple_size(DestColour) =:= 4,is_list(Options) ->
   ?CLASS(ThisT,wxDC),
@@ -597,121 +676,131 @@ gradientFillLinear(#wx_ref{type=ThisT,ref=ThisRef},{RectX,RectY,RectW,RectH},Ini
   wxe_util:cast(?wxDC_GradientFillLinear,
   <<ThisRef:32/?UI,RectX:32/?UI,RectY:32/?UI,RectW:32/?UI,RectH:32/?UI,(wxe_util:colour_bin(InitialColour)):16/binary,(wxe_util:colour_bin(DestColour)):16/binary, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxDC(), X::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdclogicaltodevicex">external documentation</a>.
+-spec logicalToDeviceX(This, X) -> integer() when
+	This::wxDC(), X::integer().
 logicalToDeviceX(#wx_ref{type=ThisT,ref=ThisRef},X)
  when is_integer(X) ->
   ?CLASS(ThisT,wxDC),
   wxe_util:call(?wxDC_LogicalToDeviceX,
   <<ThisRef:32/?UI,X:32/?UI>>).
 
-%% @spec (This::wxDC(), X::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdclogicaltodevicexrel">external documentation</a>.
+-spec logicalToDeviceXRel(This, X) -> integer() when
+	This::wxDC(), X::integer().
 logicalToDeviceXRel(#wx_ref{type=ThisT,ref=ThisRef},X)
  when is_integer(X) ->
   ?CLASS(ThisT,wxDC),
   wxe_util:call(?wxDC_LogicalToDeviceXRel,
   <<ThisRef:32/?UI,X:32/?UI>>).
 
-%% @spec (This::wxDC(), Y::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdclogicaltodevicey">external documentation</a>.
+-spec logicalToDeviceY(This, Y) -> integer() when
+	This::wxDC(), Y::integer().
 logicalToDeviceY(#wx_ref{type=ThisT,ref=ThisRef},Y)
  when is_integer(Y) ->
   ?CLASS(ThisT,wxDC),
   wxe_util:call(?wxDC_LogicalToDeviceY,
   <<ThisRef:32/?UI,Y:32/?UI>>).
 
-%% @spec (This::wxDC(), Y::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdclogicaltodeviceyrel">external documentation</a>.
+-spec logicalToDeviceYRel(This, Y) -> integer() when
+	This::wxDC(), Y::integer().
 logicalToDeviceYRel(#wx_ref{type=ThisT,ref=ThisRef},Y)
  when is_integer(Y) ->
   ?CLASS(ThisT,wxDC),
   wxe_util:call(?wxDC_LogicalToDeviceYRel,
   <<ThisRef:32/?UI,Y:32/?UI>>).
 
-%% @spec (This::wxDC()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcmaxx">external documentation</a>.
+-spec maxX(This) -> integer() when
+	This::wxDC().
 maxX(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxDC),
   wxe_util:call(?wxDC_MaxX,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxDC()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcmaxy">external documentation</a>.
+-spec maxY(This) -> integer() when
+	This::wxDC().
 maxY(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxDC),
   wxe_util:call(?wxDC_MaxY,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxDC()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcminx">external documentation</a>.
+-spec minX(This) -> integer() when
+	This::wxDC().
 minX(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxDC),
   wxe_util:call(?wxDC_MinX,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxDC()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcminy">external documentation</a>.
+-spec minY(This) -> integer() when
+	This::wxDC().
 minY(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxDC),
   wxe_util:call(?wxDC_MinY,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxDC()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcisok">external documentation</a>.
+-spec isOk(This) -> boolean() when
+	This::wxDC().
 isOk(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxDC),
   wxe_util:call(?wxDC_IsOk,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxDC()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcresetboundingbox">external documentation</a>.
+-spec resetBoundingBox(This) -> ok when
+	This::wxDC().
 resetBoundingBox(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxDC),
   wxe_util:cast(?wxDC_ResetBoundingBox,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxDC(), XLeftRight::bool(), YBottomUp::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcsetaxisorientation">external documentation</a>.
+-spec setAxisOrientation(This, XLeftRight, YBottomUp) -> ok when
+	This::wxDC(), XLeftRight::boolean(), YBottomUp::boolean().
 setAxisOrientation(#wx_ref{type=ThisT,ref=ThisRef},XLeftRight,YBottomUp)
  when is_boolean(XLeftRight),is_boolean(YBottomUp) ->
   ?CLASS(ThisT,wxDC),
   wxe_util:cast(?wxDC_SetAxisOrientation,
   <<ThisRef:32/?UI,(wxe_util:from_bool(XLeftRight)):32/?UI,(wxe_util:from_bool(YBottomUp)):32/?UI>>).
 
-%% @spec (This::wxDC(), Brush::wxBrush:wxBrush()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcsetbackground">external documentation</a>.
+-spec setBackground(This, Brush) -> ok when
+	This::wxDC(), Brush::wxBrush:wxBrush().
 setBackground(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BrushT,ref=BrushRef}) ->
   ?CLASS(ThisT,wxDC),
   ?CLASS(BrushT,wxBrush),
   wxe_util:cast(?wxDC_SetBackground,
   <<ThisRef:32/?UI,BrushRef:32/?UI>>).
 
-%% @spec (This::wxDC(), Mode::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcsetbackgroundmode">external documentation</a>.
+-spec setBackgroundMode(This, Mode) -> ok when
+	This::wxDC(), Mode::integer().
 setBackgroundMode(#wx_ref{type=ThisT,ref=ThisRef},Mode)
  when is_integer(Mode) ->
   ?CLASS(ThisT,wxDC),
   wxe_util:cast(?wxDC_SetBackgroundMode,
   <<ThisRef:32/?UI,Mode:32/?UI>>).
 
-%% @spec (This::wxDC(), Brush::wxBrush:wxBrush()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcsetbrush">external documentation</a>.
+-spec setBrush(This, Brush) -> ok when
+	This::wxDC(), Brush::wxBrush:wxBrush().
 setBrush(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BrushT,ref=BrushRef}) ->
   ?CLASS(ThisT,wxDC),
   ?CLASS(BrushT,wxBrush),
   wxe_util:cast(?wxDC_SetBrush,
   <<ThisRef:32/?UI,BrushRef:32/?UI>>).
 
-%% @spec (This::wxDC(),X::term()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcsetclippingregion">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% setClippingRegion(This::wxDC(), Region::wxRegion:wxRegion()) -> ok </c>
-%% </p>
-%% <p><c>
-%% setClippingRegion(This::wxDC(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}) -> ok </c>
-%% </p>
+-spec setClippingRegion(This, Region) -> ok when
+	This::wxDC(), Region::wxRegion:wxRegion();
+      (This, Rect) -> ok when
+	This::wxDC(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}.
 setClippingRegion(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=RegionT,ref=RegionRef}) ->
   ?CLASS(ThisT,wxDC),
   ?CLASS(RegionT,wxRegion),
@@ -723,98 +812,109 @@ setClippingRegion(#wx_ref{type=ThisT,ref=ThisRef},{RectX,RectY,RectW,RectH})
   wxe_util:cast(?wxDC_SetClippingRegion_1_1,
   <<ThisRef:32/?UI,RectX:32/?UI,RectY:32/?UI,RectW:32/?UI,RectH:32/?UI>>).
 
-%% @spec (This::wxDC(), Pt::{X::integer(), Y::integer()}, Sz::{W::integer(), H::integer()}) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcsetclippingregion">external documentation</a>.
+-spec setClippingRegion(This, Pt, Sz) -> ok when
+	This::wxDC(), Pt::{X::integer(), Y::integer()}, Sz::{W::integer(), H::integer()}.
 setClippingRegion(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY},{SzW,SzH})
  when is_integer(PtX),is_integer(PtY),is_integer(SzW),is_integer(SzH) ->
   ?CLASS(ThisT,wxDC),
   wxe_util:cast(?wxDC_SetClippingRegion_2,
   <<ThisRef:32/?UI,PtX:32/?UI,PtY:32/?UI,SzW:32/?UI,SzH:32/?UI>>).
 
-%% @spec (This::wxDC(), X::integer(), Y::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcsetdeviceorigin">external documentation</a>.
+-spec setDeviceOrigin(This, X, Y) -> ok when
+	This::wxDC(), X::integer(), Y::integer().
 setDeviceOrigin(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
  when is_integer(X),is_integer(Y) ->
   ?CLASS(ThisT,wxDC),
   wxe_util:cast(?wxDC_SetDeviceOrigin,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI>>).
 
-%% @spec (This::wxDC(), Font::wxFont:wxFont()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcsetfont">external documentation</a>.
+-spec setFont(This, Font) -> ok when
+	This::wxDC(), Font::wxFont:wxFont().
 setFont(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FontT,ref=FontRef}) ->
   ?CLASS(ThisT,wxDC),
   ?CLASS(FontT,wxFont),
   wxe_util:cast(?wxDC_SetFont,
   <<ThisRef:32/?UI,FontRef:32/?UI>>).
 
-%% @spec (This::wxDC(), Dir::WxLayoutDirection) -> ok
-%% WxLayoutDirection = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcsetlayoutdirection">external documentation</a>.
-%%<br /> WxLayoutDirection is one of ?wxLayout_Default | ?wxLayout_LeftToRight | ?wxLayout_RightToLeft
+%%<br /> Dir = ?wxLayout_Default | ?wxLayout_LeftToRight | ?wxLayout_RightToLeft
+-spec setLayoutDirection(This, Dir) -> ok when
+	This::wxDC(), Dir::wx:wx_enum().
 setLayoutDirection(#wx_ref{type=ThisT,ref=ThisRef},Dir)
  when is_integer(Dir) ->
   ?CLASS(ThisT,wxDC),
   wxe_util:cast(?wxDC_SetLayoutDirection,
   <<ThisRef:32/?UI,Dir:32/?UI>>).
 
-%% @spec (This::wxDC(), Function::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcsetlogicalfunction">external documentation</a>.
+-spec setLogicalFunction(This, Function) -> ok when
+	This::wxDC(), Function::integer().
 setLogicalFunction(#wx_ref{type=ThisT,ref=ThisRef},Function)
  when is_integer(Function) ->
   ?CLASS(ThisT,wxDC),
   wxe_util:cast(?wxDC_SetLogicalFunction,
   <<ThisRef:32/?UI,Function:32/?UI>>).
 
-%% @spec (This::wxDC(), Mode::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcsetmapmode">external documentation</a>.
+-spec setMapMode(This, Mode) -> ok when
+	This::wxDC(), Mode::integer().
 setMapMode(#wx_ref{type=ThisT,ref=ThisRef},Mode)
  when is_integer(Mode) ->
   ?CLASS(ThisT,wxDC),
   wxe_util:cast(?wxDC_SetMapMode,
   <<ThisRef:32/?UI,Mode:32/?UI>>).
 
-%% @spec (This::wxDC(), Palette::wxPalette:wxPalette()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcsetpalette">external documentation</a>.
+-spec setPalette(This, Palette) -> ok when
+	This::wxDC(), Palette::wxPalette:wxPalette().
 setPalette(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PaletteT,ref=PaletteRef}) ->
   ?CLASS(ThisT,wxDC),
   ?CLASS(PaletteT,wxPalette),
   wxe_util:cast(?wxDC_SetPalette,
   <<ThisRef:32/?UI,PaletteRef:32/?UI>>).
 
-%% @spec (This::wxDC(), Pen::wxPen:wxPen()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcsetpen">external documentation</a>.
+-spec setPen(This, Pen) -> ok when
+	This::wxDC(), Pen::wxPen:wxPen().
 setPen(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PenT,ref=PenRef}) ->
   ?CLASS(ThisT,wxDC),
   ?CLASS(PenT,wxPen),
   wxe_util:cast(?wxDC_SetPen,
   <<ThisRef:32/?UI,PenRef:32/?UI>>).
 
-%% @spec (This::wxDC(), Colour::wx:colour()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcsettextbackground">external documentation</a>.
+-spec setTextBackground(This, Colour) -> ok when
+	This::wxDC(), Colour::wx:wx_colour().
 setTextBackground(#wx_ref{type=ThisT,ref=ThisRef},Colour)
  when tuple_size(Colour) =:= 3; tuple_size(Colour) =:= 4 ->
   ?CLASS(ThisT,wxDC),
   wxe_util:cast(?wxDC_SetTextBackground,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(Colour)):16/binary>>).
 
-%% @spec (This::wxDC(), Colour::wx:colour()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcsettextforeground">external documentation</a>.
+-spec setTextForeground(This, Colour) -> ok when
+	This::wxDC(), Colour::wx:wx_colour().
 setTextForeground(#wx_ref{type=ThisT,ref=ThisRef},Colour)
  when tuple_size(Colour) =:= 3; tuple_size(Colour) =:= 4 ->
   ?CLASS(ThisT,wxDC),
   wxe_util:cast(?wxDC_SetTextForeground,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(Colour)):16/binary>>).
 
-%% @spec (This::wxDC(), X::float(), Y::float()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcsetuserscale">external documentation</a>.
+-spec setUserScale(This, X, Y) -> ok when
+	This::wxDC(), X::float(), Y::float().
 setUserScale(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
  when is_float(X),is_float(Y) ->
   ?CLASS(ThisT,wxDC),
   wxe_util:cast(?wxDC_SetUserScale,
   <<ThisRef:32/?UI,0:32,X:64/?F,Y:64/?F>>).
 
-%% @spec (This::wxDC(), Message::string()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcstartdoc">external documentation</a>.
+-spec startDoc(This, Message) -> boolean() when
+	This::wxDC(), Message::string().
 startDoc(#wx_ref{type=ThisT,ref=ThisRef},Message)
  when is_list(Message) ->
   ?CLASS(ThisT,wxDC),
@@ -822,8 +922,9 @@ startDoc(#wx_ref{type=ThisT,ref=ThisRef},Message)
   wxe_util:call(?wxDC_StartDoc,
   <<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>>).
 
-%% @spec (This::wxDC()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcstartpage">external documentation</a>.
+-spec startPage(This) -> ok when
+	This::wxDC().
 startPage(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxDC),
   wxe_util:cast(?wxDC_StartPage,
diff --git a/lib/wx/src/gen/wxDataObject.erl b/lib/wx/src/gen/wxDataObject.erl
index bad6d96fb5..65b388aa48 100644
--- a/lib/wx/src/gen/wxDataObject.erl
+++ b/lib/wx/src/gen/wxDataObject.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -29,6 +29,8 @@
 %% inherited exports
 -export([parent_class/1]).
 
+-export_type([wxDataObject/0]).
 %% @hidden
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
+-type wxDataObject() :: wx:wx_object().
diff --git a/lib/wx/src/gen/wxDateEvent.erl b/lib/wx/src/gen/wxDateEvent.erl
index b4b010e122..417322097f 100644
--- a/lib/wx/src/gen/wxDateEvent.erl
+++ b/lib/wx/src/gen/wxDateEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -40,13 +40,16 @@
   parent_class/1,resumePropagation/2,setInt/2,setString/2,shouldPropagate/1,
   skip/1,skip/2,stopPropagation/1]).
 
+-export_type([wxDateEvent/0]).
 %% @hidden
 parent_class(wxCommandEvent) -> true;
 parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (This::wxDateEvent()) -> wx:datetime()
+-type wxDateEvent() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdateevent.html#wxdateeventgetdate">external documentation</a>.
+-spec getDate(This) -> wx:wx_datetime() when
+	This::wxDateEvent().
 getDate(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxDateEvent),
   wxe_util:call(?wxDateEvent_GetDate,
diff --git a/lib/wx/src/gen/wxDatePickerCtrl.erl b/lib/wx/src/gen/wxDatePickerCtrl.erl
index 8a1700e9cd..e1c16d3612 100644
--- a/lib/wx/src/gen/wxDatePickerCtrl.erl
+++ b/lib/wx/src/gen/wxDatePickerCtrl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -74,6 +74,7 @@
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
 
+-export_type([wxDatePickerCtrl/0]).
 %% @hidden
 parent_class(wxPickerBase) -> true;
 parent_class(wxControl) -> true;
@@ -81,21 +82,29 @@ parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxDatePickerCtrl()
+-type wxDatePickerCtrl() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdatepickerctrl.html#wxdatepickerctrlwxdatepickerctrl">external documentation</a>.
+-spec new() -> wxDatePickerCtrl().
 new() ->
   wxe_util:construct(?wxDatePickerCtrl_new_0,
   <<>>).
 
-%% @spec (Parent::wxWindow:wxWindow(), Id::integer()) -> wxDatePickerCtrl()
 %% @equiv new(Parent,Id, [])
+-spec new(Parent, Id) -> wxDatePickerCtrl() when
+	Parent::wxWindow:wxWindow(), Id::integer().
+
 new(Parent,Id)
  when is_record(Parent, wx_ref),is_integer(Id) ->
   new(Parent,Id, []).
 
-%% @spec (Parent::wxWindow:wxWindow(), Id::integer(), [Option]) -> wxDatePickerCtrl()
-%% Option = {date, wx:datetime()} | {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()} | {validator, wx:wx()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdatepickerctrl.html#wxdatepickerctrlwxdatepickerctrl">external documentation</a>.
+-spec new(Parent, Id, [Option]) -> wxDatePickerCtrl() when
+	Parent::wxWindow:wxWindow(), Id::integer(),
+	Option :: {date, wx:wx_datetime()}
+		 | {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}
+		 | {validator, wx:wx()}.
 new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
  when is_integer(Id),is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -109,39 +118,43 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
   wxe_util:construct(?wxDatePickerCtrl_new_3,
   <<ParentRef:32/?UI,Id:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxDatePickerCtrl(), Dt1::wx:datetime(), Dt2::wx:datetime()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdatepickerctrl.html#wxdatepickerctrlgetrange">external documentation</a>.
+-spec getRange(This, Dt1, Dt2) -> boolean() when
+	This::wxDatePickerCtrl(), Dt1::wx:wx_datetime(), Dt2::wx:wx_datetime().
 getRange(#wx_ref{type=ThisT,ref=ThisRef},Dt1,Dt2)
  when tuple_size(Dt1) =:= 2,tuple_size(Dt2) =:= 2 ->
   ?CLASS(ThisT,wxDatePickerCtrl),
   wxe_util:call(?wxDatePickerCtrl_GetRange,
   <<ThisRef:32/?UI,(wxe_util:datetime_bin(Dt1)):24/binary,(wxe_util:datetime_bin(Dt2)):24/binary>>).
 
-%% @spec (This::wxDatePickerCtrl()) -> wx:datetime()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdatepickerctrl.html#wxdatepickerctrlgetvalue">external documentation</a>.
+-spec getValue(This) -> wx:wx_datetime() when
+	This::wxDatePickerCtrl().
 getValue(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxDatePickerCtrl),
   wxe_util:call(?wxDatePickerCtrl_GetValue,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxDatePickerCtrl(), Dt1::wx:datetime(), Dt2::wx:datetime()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdatepickerctrl.html#wxdatepickerctrlsetrange">external documentation</a>.
+-spec setRange(This, Dt1, Dt2) -> ok when
+	This::wxDatePickerCtrl(), Dt1::wx:wx_datetime(), Dt2::wx:wx_datetime().
 setRange(#wx_ref{type=ThisT,ref=ThisRef},Dt1,Dt2)
  when tuple_size(Dt1) =:= 2,tuple_size(Dt2) =:= 2 ->
   ?CLASS(ThisT,wxDatePickerCtrl),
   wxe_util:cast(?wxDatePickerCtrl_SetRange,
   <<ThisRef:32/?UI,(wxe_util:datetime_bin(Dt1)):24/binary,(wxe_util:datetime_bin(Dt2)):24/binary>>).
 
-%% @spec (This::wxDatePickerCtrl(), Date::wx:datetime()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdatepickerctrl.html#wxdatepickerctrlsetvalue">external documentation</a>.
+-spec setValue(This, Date) -> ok when
+	This::wxDatePickerCtrl(), Date::wx:wx_datetime().
 setValue(#wx_ref{type=ThisT,ref=ThisRef},Date)
  when tuple_size(Date) =:= 2 ->
   ?CLASS(ThisT,wxDatePickerCtrl),
   wxe_util:cast(?wxDatePickerCtrl_SetValue,
   <<ThisRef:32/?UI,(wxe_util:datetime_bin(Date)):24/binary>>).
 
-%% @spec (This::wxDatePickerCtrl()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxDatePickerCtrl) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxDatePickerCtrl),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxDialog.erl b/lib/wx/src/gen/wxDialog.erl
index 514a62813e..137ad27a45 100644
--- a/lib/wx/src/gen/wxDialog.erl
+++ b/lib/wx/src/gen/wxDialog.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -76,27 +76,34 @@
   thaw/1,transferDataFromWindow/1,transferDataToWindow/1,update/1,updateWindowUI/1,
   updateWindowUI/2,validate/1,warpPointer/3]).
 
+-export_type([wxDialog/0]).
 %% @hidden
 parent_class(wxTopLevelWindow) -> true;
 parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxDialog()
+-type wxDialog() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdialog.html#wxdialogwxdialog">external documentation</a>.
+-spec new() -> wxDialog().
 new() ->
   wxe_util:construct(?wxDialog_new_0,
   <<>>).
 
-%% @spec (Parent::wxWindow:wxWindow(), Id::integer(), Title::string()) -> wxDialog()
 %% @equiv new(Parent,Id,Title, [])
+-spec new(Parent, Id, Title) -> wxDialog() when
+	Parent::wxWindow:wxWindow(), Id::integer(), Title::string().
+
 new(Parent,Id,Title)
  when is_record(Parent, wx_ref),is_integer(Id),is_list(Title) ->
   new(Parent,Id,Title, []).
 
-%% @spec (Parent::wxWindow:wxWindow(), Id::integer(), Title::string(), [Option]) -> wxDialog()
-%% Option = {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdialog.html#wxdialogwxdialog">external documentation</a>.
+-spec new(Parent, Id, Title, [Option]) -> wxDialog() when
+	Parent::wxWindow:wxWindow(), Id::integer(), Title::string(),
+	Option :: {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}.
 new(#wx_ref{type=ParentT,ref=ParentRef},Id,Title, Options)
  when is_integer(Id),is_list(Title),is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -109,15 +116,20 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Id,Title, Options)
   wxe_util:construct(?wxDialog_new_4,
   <<ParentRef:32/?UI,Id:32/?UI,(byte_size(Title_UC)):32/?UI,(Title_UC)/binary, 0:(((8- ((4+byte_size(Title_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxDialog(), Parent::wxWindow:wxWindow(), Id::integer(), Title::string()) -> bool()
 %% @equiv create(This,Parent,Id,Title, [])
+-spec create(This, Parent, Id, Title) -> boolean() when
+	This::wxDialog(), Parent::wxWindow:wxWindow(), Id::integer(), Title::string().
+
 create(This,Parent,Id,Title)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id),is_list(Title) ->
   create(This,Parent,Id,Title, []).
 
-%% @spec (This::wxDialog(), Parent::wxWindow:wxWindow(), Id::integer(), Title::string(), [Option]) -> bool()
-%% Option = {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdialog.html#wxdialogcreate">external documentation</a>.
+-spec create(This, Parent, Id, Title, [Option]) -> boolean() when
+	This::wxDialog(), Parent::wxWindow:wxWindow(), Id::integer(), Title::string(),
+	Option :: {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}.
 create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id,Title, Options)
  when is_integer(Id),is_list(Title),is_list(Options) ->
   ?CLASS(ThisT,wxDialog),
@@ -131,76 +143,87 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id,Ti
   wxe_util:call(?wxDialog_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI,Id: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, BinOpt/binary>>).
 
-%% @spec (This::wxDialog(), Flags::integer()) -> wxSizer:wxSizer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdialog.html#wxdialogcreatebuttonsizer">external documentation</a>.
+-spec createButtonSizer(This, Flags) -> wxSizer:wxSizer() when
+	This::wxDialog(), Flags::integer().
 createButtonSizer(#wx_ref{type=ThisT,ref=ThisRef},Flags)
  when is_integer(Flags) ->
   ?CLASS(ThisT,wxDialog),
   wxe_util:call(?wxDialog_CreateButtonSizer,
   <<ThisRef:32/?UI,Flags:32/?UI>>).
 
-%% @spec (This::wxDialog(), Flags::integer()) -> wxStdDialogButtonSizer:wxStdDialogButtonSizer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdialog.html#wxdialogcreatestddialogbuttonsizer">external documentation</a>.
+-spec createStdDialogButtonSizer(This, Flags) -> wxStdDialogButtonSizer:wxStdDialogButtonSizer() when
+	This::wxDialog(), Flags::integer().
 createStdDialogButtonSizer(#wx_ref{type=ThisT,ref=ThisRef},Flags)
  when is_integer(Flags) ->
   ?CLASS(ThisT,wxDialog),
   wxe_util:call(?wxDialog_CreateStdDialogButtonSizer,
   <<ThisRef:32/?UI,Flags:32/?UI>>).
 
-%% @spec (This::wxDialog(), RetCode::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdialog.html#wxdialogendmodal">external documentation</a>.
+-spec endModal(This, RetCode) -> ok when
+	This::wxDialog(), RetCode::integer().
 endModal(#wx_ref{type=ThisT,ref=ThisRef},RetCode)
  when is_integer(RetCode) ->
   ?CLASS(ThisT,wxDialog),
   wxe_util:cast(?wxDialog_EndModal,
   <<ThisRef:32/?UI,RetCode:32/?UI>>).
 
-%% @spec (This::wxDialog()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdialog.html#wxdialoggetaffirmativeid">external documentation</a>.
+-spec getAffirmativeId(This) -> integer() when
+	This::wxDialog().
 getAffirmativeId(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxDialog),
   wxe_util:call(?wxDialog_GetAffirmativeId,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxDialog()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdialog.html#wxdialoggetreturncode">external documentation</a>.
+-spec getReturnCode(This) -> integer() when
+	This::wxDialog().
 getReturnCode(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxDialog),
   wxe_util:call(?wxDialog_GetReturnCode,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxDialog()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdialog.html#wxdialogismodal">external documentation</a>.
+-spec isModal(This) -> boolean() when
+	This::wxDialog().
 isModal(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxDialog),
   wxe_util:call(?wxDialog_IsModal,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxDialog(), AffirmativeId::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdialog.html#wxdialogsetaffirmativeid">external documentation</a>.
+-spec setAffirmativeId(This, AffirmativeId) -> ok when
+	This::wxDialog(), AffirmativeId::integer().
 setAffirmativeId(#wx_ref{type=ThisT,ref=ThisRef},AffirmativeId)
  when is_integer(AffirmativeId) ->
   ?CLASS(ThisT,wxDialog),
   wxe_util:cast(?wxDialog_SetAffirmativeId,
   <<ThisRef:32/?UI,AffirmativeId:32/?UI>>).
 
-%% @spec (This::wxDialog(), ReturnCode::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdialog.html#wxdialogsetreturncode">external documentation</a>.
+-spec setReturnCode(This, ReturnCode) -> ok when
+	This::wxDialog(), ReturnCode::integer().
 setReturnCode(#wx_ref{type=ThisT,ref=ThisRef},ReturnCode)
  when is_integer(ReturnCode) ->
   ?CLASS(ThisT,wxDialog),
   wxe_util:cast(?wxDialog_SetReturnCode,
   <<ThisRef:32/?UI,ReturnCode:32/?UI>>).
 
-%% @spec (This::wxDialog()) -> bool()
 %% @equiv show(This, [])
+-spec show(This) -> boolean() when
+	This::wxDialog().
+
 show(This)
  when is_record(This, wx_ref) ->
   show(This, []).
 
-%% @spec (This::wxDialog(), [Option]) -> bool()
-%% Option = {show, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdialog.html#wxdialogshow">external documentation</a>.
+-spec show(This, [Option]) -> boolean() when
+	This::wxDialog(),
+	Option :: {show, boolean()}.
 show(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxDialog),
@@ -210,15 +233,16 @@ show(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxDialog_Show,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxDialog()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdialog.html#wxdialogshowmodal">external documentation</a>.
+-spec showModal(This) -> integer() when
+	This::wxDialog().
 showModal(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxDialog),
   wxe_util:call(?wxDialog_ShowModal,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxDialog()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxDialog) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxDialog),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxDirDialog.erl b/lib/wx/src/gen/wxDirDialog.erl
index 28db3daf1d..6104803294 100644
--- a/lib/wx/src/gen/wxDirDialog.erl
+++ b/lib/wx/src/gen/wxDirDialog.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -77,6 +77,7 @@
   transferDataFromWindow/1,transferDataToWindow/1,update/1,updateWindowUI/1,
   updateWindowUI/2,validate/1,warpPointer/3]).
 
+-export_type([wxDirDialog/0]).
 %% @hidden
 parent_class(wxDialog) -> true;
 parent_class(wxTopLevelWindow) -> true;
@@ -84,15 +85,23 @@ parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (Parent::wxWindow:wxWindow()) -> wxDirDialog()
+-type wxDirDialog() :: wx:wx_object().
 %% @equiv new(Parent, [])
+-spec new(Parent) -> wxDirDialog() when
+	Parent::wxWindow:wxWindow().
+
 new(Parent)
  when is_record(Parent, wx_ref) ->
   new(Parent, []).
 
-%% @spec (Parent::wxWindow:wxWindow(), [Option]) -> wxDirDialog()
-%% Option = {title, string()} | {defaultPath, string()} | {style, integer()} | {pos, {X::integer(), Y::integer()}} | {sz, {W::integer(), H::integer()}}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdirdialog.html#wxdirdialogwxdirdialog">external documentation</a>.
+-spec new(Parent, [Option]) -> wxDirDialog() when
+	Parent::wxWindow:wxWindow(),
+	Option :: {title, string()}
+		 | {defaultPath, string()}
+		 | {style, integer()}
+		 | {pos, {X::integer(), Y::integer()}}
+		 | {sz, {W::integer(), H::integer()}}.
 new(#wx_ref{type=ParentT,ref=ParentRef}, Options)
  when is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -106,22 +115,25 @@ new(#wx_ref{type=ParentT,ref=ParentRef}, Options)
   wxe_util:construct(?wxDirDialog_new,
   <<ParentRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxDirDialog()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdirdialog.html#wxdirdialoggetpath">external documentation</a>.
+-spec getPath(This) -> string() when
+	This::wxDirDialog().
 getPath(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxDirDialog),
   wxe_util:call(?wxDirDialog_GetPath,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxDirDialog()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdirdialog.html#wxdirdialoggetmessage">external documentation</a>.
+-spec getMessage(This) -> string() when
+	This::wxDirDialog().
 getMessage(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxDirDialog),
   wxe_util:call(?wxDirDialog_GetMessage,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxDirDialog(), Message::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdirdialog.html#wxdirdialogsetmessage">external documentation</a>.
+-spec setMessage(This, Message) -> ok when
+	This::wxDirDialog(), Message::string().
 setMessage(#wx_ref{type=ThisT,ref=ThisRef},Message)
  when is_list(Message) ->
   ?CLASS(ThisT,wxDirDialog),
@@ -129,8 +141,9 @@ setMessage(#wx_ref{type=ThisT,ref=ThisRef},Message)
   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>>).
 
-%% @spec (This::wxDirDialog(), Path::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdirdialog.html#wxdirdialogsetpath">external documentation</a>.
+-spec setPath(This, Path) -> ok when
+	This::wxDirDialog(), Path::string().
 setPath(#wx_ref{type=ThisT,ref=ThisRef},Path)
  when is_list(Path) ->
   ?CLASS(ThisT,wxDirDialog),
@@ -138,8 +151,8 @@ setPath(#wx_ref{type=ThisT,ref=ThisRef},Path)
   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>>).
 
-%% @spec (This::wxDirDialog()) -> ok
 %% @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),
diff --git a/lib/wx/src/gen/wxDirPickerCtrl.erl b/lib/wx/src/gen/wxDirPickerCtrl.erl
index 2b24bc4bb0..667119c987 100644
--- a/lib/wx/src/gen/wxDirPickerCtrl.erl
+++ b/lib/wx/src/gen/wxDirPickerCtrl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -74,6 +74,7 @@
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
 
+-export_type([wxDirPickerCtrl/0]).
 %% @hidden
 parent_class(wxPickerBase) -> true;
 parent_class(wxControl) -> true;
@@ -81,21 +82,30 @@ parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxDirPickerCtrl()
+-type wxDirPickerCtrl() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdirpickerctrl.html#wxdirpickerctrlwxdirpickerctrl">external documentation</a>.
+-spec new() -> wxDirPickerCtrl().
 new() ->
   wxe_util:construct(?wxDirPickerCtrl_new_0,
   <<>>).
 
-%% @spec (Parent::wxWindow:wxWindow(), Id::integer()) -> wxDirPickerCtrl()
 %% @equiv new(Parent,Id, [])
+-spec new(Parent, Id) -> wxDirPickerCtrl() when
+	Parent::wxWindow:wxWindow(), Id::integer().
+
 new(Parent,Id)
  when is_record(Parent, wx_ref),is_integer(Id) ->
   new(Parent,Id, []).
 
-%% @spec (Parent::wxWindow:wxWindow(), Id::integer(), [Option]) -> wxDirPickerCtrl()
-%% Option = {path, string()} | {message, string()} | {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()} | {validator, wx:wx()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdirpickerctrl.html#wxdirpickerctrlwxdirpickerctrl">external documentation</a>.
+-spec new(Parent, Id, [Option]) -> wxDirPickerCtrl() when
+	Parent::wxWindow:wxWindow(), Id::integer(),
+	Option :: {path, string()}
+		 | {message, string()}
+		 | {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}
+		 | {validator, wx:wx()}.
 new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
  when is_integer(Id),is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -110,15 +120,23 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
   wxe_util:construct(?wxDirPickerCtrl_new_3,
   <<ParentRef:32/?UI,Id:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxDirPickerCtrl(), Parent::wxWindow:wxWindow(), Id::integer()) -> bool()
 %% @equiv create(This,Parent,Id, [])
+-spec create(This, Parent, Id) -> boolean() when
+	This::wxDirPickerCtrl(), Parent::wxWindow:wxWindow(), Id::integer().
+
 create(This,Parent,Id)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id) ->
   create(This,Parent,Id, []).
 
-%% @spec (This::wxDirPickerCtrl(), Parent::wxWindow:wxWindow(), Id::integer(), [Option]) -> bool()
-%% Option = {path, string()} | {message, string()} | {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()} | {validator, wx:wx()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdirpickerctrl.html#wxdirpickerctrlcreate">external documentation</a>.
+-spec create(This, Parent, Id, [Option]) -> boolean() when
+	This::wxDirPickerCtrl(), Parent::wxWindow:wxWindow(), Id::integer(),
+	Option :: {path, string()}
+		 | {message, string()}
+		 | {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}
+		 | {validator, wx:wx()}.
 create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
  when is_integer(Id),is_list(Options) ->
   ?CLASS(ThisT,wxDirPickerCtrl),
@@ -134,15 +152,17 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id, O
   wxe_util:call(?wxDirPickerCtrl_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI,Id:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxDirPickerCtrl()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdirpickerctrl.html#wxdirpickerctrlgetpath">external documentation</a>.
+-spec getPath(This) -> string() when
+	This::wxDirPickerCtrl().
 getPath(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxDirPickerCtrl),
   wxe_util:call(?wxDirPickerCtrl_GetPath,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxDirPickerCtrl(), Str::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdirpickerctrl.html#wxdirpickerctrlsetpath">external documentation</a>.
+-spec setPath(This, Str) -> ok when
+	This::wxDirPickerCtrl(), Str::string().
 setPath(#wx_ref{type=ThisT,ref=ThisRef},Str)
  when is_list(Str) ->
   ?CLASS(ThisT,wxDirPickerCtrl),
@@ -150,8 +170,8 @@ setPath(#wx_ref{type=ThisT,ref=ThisRef},Str)
   wxe_util:cast(?wxDirPickerCtrl_SetPath,
   <<ThisRef:32/?UI,(byte_size(Str_UC)):32/?UI,(Str_UC)/binary, 0:(((8- ((0+byte_size(Str_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxDirPickerCtrl()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxDirPickerCtrl) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxDirPickerCtrl),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxDisplayChangedEvent.erl b/lib/wx/src/gen/wxDisplayChangedEvent.erl
index c86ef62462..0c0612564b 100644
--- a/lib/wx/src/gen/wxDisplayChangedEvent.erl
+++ b/lib/wx/src/gen/wxDisplayChangedEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -37,10 +37,12 @@
 -export([getId/1,getSkipped/1,getTimestamp/1,isCommandEvent/1,parent_class/1,
   resumePropagation/2,shouldPropagate/1,skip/1,skip/2,stopPropagation/1]).
 
+-export_type([wxDisplayChangedEvent/0]).
 %% @hidden
 parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
+-type wxDisplayChangedEvent() :: wx:wx_object().
  %% From wxEvent
 %% @hidden
 stopPropagation(This) -> wxEvent:stopPropagation(This).
diff --git a/lib/wx/src/gen/wxEraseEvent.erl b/lib/wx/src/gen/wxEraseEvent.erl
index 77139b6790..03ce8862dc 100644
--- a/lib/wx/src/gen/wxEraseEvent.erl
+++ b/lib/wx/src/gen/wxEraseEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -37,12 +37,15 @@
 -export([getId/1,getSkipped/1,getTimestamp/1,isCommandEvent/1,parent_class/1,
   resumePropagation/2,shouldPropagate/1,skip/1,skip/2,stopPropagation/1]).
 
+-export_type([wxEraseEvent/0]).
 %% @hidden
 parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (This::wxEraseEvent()) -> wxDC:wxDC()
+-type wxEraseEvent() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxeraseevent.html#wxeraseeventgetdc">external documentation</a>.
+-spec getDC(This) -> wxDC:wxDC() when
+	This::wxEraseEvent().
 getDC(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxEraseEvent),
   wxe_util:call(?wxEraseEvent_GetDC,
diff --git a/lib/wx/src/gen/wxEvent.erl b/lib/wx/src/gen/wxEvent.erl
index 403fd89f1f..1b2147a326 100644
--- a/lib/wx/src/gen/wxEvent.erl
+++ b/lib/wx/src/gen/wxEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -30,61 +30,72 @@
 %% inherited exports
 -export([parent_class/1]).
 
+-export_type([wxEvent/0]).
 %% @hidden
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (This::wxEvent()) -> integer()
+-type wxEvent() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxevent.html#wxeventgetid">external documentation</a>.
+-spec getId(This) -> integer() when
+	This::wxEvent().
 getId(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxEvent),
   wxe_util:call(?wxEvent_GetId,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxEvent()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxevent.html#wxeventgetskipped">external documentation</a>.
+-spec getSkipped(This) -> boolean() when
+	This::wxEvent().
 getSkipped(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxEvent),
   wxe_util:call(?wxEvent_GetSkipped,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxEvent()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxevent.html#wxeventgettimestamp">external documentation</a>.
+-spec getTimestamp(This) -> integer() when
+	This::wxEvent().
 getTimestamp(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxEvent),
   wxe_util:call(?wxEvent_GetTimestamp,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxEvent()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxevent.html#wxeventiscommandevent">external documentation</a>.
+-spec isCommandEvent(This) -> boolean() when
+	This::wxEvent().
 isCommandEvent(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxEvent),
   wxe_util:call(?wxEvent_IsCommandEvent,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxEvent(), PropagationLevel::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxevent.html#wxeventresumepropagation">external documentation</a>.
+-spec resumePropagation(This, PropagationLevel) -> ok when
+	This::wxEvent(), PropagationLevel::integer().
 resumePropagation(#wx_ref{type=ThisT,ref=ThisRef},PropagationLevel)
  when is_integer(PropagationLevel) ->
   ?CLASS(ThisT,wxEvent),
   wxe_util:cast(?wxEvent_ResumePropagation,
   <<ThisRef:32/?UI,PropagationLevel:32/?UI>>).
 
-%% @spec (This::wxEvent()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxevent.html#wxeventshouldpropagate">external documentation</a>.
+-spec shouldPropagate(This) -> boolean() when
+	This::wxEvent().
 shouldPropagate(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxEvent),
   wxe_util:call(?wxEvent_ShouldPropagate,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxEvent()) -> ok
 %% @equiv skip(This, [])
+-spec skip(This) -> ok when
+	This::wxEvent().
+
 skip(This)
  when is_record(This, wx_ref) ->
   skip(This, []).
 
-%% @spec (This::wxEvent(), [Option]) -> ok
-%% Option = {skip, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxevent.html#wxeventskip">external documentation</a>.
+-spec skip(This, [Option]) -> ok when
+	This::wxEvent(),
+	Option :: {skip, boolean()}.
 skip(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxEvent),
@@ -94,8 +105,9 @@ skip(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxEvent_Skip,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxEvent()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxevent.html#wxeventstoppropagation">external documentation</a>.
+-spec stopPropagation(This) -> integer() when
+	This::wxEvent().
 stopPropagation(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxEvent),
   wxe_util:call(?wxEvent_StopPropagation,
diff --git a/lib/wx/src/gen/wxEvtHandler.erl b/lib/wx/src/gen/wxEvtHandler.erl
index 820c2b7a58..cf4a72da5a 100644
--- a/lib/wx/src/gen/wxEvtHandler.erl
+++ b/lib/wx/src/gen/wxEvtHandler.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -37,10 +37,7 @@
 %% <a href="http://www.wxwidgets.org/manuals/stable/wx_wxevthandler.html">
 %% The orginal documentation</a>. 
 %%
-%% @headerfile "../../include/wx.hrl"
 %%
-%%@type wxEvtHandler().  An object reference
-
 -module(wxEvtHandler).
 -include("wxe.hrl").
 -include("../include/wx.hrl").
@@ -53,17 +50,16 @@
 	 new_evt_listener/0, destroy_evt_listener/1, 
 	 get_callback/1, replace_fun_with_id/2]).
 
--record(evh, {et=null,id=?wxID_ANY,lastId=?wxID_ANY,skip=undefined,userdata=[],cb=0}).
-
+-export_type([wxEvtHandler/0, wx/0, event/0]).
+-type wxEvtHandler() :: wx:wx_object().
 
+-record(evh, {et=null,id=?wxID_ANY,lastId=?wxID_ANY,skip=undefined,userdata=[],cb=0}).
 
-%% @spec (This::wxEvtHandler(), EventType::wxEventType()) -> ok
 %% @doc Equivalent to {@link connect/3. connect(This, EventType, [])}
-
+-spec connect(This::wxEvtHandler(), EventType::wxEventType()) -> ok.
 connect(This, EventType) ->
     connect(This, EventType, []).
 
-%% @spec (This::wxEvtHandler(), EventType::wxEventType(), [Options]) -> ok
 %% @doc This function subscribes the to events of EventType,
 %% in the range id, lastId. The events will be received as messages 
 %% if no callback is supplied.
@@ -82,6 +78,9 @@ connect(This, EventType) ->
 %%                          to process the event. Default not specfied i.e. a message will
 %%                          be delivered to the process calling this function.
 %%    {userData, term()}    An erlang term that will be sent with the event. Default: [].
+-spec connect(This::wxEvtHandler(), EventType::wxEventType(), [Option]) -> ok when
+      Option :: {id, integer()} | {lastId, integer()} | {skip, boolean()} |
+		{callback, function()} | {userData, term()}.
 connect(This=#wx_ref{type=ThisT}, EventType, Options) ->
     EvH = parse_opts(Options, #evh{et=EventType}),
     ?CLASS(ThisT,wxEvtHandler),
@@ -118,26 +117,27 @@ parse_opts([], Opts = #evh{id=Id,lastId=Lid,skip=Skip, cb=CB}) ->
 	    Opts
     end.
 
-%% @spec (This::wxEvtHandler()) -> true | false
+
 %% @doc Equivalent to {@link disconnect/3. disconnect(This, null, [])}
 %% Can also have an optional callback Fun() as an additional last argument.
-
+-spec disconnect(This::wxEvtHandler()) -> boolean().
 disconnect(This=#wx_ref{type=ThisT,ref=_ThisRef}) ->
     ?CLASS(ThisT,wxEvtHandler),
     disconnect(This, null, []).
 
-%% @spec (This::wxEvtHandler(), EventType::wxEventType()) -> true | false
 %% @doc Equivalent to {@link disconnect/3. disconnect(This, EventType, [])}
+-spec disconnect(This::wxEvtHandler(), EventType::wxEventType()) -> boolean().
 disconnect(This=#wx_ref{type=ThisT,ref=_ThisRef}, EventType) when is_atom(EventType) ->
     ?CLASS(ThisT,wxEvtHandler),
     disconnect(This, EventType, []).
 
-%% @spec (This::wxEvtHandler(), EventType::wxEventType(), Opts) -> true | false
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxevthandler.html#wxevthandlerdisconnect">external documentation</a>
 %% This function unsubscribes the process or callback fun from the event handler.
 %% EventType may be the atom 'null' to match any eventtype.
 %% Notice that the options skip and userdata is not used to match the eventhandler.
-disconnect(This=#wx_ref{type=ThisT,ref=_ThisRef}, EventType, Opts)  ->
+-spec disconnect(This::wxEvtHandler(), EventType::wxEventType(), [Option]) -> boolean() when
+      Option :: {id, integer()} | {lastId, integer()} | {callback, function()}.
+disconnect(This=#wx_ref{type=ThisT,ref=_ThisRef}, EventType, Opts) ->
     ?CLASS(ThisT,wxEvtHandler),
     EvH = parse_opts(Opts, #evh{et=EventType}),
     case wxe_util:disconnect_cb(This, EvH) of
diff --git a/lib/wx/src/gen/wxFileDataObject.erl b/lib/wx/src/gen/wxFileDataObject.erl
index 2fcfbd5374..3349005821 100644
--- a/lib/wx/src/gen/wxFileDataObject.erl
+++ b/lib/wx/src/gen/wxFileDataObject.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -32,18 +32,21 @@
 %% inherited exports
 -export([parent_class/1]).
 
+-export_type([wxFileDataObject/0]).
 %% @hidden
 parent_class(wxDataObject) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxFileDataObject()
+-type wxFileDataObject() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfiledataobject.html#wxfiledataobjectwxfiledataobject">external documentation</a>.
+-spec new() -> wxFileDataObject().
 new() ->
   wxe_util:construct(?wxFileDataObject_new,
   <<>>).
 
-%% @spec (This::wxFileDataObject(), Filename::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfiledataobject.html#wxfiledataobjectaddfile">external documentation</a>.
+-spec addFile(This, Filename) -> ok when
+	This::wxFileDataObject(), Filename::string().
 addFile(#wx_ref{type=ThisT,ref=ThisRef},Filename)
  when is_list(Filename) ->
   ?CLASS(ThisT,wxFileDataObject),
@@ -51,15 +54,16 @@ addFile(#wx_ref{type=ThisT,ref=ThisRef},Filename)
   wxe_util:cast(?wxFileDataObject_AddFile,
   <<ThisRef:32/?UI,(byte_size(Filename_UC)):32/?UI,(Filename_UC)/binary, 0:(((8- ((0+byte_size(Filename_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxFileDataObject()) -> [[string()]]
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfiledataobject.html#wxfiledataobjectgetfilenames">external documentation</a>.
+-spec getFilenames(This) -> [[string()]] when
+	This::wxFileDataObject().
 getFilenames(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxFileDataObject),
   wxe_util:call(?wxFileDataObject_GetFilenames,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxFileDataObject()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxFileDataObject) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxFileDataObject),
   wxe_util:destroy(?wxFileDataObject_destroy,Obj),
diff --git a/lib/wx/src/gen/wxFileDialog.erl b/lib/wx/src/gen/wxFileDialog.erl
index c6779927e9..b6bd7f164a 100644
--- a/lib/wx/src/gen/wxFileDialog.erl
+++ b/lib/wx/src/gen/wxFileDialog.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -79,6 +79,7 @@
   transferDataFromWindow/1,transferDataToWindow/1,update/1,updateWindowUI/1,
   updateWindowUI/2,validate/1,warpPointer/3]).
 
+-export_type([wxFileDialog/0]).
 %% @hidden
 parent_class(wxDialog) -> true;
 parent_class(wxTopLevelWindow) -> true;
@@ -86,15 +87,25 @@ parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (Parent::wxWindow:wxWindow()) -> wxFileDialog()
+-type wxFileDialog() :: wx:wx_object().
 %% @equiv new(Parent, [])
+-spec new(Parent) -> wxFileDialog() when
+	Parent::wxWindow:wxWindow().
+
 new(Parent)
  when is_record(Parent, wx_ref) ->
   new(Parent, []).
 
-%% @spec (Parent::wxWindow:wxWindow(), [Option]) -> wxFileDialog()
-%% Option = {message, string()} | {defaultDir, string()} | {defaultFile, string()} | {wildCard, string()} | {style, integer()} | {pos, {X::integer(), Y::integer()}} | {sz, {W::integer(), H::integer()}}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfiledialog.html#wxfiledialogwxfiledialog">external documentation</a>.
+-spec new(Parent, [Option]) -> wxFileDialog() when
+	Parent::wxWindow:wxWindow(),
+	Option :: {message, string()}
+		 | {defaultDir, string()}
+		 | {defaultFile, string()}
+		 | {wildCard, string()}
+		 | {style, integer()}
+		 | {pos, {X::integer(), Y::integer()}}
+		 | {sz, {W::integer(), H::integer()}}.
 new(#wx_ref{type=ParentT,ref=ParentRef}, Options)
  when is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -110,64 +121,73 @@ new(#wx_ref{type=ParentT,ref=ParentRef}, Options)
   wxe_util:construct(?wxFileDialog_new,
   <<ParentRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxFileDialog()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfiledialog.html#wxfiledialoggetdirectory">external documentation</a>.
+-spec getDirectory(This) -> string() when
+	This::wxFileDialog().
 getDirectory(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxFileDialog),
   wxe_util:call(?wxFileDialog_GetDirectory,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxFileDialog()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfiledialog.html#wxfiledialoggetfilename">external documentation</a>.
+-spec getFilename(This) -> string() when
+	This::wxFileDialog().
 getFilename(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxFileDialog),
   wxe_util:call(?wxFileDialog_GetFilename,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxFileDialog()) -> [[string()]]
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfiledialog.html#wxfiledialoggetfilenames">external documentation</a>.
+-spec getFilenames(This) -> [[string()]] when
+	This::wxFileDialog().
 getFilenames(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxFileDialog),
   wxe_util:call(?wxFileDialog_GetFilenames,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxFileDialog()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfiledialog.html#wxfiledialoggetfilterindex">external documentation</a>.
+-spec getFilterIndex(This) -> integer() when
+	This::wxFileDialog().
 getFilterIndex(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxFileDialog),
   wxe_util:call(?wxFileDialog_GetFilterIndex,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxFileDialog()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfiledialog.html#wxfiledialoggetmessage">external documentation</a>.
+-spec getMessage(This) -> string() when
+	This::wxFileDialog().
 getMessage(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxFileDialog),
   wxe_util:call(?wxFileDialog_GetMessage,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxFileDialog()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfiledialog.html#wxfiledialoggetpath">external documentation</a>.
+-spec getPath(This) -> string() when
+	This::wxFileDialog().
 getPath(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxFileDialog),
   wxe_util:call(?wxFileDialog_GetPath,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxFileDialog()) -> [[string()]]
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfiledialog.html#wxfiledialoggetpaths">external documentation</a>.
+-spec getPaths(This) -> [[string()]] when
+	This::wxFileDialog().
 getPaths(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxFileDialog),
   wxe_util:call(?wxFileDialog_GetPaths,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxFileDialog()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfiledialog.html#wxfiledialoggetwildcard">external documentation</a>.
+-spec getWildcard(This) -> string() when
+	This::wxFileDialog().
 getWildcard(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxFileDialog),
   wxe_util:call(?wxFileDialog_GetWildcard,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxFileDialog(), Dir::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfiledialog.html#wxfiledialogsetdirectory">external documentation</a>.
+-spec setDirectory(This, Dir) -> ok when
+	This::wxFileDialog(), Dir::string().
 setDirectory(#wx_ref{type=ThisT,ref=ThisRef},Dir)
  when is_list(Dir) ->
   ?CLASS(ThisT,wxFileDialog),
@@ -175,8 +195,9 @@ setDirectory(#wx_ref{type=ThisT,ref=ThisRef},Dir)
   wxe_util:cast(?wxFileDialog_SetDirectory,
   <<ThisRef:32/?UI,(byte_size(Dir_UC)):32/?UI,(Dir_UC)/binary, 0:(((8- ((0+byte_size(Dir_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxFileDialog(), Name::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfiledialog.html#wxfiledialogsetfilename">external documentation</a>.
+-spec setFilename(This, Name) -> ok when
+	This::wxFileDialog(), Name::string().
 setFilename(#wx_ref{type=ThisT,ref=ThisRef},Name)
  when is_list(Name) ->
   ?CLASS(ThisT,wxFileDialog),
@@ -184,16 +205,18 @@ setFilename(#wx_ref{type=ThisT,ref=ThisRef},Name)
   wxe_util:cast(?wxFileDialog_SetFilename,
   <<ThisRef:32/?UI,(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((0+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxFileDialog(), FilterIndex::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfiledialog.html#wxfiledialogsetfilterindex">external documentation</a>.
+-spec setFilterIndex(This, FilterIndex) -> ok when
+	This::wxFileDialog(), FilterIndex::integer().
 setFilterIndex(#wx_ref{type=ThisT,ref=ThisRef},FilterIndex)
  when is_integer(FilterIndex) ->
   ?CLASS(ThisT,wxFileDialog),
   wxe_util:cast(?wxFileDialog_SetFilterIndex,
   <<ThisRef:32/?UI,FilterIndex:32/?UI>>).
 
-%% @spec (This::wxFileDialog(), Message::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfiledialog.html#wxfiledialogsetmessage">external documentation</a>.
+-spec setMessage(This, Message) -> ok when
+	This::wxFileDialog(), Message::string().
 setMessage(#wx_ref{type=ThisT,ref=ThisRef},Message)
  when is_list(Message) ->
   ?CLASS(ThisT,wxFileDialog),
@@ -201,8 +224,9 @@ setMessage(#wx_ref{type=ThisT,ref=ThisRef},Message)
   wxe_util:cast(?wxFileDialog_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>>).
 
-%% @spec (This::wxFileDialog(), Path::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfiledialog.html#wxfiledialogsetpath">external documentation</a>.
+-spec setPath(This, Path) -> ok when
+	This::wxFileDialog(), Path::string().
 setPath(#wx_ref{type=ThisT,ref=ThisRef},Path)
  when is_list(Path) ->
   ?CLASS(ThisT,wxFileDialog),
@@ -210,8 +234,9 @@ setPath(#wx_ref{type=ThisT,ref=ThisRef},Path)
   wxe_util:cast(?wxFileDialog_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>>).
 
-%% @spec (This::wxFileDialog(), WildCard::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfiledialog.html#wxfiledialogsetwildcard">external documentation</a>.
+-spec setWildcard(This, WildCard) -> ok when
+	This::wxFileDialog(), WildCard::string().
 setWildcard(#wx_ref{type=ThisT,ref=ThisRef},WildCard)
  when is_list(WildCard) ->
   ?CLASS(ThisT,wxFileDialog),
@@ -219,8 +244,8 @@ setWildcard(#wx_ref{type=ThisT,ref=ThisRef},WildCard)
   wxe_util:cast(?wxFileDialog_SetWildcard,
   <<ThisRef:32/?UI,(byte_size(WildCard_UC)):32/?UI,(WildCard_UC)/binary, 0:(((8- ((0+byte_size(WildCard_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxFileDialog()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxFileDialog) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxFileDialog),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxFileDirPickerEvent.erl b/lib/wx/src/gen/wxFileDirPickerEvent.erl
index cc4880b88c..1ed803ea74 100644
--- a/lib/wx/src/gen/wxFileDirPickerEvent.erl
+++ b/lib/wx/src/gen/wxFileDirPickerEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -40,13 +40,16 @@
   parent_class/1,resumePropagation/2,setInt/2,setString/2,shouldPropagate/1,
   skip/1,skip/2,stopPropagation/1]).
 
+-export_type([wxFileDirPickerEvent/0]).
 %% @hidden
 parent_class(wxCommandEvent) -> true;
 parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (This::wxFileDirPickerEvent()) -> string()
+-type wxFileDirPickerEvent() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfiledirpickerevent.html#wxfiledirpickereventgetpath">external documentation</a>.
+-spec getPath(This) -> string() when
+	This::wxFileDirPickerEvent().
 getPath(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxFileDirPickerEvent),
   wxe_util:call(?wxFileDirPickerEvent_GetPath,
diff --git a/lib/wx/src/gen/wxFilePickerCtrl.erl b/lib/wx/src/gen/wxFilePickerCtrl.erl
index 93bfa72380..456483ec55 100644
--- a/lib/wx/src/gen/wxFilePickerCtrl.erl
+++ b/lib/wx/src/gen/wxFilePickerCtrl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -74,6 +74,7 @@
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
 
+-export_type([wxFilePickerCtrl/0]).
 %% @hidden
 parent_class(wxPickerBase) -> true;
 parent_class(wxControl) -> true;
@@ -81,21 +82,31 @@ parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxFilePickerCtrl()
+-type wxFilePickerCtrl() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfilepickerctrl.html#wxfilepickerctrlwxfilepickerctrl">external documentation</a>.
+-spec new() -> wxFilePickerCtrl().
 new() ->
   wxe_util:construct(?wxFilePickerCtrl_new_0,
   <<>>).
 
-%% @spec (Parent::wxWindow:wxWindow(), Id::integer()) -> wxFilePickerCtrl()
 %% @equiv new(Parent,Id, [])
+-spec new(Parent, Id) -> wxFilePickerCtrl() when
+	Parent::wxWindow:wxWindow(), Id::integer().
+
 new(Parent,Id)
  when is_record(Parent, wx_ref),is_integer(Id) ->
   new(Parent,Id, []).
 
-%% @spec (Parent::wxWindow:wxWindow(), Id::integer(), [Option]) -> wxFilePickerCtrl()
-%% Option = {path, string()} | {message, string()} | {wildcard, string()} | {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()} | {validator, wx:wx()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfilepickerctrl.html#wxfilepickerctrlwxfilepickerctrl">external documentation</a>.
+-spec new(Parent, Id, [Option]) -> wxFilePickerCtrl() when
+	Parent::wxWindow:wxWindow(), Id::integer(),
+	Option :: {path, string()}
+		 | {message, string()}
+		 | {wildcard, string()}
+		 | {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}
+		 | {validator, wx:wx()}.
 new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
  when is_integer(Id),is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -111,15 +122,24 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
   wxe_util:construct(?wxFilePickerCtrl_new_3,
   <<ParentRef:32/?UI,Id:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxFilePickerCtrl(), Parent::wxWindow:wxWindow(), Id::integer()) -> bool()
 %% @equiv create(This,Parent,Id, [])
+-spec create(This, Parent, Id) -> boolean() when
+	This::wxFilePickerCtrl(), Parent::wxWindow:wxWindow(), Id::integer().
+
 create(This,Parent,Id)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id) ->
   create(This,Parent,Id, []).
 
-%% @spec (This::wxFilePickerCtrl(), Parent::wxWindow:wxWindow(), Id::integer(), [Option]) -> bool()
-%% Option = {path, string()} | {message, string()} | {wildcard, string()} | {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()} | {validator, wx:wx()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfilepickerctrl.html#wxfilepickerctrlcreate">external documentation</a>.
+-spec create(This, Parent, Id, [Option]) -> boolean() when
+	This::wxFilePickerCtrl(), Parent::wxWindow:wxWindow(), Id::integer(),
+	Option :: {path, string()}
+		 | {message, string()}
+		 | {wildcard, string()}
+		 | {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}
+		 | {validator, wx:wx()}.
 create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
  when is_integer(Id),is_list(Options) ->
   ?CLASS(ThisT,wxFilePickerCtrl),
@@ -136,15 +156,17 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id, O
   wxe_util:call(?wxFilePickerCtrl_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI,Id:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxFilePickerCtrl()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfilepickerctrl.html#wxfilepickerctrlgetpath">external documentation</a>.
+-spec getPath(This) -> string() when
+	This::wxFilePickerCtrl().
 getPath(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxFilePickerCtrl),
   wxe_util:call(?wxFilePickerCtrl_GetPath,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxFilePickerCtrl(), Str::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfilepickerctrl.html#wxfilepickerctrlsetpath">external documentation</a>.
+-spec setPath(This, Str) -> ok when
+	This::wxFilePickerCtrl(), Str::string().
 setPath(#wx_ref{type=ThisT,ref=ThisRef},Str)
  when is_list(Str) ->
   ?CLASS(ThisT,wxFilePickerCtrl),
@@ -152,8 +174,8 @@ setPath(#wx_ref{type=ThisT,ref=ThisRef},Str)
   wxe_util:cast(?wxFilePickerCtrl_SetPath,
   <<ThisRef:32/?UI,(byte_size(Str_UC)):32/?UI,(Str_UC)/binary, 0:(((8- ((0+byte_size(Str_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxFilePickerCtrl()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxFilePickerCtrl) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxFilePickerCtrl),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxFindReplaceData.erl b/lib/wx/src/gen/wxFindReplaceData.erl
index 52eafa8398..fbc207b758 100644
--- a/lib/wx/src/gen/wxFindReplaceData.erl
+++ b/lib/wx/src/gen/wxFindReplaceData.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -30,53 +30,61 @@
 %% inherited exports
 -export([parent_class/1]).
 
+-export_type([wxFindReplaceData/0]).
 %% @hidden
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxFindReplaceData()
+-type wxFindReplaceData() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfindreplacedata.html#wxfindreplacedatawxfindreplacedata">external documentation</a>.
+-spec new() -> wxFindReplaceData().
 new() ->
   wxe_util:construct(?wxFindReplaceData_new_0,
   <<>>).
 
-%% @spec (Flags::integer()) -> wxFindReplaceData()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfindreplacedata.html#wxfindreplacedatawxfindreplacedata">external documentation</a>.
+-spec new(Flags) -> wxFindReplaceData() when
+	Flags::integer().
 new(Flags)
  when is_integer(Flags) ->
   wxe_util:construct(?wxFindReplaceData_new_1,
   <<Flags:32/?UI>>).
 
-%% @spec (This::wxFindReplaceData()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfindreplacedata.html#wxfindreplacedatagetfindstring">external documentation</a>.
+-spec getFindString(This) -> string() when
+	This::wxFindReplaceData().
 getFindString(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxFindReplaceData),
   wxe_util:call(?wxFindReplaceData_GetFindString,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxFindReplaceData()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfindreplacedata.html#wxfindreplacedatagetreplacestring">external documentation</a>.
+-spec getReplaceString(This) -> string() when
+	This::wxFindReplaceData().
 getReplaceString(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxFindReplaceData),
   wxe_util:call(?wxFindReplaceData_GetReplaceString,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxFindReplaceData()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfindreplacedata.html#wxfindreplacedatagetflags">external documentation</a>.
+-spec getFlags(This) -> integer() when
+	This::wxFindReplaceData().
 getFlags(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxFindReplaceData),
   wxe_util:call(?wxFindReplaceData_GetFlags,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxFindReplaceData(), Flags::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfindreplacedata.html#wxfindreplacedatasetflags">external documentation</a>.
+-spec setFlags(This, Flags) -> ok when
+	This::wxFindReplaceData(), Flags::integer().
 setFlags(#wx_ref{type=ThisT,ref=ThisRef},Flags)
  when is_integer(Flags) ->
   ?CLASS(ThisT,wxFindReplaceData),
   wxe_util:cast(?wxFindReplaceData_SetFlags,
   <<ThisRef:32/?UI,Flags:32/?UI>>).
 
-%% @spec (This::wxFindReplaceData(), Str::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfindreplacedata.html#wxfindreplacedatasetfindstring">external documentation</a>.
+-spec setFindString(This, Str) -> ok when
+	This::wxFindReplaceData(), Str::string().
 setFindString(#wx_ref{type=ThisT,ref=ThisRef},Str)
  when is_list(Str) ->
   ?CLASS(ThisT,wxFindReplaceData),
@@ -84,8 +92,9 @@ setFindString(#wx_ref{type=ThisT,ref=ThisRef},Str)
   wxe_util:cast(?wxFindReplaceData_SetFindString,
   <<ThisRef:32/?UI,(byte_size(Str_UC)):32/?UI,(Str_UC)/binary, 0:(((8- ((0+byte_size(Str_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxFindReplaceData(), Str::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfindreplacedata.html#wxfindreplacedatasetreplacestring">external documentation</a>.
+-spec setReplaceString(This, Str) -> ok when
+	This::wxFindReplaceData(), Str::string().
 setReplaceString(#wx_ref{type=ThisT,ref=ThisRef},Str)
  when is_list(Str) ->
   ?CLASS(ThisT,wxFindReplaceData),
@@ -93,8 +102,8 @@ setReplaceString(#wx_ref{type=ThisT,ref=ThisRef},Str)
   wxe_util:cast(?wxFindReplaceData_SetReplaceString,
   <<ThisRef:32/?UI,(byte_size(Str_UC)):32/?UI,(Str_UC)/binary, 0:(((8- ((0+byte_size(Str_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxFindReplaceData()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxFindReplaceData) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxFindReplaceData),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxFindReplaceDialog.erl b/lib/wx/src/gen/wxFindReplaceDialog.erl
index b37fd41831..cef41e6d20 100644
--- a/lib/wx/src/gen/wxFindReplaceDialog.erl
+++ b/lib/wx/src/gen/wxFindReplaceDialog.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -77,6 +77,7 @@
   transferDataFromWindow/1,transferDataToWindow/1,update/1,updateWindowUI/1,
   updateWindowUI/2,validate/1,warpPointer/3]).
 
+-export_type([wxFindReplaceDialog/0]).
 %% @hidden
 parent_class(wxDialog) -> true;
 parent_class(wxTopLevelWindow) -> true;
@@ -84,21 +85,25 @@ parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxFindReplaceDialog()
+-type wxFindReplaceDialog() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfindreplacedialog.html#wxfindreplacedialogwxfindreplacedialog">external documentation</a>.
+-spec new() -> wxFindReplaceDialog().
 new() ->
   wxe_util:construct(?wxFindReplaceDialog_new_0,
   <<>>).
 
-%% @spec (Parent::wxWindow:wxWindow(), Data::wxFindReplaceData:wxFindReplaceData(), Title::string()) -> wxFindReplaceDialog()
 %% @equiv new(Parent,Data,Title, [])
+-spec new(Parent, Data, Title) -> wxFindReplaceDialog() when
+	Parent::wxWindow:wxWindow(), Data::wxFindReplaceData:wxFindReplaceData(), Title::string().
+
 new(Parent,Data,Title)
  when is_record(Parent, wx_ref),is_record(Data, wx_ref),is_list(Title) ->
   new(Parent,Data,Title, []).
 
-%% @spec (Parent::wxWindow:wxWindow(), Data::wxFindReplaceData:wxFindReplaceData(), Title::string(), [Option]) -> wxFindReplaceDialog()
-%% Option = {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfindreplacedialog.html#wxfindreplacedialogwxfindreplacedialog">external documentation</a>.
+-spec new(Parent, Data, Title, [Option]) -> wxFindReplaceDialog() when
+	Parent::wxWindow:wxWindow(), Data::wxFindReplaceData:wxFindReplaceData(), Title::string(),
+	Option :: {style, integer()}.
 new(#wx_ref{type=ParentT,ref=ParentRef},#wx_ref{type=DataT,ref=DataRef},Title, Options)
  when is_list(Title),is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -110,15 +115,18 @@ new(#wx_ref{type=ParentT,ref=ParentRef},#wx_ref{type=DataT,ref=DataRef},Title, O
   wxe_util:construct(?wxFindReplaceDialog_new_4,
   <<ParentRef:32/?UI,DataRef:32/?UI,(byte_size(Title_UC)):32/?UI,(Title_UC)/binary, 0:(((8- ((4+byte_size(Title_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxFindReplaceDialog(), Parent::wxWindow:wxWindow(), Data::wxFindReplaceData:wxFindReplaceData(), Title::string()) -> bool()
 %% @equiv create(This,Parent,Data,Title, [])
+-spec create(This, Parent, Data, Title) -> boolean() when
+	This::wxFindReplaceDialog(), Parent::wxWindow:wxWindow(), Data::wxFindReplaceData:wxFindReplaceData(), Title::string().
+
 create(This,Parent,Data,Title)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_record(Data, wx_ref),is_list(Title) ->
   create(This,Parent,Data,Title, []).
 
-%% @spec (This::wxFindReplaceDialog(), Parent::wxWindow:wxWindow(), Data::wxFindReplaceData:wxFindReplaceData(), Title::string(), [Option]) -> bool()
-%% Option = {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfindreplacedialog.html#wxfindreplacedialogcreate">external documentation</a>.
+-spec create(This, Parent, Data, Title, [Option]) -> boolean() when
+	This::wxFindReplaceDialog(), Parent::wxWindow:wxWindow(), Data::wxFindReplaceData:wxFindReplaceData(), Title::string(),
+	Option :: {style, integer()}.
 create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},#wx_ref{type=DataT,ref=DataRef},Title, Options)
  when is_list(Title),is_list(Options) ->
   ?CLASS(ThisT,wxFindReplaceDialog),
@@ -131,15 +139,16 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},#wx_r
   wxe_util:call(?wxFindReplaceDialog_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI,DataRef: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, BinOpt/binary>>).
 
-%% @spec (This::wxFindReplaceDialog()) -> wxFindReplaceData:wxFindReplaceData()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfindreplacedialog.html#wxfindreplacedialoggetdata">external documentation</a>.
+-spec getData(This) -> wxFindReplaceData:wxFindReplaceData() when
+	This::wxFindReplaceDialog().
 getData(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxFindReplaceDialog),
   wxe_util:call(?wxFindReplaceDialog_GetData,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxFindReplaceDialog()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxFindReplaceDialog) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxFindReplaceDialog),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxFlexGridSizer.erl b/lib/wx/src/gen/wxFlexGridSizer.erl
index 910cc78894..d22ae74015 100644
--- a/lib/wx/src/gen/wxFlexGridSizer.erl
+++ b/lib/wx/src/gen/wxFlexGridSizer.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -45,20 +45,26 @@
   setMinSize/2,setMinSize/3,setRows/2,setSizeHints/2,setVGap/2,setVirtualSizeHints/2,
   show/2,show/3]).
 
+-export_type([wxFlexGridSizer/0]).
 %% @hidden
 parent_class(wxGridSizer) -> true;
 parent_class(wxSizer) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (Cols::integer()) -> wxFlexGridSizer()
+-type wxFlexGridSizer() :: wx:wx_object().
 %% @equiv new(Cols, [])
+-spec new(Cols) -> wxFlexGridSizer() when
+	Cols::integer().
+
 new(Cols)
  when is_integer(Cols) ->
   new(Cols, []).
 
-%% @spec (Cols::integer(), [Option]) -> wxFlexGridSizer()
-%% Option = {vgap, integer()} | {hgap, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxflexgridsizer.html#wxflexgridsizerwxflexgridsizer">external documentation</a>.
+-spec new(Cols, [Option]) -> wxFlexGridSizer() when
+	Cols::integer(),
+	Option :: {vgap, integer()}
+		 | {hgap, integer()}.
 new(Cols, Options)
  when is_integer(Cols),is_list(Options) ->
   MOpts = fun({vgap, Vgap}, Acc) -> [<<1:32/?UI,Vgap:32/?UI>>|Acc];
@@ -68,22 +74,26 @@ new(Cols, Options)
   wxe_util:construct(?wxFlexGridSizer_new_2,
   <<Cols:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (Rows::integer(), Cols::integer(), Vgap::integer(), Hgap::integer()) -> wxFlexGridSizer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxflexgridsizer.html#wxflexgridsizerwxflexgridsizer">external documentation</a>.
+-spec new(Rows, Cols, Vgap, Hgap) -> wxFlexGridSizer() when
+	Rows::integer(), Cols::integer(), Vgap::integer(), Hgap::integer().
 new(Rows,Cols,Vgap,Hgap)
  when is_integer(Rows),is_integer(Cols),is_integer(Vgap),is_integer(Hgap) ->
   wxe_util:construct(?wxFlexGridSizer_new_4,
   <<Rows:32/?UI,Cols:32/?UI,Vgap:32/?UI,Hgap:32/?UI>>).
 
-%% @spec (This::wxFlexGridSizer(), Idx::integer()) -> ok
 %% @equiv addGrowableCol(This,Idx, [])
+-spec addGrowableCol(This, Idx) -> ok when
+	This::wxFlexGridSizer(), Idx::integer().
+
 addGrowableCol(This,Idx)
  when is_record(This, wx_ref),is_integer(Idx) ->
   addGrowableCol(This,Idx, []).
 
-%% @spec (This::wxFlexGridSizer(), Idx::integer(), [Option]) -> ok
-%% Option = {proportion, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxflexgridsizer.html#wxflexgridsizeraddgrowablecol">external documentation</a>.
+-spec addGrowableCol(This, Idx, [Option]) -> ok when
+	This::wxFlexGridSizer(), Idx::integer(),
+	Option :: {proportion, integer()}.
 addGrowableCol(#wx_ref{type=ThisT,ref=ThisRef},Idx, Options)
  when is_integer(Idx),is_list(Options) ->
   ?CLASS(ThisT,wxFlexGridSizer),
@@ -93,15 +103,18 @@ addGrowableCol(#wx_ref{type=ThisT,ref=ThisRef},Idx, Options)
   wxe_util:cast(?wxFlexGridSizer_AddGrowableCol,
   <<ThisRef:32/?UI,Idx:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxFlexGridSizer(), Idx::integer()) -> ok
 %% @equiv addGrowableRow(This,Idx, [])
+-spec addGrowableRow(This, Idx) -> ok when
+	This::wxFlexGridSizer(), Idx::integer().
+
 addGrowableRow(This,Idx)
  when is_record(This, wx_ref),is_integer(Idx) ->
   addGrowableRow(This,Idx, []).
 
-%% @spec (This::wxFlexGridSizer(), Idx::integer(), [Option]) -> ok
-%% Option = {proportion, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxflexgridsizer.html#wxflexgridsizeraddgrowablerow">external documentation</a>.
+-spec addGrowableRow(This, Idx, [Option]) -> ok when
+	This::wxFlexGridSizer(), Idx::integer(),
+	Option :: {proportion, integer()}.
 addGrowableRow(#wx_ref{type=ThisT,ref=ThisRef},Idx, Options)
  when is_integer(Idx),is_list(Options) ->
   ?CLASS(ThisT,wxFlexGridSizer),
@@ -111,58 +124,62 @@ addGrowableRow(#wx_ref{type=ThisT,ref=ThisRef},Idx, Options)
   wxe_util:cast(?wxFlexGridSizer_AddGrowableRow,
   <<ThisRef:32/?UI,Idx:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxFlexGridSizer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxflexgridsizer.html#wxflexgridsizergetflexibledirection">external documentation</a>.
+-spec getFlexibleDirection(This) -> integer() when
+	This::wxFlexGridSizer().
 getFlexibleDirection(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxFlexGridSizer),
   wxe_util:call(?wxFlexGridSizer_GetFlexibleDirection,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxFlexGridSizer()) -> WxFlexSizerGrowMode
-%% WxFlexSizerGrowMode = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxflexgridsizer.html#wxflexgridsizergetnonflexiblegrowmode">external documentation</a>.
-%%<br /> WxFlexSizerGrowMode is one of ?wxFLEX_GROWMODE_NONE | ?wxFLEX_GROWMODE_SPECIFIED | ?wxFLEX_GROWMODE_ALL
+%%<br /> Res = ?wxFLEX_GROWMODE_NONE | ?wxFLEX_GROWMODE_SPECIFIED | ?wxFLEX_GROWMODE_ALL
+-spec getNonFlexibleGrowMode(This) -> wx:wx_enum() when
+	This::wxFlexGridSizer().
 getNonFlexibleGrowMode(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxFlexGridSizer),
   wxe_util:call(?wxFlexGridSizer_GetNonFlexibleGrowMode,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxFlexGridSizer(), Idx::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxflexgridsizer.html#wxflexgridsizerremovegrowablecol">external documentation</a>.
+-spec removeGrowableCol(This, Idx) -> ok when
+	This::wxFlexGridSizer(), Idx::integer().
 removeGrowableCol(#wx_ref{type=ThisT,ref=ThisRef},Idx)
  when is_integer(Idx) ->
   ?CLASS(ThisT,wxFlexGridSizer),
   wxe_util:cast(?wxFlexGridSizer_RemoveGrowableCol,
   <<ThisRef:32/?UI,Idx:32/?UI>>).
 
-%% @spec (This::wxFlexGridSizer(), Idx::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxflexgridsizer.html#wxflexgridsizerremovegrowablerow">external documentation</a>.
+-spec removeGrowableRow(This, Idx) -> ok when
+	This::wxFlexGridSizer(), Idx::integer().
 removeGrowableRow(#wx_ref{type=ThisT,ref=ThisRef},Idx)
  when is_integer(Idx) ->
   ?CLASS(ThisT,wxFlexGridSizer),
   wxe_util:cast(?wxFlexGridSizer_RemoveGrowableRow,
   <<ThisRef:32/?UI,Idx:32/?UI>>).
 
-%% @spec (This::wxFlexGridSizer(), Direction::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxflexgridsizer.html#wxflexgridsizersetflexibledirection">external documentation</a>.
+-spec setFlexibleDirection(This, Direction) -> ok when
+	This::wxFlexGridSizer(), Direction::integer().
 setFlexibleDirection(#wx_ref{type=ThisT,ref=ThisRef},Direction)
  when is_integer(Direction) ->
   ?CLASS(ThisT,wxFlexGridSizer),
   wxe_util:cast(?wxFlexGridSizer_SetFlexibleDirection,
   <<ThisRef:32/?UI,Direction:32/?UI>>).
 
-%% @spec (This::wxFlexGridSizer(), Mode::WxFlexSizerGrowMode) -> ok
-%% WxFlexSizerGrowMode = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxflexgridsizer.html#wxflexgridsizersetnonflexiblegrowmode">external documentation</a>.
-%%<br /> WxFlexSizerGrowMode is one of ?wxFLEX_GROWMODE_NONE | ?wxFLEX_GROWMODE_SPECIFIED | ?wxFLEX_GROWMODE_ALL
+%%<br /> Mode = ?wxFLEX_GROWMODE_NONE | ?wxFLEX_GROWMODE_SPECIFIED | ?wxFLEX_GROWMODE_ALL
+-spec setNonFlexibleGrowMode(This, Mode) -> ok when
+	This::wxFlexGridSizer(), Mode::wx:wx_enum().
 setNonFlexibleGrowMode(#wx_ref{type=ThisT,ref=ThisRef},Mode)
  when is_integer(Mode) ->
   ?CLASS(ThisT,wxFlexGridSizer),
   wxe_util:cast(?wxFlexGridSizer_SetNonFlexibleGrowMode,
   <<ThisRef:32/?UI,Mode:32/?UI>>).
 
-%% @spec (This::wxFlexGridSizer()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxFlexGridSizer) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxFlexGridSizer),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxFocusEvent.erl b/lib/wx/src/gen/wxFocusEvent.erl
index 46f2e2a3df..d6478c1142 100644
--- a/lib/wx/src/gen/wxFocusEvent.erl
+++ b/lib/wx/src/gen/wxFocusEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -37,12 +37,15 @@
 -export([getId/1,getSkipped/1,getTimestamp/1,isCommandEvent/1,parent_class/1,
   resumePropagation/2,shouldPropagate/1,skip/1,skip/2,stopPropagation/1]).
 
+-export_type([wxFocusEvent/0]).
 %% @hidden
 parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (This::wxFocusEvent()) -> wxWindow:wxWindow()
+-type wxFocusEvent() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfocusevent.html#wxfocuseventgetwindow">external documentation</a>.
+-spec getWindow(This) -> wxWindow:wxWindow() when
+	This::wxFocusEvent().
 getWindow(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxFocusEvent),
   wxe_util:call(?wxFocusEvent_GetWindow,
diff --git a/lib/wx/src/gen/wxFont.erl b/lib/wx/src/gen/wxFont.erl
index 4afc53cfa8..dc8c738b49 100644
--- a/lib/wx/src/gen/wxFont.erl
+++ b/lib/wx/src/gen/wxFont.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -33,38 +33,43 @@
 %% inherited exports
 -export([parent_class/1]).
 
+-export_type([wxFont/0]).
 %% @hidden
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxFont()
+-type wxFont() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfont.html#wxfontwxfont">external documentation</a>.
+-spec new() -> wxFont().
 new() ->
   wxe_util:construct(?wxFont_new_0,
   <<>>).
 
-%% @spec (Fontname::string()) -> wxFont()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfont.html#wxfontwxfont">external documentation</a>.
+-spec new(Fontname) -> wxFont() when
+	Fontname::string().
 new(Fontname)
  when is_list(Fontname) ->
   Fontname_UC = unicode:characters_to_binary([Fontname,0]),
   wxe_util:construct(?wxFont_new_1,
   <<(byte_size(Fontname_UC)):32/?UI,(Fontname_UC)/binary, 0:(((8- ((4+byte_size(Fontname_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (Size::integer(), Family::WxFontFamily, Style::WxFontStyle, Weight::integer()) -> wxFont()
 %% @equiv new(Size,Family,Style,Weight, [])
+-spec new(Size, Family, Style, Weight) -> wxFont() when
+	Size::integer(), Family::wx:wx_enum(), Style::wx:wx_enum(), Weight::integer().
+
 new(Size,Family,Style,Weight)
  when is_integer(Size),is_integer(Family),is_integer(Style),is_integer(Weight) ->
   new(Size,Family,Style,Weight, []).
 
-%% @spec (Size::integer(), Family::WxFontFamily, Style::WxFontStyle, Weight::integer(), [Option]) -> wxFont()
-%% Option = {underlined, bool()} | {face, string()} | {encoding, WxFontEncoding}
-%% WxFontFamily = integer()
-%% WxFontStyle = integer()
-%% WxFontEncoding = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfont.html#wxfontwxfont">external documentation</a>.
-%%<br /> WxFontFamily is one of ?wxFONTFAMILY_DEFAULT | ?wxFONTFAMILY_DECORATIVE | ?wxFONTFAMILY_ROMAN | ?wxFONTFAMILY_SCRIPT | ?wxFONTFAMILY_SWISS | ?wxFONTFAMILY_MODERN | ?wxFONTFAMILY_TELETYPE | ?wxFONTFAMILY_MAX | ?wxFONTFAMILY_UNKNOWN
-%%<br /> WxFontStyle is one of ?wxFONTSTYLE_NORMAL | ?wxFONTSTYLE_ITALIC | ?wxFONTSTYLE_SLANT | ?wxFONTSTYLE_MAX
-%%<br /> WxFontEncoding is one of ?wxFONTENCODING_SYSTEM | ?wxFONTENCODING_DEFAULT | ?wxFONTENCODING_ISO8859_1 | ?wxFONTENCODING_ISO8859_2 | ?wxFONTENCODING_ISO8859_3 | ?wxFONTENCODING_ISO8859_4 | ?wxFONTENCODING_ISO8859_5 | ?wxFONTENCODING_ISO8859_6 | ?wxFONTENCODING_ISO8859_7 | ?wxFONTENCODING_ISO8859_8 | ?wxFONTENCODING_ISO8859_9 | ?wxFONTENCODING_ISO8859_10 | ?wxFONTENCODING_ISO8859_11 | ?wxFONTENCODING_ISO8859_12 | ?wxFONTENCODING_ISO8859_13 | ?wxFONTENCODING_ISO8859_14 | ?wxFONTENCODING_ISO8859_15 | ?wxFONTENCODING_ISO8859_MAX | ?wxFONTENCODING_KOI8 | ?wxFONTENCODING_KOI8_U | ?wxFONTENCODING_ALTERNATIVE | ?wxFONTENCODING_BULGARIAN | ?wxFONTENCODING_CP437 | ?wxFONTENCODING_CP850 | ?wxFONTENCODING_CP852 | ?wxFONTENCODING_CP855 | ?wxFONTENCODING_CP866 | ?wxFONTENCODING_CP874 | ?wxFONTENCODING_CP932 | ?wxFONTENCODING_CP936 | ?wxFONTENCODING_CP949 | ?wxFONTENCODING_CP950 | ?wxFONTENCODING_CP1250 | ?wxFONTENCODING_CP1251 | ?wxFONTENCODING_CP1252 | ?wxFONTENCODING_CP1253 | ?wxFONTENCODING_CP1254 | ?wxFONTENCODING_CP1255 | ?wxFONTENCODING_CP1256 | ?wxFONTENCODING_CP1257 | ?wxFONTENCODING_CP12_MAX | ?wxFONTENCODING_UTF7 | ?wxFONTENCODING_UTF8 | ?wxFONTENCODING_EUC_JP | ?wxFONTENCODING_UTF16BE | ?wxFONTENCODING_UTF16LE | ?wxFONTENCODING_UTF32BE | ?wxFONTENCODING_UTF32LE | ?wxFONTENCODING_MACROMAN | ?wxFONTENCODING_MACJAPANESE | ?wxFONTENCODING_MACCHINESETRAD | ?wxFONTENCODING_MACKOREAN | ?wxFONTENCODING_MACARABIC | ?wxFONTENCODING_MACHEBREW | ?wxFONTENCODING_MACGREEK | ?wxFONTENCODING_MACCYRILLIC | ?wxFONTENCODING_MACDEVANAGARI | ?wxFONTENCODING_MACGURMUKHI | ?wxFONTENCODING_MACGUJARATI | ?wxFONTENCODING_MACORIYA | ?wxFONTENCODING_MACBENGALI | ?wxFONTENCODING_MACTAMIL | ?wxFONTENCODING_MACTELUGU | ?wxFONTENCODING_MACKANNADA | ?wxFONTENCODING_MACMALAJALAM | ?wxFONTENCODING_MACSINHALESE | ?wxFONTENCODING_MACBURMESE | ?wxFONTENCODING_MACKHMER | ?wxFONTENCODING_MACTHAI | ?wxFONTENCODING_MACLAOTIAN | ?wxFONTENCODING_MACGEORGIAN | ?wxFONTENCODING_MACARMENIAN | ?wxFONTENCODING_MACCHINESESIMP | ?wxFONTENCODING_MACTIBETAN | ?wxFONTENCODING_MACMONGOLIAN | ?wxFONTENCODING_MACETHIOPIC | ?wxFONTENCODING_MACCENTRALEUR | ?wxFONTENCODING_MACVIATNAMESE | ?wxFONTENCODING_MACARABICEXT | ?wxFONTENCODING_MACSYMBOL | ?wxFONTENCODING_MACDINGBATS | ?wxFONTENCODING_MACTURKISH | ?wxFONTENCODING_MACCROATIAN | ?wxFONTENCODING_MACICELANDIC | ?wxFONTENCODING_MACROMANIAN | ?wxFONTENCODING_MACCELTIC | ?wxFONTENCODING_MACGAELIC | ?wxFONTENCODING_MACKEYBOARD | ?wxFONTENCODING_MAX | ?wxFONTENCODING_MACMIN | ?wxFONTENCODING_MACMAX | ?wxFONTENCODING_UTF16 | ?wxFONTENCODING_UTF32 | ?wxFONTENCODING_UNICODE | ?wxFONTENCODING_GB2312 | ?wxFONTENCODING_BIG5 | ?wxFONTENCODING_SHIFT_JIS
+%%<br /> Family = ?wxFONTFAMILY_DEFAULT | ?wxFONTFAMILY_DECORATIVE | ?wxFONTFAMILY_ROMAN | ?wxFONTFAMILY_SCRIPT | ?wxFONTFAMILY_SWISS | ?wxFONTFAMILY_MODERN | ?wxFONTFAMILY_TELETYPE | ?wxFONTFAMILY_MAX | ?wxFONTFAMILY_UNKNOWN
+%%<br /> Style = ?wxFONTSTYLE_NORMAL | ?wxFONTSTYLE_ITALIC | ?wxFONTSTYLE_SLANT | ?wxFONTSTYLE_MAX
+%%<br /> Encoding = ?wxFONTENCODING_SYSTEM | ?wxFONTENCODING_DEFAULT | ?wxFONTENCODING_ISO8859_1 | ?wxFONTENCODING_ISO8859_2 | ?wxFONTENCODING_ISO8859_3 | ?wxFONTENCODING_ISO8859_4 | ?wxFONTENCODING_ISO8859_5 | ?wxFONTENCODING_ISO8859_6 | ?wxFONTENCODING_ISO8859_7 | ?wxFONTENCODING_ISO8859_8 | ?wxFONTENCODING_ISO8859_9 | ?wxFONTENCODING_ISO8859_10 | ?wxFONTENCODING_ISO8859_11 | ?wxFONTENCODING_ISO8859_12 | ?wxFONTENCODING_ISO8859_13 | ?wxFONTENCODING_ISO8859_14 | ?wxFONTENCODING_ISO8859_15 | ?wxFONTENCODING_ISO8859_MAX | ?wxFONTENCODING_KOI8 | ?wxFONTENCODING_KOI8_U | ?wxFONTENCODING_ALTERNATIVE | ?wxFONTENCODING_BULGARIAN | ?wxFONTENCODING_CP437 | ?wxFONTENCODING_CP850 | ?wxFONTENCODING_CP852 | ?wxFONTENCODING_CP855 | ?wxFONTENCODING_CP866 | ?wxFONTENCODING_CP874 | ?wxFONTENCODING_CP932 | ?wxFONTENCODING_CP936 | ?wxFONTENCODING_CP949 | ?wxFONTENCODING_CP950 | ?wxFONTENCODING_CP1250 | ?wxFONTENCODING_CP1251 | ?wxFONTENCODING_CP1252 | ?wxFONTENCODING_CP1253 | ?wxFONTENCODING_CP1254 | ?wxFONTENCODING_CP1255 | ?wxFONTENCODING_CP1256 | ?wxFONTENCODING_CP1257 | ?wxFONTENCODING_CP12_MAX | ?wxFONTENCODING_UTF7 | ?wxFONTENCODING_UTF8 | ?wxFONTENCODING_EUC_JP | ?wxFONTENCODING_UTF16BE | ?wxFONTENCODING_UTF16LE | ?wxFONTENCODING_UTF32BE | ?wxFONTENCODING_UTF32LE | ?wxFONTENCODING_MACROMAN | ?wxFONTENCODING_MACJAPANESE | ?wxFONTENCODING_MACCHINESETRAD | ?wxFONTENCODING_MACKOREAN | ?wxFONTENCODING_MACARABIC | ?wxFONTENCODING_MACHEBREW | ?wxFONTENCODING_MACGREEK | ?wxFONTENCODING_MACCYRILLIC | ?wxFONTENCODING_MACDEVANAGARI | ?wxFONTENCODING_MACGURMUKHI | ?wxFONTENCODING_MACGUJARATI | ?wxFONTENCODING_MACORIYA | ?wxFONTENCODING_MACBENGALI | ?wxFONTENCODING_MACTAMIL | ?wxFONTENCODING_MACTELUGU | ?wxFONTENCODING_MACKANNADA | ?wxFONTENCODING_MACMALAJALAM | ?wxFONTENCODING_MACSINHALESE | ?wxFONTENCODING_MACBURMESE | ?wxFONTENCODING_MACKHMER | ?wxFONTENCODING_MACTHAI | ?wxFONTENCODING_MACLAOTIAN | ?wxFONTENCODING_MACGEORGIAN | ?wxFONTENCODING_MACARMENIAN | ?wxFONTENCODING_MACCHINESESIMP | ?wxFONTENCODING_MACTIBETAN | ?wxFONTENCODING_MACMONGOLIAN | ?wxFONTENCODING_MACETHIOPIC | ?wxFONTENCODING_MACCENTRALEUR | ?wxFONTENCODING_MACVIATNAMESE | ?wxFONTENCODING_MACARABICEXT | ?wxFONTENCODING_MACSYMBOL | ?wxFONTENCODING_MACDINGBATS | ?wxFONTENCODING_MACTURKISH | ?wxFONTENCODING_MACCROATIAN | ?wxFONTENCODING_MACICELANDIC | ?wxFONTENCODING_MACROMANIAN | ?wxFONTENCODING_MACCELTIC | ?wxFONTENCODING_MACGAELIC | ?wxFONTENCODING_MACKEYBOARD | ?wxFONTENCODING_MAX | ?wxFONTENCODING_MACMIN | ?wxFONTENCODING_MACMAX | ?wxFONTENCODING_UTF16 | ?wxFONTENCODING_UTF32 | ?wxFONTENCODING_UNICODE | ?wxFONTENCODING_GB2312 | ?wxFONTENCODING_BIG5 | ?wxFONTENCODING_SHIFT_JIS
+-spec new(Size, Family, Style, Weight, [Option]) -> wxFont() when
+	Size::integer(), Family::wx:wx_enum(), Style::wx:wx_enum(), Weight::integer(),
+	Option :: {underlined, boolean()}
+		 | {face, string()}
+		 | {encoding, wx:wx_enum()}.
 new(Size,Family,Style,Weight, Options)
  when is_integer(Size),is_integer(Family),is_integer(Style),is_integer(Weight),is_list(Options) ->
   MOpts = fun({underlined, Underlined}, Acc) -> [<<1:32/?UI,(wxe_util:from_bool(Underlined)):32/?UI>>|Acc];
@@ -75,99 +80,107 @@ new(Size,Family,Style,Weight, Options)
   wxe_util:construct(?wxFont_new_5,
   <<Size:32/?UI,Family:32/?UI,Style:32/?UI,Weight:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxFont()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfont.html#wxfontisfixedwidth">external documentation</a>.
+-spec isFixedWidth(This) -> boolean() when
+	This::wxFont().
 isFixedWidth(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxFont),
   wxe_util:call(?wxFont_IsFixedWidth,
   <<ThisRef:32/?UI>>).
 
-%% @spec () -> WxFontEncoding
-%% WxFontEncoding = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfont.html#wxfontgetdefaultencoding">external documentation</a>.
-%%<br /> WxFontEncoding is one of ?wxFONTENCODING_SYSTEM | ?wxFONTENCODING_DEFAULT | ?wxFONTENCODING_ISO8859_1 | ?wxFONTENCODING_ISO8859_2 | ?wxFONTENCODING_ISO8859_3 | ?wxFONTENCODING_ISO8859_4 | ?wxFONTENCODING_ISO8859_5 | ?wxFONTENCODING_ISO8859_6 | ?wxFONTENCODING_ISO8859_7 | ?wxFONTENCODING_ISO8859_8 | ?wxFONTENCODING_ISO8859_9 | ?wxFONTENCODING_ISO8859_10 | ?wxFONTENCODING_ISO8859_11 | ?wxFONTENCODING_ISO8859_12 | ?wxFONTENCODING_ISO8859_13 | ?wxFONTENCODING_ISO8859_14 | ?wxFONTENCODING_ISO8859_15 | ?wxFONTENCODING_ISO8859_MAX | ?wxFONTENCODING_KOI8 | ?wxFONTENCODING_KOI8_U | ?wxFONTENCODING_ALTERNATIVE | ?wxFONTENCODING_BULGARIAN | ?wxFONTENCODING_CP437 | ?wxFONTENCODING_CP850 | ?wxFONTENCODING_CP852 | ?wxFONTENCODING_CP855 | ?wxFONTENCODING_CP866 | ?wxFONTENCODING_CP874 | ?wxFONTENCODING_CP932 | ?wxFONTENCODING_CP936 | ?wxFONTENCODING_CP949 | ?wxFONTENCODING_CP950 | ?wxFONTENCODING_CP1250 | ?wxFONTENCODING_CP1251 | ?wxFONTENCODING_CP1252 | ?wxFONTENCODING_CP1253 | ?wxFONTENCODING_CP1254 | ?wxFONTENCODING_CP1255 | ?wxFONTENCODING_CP1256 | ?wxFONTENCODING_CP1257 | ?wxFONTENCODING_CP12_MAX | ?wxFONTENCODING_UTF7 | ?wxFONTENCODING_UTF8 | ?wxFONTENCODING_EUC_JP | ?wxFONTENCODING_UTF16BE | ?wxFONTENCODING_UTF16LE | ?wxFONTENCODING_UTF32BE | ?wxFONTENCODING_UTF32LE | ?wxFONTENCODING_MACROMAN | ?wxFONTENCODING_MACJAPANESE | ?wxFONTENCODING_MACCHINESETRAD | ?wxFONTENCODING_MACKOREAN | ?wxFONTENCODING_MACARABIC | ?wxFONTENCODING_MACHEBREW | ?wxFONTENCODING_MACGREEK | ?wxFONTENCODING_MACCYRILLIC | ?wxFONTENCODING_MACDEVANAGARI | ?wxFONTENCODING_MACGURMUKHI | ?wxFONTENCODING_MACGUJARATI | ?wxFONTENCODING_MACORIYA | ?wxFONTENCODING_MACBENGALI | ?wxFONTENCODING_MACTAMIL | ?wxFONTENCODING_MACTELUGU | ?wxFONTENCODING_MACKANNADA | ?wxFONTENCODING_MACMALAJALAM | ?wxFONTENCODING_MACSINHALESE | ?wxFONTENCODING_MACBURMESE | ?wxFONTENCODING_MACKHMER | ?wxFONTENCODING_MACTHAI | ?wxFONTENCODING_MACLAOTIAN | ?wxFONTENCODING_MACGEORGIAN | ?wxFONTENCODING_MACARMENIAN | ?wxFONTENCODING_MACCHINESESIMP | ?wxFONTENCODING_MACTIBETAN | ?wxFONTENCODING_MACMONGOLIAN | ?wxFONTENCODING_MACETHIOPIC | ?wxFONTENCODING_MACCENTRALEUR | ?wxFONTENCODING_MACVIATNAMESE | ?wxFONTENCODING_MACARABICEXT | ?wxFONTENCODING_MACSYMBOL | ?wxFONTENCODING_MACDINGBATS | ?wxFONTENCODING_MACTURKISH | ?wxFONTENCODING_MACCROATIAN | ?wxFONTENCODING_MACICELANDIC | ?wxFONTENCODING_MACROMANIAN | ?wxFONTENCODING_MACCELTIC | ?wxFONTENCODING_MACGAELIC | ?wxFONTENCODING_MACKEYBOARD | ?wxFONTENCODING_MAX | ?wxFONTENCODING_MACMIN | ?wxFONTENCODING_MACMAX | ?wxFONTENCODING_UTF16 | ?wxFONTENCODING_UTF32 | ?wxFONTENCODING_UNICODE | ?wxFONTENCODING_GB2312 | ?wxFONTENCODING_BIG5 | ?wxFONTENCODING_SHIFT_JIS
+%%<br /> Res = ?wxFONTENCODING_SYSTEM | ?wxFONTENCODING_DEFAULT | ?wxFONTENCODING_ISO8859_1 | ?wxFONTENCODING_ISO8859_2 | ?wxFONTENCODING_ISO8859_3 | ?wxFONTENCODING_ISO8859_4 | ?wxFONTENCODING_ISO8859_5 | ?wxFONTENCODING_ISO8859_6 | ?wxFONTENCODING_ISO8859_7 | ?wxFONTENCODING_ISO8859_8 | ?wxFONTENCODING_ISO8859_9 | ?wxFONTENCODING_ISO8859_10 | ?wxFONTENCODING_ISO8859_11 | ?wxFONTENCODING_ISO8859_12 | ?wxFONTENCODING_ISO8859_13 | ?wxFONTENCODING_ISO8859_14 | ?wxFONTENCODING_ISO8859_15 | ?wxFONTENCODING_ISO8859_MAX | ?wxFONTENCODING_KOI8 | ?wxFONTENCODING_KOI8_U | ?wxFONTENCODING_ALTERNATIVE | ?wxFONTENCODING_BULGARIAN | ?wxFONTENCODING_CP437 | ?wxFONTENCODING_CP850 | ?wxFONTENCODING_CP852 | ?wxFONTENCODING_CP855 | ?wxFONTENCODING_CP866 | ?wxFONTENCODING_CP874 | ?wxFONTENCODING_CP932 | ?wxFONTENCODING_CP936 | ?wxFONTENCODING_CP949 | ?wxFONTENCODING_CP950 | ?wxFONTENCODING_CP1250 | ?wxFONTENCODING_CP1251 | ?wxFONTENCODING_CP1252 | ?wxFONTENCODING_CP1253 | ?wxFONTENCODING_CP1254 | ?wxFONTENCODING_CP1255 | ?wxFONTENCODING_CP1256 | ?wxFONTENCODING_CP1257 | ?wxFONTENCODING_CP12_MAX | ?wxFONTENCODING_UTF7 | ?wxFONTENCODING_UTF8 | ?wxFONTENCODING_EUC_JP | ?wxFONTENCODING_UTF16BE | ?wxFONTENCODING_UTF16LE | ?wxFONTENCODING_UTF32BE | ?wxFONTENCODING_UTF32LE | ?wxFONTENCODING_MACROMAN | ?wxFONTENCODING_MACJAPANESE | ?wxFONTENCODING_MACCHINESETRAD | ?wxFONTENCODING_MACKOREAN | ?wxFONTENCODING_MACARABIC | ?wxFONTENCODING_MACHEBREW | ?wxFONTENCODING_MACGREEK | ?wxFONTENCODING_MACCYRILLIC | ?wxFONTENCODING_MACDEVANAGARI | ?wxFONTENCODING_MACGURMUKHI | ?wxFONTENCODING_MACGUJARATI | ?wxFONTENCODING_MACORIYA | ?wxFONTENCODING_MACBENGALI | ?wxFONTENCODING_MACTAMIL | ?wxFONTENCODING_MACTELUGU | ?wxFONTENCODING_MACKANNADA | ?wxFONTENCODING_MACMALAJALAM | ?wxFONTENCODING_MACSINHALESE | ?wxFONTENCODING_MACBURMESE | ?wxFONTENCODING_MACKHMER | ?wxFONTENCODING_MACTHAI | ?wxFONTENCODING_MACLAOTIAN | ?wxFONTENCODING_MACGEORGIAN | ?wxFONTENCODING_MACARMENIAN | ?wxFONTENCODING_MACCHINESESIMP | ?wxFONTENCODING_MACTIBETAN | ?wxFONTENCODING_MACMONGOLIAN | ?wxFONTENCODING_MACETHIOPIC | ?wxFONTENCODING_MACCENTRALEUR | ?wxFONTENCODING_MACVIATNAMESE | ?wxFONTENCODING_MACARABICEXT | ?wxFONTENCODING_MACSYMBOL | ?wxFONTENCODING_MACDINGBATS | ?wxFONTENCODING_MACTURKISH | ?wxFONTENCODING_MACCROATIAN | ?wxFONTENCODING_MACICELANDIC | ?wxFONTENCODING_MACROMANIAN | ?wxFONTENCODING_MACCELTIC | ?wxFONTENCODING_MACGAELIC | ?wxFONTENCODING_MACKEYBOARD | ?wxFONTENCODING_MAX | ?wxFONTENCODING_MACMIN | ?wxFONTENCODING_MACMAX | ?wxFONTENCODING_UTF16 | ?wxFONTENCODING_UTF32 | ?wxFONTENCODING_UNICODE | ?wxFONTENCODING_GB2312 | ?wxFONTENCODING_BIG5 | ?wxFONTENCODING_SHIFT_JIS
+-spec getDefaultEncoding() -> wx:wx_enum().
 getDefaultEncoding() ->
   wxe_util:call(?wxFont_GetDefaultEncoding,
   <<>>).
 
-%% @spec (This::wxFont()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfont.html#wxfontgetfacename">external documentation</a>.
+-spec getFaceName(This) -> string() when
+	This::wxFont().
 getFaceName(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxFont),
   wxe_util:call(?wxFont_GetFaceName,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxFont()) -> WxFontFamily
-%% WxFontFamily = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfont.html#wxfontgetfamily">external documentation</a>.
-%%<br /> WxFontFamily is one of ?wxFONTFAMILY_DEFAULT | ?wxFONTFAMILY_DECORATIVE | ?wxFONTFAMILY_ROMAN | ?wxFONTFAMILY_SCRIPT | ?wxFONTFAMILY_SWISS | ?wxFONTFAMILY_MODERN | ?wxFONTFAMILY_TELETYPE | ?wxFONTFAMILY_MAX | ?wxFONTFAMILY_UNKNOWN
+%%<br /> Res = ?wxFONTFAMILY_DEFAULT | ?wxFONTFAMILY_DECORATIVE | ?wxFONTFAMILY_ROMAN | ?wxFONTFAMILY_SCRIPT | ?wxFONTFAMILY_SWISS | ?wxFONTFAMILY_MODERN | ?wxFONTFAMILY_TELETYPE | ?wxFONTFAMILY_MAX | ?wxFONTFAMILY_UNKNOWN
+-spec getFamily(This) -> wx:wx_enum() when
+	This::wxFont().
 getFamily(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxFont),
   wxe_util:call(?wxFont_GetFamily,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxFont()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfont.html#wxfontgetnativefontinfodesc">external documentation</a>.
+-spec getNativeFontInfoDesc(This) -> string() when
+	This::wxFont().
 getNativeFontInfoDesc(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxFont),
   wxe_util:call(?wxFont_GetNativeFontInfoDesc,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxFont()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfont.html#wxfontgetnativefontinfouserdesc">external documentation</a>.
+-spec getNativeFontInfoUserDesc(This) -> string() when
+	This::wxFont().
 getNativeFontInfoUserDesc(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxFont),
   wxe_util:call(?wxFont_GetNativeFontInfoUserDesc,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxFont()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfont.html#wxfontgetpointsize">external documentation</a>.
+-spec getPointSize(This) -> integer() when
+	This::wxFont().
 getPointSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxFont),
   wxe_util:call(?wxFont_GetPointSize,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxFont()) -> WxFontStyle
-%% WxFontStyle = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfont.html#wxfontgetstyle">external documentation</a>.
-%%<br /> WxFontStyle is one of ?wxFONTSTYLE_NORMAL | ?wxFONTSTYLE_ITALIC | ?wxFONTSTYLE_SLANT | ?wxFONTSTYLE_MAX
+%%<br /> Res = ?wxFONTSTYLE_NORMAL | ?wxFONTSTYLE_ITALIC | ?wxFONTSTYLE_SLANT | ?wxFONTSTYLE_MAX
+-spec getStyle(This) -> wx:wx_enum() when
+	This::wxFont().
 getStyle(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxFont),
   wxe_util:call(?wxFont_GetStyle,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxFont()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfont.html#wxfontgetunderlined">external documentation</a>.
+-spec getUnderlined(This) -> boolean() when
+	This::wxFont().
 getUnderlined(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxFont),
   wxe_util:call(?wxFont_GetUnderlined,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxFont()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfont.html#wxfontgetweight">external documentation</a>.
+-spec getWeight(This) -> integer() when
+	This::wxFont().
 getWeight(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxFont),
   wxe_util:call(?wxFont_GetWeight,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxFont()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfont.html#wxfontok">external documentation</a>.
+-spec ok(This) -> boolean() when
+	This::wxFont().
 ok(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxFont),
   wxe_util:call(?wxFont_Ok,
   <<ThisRef:32/?UI>>).
 
-%% @spec (Encoding::WxFontEncoding) -> ok
-%% WxFontEncoding = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfont.html#wxfontsetdefaultencoding">external documentation</a>.
-%%<br /> WxFontEncoding is one of ?wxFONTENCODING_SYSTEM | ?wxFONTENCODING_DEFAULT | ?wxFONTENCODING_ISO8859_1 | ?wxFONTENCODING_ISO8859_2 | ?wxFONTENCODING_ISO8859_3 | ?wxFONTENCODING_ISO8859_4 | ?wxFONTENCODING_ISO8859_5 | ?wxFONTENCODING_ISO8859_6 | ?wxFONTENCODING_ISO8859_7 | ?wxFONTENCODING_ISO8859_8 | ?wxFONTENCODING_ISO8859_9 | ?wxFONTENCODING_ISO8859_10 | ?wxFONTENCODING_ISO8859_11 | ?wxFONTENCODING_ISO8859_12 | ?wxFONTENCODING_ISO8859_13 | ?wxFONTENCODING_ISO8859_14 | ?wxFONTENCODING_ISO8859_15 | ?wxFONTENCODING_ISO8859_MAX | ?wxFONTENCODING_KOI8 | ?wxFONTENCODING_KOI8_U | ?wxFONTENCODING_ALTERNATIVE | ?wxFONTENCODING_BULGARIAN | ?wxFONTENCODING_CP437 | ?wxFONTENCODING_CP850 | ?wxFONTENCODING_CP852 | ?wxFONTENCODING_CP855 | ?wxFONTENCODING_CP866 | ?wxFONTENCODING_CP874 | ?wxFONTENCODING_CP932 | ?wxFONTENCODING_CP936 | ?wxFONTENCODING_CP949 | ?wxFONTENCODING_CP950 | ?wxFONTENCODING_CP1250 | ?wxFONTENCODING_CP1251 | ?wxFONTENCODING_CP1252 | ?wxFONTENCODING_CP1253 | ?wxFONTENCODING_CP1254 | ?wxFONTENCODING_CP1255 | ?wxFONTENCODING_CP1256 | ?wxFONTENCODING_CP1257 | ?wxFONTENCODING_CP12_MAX | ?wxFONTENCODING_UTF7 | ?wxFONTENCODING_UTF8 | ?wxFONTENCODING_EUC_JP | ?wxFONTENCODING_UTF16BE | ?wxFONTENCODING_UTF16LE | ?wxFONTENCODING_UTF32BE | ?wxFONTENCODING_UTF32LE | ?wxFONTENCODING_MACROMAN | ?wxFONTENCODING_MACJAPANESE | ?wxFONTENCODING_MACCHINESETRAD | ?wxFONTENCODING_MACKOREAN | ?wxFONTENCODING_MACARABIC | ?wxFONTENCODING_MACHEBREW | ?wxFONTENCODING_MACGREEK | ?wxFONTENCODING_MACCYRILLIC | ?wxFONTENCODING_MACDEVANAGARI | ?wxFONTENCODING_MACGURMUKHI | ?wxFONTENCODING_MACGUJARATI | ?wxFONTENCODING_MACORIYA | ?wxFONTENCODING_MACBENGALI | ?wxFONTENCODING_MACTAMIL | ?wxFONTENCODING_MACTELUGU | ?wxFONTENCODING_MACKANNADA | ?wxFONTENCODING_MACMALAJALAM | ?wxFONTENCODING_MACSINHALESE | ?wxFONTENCODING_MACBURMESE | ?wxFONTENCODING_MACKHMER | ?wxFONTENCODING_MACTHAI | ?wxFONTENCODING_MACLAOTIAN | ?wxFONTENCODING_MACGEORGIAN | ?wxFONTENCODING_MACARMENIAN | ?wxFONTENCODING_MACCHINESESIMP | ?wxFONTENCODING_MACTIBETAN | ?wxFONTENCODING_MACMONGOLIAN | ?wxFONTENCODING_MACETHIOPIC | ?wxFONTENCODING_MACCENTRALEUR | ?wxFONTENCODING_MACVIATNAMESE | ?wxFONTENCODING_MACARABICEXT | ?wxFONTENCODING_MACSYMBOL | ?wxFONTENCODING_MACDINGBATS | ?wxFONTENCODING_MACTURKISH | ?wxFONTENCODING_MACCROATIAN | ?wxFONTENCODING_MACICELANDIC | ?wxFONTENCODING_MACROMANIAN | ?wxFONTENCODING_MACCELTIC | ?wxFONTENCODING_MACGAELIC | ?wxFONTENCODING_MACKEYBOARD | ?wxFONTENCODING_MAX | ?wxFONTENCODING_MACMIN | ?wxFONTENCODING_MACMAX | ?wxFONTENCODING_UTF16 | ?wxFONTENCODING_UTF32 | ?wxFONTENCODING_UNICODE | ?wxFONTENCODING_GB2312 | ?wxFONTENCODING_BIG5 | ?wxFONTENCODING_SHIFT_JIS
+%%<br /> Encoding = ?wxFONTENCODING_SYSTEM | ?wxFONTENCODING_DEFAULT | ?wxFONTENCODING_ISO8859_1 | ?wxFONTENCODING_ISO8859_2 | ?wxFONTENCODING_ISO8859_3 | ?wxFONTENCODING_ISO8859_4 | ?wxFONTENCODING_ISO8859_5 | ?wxFONTENCODING_ISO8859_6 | ?wxFONTENCODING_ISO8859_7 | ?wxFONTENCODING_ISO8859_8 | ?wxFONTENCODING_ISO8859_9 | ?wxFONTENCODING_ISO8859_10 | ?wxFONTENCODING_ISO8859_11 | ?wxFONTENCODING_ISO8859_12 | ?wxFONTENCODING_ISO8859_13 | ?wxFONTENCODING_ISO8859_14 | ?wxFONTENCODING_ISO8859_15 | ?wxFONTENCODING_ISO8859_MAX | ?wxFONTENCODING_KOI8 | ?wxFONTENCODING_KOI8_U | ?wxFONTENCODING_ALTERNATIVE | ?wxFONTENCODING_BULGARIAN | ?wxFONTENCODING_CP437 | ?wxFONTENCODING_CP850 | ?wxFONTENCODING_CP852 | ?wxFONTENCODING_CP855 | ?wxFONTENCODING_CP866 | ?wxFONTENCODING_CP874 | ?wxFONTENCODING_CP932 | ?wxFONTENCODING_CP936 | ?wxFONTENCODING_CP949 | ?wxFONTENCODING_CP950 | ?wxFONTENCODING_CP1250 | ?wxFONTENCODING_CP1251 | ?wxFONTENCODING_CP1252 | ?wxFONTENCODING_CP1253 | ?wxFONTENCODING_CP1254 | ?wxFONTENCODING_CP1255 | ?wxFONTENCODING_CP1256 | ?wxFONTENCODING_CP1257 | ?wxFONTENCODING_CP12_MAX | ?wxFONTENCODING_UTF7 | ?wxFONTENCODING_UTF8 | ?wxFONTENCODING_EUC_JP | ?wxFONTENCODING_UTF16BE | ?wxFONTENCODING_UTF16LE | ?wxFONTENCODING_UTF32BE | ?wxFONTENCODING_UTF32LE | ?wxFONTENCODING_MACROMAN | ?wxFONTENCODING_MACJAPANESE | ?wxFONTENCODING_MACCHINESETRAD | ?wxFONTENCODING_MACKOREAN | ?wxFONTENCODING_MACARABIC | ?wxFONTENCODING_MACHEBREW | ?wxFONTENCODING_MACGREEK | ?wxFONTENCODING_MACCYRILLIC | ?wxFONTENCODING_MACDEVANAGARI | ?wxFONTENCODING_MACGURMUKHI | ?wxFONTENCODING_MACGUJARATI | ?wxFONTENCODING_MACORIYA | ?wxFONTENCODING_MACBENGALI | ?wxFONTENCODING_MACTAMIL | ?wxFONTENCODING_MACTELUGU | ?wxFONTENCODING_MACKANNADA | ?wxFONTENCODING_MACMALAJALAM | ?wxFONTENCODING_MACSINHALESE | ?wxFONTENCODING_MACBURMESE | ?wxFONTENCODING_MACKHMER | ?wxFONTENCODING_MACTHAI | ?wxFONTENCODING_MACLAOTIAN | ?wxFONTENCODING_MACGEORGIAN | ?wxFONTENCODING_MACARMENIAN | ?wxFONTENCODING_MACCHINESESIMP | ?wxFONTENCODING_MACTIBETAN | ?wxFONTENCODING_MACMONGOLIAN | ?wxFONTENCODING_MACETHIOPIC | ?wxFONTENCODING_MACCENTRALEUR | ?wxFONTENCODING_MACVIATNAMESE | ?wxFONTENCODING_MACARABICEXT | ?wxFONTENCODING_MACSYMBOL | ?wxFONTENCODING_MACDINGBATS | ?wxFONTENCODING_MACTURKISH | ?wxFONTENCODING_MACCROATIAN | ?wxFONTENCODING_MACICELANDIC | ?wxFONTENCODING_MACROMANIAN | ?wxFONTENCODING_MACCELTIC | ?wxFONTENCODING_MACGAELIC | ?wxFONTENCODING_MACKEYBOARD | ?wxFONTENCODING_MAX | ?wxFONTENCODING_MACMIN | ?wxFONTENCODING_MACMAX | ?wxFONTENCODING_UTF16 | ?wxFONTENCODING_UTF32 | ?wxFONTENCODING_UNICODE | ?wxFONTENCODING_GB2312 | ?wxFONTENCODING_BIG5 | ?wxFONTENCODING_SHIFT_JIS
+-spec setDefaultEncoding(Encoding) -> ok when
+	Encoding::wx:wx_enum().
 setDefaultEncoding(Encoding)
  when is_integer(Encoding) ->
   wxe_util:cast(?wxFont_SetDefaultEncoding,
   <<Encoding:32/?UI>>).
 
-%% @spec (This::wxFont(), FaceName::string()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfont.html#wxfontsetfacename">external documentation</a>.
+-spec setFaceName(This, FaceName) -> boolean() when
+	This::wxFont(), FaceName::string().
 setFaceName(#wx_ref{type=ThisT,ref=ThisRef},FaceName)
  when is_list(FaceName) ->
   ?CLASS(ThisT,wxFont),
@@ -175,52 +188,55 @@ setFaceName(#wx_ref{type=ThisT,ref=ThisRef},FaceName)
   wxe_util:call(?wxFont_SetFaceName,
   <<ThisRef:32/?UI,(byte_size(FaceName_UC)):32/?UI,(FaceName_UC)/binary, 0:(((8- ((0+byte_size(FaceName_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxFont(), Family::WxFontFamily) -> ok
-%% WxFontFamily = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfont.html#wxfontsetfamily">external documentation</a>.
-%%<br /> WxFontFamily is one of ?wxFONTFAMILY_DEFAULT | ?wxFONTFAMILY_DECORATIVE | ?wxFONTFAMILY_ROMAN | ?wxFONTFAMILY_SCRIPT | ?wxFONTFAMILY_SWISS | ?wxFONTFAMILY_MODERN | ?wxFONTFAMILY_TELETYPE | ?wxFONTFAMILY_MAX | ?wxFONTFAMILY_UNKNOWN
+%%<br /> Family = ?wxFONTFAMILY_DEFAULT | ?wxFONTFAMILY_DECORATIVE | ?wxFONTFAMILY_ROMAN | ?wxFONTFAMILY_SCRIPT | ?wxFONTFAMILY_SWISS | ?wxFONTFAMILY_MODERN | ?wxFONTFAMILY_TELETYPE | ?wxFONTFAMILY_MAX | ?wxFONTFAMILY_UNKNOWN
+-spec setFamily(This, Family) -> ok when
+	This::wxFont(), Family::wx:wx_enum().
 setFamily(#wx_ref{type=ThisT,ref=ThisRef},Family)
  when is_integer(Family) ->
   ?CLASS(ThisT,wxFont),
   wxe_util:cast(?wxFont_SetFamily,
   <<ThisRef:32/?UI,Family:32/?UI>>).
 
-%% @spec (This::wxFont(), PointSize::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfont.html#wxfontsetpointsize">external documentation</a>.
+-spec setPointSize(This, PointSize) -> ok when
+	This::wxFont(), PointSize::integer().
 setPointSize(#wx_ref{type=ThisT,ref=ThisRef},PointSize)
  when is_integer(PointSize) ->
   ?CLASS(ThisT,wxFont),
   wxe_util:cast(?wxFont_SetPointSize,
   <<ThisRef:32/?UI,PointSize:32/?UI>>).
 
-%% @spec (This::wxFont(), Style::WxFontStyle) -> ok
-%% WxFontStyle = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfont.html#wxfontsetstyle">external documentation</a>.
-%%<br /> WxFontStyle is one of ?wxFONTSTYLE_NORMAL | ?wxFONTSTYLE_ITALIC | ?wxFONTSTYLE_SLANT | ?wxFONTSTYLE_MAX
+%%<br /> Style = ?wxFONTSTYLE_NORMAL | ?wxFONTSTYLE_ITALIC | ?wxFONTSTYLE_SLANT | ?wxFONTSTYLE_MAX
+-spec setStyle(This, Style) -> ok when
+	This::wxFont(), Style::wx:wx_enum().
 setStyle(#wx_ref{type=ThisT,ref=ThisRef},Style)
  when is_integer(Style) ->
   ?CLASS(ThisT,wxFont),
   wxe_util:cast(?wxFont_SetStyle,
   <<ThisRef:32/?UI,Style:32/?UI>>).
 
-%% @spec (This::wxFont(), Underlined::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfont.html#wxfontsetunderlined">external documentation</a>.
+-spec setUnderlined(This, Underlined) -> ok when
+	This::wxFont(), Underlined::boolean().
 setUnderlined(#wx_ref{type=ThisT,ref=ThisRef},Underlined)
  when is_boolean(Underlined) ->
   ?CLASS(ThisT,wxFont),
   wxe_util:cast(?wxFont_SetUnderlined,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Underlined)):32/?UI>>).
 
-%% @spec (This::wxFont(), Weight::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfont.html#wxfontsetweight">external documentation</a>.
+-spec setWeight(This, Weight) -> ok when
+	This::wxFont(), Weight::integer().
 setWeight(#wx_ref{type=ThisT,ref=ThisRef},Weight)
  when is_integer(Weight) ->
   ?CLASS(ThisT,wxFont),
   wxe_util:cast(?wxFont_SetWeight,
   <<ThisRef:32/?UI,Weight:32/?UI>>).
 
-%% @spec (This::wxFont()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxFont) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxFont),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxFontData.erl b/lib/wx/src/gen/wxFontData.erl
index 33015b7ca9..df8e734000 100644
--- a/lib/wx/src/gen/wxFontData.erl
+++ b/lib/wx/src/gen/wxFontData.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -31,122 +31,138 @@
 %% inherited exports
 -export([parent_class/1]).
 
+-export_type([wxFontData/0]).
 %% @hidden
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxFontData()
+-type wxFontData() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfontdata.html#wxfontdatawxfontdata">external documentation</a>.
+-spec new() -> wxFontData().
 new() ->
   wxe_util:construct(?wxFontData_new_0,
   <<>>).
 
-%% @spec (Data::wxFontData()) -> wxFontData()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfontdata.html#wxfontdatawxfontdata">external documentation</a>.
+-spec new(Data) -> wxFontData() when
+	Data::wxFontData().
 new(#wx_ref{type=DataT,ref=DataRef}) ->
   ?CLASS(DataT,wxFontData),
   wxe_util:construct(?wxFontData_new_1,
   <<DataRef:32/?UI>>).
 
-%% @spec (This::wxFontData(), Flag::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfontdata.html#wxfontdataenableeffects">external documentation</a>.
+-spec enableEffects(This, Flag) -> ok when
+	This::wxFontData(), Flag::boolean().
 enableEffects(#wx_ref{type=ThisT,ref=ThisRef},Flag)
  when is_boolean(Flag) ->
   ?CLASS(ThisT,wxFontData),
   wxe_util:cast(?wxFontData_EnableEffects,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Flag)):32/?UI>>).
 
-%% @spec (This::wxFontData()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfontdata.html#wxfontdatagetallowsymbols">external documentation</a>.
+-spec getAllowSymbols(This) -> boolean() when
+	This::wxFontData().
 getAllowSymbols(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxFontData),
   wxe_util:call(?wxFontData_GetAllowSymbols,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxFontData()) -> wx:colour()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfontdata.html#wxfontdatagetcolour">external documentation</a>.
+-spec getColour(This) -> wx:wx_colour() when
+	This::wxFontData().
 getColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxFontData),
   wxe_util:call(?wxFontData_GetColour,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxFontData()) -> wxFont:wxFont()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfontdata.html#wxfontdatagetchosenfont">external documentation</a>.
+-spec getChosenFont(This) -> wxFont:wxFont() when
+	This::wxFontData().
 getChosenFont(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxFontData),
   wxe_util:call(?wxFontData_GetChosenFont,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxFontData()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfontdata.html#wxfontdatagetenableeffects">external documentation</a>.
+-spec getEnableEffects(This) -> boolean() when
+	This::wxFontData().
 getEnableEffects(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxFontData),
   wxe_util:call(?wxFontData_GetEnableEffects,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxFontData()) -> wxFont:wxFont()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfontdata.html#wxfontdatagetinitialfont">external documentation</a>.
+-spec getInitialFont(This) -> wxFont:wxFont() when
+	This::wxFontData().
 getInitialFont(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxFontData),
   wxe_util:call(?wxFontData_GetInitialFont,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxFontData()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfontdata.html#wxfontdatagetshowhelp">external documentation</a>.
+-spec getShowHelp(This) -> boolean() when
+	This::wxFontData().
 getShowHelp(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxFontData),
   wxe_util:call(?wxFontData_GetShowHelp,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxFontData(), Flag::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfontdata.html#wxfontdatasetallowsymbols">external documentation</a>.
+-spec setAllowSymbols(This, Flag) -> ok when
+	This::wxFontData(), Flag::boolean().
 setAllowSymbols(#wx_ref{type=ThisT,ref=ThisRef},Flag)
  when is_boolean(Flag) ->
   ?CLASS(ThisT,wxFontData),
   wxe_util:cast(?wxFontData_SetAllowSymbols,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Flag)):32/?UI>>).
 
-%% @spec (This::wxFontData(), Font::wxFont:wxFont()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfontdata.html#wxfontdatasetchosenfont">external documentation</a>.
+-spec setChosenFont(This, Font) -> ok when
+	This::wxFontData(), Font::wxFont:wxFont().
 setChosenFont(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FontT,ref=FontRef}) ->
   ?CLASS(ThisT,wxFontData),
   ?CLASS(FontT,wxFont),
   wxe_util:cast(?wxFontData_SetChosenFont,
   <<ThisRef:32/?UI,FontRef:32/?UI>>).
 
-%% @spec (This::wxFontData(), Colour::wx:colour()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfontdata.html#wxfontdatasetcolour">external documentation</a>.
+-spec setColour(This, Colour) -> ok when
+	This::wxFontData(), Colour::wx:wx_colour().
 setColour(#wx_ref{type=ThisT,ref=ThisRef},Colour)
  when tuple_size(Colour) =:= 3; tuple_size(Colour) =:= 4 ->
   ?CLASS(ThisT,wxFontData),
   wxe_util:cast(?wxFontData_SetColour,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(Colour)):16/binary>>).
 
-%% @spec (This::wxFontData(), Font::wxFont:wxFont()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfontdata.html#wxfontdatasetinitialfont">external documentation</a>.
+-spec setInitialFont(This, Font) -> ok when
+	This::wxFontData(), Font::wxFont:wxFont().
 setInitialFont(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FontT,ref=FontRef}) ->
   ?CLASS(ThisT,wxFontData),
   ?CLASS(FontT,wxFont),
   wxe_util:cast(?wxFontData_SetInitialFont,
   <<ThisRef:32/?UI,FontRef:32/?UI>>).
 
-%% @spec (This::wxFontData(), MinRange::integer(), MaxRange::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfontdata.html#wxfontdatasetrange">external documentation</a>.
+-spec setRange(This, MinRange, MaxRange) -> ok when
+	This::wxFontData(), MinRange::integer(), MaxRange::integer().
 setRange(#wx_ref{type=ThisT,ref=ThisRef},MinRange,MaxRange)
  when is_integer(MinRange),is_integer(MaxRange) ->
   ?CLASS(ThisT,wxFontData),
   wxe_util:cast(?wxFontData_SetRange,
   <<ThisRef:32/?UI,MinRange:32/?UI,MaxRange:32/?UI>>).
 
-%% @spec (This::wxFontData(), Flag::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfontdata.html#wxfontdatasetshowhelp">external documentation</a>.
+-spec setShowHelp(This, Flag) -> ok when
+	This::wxFontData(), Flag::boolean().
 setShowHelp(#wx_ref{type=ThisT,ref=ThisRef},Flag)
  when is_boolean(Flag) ->
   ?CLASS(ThisT,wxFontData),
   wxe_util:cast(?wxFontData_SetShowHelp,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Flag)):32/?UI>>).
 
-%% @spec (This::wxFontData()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxFontData) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxFontData),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxFontDialog.erl b/lib/wx/src/gen/wxFontDialog.erl
index 357bfe532d..ad061055da 100644
--- a/lib/wx/src/gen/wxFontDialog.erl
+++ b/lib/wx/src/gen/wxFontDialog.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -77,6 +77,7 @@
   transferDataFromWindow/1,transferDataToWindow/1,update/1,updateWindowUI/1,
   updateWindowUI/2,validate/1,warpPointer/3]).
 
+-export_type([wxFontDialog/0]).
 %% @hidden
 parent_class(wxDialog) -> true;
 parent_class(wxTopLevelWindow) -> true;
@@ -84,22 +85,25 @@ parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxFontDialog()
+-type wxFontDialog() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfontdialog.html#wxfontdialogwxfontdialog">external documentation</a>.
+-spec new() -> wxFontDialog().
 new() ->
   wxe_util:construct(?wxFontDialog_new_0,
   <<>>).
 
-%% @spec (Parent::wxWindow:wxWindow(), Data::wxFontData:wxFontData()) -> wxFontDialog()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfontdialog.html#wxfontdialogwxfontdialog">external documentation</a>.
+-spec new(Parent, Data) -> wxFontDialog() when
+	Parent::wxWindow:wxWindow(), Data::wxFontData:wxFontData().
 new(#wx_ref{type=ParentT,ref=ParentRef},#wx_ref{type=DataT,ref=DataRef}) ->
   ?CLASS(ParentT,wxWindow),
   ?CLASS(DataT,wxFontData),
   wxe_util:construct(?wxFontDialog_new_2,
   <<ParentRef:32/?UI,DataRef:32/?UI>>).
 
-%% @spec (This::wxFontDialog(), Parent::wxWindow:wxWindow(), Data::wxFontData:wxFontData()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfontdialog.html#wxfontdialogcreate">external documentation</a>.
+-spec create(This, Parent, Data) -> boolean() when
+	This::wxFontDialog(), Parent::wxWindow:wxWindow(), Data::wxFontData:wxFontData().
 create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},#wx_ref{type=DataT,ref=DataRef}) ->
   ?CLASS(ThisT,wxFontDialog),
   ?CLASS(ParentT,wxWindow),
@@ -107,15 +111,16 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},#wx_r
   wxe_util:call(?wxFontDialog_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI,DataRef:32/?UI>>).
 
-%% @spec (This::wxFontDialog()) -> wxFontData:wxFontData()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfontdialog.html#wxfontdialoggetfontdata">external documentation</a>.
+-spec getFontData(This) -> wxFontData:wxFontData() when
+	This::wxFontDialog().
 getFontData(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxFontDialog),
   wxe_util:call(?wxFontDialog_GetFontData,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxFontDialog()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxFontDialog) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxFontDialog),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxFontPickerCtrl.erl b/lib/wx/src/gen/wxFontPickerCtrl.erl
index 3050011b60..01be91239c 100644
--- a/lib/wx/src/gen/wxFontPickerCtrl.erl
+++ b/lib/wx/src/gen/wxFontPickerCtrl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -75,6 +75,7 @@
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
 
+-export_type([wxFontPickerCtrl/0]).
 %% @hidden
 parent_class(wxPickerBase) -> true;
 parent_class(wxControl) -> true;
@@ -82,21 +83,29 @@ parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxFontPickerCtrl()
+-type wxFontPickerCtrl() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfontpickerctrl.html#wxfontpickerctrlwxfontpickerctrl">external documentation</a>.
+-spec new() -> wxFontPickerCtrl().
 new() ->
   wxe_util:construct(?wxFontPickerCtrl_new_0,
   <<>>).
 
-%% @spec (Parent::wxWindow:wxWindow(), Id::integer()) -> wxFontPickerCtrl()
 %% @equiv new(Parent,Id, [])
+-spec new(Parent, Id) -> wxFontPickerCtrl() when
+	Parent::wxWindow:wxWindow(), Id::integer().
+
 new(Parent,Id)
  when is_record(Parent, wx_ref),is_integer(Id) ->
   new(Parent,Id, []).
 
-%% @spec (Parent::wxWindow:wxWindow(), Id::integer(), [Option]) -> wxFontPickerCtrl()
-%% Option = {initial, wxFont:wxFont()} | {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()} | {validator, wx:wx()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfontpickerctrl.html#wxfontpickerctrlwxfontpickerctrl">external documentation</a>.
+-spec new(Parent, Id, [Option]) -> wxFontPickerCtrl() when
+	Parent::wxWindow:wxWindow(), Id::integer(),
+	Option :: {initial, wxFont:wxFont()}
+		 | {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}
+		 | {validator, wx:wx()}.
 new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
  when is_integer(Id),is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -110,15 +119,22 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
   wxe_util:construct(?wxFontPickerCtrl_new_3,
   <<ParentRef:32/?UI,Id:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxFontPickerCtrl(), Parent::wxWindow:wxWindow(), Id::integer()) -> bool()
 %% @equiv create(This,Parent,Id, [])
+-spec create(This, Parent, Id) -> boolean() when
+	This::wxFontPickerCtrl(), Parent::wxWindow:wxWindow(), Id::integer().
+
 create(This,Parent,Id)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id) ->
   create(This,Parent,Id, []).
 
-%% @spec (This::wxFontPickerCtrl(), Parent::wxWindow:wxWindow(), Id::integer(), [Option]) -> bool()
-%% Option = {initial, wxFont:wxFont()} | {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()} | {validator, wx:wx()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfontpickerctrl.html#wxfontpickerctrlcreate">external documentation</a>.
+-spec create(This, Parent, Id, [Option]) -> boolean() when
+	This::wxFontPickerCtrl(), Parent::wxWindow:wxWindow(), Id::integer(),
+	Option :: {initial, wxFont:wxFont()}
+		 | {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}
+		 | {validator, wx:wx()}.
 create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
  when is_integer(Id),is_list(Options) ->
   ?CLASS(ThisT,wxFontPickerCtrl),
@@ -133,38 +149,42 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id, O
   wxe_util:call(?wxFontPickerCtrl_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI,Id:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxFontPickerCtrl()) -> wxFont:wxFont()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfontpickerctrl.html#wxfontpickerctrlgetselectedfont">external documentation</a>.
+-spec getSelectedFont(This) -> wxFont:wxFont() when
+	This::wxFontPickerCtrl().
 getSelectedFont(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxFontPickerCtrl),
   wxe_util:call(?wxFontPickerCtrl_GetSelectedFont,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxFontPickerCtrl(), F::wxFont:wxFont()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfontpickerctrl.html#wxfontpickerctrlsetselectedfont">external documentation</a>.
+-spec setSelectedFont(This, F) -> ok when
+	This::wxFontPickerCtrl(), F::wxFont:wxFont().
 setSelectedFont(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FT,ref=FRef}) ->
   ?CLASS(ThisT,wxFontPickerCtrl),
   ?CLASS(FT,wxFont),
   wxe_util:cast(?wxFontPickerCtrl_SetSelectedFont,
   <<ThisRef:32/?UI,FRef:32/?UI>>).
 
-%% @spec (This::wxFontPickerCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfontpickerctrl.html#wxfontpickerctrlgetmaxpointsize">external documentation</a>.
+-spec getMaxPointSize(This) -> integer() when
+	This::wxFontPickerCtrl().
 getMaxPointSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxFontPickerCtrl),
   wxe_util:call(?wxFontPickerCtrl_GetMaxPointSize,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxFontPickerCtrl(), Max::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfontpickerctrl.html#wxfontpickerctrlsetmaxpointsize">external documentation</a>.
+-spec setMaxPointSize(This, Max) -> ok when
+	This::wxFontPickerCtrl(), Max::integer().
 setMaxPointSize(#wx_ref{type=ThisT,ref=ThisRef},Max)
  when is_integer(Max) ->
   ?CLASS(ThisT,wxFontPickerCtrl),
   wxe_util:cast(?wxFontPickerCtrl_SetMaxPointSize,
   <<ThisRef:32/?UI,Max:32/?UI>>).
 
-%% @spec (This::wxFontPickerCtrl()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxFontPickerCtrl) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxFontPickerCtrl),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxFontPickerEvent.erl b/lib/wx/src/gen/wxFontPickerEvent.erl
index 6eb456767f..2dc3606409 100644
--- a/lib/wx/src/gen/wxFontPickerEvent.erl
+++ b/lib/wx/src/gen/wxFontPickerEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -40,13 +40,16 @@
   parent_class/1,resumePropagation/2,setInt/2,setString/2,shouldPropagate/1,
   skip/1,skip/2,stopPropagation/1]).
 
+-export_type([wxFontPickerEvent/0]).
 %% @hidden
 parent_class(wxCommandEvent) -> true;
 parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (This::wxFontPickerEvent()) -> wxFont:wxFont()
+-type wxFontPickerEvent() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfontpickerevent.html#wxfontpickereventgetfont">external documentation</a>.
+-spec getFont(This) -> wxFont:wxFont() when
+	This::wxFontPickerEvent().
 getFont(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxFontPickerEvent),
   wxe_util:call(?wxFontPickerEvent_GetFont,
diff --git a/lib/wx/src/gen/wxFrame.erl b/lib/wx/src/gen/wxFrame.erl
index 7e25bc8762..1618af137c 100644
--- a/lib/wx/src/gen/wxFrame.erl
+++ b/lib/wx/src/gen/wxFrame.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -78,27 +78,34 @@
   showFullScreen/3,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
 
+-export_type([wxFrame/0]).
 %% @hidden
 parent_class(wxTopLevelWindow) -> true;
 parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxFrame()
+-type wxFrame() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxframe.html#wxframewxframe">external documentation</a>.
+-spec new() -> wxFrame().
 new() ->
   wxe_util:construct(?wxFrame_new_0,
   <<>>).
 
-%% @spec (Parent::wxWindow:wxWindow(), Id::integer(), Title::string()) -> wxFrame()
 %% @equiv new(Parent,Id,Title, [])
+-spec new(Parent, Id, Title) -> wxFrame() when
+	Parent::wxWindow:wxWindow(), Id::integer(), Title::string().
+
 new(Parent,Id,Title)
  when is_record(Parent, wx_ref),is_integer(Id),is_list(Title) ->
   new(Parent,Id,Title, []).
 
-%% @spec (Parent::wxWindow:wxWindow(), Id::integer(), Title::string(), [Option]) -> wxFrame()
-%% Option = {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxframe.html#wxframewxframe">external documentation</a>.
+-spec new(Parent, Id, Title, [Option]) -> wxFrame() when
+	Parent::wxWindow:wxWindow(), Id::integer(), Title::string(),
+	Option :: {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}.
 new(#wx_ref{type=ParentT,ref=ParentRef},Id,Title, Options)
  when is_integer(Id),is_list(Title),is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -111,15 +118,20 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Id,Title, Options)
   wxe_util:construct(?wxFrame_new_4,
   <<ParentRef:32/?UI,Id:32/?UI,(byte_size(Title_UC)):32/?UI,(Title_UC)/binary, 0:(((8- ((4+byte_size(Title_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxFrame(), Parent::wxWindow:wxWindow(), Id::integer(), Title::string()) -> bool()
 %% @equiv create(This,Parent,Id,Title, [])
+-spec create(This, Parent, Id, Title) -> boolean() when
+	This::wxFrame(), Parent::wxWindow:wxWindow(), Id::integer(), Title::string().
+
 create(This,Parent,Id,Title)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id),is_list(Title) ->
   create(This,Parent,Id,Title, []).
 
-%% @spec (This::wxFrame(), Parent::wxWindow:wxWindow(), Id::integer(), Title::string(), [Option]) -> bool()
-%% Option = {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxframe.html#wxframecreate">external documentation</a>.
+-spec create(This, Parent, Id, Title, [Option]) -> boolean() when
+	This::wxFrame(), Parent::wxWindow:wxWindow(), Id::integer(), Title::string(),
+	Option :: {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}.
 create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id,Title, Options)
  when is_integer(Id),is_list(Title),is_list(Options) ->
   ?CLASS(ThisT,wxFrame),
@@ -133,15 +145,20 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id,Ti
   wxe_util:call(?wxFrame_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI,Id: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, BinOpt/binary>>).
 
-%% @spec (This::wxFrame()) -> wxStatusBar:wxStatusBar()
 %% @equiv createStatusBar(This, [])
+-spec createStatusBar(This) -> wxStatusBar:wxStatusBar() when
+	This::wxFrame().
+
 createStatusBar(This)
  when is_record(This, wx_ref) ->
   createStatusBar(This, []).
 
-%% @spec (This::wxFrame(), [Option]) -> wxStatusBar:wxStatusBar()
-%% Option = {number, integer()} | {style, integer()} | {id, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxframe.html#wxframecreatestatusbar">external documentation</a>.
+-spec createStatusBar(This, [Option]) -> wxStatusBar:wxStatusBar() when
+	This::wxFrame(),
+	Option :: {number, integer()}
+		 | {style, integer()}
+		 | {id, integer()}.
 createStatusBar(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxFrame),
@@ -153,15 +170,19 @@ createStatusBar(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxFrame_CreateStatusBar,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxFrame()) -> wxToolBar:wxToolBar()
 %% @equiv createToolBar(This, [])
+-spec createToolBar(This) -> wxToolBar:wxToolBar() when
+	This::wxFrame().
+
 createToolBar(This)
  when is_record(This, wx_ref) ->
   createToolBar(This, []).
 
-%% @spec (This::wxFrame(), [Option]) -> wxToolBar:wxToolBar()
-%% Option = {style, integer()} | {id, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxframe.html#wxframecreatetoolbar">external documentation</a>.
+-spec createToolBar(This, [Option]) -> wxToolBar:wxToolBar() when
+	This::wxFrame(),
+	Option :: {style, integer()}
+		 | {id, integer()}.
 createToolBar(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxFrame),
@@ -172,89 +193,102 @@ createToolBar(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxFrame_CreateToolBar,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxFrame()) -> {X::integer(), Y::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxframe.html#wxframegetclientareaorigin">external documentation</a>.
+-spec getClientAreaOrigin(This) -> {X::integer(), Y::integer()} when
+	This::wxFrame().
 getClientAreaOrigin(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxFrame),
   wxe_util:call(?wxFrame_GetClientAreaOrigin,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxFrame()) -> wxMenuBar:wxMenuBar()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxframe.html#wxframegetmenubar">external documentation</a>.
+-spec getMenuBar(This) -> wxMenuBar:wxMenuBar() when
+	This::wxFrame().
 getMenuBar(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxFrame),
   wxe_util:call(?wxFrame_GetMenuBar,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxFrame()) -> wxStatusBar:wxStatusBar()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxframe.html#wxframegetstatusbar">external documentation</a>.
+-spec getStatusBar(This) -> wxStatusBar:wxStatusBar() when
+	This::wxFrame().
 getStatusBar(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxFrame),
   wxe_util:call(?wxFrame_GetStatusBar,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxFrame()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxframe.html#wxframegetstatusbarpane">external documentation</a>.
+-spec getStatusBarPane(This) -> integer() when
+	This::wxFrame().
 getStatusBarPane(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxFrame),
   wxe_util:call(?wxFrame_GetStatusBarPane,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxFrame()) -> wxToolBar:wxToolBar()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxframe.html#wxframegettoolbar">external documentation</a>.
+-spec getToolBar(This) -> wxToolBar:wxToolBar() when
+	This::wxFrame().
 getToolBar(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxFrame),
   wxe_util:call(?wxFrame_GetToolBar,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxFrame(), Winid::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxframe.html#wxframeprocesscommand">external documentation</a>.
+-spec processCommand(This, Winid) -> boolean() when
+	This::wxFrame(), Winid::integer().
 processCommand(#wx_ref{type=ThisT,ref=ThisRef},Winid)
  when is_integer(Winid) ->
   ?CLASS(ThisT,wxFrame),
   wxe_util:call(?wxFrame_ProcessCommand,
   <<ThisRef:32/?UI,Winid:32/?UI>>).
 
-%% @spec (This::wxFrame()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxframe.html#wxframesendsizeevent">external documentation</a>.
+-spec sendSizeEvent(This) -> ok when
+	This::wxFrame().
 sendSizeEvent(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxFrame),
   wxe_util:cast(?wxFrame_SendSizeEvent,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxFrame(), Menubar::wxMenuBar:wxMenuBar()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxframe.html#wxframesetmenubar">external documentation</a>.
+-spec setMenuBar(This, Menubar) -> ok when
+	This::wxFrame(), Menubar::wxMenuBar:wxMenuBar().
 setMenuBar(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=MenubarT,ref=MenubarRef}) ->
   ?CLASS(ThisT,wxFrame),
   ?CLASS(MenubarT,wxMenuBar),
   wxe_util:cast(?wxFrame_SetMenuBar,
   <<ThisRef:32/?UI,MenubarRef:32/?UI>>).
 
-%% @spec (This::wxFrame(), Statbar::wxStatusBar:wxStatusBar()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxframe.html#wxframesetstatusbar">external documentation</a>.
+-spec setStatusBar(This, Statbar) -> ok when
+	This::wxFrame(), Statbar::wxStatusBar:wxStatusBar().
 setStatusBar(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=StatbarT,ref=StatbarRef}) ->
   ?CLASS(ThisT,wxFrame),
   ?CLASS(StatbarT,wxStatusBar),
   wxe_util:cast(?wxFrame_SetStatusBar,
   <<ThisRef:32/?UI,StatbarRef:32/?UI>>).
 
-%% @spec (This::wxFrame(), N::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxframe.html#wxframesetstatusbarpane">external documentation</a>.
+-spec setStatusBarPane(This, N) -> ok when
+	This::wxFrame(), N::integer().
 setStatusBarPane(#wx_ref{type=ThisT,ref=ThisRef},N)
  when is_integer(N) ->
   ?CLASS(ThisT,wxFrame),
   wxe_util:cast(?wxFrame_SetStatusBarPane,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @spec (This::wxFrame(), Text::string()) -> ok
 %% @equiv setStatusText(This,Text, [])
+-spec setStatusText(This, Text) -> ok when
+	This::wxFrame(), Text::string().
+
 setStatusText(This,Text)
  when is_record(This, wx_ref),is_list(Text) ->
   setStatusText(This,Text, []).
 
-%% @spec (This::wxFrame(), Text::string(), [Option]) -> ok
-%% Option = {number, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxframe.html#wxframesetstatustext">external documentation</a>.
+-spec setStatusText(This, Text, [Option]) -> ok when
+	This::wxFrame(), Text::string(),
+	Option :: {number, integer()}.
 setStatusText(#wx_ref{type=ThisT,ref=ThisRef},Text, Options)
  when is_list(Text),is_list(Options) ->
   ?CLASS(ThisT,wxFrame),
@@ -265,8 +299,9 @@ setStatusText(#wx_ref{type=ThisT,ref=ThisRef},Text, Options)
   wxe_util:cast(?wxFrame_SetStatusText,
   <<ThisRef:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxFrame(), Widths_field::[integer()]) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxframe.html#wxframesetstatuswidths">external documentation</a>.
+-spec setStatusWidths(This, Widths_field) -> ok when
+	This::wxFrame(), Widths_field::[integer()].
 setStatusWidths(#wx_ref{type=ThisT,ref=ThisRef},Widths_field)
  when is_list(Widths_field) ->
   ?CLASS(ThisT,wxFrame),
@@ -274,16 +309,17 @@ setStatusWidths(#wx_ref{type=ThisT,ref=ThisRef},Widths_field)
   <<ThisRef:32/?UI,(length(Widths_field)):32/?UI,
         (<< <<C:32/?I>> || C <- Widths_field>>)/binary, 0:(((0+length(Widths_field)) rem 2)*32)>>).
 
-%% @spec (This::wxFrame(), Toolbar::wxToolBar:wxToolBar()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxframe.html#wxframesettoolbar">external documentation</a>.
+-spec setToolBar(This, Toolbar) -> ok when
+	This::wxFrame(), Toolbar::wxToolBar:wxToolBar().
 setToolBar(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ToolbarT,ref=ToolbarRef}) ->
   ?CLASS(ThisT,wxFrame),
   ?CLASS(ToolbarT,wxToolBar),
   wxe_util:cast(?wxFrame_SetToolBar,
   <<ThisRef:32/?UI,ToolbarRef:32/?UI>>).
 
-%% @spec (This::wxFrame()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxFrame) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxFrame),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxGBSizerItem.erl b/lib/wx/src/gen/wxGBSizerItem.erl
index 90dd98fdf2..1860e5f808 100644
--- a/lib/wx/src/gen/wxGBSizerItem.erl
+++ b/lib/wx/src/gen/wxGBSizerItem.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -37,10 +37,12 @@
   setMinSize/2,setMinSize/3,setProportion/2,setRatio/2,setRatio/3,setSizer/2,
   setSpacer/2,setSpacer/3,setWindow/2,show/2]).
 
+-export_type([wxGBSizerItem/0]).
 %% @hidden
 parent_class(wxSizerItem) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
+-type wxGBSizerItem() :: wx:wx_object().
  %% From wxSizerItem
 %% @hidden
 show(This,Show) -> wxSizerItem:show(This,Show).
diff --git a/lib/wx/src/gen/wxGLCanvas.erl b/lib/wx/src/gen/wxGLCanvas.erl
index a30d8cefd9..515ccab2ff 100644
--- a/lib/wx/src/gen/wxGLCanvas.erl
+++ b/lib/wx/src/gen/wxGLCanvas.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -68,26 +68,33 @@
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
 
+-export_type([wxGLCanvas/0]).
 %% @hidden
 parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (Parent::wxWindow:wxWindow()) -> wxGLCanvas()
+-type wxGLCanvas() :: wx:wx_object().
 %% @equiv new(Parent, [])
+-spec new(Parent) -> wxGLCanvas() when
+	Parent::wxWindow:wxWindow().
+
 new(Parent)
  when is_record(Parent, wx_ref) ->
   new(Parent, []).
 
-%% @spec (Parent::wxWindow:wxWindow(),X::term()) -> wxGLCanvas()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxglcanvas.html#wxglcanvaswxglcanvas">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% new(Parent::wxWindow:wxWindow(), Shared::wxGLContext:wxGLContext() | wxGLCanvas()) -> new(Parent,Shared, []) </c></p>
-%% <p><c>
-%% new(Parent::wxWindow:wxWindow(), [Option]) -> wxGLCanvas() </c>
-%%<br /> Option = {id, integer()} | {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()} | {name, string()} | {attribList, [integer()]} | {palette, wxPalette:wxPalette()}
-%% </p>
+-spec new(Parent, Shared) -> wxGLCanvas() when
+	Parent::wxWindow:wxWindow(), Shared::wxGLContext:wxGLContext() | wxGLCanvas();
+      (Parent, [Option]) -> wxGLCanvas() when
+	Parent::wxWindow:wxWindow(),
+	Option :: {id, integer()}
+		 | {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}
+		 | {name, string()}
+		 | {attribList, [integer()]}
+		 | {palette, wxPalette:wxPalette()}.
 
 new(Parent,Shared)
  when is_record(Parent, wx_ref),is_record(Shared, wx_ref) ->
@@ -108,9 +115,16 @@ new(#wx_ref{type=ParentT,ref=ParentRef}, Options)
   wxe_util:construct(?wxGLCanvas_new_2,
   <<ParentRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (Parent::wxWindow:wxWindow(), Shared::wxGLContext:wxGLContext() | wxGLCanvas(), [Option]) -> wxGLCanvas()
-%% Option = {id, integer()} | {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()} | {name, string()} | {attribList, [integer()]} | {palette, wxPalette:wxPalette()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxglcanvas.html#wxglcanvaswxglcanvas">external documentation</a>.
+-spec new(Parent, Shared, [Option]) -> wxGLCanvas() when
+	Parent::wxWindow:wxWindow(), Shared::wxGLContext:wxGLContext() | wxGLCanvas(),
+	Option :: {id, integer()}
+		 | {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}
+		 | {name, string()}
+		 | {attribList, [integer()]}
+		 | {palette, wxPalette:wxPalette()}.
 new(#wx_ref{type=ParentT,ref=ParentRef},#wx_ref{type=SharedT,ref=SharedRef}, Options)
  when is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -133,15 +147,17 @@ new(#wx_ref{type=ParentT,ref=ParentRef},#wx_ref{type=SharedT,ref=SharedRef}, Opt
   wxe_util:construct(SharedOP,
   <<ParentRef:32/?UI,SharedRef:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxGLCanvas()) -> wxGLContext:wxGLContext()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxglcanvas.html#wxglcanvasgetcontext">external documentation</a>.
+-spec getContext(This) -> wxGLContext:wxGLContext() when
+	This::wxGLCanvas().
 getContext(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGLCanvas),
   wxe_util:call(?wxGLCanvas_GetContext,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGLCanvas()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxglcanvas.html#wxglcanvassetcurrent">external documentation</a>.
+-spec setCurrent(This) -> ok when
+	This::wxGLCanvas().
 setCurrent(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGLCanvas),
   _Result =  wxe_util:cast(?wxGLCanvas_SetCurrent,
@@ -149,15 +165,16 @@ setCurrent(#wx_ref{type=ThisT,ref=ThisRef}) ->
   {ok, _} = wxe_master:init_opengl(),
   _Result.
 
-%% @spec (This::wxGLCanvas()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxglcanvas.html#wxglcanvasswapbuffers">external documentation</a>.
+-spec swapBuffers(This) -> ok when
+	This::wxGLCanvas().
 swapBuffers(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGLCanvas),
   wxe_util:cast(?wxGLCanvas_SwapBuffers,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGLCanvas()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxGLCanvas) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxGLCanvas),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxGauge.erl b/lib/wx/src/gen/wxGauge.erl
index 484fd36936..bb453b4a8b 100644
--- a/lib/wx/src/gen/wxGauge.erl
+++ b/lib/wx/src/gen/wxGauge.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -71,27 +71,35 @@
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
 
+-export_type([wxGauge/0]).
 %% @hidden
 parent_class(wxControl) -> true;
 parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxGauge()
+-type wxGauge() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgauge.html#wxgaugewxgauge">external documentation</a>.
+-spec new() -> wxGauge().
 new() ->
   wxe_util:construct(?wxGauge_new_0,
   <<>>).
 
-%% @spec (Parent::wxWindow:wxWindow(), Id::integer(), Range::integer()) -> wxGauge()
 %% @equiv new(Parent,Id,Range, [])
+-spec new(Parent, Id, Range) -> wxGauge() when
+	Parent::wxWindow:wxWindow(), Id::integer(), Range::integer().
+
 new(Parent,Id,Range)
  when is_record(Parent, wx_ref),is_integer(Id),is_integer(Range) ->
   new(Parent,Id,Range, []).
 
-%% @spec (Parent::wxWindow:wxWindow(), Id::integer(), Range::integer(), [Option]) -> wxGauge()
-%% Option = {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()} | {validator, wx:wx()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgauge.html#wxgaugewxgauge">external documentation</a>.
+-spec new(Parent, Id, Range, [Option]) -> wxGauge() when
+	Parent::wxWindow:wxWindow(), Id::integer(), Range::integer(),
+	Option :: {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}
+		 | {validator, wx:wx()}.
 new(#wx_ref{type=ParentT,ref=ParentRef},Id,Range, Options)
  when is_integer(Id),is_integer(Range),is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -104,15 +112,21 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Id,Range, Options)
   wxe_util:construct(?wxGauge_new_4,
   <<ParentRef:32/?UI,Id:32/?UI,Range:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxGauge(), Parent::wxWindow:wxWindow(), Id::integer(), Range::integer()) -> bool()
 %% @equiv create(This,Parent,Id,Range, [])
+-spec create(This, Parent, Id, Range) -> boolean() when
+	This::wxGauge(), Parent::wxWindow:wxWindow(), Id::integer(), Range::integer().
+
 create(This,Parent,Id,Range)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id),is_integer(Range) ->
   create(This,Parent,Id,Range, []).
 
-%% @spec (This::wxGauge(), Parent::wxWindow:wxWindow(), Id::integer(), Range::integer(), [Option]) -> bool()
-%% Option = {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()} | {validator, wx:wx()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgauge.html#wxgaugecreate">external documentation</a>.
+-spec create(This, Parent, Id, Range, [Option]) -> boolean() when
+	This::wxGauge(), Parent::wxWindow:wxWindow(), Id::integer(), Range::integer(),
+	Option :: {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}
+		 | {validator, wx:wx()}.
 create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id,Range, Options)
  when is_integer(Id),is_integer(Range),is_list(Options) ->
   ?CLASS(ThisT,wxGauge),
@@ -126,82 +140,92 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id,Ra
   wxe_util:call(?wxGauge_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI,Id:32/?UI,Range:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxGauge()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgauge.html#wxgaugegetbezelface">external documentation</a>.
+-spec getBezelFace(This) -> integer() when
+	This::wxGauge().
 getBezelFace(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGauge),
   wxe_util:call(?wxGauge_GetBezelFace,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGauge()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgauge.html#wxgaugegetrange">external documentation</a>.
+-spec getRange(This) -> integer() when
+	This::wxGauge().
 getRange(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGauge),
   wxe_util:call(?wxGauge_GetRange,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGauge()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgauge.html#wxgaugegetshadowwidth">external documentation</a>.
+-spec getShadowWidth(This) -> integer() when
+	This::wxGauge().
 getShadowWidth(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGauge),
   wxe_util:call(?wxGauge_GetShadowWidth,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGauge()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgauge.html#wxgaugegetvalue">external documentation</a>.
+-spec getValue(This) -> integer() when
+	This::wxGauge().
 getValue(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGauge),
   wxe_util:call(?wxGauge_GetValue,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGauge()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgauge.html#wxgaugeisvertical">external documentation</a>.
+-spec isVertical(This) -> boolean() when
+	This::wxGauge().
 isVertical(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGauge),
   wxe_util:call(?wxGauge_IsVertical,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGauge(), W::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgauge.html#wxgaugesetbezelface">external documentation</a>.
+-spec setBezelFace(This, W) -> ok when
+	This::wxGauge(), W::integer().
 setBezelFace(#wx_ref{type=ThisT,ref=ThisRef},W)
  when is_integer(W) ->
   ?CLASS(ThisT,wxGauge),
   wxe_util:cast(?wxGauge_SetBezelFace,
   <<ThisRef:32/?UI,W:32/?UI>>).
 
-%% @spec (This::wxGauge(), R::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgauge.html#wxgaugesetrange">external documentation</a>.
+-spec setRange(This, R) -> ok when
+	This::wxGauge(), R::integer().
 setRange(#wx_ref{type=ThisT,ref=ThisRef},R)
  when is_integer(R) ->
   ?CLASS(ThisT,wxGauge),
   wxe_util:cast(?wxGauge_SetRange,
   <<ThisRef:32/?UI,R:32/?UI>>).
 
-%% @spec (This::wxGauge(), W::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgauge.html#wxgaugesetshadowwidth">external documentation</a>.
+-spec setShadowWidth(This, W) -> ok when
+	This::wxGauge(), W::integer().
 setShadowWidth(#wx_ref{type=ThisT,ref=ThisRef},W)
  when is_integer(W) ->
   ?CLASS(ThisT,wxGauge),
   wxe_util:cast(?wxGauge_SetShadowWidth,
   <<ThisRef:32/?UI,W:32/?UI>>).
 
-%% @spec (This::wxGauge(), Pos::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgauge.html#wxgaugesetvalue">external documentation</a>.
+-spec setValue(This, Pos) -> ok when
+	This::wxGauge(), Pos::integer().
 setValue(#wx_ref{type=ThisT,ref=ThisRef},Pos)
  when is_integer(Pos) ->
   ?CLASS(ThisT,wxGauge),
   wxe_util:cast(?wxGauge_SetValue,
   <<ThisRef:32/?UI,Pos:32/?UI>>).
 
-%% @spec (This::wxGauge()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgauge.html#wxgaugepulse">external documentation</a>.
+-spec pulse(This) -> ok when
+	This::wxGauge().
 pulse(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGauge),
   wxe_util:cast(?wxGauge_Pulse,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGauge()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxGauge) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxGauge),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxGenericDirCtrl.erl b/lib/wx/src/gen/wxGenericDirCtrl.erl
index 626a454d2a..6ea26e0426 100644
--- a/lib/wx/src/gen/wxGenericDirCtrl.erl
+++ b/lib/wx/src/gen/wxGenericDirCtrl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -72,27 +72,38 @@
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
 
+-export_type([wxGenericDirCtrl/0]).
 %% @hidden
 parent_class(wxControl) -> true;
 parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxGenericDirCtrl()
+-type wxGenericDirCtrl() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgenericdirctrl.html#wxgenericdirctrlwxgenericdirctrl">external documentation</a>.
+-spec new() -> wxGenericDirCtrl().
 new() ->
   wxe_util:construct(?wxGenericDirCtrl_new_0,
   <<>>).
 
-%% @spec (Parent::wxWindow:wxWindow()) -> wxGenericDirCtrl()
 %% @equiv new(Parent, [])
+-spec new(Parent) -> wxGenericDirCtrl() when
+	Parent::wxWindow:wxWindow().
+
 new(Parent)
  when is_record(Parent, wx_ref) ->
   new(Parent, []).
 
-%% @spec (Parent::wxWindow:wxWindow(), [Option]) -> wxGenericDirCtrl()
-%% Option = {id, integer()} | {dir, string()} | {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()} | {filter, string()} | {defaultFilter, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgenericdirctrl.html#wxgenericdirctrlwxgenericdirctrl">external documentation</a>.
+-spec new(Parent, [Option]) -> wxGenericDirCtrl() when
+	Parent::wxWindow:wxWindow(),
+	Option :: {id, integer()}
+		 | {dir, string()}
+		 | {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}
+		 | {filter, string()}
+		 | {defaultFilter, integer()}.
 new(#wx_ref{type=ParentT,ref=ParentRef}, Options)
  when is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -108,15 +119,24 @@ new(#wx_ref{type=ParentT,ref=ParentRef}, Options)
   wxe_util:construct(?wxGenericDirCtrl_new_2,
   <<ParentRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxGenericDirCtrl(), Parent::wxWindow:wxWindow()) -> bool()
 %% @equiv create(This,Parent, [])
+-spec create(This, Parent) -> boolean() when
+	This::wxGenericDirCtrl(), Parent::wxWindow:wxWindow().
+
 create(This,Parent)
  when is_record(This, wx_ref),is_record(Parent, wx_ref) ->
   create(This,Parent, []).
 
-%% @spec (This::wxGenericDirCtrl(), Parent::wxWindow:wxWindow(), [Option]) -> bool()
-%% Option = {id, integer()} | {dir, string()} | {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()} | {filter, string()} | {defaultFilter, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgenericdirctrl.html#wxgenericdirctrlcreate">external documentation</a>.
+-spec create(This, Parent, [Option]) -> boolean() when
+	This::wxGenericDirCtrl(), Parent::wxWindow:wxWindow(),
+	Option :: {id, integer()}
+		 | {dir, string()}
+		 | {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}
+		 | {filter, string()}
+		 | {defaultFilter, integer()}.
 create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxGenericDirCtrl),
@@ -133,22 +153,25 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef}, Opti
   wxe_util:call(?wxGenericDirCtrl_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxGenericDirCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgenericdirctrl.html#wxgenericdirctrlinit">external documentation</a>.
+-spec init(This) -> ok when
+	This::wxGenericDirCtrl().
 init(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGenericDirCtrl),
   wxe_util:cast(?wxGenericDirCtrl_Init,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGenericDirCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgenericdirctrl.html#wxgenericdirctrlcollapsetree">external documentation</a>.
+-spec collapseTree(This) -> ok when
+	This::wxGenericDirCtrl().
 collapseTree(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGenericDirCtrl),
   wxe_util:cast(?wxGenericDirCtrl_CollapseTree,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGenericDirCtrl(), Path::string()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgenericdirctrl.html#wxgenericdirctrlexpandpath">external documentation</a>.
+-spec expandPath(This, Path) -> boolean() when
+	This::wxGenericDirCtrl(), Path::string().
 expandPath(#wx_ref{type=ThisT,ref=ThisRef},Path)
  when is_list(Path) ->
   ?CLASS(ThisT,wxGenericDirCtrl),
@@ -156,64 +179,73 @@ expandPath(#wx_ref{type=ThisT,ref=ThisRef},Path)
   wxe_util:call(?wxGenericDirCtrl_ExpandPath,
   <<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>>).
 
-%% @spec (This::wxGenericDirCtrl()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgenericdirctrl.html#wxgenericdirctrlgetdefaultpath">external documentation</a>.
+-spec getDefaultPath(This) -> string() when
+	This::wxGenericDirCtrl().
 getDefaultPath(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGenericDirCtrl),
   wxe_util:call(?wxGenericDirCtrl_GetDefaultPath,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGenericDirCtrl()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgenericdirctrl.html#wxgenericdirctrlgetpath">external documentation</a>.
+-spec getPath(This) -> string() when
+	This::wxGenericDirCtrl().
 getPath(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGenericDirCtrl),
   wxe_util:call(?wxGenericDirCtrl_GetPath,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGenericDirCtrl()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgenericdirctrl.html#wxgenericdirctrlgetfilepath">external documentation</a>.
+-spec getFilePath(This) -> string() when
+	This::wxGenericDirCtrl().
 getFilePath(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGenericDirCtrl),
   wxe_util:call(?wxGenericDirCtrl_GetFilePath,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGenericDirCtrl()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgenericdirctrl.html#wxgenericdirctrlgetfilter">external documentation</a>.
+-spec getFilter(This) -> string() when
+	This::wxGenericDirCtrl().
 getFilter(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGenericDirCtrl),
   wxe_util:call(?wxGenericDirCtrl_GetFilter,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGenericDirCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgenericdirctrl.html#wxgenericdirctrlgetfilterindex">external documentation</a>.
+-spec getFilterIndex(This) -> integer() when
+	This::wxGenericDirCtrl().
 getFilterIndex(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGenericDirCtrl),
   wxe_util:call(?wxGenericDirCtrl_GetFilterIndex,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGenericDirCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgenericdirctrl.html#wxgenericdirctrlgetrootid">external documentation</a>.
+-spec getRootId(This) -> integer() when
+	This::wxGenericDirCtrl().
 getRootId(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGenericDirCtrl),
   wxe_util:call(?wxGenericDirCtrl_GetRootId,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGenericDirCtrl()) -> wxTreeCtrl:wxTreeCtrl()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgenericdirctrl.html#wxgenericdirctrlgettreectrl">external documentation</a>.
+-spec getTreeCtrl(This) -> wxTreeCtrl:wxTreeCtrl() when
+	This::wxGenericDirCtrl().
 getTreeCtrl(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGenericDirCtrl),
   wxe_util:call(?wxGenericDirCtrl_GetTreeCtrl,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGenericDirCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgenericdirctrl.html#wxgenericdirctrlrecreatetree">external documentation</a>.
+-spec reCreateTree(This) -> ok when
+	This::wxGenericDirCtrl().
 reCreateTree(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGenericDirCtrl),
   wxe_util:cast(?wxGenericDirCtrl_ReCreateTree,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGenericDirCtrl(), Path::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgenericdirctrl.html#wxgenericdirctrlsetdefaultpath">external documentation</a>.
+-spec setDefaultPath(This, Path) -> ok when
+	This::wxGenericDirCtrl(), Path::string().
 setDefaultPath(#wx_ref{type=ThisT,ref=ThisRef},Path)
  when is_list(Path) ->
   ?CLASS(ThisT,wxGenericDirCtrl),
@@ -221,8 +253,9 @@ setDefaultPath(#wx_ref{type=ThisT,ref=ThisRef},Path)
   wxe_util:cast(?wxGenericDirCtrl_SetDefaultPath,
   <<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>>).
 
-%% @spec (This::wxGenericDirCtrl(), Filter::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgenericdirctrl.html#wxgenericdirctrlsetfilter">external documentation</a>.
+-spec setFilter(This, Filter) -> ok when
+	This::wxGenericDirCtrl(), Filter::string().
 setFilter(#wx_ref{type=ThisT,ref=ThisRef},Filter)
  when is_list(Filter) ->
   ?CLASS(ThisT,wxGenericDirCtrl),
@@ -230,16 +263,18 @@ setFilter(#wx_ref{type=ThisT,ref=ThisRef},Filter)
   wxe_util:cast(?wxGenericDirCtrl_SetFilter,
   <<ThisRef:32/?UI,(byte_size(Filter_UC)):32/?UI,(Filter_UC)/binary, 0:(((8- ((0+byte_size(Filter_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxGenericDirCtrl(), N::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgenericdirctrl.html#wxgenericdirctrlsetfilterindex">external documentation</a>.
+-spec setFilterIndex(This, N) -> ok when
+	This::wxGenericDirCtrl(), N::integer().
 setFilterIndex(#wx_ref{type=ThisT,ref=ThisRef},N)
  when is_integer(N) ->
   ?CLASS(ThisT,wxGenericDirCtrl),
   wxe_util:cast(?wxGenericDirCtrl_SetFilterIndex,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @spec (This::wxGenericDirCtrl(), Path::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgenericdirctrl.html#wxgenericdirctrlsetpath">external documentation</a>.
+-spec setPath(This, Path) -> ok when
+	This::wxGenericDirCtrl(), Path::string().
 setPath(#wx_ref{type=ThisT,ref=ThisRef},Path)
  when is_list(Path) ->
   ?CLASS(ThisT,wxGenericDirCtrl),
@@ -247,8 +282,8 @@ setPath(#wx_ref{type=ThisT,ref=ThisRef},Path)
   wxe_util:cast(?wxGenericDirCtrl_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>>).
 
-%% @spec (This::wxGenericDirCtrl()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxGenericDirCtrl) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxGenericDirCtrl),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxGraphicsBrush.erl b/lib/wx/src/gen/wxGraphicsBrush.erl
index e1ad01567d..bbc0c4b1a0 100644
--- a/lib/wx/src/gen/wxGraphicsBrush.erl
+++ b/lib/wx/src/gen/wxGraphicsBrush.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -32,10 +32,12 @@
 %% inherited exports
 -export([getRenderer/1,isNull/1,parent_class/1]).
 
+-export_type([wxGraphicsBrush/0]).
 %% @hidden
 parent_class(wxGraphicsObject) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
+-type wxGraphicsBrush() :: wx:wx_object().
  %% From wxGraphicsObject
 %% @hidden
 isNull(This) -> wxGraphicsObject:isNull(This).
diff --git a/lib/wx/src/gen/wxGraphicsContext.erl b/lib/wx/src/gen/wxGraphicsContext.erl
index 05c56dd4b2..ddbfc92157 100644
--- a/lib/wx/src/gen/wxGraphicsContext.erl
+++ b/lib/wx/src/gen/wxGraphicsContext.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -40,18 +40,21 @@
 %% inherited exports
 -export([getRenderer/1,isNull/1,parent_class/1]).
 
+-export_type([wxGraphicsContext/0]).
 %% @hidden
 parent_class(wxGraphicsObject) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxGraphicsContext()
+-type wxGraphicsContext() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextcreate">external documentation</a>.
+-spec create() -> wxGraphicsContext().
 create() ->
   wxe_util:call(?wxGraphicsContext_Create_0,
   <<>>).
 
-%% @spec (Dc::wxWindowDC:wxWindowDC() | wxWindow:wxWindow()) -> wxGraphicsContext()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextcreate">external documentation</a>.
+-spec create(Dc) -> wxGraphicsContext() when
+	Dc::wxWindowDC:wxWindowDC() | wxWindow:wxWindow().
 create(#wx_ref{type=DcT,ref=DcRef}) ->
   DcOP = case ?CLASS_T(DcT,wxWindowDC) of
      true ->
@@ -62,47 +65,54 @@ create(#wx_ref{type=DcT,ref=DcRef}) ->
   wxe_util:call(DcOP,
   <<DcRef:32/?UI>>).
 
-%% @spec (This::wxGraphicsContext(), Pen::wxPen:wxPen()) -> wxGraphicsPen:wxGraphicsPen()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextcreatepen">external documentation</a>.
+-spec createPen(This, Pen) -> wxGraphicsPen:wxGraphicsPen() when
+	This::wxGraphicsContext(), Pen::wxPen:wxPen().
 createPen(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PenT,ref=PenRef}) ->
   ?CLASS(ThisT,wxGraphicsContext),
   ?CLASS(PenT,wxPen),
   wxe_util:call(?wxGraphicsContext_CreatePen,
   <<ThisRef:32/?UI,PenRef:32/?UI>>).
 
-%% @spec (This::wxGraphicsContext(), Brush::wxBrush:wxBrush()) -> wxGraphicsBrush:wxGraphicsBrush()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextcreatebrush">external documentation</a>.
+-spec createBrush(This, Brush) -> wxGraphicsBrush:wxGraphicsBrush() when
+	This::wxGraphicsContext(), Brush::wxBrush:wxBrush().
 createBrush(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BrushT,ref=BrushRef}) ->
   ?CLASS(ThisT,wxGraphicsContext),
   ?CLASS(BrushT,wxBrush),
   wxe_util:call(?wxGraphicsContext_CreateBrush,
   <<ThisRef:32/?UI,BrushRef:32/?UI>>).
 
-%% @spec (This::wxGraphicsContext(), Xo::float(), Yo::float(), Xc::float(), Yc::float(), Radius::float(), OColor::wx:colour(), CColor::wx:colour()) -> wxGraphicsBrush:wxGraphicsBrush()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextcreateradialgradientbrush">external documentation</a>.
+-spec createRadialGradientBrush(This, Xo, Yo, Xc, Yc, Radius, OColor, CColor) -> wxGraphicsBrush:wxGraphicsBrush() when
+	This::wxGraphicsContext(), Xo::float(), Yo::float(), Xc::float(), Yc::float(), Radius::float(), OColor::wx:wx_colour(), CColor::wx:wx_colour().
 createRadialGradientBrush(#wx_ref{type=ThisT,ref=ThisRef},Xo,Yo,Xc,Yc,Radius,OColor,CColor)
  when is_float(Xo),is_float(Yo),is_float(Xc),is_float(Yc),is_float(Radius),tuple_size(OColor) =:= 3; tuple_size(OColor) =:= 4,tuple_size(CColor) =:= 3; tuple_size(CColor) =:= 4 ->
   ?CLASS(ThisT,wxGraphicsContext),
   wxe_util:call(?wxGraphicsContext_CreateRadialGradientBrush,
   <<ThisRef:32/?UI,0:32,Xo:64/?F,Yo:64/?F,Xc:64/?F,Yc:64/?F,Radius:64/?F,(wxe_util:colour_bin(OColor)):16/binary,(wxe_util:colour_bin(CColor)):16/binary>>).
 
-%% @spec (This::wxGraphicsContext(), X1::float(), Y1::float(), X2::float(), Y2::float(), C1::wx:colour(), C2::wx:colour()) -> wxGraphicsBrush:wxGraphicsBrush()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextcreatelineargradientbrush">external documentation</a>.
+-spec createLinearGradientBrush(This, X1, Y1, X2, Y2, C1, C2) -> wxGraphicsBrush:wxGraphicsBrush() when
+	This::wxGraphicsContext(), X1::float(), Y1::float(), X2::float(), Y2::float(), C1::wx:wx_colour(), C2::wx:wx_colour().
 createLinearGradientBrush(#wx_ref{type=ThisT,ref=ThisRef},X1,Y1,X2,Y2,C1,C2)
  when is_float(X1),is_float(Y1),is_float(X2),is_float(Y2),tuple_size(C1) =:= 3; tuple_size(C1) =:= 4,tuple_size(C2) =:= 3; tuple_size(C2) =:= 4 ->
   ?CLASS(ThisT,wxGraphicsContext),
   wxe_util:call(?wxGraphicsContext_CreateLinearGradientBrush,
   <<ThisRef:32/?UI,0:32,X1:64/?F,Y1:64/?F,X2:64/?F,Y2:64/?F,(wxe_util:colour_bin(C1)):16/binary,(wxe_util:colour_bin(C2)):16/binary>>).
 
-%% @spec (This::wxGraphicsContext(), Font::wxFont:wxFont()) -> wxGraphicsFont:wxGraphicsFont()
 %% @equiv createFont(This,Font, [])
+-spec createFont(This, Font) -> wxGraphicsFont:wxGraphicsFont() when
+	This::wxGraphicsContext(), Font::wxFont:wxFont().
+
 createFont(This,Font)
  when is_record(This, wx_ref),is_record(Font, wx_ref) ->
   createFont(This,Font, []).
 
-%% @spec (This::wxGraphicsContext(), Font::wxFont:wxFont(), [Option]) -> wxGraphicsFont:wxGraphicsFont()
-%% Option = {col, wx:colour()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextcreatefont">external documentation</a>.
+-spec createFont(This, Font, [Option]) -> wxGraphicsFont:wxGraphicsFont() when
+	This::wxGraphicsContext(), Font::wxFont:wxFont(),
+	Option :: {col, wx:wx_colour()}.
 createFont(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FontT,ref=FontRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxGraphicsContext),
@@ -113,15 +123,23 @@ createFont(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FontT,ref=FontRef}, Opti
   wxe_util:call(?wxGraphicsContext_CreateFont,
   <<ThisRef:32/?UI,FontRef:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxGraphicsContext()) -> wxGraphicsMatrix:wxGraphicsMatrix()
 %% @equiv createMatrix(This, [])
+-spec createMatrix(This) -> wxGraphicsMatrix:wxGraphicsMatrix() when
+	This::wxGraphicsContext().
+
 createMatrix(This)
  when is_record(This, wx_ref) ->
   createMatrix(This, []).
 
-%% @spec (This::wxGraphicsContext(), [Option]) -> wxGraphicsMatrix:wxGraphicsMatrix()
-%% Option = {a, float()} | {b, float()} | {c, float()} | {d, float()} | {tx, float()} | {ty, float()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextcreatematrix">external documentation</a>.
+-spec createMatrix(This, [Option]) -> wxGraphicsMatrix:wxGraphicsMatrix() when
+	This::wxGraphicsContext(),
+	Option :: {a, float()}
+		 | {b, float()}
+		 | {c, float()}
+		 | {d, float()}
+		 | {tx, float()}
+		 | {ty, float()}.
 createMatrix(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxGraphicsContext),
@@ -136,38 +154,43 @@ createMatrix(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxGraphicsContext_CreateMatrix,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxGraphicsContext()) -> wxGraphicsPath:wxGraphicsPath()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextcreatepath">external documentation</a>.
+-spec createPath(This) -> wxGraphicsPath:wxGraphicsPath() when
+	This::wxGraphicsContext().
 createPath(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGraphicsContext),
   wxe_util:call(?wxGraphicsContext_CreatePath,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGraphicsContext(), Region::wxRegion:wxRegion()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextclip">external documentation</a>.
+-spec clip(This, Region) -> ok when
+	This::wxGraphicsContext(), Region::wxRegion:wxRegion().
 clip(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=RegionT,ref=RegionRef}) ->
   ?CLASS(ThisT,wxGraphicsContext),
   ?CLASS(RegionT,wxRegion),
   wxe_util:cast(?wxGraphicsContext_Clip_1,
   <<ThisRef:32/?UI,RegionRef:32/?UI>>).
 
-%% @spec (This::wxGraphicsContext(), X::float(), Y::float(), W::float(), H::float()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextclip">external documentation</a>.
+-spec clip(This, X, Y, W, H) -> ok when
+	This::wxGraphicsContext(), X::float(), Y::float(), W::float(), H::float().
 clip(#wx_ref{type=ThisT,ref=ThisRef},X,Y,W,H)
  when is_float(X),is_float(Y),is_float(W),is_float(H) ->
   ?CLASS(ThisT,wxGraphicsContext),
   wxe_util:cast(?wxGraphicsContext_Clip_4,
   <<ThisRef:32/?UI,0:32,X:64/?F,Y:64/?F,W:64/?F,H:64/?F>>).
 
-%% @spec (This::wxGraphicsContext()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextresetclip">external documentation</a>.
+-spec resetClip(This) -> ok when
+	This::wxGraphicsContext().
 resetClip(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGraphicsContext),
   wxe_util:cast(?wxGraphicsContext_ResetClip,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGraphicsContext(), Bmp::wxBitmap:wxBitmap(), X::float(), Y::float(), W::float(), H::float()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextdrawbitmap">external documentation</a>.
+-spec drawBitmap(This, Bmp, X, Y, W, H) -> ok when
+	This::wxGraphicsContext(), Bmp::wxBitmap:wxBitmap(), X::float(), Y::float(), W::float(), H::float().
 drawBitmap(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BmpT,ref=BmpRef},X,Y,W,H)
  when is_float(X),is_float(Y),is_float(W),is_float(H) ->
   ?CLASS(ThisT,wxGraphicsContext),
@@ -175,16 +198,18 @@ drawBitmap(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BmpT,ref=BmpRef},X,Y,W,H
   wxe_util:cast(?wxGraphicsContext_DrawBitmap,
   <<ThisRef:32/?UI,BmpRef:32/?UI,X:64/?F,Y:64/?F,W:64/?F,H:64/?F>>).
 
-%% @spec (This::wxGraphicsContext(), X::float(), Y::float(), W::float(), H::float()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextdrawellipse">external documentation</a>.
+-spec drawEllipse(This, X, Y, W, H) -> ok when
+	This::wxGraphicsContext(), X::float(), Y::float(), W::float(), H::float().
 drawEllipse(#wx_ref{type=ThisT,ref=ThisRef},X,Y,W,H)
  when is_float(X),is_float(Y),is_float(W),is_float(H) ->
   ?CLASS(ThisT,wxGraphicsContext),
   wxe_util:cast(?wxGraphicsContext_DrawEllipse,
   <<ThisRef:32/?UI,0:32,X:64/?F,Y:64/?F,W:64/?F,H:64/?F>>).
 
-%% @spec (This::wxGraphicsContext(), Icon::wxIcon:wxIcon(), X::float(), Y::float(), W::float(), H::float()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextdrawicon">external documentation</a>.
+-spec drawIcon(This, Icon, X, Y, W, H) -> ok when
+	This::wxGraphicsContext(), Icon::wxIcon:wxIcon(), X::float(), Y::float(), W::float(), H::float().
 drawIcon(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=IconT,ref=IconRef},X,Y,W,H)
  when is_float(X),is_float(Y),is_float(W),is_float(H) ->
   ?CLASS(ThisT,wxGraphicsContext),
@@ -192,15 +217,18 @@ drawIcon(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=IconT,ref=IconRef},X,Y,W,H
   wxe_util:cast(?wxGraphicsContext_DrawIcon,
   <<ThisRef:32/?UI,IconRef:32/?UI,X:64/?F,Y:64/?F,W:64/?F,H:64/?F>>).
 
-%% @spec (This::wxGraphicsContext(), N::integer(), Points::{X::float(), Y::float()}) -> ok
 %% @equiv drawLines(This,N,Points, [])
+-spec drawLines(This, N, Points) -> ok when
+	This::wxGraphicsContext(), N::integer(), Points::{X::float(), Y::float()}.
+
 drawLines(This,N,Points={PointsX,PointsY})
  when is_record(This, wx_ref),is_integer(N),is_number(PointsX),is_number(PointsY) ->
   drawLines(This,N,Points, []).
 
-%% @spec (This::wxGraphicsContext(), N::integer(), Points::{X::float(), Y::float()}, [Option]) -> ok
-%% Option = {fillStyle, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextdrawlines">external documentation</a>.
+-spec drawLines(This, N, Points, [Option]) -> ok when
+	This::wxGraphicsContext(), N::integer(), Points::{X::float(), Y::float()},
+	Option :: {fillStyle, integer()}.
 drawLines(#wx_ref{type=ThisT,ref=ThisRef},N,{PointsX,PointsY}, Options)
  when is_integer(N),is_number(PointsX),is_number(PointsY),is_list(Options) ->
   ?CLASS(ThisT,wxGraphicsContext),
@@ -210,15 +238,18 @@ drawLines(#wx_ref{type=ThisT,ref=ThisRef},N,{PointsX,PointsY}, Options)
   wxe_util:cast(?wxGraphicsContext_DrawLines,
   <<ThisRef:32/?UI,N:32/?UI,PointsX:64/float,PointsY:64/float, BinOpt/binary>>).
 
-%% @spec (This::wxGraphicsContext(), Path::wxGraphicsPath:wxGraphicsPath()) -> ok
 %% @equiv drawPath(This,Path, [])
+-spec drawPath(This, Path) -> ok when
+	This::wxGraphicsContext(), Path::wxGraphicsPath:wxGraphicsPath().
+
 drawPath(This,Path)
  when is_record(This, wx_ref),is_record(Path, wx_ref) ->
   drawPath(This,Path, []).
 
-%% @spec (This::wxGraphicsContext(), Path::wxGraphicsPath:wxGraphicsPath(), [Option]) -> ok
-%% Option = {fillStyle, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextdrawpath">external documentation</a>.
+-spec drawPath(This, Path, [Option]) -> ok when
+	This::wxGraphicsContext(), Path::wxGraphicsPath:wxGraphicsPath(),
+	Option :: {fillStyle, integer()}.
 drawPath(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PathT,ref=PathRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxGraphicsContext),
@@ -229,24 +260,27 @@ drawPath(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PathT,ref=PathRef}, Option
   wxe_util:cast(?wxGraphicsContext_DrawPath,
   <<ThisRef:32/?UI,PathRef:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxGraphicsContext(), X::float(), Y::float(), W::float(), H::float()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextdrawrectangle">external documentation</a>.
+-spec drawRectangle(This, X, Y, W, H) -> ok when
+	This::wxGraphicsContext(), X::float(), Y::float(), W::float(), H::float().
 drawRectangle(#wx_ref{type=ThisT,ref=ThisRef},X,Y,W,H)
  when is_float(X),is_float(Y),is_float(W),is_float(H) ->
   ?CLASS(ThisT,wxGraphicsContext),
   wxe_util:cast(?wxGraphicsContext_DrawRectangle,
   <<ThisRef:32/?UI,0:32,X:64/?F,Y:64/?F,W:64/?F,H:64/?F>>).
 
-%% @spec (This::wxGraphicsContext(), X::float(), Y::float(), W::float(), H::float(), Radius::float()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextdrawroundedrectangle">external documentation</a>.
+-spec drawRoundedRectangle(This, X, Y, W, H, Radius) -> ok when
+	This::wxGraphicsContext(), X::float(), Y::float(), W::float(), H::float(), Radius::float().
 drawRoundedRectangle(#wx_ref{type=ThisT,ref=ThisRef},X,Y,W,H,Radius)
  when is_float(X),is_float(Y),is_float(W),is_float(H),is_float(Radius) ->
   ?CLASS(ThisT,wxGraphicsContext),
   wxe_util:cast(?wxGraphicsContext_DrawRoundedRectangle,
   <<ThisRef:32/?UI,0:32,X:64/?F,Y:64/?F,W:64/?F,H:64/?F,Radius:64/?F>>).
 
-%% @spec (This::wxGraphicsContext(), Str::string(), X::float(), Y::float()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextdrawtext">external documentation</a>.
+-spec drawText(This, Str, X, Y) -> ok when
+	This::wxGraphicsContext(), Str::string(), X::float(), Y::float().
 drawText(#wx_ref{type=ThisT,ref=ThisRef},Str,X,Y)
  when is_list(Str),is_float(X),is_float(Y) ->
   ?CLASS(ThisT,wxGraphicsContext),
@@ -254,15 +288,11 @@ drawText(#wx_ref{type=ThisT,ref=ThisRef},Str,X,Y)
   wxe_util:cast(?wxGraphicsContext_DrawText_3,
   <<ThisRef:32/?UI,(byte_size(Str_UC)):32/?UI,(Str_UC)/binary, 0:(((8- ((0+byte_size(Str_UC)) band 16#7)) band 16#7))/unit:8,X:64/?F,Y:64/?F>>).
 
-%% @spec (This::wxGraphicsContext(),Str::string(),X::float(),Y::float(),X::float()|term()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextdrawtext">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% drawText(This::wxGraphicsContext(), Str::string(), X::float(), Y::float(), Angle::float()) -> ok </c>
-%% </p>
-%% <p><c>
-%% drawText(This::wxGraphicsContext(), Str::string(), X::float(), Y::float(), BackgroundBrush::wxGraphicsBrush:wxGraphicsBrush()) -> ok </c>
-%% </p>
+-spec drawText(This, Str, X, Y, Angle) -> ok when
+	This::wxGraphicsContext(), Str::string(), X::float(), Y::float(), Angle::float();
+      (This, Str, X, Y, BackgroundBrush) -> ok when
+	This::wxGraphicsContext(), Str::string(), X::float(), Y::float(), BackgroundBrush::wxGraphicsBrush:wxGraphicsBrush().
 drawText(#wx_ref{type=ThisT,ref=ThisRef},Str,X,Y,Angle)
  when is_list(Str),is_float(X),is_float(Y),is_float(Angle) ->
   ?CLASS(ThisT,wxGraphicsContext),
@@ -277,8 +307,9 @@ drawText(#wx_ref{type=ThisT,ref=ThisRef},Str,X,Y,#wx_ref{type=BackgroundBrushT,r
   wxe_util:cast(?wxGraphicsContext_DrawText_4_1,
   <<ThisRef:32/?UI,(byte_size(Str_UC)):32/?UI,(Str_UC)/binary, 0:(((8- ((0+byte_size(Str_UC)) band 16#7)) band 16#7))/unit:8,X:64/?F,Y:64/?F,BackgroundBrushRef:32/?UI>>).
 
-%% @spec (This::wxGraphicsContext(), Str::string(), X::float(), Y::float(), Angle::float(), BackgroundBrush::wxGraphicsBrush:wxGraphicsBrush()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextdrawtext">external documentation</a>.
+-spec drawText(This, Str, X, Y, Angle, BackgroundBrush) -> ok when
+	This::wxGraphicsContext(), Str::string(), X::float(), Y::float(), Angle::float(), BackgroundBrush::wxGraphicsBrush:wxGraphicsBrush().
 drawText(#wx_ref{type=ThisT,ref=ThisRef},Str,X,Y,Angle,#wx_ref{type=BackgroundBrushT,ref=BackgroundBrushRef})
  when is_list(Str),is_float(X),is_float(Y),is_float(Angle) ->
   ?CLASS(ThisT,wxGraphicsContext),
@@ -287,15 +318,18 @@ drawText(#wx_ref{type=ThisT,ref=ThisRef},Str,X,Y,Angle,#wx_ref{type=BackgroundBr
   wxe_util:cast(?wxGraphicsContext_DrawText_5,
   <<ThisRef:32/?UI,(byte_size(Str_UC)):32/?UI,(Str_UC)/binary, 0:(((8- ((0+byte_size(Str_UC)) band 16#7)) band 16#7))/unit:8,X:64/?F,Y:64/?F,Angle:64/?F,BackgroundBrushRef:32/?UI>>).
 
-%% @spec (This::wxGraphicsContext(), Path::wxGraphicsPath:wxGraphicsPath()) -> ok
 %% @equiv fillPath(This,Path, [])
+-spec fillPath(This, Path) -> ok when
+	This::wxGraphicsContext(), Path::wxGraphicsPath:wxGraphicsPath().
+
 fillPath(This,Path)
  when is_record(This, wx_ref),is_record(Path, wx_ref) ->
   fillPath(This,Path, []).
 
-%% @spec (This::wxGraphicsContext(), Path::wxGraphicsPath:wxGraphicsPath(), [Option]) -> ok
-%% Option = {fillStyle, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextfillpath">external documentation</a>.
+-spec fillPath(This, Path, [Option]) -> ok when
+	This::wxGraphicsContext(), Path::wxGraphicsPath:wxGraphicsPath(),
+	Option :: {fillStyle, integer()}.
 fillPath(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PathT,ref=PathRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxGraphicsContext),
@@ -306,23 +340,26 @@ fillPath(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PathT,ref=PathRef}, Option
   wxe_util:cast(?wxGraphicsContext_FillPath,
   <<ThisRef:32/?UI,PathRef:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxGraphicsContext(), Path::wxGraphicsPath:wxGraphicsPath()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextstrokepath">external documentation</a>.
+-spec strokePath(This, Path) -> ok when
+	This::wxGraphicsContext(), Path::wxGraphicsPath:wxGraphicsPath().
 strokePath(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PathT,ref=PathRef}) ->
   ?CLASS(ThisT,wxGraphicsContext),
   ?CLASS(PathT,wxGraphicsPath),
   wxe_util:cast(?wxGraphicsContext_StrokePath,
   <<ThisRef:32/?UI,PathRef:32/?UI>>).
 
-%% @spec (This::wxGraphicsContext()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextgetnativecontext">external documentation</a>.
+-spec getNativeContext(This) -> ok when
+	This::wxGraphicsContext().
 getNativeContext(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGraphicsContext),
   wxe_util:cast(?wxGraphicsContext_GetNativeContext,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGraphicsContext(), Text::string(), Widths::[float()]) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextgetpartialtextextents">external documentation</a>.
+-spec getPartialTextExtents(This, Text, Widths) -> ok when
+	This::wxGraphicsContext(), Text::string(), Widths::[float()].
 getPartialTextExtents(#wx_ref{type=ThisT,ref=ThisRef},Text,Widths)
  when is_list(Text),is_list(Widths) ->
   ?CLASS(ThisT,wxGraphicsContext),
@@ -331,8 +368,10 @@ getPartialTextExtents(#wx_ref{type=ThisT,ref=ThisRef},Text,Widths)
   <<ThisRef:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8,(length(Widths)):32/?UI,
 0:32,  (<< <<C:64/float>> || C <- Widths>>)/binary>>).
 
-%% @spec (This::wxGraphicsContext(), Text::string()) -> {Width::float(), Height::float(), Descent::float(), ExternalLeading::float()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextgettextextent">external documentation</a>.
+-spec getTextExtent(This, Text) -> Result when
+	Result ::{Width::float(), Height::float(), Descent::float(), ExternalLeading::float()},
+	This::wxGraphicsContext(), Text::string().
 getTextExtent(#wx_ref{type=ThisT,ref=ThisRef},Text)
  when is_list(Text) ->
   ?CLASS(ThisT,wxGraphicsContext),
@@ -340,55 +379,62 @@ getTextExtent(#wx_ref{type=ThisT,ref=ThisRef},Text)
   wxe_util:call(?wxGraphicsContext_GetTextExtent,
   <<ThisRef:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxGraphicsContext(), Angle::float()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextrotate">external documentation</a>.
+-spec rotate(This, Angle) -> ok when
+	This::wxGraphicsContext(), Angle::float().
 rotate(#wx_ref{type=ThisT,ref=ThisRef},Angle)
  when is_float(Angle) ->
   ?CLASS(ThisT,wxGraphicsContext),
   wxe_util:cast(?wxGraphicsContext_Rotate,
   <<ThisRef:32/?UI,0:32,Angle:64/?F>>).
 
-%% @spec (This::wxGraphicsContext(), XScale::float(), YScale::float()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextscale">external documentation</a>.
+-spec scale(This, XScale, YScale) -> ok when
+	This::wxGraphicsContext(), XScale::float(), YScale::float().
 scale(#wx_ref{type=ThisT,ref=ThisRef},XScale,YScale)
  when is_float(XScale),is_float(YScale) ->
   ?CLASS(ThisT,wxGraphicsContext),
   wxe_util:cast(?wxGraphicsContext_Scale,
   <<ThisRef:32/?UI,0:32,XScale:64/?F,YScale:64/?F>>).
 
-%% @spec (This::wxGraphicsContext(), Dx::float(), Dy::float()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontexttranslate">external documentation</a>.
+-spec translate(This, Dx, Dy) -> ok when
+	This::wxGraphicsContext(), Dx::float(), Dy::float().
 translate(#wx_ref{type=ThisT,ref=ThisRef},Dx,Dy)
  when is_float(Dx),is_float(Dy) ->
   ?CLASS(ThisT,wxGraphicsContext),
   wxe_util:cast(?wxGraphicsContext_Translate,
   <<ThisRef:32/?UI,0:32,Dx:64/?F,Dy:64/?F>>).
 
-%% @spec (This::wxGraphicsContext()) -> wxGraphicsMatrix:wxGraphicsMatrix()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextgettransform">external documentation</a>.
+-spec getTransform(This) -> wxGraphicsMatrix:wxGraphicsMatrix() when
+	This::wxGraphicsContext().
 getTransform(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGraphicsContext),
   wxe_util:call(?wxGraphicsContext_GetTransform,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGraphicsContext(), Matrix::wxGraphicsMatrix:wxGraphicsMatrix()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextsettransform">external documentation</a>.
+-spec setTransform(This, Matrix) -> ok when
+	This::wxGraphicsContext(), Matrix::wxGraphicsMatrix:wxGraphicsMatrix().
 setTransform(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=MatrixT,ref=MatrixRef}) ->
   ?CLASS(ThisT,wxGraphicsContext),
   ?CLASS(MatrixT,wxGraphicsMatrix),
   wxe_util:cast(?wxGraphicsContext_SetTransform,
   <<ThisRef:32/?UI,MatrixRef:32/?UI>>).
 
-%% @spec (This::wxGraphicsContext(), Matrix::wxGraphicsMatrix:wxGraphicsMatrix()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextconcattransform">external documentation</a>.
+-spec concatTransform(This, Matrix) -> ok when
+	This::wxGraphicsContext(), Matrix::wxGraphicsMatrix:wxGraphicsMatrix().
 concatTransform(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=MatrixT,ref=MatrixRef}) ->
   ?CLASS(ThisT,wxGraphicsContext),
   ?CLASS(MatrixT,wxGraphicsMatrix),
   wxe_util:cast(?wxGraphicsContext_ConcatTransform,
   <<ThisRef:32/?UI,MatrixRef:32/?UI>>).
 
-%% @spec (This::wxGraphicsContext(), Brush::wxGraphicsBrush:wxGraphicsBrush() | wxBrush:wxBrush()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextsetbrush">external documentation</a>.
+-spec setBrush(This, Brush) -> ok when
+	This::wxGraphicsContext(), Brush::wxGraphicsBrush:wxGraphicsBrush() | wxBrush:wxBrush().
 setBrush(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BrushT,ref=BrushRef}) ->
   ?CLASS(ThisT,wxGraphicsContext),
   BrushOP = case ?CLASS_T(BrushT,wxGraphicsBrush) of
@@ -400,16 +446,18 @@ setBrush(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BrushT,ref=BrushRef}) ->
   wxe_util:cast(BrushOP,
   <<ThisRef:32/?UI,BrushRef:32/?UI>>).
 
-%% @spec (This::wxGraphicsContext(), Font::wxGraphicsFont:wxGraphicsFont()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextsetfont">external documentation</a>.
+-spec setFont(This, Font) -> ok when
+	This::wxGraphicsContext(), Font::wxGraphicsFont:wxGraphicsFont().
 setFont(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FontT,ref=FontRef}) ->
   ?CLASS(ThisT,wxGraphicsContext),
   ?CLASS(FontT,wxGraphicsFont),
   wxe_util:cast(?wxGraphicsContext_SetFont_1,
   <<ThisRef:32/?UI,FontRef:32/?UI>>).
 
-%% @spec (This::wxGraphicsContext(), Font::wxFont:wxFont(), Colour::wx:colour()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextsetfont">external documentation</a>.
+-spec setFont(This, Font, Colour) -> ok when
+	This::wxGraphicsContext(), Font::wxFont:wxFont(), Colour::wx:wx_colour().
 setFont(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FontT,ref=FontRef},Colour)
  when tuple_size(Colour) =:= 3; tuple_size(Colour) =:= 4 ->
   ?CLASS(ThisT,wxGraphicsContext),
@@ -417,8 +465,9 @@ setFont(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FontT,ref=FontRef},Colour)
   wxe_util:cast(?wxGraphicsContext_SetFont_2,
   <<ThisRef:32/?UI,FontRef:32/?UI,(wxe_util:colour_bin(Colour)):16/binary>>).
 
-%% @spec (This::wxGraphicsContext(), Pen::wxPen:wxPen() | wxGraphicsPen:wxGraphicsPen()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextsetpen">external documentation</a>.
+-spec setPen(This, Pen) -> ok when
+	This::wxGraphicsContext(), Pen::wxPen:wxPen() | wxGraphicsPen:wxGraphicsPen().
 setPen(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PenT,ref=PenRef}) ->
   ?CLASS(ThisT,wxGraphicsContext),
   PenOP = case ?CLASS_T(PenT,wxPen) of
@@ -430,24 +479,27 @@ setPen(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PenT,ref=PenRef}) ->
   wxe_util:cast(PenOP,
   <<ThisRef:32/?UI,PenRef:32/?UI>>).
 
-%% @spec (This::wxGraphicsContext(), X1::float(), Y1::float(), X2::float(), Y2::float()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextstrokeline">external documentation</a>.
+-spec strokeLine(This, X1, Y1, X2, Y2) -> ok when
+	This::wxGraphicsContext(), X1::float(), Y1::float(), X2::float(), Y2::float().
 strokeLine(#wx_ref{type=ThisT,ref=ThisRef},X1,Y1,X2,Y2)
  when is_float(X1),is_float(Y1),is_float(X2),is_float(Y2) ->
   ?CLASS(ThisT,wxGraphicsContext),
   wxe_util:cast(?wxGraphicsContext_StrokeLine,
   <<ThisRef:32/?UI,0:32,X1:64/?F,Y1:64/?F,X2:64/?F,Y2:64/?F>>).
 
-%% @spec (This::wxGraphicsContext(), N::integer(), Points::{X::float(), Y::float()}) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextstrokelines">external documentation</a>.
+-spec strokeLines(This, N, Points) -> ok when
+	This::wxGraphicsContext(), N::integer(), Points::{X::float(), Y::float()}.
 strokeLines(#wx_ref{type=ThisT,ref=ThisRef},N,{PointsX,PointsY})
  when is_integer(N),is_number(PointsX),is_number(PointsY) ->
   ?CLASS(ThisT,wxGraphicsContext),
   wxe_util:cast(?wxGraphicsContext_StrokeLines_2,
   <<ThisRef:32/?UI,N:32/?UI,PointsX:64/float,PointsY:64/float>>).
 
-%% @spec (This::wxGraphicsContext(), N::integer(), BeginPoints::{X::float(), Y::float()}, EndPoints::{X::float(), Y::float()}) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextstrokelines">external documentation</a>.
+-spec strokeLines(This, N, BeginPoints, EndPoints) -> ok when
+	This::wxGraphicsContext(), N::integer(), BeginPoints::{X::float(), Y::float()}, EndPoints::{X::float(), Y::float()}.
 strokeLines(#wx_ref{type=ThisT,ref=ThisRef},N,{BeginPointsX,BeginPointsY},{EndPointsX,EndPointsY})
  when is_integer(N),is_number(BeginPointsX),is_number(BeginPointsY),is_number(EndPointsX),is_number(EndPointsY) ->
   ?CLASS(ThisT,wxGraphicsContext),
diff --git a/lib/wx/src/gen/wxGraphicsFont.erl b/lib/wx/src/gen/wxGraphicsFont.erl
index 19b2172176..03220599fb 100644
--- a/lib/wx/src/gen/wxGraphicsFont.erl
+++ b/lib/wx/src/gen/wxGraphicsFont.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -32,10 +32,12 @@
 %% inherited exports
 -export([getRenderer/1,isNull/1,parent_class/1]).
 
+-export_type([wxGraphicsFont/0]).
 %% @hidden
 parent_class(wxGraphicsObject) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
+-type wxGraphicsFont() :: wx:wx_object().
  %% From wxGraphicsObject
 %% @hidden
 isNull(This) -> wxGraphicsObject:isNull(This).
diff --git a/lib/wx/src/gen/wxGraphicsMatrix.erl b/lib/wx/src/gen/wxGraphicsMatrix.erl
index 635a2027b3..6cf4257530 100644
--- a/lib/wx/src/gen/wxGraphicsMatrix.erl
+++ b/lib/wx/src/gen/wxGraphicsMatrix.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -33,87 +33,107 @@
 %% inherited exports
 -export([getRenderer/1,isNull/1,parent_class/1]).
 
+-export_type([wxGraphicsMatrix/0]).
 %% @hidden
 parent_class(wxGraphicsObject) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (This::wxGraphicsMatrix(), T::wxGraphicsMatrix()) -> ok
+-type wxGraphicsMatrix() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicsmatrix.html#wxgraphicsmatrixconcat">external documentation</a>.
+-spec concat(This, T) -> ok when
+	This::wxGraphicsMatrix(), T::wxGraphicsMatrix().
 concat(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=TT,ref=TRef}) ->
   ?CLASS(ThisT,wxGraphicsMatrix),
   ?CLASS(TT,wxGraphicsMatrix),
   wxe_util:cast(?wxGraphicsMatrix_Concat,
   <<ThisRef:32/?UI,TRef:32/?UI>>).
 
-%% @spec (This::wxGraphicsMatrix()) -> {A::float(), B::float(), C::float(), D::float(), Tx::float(), Ty::float()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicsmatrix.html#wxgraphicsmatrixget">external documentation</a>.
+-spec get(This) -> Result when
+	Result ::{A::float(), B::float(), C::float(), D::float(), Tx::float(), Ty::float()},
+	This::wxGraphicsMatrix().
 get(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGraphicsMatrix),
   wxe_util:call(?wxGraphicsMatrix_Get,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGraphicsMatrix()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicsmatrix.html#wxgraphicsmatrixgetnativematrix">external documentation</a>.
+-spec getNativeMatrix(This) -> ok when
+	This::wxGraphicsMatrix().
 getNativeMatrix(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGraphicsMatrix),
   wxe_util:cast(?wxGraphicsMatrix_GetNativeMatrix,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGraphicsMatrix()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicsmatrix.html#wxgraphicsmatrixinvert">external documentation</a>.
+-spec invert(This) -> ok when
+	This::wxGraphicsMatrix().
 invert(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGraphicsMatrix),
   wxe_util:cast(?wxGraphicsMatrix_Invert,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGraphicsMatrix(), T::wxGraphicsMatrix()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicsmatrix.html#wxgraphicsmatrixisequal">external documentation</a>.
+-spec isEqual(This, T) -> boolean() when
+	This::wxGraphicsMatrix(), T::wxGraphicsMatrix().
 isEqual(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=TT,ref=TRef}) ->
   ?CLASS(ThisT,wxGraphicsMatrix),
   ?CLASS(TT,wxGraphicsMatrix),
   wxe_util:call(?wxGraphicsMatrix_IsEqual,
   <<ThisRef:32/?UI,TRef:32/?UI>>).
 
-%% @spec (This::wxGraphicsMatrix()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicsmatrix.html#wxgraphicsmatrixisidentity">external documentation</a>.
+-spec isIdentity(This) -> boolean() when
+	This::wxGraphicsMatrix().
 isIdentity(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGraphicsMatrix),
   wxe_util:call(?wxGraphicsMatrix_IsIdentity,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGraphicsMatrix(), Angle::float()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicsmatrix.html#wxgraphicsmatrixrotate">external documentation</a>.
+-spec rotate(This, Angle) -> ok when
+	This::wxGraphicsMatrix(), Angle::float().
 rotate(#wx_ref{type=ThisT,ref=ThisRef},Angle)
  when is_float(Angle) ->
   ?CLASS(ThisT,wxGraphicsMatrix),
   wxe_util:cast(?wxGraphicsMatrix_Rotate,
   <<ThisRef:32/?UI,0:32,Angle:64/?F>>).
 
-%% @spec (This::wxGraphicsMatrix(), XScale::float(), YScale::float()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicsmatrix.html#wxgraphicsmatrixscale">external documentation</a>.
+-spec scale(This, XScale, YScale) -> ok when
+	This::wxGraphicsMatrix(), XScale::float(), YScale::float().
 scale(#wx_ref{type=ThisT,ref=ThisRef},XScale,YScale)
  when is_float(XScale),is_float(YScale) ->
   ?CLASS(ThisT,wxGraphicsMatrix),
   wxe_util:cast(?wxGraphicsMatrix_Scale,
   <<ThisRef:32/?UI,0:32,XScale:64/?F,YScale:64/?F>>).
 
-%% @spec (This::wxGraphicsMatrix(), Dx::float(), Dy::float()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicsmatrix.html#wxgraphicsmatrixtranslate">external documentation</a>.
+-spec translate(This, Dx, Dy) -> ok when
+	This::wxGraphicsMatrix(), Dx::float(), Dy::float().
 translate(#wx_ref{type=ThisT,ref=ThisRef},Dx,Dy)
  when is_float(Dx),is_float(Dy) ->
   ?CLASS(ThisT,wxGraphicsMatrix),
   wxe_util:cast(?wxGraphicsMatrix_Translate,
   <<ThisRef:32/?UI,0:32,Dx:64/?F,Dy:64/?F>>).
 
-%% @spec (This::wxGraphicsMatrix()) -> ok
 %% @equiv set(This, [])
+-spec set(This) -> ok when
+	This::wxGraphicsMatrix().
+
 set(This)
  when is_record(This, wx_ref) ->
   set(This, []).
 
-%% @spec (This::wxGraphicsMatrix(), [Option]) -> ok
-%% Option = {a, float()} | {b, float()} | {c, float()} | {d, float()} | {tx, float()} | {ty, float()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicsmatrix.html#wxgraphicsmatrixset">external documentation</a>.
+-spec set(This, [Option]) -> ok when
+	This::wxGraphicsMatrix(),
+	Option :: {a, float()}
+		 | {b, float()}
+		 | {c, float()}
+		 | {d, float()}
+		 | {tx, float()}
+		 | {ty, float()}.
 set(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxGraphicsMatrix),
@@ -128,15 +148,17 @@ set(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxGraphicsMatrix_Set,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxGraphicsMatrix()) -> {X::float(), Y::float()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicsmatrix.html#wxgraphicsmatrixtransformpoint">external documentation</a>.
+-spec transformPoint(This) -> {X::float(), Y::float()} when
+	This::wxGraphicsMatrix().
 transformPoint(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGraphicsMatrix),
   wxe_util:call(?wxGraphicsMatrix_TransformPoint,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGraphicsMatrix()) -> {Dx::float(), Dy::float()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicsmatrix.html#wxgraphicsmatrixtransformdistance">external documentation</a>.
+-spec transformDistance(This) -> {Dx::float(), Dy::float()} when
+	This::wxGraphicsMatrix().
 transformDistance(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGraphicsMatrix),
   wxe_util:call(?wxGraphicsMatrix_TransformDistance,
diff --git a/lib/wx/src/gen/wxGraphicsObject.erl b/lib/wx/src/gen/wxGraphicsObject.erl
index 7e63285b7a..e2e082ff91 100644
--- a/lib/wx/src/gen/wxGraphicsObject.erl
+++ b/lib/wx/src/gen/wxGraphicsObject.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -29,18 +29,22 @@
 %% inherited exports
 -export([parent_class/1]).
 
+-export_type([wxGraphicsObject/0]).
 %% @hidden
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (This::wxGraphicsObject()) -> wxGraphicsRenderer:wxGraphicsRenderer()
+-type wxGraphicsObject() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicsobject.html#wxgraphicsobjectgetrenderer">external documentation</a>.
+-spec getRenderer(This) -> wxGraphicsRenderer:wxGraphicsRenderer() when
+	This::wxGraphicsObject().
 getRenderer(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGraphicsObject),
   wxe_util:call(?wxGraphicsObject_GetRenderer,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGraphicsObject()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicsobject.html#wxgraphicsobjectisnull">external documentation</a>.
+-spec isNull(This) -> boolean() when
+	This::wxGraphicsObject().
 isNull(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGraphicsObject),
   wxe_util:call(?wxGraphicsObject_IsNull,
diff --git a/lib/wx/src/gen/wxGraphicsPath.erl b/lib/wx/src/gen/wxGraphicsPath.erl
index e41496c641..6e9af755b9 100644
--- a/lib/wx/src/gen/wxGraphicsPath.erl
+++ b/lib/wx/src/gen/wxGraphicsPath.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -36,152 +36,169 @@
 %% inherited exports
 -export([getRenderer/1,isNull/1,parent_class/1]).
 
+-export_type([wxGraphicsPath/0]).
 %% @hidden
 parent_class(wxGraphicsObject) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (This::wxGraphicsPath(), P::{X::float(), Y::float()}) -> ok
+-type wxGraphicsPath() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicspath.html#wxgraphicspathmovetopoint">external documentation</a>.
+-spec moveToPoint(This, P) -> ok when
+	This::wxGraphicsPath(), P::{X::float(), Y::float()}.
 moveToPoint(#wx_ref{type=ThisT,ref=ThisRef},{PX,PY})
  when is_number(PX),is_number(PY) ->
   ?CLASS(ThisT,wxGraphicsPath),
   wxe_util:cast(?wxGraphicsPath_MoveToPoint_1,
   <<ThisRef:32/?UI,0:32,PX:64/float,PY:64/float>>).
 
-%% @spec (This::wxGraphicsPath(), X::float(), Y::float()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicspath.html#wxgraphicspathmovetopoint">external documentation</a>.
+-spec moveToPoint(This, X, Y) -> ok when
+	This::wxGraphicsPath(), X::float(), Y::float().
 moveToPoint(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
  when is_float(X),is_float(Y) ->
   ?CLASS(ThisT,wxGraphicsPath),
   wxe_util:cast(?wxGraphicsPath_MoveToPoint_2,
   <<ThisRef:32/?UI,0:32,X:64/?F,Y:64/?F>>).
 
-%% @spec (This::wxGraphicsPath(), C::{X::float(), Y::float()}, R::float(), StartAngle::float(), EndAngle::float(), Clockwise::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicspath.html#wxgraphicspathaddarc">external documentation</a>.
+-spec addArc(This, C, R, StartAngle, EndAngle, Clockwise) -> ok when
+	This::wxGraphicsPath(), C::{X::float(), Y::float()}, R::float(), StartAngle::float(), EndAngle::float(), Clockwise::boolean().
 addArc(#wx_ref{type=ThisT,ref=ThisRef},{CX,CY},R,StartAngle,EndAngle,Clockwise)
  when is_number(CX),is_number(CY),is_float(R),is_float(StartAngle),is_float(EndAngle),is_boolean(Clockwise) ->
   ?CLASS(ThisT,wxGraphicsPath),
   wxe_util:cast(?wxGraphicsPath_AddArc_5,
   <<ThisRef:32/?UI,0:32,CX:64/float,CY:64/float,R:64/?F,StartAngle:64/?F,EndAngle:64/?F,(wxe_util:from_bool(Clockwise)):32/?UI>>).
 
-%% @spec (This::wxGraphicsPath(), X::float(), Y::float(), R::float(), StartAngle::float(), EndAngle::float(), Clockwise::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicspath.html#wxgraphicspathaddarc">external documentation</a>.
+-spec addArc(This, X, Y, R, StartAngle, EndAngle, Clockwise) -> ok when
+	This::wxGraphicsPath(), X::float(), Y::float(), R::float(), StartAngle::float(), EndAngle::float(), Clockwise::boolean().
 addArc(#wx_ref{type=ThisT,ref=ThisRef},X,Y,R,StartAngle,EndAngle,Clockwise)
  when is_float(X),is_float(Y),is_float(R),is_float(StartAngle),is_float(EndAngle),is_boolean(Clockwise) ->
   ?CLASS(ThisT,wxGraphicsPath),
   wxe_util:cast(?wxGraphicsPath_AddArc_6,
   <<ThisRef:32/?UI,0:32,X:64/?F,Y:64/?F,R:64/?F,StartAngle:64/?F,EndAngle:64/?F,(wxe_util:from_bool(Clockwise)):32/?UI>>).
 
-%% @spec (This::wxGraphicsPath(), X1::float(), Y1::float(), X2::float(), Y2::float(), R::float()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicspath.html#wxgraphicspathaddarctopoint">external documentation</a>.
+-spec addArcToPoint(This, X1, Y1, X2, Y2, R) -> ok when
+	This::wxGraphicsPath(), X1::float(), Y1::float(), X2::float(), Y2::float(), R::float().
 addArcToPoint(#wx_ref{type=ThisT,ref=ThisRef},X1,Y1,X2,Y2,R)
  when is_float(X1),is_float(Y1),is_float(X2),is_float(Y2),is_float(R) ->
   ?CLASS(ThisT,wxGraphicsPath),
   wxe_util:cast(?wxGraphicsPath_AddArcToPoint,
   <<ThisRef:32/?UI,0:32,X1:64/?F,Y1:64/?F,X2:64/?F,Y2:64/?F,R:64/?F>>).
 
-%% @spec (This::wxGraphicsPath(), X::float(), Y::float(), R::float()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicspath.html#wxgraphicspathaddcircle">external documentation</a>.
+-spec addCircle(This, X, Y, R) -> ok when
+	This::wxGraphicsPath(), X::float(), Y::float(), R::float().
 addCircle(#wx_ref{type=ThisT,ref=ThisRef},X,Y,R)
  when is_float(X),is_float(Y),is_float(R) ->
   ?CLASS(ThisT,wxGraphicsPath),
   wxe_util:cast(?wxGraphicsPath_AddCircle,
   <<ThisRef:32/?UI,0:32,X:64/?F,Y:64/?F,R:64/?F>>).
 
-%% @spec (This::wxGraphicsPath(), C1::{X::float(), Y::float()}, C2::{X::float(), Y::float()}, E::{X::float(), Y::float()}) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicspath.html#wxgraphicspathaddcurvetopoint">external documentation</a>.
+-spec addCurveToPoint(This, C1, C2, E) -> ok when
+	This::wxGraphicsPath(), C1::{X::float(), Y::float()}, C2::{X::float(), Y::float()}, E::{X::float(), Y::float()}.
 addCurveToPoint(#wx_ref{type=ThisT,ref=ThisRef},{C1X,C1Y},{C2X,C2Y},{EX,EY})
  when is_number(C1X),is_number(C1Y),is_number(C2X),is_number(C2Y),is_number(EX),is_number(EY) ->
   ?CLASS(ThisT,wxGraphicsPath),
   wxe_util:cast(?wxGraphicsPath_AddCurveToPoint_3,
   <<ThisRef:32/?UI,0:32,C1X:64/float,C1Y:64/float,C2X:64/float,C2Y:64/float,EX:64/float,EY:64/float>>).
 
-%% @spec (This::wxGraphicsPath(), Cx1::float(), Cy1::float(), Cx2::float(), Cy2::float(), X::float(), Y::float()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicspath.html#wxgraphicspathaddcurvetopoint">external documentation</a>.
+-spec addCurveToPoint(This, Cx1, Cy1, Cx2, Cy2, X, Y) -> ok when
+	This::wxGraphicsPath(), Cx1::float(), Cy1::float(), Cx2::float(), Cy2::float(), X::float(), Y::float().
 addCurveToPoint(#wx_ref{type=ThisT,ref=ThisRef},Cx1,Cy1,Cx2,Cy2,X,Y)
  when is_float(Cx1),is_float(Cy1),is_float(Cx2),is_float(Cy2),is_float(X),is_float(Y) ->
   ?CLASS(ThisT,wxGraphicsPath),
   wxe_util:cast(?wxGraphicsPath_AddCurveToPoint_6,
   <<ThisRef:32/?UI,0:32,Cx1:64/?F,Cy1:64/?F,Cx2:64/?F,Cy2:64/?F,X:64/?F,Y:64/?F>>).
 
-%% @spec (This::wxGraphicsPath(), X::float(), Y::float(), W::float(), H::float()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicspath.html#wxgraphicspathaddellipse">external documentation</a>.
+-spec addEllipse(This, X, Y, W, H) -> ok when
+	This::wxGraphicsPath(), X::float(), Y::float(), W::float(), H::float().
 addEllipse(#wx_ref{type=ThisT,ref=ThisRef},X,Y,W,H)
  when is_float(X),is_float(Y),is_float(W),is_float(H) ->
   ?CLASS(ThisT,wxGraphicsPath),
   wxe_util:cast(?wxGraphicsPath_AddEllipse,
   <<ThisRef:32/?UI,0:32,X:64/?F,Y:64/?F,W:64/?F,H:64/?F>>).
 
-%% @spec (This::wxGraphicsPath(), P::{X::float(), Y::float()}) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicspath.html#wxgraphicspathaddlinetopoint">external documentation</a>.
+-spec addLineToPoint(This, P) -> ok when
+	This::wxGraphicsPath(), P::{X::float(), Y::float()}.
 addLineToPoint(#wx_ref{type=ThisT,ref=ThisRef},{PX,PY})
  when is_number(PX),is_number(PY) ->
   ?CLASS(ThisT,wxGraphicsPath),
   wxe_util:cast(?wxGraphicsPath_AddLineToPoint_1,
   <<ThisRef:32/?UI,0:32,PX:64/float,PY:64/float>>).
 
-%% @spec (This::wxGraphicsPath(), X::float(), Y::float()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicspath.html#wxgraphicspathaddlinetopoint">external documentation</a>.
+-spec addLineToPoint(This, X, Y) -> ok when
+	This::wxGraphicsPath(), X::float(), Y::float().
 addLineToPoint(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
  when is_float(X),is_float(Y) ->
   ?CLASS(ThisT,wxGraphicsPath),
   wxe_util:cast(?wxGraphicsPath_AddLineToPoint_2,
   <<ThisRef:32/?UI,0:32,X:64/?F,Y:64/?F>>).
 
-%% @spec (This::wxGraphicsPath(), Path::wxGraphicsPath()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicspath.html#wxgraphicspathaddpath">external documentation</a>.
+-spec addPath(This, Path) -> ok when
+	This::wxGraphicsPath(), Path::wxGraphicsPath().
 addPath(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PathT,ref=PathRef}) ->
   ?CLASS(ThisT,wxGraphicsPath),
   ?CLASS(PathT,wxGraphicsPath),
   wxe_util:cast(?wxGraphicsPath_AddPath,
   <<ThisRef:32/?UI,PathRef:32/?UI>>).
 
-%% @spec (This::wxGraphicsPath(), Cx::float(), Cy::float(), X::float(), Y::float()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicspath.html#wxgraphicspathaddquadcurvetopoint">external documentation</a>.
+-spec addQuadCurveToPoint(This, Cx, Cy, X, Y) -> ok when
+	This::wxGraphicsPath(), Cx::float(), Cy::float(), X::float(), Y::float().
 addQuadCurveToPoint(#wx_ref{type=ThisT,ref=ThisRef},Cx,Cy,X,Y)
  when is_float(Cx),is_float(Cy),is_float(X),is_float(Y) ->
   ?CLASS(ThisT,wxGraphicsPath),
   wxe_util:cast(?wxGraphicsPath_AddQuadCurveToPoint,
   <<ThisRef:32/?UI,0:32,Cx:64/?F,Cy:64/?F,X:64/?F,Y:64/?F>>).
 
-%% @spec (This::wxGraphicsPath(), X::float(), Y::float(), W::float(), H::float()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicspath.html#wxgraphicspathaddrectangle">external documentation</a>.
+-spec addRectangle(This, X, Y, W, H) -> ok when
+	This::wxGraphicsPath(), X::float(), Y::float(), W::float(), H::float().
 addRectangle(#wx_ref{type=ThisT,ref=ThisRef},X,Y,W,H)
  when is_float(X),is_float(Y),is_float(W),is_float(H) ->
   ?CLASS(ThisT,wxGraphicsPath),
   wxe_util:cast(?wxGraphicsPath_AddRectangle,
   <<ThisRef:32/?UI,0:32,X:64/?F,Y:64/?F,W:64/?F,H:64/?F>>).
 
-%% @spec (This::wxGraphicsPath(), X::float(), Y::float(), W::float(), H::float(), Radius::float()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicspath.html#wxgraphicspathaddroundedrectangle">external documentation</a>.
+-spec addRoundedRectangle(This, X, Y, W, H, Radius) -> ok when
+	This::wxGraphicsPath(), X::float(), Y::float(), W::float(), H::float(), Radius::float().
 addRoundedRectangle(#wx_ref{type=ThisT,ref=ThisRef},X,Y,W,H,Radius)
  when is_float(X),is_float(Y),is_float(W),is_float(H),is_float(Radius) ->
   ?CLASS(ThisT,wxGraphicsPath),
   wxe_util:cast(?wxGraphicsPath_AddRoundedRectangle,
   <<ThisRef:32/?UI,0:32,X:64/?F,Y:64/?F,W:64/?F,H:64/?F,Radius:64/?F>>).
 
-%% @spec (This::wxGraphicsPath()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicspath.html#wxgraphicspathclosesubpath">external documentation</a>.
+-spec closeSubpath(This) -> ok when
+	This::wxGraphicsPath().
 closeSubpath(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGraphicsPath),
   wxe_util:cast(?wxGraphicsPath_CloseSubpath,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGraphicsPath(), C::{X::float(), Y::float()}) -> bool()
 %% @equiv contains(This,C, [])
+-spec contains(This, C) -> boolean() when
+	This::wxGraphicsPath(), C::{X::float(), Y::float()}.
+
 contains(This,C={CX,CY})
  when is_record(This, wx_ref),is_number(CX),is_number(CY) ->
   contains(This,C, []).
 
-%% @spec (This::wxGraphicsPath(),X::float()|term(),X::float()|term()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicspath.html#wxgraphicspathcontains">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% contains(This::wxGraphicsPath(), X::float(), Y::float()) -> contains(This,X,Y, []) </c></p>
-%% <p><c>
-%% contains(This::wxGraphicsPath(), C::{X::float(), Y::float()}, [Option]) -> bool() </c>
-%%<br /> Option = {fillStyle, integer()}
-%% </p>
+-spec contains(This, X, Y) -> boolean() when
+	This::wxGraphicsPath(), X::float(), Y::float();
+      (This, C, [Option]) -> boolean() when
+	This::wxGraphicsPath(), C::{X::float(), Y::float()},
+	Option :: {fillStyle, integer()}.
 
 contains(This,X,Y)
  when is_record(This, wx_ref),is_float(X),is_float(Y) ->
@@ -195,9 +212,10 @@ contains(#wx_ref{type=ThisT,ref=ThisRef},{CX,CY}, Options)
   wxe_util:call(?wxGraphicsPath_Contains_2,
   <<ThisRef:32/?UI,0:32,CX:64/float,CY:64/float, BinOpt/binary>>).
 
-%% @spec (This::wxGraphicsPath(), X::float(), Y::float(), [Option]) -> bool()
-%% Option = {fillStyle, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicspath.html#wxgraphicspathcontains">external documentation</a>.
+-spec contains(This, X, Y, [Option]) -> boolean() when
+	This::wxGraphicsPath(), X::float(), Y::float(),
+	Option :: {fillStyle, integer()}.
 contains(#wx_ref{type=ThisT,ref=ThisRef},X,Y, Options)
  when is_float(X),is_float(Y),is_list(Options) ->
   ?CLASS(ThisT,wxGraphicsPath),
@@ -207,22 +225,25 @@ contains(#wx_ref{type=ThisT,ref=ThisRef},X,Y, Options)
   wxe_util:call(?wxGraphicsPath_Contains_3,
   <<ThisRef:32/?UI,0:32,X:64/?F,Y:64/?F, BinOpt/binary>>).
 
-%% @spec (This::wxGraphicsPath()) -> {X::float(), Y::float(), W::float(), H::float()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicspath.html#wxgraphicspathgetbox">external documentation</a>.
+-spec getBox(This) -> {X::float(), Y::float(), W::float(), H::float()} when
+	This::wxGraphicsPath().
 getBox(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGraphicsPath),
   wxe_util:call(?wxGraphicsPath_GetBox,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGraphicsPath()) -> {X::float(), Y::float()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicspath.html#wxgraphicspathgetcurrentpoint">external documentation</a>.
+-spec getCurrentPoint(This) -> {X::float(), Y::float()} when
+	This::wxGraphicsPath().
 getCurrentPoint(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGraphicsPath),
   wxe_util:call(?wxGraphicsPath_GetCurrentPoint,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGraphicsPath(), Matrix::wxGraphicsMatrix:wxGraphicsMatrix()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicspath.html#wxgraphicspathtransform">external documentation</a>.
+-spec transform(This, Matrix) -> ok when
+	This::wxGraphicsPath(), Matrix::wxGraphicsMatrix:wxGraphicsMatrix().
 transform(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=MatrixT,ref=MatrixRef}) ->
   ?CLASS(ThisT,wxGraphicsPath),
   ?CLASS(MatrixT,wxGraphicsMatrix),
diff --git a/lib/wx/src/gen/wxGraphicsPen.erl b/lib/wx/src/gen/wxGraphicsPen.erl
index 395b05f8af..76a59e6e2c 100644
--- a/lib/wx/src/gen/wxGraphicsPen.erl
+++ b/lib/wx/src/gen/wxGraphicsPen.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -32,10 +32,12 @@
 %% inherited exports
 -export([getRenderer/1,isNull/1,parent_class/1]).
 
+-export_type([wxGraphicsPen/0]).
 %% @hidden
 parent_class(wxGraphicsObject) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
+-type wxGraphicsPen() :: wx:wx_object().
  %% From wxGraphicsObject
 %% @hidden
 isNull(This) -> wxGraphicsObject:isNull(This).
diff --git a/lib/wx/src/gen/wxGraphicsRenderer.erl b/lib/wx/src/gen/wxGraphicsRenderer.erl
index ed53ebf468..b4b3e506e7 100644
--- a/lib/wx/src/gen/wxGraphicsRenderer.erl
+++ b/lib/wx/src/gen/wxGraphicsRenderer.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -31,17 +31,20 @@
 %% inherited exports
 -export([parent_class/1]).
 
+-export_type([wxGraphicsRenderer/0]).
 %% @hidden
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxGraphicsRenderer()
+-type wxGraphicsRenderer() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicsrenderer.html#wxgraphicsrenderergetdefaultrenderer">external documentation</a>.
+-spec getDefaultRenderer() -> wxGraphicsRenderer().
 getDefaultRenderer() ->
   wxe_util:call(?wxGraphicsRenderer_GetDefaultRenderer,
   <<>>).
 
-%% @spec (This::wxGraphicsRenderer(), Dc::wxWindowDC:wxWindowDC() | wxWindow:wxWindow()) -> wxGraphicsContext:wxGraphicsContext()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicsrenderer.html#wxgraphicsrenderercreatecontext">external documentation</a>.
+-spec createContext(This, Dc) -> wxGraphicsContext:wxGraphicsContext() when
+	This::wxGraphicsRenderer(), Dc::wxWindowDC:wxWindowDC() | wxWindow:wxWindow().
 createContext(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=DcT,ref=DcRef}) ->
   ?CLASS(ThisT,wxGraphicsRenderer),
   DcOP = case ?CLASS_T(DcT,wxWindowDC) of
@@ -53,47 +56,54 @@ createContext(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=DcT,ref=DcRef}) ->
   wxe_util:call(DcOP,
   <<ThisRef:32/?UI,DcRef:32/?UI>>).
 
-%% @spec (This::wxGraphicsRenderer(), Pen::wxPen:wxPen()) -> wxGraphicsPen:wxGraphicsPen()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicsrenderer.html#wxgraphicsrenderercreatepen">external documentation</a>.
+-spec createPen(This, Pen) -> wxGraphicsPen:wxGraphicsPen() when
+	This::wxGraphicsRenderer(), Pen::wxPen:wxPen().
 createPen(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PenT,ref=PenRef}) ->
   ?CLASS(ThisT,wxGraphicsRenderer),
   ?CLASS(PenT,wxPen),
   wxe_util:call(?wxGraphicsRenderer_CreatePen,
   <<ThisRef:32/?UI,PenRef:32/?UI>>).
 
-%% @spec (This::wxGraphicsRenderer(), Brush::wxBrush:wxBrush()) -> wxGraphicsBrush:wxGraphicsBrush()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicsrenderer.html#wxgraphicsrenderercreatebrush">external documentation</a>.
+-spec createBrush(This, Brush) -> wxGraphicsBrush:wxGraphicsBrush() when
+	This::wxGraphicsRenderer(), Brush::wxBrush:wxBrush().
 createBrush(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BrushT,ref=BrushRef}) ->
   ?CLASS(ThisT,wxGraphicsRenderer),
   ?CLASS(BrushT,wxBrush),
   wxe_util:call(?wxGraphicsRenderer_CreateBrush,
   <<ThisRef:32/?UI,BrushRef:32/?UI>>).
 
-%% @spec (This::wxGraphicsRenderer(), X1::float(), Y1::float(), X2::float(), Y2::float(), C1::wx:colour(), C2::wx:colour()) -> wxGraphicsBrush:wxGraphicsBrush()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicsrenderer.html#wxgraphicsrenderercreatelineargradientbrush">external documentation</a>.
+-spec createLinearGradientBrush(This, X1, Y1, X2, Y2, C1, C2) -> wxGraphicsBrush:wxGraphicsBrush() when
+	This::wxGraphicsRenderer(), X1::float(), Y1::float(), X2::float(), Y2::float(), C1::wx:wx_colour(), C2::wx:wx_colour().
 createLinearGradientBrush(#wx_ref{type=ThisT,ref=ThisRef},X1,Y1,X2,Y2,C1,C2)
  when is_float(X1),is_float(Y1),is_float(X2),is_float(Y2),tuple_size(C1) =:= 3; tuple_size(C1) =:= 4,tuple_size(C2) =:= 3; tuple_size(C2) =:= 4 ->
   ?CLASS(ThisT,wxGraphicsRenderer),
   wxe_util:call(?wxGraphicsRenderer_CreateLinearGradientBrush,
   <<ThisRef:32/?UI,0:32,X1:64/?F,Y1:64/?F,X2:64/?F,Y2:64/?F,(wxe_util:colour_bin(C1)):16/binary,(wxe_util:colour_bin(C2)):16/binary>>).
 
-%% @spec (This::wxGraphicsRenderer(), Xo::float(), Yo::float(), Xc::float(), Yc::float(), Radius::float(), OColor::wx:colour(), CColor::wx:colour()) -> wxGraphicsBrush:wxGraphicsBrush()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicsrenderer.html#wxgraphicsrenderercreateradialgradientbrush">external documentation</a>.
+-spec createRadialGradientBrush(This, Xo, Yo, Xc, Yc, Radius, OColor, CColor) -> wxGraphicsBrush:wxGraphicsBrush() when
+	This::wxGraphicsRenderer(), Xo::float(), Yo::float(), Xc::float(), Yc::float(), Radius::float(), OColor::wx:wx_colour(), CColor::wx:wx_colour().
 createRadialGradientBrush(#wx_ref{type=ThisT,ref=ThisRef},Xo,Yo,Xc,Yc,Radius,OColor,CColor)
  when is_float(Xo),is_float(Yo),is_float(Xc),is_float(Yc),is_float(Radius),tuple_size(OColor) =:= 3; tuple_size(OColor) =:= 4,tuple_size(CColor) =:= 3; tuple_size(CColor) =:= 4 ->
   ?CLASS(ThisT,wxGraphicsRenderer),
   wxe_util:call(?wxGraphicsRenderer_CreateRadialGradientBrush,
   <<ThisRef:32/?UI,0:32,Xo:64/?F,Yo:64/?F,Xc:64/?F,Yc:64/?F,Radius:64/?F,(wxe_util:colour_bin(OColor)):16/binary,(wxe_util:colour_bin(CColor)):16/binary>>).
 
-%% @spec (This::wxGraphicsRenderer(), Font::wxFont:wxFont()) -> wxGraphicsFont:wxGraphicsFont()
 %% @equiv createFont(This,Font, [])
+-spec createFont(This, Font) -> wxGraphicsFont:wxGraphicsFont() when
+	This::wxGraphicsRenderer(), Font::wxFont:wxFont().
+
 createFont(This,Font)
  when is_record(This, wx_ref),is_record(Font, wx_ref) ->
   createFont(This,Font, []).
 
-%% @spec (This::wxGraphicsRenderer(), Font::wxFont:wxFont(), [Option]) -> wxGraphicsFont:wxGraphicsFont()
-%% Option = {col, wx:colour()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicsrenderer.html#wxgraphicsrenderercreatefont">external documentation</a>.
+-spec createFont(This, Font, [Option]) -> wxGraphicsFont:wxGraphicsFont() when
+	This::wxGraphicsRenderer(), Font::wxFont:wxFont(),
+	Option :: {col, wx:wx_colour()}.
 createFont(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FontT,ref=FontRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxGraphicsRenderer),
@@ -104,15 +114,23 @@ createFont(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FontT,ref=FontRef}, Opti
   wxe_util:call(?wxGraphicsRenderer_CreateFont,
   <<ThisRef:32/?UI,FontRef:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxGraphicsRenderer()) -> wxGraphicsMatrix:wxGraphicsMatrix()
 %% @equiv createMatrix(This, [])
+-spec createMatrix(This) -> wxGraphicsMatrix:wxGraphicsMatrix() when
+	This::wxGraphicsRenderer().
+
 createMatrix(This)
  when is_record(This, wx_ref) ->
   createMatrix(This, []).
 
-%% @spec (This::wxGraphicsRenderer(), [Option]) -> wxGraphicsMatrix:wxGraphicsMatrix()
-%% Option = {a, float()} | {b, float()} | {c, float()} | {d, float()} | {tx, float()} | {ty, float()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicsrenderer.html#wxgraphicsrenderercreatematrix">external documentation</a>.
+-spec createMatrix(This, [Option]) -> wxGraphicsMatrix:wxGraphicsMatrix() when
+	This::wxGraphicsRenderer(),
+	Option :: {a, float()}
+		 | {b, float()}
+		 | {c, float()}
+		 | {d, float()}
+		 | {tx, float()}
+		 | {ty, float()}.
 createMatrix(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxGraphicsRenderer),
@@ -127,8 +145,9 @@ createMatrix(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxGraphicsRenderer_CreateMatrix,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxGraphicsRenderer()) -> wxGraphicsPath:wxGraphicsPath()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicsrenderer.html#wxgraphicsrenderercreatepath">external documentation</a>.
+-spec createPath(This) -> wxGraphicsPath:wxGraphicsPath() when
+	This::wxGraphicsRenderer().
 createPath(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGraphicsRenderer),
   wxe_util:call(?wxGraphicsRenderer_CreatePath,
diff --git a/lib/wx/src/gen/wxGrid.erl b/lib/wx/src/gen/wxGrid.erl
index 531fed05c1..ab4ec3a44a 100644
--- a/lib/wx/src/gen/wxGrid.erl
+++ b/lib/wx/src/gen/wxGrid.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -125,6 +125,7 @@
   transferDataToWindow/1,update/1,updateWindowUI/1,updateWindowUI/2,
   validate/1,warpPointer/3]).
 
+-export_type([wxGrid/0]).
 %% @hidden
 parent_class(wxScrolledWindow) -> true;
 parent_class(wxPanel) -> true;
@@ -132,27 +133,29 @@ parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxGrid()
+-type wxGrid() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridwxgrid">external documentation</a>.
+-spec new() -> wxGrid().
 new() ->
   wxe_util:construct(?wxGrid_new_0,
   <<>>).
 
-%% @spec (Parent::wxWindow:wxWindow(), Id::integer()) -> wxGrid()
 %% @equiv new(Parent,Id, [])
+-spec new(Parent, Id) -> wxGrid() when
+	Parent::wxWindow:wxWindow(), Id::integer().
+
 new(Parent,Id)
  when is_record(Parent, wx_ref),is_integer(Id) ->
   new(Parent,Id, []).
 
-%% @spec (Parent::wxWindow:wxWindow(),X::integer(),X::integer()|term()) -> wxGrid()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridwxgrid">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% new(Parent::wxWindow:wxWindow(), X::integer(), Y::integer()) -> new(Parent,X,Y, []) </c></p>
-%% <p><c>
-%% new(Parent::wxWindow:wxWindow(), Id::integer(), [Option]) -> wxGrid() </c>
-%%<br /> Option = {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}
-%% </p>
+-spec new(Parent, X, Y) -> wxGrid() when
+	Parent::wxWindow:wxWindow(), X::integer(), Y::integer();
+      (Parent, Id, [Option]) -> wxGrid() when
+	Parent::wxWindow:wxWindow(), Id::integer(),
+	Option :: {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}.
 
 new(Parent,X,Y)
  when is_record(Parent, wx_ref),is_integer(X),is_integer(Y) ->
@@ -168,9 +171,12 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
   wxe_util:construct(?wxGrid_new_3,
   <<ParentRef:32/?UI,Id:32/?UI, BinOpt/binary>>).
 
-%% @spec (Parent::wxWindow:wxWindow(), X::integer(), Y::integer(), [Option]) -> wxGrid()
-%% Option = {w, integer()} | {h, integer()} | {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridwxgrid">external documentation</a>.
+-spec new(Parent, X, Y, [Option]) -> wxGrid() when
+	Parent::wxWindow:wxWindow(), X::integer(), Y::integer(),
+	Option :: {w, integer()}
+		 | {h, integer()}
+		 | {style, integer()}.
 new(#wx_ref{type=ParentT,ref=ParentRef},X,Y, Options)
  when is_integer(X),is_integer(Y),is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -182,15 +188,19 @@ new(#wx_ref{type=ParentT,ref=ParentRef},X,Y, Options)
   wxe_util:construct(?wxGrid_new_4,
   <<ParentRef:32/?UI,X:32/?UI,Y:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxGrid()) -> bool()
 %% @equiv appendCols(This, [])
+-spec appendCols(This) -> boolean() when
+	This::wxGrid().
+
 appendCols(This)
  when is_record(This, wx_ref) ->
   appendCols(This, []).
 
-%% @spec (This::wxGrid(), [Option]) -> bool()
-%% Option = {numCols, integer()} | {updateLabels, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridappendcols">external documentation</a>.
+-spec appendCols(This, [Option]) -> boolean() when
+	This::wxGrid(),
+	Option :: {numCols, integer()}
+		 | {updateLabels, boolean()}.
 appendCols(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxGrid),
@@ -201,15 +211,19 @@ appendCols(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxGrid_AppendCols,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxGrid()) -> bool()
 %% @equiv appendRows(This, [])
+-spec appendRows(This) -> boolean() when
+	This::wxGrid().
+
 appendRows(This)
  when is_record(This, wx_ref) ->
   appendRows(This, []).
 
-%% @spec (This::wxGrid(), [Option]) -> bool()
-%% Option = {numRows, integer()} | {updateLabels, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridappendrows">external documentation</a>.
+-spec appendRows(This, [Option]) -> boolean() when
+	This::wxGrid(),
+	Option :: {numRows, integer()}
+		 | {updateLabels, boolean()}.
 appendRows(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxGrid),
@@ -220,22 +234,26 @@ appendRows(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxGrid_AppendRows,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxGrid()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridautosize">external documentation</a>.
+-spec autoSize(This) -> ok when
+	This::wxGrid().
 autoSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:cast(?wxGrid_AutoSize,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid(), Col::integer()) -> ok
 %% @equiv autoSizeColumn(This,Col, [])
+-spec autoSizeColumn(This, Col) -> ok when
+	This::wxGrid(), Col::integer().
+
 autoSizeColumn(This,Col)
  when is_record(This, wx_ref),is_integer(Col) ->
   autoSizeColumn(This,Col, []).
 
-%% @spec (This::wxGrid(), Col::integer(), [Option]) -> ok
-%% Option = {setAsMin, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridautosizecolumn">external documentation</a>.
+-spec autoSizeColumn(This, Col, [Option]) -> ok when
+	This::wxGrid(), Col::integer(),
+	Option :: {setAsMin, boolean()}.
 autoSizeColumn(#wx_ref{type=ThisT,ref=ThisRef},Col, Options)
  when is_integer(Col),is_list(Options) ->
   ?CLASS(ThisT,wxGrid),
@@ -245,15 +263,18 @@ autoSizeColumn(#wx_ref{type=ThisT,ref=ThisRef},Col, Options)
   wxe_util:cast(?wxGrid_AutoSizeColumn,
   <<ThisRef:32/?UI,Col:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxGrid()) -> ok
 %% @equiv autoSizeColumns(This, [])
+-spec autoSizeColumns(This) -> ok when
+	This::wxGrid().
+
 autoSizeColumns(This)
  when is_record(This, wx_ref) ->
   autoSizeColumns(This, []).
 
-%% @spec (This::wxGrid(), [Option]) -> ok
-%% Option = {setAsMin, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridautosizecolumns">external documentation</a>.
+-spec autoSizeColumns(This, [Option]) -> ok when
+	This::wxGrid(),
+	Option :: {setAsMin, boolean()}.
 autoSizeColumns(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxGrid),
@@ -263,15 +284,18 @@ autoSizeColumns(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxGrid_AutoSizeColumns,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxGrid(), Row::integer()) -> ok
 %% @equiv autoSizeRow(This,Row, [])
+-spec autoSizeRow(This, Row) -> ok when
+	This::wxGrid(), Row::integer().
+
 autoSizeRow(This,Row)
  when is_record(This, wx_ref),is_integer(Row) ->
   autoSizeRow(This,Row, []).
 
-%% @spec (This::wxGrid(), Row::integer(), [Option]) -> ok
-%% Option = {setAsMin, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridautosizerow">external documentation</a>.
+-spec autoSizeRow(This, Row, [Option]) -> ok when
+	This::wxGrid(), Row::integer(),
+	Option :: {setAsMin, boolean()}.
 autoSizeRow(#wx_ref{type=ThisT,ref=ThisRef},Row, Options)
  when is_integer(Row),is_list(Options) ->
   ?CLASS(ThisT,wxGrid),
@@ -281,15 +305,18 @@ autoSizeRow(#wx_ref{type=ThisT,ref=ThisRef},Row, Options)
   wxe_util:cast(?wxGrid_AutoSizeRow,
   <<ThisRef:32/?UI,Row:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxGrid()) -> ok
 %% @equiv autoSizeRows(This, [])
+-spec autoSizeRows(This) -> ok when
+	This::wxGrid().
+
 autoSizeRows(This)
  when is_record(This, wx_ref) ->
   autoSizeRows(This, []).
 
-%% @spec (This::wxGrid(), [Option]) -> ok
-%% Option = {setAsMin, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridautosizerows">external documentation</a>.
+-spec autoSizeRows(This, [Option]) -> ok when
+	This::wxGrid(),
+	Option :: {setAsMin, boolean()}.
 autoSizeRows(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxGrid),
@@ -299,90 +326,102 @@ autoSizeRows(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxGrid_AutoSizeRows,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxGrid()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridbeginbatch">external documentation</a>.
+-spec beginBatch(This) -> ok when
+	This::wxGrid().
 beginBatch(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:cast(?wxGrid_BeginBatch,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid(), TopLeft::{R::integer(), C::integer()}, BottomRight::{R::integer(), C::integer()}) -> {X::integer(), Y::integer(), W::integer(), H::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridblocktodevicerect">external documentation</a>.
+-spec blockToDeviceRect(This, TopLeft, BottomRight) -> {X::integer(), Y::integer(), W::integer(), H::integer()} when
+	This::wxGrid(), TopLeft::{R::integer(), C::integer()}, BottomRight::{R::integer(), C::integer()}.
 blockToDeviceRect(#wx_ref{type=ThisT,ref=ThisRef},{TopLeftR,TopLeftC},{BottomRightR,BottomRightC})
  when is_integer(TopLeftR),is_integer(TopLeftC),is_integer(BottomRightR),is_integer(BottomRightC) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_BlockToDeviceRect,
   <<ThisRef:32/?UI,TopLeftR:32/?UI,TopLeftC:32/?UI,BottomRightR:32/?UI,BottomRightC:32/?UI>>).
 
-%% @spec (This::wxGrid()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridcandragcolsize">external documentation</a>.
+-spec canDragColSize(This) -> boolean() when
+	This::wxGrid().
 canDragColSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_CanDragColSize,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridcandragrowsize">external documentation</a>.
+-spec canDragRowSize(This) -> boolean() when
+	This::wxGrid().
 canDragRowSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_CanDragRowSize,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridcandraggridsize">external documentation</a>.
+-spec canDragGridSize(This) -> boolean() when
+	This::wxGrid().
 canDragGridSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_CanDragGridSize,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridcanenablecellcontrol">external documentation</a>.
+-spec canEnableCellControl(This) -> boolean() when
+	This::wxGrid().
 canEnableCellControl(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_CanEnableCellControl,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid(), Coords::{R::integer(), C::integer()}) -> {X::integer(), Y::integer(), W::integer(), H::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridcelltorect">external documentation</a>.
+-spec cellToRect(This, Coords) -> {X::integer(), Y::integer(), W::integer(), H::integer()} when
+	This::wxGrid(), Coords::{R::integer(), C::integer()}.
 cellToRect(#wx_ref{type=ThisT,ref=ThisRef},{CoordsR,CoordsC})
  when is_integer(CoordsR),is_integer(CoordsC) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_CellToRect_1,
   <<ThisRef:32/?UI,CoordsR:32/?UI,CoordsC:32/?UI>>).
 
-%% @spec (This::wxGrid(), Row::integer(), Col::integer()) -> {X::integer(), Y::integer(), W::integer(), H::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridcelltorect">external documentation</a>.
+-spec cellToRect(This, Row, Col) -> {X::integer(), Y::integer(), W::integer(), H::integer()} when
+	This::wxGrid(), Row::integer(), Col::integer().
 cellToRect(#wx_ref{type=ThisT,ref=ThisRef},Row,Col)
  when is_integer(Row),is_integer(Col) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_CellToRect_2,
   <<ThisRef:32/?UI,Row:32/?UI,Col:32/?UI>>).
 
-%% @spec (This::wxGrid()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridcleargrid">external documentation</a>.
+-spec clearGrid(This) -> ok when
+	This::wxGrid().
 clearGrid(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:cast(?wxGrid_ClearGrid,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridclearselection">external documentation</a>.
+-spec clearSelection(This) -> ok when
+	This::wxGrid().
 clearSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:cast(?wxGrid_ClearSelection,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid(), NumRows::integer(), NumCols::integer()) -> bool()
 %% @equiv createGrid(This,NumRows,NumCols, [])
+-spec createGrid(This, NumRows, NumCols) -> boolean() when
+	This::wxGrid(), NumRows::integer(), NumCols::integer().
+
 createGrid(This,NumRows,NumCols)
  when is_record(This, wx_ref),is_integer(NumRows),is_integer(NumCols) ->
   createGrid(This,NumRows,NumCols, []).
 
-%% @spec (This::wxGrid(), NumRows::integer(), NumCols::integer(), [Option]) -> bool()
-%% Option = {selmode, WxGridSelectionModes}
-%% WxGridSelectionModes = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridcreategrid">external documentation</a>.
-%%<br /> WxGridSelectionModes is one of ?wxGrid_wxGridSelectCells | ?wxGrid_wxGridSelectRows | ?wxGrid_wxGridSelectColumns
+%%<br /> Selmode = ?wxGrid_wxGridSelectCells | ?wxGrid_wxGridSelectRows | ?wxGrid_wxGridSelectColumns
+-spec createGrid(This, NumRows, NumCols, [Option]) -> boolean() when
+	This::wxGrid(), NumRows::integer(), NumCols::integer(),
+	Option :: {selmode, wx:wx_enum()}.
 createGrid(#wx_ref{type=ThisT,ref=ThisRef},NumRows,NumCols, Options)
  when is_integer(NumRows),is_integer(NumCols),is_list(Options) ->
   ?CLASS(ThisT,wxGrid),
@@ -392,15 +431,20 @@ createGrid(#wx_ref{type=ThisT,ref=ThisRef},NumRows,NumCols, Options)
   wxe_util:call(?wxGrid_CreateGrid,
   <<ThisRef:32/?UI,NumRows:32/?UI,NumCols:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxGrid()) -> bool()
 %% @equiv deleteCols(This, [])
+-spec deleteCols(This) -> boolean() when
+	This::wxGrid().
+
 deleteCols(This)
  when is_record(This, wx_ref) ->
   deleteCols(This, []).
 
-%% @spec (This::wxGrid(), [Option]) -> bool()
-%% Option = {pos, integer()} | {numCols, integer()} | {updateLabels, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgriddeletecols">external documentation</a>.
+-spec deleteCols(This, [Option]) -> boolean() when
+	This::wxGrid(),
+	Option :: {pos, integer()}
+		 | {numCols, integer()}
+		 | {updateLabels, boolean()}.
 deleteCols(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxGrid),
@@ -412,15 +456,20 @@ deleteCols(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxGrid_DeleteCols,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxGrid()) -> bool()
 %% @equiv deleteRows(This, [])
+-spec deleteRows(This) -> boolean() when
+	This::wxGrid().
+
 deleteRows(This)
  when is_record(This, wx_ref) ->
   deleteRows(This, []).
 
-%% @spec (This::wxGrid(), [Option]) -> bool()
-%% Option = {pos, integer()} | {numRows, integer()} | {updateLabels, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgriddeleterows">external documentation</a>.
+-spec deleteRows(This, [Option]) -> boolean() when
+	This::wxGrid(),
+	Option :: {pos, integer()}
+		 | {numRows, integer()}
+		 | {updateLabels, boolean()}.
 deleteRows(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxGrid),
@@ -432,43 +481,50 @@ deleteRows(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxGrid_DeleteRows,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxGrid()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgriddisablecelleditcontrol">external documentation</a>.
+-spec disableCellEditControl(This) -> ok when
+	This::wxGrid().
 disableCellEditControl(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:cast(?wxGrid_DisableCellEditControl,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgriddisabledragcolsize">external documentation</a>.
+-spec disableDragColSize(This) -> ok when
+	This::wxGrid().
 disableDragColSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:cast(?wxGrid_DisableDragColSize,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgriddisabledraggridsize">external documentation</a>.
+-spec disableDragGridSize(This) -> ok when
+	This::wxGrid().
 disableDragGridSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:cast(?wxGrid_DisableDragGridSize,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgriddisabledragrowsize">external documentation</a>.
+-spec disableDragRowSize(This) -> ok when
+	This::wxGrid().
 disableDragRowSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:cast(?wxGrid_DisableDragRowSize,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid()) -> ok
 %% @equiv enableCellEditControl(This, [])
+-spec enableCellEditControl(This) -> ok when
+	This::wxGrid().
+
 enableCellEditControl(This)
  when is_record(This, wx_ref) ->
   enableCellEditControl(This, []).
 
-%% @spec (This::wxGrid(), [Option]) -> ok
-%% Option = {enable, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridenablecelleditcontrol">external documentation</a>.
+-spec enableCellEditControl(This, [Option]) -> ok when
+	This::wxGrid(),
+	Option :: {enable, boolean()}.
 enableCellEditControl(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxGrid),
@@ -478,15 +534,18 @@ enableCellEditControl(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxGrid_EnableCellEditControl,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxGrid()) -> ok
 %% @equiv enableDragColSize(This, [])
+-spec enableDragColSize(This) -> ok when
+	This::wxGrid().
+
 enableDragColSize(This)
  when is_record(This, wx_ref) ->
   enableDragColSize(This, []).
 
-%% @spec (This::wxGrid(), [Option]) -> ok
-%% Option = {enable, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridenabledragcolsize">external documentation</a>.
+-spec enableDragColSize(This, [Option]) -> ok when
+	This::wxGrid(),
+	Option :: {enable, boolean()}.
 enableDragColSize(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxGrid),
@@ -496,15 +555,18 @@ enableDragColSize(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxGrid_EnableDragColSize,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxGrid()) -> ok
 %% @equiv enableDragGridSize(This, [])
+-spec enableDragGridSize(This) -> ok when
+	This::wxGrid().
+
 enableDragGridSize(This)
  when is_record(This, wx_ref) ->
   enableDragGridSize(This, []).
 
-%% @spec (This::wxGrid(), [Option]) -> ok
-%% Option = {enable, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridenabledraggridsize">external documentation</a>.
+-spec enableDragGridSize(This, [Option]) -> ok when
+	This::wxGrid(),
+	Option :: {enable, boolean()}.
 enableDragGridSize(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxGrid),
@@ -514,15 +576,18 @@ enableDragGridSize(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxGrid_EnableDragGridSize,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxGrid()) -> ok
 %% @equiv enableDragRowSize(This, [])
+-spec enableDragRowSize(This) -> ok when
+	This::wxGrid().
+
 enableDragRowSize(This)
  when is_record(This, wx_ref) ->
   enableDragRowSize(This, []).
 
-%% @spec (This::wxGrid(), [Option]) -> ok
-%% Option = {enable, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridenabledragrowsize">external documentation</a>.
+-spec enableDragRowSize(This, [Option]) -> ok when
+	This::wxGrid(),
+	Option :: {enable, boolean()}.
 enableDragRowSize(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxGrid),
@@ -532,23 +597,27 @@ enableDragRowSize(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxGrid_EnableDragRowSize,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxGrid(), Edit::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridenableediting">external documentation</a>.
+-spec enableEditing(This, Edit) -> ok when
+	This::wxGrid(), Edit::boolean().
 enableEditing(#wx_ref{type=ThisT,ref=ThisRef},Edit)
  when is_boolean(Edit) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:cast(?wxGrid_EnableEditing,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Edit)):32/?UI>>).
 
-%% @spec (This::wxGrid()) -> ok
 %% @equiv enableGridLines(This, [])
+-spec enableGridLines(This) -> ok when
+	This::wxGrid().
+
 enableGridLines(This)
  when is_record(This, wx_ref) ->
   enableGridLines(This, []).
 
-%% @spec (This::wxGrid(), [Option]) -> ok
-%% Option = {enable, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridenablegridlines">external documentation</a>.
+-spec enableGridLines(This, [Option]) -> ok when
+	This::wxGrid(),
+	Option :: {enable, boolean()}.
 enableGridLines(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxGrid),
@@ -558,194 +627,220 @@ enableGridLines(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxGrid_EnableGridLines,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxGrid()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridendbatch">external documentation</a>.
+-spec endBatch(This) -> ok when
+	This::wxGrid().
 endBatch(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:cast(?wxGrid_EndBatch,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridfit">external documentation</a>.
+-spec fit(This) -> ok when
+	This::wxGrid().
 fit(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:cast(?wxGrid_Fit,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridforcerefresh">external documentation</a>.
+-spec forceRefresh(This) -> ok when
+	This::wxGrid().
 forceRefresh(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:cast(?wxGrid_ForceRefresh,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetbatchcount">external documentation</a>.
+-spec getBatchCount(This) -> integer() when
+	This::wxGrid().
 getBatchCount(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_GetBatchCount,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid(), Row::integer(), Col::integer()) -> {Horiz::integer(), Vert::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetcellalignment">external documentation</a>.
+-spec getCellAlignment(This, Row, Col) -> {Horiz::integer(), Vert::integer()} when
+	This::wxGrid(), Row::integer(), Col::integer().
 getCellAlignment(#wx_ref{type=ThisT,ref=ThisRef},Row,Col)
  when is_integer(Row),is_integer(Col) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_GetCellAlignment,
   <<ThisRef:32/?UI,Row:32/?UI,Col:32/?UI>>).
 
-%% @spec (This::wxGrid(), Row::integer(), Col::integer()) -> wx:colour()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetcellbackgroundcolour">external documentation</a>.
+-spec getCellBackgroundColour(This, Row, Col) -> wx:wx_colour() when
+	This::wxGrid(), Row::integer(), Col::integer().
 getCellBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef},Row,Col)
  when is_integer(Row),is_integer(Col) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_GetCellBackgroundColour,
   <<ThisRef:32/?UI,Row:32/?UI,Col:32/?UI>>).
 
-%% @spec (This::wxGrid(), Row::integer(), Col::integer()) -> wxGridCellEditor:wxGridCellEditor()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetcelleditor">external documentation</a>.
+-spec getCellEditor(This, Row, Col) -> wxGridCellEditor:wxGridCellEditor() when
+	This::wxGrid(), Row::integer(), Col::integer().
 getCellEditor(#wx_ref{type=ThisT,ref=ThisRef},Row,Col)
  when is_integer(Row),is_integer(Col) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_GetCellEditor,
   <<ThisRef:32/?UI,Row:32/?UI,Col:32/?UI>>).
 
-%% @spec (This::wxGrid(), Row::integer(), Col::integer()) -> wxFont:wxFont()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetcellfont">external documentation</a>.
+-spec getCellFont(This, Row, Col) -> wxFont:wxFont() when
+	This::wxGrid(), Row::integer(), Col::integer().
 getCellFont(#wx_ref{type=ThisT,ref=ThisRef},Row,Col)
  when is_integer(Row),is_integer(Col) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_GetCellFont,
   <<ThisRef:32/?UI,Row:32/?UI,Col:32/?UI>>).
 
-%% @spec (This::wxGrid(), Row::integer(), Col::integer()) -> wxGridCellRenderer:wxGridCellRenderer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetcellrenderer">external documentation</a>.
+-spec getCellRenderer(This, Row, Col) -> wxGridCellRenderer:wxGridCellRenderer() when
+	This::wxGrid(), Row::integer(), Col::integer().
 getCellRenderer(#wx_ref{type=ThisT,ref=ThisRef},Row,Col)
  when is_integer(Row),is_integer(Col) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_GetCellRenderer,
   <<ThisRef:32/?UI,Row:32/?UI,Col:32/?UI>>).
 
-%% @spec (This::wxGrid(), Row::integer(), Col::integer()) -> wx:colour()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetcelltextcolour">external documentation</a>.
+-spec getCellTextColour(This, Row, Col) -> wx:wx_colour() when
+	This::wxGrid(), Row::integer(), Col::integer().
 getCellTextColour(#wx_ref{type=ThisT,ref=ThisRef},Row,Col)
  when is_integer(Row),is_integer(Col) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_GetCellTextColour,
   <<ThisRef:32/?UI,Row:32/?UI,Col:32/?UI>>).
 
-%% @spec (This::wxGrid(), Coords::{R::integer(), C::integer()}) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetcellvalue">external documentation</a>.
+-spec getCellValue(This, Coords) -> string() when
+	This::wxGrid(), Coords::{R::integer(), C::integer()}.
 getCellValue(#wx_ref{type=ThisT,ref=ThisRef},{CoordsR,CoordsC})
  when is_integer(CoordsR),is_integer(CoordsC) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_GetCellValue_1,
   <<ThisRef:32/?UI,CoordsR:32/?UI,CoordsC:32/?UI>>).
 
-%% @spec (This::wxGrid(), Row::integer(), Col::integer()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetcellvalue">external documentation</a>.
+-spec getCellValue(This, Row, Col) -> string() when
+	This::wxGrid(), Row::integer(), Col::integer().
 getCellValue(#wx_ref{type=ThisT,ref=ThisRef},Row,Col)
  when is_integer(Row),is_integer(Col) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_GetCellValue_2,
   <<ThisRef:32/?UI,Row:32/?UI,Col:32/?UI>>).
 
-%% @spec (This::wxGrid()) -> {Horiz::integer(), Vert::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetcollabelalignment">external documentation</a>.
+-spec getColLabelAlignment(This) -> {Horiz::integer(), Vert::integer()} when
+	This::wxGrid().
 getColLabelAlignment(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_GetColLabelAlignment,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetcollabelsize">external documentation</a>.
+-spec getColLabelSize(This) -> integer() when
+	This::wxGrid().
 getColLabelSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_GetColLabelSize,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid(), Col::integer()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetcollabelvalue">external documentation</a>.
+-spec getColLabelValue(This, Col) -> string() when
+	This::wxGrid(), Col::integer().
 getColLabelValue(#wx_ref{type=ThisT,ref=ThisRef},Col)
  when is_integer(Col) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_GetColLabelValue,
   <<ThisRef:32/?UI,Col:32/?UI>>).
 
-%% @spec (This::wxGrid()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetcolminimalacceptablewidth">external documentation</a>.
+-spec getColMinimalAcceptableWidth(This) -> integer() when
+	This::wxGrid().
 getColMinimalAcceptableWidth(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_GetColMinimalAcceptableWidth,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid()) -> {Horiz::integer(), Vert::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetdefaultcellalignment">external documentation</a>.
+-spec getDefaultCellAlignment(This) -> {Horiz::integer(), Vert::integer()} when
+	This::wxGrid().
 getDefaultCellAlignment(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_GetDefaultCellAlignment,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid()) -> wx:colour()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetdefaultcellbackgroundcolour">external documentation</a>.
+-spec getDefaultCellBackgroundColour(This) -> wx:wx_colour() when
+	This::wxGrid().
 getDefaultCellBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_GetDefaultCellBackgroundColour,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid()) -> wxFont:wxFont()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetdefaultcellfont">external documentation</a>.
+-spec getDefaultCellFont(This) -> wxFont:wxFont() when
+	This::wxGrid().
 getDefaultCellFont(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_GetDefaultCellFont,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid()) -> wx:colour()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetdefaultcelltextcolour">external documentation</a>.
+-spec getDefaultCellTextColour(This) -> wx:wx_colour() when
+	This::wxGrid().
 getDefaultCellTextColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_GetDefaultCellTextColour,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetdefaultcollabelsize">external documentation</a>.
+-spec getDefaultColLabelSize(This) -> integer() when
+	This::wxGrid().
 getDefaultColLabelSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_GetDefaultColLabelSize,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetdefaultcolsize">external documentation</a>.
+-spec getDefaultColSize(This) -> integer() when
+	This::wxGrid().
 getDefaultColSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_GetDefaultColSize,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid()) -> wxGridCellEditor:wxGridCellEditor()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetdefaulteditor">external documentation</a>.
+-spec getDefaultEditor(This) -> wxGridCellEditor:wxGridCellEditor() when
+	This::wxGrid().
 getDefaultEditor(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_GetDefaultEditor,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid(), C::{R::integer(), C::integer()}) -> wxGridCellEditor:wxGridCellEditor()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetdefaulteditorforcell">external documentation</a>.
+-spec getDefaultEditorForCell(This, C) -> wxGridCellEditor:wxGridCellEditor() when
+	This::wxGrid(), C::{R::integer(), C::integer()}.
 getDefaultEditorForCell(#wx_ref{type=ThisT,ref=ThisRef},{CR,CC})
  when is_integer(CR),is_integer(CC) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_GetDefaultEditorForCell_1,
   <<ThisRef:32/?UI,CR:32/?UI,CC:32/?UI>>).
 
-%% @spec (This::wxGrid(), Row::integer(), Col::integer()) -> wxGridCellEditor:wxGridCellEditor()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetdefaulteditorforcell">external documentation</a>.
+-spec getDefaultEditorForCell(This, Row, Col) -> wxGridCellEditor:wxGridCellEditor() when
+	This::wxGrid(), Row::integer(), Col::integer().
 getDefaultEditorForCell(#wx_ref{type=ThisT,ref=ThisRef},Row,Col)
  when is_integer(Row),is_integer(Col) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_GetDefaultEditorForCell_2,
   <<ThisRef:32/?UI,Row:32/?UI,Col:32/?UI>>).
 
-%% @spec (This::wxGrid(), TypeName::string()) -> wxGridCellEditor:wxGridCellEditor()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetdefaulteditorfortype">external documentation</a>.
+-spec getDefaultEditorForType(This, TypeName) -> wxGridCellEditor:wxGridCellEditor() when
+	This::wxGrid(), TypeName::string().
 getDefaultEditorForType(#wx_ref{type=ThisT,ref=ThisRef},TypeName)
  when is_list(TypeName) ->
   ?CLASS(ThisT,wxGrid),
@@ -753,23 +848,26 @@ getDefaultEditorForType(#wx_ref{type=ThisT,ref=ThisRef},TypeName)
   wxe_util:call(?wxGrid_GetDefaultEditorForType,
   <<ThisRef:32/?UI,(byte_size(TypeName_UC)):32/?UI,(TypeName_UC)/binary, 0:(((8- ((0+byte_size(TypeName_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxGrid()) -> wxGridCellRenderer:wxGridCellRenderer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetdefaultrenderer">external documentation</a>.
+-spec getDefaultRenderer(This) -> wxGridCellRenderer:wxGridCellRenderer() when
+	This::wxGrid().
 getDefaultRenderer(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_GetDefaultRenderer,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid(), Row::integer(), Col::integer()) -> wxGridCellRenderer:wxGridCellRenderer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetdefaultrendererforcell">external documentation</a>.
+-spec getDefaultRendererForCell(This, Row, Col) -> wxGridCellRenderer:wxGridCellRenderer() when
+	This::wxGrid(), Row::integer(), Col::integer().
 getDefaultRendererForCell(#wx_ref{type=ThisT,ref=ThisRef},Row,Col)
  when is_integer(Row),is_integer(Col) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_GetDefaultRendererForCell,
   <<ThisRef:32/?UI,Row:32/?UI,Col:32/?UI>>).
 
-%% @spec (This::wxGrid(), TypeName::string()) -> wxGridCellRenderer:wxGridCellRenderer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetdefaultrendererfortype">external documentation</a>.
+-spec getDefaultRendererForType(This, TypeName) -> wxGridCellRenderer:wxGridCellRenderer() when
+	This::wxGrid(), TypeName::string().
 getDefaultRendererForType(#wx_ref{type=ThisT,ref=ThisRef},TypeName)
  when is_list(TypeName) ->
   ?CLASS(ThisT,wxGrid),
@@ -777,242 +875,279 @@ getDefaultRendererForType(#wx_ref{type=ThisT,ref=ThisRef},TypeName)
   wxe_util:call(?wxGrid_GetDefaultRendererForType,
   <<ThisRef:32/?UI,(byte_size(TypeName_UC)):32/?UI,(TypeName_UC)/binary, 0:(((8- ((0+byte_size(TypeName_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxGrid()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetdefaultrowlabelsize">external documentation</a>.
+-spec getDefaultRowLabelSize(This) -> integer() when
+	This::wxGrid().
 getDefaultRowLabelSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_GetDefaultRowLabelSize,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetdefaultrowsize">external documentation</a>.
+-spec getDefaultRowSize(This) -> integer() when
+	This::wxGrid().
 getDefaultRowSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_GetDefaultRowSize,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetgridcursorcol">external documentation</a>.
+-spec getGridCursorCol(This) -> integer() when
+	This::wxGrid().
 getGridCursorCol(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_GetGridCursorCol,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetgridcursorrow">external documentation</a>.
+-spec getGridCursorRow(This) -> integer() when
+	This::wxGrid().
 getGridCursorRow(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_GetGridCursorRow,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid()) -> wx:colour()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetgridlinecolour">external documentation</a>.
+-spec getGridLineColour(This) -> wx:wx_colour() when
+	This::wxGrid().
 getGridLineColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_GetGridLineColour,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgridlinesenabled">external documentation</a>.
+-spec gridLinesEnabled(This) -> boolean() when
+	This::wxGrid().
 gridLinesEnabled(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_GridLinesEnabled,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid()) -> wx:colour()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetlabelbackgroundcolour">external documentation</a>.
+-spec getLabelBackgroundColour(This) -> wx:wx_colour() when
+	This::wxGrid().
 getLabelBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_GetLabelBackgroundColour,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid()) -> wxFont:wxFont()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetlabelfont">external documentation</a>.
+-spec getLabelFont(This) -> wxFont:wxFont() when
+	This::wxGrid().
 getLabelFont(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_GetLabelFont,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid()) -> wx:colour()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetlabeltextcolour">external documentation</a>.
+-spec getLabelTextColour(This) -> wx:wx_colour() when
+	This::wxGrid().
 getLabelTextColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_GetLabelTextColour,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetnumbercols">external documentation</a>.
+-spec getNumberCols(This) -> integer() when
+	This::wxGrid().
 getNumberCols(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_GetNumberCols,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetnumberrows">external documentation</a>.
+-spec getNumberRows(This) -> integer() when
+	This::wxGrid().
 getNumberRows(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_GetNumberRows,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid(), Row::integer(), Col::integer()) -> wxGridCellAttr:wxGridCellAttr()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetorcreatecellattr">external documentation</a>.
+-spec getOrCreateCellAttr(This, Row, Col) -> wxGridCellAttr:wxGridCellAttr() when
+	This::wxGrid(), Row::integer(), Col::integer().
 getOrCreateCellAttr(#wx_ref{type=ThisT,ref=ThisRef},Row,Col)
  when is_integer(Row),is_integer(Col) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_GetOrCreateCellAttr,
   <<ThisRef:32/?UI,Row:32/?UI,Col:32/?UI>>).
 
-%% @spec (This::wxGrid()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetrowminimalacceptableheight">external documentation</a>.
+-spec getRowMinimalAcceptableHeight(This) -> integer() when
+	This::wxGrid().
 getRowMinimalAcceptableHeight(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_GetRowMinimalAcceptableHeight,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid()) -> {Horiz::integer(), Vert::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetrowlabelalignment">external documentation</a>.
+-spec getRowLabelAlignment(This) -> {Horiz::integer(), Vert::integer()} when
+	This::wxGrid().
 getRowLabelAlignment(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_GetRowLabelAlignment,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetrowlabelsize">external documentation</a>.
+-spec getRowLabelSize(This) -> integer() when
+	This::wxGrid().
 getRowLabelSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_GetRowLabelSize,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid(), Row::integer()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetrowlabelvalue">external documentation</a>.
+-spec getRowLabelValue(This, Row) -> string() when
+	This::wxGrid(), Row::integer().
 getRowLabelValue(#wx_ref{type=ThisT,ref=ThisRef},Row)
  when is_integer(Row) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_GetRowLabelValue,
   <<ThisRef:32/?UI,Row:32/?UI>>).
 
-%% @spec (This::wxGrid(), Row::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetrowsize">external documentation</a>.
+-spec getRowSize(This, Row) -> integer() when
+	This::wxGrid(), Row::integer().
 getRowSize(#wx_ref{type=ThisT,ref=ThisRef},Row)
  when is_integer(Row) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_GetRowSize,
   <<ThisRef:32/?UI,Row:32/?UI>>).
 
-%% @spec (This::wxGrid()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetscrolllinex">external documentation</a>.
+-spec getScrollLineX(This) -> integer() when
+	This::wxGrid().
 getScrollLineX(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_GetScrollLineX,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetscrollliney">external documentation</a>.
+-spec getScrollLineY(This) -> integer() when
+	This::wxGrid().
 getScrollLineY(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_GetScrollLineY,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid()) -> [{R::integer(), C::integer()}]
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetselectedcells">external documentation</a>.
+-spec getSelectedCells(This) -> [{R::integer(), C::integer()}] when
+	This::wxGrid().
 getSelectedCells(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_GetSelectedCells,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid()) -> [integer()]
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetselectedcols">external documentation</a>.
+-spec getSelectedCols(This) -> [integer()] when
+	This::wxGrid().
 getSelectedCols(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_GetSelectedCols,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid()) -> [integer()]
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetselectedrows">external documentation</a>.
+-spec getSelectedRows(This) -> [integer()] when
+	This::wxGrid().
 getSelectedRows(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_GetSelectedRows,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid()) -> wx:colour()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetselectionbackground">external documentation</a>.
+-spec getSelectionBackground(This) -> wx:wx_colour() when
+	This::wxGrid().
 getSelectionBackground(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_GetSelectionBackground,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid()) -> [{R::integer(), C::integer()}]
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetselectionblocktopleft">external documentation</a>.
+-spec getSelectionBlockTopLeft(This) -> [{R::integer(), C::integer()}] when
+	This::wxGrid().
 getSelectionBlockTopLeft(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_GetSelectionBlockTopLeft,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid()) -> [{R::integer(), C::integer()}]
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetselectionblockbottomright">external documentation</a>.
+-spec getSelectionBlockBottomRight(This) -> [{R::integer(), C::integer()}] when
+	This::wxGrid().
 getSelectionBlockBottomRight(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_GetSelectionBlockBottomRight,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid()) -> wx:colour()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetselectionforeground">external documentation</a>.
+-spec getSelectionForeground(This) -> wx:wx_colour() when
+	This::wxGrid().
 getSelectionForeground(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_GetSelectionForeground,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetviewwidth">external documentation</a>.
+-spec getViewWidth(This) -> integer() when
+	This::wxGrid().
 getViewWidth(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_GetViewWidth,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid()) -> wxWindow:wxWindow()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetgridwindow">external documentation</a>.
+-spec getGridWindow(This) -> wxWindow:wxWindow() when
+	This::wxGrid().
 getGridWindow(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_GetGridWindow,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid()) -> wxWindow:wxWindow()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetgridrowlabelwindow">external documentation</a>.
+-spec getGridRowLabelWindow(This) -> wxWindow:wxWindow() when
+	This::wxGrid().
 getGridRowLabelWindow(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_GetGridRowLabelWindow,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid()) -> wxWindow:wxWindow()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetgridcollabelwindow">external documentation</a>.
+-spec getGridColLabelWindow(This) -> wxWindow:wxWindow() when
+	This::wxGrid().
 getGridColLabelWindow(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_GetGridColLabelWindow,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid()) -> wxWindow:wxWindow()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetgridcornerlabelwindow">external documentation</a>.
+-spec getGridCornerLabelWindow(This) -> wxWindow:wxWindow() when
+	This::wxGrid().
 getGridCornerLabelWindow(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_GetGridCornerLabelWindow,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridhidecelleditcontrol">external documentation</a>.
+-spec hideCellEditControl(This) -> ok when
+	This::wxGrid().
 hideCellEditControl(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:cast(?wxGrid_HideCellEditControl,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid()) -> bool()
 %% @equiv insertCols(This, [])
+-spec insertCols(This) -> boolean() when
+	This::wxGrid().
+
 insertCols(This)
  when is_record(This, wx_ref) ->
   insertCols(This, []).
 
-%% @spec (This::wxGrid(), [Option]) -> bool()
-%% Option = {pos, integer()} | {numCols, integer()} | {updateLabels, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridinsertcols">external documentation</a>.
+-spec insertCols(This, [Option]) -> boolean() when
+	This::wxGrid(),
+	Option :: {pos, integer()}
+		 | {numCols, integer()}
+		 | {updateLabels, boolean()}.
 insertCols(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxGrid),
@@ -1024,15 +1159,20 @@ insertCols(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxGrid_InsertCols,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxGrid()) -> bool()
 %% @equiv insertRows(This, [])
+-spec insertRows(This) -> boolean() when
+	This::wxGrid().
+
 insertRows(This)
  when is_record(This, wx_ref) ->
   insertRows(This, []).
 
-%% @spec (This::wxGrid(), [Option]) -> bool()
-%% Option = {pos, integer()} | {numRows, integer()} | {updateLabels, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridinsertrows">external documentation</a>.
+-spec insertRows(This, [Option]) -> boolean() when
+	This::wxGrid(),
+	Option :: {pos, integer()}
+		 | {numRows, integer()}
+		 | {updateLabels, boolean()}.
 insertRows(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxGrid),
@@ -1044,73 +1184,79 @@ insertRows(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxGrid_InsertRows,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxGrid()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridiscelleditcontrolenabled">external documentation</a>.
+-spec isCellEditControlEnabled(This) -> boolean() when
+	This::wxGrid().
 isCellEditControlEnabled(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_IsCellEditControlEnabled,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridiscurrentcellreadonly">external documentation</a>.
+-spec isCurrentCellReadOnly(This) -> boolean() when
+	This::wxGrid().
 isCurrentCellReadOnly(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_IsCurrentCellReadOnly,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridiseditable">external documentation</a>.
+-spec isEditable(This) -> boolean() when
+	This::wxGrid().
 isEditable(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_IsEditable,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid(), Coords::{R::integer(), C::integer()}) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridisinselection">external documentation</a>.
+-spec isInSelection(This, Coords) -> boolean() when
+	This::wxGrid(), Coords::{R::integer(), C::integer()}.
 isInSelection(#wx_ref{type=ThisT,ref=ThisRef},{CoordsR,CoordsC})
  when is_integer(CoordsR),is_integer(CoordsC) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_IsInSelection_1,
   <<ThisRef:32/?UI,CoordsR:32/?UI,CoordsC:32/?UI>>).
 
-%% @spec (This::wxGrid(), Row::integer(), Col::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridisinselection">external documentation</a>.
+-spec isInSelection(This, Row, Col) -> boolean() when
+	This::wxGrid(), Row::integer(), Col::integer().
 isInSelection(#wx_ref{type=ThisT,ref=ThisRef},Row,Col)
  when is_integer(Row),is_integer(Col) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_IsInSelection_2,
   <<ThisRef:32/?UI,Row:32/?UI,Col:32/?UI>>).
 
-%% @spec (This::wxGrid(), Row::integer(), Col::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridisreadonly">external documentation</a>.
+-spec isReadOnly(This, Row, Col) -> boolean() when
+	This::wxGrid(), Row::integer(), Col::integer().
 isReadOnly(#wx_ref{type=ThisT,ref=ThisRef},Row,Col)
  when is_integer(Row),is_integer(Col) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_IsReadOnly,
   <<ThisRef:32/?UI,Row:32/?UI,Col:32/?UI>>).
 
-%% @spec (This::wxGrid()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridisselection">external documentation</a>.
+-spec isSelection(This) -> boolean() when
+	This::wxGrid().
 isSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_IsSelection,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid(), Coords::{R::integer(), C::integer()}) -> bool()
 %% @equiv isVisible(This,Coords, [])
+-spec isVisible(This, Coords) -> boolean() when
+	This::wxGrid(), Coords::{R::integer(), C::integer()}.
+
 isVisible(This,Coords={CoordsR,CoordsC})
  when is_record(This, wx_ref),is_integer(CoordsR),is_integer(CoordsC) ->
   isVisible(This,Coords, []).
 
-%% @spec (This::wxGrid(),X::integer()|term(),X::integer()|term()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridisvisible">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% isVisible(This::wxGrid(), Row::integer(), Col::integer()) -> isVisible(This,Row,Col, []) </c></p>
-%% <p><c>
-%% isVisible(This::wxGrid(), Coords::{R::integer(), C::integer()}, [Option]) -> bool() </c>
-%%<br /> Option = {wholeCellVisible, bool()}
-%% </p>
+-spec isVisible(This, Row, Col) -> boolean() when
+	This::wxGrid(), Row::integer(), Col::integer();
+      (This, Coords, [Option]) -> boolean() when
+	This::wxGrid(), Coords::{R::integer(), C::integer()},
+	Option :: {wholeCellVisible, boolean()}.
 
 isVisible(This,Row,Col)
  when is_record(This, wx_ref),is_integer(Row),is_integer(Col) ->
@@ -1124,9 +1270,10 @@ isVisible(#wx_ref{type=ThisT,ref=ThisRef},{CoordsR,CoordsC}, Options)
   wxe_util:call(?wxGrid_IsVisible_2,
   <<ThisRef:32/?UI,CoordsR:32/?UI,CoordsC:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxGrid(), Row::integer(), Col::integer(), [Option]) -> bool()
-%% Option = {wholeCellVisible, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridisvisible">external documentation</a>.
+-spec isVisible(This, Row, Col, [Option]) -> boolean() when
+	This::wxGrid(), Row::integer(), Col::integer(),
+	Option :: {wholeCellVisible, boolean()}.
 isVisible(#wx_ref{type=ThisT,ref=ThisRef},Row,Col, Options)
  when is_integer(Row),is_integer(Col),is_list(Options) ->
   ?CLASS(ThisT,wxGrid),
@@ -1136,102 +1283,115 @@ isVisible(#wx_ref{type=ThisT,ref=ThisRef},Row,Col, Options)
   wxe_util:call(?wxGrid_IsVisible_3,
   <<ThisRef:32/?UI,Row:32/?UI,Col:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxGrid(), Coords::{R::integer(), C::integer()}) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridmakecellvisible">external documentation</a>.
+-spec makeCellVisible(This, Coords) -> ok when
+	This::wxGrid(), Coords::{R::integer(), C::integer()}.
 makeCellVisible(#wx_ref{type=ThisT,ref=ThisRef},{CoordsR,CoordsC})
  when is_integer(CoordsR),is_integer(CoordsC) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:cast(?wxGrid_MakeCellVisible_1,
   <<ThisRef:32/?UI,CoordsR:32/?UI,CoordsC:32/?UI>>).
 
-%% @spec (This::wxGrid(), Row::integer(), Col::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridmakecellvisible">external documentation</a>.
+-spec makeCellVisible(This, Row, Col) -> ok when
+	This::wxGrid(), Row::integer(), Col::integer().
 makeCellVisible(#wx_ref{type=ThisT,ref=ThisRef},Row,Col)
  when is_integer(Row),is_integer(Col) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:cast(?wxGrid_MakeCellVisible_2,
   <<ThisRef:32/?UI,Row:32/?UI,Col:32/?UI>>).
 
-%% @spec (This::wxGrid(), ExpandSelection::bool()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridmovecursordown">external documentation</a>.
+-spec moveCursorDown(This, ExpandSelection) -> boolean() when
+	This::wxGrid(), ExpandSelection::boolean().
 moveCursorDown(#wx_ref{type=ThisT,ref=ThisRef},ExpandSelection)
  when is_boolean(ExpandSelection) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_MoveCursorDown,
   <<ThisRef:32/?UI,(wxe_util:from_bool(ExpandSelection)):32/?UI>>).
 
-%% @spec (This::wxGrid(), ExpandSelection::bool()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridmovecursorleft">external documentation</a>.
+-spec moveCursorLeft(This, ExpandSelection) -> boolean() when
+	This::wxGrid(), ExpandSelection::boolean().
 moveCursorLeft(#wx_ref{type=ThisT,ref=ThisRef},ExpandSelection)
  when is_boolean(ExpandSelection) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_MoveCursorLeft,
   <<ThisRef:32/?UI,(wxe_util:from_bool(ExpandSelection)):32/?UI>>).
 
-%% @spec (This::wxGrid(), ExpandSelection::bool()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridmovecursorright">external documentation</a>.
+-spec moveCursorRight(This, ExpandSelection) -> boolean() when
+	This::wxGrid(), ExpandSelection::boolean().
 moveCursorRight(#wx_ref{type=ThisT,ref=ThisRef},ExpandSelection)
  when is_boolean(ExpandSelection) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_MoveCursorRight,
   <<ThisRef:32/?UI,(wxe_util:from_bool(ExpandSelection)):32/?UI>>).
 
-%% @spec (This::wxGrid(), ExpandSelection::bool()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridmovecursorup">external documentation</a>.
+-spec moveCursorUp(This, ExpandSelection) -> boolean() when
+	This::wxGrid(), ExpandSelection::boolean().
 moveCursorUp(#wx_ref{type=ThisT,ref=ThisRef},ExpandSelection)
  when is_boolean(ExpandSelection) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_MoveCursorUp,
   <<ThisRef:32/?UI,(wxe_util:from_bool(ExpandSelection)):32/?UI>>).
 
-%% @spec (This::wxGrid(), ExpandSelection::bool()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridmovecursordownblock">external documentation</a>.
+-spec moveCursorDownBlock(This, ExpandSelection) -> boolean() when
+	This::wxGrid(), ExpandSelection::boolean().
 moveCursorDownBlock(#wx_ref{type=ThisT,ref=ThisRef},ExpandSelection)
  when is_boolean(ExpandSelection) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_MoveCursorDownBlock,
   <<ThisRef:32/?UI,(wxe_util:from_bool(ExpandSelection)):32/?UI>>).
 
-%% @spec (This::wxGrid(), ExpandSelection::bool()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridmovecursorleftblock">external documentation</a>.
+-spec moveCursorLeftBlock(This, ExpandSelection) -> boolean() when
+	This::wxGrid(), ExpandSelection::boolean().
 moveCursorLeftBlock(#wx_ref{type=ThisT,ref=ThisRef},ExpandSelection)
  when is_boolean(ExpandSelection) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_MoveCursorLeftBlock,
   <<ThisRef:32/?UI,(wxe_util:from_bool(ExpandSelection)):32/?UI>>).
 
-%% @spec (This::wxGrid(), ExpandSelection::bool()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridmovecursorrightblock">external documentation</a>.
+-spec moveCursorRightBlock(This, ExpandSelection) -> boolean() when
+	This::wxGrid(), ExpandSelection::boolean().
 moveCursorRightBlock(#wx_ref{type=ThisT,ref=ThisRef},ExpandSelection)
  when is_boolean(ExpandSelection) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_MoveCursorRightBlock,
   <<ThisRef:32/?UI,(wxe_util:from_bool(ExpandSelection)):32/?UI>>).
 
-%% @spec (This::wxGrid(), ExpandSelection::bool()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridmovecursorupblock">external documentation</a>.
+-spec moveCursorUpBlock(This, ExpandSelection) -> boolean() when
+	This::wxGrid(), ExpandSelection::boolean().
 moveCursorUpBlock(#wx_ref{type=ThisT,ref=ThisRef},ExpandSelection)
  when is_boolean(ExpandSelection) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_MoveCursorUpBlock,
   <<ThisRef:32/?UI,(wxe_util:from_bool(ExpandSelection)):32/?UI>>).
 
-%% @spec (This::wxGrid()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridmovepagedown">external documentation</a>.
+-spec movePageDown(This) -> boolean() when
+	This::wxGrid().
 movePageDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_MovePageDown,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridmovepageup">external documentation</a>.
+-spec movePageUp(This) -> boolean() when
+	This::wxGrid().
 movePageUp(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_MovePageUp,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid(), TypeName::string(), Renderer::wxGridCellRenderer:wxGridCellRenderer(), Editor::wxGridCellEditor:wxGridCellEditor()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridregisterdatatype">external documentation</a>.
+-spec registerDataType(This, TypeName, Renderer, Editor) -> ok when
+	This::wxGrid(), TypeName::string(), Renderer::wxGridCellRenderer:wxGridCellRenderer(), Editor::wxGridCellEditor:wxGridCellEditor().
 registerDataType(#wx_ref{type=ThisT,ref=ThisRef},TypeName,#wx_ref{type=RendererT,ref=RendererRef},#wx_ref{type=EditorT,ref=EditorRef})
  when is_list(TypeName) ->
   ?CLASS(ThisT,wxGrid),
@@ -1241,29 +1401,34 @@ registerDataType(#wx_ref{type=ThisT,ref=ThisRef},TypeName,#wx_ref{type=RendererT
   wxe_util:cast(?wxGrid_RegisterDataType,
   <<ThisRef:32/?UI,(byte_size(TypeName_UC)):32/?UI,(TypeName_UC)/binary, 0:(((8- ((0+byte_size(TypeName_UC)) band 16#7)) band 16#7))/unit:8,RendererRef:32/?UI,EditorRef:32/?UI>>).
 
-%% @spec (This::wxGrid()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsaveeditcontrolvalue">external documentation</a>.
+-spec saveEditControlValue(This) -> ok when
+	This::wxGrid().
 saveEditControlValue(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:cast(?wxGrid_SaveEditControlValue,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridselectall">external documentation</a>.
+-spec selectAll(This) -> ok when
+	This::wxGrid().
 selectAll(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:cast(?wxGrid_SelectAll,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid(), TopLeft::{R::integer(), C::integer()}, BottomRight::{R::integer(), C::integer()}) -> ok
 %% @equiv selectBlock(This,TopLeft,BottomRight, [])
+-spec selectBlock(This, TopLeft, BottomRight) -> ok when
+	This::wxGrid(), TopLeft::{R::integer(), C::integer()}, BottomRight::{R::integer(), C::integer()}.
+
 selectBlock(This,TopLeft={TopLeftR,TopLeftC},BottomRight={BottomRightR,BottomRightC})
  when is_record(This, wx_ref),is_integer(TopLeftR),is_integer(TopLeftC),is_integer(BottomRightR),is_integer(BottomRightC) ->
   selectBlock(This,TopLeft,BottomRight, []).
 
-%% @spec (This::wxGrid(), TopLeft::{R::integer(), C::integer()}, BottomRight::{R::integer(), C::integer()}, [Option]) -> ok
-%% Option = {addToSelected, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridselectblock">external documentation</a>.
+-spec selectBlock(This, TopLeft, BottomRight, [Option]) -> ok when
+	This::wxGrid(), TopLeft::{R::integer(), C::integer()}, BottomRight::{R::integer(), C::integer()},
+	Option :: {addToSelected, boolean()}.
 selectBlock(#wx_ref{type=ThisT,ref=ThisRef},{TopLeftR,TopLeftC},{BottomRightR,BottomRightC}, Options)
  when is_integer(TopLeftR),is_integer(TopLeftC),is_integer(BottomRightR),is_integer(BottomRightC),is_list(Options) ->
   ?CLASS(ThisT,wxGrid),
@@ -1273,15 +1438,18 @@ selectBlock(#wx_ref{type=ThisT,ref=ThisRef},{TopLeftR,TopLeftC},{BottomRightR,Bo
   wxe_util:cast(?wxGrid_SelectBlock_3,
   <<ThisRef:32/?UI,TopLeftR:32/?UI,TopLeftC:32/?UI,BottomRightR:32/?UI,BottomRightC:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxGrid(), TopRow::integer(), LeftCol::integer(), BottomRow::integer(), RightCol::integer()) -> ok
 %% @equiv selectBlock(This,TopRow,LeftCol,BottomRow,RightCol, [])
+-spec selectBlock(This, TopRow, LeftCol, BottomRow, RightCol) -> ok when
+	This::wxGrid(), TopRow::integer(), LeftCol::integer(), BottomRow::integer(), RightCol::integer().
+
 selectBlock(This,TopRow,LeftCol,BottomRow,RightCol)
  when is_record(This, wx_ref),is_integer(TopRow),is_integer(LeftCol),is_integer(BottomRow),is_integer(RightCol) ->
   selectBlock(This,TopRow,LeftCol,BottomRow,RightCol, []).
 
-%% @spec (This::wxGrid(), TopRow::integer(), LeftCol::integer(), BottomRow::integer(), RightCol::integer(), [Option]) -> ok
-%% Option = {addToSelected, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridselectblock">external documentation</a>.
+-spec selectBlock(This, TopRow, LeftCol, BottomRow, RightCol, [Option]) -> ok when
+	This::wxGrid(), TopRow::integer(), LeftCol::integer(), BottomRow::integer(), RightCol::integer(),
+	Option :: {addToSelected, boolean()}.
 selectBlock(#wx_ref{type=ThisT,ref=ThisRef},TopRow,LeftCol,BottomRow,RightCol, Options)
  when is_integer(TopRow),is_integer(LeftCol),is_integer(BottomRow),is_integer(RightCol),is_list(Options) ->
   ?CLASS(ThisT,wxGrid),
@@ -1291,15 +1459,18 @@ selectBlock(#wx_ref{type=ThisT,ref=ThisRef},TopRow,LeftCol,BottomRow,RightCol, O
   wxe_util:cast(?wxGrid_SelectBlock_5,
   <<ThisRef:32/?UI,TopRow:32/?UI,LeftCol:32/?UI,BottomRow:32/?UI,RightCol:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxGrid(), Col::integer()) -> ok
 %% @equiv selectCol(This,Col, [])
+-spec selectCol(This, Col) -> ok when
+	This::wxGrid(), Col::integer().
+
 selectCol(This,Col)
  when is_record(This, wx_ref),is_integer(Col) ->
   selectCol(This,Col, []).
 
-%% @spec (This::wxGrid(), Col::integer(), [Option]) -> ok
-%% Option = {addToSelected, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridselectcol">external documentation</a>.
+-spec selectCol(This, Col, [Option]) -> ok when
+	This::wxGrid(), Col::integer(),
+	Option :: {addToSelected, boolean()}.
 selectCol(#wx_ref{type=ThisT,ref=ThisRef},Col, Options)
  when is_integer(Col),is_list(Options) ->
   ?CLASS(ThisT,wxGrid),
@@ -1309,15 +1480,18 @@ selectCol(#wx_ref{type=ThisT,ref=ThisRef},Col, Options)
   wxe_util:cast(?wxGrid_SelectCol,
   <<ThisRef:32/?UI,Col:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxGrid(), Row::integer()) -> ok
 %% @equiv selectRow(This,Row, [])
+-spec selectRow(This, Row) -> ok when
+	This::wxGrid(), Row::integer().
+
 selectRow(This,Row)
  when is_record(This, wx_ref),is_integer(Row) ->
   selectRow(This,Row, []).
 
-%% @spec (This::wxGrid(), Row::integer(), [Option]) -> ok
-%% Option = {addToSelected, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridselectrow">external documentation</a>.
+-spec selectRow(This, Row, [Option]) -> ok when
+	This::wxGrid(), Row::integer(),
+	Option :: {addToSelected, boolean()}.
 selectRow(#wx_ref{type=ThisT,ref=ThisRef},Row, Options)
  when is_integer(Row),is_list(Options) ->
   ?CLASS(ThisT,wxGrid),
@@ -1327,47 +1501,47 @@ selectRow(#wx_ref{type=ThisT,ref=ThisRef},Row, Options)
   wxe_util:cast(?wxGrid_SelectRow,
   <<ThisRef:32/?UI,Row:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxGrid(), Align::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetcellalignment">external documentation</a>.
+-spec setCellAlignment(This, Align) -> ok when
+	This::wxGrid(), Align::integer().
 setCellAlignment(#wx_ref{type=ThisT,ref=ThisRef},Align)
  when is_integer(Align) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:cast(?wxGrid_SetCellAlignment_1,
   <<ThisRef:32/?UI,Align:32/?UI>>).
 
-%% @spec (This::wxGrid(), Align::integer(), Row::integer(), Col::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetcellalignment">external documentation</a>.
+-spec setCellAlignment(This, Align, Row, Col) -> ok when
+	This::wxGrid(), Align::integer(), Row::integer(), Col::integer().
 setCellAlignment(#wx_ref{type=ThisT,ref=ThisRef},Align,Row,Col)
  when is_integer(Align),is_integer(Row),is_integer(Col) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:cast(?wxGrid_SetCellAlignment_3,
   <<ThisRef:32/?UI,Align:32/?UI,Row:32/?UI,Col:32/?UI>>).
 
-%% @spec (This::wxGrid(), Row::integer(), Col::integer(), Horiz::integer(), Vert::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetcellalignment">external documentation</a>.
+-spec setCellAlignment(This, Row, Col, Horiz, Vert) -> ok when
+	This::wxGrid(), Row::integer(), Col::integer(), Horiz::integer(), Vert::integer().
 setCellAlignment(#wx_ref{type=ThisT,ref=ThisRef},Row,Col,Horiz,Vert)
  when is_integer(Row),is_integer(Col),is_integer(Horiz),is_integer(Vert) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:cast(?wxGrid_SetCellAlignment_4,
   <<ThisRef:32/?UI,Row:32/?UI,Col:32/?UI,Horiz:32/?UI,Vert:32/?UI>>).
 
-%% @spec (This::wxGrid(), Col::wx:colour()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetcellbackgroundcolour">external documentation</a>.
+-spec setCellBackgroundColour(This, Col) -> ok when
+	This::wxGrid(), Col::wx:wx_colour().
 setCellBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef},Col)
  when tuple_size(Col) =:= 3; tuple_size(Col) =:= 4 ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:cast(?wxGrid_SetCellBackgroundColour_1,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(Col)):16/binary>>).
 
-%% @spec (This::wxGrid(),X::integer()|term(),X::integer(),X::term()|integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetcellbackgroundcolour">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% setCellBackgroundColour(This::wxGrid(), Row::integer(), Col::integer(), Val::wx:colour()) -> ok </c>
-%% </p>
-%% <p><c>
-%% setCellBackgroundColour(This::wxGrid(), Colour::wx:colour(), Row::integer(), Col::integer()) -> ok </c>
-%% </p>
+-spec setCellBackgroundColour(This, Row, Col, Val) -> ok when
+	This::wxGrid(), Row::integer(), Col::integer(), Val::wx:wx_colour();
+      (This, Colour, Row, Col) -> ok when
+	This::wxGrid(), Colour::wx:wx_colour(), Row::integer(), Col::integer().
 setCellBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef},Row,Col,Val)
  when is_integer(Row),is_integer(Col),tuple_size(Val) =:= 3; tuple_size(Val) =:= 4 ->
   ?CLASS(ThisT,wxGrid),
@@ -1379,8 +1553,9 @@ setCellBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef},Colour,Row,Col)
   wxe_util:cast(?wxGrid_SetCellBackgroundColour_3_1,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(Colour)):16/binary,Row:32/?UI,Col:32/?UI>>).
 
-%% @spec (This::wxGrid(), Row::integer(), Col::integer(), Editor::wxGridCellEditor:wxGridCellEditor()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetcelleditor">external documentation</a>.
+-spec setCellEditor(This, Row, Col, Editor) -> ok when
+	This::wxGrid(), Row::integer(), Col::integer(), Editor::wxGridCellEditor:wxGridCellEditor().
 setCellEditor(#wx_ref{type=ThisT,ref=ThisRef},Row,Col,#wx_ref{type=EditorT,ref=EditorRef})
  when is_integer(Row),is_integer(Col) ->
   ?CLASS(ThisT,wxGrid),
@@ -1388,8 +1563,9 @@ setCellEditor(#wx_ref{type=ThisT,ref=ThisRef},Row,Col,#wx_ref{type=EditorT,ref=E
   wxe_util:cast(?wxGrid_SetCellEditor,
   <<ThisRef:32/?UI,Row:32/?UI,Col:32/?UI,EditorRef:32/?UI>>).
 
-%% @spec (This::wxGrid(), Row::integer(), Col::integer(), Val::wxFont:wxFont()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetcellfont">external documentation</a>.
+-spec setCellFont(This, Row, Col, Val) -> ok when
+	This::wxGrid(), Row::integer(), Col::integer(), Val::wxFont:wxFont().
 setCellFont(#wx_ref{type=ThisT,ref=ThisRef},Row,Col,#wx_ref{type=ValT,ref=ValRef})
  when is_integer(Row),is_integer(Col) ->
   ?CLASS(ThisT,wxGrid),
@@ -1397,8 +1573,9 @@ setCellFont(#wx_ref{type=ThisT,ref=ThisRef},Row,Col,#wx_ref{type=ValT,ref=ValRef
   wxe_util:cast(?wxGrid_SetCellFont,
   <<ThisRef:32/?UI,Row:32/?UI,Col:32/?UI,ValRef:32/?UI>>).
 
-%% @spec (This::wxGrid(), Row::integer(), Col::integer(), Renderer::wxGridCellRenderer:wxGridCellRenderer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetcellrenderer">external documentation</a>.
+-spec setCellRenderer(This, Row, Col, Renderer) -> ok when
+	This::wxGrid(), Row::integer(), Col::integer(), Renderer::wxGridCellRenderer:wxGridCellRenderer().
 setCellRenderer(#wx_ref{type=ThisT,ref=ThisRef},Row,Col,#wx_ref{type=RendererT,ref=RendererRef})
  when is_integer(Row),is_integer(Col) ->
   ?CLASS(ThisT,wxGrid),
@@ -1406,23 +1583,20 @@ setCellRenderer(#wx_ref{type=ThisT,ref=ThisRef},Row,Col,#wx_ref{type=RendererT,r
   wxe_util:cast(?wxGrid_SetCellRenderer,
   <<ThisRef:32/?UI,Row:32/?UI,Col:32/?UI,RendererRef:32/?UI>>).
 
-%% @spec (This::wxGrid(), Col::wx:colour()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetcelltextcolour">external documentation</a>.
+-spec setCellTextColour(This, Col) -> ok when
+	This::wxGrid(), Col::wx:wx_colour().
 setCellTextColour(#wx_ref{type=ThisT,ref=ThisRef},Col)
  when tuple_size(Col) =:= 3; tuple_size(Col) =:= 4 ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:cast(?wxGrid_SetCellTextColour_1,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(Col)):16/binary>>).
 
-%% @spec (This::wxGrid(),X::integer()|term(),X::integer(),X::term()|integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetcelltextcolour">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% setCellTextColour(This::wxGrid(), Row::integer(), Col::integer(), Val::wx:colour()) -> ok </c>
-%% </p>
-%% <p><c>
-%% setCellTextColour(This::wxGrid(), Val::wx:colour(), Row::integer(), Col::integer()) -> ok </c>
-%% </p>
+-spec setCellTextColour(This, Row, Col, Val) -> ok when
+	This::wxGrid(), Row::integer(), Col::integer(), Val::wx:wx_colour();
+      (This, Val, Row, Col) -> ok when
+	This::wxGrid(), Val::wx:wx_colour(), Row::integer(), Col::integer().
 setCellTextColour(#wx_ref{type=ThisT,ref=ThisRef},Row,Col,Val)
  when is_integer(Row),is_integer(Col),tuple_size(Val) =:= 3; tuple_size(Val) =:= 4 ->
   ?CLASS(ThisT,wxGrid),
@@ -1434,8 +1608,9 @@ setCellTextColour(#wx_ref{type=ThisT,ref=ThisRef},Val,Row,Col)
   wxe_util:cast(?wxGrid_SetCellTextColour_3_1,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(Val)):16/binary,Row:32/?UI,Col:32/?UI>>).
 
-%% @spec (This::wxGrid(), Coords::{R::integer(), C::integer()}, S::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetcellvalue">external documentation</a>.
+-spec setCellValue(This, Coords, S) -> ok when
+	This::wxGrid(), Coords::{R::integer(), C::integer()}, S::string().
 setCellValue(#wx_ref{type=ThisT,ref=ThisRef},{CoordsR,CoordsC},S)
  when is_integer(CoordsR),is_integer(CoordsC),is_list(S) ->
   ?CLASS(ThisT,wxGrid),
@@ -1443,15 +1618,11 @@ setCellValue(#wx_ref{type=ThisT,ref=ThisRef},{CoordsR,CoordsC},S)
   wxe_util:cast(?wxGrid_SetCellValue_2,
   <<ThisRef:32/?UI,CoordsR:32/?UI,CoordsC:32/?UI,(byte_size(S_UC)):32/?UI,(S_UC)/binary, 0:(((8- ((0+byte_size(S_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxGrid(),X::integer()|string(),X::integer(),X::string()|integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetcellvalue">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% setCellValue(This::wxGrid(), Row::integer(), Col::integer(), S::string()) -> ok </c>
-%% </p>
-%% <p><c>
-%% setCellValue(This::wxGrid(), Val::string(), Row::integer(), Col::integer()) -> ok </c>
-%% </p>
+-spec setCellValue(This, Row, Col, S) -> ok when
+	This::wxGrid(), Row::integer(), Col::integer(), S::string();
+      (This, Val, Row, Col) -> ok when
+	This::wxGrid(), Val::string(), Row::integer(), Col::integer().
 setCellValue(#wx_ref{type=ThisT,ref=ThisRef},Row,Col,S)
  when is_integer(Row),is_integer(Col),is_list(S) ->
   ?CLASS(ThisT,wxGrid),
@@ -1465,8 +1636,9 @@ setCellValue(#wx_ref{type=ThisT,ref=ThisRef},Val,Row,Col)
   wxe_util:cast(?wxGrid_SetCellValue_3_1,
   <<ThisRef:32/?UI,(byte_size(Val_UC)):32/?UI,(Val_UC)/binary, 0:(((8- ((0+byte_size(Val_UC)) band 16#7)) band 16#7))/unit:8,Row:32/?UI,Col:32/?UI>>).
 
-%% @spec (This::wxGrid(), Col::integer(), Attr::wxGridCellAttr:wxGridCellAttr()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetcolattr">external documentation</a>.
+-spec setColAttr(This, Col, Attr) -> ok when
+	This::wxGrid(), Col::integer(), Attr::wxGridCellAttr:wxGridCellAttr().
 setColAttr(#wx_ref{type=ThisT,ref=ThisRef},Col,#wx_ref{type=AttrT,ref=AttrRef})
  when is_integer(Col) ->
   ?CLASS(ThisT,wxGrid),
@@ -1474,31 +1646,37 @@ setColAttr(#wx_ref{type=ThisT,ref=ThisRef},Col,#wx_ref{type=AttrT,ref=AttrRef})
   wxe_util:cast(?wxGrid_SetColAttr,
   <<ThisRef:32/?UI,Col:32/?UI,AttrRef:32/?UI>>).
 
-%% @spec (This::wxGrid(), Col::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetcolformatbool">external documentation</a>.
+-spec setColFormatBool(This, Col) -> ok when
+	This::wxGrid(), Col::integer().
 setColFormatBool(#wx_ref{type=ThisT,ref=ThisRef},Col)
  when is_integer(Col) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:cast(?wxGrid_SetColFormatBool,
   <<ThisRef:32/?UI,Col:32/?UI>>).
 
-%% @spec (This::wxGrid(), Col::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetcolformatnumber">external documentation</a>.
+-spec setColFormatNumber(This, Col) -> ok when
+	This::wxGrid(), Col::integer().
 setColFormatNumber(#wx_ref{type=ThisT,ref=ThisRef},Col)
  when is_integer(Col) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:cast(?wxGrid_SetColFormatNumber,
   <<ThisRef:32/?UI,Col:32/?UI>>).
 
-%% @spec (This::wxGrid(), Col::integer()) -> ok
 %% @equiv setColFormatFloat(This,Col, [])
+-spec setColFormatFloat(This, Col) -> ok when
+	This::wxGrid(), Col::integer().
+
 setColFormatFloat(This,Col)
  when is_record(This, wx_ref),is_integer(Col) ->
   setColFormatFloat(This,Col, []).
 
-%% @spec (This::wxGrid(), Col::integer(), [Option]) -> ok
-%% Option = {width, integer()} | {precision, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetcolformatfloat">external documentation</a>.
+-spec setColFormatFloat(This, Col, [Option]) -> ok when
+	This::wxGrid(), Col::integer(),
+	Option :: {width, integer()}
+		 | {precision, integer()}.
 setColFormatFloat(#wx_ref{type=ThisT,ref=ThisRef},Col, Options)
  when is_integer(Col),is_list(Options) ->
   ?CLASS(ThisT,wxGrid),
@@ -1509,8 +1687,9 @@ setColFormatFloat(#wx_ref{type=ThisT,ref=ThisRef},Col, Options)
   wxe_util:cast(?wxGrid_SetColFormatFloat,
   <<ThisRef:32/?UI,Col:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxGrid(), Col::integer(), TypeName::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetcolformatcustom">external documentation</a>.
+-spec setColFormatCustom(This, Col, TypeName) -> ok when
+	This::wxGrid(), Col::integer(), TypeName::string().
 setColFormatCustom(#wx_ref{type=ThisT,ref=ThisRef},Col,TypeName)
  when is_integer(Col),is_list(TypeName) ->
   ?CLASS(ThisT,wxGrid),
@@ -1518,24 +1697,27 @@ setColFormatCustom(#wx_ref{type=ThisT,ref=ThisRef},Col,TypeName)
   wxe_util:cast(?wxGrid_SetColFormatCustom,
   <<ThisRef:32/?UI,Col:32/?UI,(byte_size(TypeName_UC)):32/?UI,(TypeName_UC)/binary, 0:(((8- ((4+byte_size(TypeName_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxGrid(), Horiz::integer(), Vert::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetcollabelalignment">external documentation</a>.
+-spec setColLabelAlignment(This, Horiz, Vert) -> ok when
+	This::wxGrid(), Horiz::integer(), Vert::integer().
 setColLabelAlignment(#wx_ref{type=ThisT,ref=ThisRef},Horiz,Vert)
  when is_integer(Horiz),is_integer(Vert) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:cast(?wxGrid_SetColLabelAlignment,
   <<ThisRef:32/?UI,Horiz:32/?UI,Vert:32/?UI>>).
 
-%% @spec (This::wxGrid(), Height::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetcollabelsize">external documentation</a>.
+-spec setColLabelSize(This, Height) -> ok when
+	This::wxGrid(), Height::integer().
 setColLabelSize(#wx_ref{type=ThisT,ref=ThisRef},Height)
  when is_integer(Height) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:cast(?wxGrid_SetColLabelSize,
   <<ThisRef:32/?UI,Height:32/?UI>>).
 
-%% @spec (This::wxGrid(), Col::integer(), Val::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetcollabelvalue">external documentation</a>.
+-spec setColLabelValue(This, Col, Val) -> ok when
+	This::wxGrid(), Col::integer(), Val::string().
 setColLabelValue(#wx_ref{type=ThisT,ref=ThisRef},Col,Val)
  when is_integer(Col),is_list(Val) ->
   ?CLASS(ThisT,wxGrid),
@@ -1543,87 +1725,99 @@ setColLabelValue(#wx_ref{type=ThisT,ref=ThisRef},Col,Val)
   wxe_util:cast(?wxGrid_SetColLabelValue,
   <<ThisRef:32/?UI,Col:32/?UI,(byte_size(Val_UC)):32/?UI,(Val_UC)/binary, 0:(((8- ((4+byte_size(Val_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxGrid(), Col::integer(), Width::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetcolminimalwidth">external documentation</a>.
+-spec setColMinimalWidth(This, Col, Width) -> ok when
+	This::wxGrid(), Col::integer(), Width::integer().
 setColMinimalWidth(#wx_ref{type=ThisT,ref=ThisRef},Col,Width)
  when is_integer(Col),is_integer(Width) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:cast(?wxGrid_SetColMinimalWidth,
   <<ThisRef:32/?UI,Col:32/?UI,Width:32/?UI>>).
 
-%% @spec (This::wxGrid(), Width::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetcolminimalacceptablewidth">external documentation</a>.
+-spec setColMinimalAcceptableWidth(This, Width) -> ok when
+	This::wxGrid(), Width::integer().
 setColMinimalAcceptableWidth(#wx_ref{type=ThisT,ref=ThisRef},Width)
  when is_integer(Width) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:cast(?wxGrid_SetColMinimalAcceptableWidth,
   <<ThisRef:32/?UI,Width:32/?UI>>).
 
-%% @spec (This::wxGrid(), Col::integer(), Width::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetcolsize">external documentation</a>.
+-spec setColSize(This, Col, Width) -> ok when
+	This::wxGrid(), Col::integer(), Width::integer().
 setColSize(#wx_ref{type=ThisT,ref=ThisRef},Col,Width)
  when is_integer(Col),is_integer(Width) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:cast(?wxGrid_SetColSize,
   <<ThisRef:32/?UI,Col:32/?UI,Width:32/?UI>>).
 
-%% @spec (This::wxGrid(), Horiz::integer(), Vert::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetdefaultcellalignment">external documentation</a>.
+-spec setDefaultCellAlignment(This, Horiz, Vert) -> ok when
+	This::wxGrid(), Horiz::integer(), Vert::integer().
 setDefaultCellAlignment(#wx_ref{type=ThisT,ref=ThisRef},Horiz,Vert)
  when is_integer(Horiz),is_integer(Vert) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:cast(?wxGrid_SetDefaultCellAlignment,
   <<ThisRef:32/?UI,Horiz:32/?UI,Vert:32/?UI>>).
 
-%% @spec (This::wxGrid(), Val::wx:colour()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetdefaultcellbackgroundcolour">external documentation</a>.
+-spec setDefaultCellBackgroundColour(This, Val) -> ok when
+	This::wxGrid(), Val::wx:wx_colour().
 setDefaultCellBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef},Val)
  when tuple_size(Val) =:= 3; tuple_size(Val) =:= 4 ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:cast(?wxGrid_SetDefaultCellBackgroundColour,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(Val)):16/binary>>).
 
-%% @spec (This::wxGrid(), Val::wxFont:wxFont()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetdefaultcellfont">external documentation</a>.
+-spec setDefaultCellFont(This, Val) -> ok when
+	This::wxGrid(), Val::wxFont:wxFont().
 setDefaultCellFont(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ValT,ref=ValRef}) ->
   ?CLASS(ThisT,wxGrid),
   ?CLASS(ValT,wxFont),
   wxe_util:cast(?wxGrid_SetDefaultCellFont,
   <<ThisRef:32/?UI,ValRef:32/?UI>>).
 
-%% @spec (This::wxGrid(), Val::wx:colour()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetdefaultcelltextcolour">external documentation</a>.
+-spec setDefaultCellTextColour(This, Val) -> ok when
+	This::wxGrid(), Val::wx:wx_colour().
 setDefaultCellTextColour(#wx_ref{type=ThisT,ref=ThisRef},Val)
  when tuple_size(Val) =:= 3; tuple_size(Val) =:= 4 ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:cast(?wxGrid_SetDefaultCellTextColour,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(Val)):16/binary>>).
 
-%% @spec (This::wxGrid(), Editor::wxGridCellEditor:wxGridCellEditor()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetdefaulteditor">external documentation</a>.
+-spec setDefaultEditor(This, Editor) -> ok when
+	This::wxGrid(), Editor::wxGridCellEditor:wxGridCellEditor().
 setDefaultEditor(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=EditorT,ref=EditorRef}) ->
   ?CLASS(ThisT,wxGrid),
   ?CLASS(EditorT,wxGridCellEditor),
   wxe_util:cast(?wxGrid_SetDefaultEditor,
   <<ThisRef:32/?UI,EditorRef:32/?UI>>).
 
-%% @spec (This::wxGrid(), Renderer::wxGridCellRenderer:wxGridCellRenderer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetdefaultrenderer">external documentation</a>.
+-spec setDefaultRenderer(This, Renderer) -> ok when
+	This::wxGrid(), Renderer::wxGridCellRenderer:wxGridCellRenderer().
 setDefaultRenderer(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=RendererT,ref=RendererRef}) ->
   ?CLASS(ThisT,wxGrid),
   ?CLASS(RendererT,wxGridCellRenderer),
   wxe_util:cast(?wxGrid_SetDefaultRenderer,
   <<ThisRef:32/?UI,RendererRef:32/?UI>>).
 
-%% @spec (This::wxGrid(), Width::integer()) -> ok
 %% @equiv setDefaultColSize(This,Width, [])
+-spec setDefaultColSize(This, Width) -> ok when
+	This::wxGrid(), Width::integer().
+
 setDefaultColSize(This,Width)
  when is_record(This, wx_ref),is_integer(Width) ->
   setDefaultColSize(This,Width, []).
 
-%% @spec (This::wxGrid(), Width::integer(), [Option]) -> ok
-%% Option = {resizeExistingCols, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetdefaultcolsize">external documentation</a>.
+-spec setDefaultColSize(This, Width, [Option]) -> ok when
+	This::wxGrid(), Width::integer(),
+	Option :: {resizeExistingCols, boolean()}.
 setDefaultColSize(#wx_ref{type=ThisT,ref=ThisRef},Width, Options)
  when is_integer(Width),is_list(Options) ->
   ?CLASS(ThisT,wxGrid),
@@ -1633,15 +1827,18 @@ setDefaultColSize(#wx_ref{type=ThisT,ref=ThisRef},Width, Options)
   wxe_util:cast(?wxGrid_SetDefaultColSize,
   <<ThisRef:32/?UI,Width:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxGrid(), Height::integer()) -> ok
 %% @equiv setDefaultRowSize(This,Height, [])
+-spec setDefaultRowSize(This, Height) -> ok when
+	This::wxGrid(), Height::integer().
+
 setDefaultRowSize(This,Height)
  when is_record(This, wx_ref),is_integer(Height) ->
   setDefaultRowSize(This,Height, []).
 
-%% @spec (This::wxGrid(), Height::integer(), [Option]) -> ok
-%% Option = {resizeExistingRows, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetdefaultrowsize">external documentation</a>.
+-spec setDefaultRowSize(This, Height, [Option]) -> ok when
+	This::wxGrid(), Height::integer(),
+	Option :: {resizeExistingRows, boolean()}.
 setDefaultRowSize(#wx_ref{type=ThisT,ref=ThisRef},Height, Options)
  when is_integer(Height),is_list(Options) ->
   ?CLASS(ThisT,wxGrid),
@@ -1651,63 +1848,72 @@ setDefaultRowSize(#wx_ref{type=ThisT,ref=ThisRef},Height, Options)
   wxe_util:cast(?wxGrid_SetDefaultRowSize,
   <<ThisRef:32/?UI,Height:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxGrid(), Row::integer(), Col::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetgridcursor">external documentation</a>.
+-spec setGridCursor(This, Row, Col) -> ok when
+	This::wxGrid(), Row::integer(), Col::integer().
 setGridCursor(#wx_ref{type=ThisT,ref=ThisRef},Row,Col)
  when is_integer(Row),is_integer(Col) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:cast(?wxGrid_SetGridCursor,
   <<ThisRef:32/?UI,Row:32/?UI,Col:32/?UI>>).
 
-%% @spec (This::wxGrid(), Val::wx:colour()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetgridlinecolour">external documentation</a>.
+-spec setGridLineColour(This, Val) -> ok when
+	This::wxGrid(), Val::wx:wx_colour().
 setGridLineColour(#wx_ref{type=ThisT,ref=ThisRef},Val)
  when tuple_size(Val) =:= 3; tuple_size(Val) =:= 4 ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:cast(?wxGrid_SetGridLineColour,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(Val)):16/binary>>).
 
-%% @spec (This::wxGrid(), Val::wx:colour()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetlabelbackgroundcolour">external documentation</a>.
+-spec setLabelBackgroundColour(This, Val) -> ok when
+	This::wxGrid(), Val::wx:wx_colour().
 setLabelBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef},Val)
  when tuple_size(Val) =:= 3; tuple_size(Val) =:= 4 ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:cast(?wxGrid_SetLabelBackgroundColour,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(Val)):16/binary>>).
 
-%% @spec (This::wxGrid(), Val::wxFont:wxFont()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetlabelfont">external documentation</a>.
+-spec setLabelFont(This, Val) -> ok when
+	This::wxGrid(), Val::wxFont:wxFont().
 setLabelFont(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ValT,ref=ValRef}) ->
   ?CLASS(ThisT,wxGrid),
   ?CLASS(ValT,wxFont),
   wxe_util:cast(?wxGrid_SetLabelFont,
   <<ThisRef:32/?UI,ValRef:32/?UI>>).
 
-%% @spec (This::wxGrid(), Val::wx:colour()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetlabeltextcolour">external documentation</a>.
+-spec setLabelTextColour(This, Val) -> ok when
+	This::wxGrid(), Val::wx:wx_colour().
 setLabelTextColour(#wx_ref{type=ThisT,ref=ThisRef},Val)
  when tuple_size(Val) =:= 3; tuple_size(Val) =:= 4 ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:cast(?wxGrid_SetLabelTextColour,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(Val)):16/binary>>).
 
-%% @spec (This::wxGrid(), ExtraWidth::integer(), ExtraHeight::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetmargins">external documentation</a>.
+-spec setMargins(This, ExtraWidth, ExtraHeight) -> ok when
+	This::wxGrid(), ExtraWidth::integer(), ExtraHeight::integer().
 setMargins(#wx_ref{type=ThisT,ref=ThisRef},ExtraWidth,ExtraHeight)
  when is_integer(ExtraWidth),is_integer(ExtraHeight) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:cast(?wxGrid_SetMargins,
   <<ThisRef:32/?UI,ExtraWidth:32/?UI,ExtraHeight:32/?UI>>).
 
-%% @spec (This::wxGrid(), Row::integer(), Col::integer()) -> ok
 %% @equiv setReadOnly(This,Row,Col, [])
+-spec setReadOnly(This, Row, Col) -> ok when
+	This::wxGrid(), Row::integer(), Col::integer().
+
 setReadOnly(This,Row,Col)
  when is_record(This, wx_ref),is_integer(Row),is_integer(Col) ->
   setReadOnly(This,Row,Col, []).
 
-%% @spec (This::wxGrid(), Row::integer(), Col::integer(), [Option]) -> ok
-%% Option = {isReadOnly, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetreadonly">external documentation</a>.
+-spec setReadOnly(This, Row, Col, [Option]) -> ok when
+	This::wxGrid(), Row::integer(), Col::integer(),
+	Option :: {isReadOnly, boolean()}.
 setReadOnly(#wx_ref{type=ThisT,ref=ThisRef},Row,Col, Options)
  when is_integer(Row),is_integer(Col),is_list(Options) ->
   ?CLASS(ThisT,wxGrid),
@@ -1717,8 +1923,9 @@ setReadOnly(#wx_ref{type=ThisT,ref=ThisRef},Row,Col, Options)
   wxe_util:cast(?wxGrid_SetReadOnly,
   <<ThisRef:32/?UI,Row:32/?UI,Col:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxGrid(), Row::integer(), Attr::wxGridCellAttr:wxGridCellAttr()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetrowattr">external documentation</a>.
+-spec setRowAttr(This, Row, Attr) -> ok when
+	This::wxGrid(), Row::integer(), Attr::wxGridCellAttr:wxGridCellAttr().
 setRowAttr(#wx_ref{type=ThisT,ref=ThisRef},Row,#wx_ref{type=AttrT,ref=AttrRef})
  when is_integer(Row) ->
   ?CLASS(ThisT,wxGrid),
@@ -1726,24 +1933,27 @@ setRowAttr(#wx_ref{type=ThisT,ref=ThisRef},Row,#wx_ref{type=AttrT,ref=AttrRef})
   wxe_util:cast(?wxGrid_SetRowAttr,
   <<ThisRef:32/?UI,Row:32/?UI,AttrRef:32/?UI>>).
 
-%% @spec (This::wxGrid(), Horiz::integer(), Vert::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetrowlabelalignment">external documentation</a>.
+-spec setRowLabelAlignment(This, Horiz, Vert) -> ok when
+	This::wxGrid(), Horiz::integer(), Vert::integer().
 setRowLabelAlignment(#wx_ref{type=ThisT,ref=ThisRef},Horiz,Vert)
  when is_integer(Horiz),is_integer(Vert) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:cast(?wxGrid_SetRowLabelAlignment,
   <<ThisRef:32/?UI,Horiz:32/?UI,Vert:32/?UI>>).
 
-%% @spec (This::wxGrid(), Width::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetrowlabelsize">external documentation</a>.
+-spec setRowLabelSize(This, Width) -> ok when
+	This::wxGrid(), Width::integer().
 setRowLabelSize(#wx_ref{type=ThisT,ref=ThisRef},Width)
  when is_integer(Width) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:cast(?wxGrid_SetRowLabelSize,
   <<ThisRef:32/?UI,Width:32/?UI>>).
 
-%% @spec (This::wxGrid(), Row::integer(), Val::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetrowlabelvalue">external documentation</a>.
+-spec setRowLabelValue(This, Row, Val) -> ok when
+	This::wxGrid(), Row::integer(), Val::string().
 setRowLabelValue(#wx_ref{type=ThisT,ref=ThisRef},Row,Val)
  when is_integer(Row),is_list(Val) ->
   ?CLASS(ThisT,wxGrid),
@@ -1751,88 +1961,99 @@ setRowLabelValue(#wx_ref{type=ThisT,ref=ThisRef},Row,Val)
   wxe_util:cast(?wxGrid_SetRowLabelValue,
   <<ThisRef:32/?UI,Row:32/?UI,(byte_size(Val_UC)):32/?UI,(Val_UC)/binary, 0:(((8- ((4+byte_size(Val_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxGrid(), Row::integer(), Width::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetrowminimalheight">external documentation</a>.
+-spec setRowMinimalHeight(This, Row, Width) -> ok when
+	This::wxGrid(), Row::integer(), Width::integer().
 setRowMinimalHeight(#wx_ref{type=ThisT,ref=ThisRef},Row,Width)
  when is_integer(Row),is_integer(Width) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:cast(?wxGrid_SetRowMinimalHeight,
   <<ThisRef:32/?UI,Row:32/?UI,Width:32/?UI>>).
 
-%% @spec (This::wxGrid(), Width::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetrowminimalacceptableheight">external documentation</a>.
+-spec setRowMinimalAcceptableHeight(This, Width) -> ok when
+	This::wxGrid(), Width::integer().
 setRowMinimalAcceptableHeight(#wx_ref{type=ThisT,ref=ThisRef},Width)
  when is_integer(Width) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:cast(?wxGrid_SetRowMinimalAcceptableHeight,
   <<ThisRef:32/?UI,Width:32/?UI>>).
 
-%% @spec (This::wxGrid(), Row::integer(), Height::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetrowsize">external documentation</a>.
+-spec setRowSize(This, Row, Height) -> ok when
+	This::wxGrid(), Row::integer(), Height::integer().
 setRowSize(#wx_ref{type=ThisT,ref=ThisRef},Row,Height)
  when is_integer(Row),is_integer(Height) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:cast(?wxGrid_SetRowSize,
   <<ThisRef:32/?UI,Row:32/?UI,Height:32/?UI>>).
 
-%% @spec (This::wxGrid(), X::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetscrolllinex">external documentation</a>.
+-spec setScrollLineX(This, X) -> ok when
+	This::wxGrid(), X::integer().
 setScrollLineX(#wx_ref{type=ThisT,ref=ThisRef},X)
  when is_integer(X) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:cast(?wxGrid_SetScrollLineX,
   <<ThisRef:32/?UI,X:32/?UI>>).
 
-%% @spec (This::wxGrid(), Y::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetscrollliney">external documentation</a>.
+-spec setScrollLineY(This, Y) -> ok when
+	This::wxGrid(), Y::integer().
 setScrollLineY(#wx_ref{type=ThisT,ref=ThisRef},Y)
  when is_integer(Y) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:cast(?wxGrid_SetScrollLineY,
   <<ThisRef:32/?UI,Y:32/?UI>>).
 
-%% @spec (This::wxGrid(), C::wx:colour()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetselectionbackground">external documentation</a>.
+-spec setSelectionBackground(This, C) -> ok when
+	This::wxGrid(), C::wx:wx_colour().
 setSelectionBackground(#wx_ref{type=ThisT,ref=ThisRef},C)
  when tuple_size(C) =:= 3; tuple_size(C) =:= 4 ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:cast(?wxGrid_SetSelectionBackground,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(C)):16/binary>>).
 
-%% @spec (This::wxGrid(), C::wx:colour()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetselectionforeground">external documentation</a>.
+-spec setSelectionForeground(This, C) -> ok when
+	This::wxGrid(), C::wx:wx_colour().
 setSelectionForeground(#wx_ref{type=ThisT,ref=ThisRef},C)
  when tuple_size(C) =:= 3; tuple_size(C) =:= 4 ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:cast(?wxGrid_SetSelectionForeground,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(C)):16/binary>>).
 
-%% @spec (This::wxGrid(), Selmode::WxGridSelectionModes) -> ok
-%% WxGridSelectionModes = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetselectionmode">external documentation</a>.
-%%<br /> WxGridSelectionModes is one of ?wxGrid_wxGridSelectCells | ?wxGrid_wxGridSelectRows | ?wxGrid_wxGridSelectColumns
+%%<br /> Selmode = ?wxGrid_wxGridSelectCells | ?wxGrid_wxGridSelectRows | ?wxGrid_wxGridSelectColumns
+-spec setSelectionMode(This, Selmode) -> ok when
+	This::wxGrid(), Selmode::wx:wx_enum().
 setSelectionMode(#wx_ref{type=ThisT,ref=ThisRef},Selmode)
  when is_integer(Selmode) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:cast(?wxGrid_SetSelectionMode,
   <<ThisRef:32/?UI,Selmode:32/?UI>>).
 
-%% @spec (This::wxGrid()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridshowcelleditcontrol">external documentation</a>.
+-spec showCellEditControl(This) -> ok when
+	This::wxGrid().
 showCellEditControl(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:cast(?wxGrid_ShowCellEditControl,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGrid(), X::integer()) -> integer()
 %% @equiv xToCol(This,X, [])
+-spec xToCol(This, X) -> integer() when
+	This::wxGrid(), X::integer().
+
 xToCol(This,X)
  when is_record(This, wx_ref),is_integer(X) ->
   xToCol(This,X, []).
 
-%% @spec (This::wxGrid(), X::integer(), [Option]) -> integer()
-%% Option = {clipToMinMax, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridxtocol">external documentation</a>.
+-spec xToCol(This, X, [Option]) -> integer() when
+	This::wxGrid(), X::integer(),
+	Option :: {clipToMinMax, boolean()}.
 xToCol(#wx_ref{type=ThisT,ref=ThisRef},X, Options)
  when is_integer(X),is_list(Options) ->
   ?CLASS(ThisT,wxGrid),
@@ -1842,32 +2063,35 @@ xToCol(#wx_ref{type=ThisT,ref=ThisRef},X, Options)
   wxe_util:call(?wxGrid_XToCol,
   <<ThisRef:32/?UI,X:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxGrid(), X::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridxtoedgeofcol">external documentation</a>.
+-spec xToEdgeOfCol(This, X) -> integer() when
+	This::wxGrid(), X::integer().
 xToEdgeOfCol(#wx_ref{type=ThisT,ref=ThisRef},X)
  when is_integer(X) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_XToEdgeOfCol,
   <<ThisRef:32/?UI,X:32/?UI>>).
 
-%% @spec (This::wxGrid(), Y::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridytoedgeofrow">external documentation</a>.
+-spec yToEdgeOfRow(This, Y) -> integer() when
+	This::wxGrid(), Y::integer().
 yToEdgeOfRow(#wx_ref{type=ThisT,ref=ThisRef},Y)
  when is_integer(Y) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_YToEdgeOfRow,
   <<ThisRef:32/?UI,Y:32/?UI>>).
 
-%% @spec (This::wxGrid(), Y::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridytorow">external documentation</a>.
+-spec yToRow(This, Y) -> integer() when
+	This::wxGrid(), Y::integer().
 yToRow(#wx_ref{type=ThisT,ref=ThisRef},Y)
  when is_integer(Y) ->
   ?CLASS(ThisT,wxGrid),
   wxe_util:call(?wxGrid_YToRow,
   <<ThisRef:32/?UI,Y:32/?UI>>).
 
-%% @spec (This::wxGrid()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxGrid) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxGrid),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxGridBagSizer.erl b/lib/wx/src/gen/wxGridBagSizer.erl
index d2b8a2b045..10d87d0a4e 100644
--- a/lib/wx/src/gen/wxGridBagSizer.erl
+++ b/lib/wx/src/gen/wxGridBagSizer.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -48,20 +48,24 @@
   setItemMinSize/4,setMinSize/2,setMinSize/3,setNonFlexibleGrowMode/2,
   setRows/2,setSizeHints/2,setVGap/2,setVirtualSizeHints/2,show/2,show/3]).
 
+-export_type([wxGridBagSizer/0]).
 %% @hidden
 parent_class(wxFlexGridSizer) -> true;
 parent_class(wxGridSizer) -> true;
 parent_class(wxSizer) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxGridBagSizer()
+-type wxGridBagSizer() :: wx:wx_object().
 %% @equiv new([])
+-spec new() -> wxGridBagSizer().
+
 new() ->
   new([]).
 
-%% @spec ([Option]) -> wxGridBagSizer()
-%% Option = {vgap, integer()} | {hgap, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridbagsizer.html#wxgridbagsizerwxgridbagsizer">external documentation</a>.
+-spec new([Option]) -> wxGridBagSizer() when
+	Option :: {vgap, integer()}
+		 | {hgap, integer()}.
 new(Options)
  when is_list(Options) ->
   MOpts = fun({vgap, Vgap}, Acc) -> [<<1:32/?UI,Vgap:32/?UI>>|Acc];
@@ -71,8 +75,9 @@ new(Options)
   wxe_util:construct(?wxGridBagSizer_new,
   <<BinOpt/binary>>).
 
-%% @spec (This::wxGridBagSizer(), Item::wxSizerItem:wxSizerItem() | wxGBSizerItem:wxGBSizerItem()) -> wxSizerItem:wxSizerItem()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridbagsizer.html#wxgridbagsizeradd">external documentation</a>.
+-spec add(This, Item) -> wxSizerItem:wxSizerItem() when
+	This::wxGridBagSizer(), Item::wxSizerItem:wxSizerItem() | wxGBSizerItem:wxGBSizerItem().
 add(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ItemT,ref=ItemRef}) ->
   ?CLASS(ThisT,wxGridBagSizer),
   ItemOP = case ?CLASS_T(ItemT,wxSizerItem) of
@@ -84,17 +89,17 @@ add(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ItemT,ref=ItemRef}) ->
   wxe_util:call(ItemOP,
   <<ThisRef:32/?UI,ItemRef:32/?UI>>).
 
-%% @spec (This::wxGridBagSizer(),X::integer()|term(),X::integer()|term()) -> wxSizerItem:wxSizerItem()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridbagsizer.html#wxgridbagsizeradd">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% add(This::wxGridBagSizer(), Width::integer(), Height::integer()) -> add(This,Width,Height, []) </c></p>
-%% <p><c>
-%% add(This::wxGridBagSizer(), Window::wxWindow:wxWindow() | wxSizer:wxSizer(), Pos::{R::integer(), C::integer()}) -> add(This,Window,Pos, []) </c></p>
-%% <p><c>
-%% add(This::wxGridBagSizer(), Window::wxWindow:wxWindow() | wxSizer:wxSizer(), [Option]) -> wxSizerItem:wxSizerItem() </c>
-%%<br /> Option = {proportion, integer()} | {flag, integer()} | {border, integer()} | {userData, wx:wx()}
-%% </p>
+-spec add(This, Width, Height) -> wxSizerItem:wxSizerItem() when
+	This::wxGridBagSizer(), Width::integer(), Height::integer();
+      (This, Window, Pos) -> wxSizerItem:wxSizerItem() when
+	This::wxGridBagSizer(), Window::wxWindow:wxWindow() | wxSizer:wxSizer(), Pos::{R::integer(), C::integer()};
+      (This, Window, [Option]) -> wxSizerItem:wxSizerItem() when
+	This::wxGridBagSizer(), Window::wxWindow:wxWindow() | wxSizer:wxSizer(),
+	Option :: {proportion, integer()}
+		 | {flag, integer()}
+		 | {border, integer()}
+		 | {userData, wx:wx()}.
 
 add(This,Width,Height)
  when is_record(This, wx_ref),is_integer(Width),is_integer(Height) ->
@@ -121,19 +126,21 @@ add(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef}, Options
   wxe_util:call(WindowOP,
   <<ThisRef:32/?UI,WindowRef:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxGridBagSizer(),X::integer()|term(),X::integer()|term(),X::term()) -> wxSizerItem:wxSizerItem()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridbagsizer.html#wxgridbagsizeradd">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% add(This::wxGridBagSizer(), Width::integer(), Height::integer(), Pos::{R::integer(), C::integer()}) -> add(This,Width,Height,Pos, []) </c></p>
-%% <p><c>
-%% add(This::wxGridBagSizer(), Width::integer(), Height::integer(), [Option]) -> wxSizerItem:wxSizerItem() </c>
-%%<br /> Option = {proportion, integer()} | {flag, integer()} | {border, integer()} | {userData, wx:wx()}
-%% </p>
-%% <p><c>
-%% add(This::wxGridBagSizer(), Window::wxWindow:wxWindow() | wxSizer:wxSizer(), Pos::{R::integer(), C::integer()}, [Option]) -> wxSizerItem:wxSizerItem() </c>
-%%<br /> Option = {span, {RS::integer(), CS::integer()}} | {flag, integer()} | {border, integer()} | {userData, wx:wx()}
-%% </p>
+-spec add(This, Width, Height, Pos) -> wxSizerItem:wxSizerItem() when
+	This::wxGridBagSizer(), Width::integer(), Height::integer(), Pos::{R::integer(), C::integer()};
+      (This, Width, Height, [Option]) -> wxSizerItem:wxSizerItem() when
+	This::wxGridBagSizer(), Width::integer(), Height::integer(),
+	Option :: {proportion, integer()}
+		 | {flag, integer()}
+		 | {border, integer()}
+		 | {userData, wx:wx()};
+      (This, Window, Pos, [Option]) -> wxSizerItem:wxSizerItem() when
+	This::wxGridBagSizer(), Window::wxWindow:wxWindow() | wxSizer:wxSizer(), Pos::{R::integer(), C::integer()},
+	Option :: {span, {RS::integer(), CS::integer()}}
+		 | {flag, integer()}
+		 | {border, integer()}
+		 | {userData, wx:wx()}.
 
 add(This,Width,Height,Pos={PosR,PosC})
  when is_record(This, wx_ref),is_integer(Width),is_integer(Height),is_integer(PosR),is_integer(PosC) ->
@@ -167,9 +174,13 @@ add(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef},{PosR,Po
   wxe_util:call(WindowOP,
   <<ThisRef:32/?UI,WindowRef:32/?UI,PosR:32/?UI,PosC:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxGridBagSizer(), Width::integer(), Height::integer(), Pos::{R::integer(), C::integer()}, [Option]) -> wxSizerItem:wxSizerItem()
-%% Option = {span, {RS::integer(), CS::integer()}} | {flag, integer()} | {border, integer()} | {userData, wx:wx()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridbagsizer.html#wxgridbagsizeradd">external documentation</a>.
+-spec add(This, Width, Height, Pos, [Option]) -> wxSizerItem:wxSizerItem() when
+	This::wxGridBagSizer(), Width::integer(), Height::integer(), Pos::{R::integer(), C::integer()},
+	Option :: {span, {RS::integer(), CS::integer()}}
+		 | {flag, integer()}
+		 | {border, integer()}
+		 | {userData, wx:wx()}.
 add(#wx_ref{type=ThisT,ref=ThisRef},Width,Height,{PosR,PosC}, Options)
  when is_integer(Width),is_integer(Height),is_integer(PosR),is_integer(PosC),is_list(Options) ->
   ?CLASS(ThisT,wxGridBagSizer),
@@ -182,28 +193,28 @@ add(#wx_ref{type=ThisT,ref=ThisRef},Width,Height,{PosR,PosC}, Options)
   wxe_util:call(?wxGridBagSizer_Add_4,
   <<ThisRef:32/?UI,Width:32/?UI,Height:32/?UI,PosR:32/?UI,PosC:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxGridBagSizer()) -> {W::integer(), H::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridbagsizer.html#wxgridbagsizercalcmin">external documentation</a>.
+-spec calcMin(This) -> {W::integer(), H::integer()} when
+	This::wxGridBagSizer().
 calcMin(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGridBagSizer),
   wxe_util:call(?wxGridBagSizer_CalcMin,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGridBagSizer(), Item::wxGBSizerItem:wxGBSizerItem()) -> bool()
 %% @equiv checkForIntersection(This,Item, [])
+-spec checkForIntersection(This, Item) -> boolean() when
+	This::wxGridBagSizer(), Item::wxGBSizerItem:wxGBSizerItem().
+
 checkForIntersection(This,Item)
  when is_record(This, wx_ref),is_record(Item, wx_ref) ->
   checkForIntersection(This,Item, []).
 
-%% @spec (This::wxGridBagSizer(),X::term(),X::term()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridbagsizer.html#wxgridbagsizercheckforintersection">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% checkForIntersection(This::wxGridBagSizer(), Pos::{R::integer(), C::integer()}, Span::{RS::integer(), CS::integer()}) -> checkForIntersection(This,Pos,Span, []) </c></p>
-%% <p><c>
-%% checkForIntersection(This::wxGridBagSizer(), Item::wxGBSizerItem:wxGBSizerItem(), [Option]) -> bool() </c>
-%%<br /> Option = {excludeItem, wxGBSizerItem:wxGBSizerItem()}
-%% </p>
+-spec checkForIntersection(This, Pos, Span) -> boolean() when
+	This::wxGridBagSizer(), Pos::{R::integer(), C::integer()}, Span::{RS::integer(), CS::integer()};
+      (This, Item, [Option]) -> boolean() when
+	This::wxGridBagSizer(), Item::wxGBSizerItem:wxGBSizerItem(),
+	Option :: {excludeItem, wxGBSizerItem:wxGBSizerItem()}.
 
 checkForIntersection(This,Pos={PosR,PosC},Span={SpanRS,SpanCS})
  when is_record(This, wx_ref),is_integer(PosR),is_integer(PosC),is_integer(SpanRS),is_integer(SpanCS) ->
@@ -218,9 +229,10 @@ checkForIntersection(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ItemT,ref=Item
   wxe_util:call(?wxGridBagSizer_CheckForIntersection_2,
   <<ThisRef:32/?UI,ItemRef:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxGridBagSizer(), Pos::{R::integer(), C::integer()}, Span::{RS::integer(), CS::integer()}, [Option]) -> bool()
-%% Option = {excludeItem, wxGBSizerItem:wxGBSizerItem()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridbagsizer.html#wxgridbagsizercheckforintersection">external documentation</a>.
+-spec checkForIntersection(This, Pos, Span, [Option]) -> boolean() when
+	This::wxGridBagSizer(), Pos::{R::integer(), C::integer()}, Span::{RS::integer(), CS::integer()},
+	Option :: {excludeItem, wxGBSizerItem:wxGBSizerItem()}.
 checkForIntersection(#wx_ref{type=ThisT,ref=ThisRef},{PosR,PosC},{SpanRS,SpanCS}, Options)
  when is_integer(PosR),is_integer(PosC),is_integer(SpanRS),is_integer(SpanCS),is_list(Options) ->
   ?CLASS(ThisT,wxGridBagSizer),
@@ -230,8 +242,9 @@ checkForIntersection(#wx_ref{type=ThisT,ref=ThisRef},{PosR,PosC},{SpanRS,SpanCS}
   wxe_util:call(?wxGridBagSizer_CheckForIntersection_3,
   <<ThisRef:32/?UI,PosR:32/?UI,PosC:32/?UI,SpanRS:32/?UI,SpanCS:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxGridBagSizer(), Window::wxWindow:wxWindow() | wxSizer:wxSizer()) -> wxGBSizerItem:wxGBSizerItem()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridbagsizer.html#wxgridbagsizerfinditem">external documentation</a>.
+-spec findItem(This, Window) -> wxGBSizerItem:wxGBSizerItem() when
+	This::wxGridBagSizer(), Window::wxWindow:wxWindow() | wxSizer:wxSizer().
 findItem(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef}) ->
   ?CLASS(ThisT,wxGridBagSizer),
   WindowOP = case ?CLASS_T(WindowT,wxWindow) of
@@ -243,54 +256,55 @@ findItem(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef}) ->
   wxe_util:call(WindowOP,
   <<ThisRef:32/?UI,WindowRef:32/?UI>>).
 
-%% @spec (This::wxGridBagSizer(), Pt::{X::integer(), Y::integer()}) -> wxGBSizerItem:wxGBSizerItem()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridbagsizer.html#wxgridbagsizerfinditematpoint">external documentation</a>.
+-spec findItemAtPoint(This, Pt) -> wxGBSizerItem:wxGBSizerItem() when
+	This::wxGridBagSizer(), Pt::{X::integer(), Y::integer()}.
 findItemAtPoint(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY})
  when is_integer(PtX),is_integer(PtY) ->
   ?CLASS(ThisT,wxGridBagSizer),
   wxe_util:call(?wxGridBagSizer_FindItemAtPoint,
   <<ThisRef:32/?UI,PtX:32/?UI,PtY:32/?UI>>).
 
-%% @spec (This::wxGridBagSizer(), Pos::{R::integer(), C::integer()}) -> wxGBSizerItem:wxGBSizerItem()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridbagsizer.html#wxgridbagsizerfinditematposition">external documentation</a>.
+-spec findItemAtPosition(This, Pos) -> wxGBSizerItem:wxGBSizerItem() when
+	This::wxGridBagSizer(), Pos::{R::integer(), C::integer()}.
 findItemAtPosition(#wx_ref{type=ThisT,ref=ThisRef},{PosR,PosC})
  when is_integer(PosR),is_integer(PosC) ->
   ?CLASS(ThisT,wxGridBagSizer),
   wxe_util:call(?wxGridBagSizer_FindItemAtPosition,
   <<ThisRef:32/?UI,PosR:32/?UI,PosC:32/?UI>>).
 
-%% @spec (This::wxGridBagSizer(), UserData::wx:wx()) -> wxGBSizerItem:wxGBSizerItem()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridbagsizer.html#wxgridbagsizerfinditemwithdata">external documentation</a>.
+-spec findItemWithData(This, UserData) -> wxGBSizerItem:wxGBSizerItem() when
+	This::wxGridBagSizer(), UserData::wx:wx().
 findItemWithData(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=UserDataT,ref=UserDataRef}) ->
   ?CLASS(ThisT,wxGridBagSizer),
   ?CLASS(UserDataT,wx),
   wxe_util:call(?wxGridBagSizer_FindItemWithData,
   <<ThisRef:32/?UI,UserDataRef:32/?UI>>).
 
-%% @spec (This::wxGridBagSizer(), Row::integer(), Col::integer()) -> {W::integer(), H::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridbagsizer.html#wxgridbagsizergetcellsize">external documentation</a>.
+-spec getCellSize(This, Row, Col) -> {W::integer(), H::integer()} when
+	This::wxGridBagSizer(), Row::integer(), Col::integer().
 getCellSize(#wx_ref{type=ThisT,ref=ThisRef},Row,Col)
  when is_integer(Row),is_integer(Col) ->
   ?CLASS(ThisT,wxGridBagSizer),
   wxe_util:call(?wxGridBagSizer_GetCellSize,
   <<ThisRef:32/?UI,Row:32/?UI,Col:32/?UI>>).
 
-%% @spec (This::wxGridBagSizer()) -> {W::integer(), H::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridbagsizer.html#wxgridbagsizergetemptycellsize">external documentation</a>.
+-spec getEmptyCellSize(This) -> {W::integer(), H::integer()} when
+	This::wxGridBagSizer().
 getEmptyCellSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGridBagSizer),
   wxe_util:call(?wxGridBagSizer_GetEmptyCellSize,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGridBagSizer(),X::integer()|term()) -> {R::integer(), C::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridbagsizer.html#wxgridbagsizergetitemposition">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% getItemPosition(This::wxGridBagSizer(), Index::integer()) -> {R::integer(), C::integer()} </c>
-%% </p>
-%% <p><c>
-%% getItemPosition(This::wxGridBagSizer(), Window::wxWindow:wxWindow() | wxSizer:wxSizer()) -> {R::integer(), C::integer()} </c>
-%% </p>
+-spec getItemPosition(This, Index) -> {R::integer(), C::integer()} when
+	This::wxGridBagSizer(), Index::integer();
+      (This, Window) -> {R::integer(), C::integer()} when
+	This::wxGridBagSizer(), Window::wxWindow:wxWindow() | wxSizer:wxSizer().
 getItemPosition(#wx_ref{type=ThisT,ref=ThisRef},Index)
  when is_integer(Index) ->
   ?CLASS(ThisT,wxGridBagSizer),
@@ -307,15 +321,11 @@ getItemPosition(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowR
   wxe_util:call(WindowOP,
   <<ThisRef:32/?UI,WindowRef:32/?UI>>).
 
-%% @spec (This::wxGridBagSizer(),X::integer()|term()) -> {RS::integer(), CS::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridbagsizer.html#wxgridbagsizergetitemspan">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% getItemSpan(This::wxGridBagSizer(), Index::integer()) -> {RS::integer(), CS::integer()} </c>
-%% </p>
-%% <p><c>
-%% getItemSpan(This::wxGridBagSizer(), Window::wxWindow:wxWindow() | wxSizer:wxSizer()) -> {RS::integer(), CS::integer()} </c>
-%% </p>
+-spec getItemSpan(This, Index) -> {RS::integer(), CS::integer()} when
+	This::wxGridBagSizer(), Index::integer();
+      (This, Window) -> {RS::integer(), CS::integer()} when
+	This::wxGridBagSizer(), Window::wxWindow:wxWindow() | wxSizer:wxSizer().
 getItemSpan(#wx_ref{type=ThisT,ref=ThisRef},Index)
  when is_integer(Index) ->
   ?CLASS(ThisT,wxGridBagSizer),
@@ -332,23 +342,20 @@ getItemSpan(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef})
   wxe_util:call(WindowOP,
   <<ThisRef:32/?UI,WindowRef:32/?UI>>).
 
-%% @spec (This::wxGridBagSizer(), Sz::{W::integer(), H::integer()}) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridbagsizer.html#wxgridbagsizersetemptycellsize">external documentation</a>.
+-spec setEmptyCellSize(This, Sz) -> ok when
+	This::wxGridBagSizer(), Sz::{W::integer(), H::integer()}.
 setEmptyCellSize(#wx_ref{type=ThisT,ref=ThisRef},{SzW,SzH})
  when is_integer(SzW),is_integer(SzH) ->
   ?CLASS(ThisT,wxGridBagSizer),
   wxe_util:cast(?wxGridBagSizer_SetEmptyCellSize,
   <<ThisRef:32/?UI,SzW:32/?UI,SzH:32/?UI>>).
 
-%% @spec (This::wxGridBagSizer(),X::integer()|term(),Pos::{R::integer(), C::integer()}) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridbagsizer.html#wxgridbagsizersetitemposition">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% setItemPosition(This::wxGridBagSizer(), Index::integer(), Pos::{R::integer(), C::integer()}) -> bool() </c>
-%% </p>
-%% <p><c>
-%% setItemPosition(This::wxGridBagSizer(), Window::wxWindow:wxWindow() | wxSizer:wxSizer(), Pos::{R::integer(), C::integer()}) -> bool() </c>
-%% </p>
+-spec setItemPosition(This, Index, Pos) -> boolean() when
+	This::wxGridBagSizer(), Index::integer(), Pos::{R::integer(), C::integer()};
+      (This, Window, Pos) -> boolean() when
+	This::wxGridBagSizer(), Window::wxWindow:wxWindow() | wxSizer:wxSizer(), Pos::{R::integer(), C::integer()}.
 setItemPosition(#wx_ref{type=ThisT,ref=ThisRef},Index,{PosR,PosC})
  when is_integer(Index),is_integer(PosR),is_integer(PosC) ->
   ?CLASS(ThisT,wxGridBagSizer),
@@ -366,15 +373,11 @@ setItemPosition(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowR
   wxe_util:call(WindowOP,
   <<ThisRef:32/?UI,WindowRef:32/?UI,PosR:32/?UI,PosC:32/?UI>>).
 
-%% @spec (This::wxGridBagSizer(),X::integer()|term(),Span::{RS::integer(), CS::integer()}) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridbagsizer.html#wxgridbagsizersetitemspan">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% setItemSpan(This::wxGridBagSizer(), Index::integer(), Span::{RS::integer(), CS::integer()}) -> bool() </c>
-%% </p>
-%% <p><c>
-%% setItemSpan(This::wxGridBagSizer(), Window::wxWindow:wxWindow() | wxSizer:wxSizer(), Span::{RS::integer(), CS::integer()}) -> bool() </c>
-%% </p>
+-spec setItemSpan(This, Index, Span) -> boolean() when
+	This::wxGridBagSizer(), Index::integer(), Span::{RS::integer(), CS::integer()};
+      (This, Window, Span) -> boolean() when
+	This::wxGridBagSizer(), Window::wxWindow:wxWindow() | wxSizer:wxSizer(), Span::{RS::integer(), CS::integer()}.
 setItemSpan(#wx_ref{type=ThisT,ref=ThisRef},Index,{SpanRS,SpanCS})
  when is_integer(Index),is_integer(SpanRS),is_integer(SpanCS) ->
   ?CLASS(ThisT,wxGridBagSizer),
@@ -392,8 +395,8 @@ setItemSpan(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef},
   wxe_util:call(WindowOP,
   <<ThisRef:32/?UI,WindowRef:32/?UI,SpanRS:32/?UI,SpanCS:32/?UI>>).
 
-%% @spec (This::wxGridBagSizer()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxGridBagSizer) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxGridBagSizer),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxGridCellAttr.erl b/lib/wx/src/gen/wxGridCellAttr.erl
index a9a0c1fb79..896bf97489 100644
--- a/lib/wx/src/gen/wxGridCellAttr.erl
+++ b/lib/wx/src/gen/wxGridCellAttr.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -33,50 +33,59 @@
 %% inherited exports
 -export([parent_class/1]).
 
+-export_type([wxGridCellAttr/0]).
 %% @hidden
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (This::wxGridCellAttr(), ColText::wx:colour()) -> ok
+-type wxGridCellAttr() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellattr.html#wxgridcellattrsettextcolour">external documentation</a>.
+-spec setTextColour(This, ColText) -> ok when
+	This::wxGridCellAttr(), ColText::wx:wx_colour().
 setTextColour(#wx_ref{type=ThisT,ref=ThisRef},ColText)
  when tuple_size(ColText) =:= 3; tuple_size(ColText) =:= 4 ->
   ?CLASS(ThisT,wxGridCellAttr),
   wxe_util:cast(?wxGridCellAttr_SetTextColour,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(ColText)):16/binary>>).
 
-%% @spec (This::wxGridCellAttr(), ColBack::wx:colour()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellattr.html#wxgridcellattrsetbackgroundcolour">external documentation</a>.
+-spec setBackgroundColour(This, ColBack) -> ok when
+	This::wxGridCellAttr(), ColBack::wx:wx_colour().
 setBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef},ColBack)
  when tuple_size(ColBack) =:= 3; tuple_size(ColBack) =:= 4 ->
   ?CLASS(ThisT,wxGridCellAttr),
   wxe_util:cast(?wxGridCellAttr_SetBackgroundColour,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(ColBack)):16/binary>>).
 
-%% @spec (This::wxGridCellAttr(), Font::wxFont:wxFont()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellattr.html#wxgridcellattrsetfont">external documentation</a>.
+-spec setFont(This, Font) -> ok when
+	This::wxGridCellAttr(), Font::wxFont:wxFont().
 setFont(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FontT,ref=FontRef}) ->
   ?CLASS(ThisT,wxGridCellAttr),
   ?CLASS(FontT,wxFont),
   wxe_util:cast(?wxGridCellAttr_SetFont,
   <<ThisRef:32/?UI,FontRef:32/?UI>>).
 
-%% @spec (This::wxGridCellAttr(), HAlign::integer(), VAlign::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellattr.html#wxgridcellattrsetalignment">external documentation</a>.
+-spec setAlignment(This, HAlign, VAlign) -> ok when
+	This::wxGridCellAttr(), HAlign::integer(), VAlign::integer().
 setAlignment(#wx_ref{type=ThisT,ref=ThisRef},HAlign,VAlign)
  when is_integer(HAlign),is_integer(VAlign) ->
   ?CLASS(ThisT,wxGridCellAttr),
   wxe_util:cast(?wxGridCellAttr_SetAlignment,
   <<ThisRef:32/?UI,HAlign:32/?UI,VAlign:32/?UI>>).
 
-%% @spec (This::wxGridCellAttr()) -> ok
 %% @equiv setReadOnly(This, [])
+-spec setReadOnly(This) -> ok when
+	This::wxGridCellAttr().
+
 setReadOnly(This)
  when is_record(This, wx_ref) ->
   setReadOnly(This, []).
 
-%% @spec (This::wxGridCellAttr(), [Option]) -> ok
-%% Option = {isReadOnly, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellattr.html#wxgridcellattrsetreadonly">external documentation</a>.
+-spec setReadOnly(This, [Option]) -> ok when
+	This::wxGridCellAttr(),
+	Option :: {isReadOnly, boolean()}.
 setReadOnly(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxGridCellAttr),
@@ -86,94 +95,107 @@ setReadOnly(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxGridCellAttr_SetReadOnly,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxGridCellAttr(), Renderer::wxGridCellRenderer:wxGridCellRenderer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellattr.html#wxgridcellattrsetrenderer">external documentation</a>.
+-spec setRenderer(This, Renderer) -> ok when
+	This::wxGridCellAttr(), Renderer::wxGridCellRenderer:wxGridCellRenderer().
 setRenderer(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=RendererT,ref=RendererRef}) ->
   ?CLASS(ThisT,wxGridCellAttr),
   ?CLASS(RendererT,wxGridCellRenderer),
   wxe_util:cast(?wxGridCellAttr_SetRenderer,
   <<ThisRef:32/?UI,RendererRef:32/?UI>>).
 
-%% @spec (This::wxGridCellAttr(), Editor::wxGridCellEditor:wxGridCellEditor()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellattr.html#wxgridcellattrseteditor">external documentation</a>.
+-spec setEditor(This, Editor) -> ok when
+	This::wxGridCellAttr(), Editor::wxGridCellEditor:wxGridCellEditor().
 setEditor(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=EditorT,ref=EditorRef}) ->
   ?CLASS(ThisT,wxGridCellAttr),
   ?CLASS(EditorT,wxGridCellEditor),
   wxe_util:cast(?wxGridCellAttr_SetEditor,
   <<ThisRef:32/?UI,EditorRef:32/?UI>>).
 
-%% @spec (This::wxGridCellAttr()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellattr.html#wxgridcellattrhastextcolour">external documentation</a>.
+-spec hasTextColour(This) -> boolean() when
+	This::wxGridCellAttr().
 hasTextColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGridCellAttr),
   wxe_util:call(?wxGridCellAttr_HasTextColour,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGridCellAttr()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellattr.html#wxgridcellattrhasbackgroundcolour">external documentation</a>.
+-spec hasBackgroundColour(This) -> boolean() when
+	This::wxGridCellAttr().
 hasBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGridCellAttr),
   wxe_util:call(?wxGridCellAttr_HasBackgroundColour,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGridCellAttr()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellattr.html#wxgridcellattrhasfont">external documentation</a>.
+-spec hasFont(This) -> boolean() when
+	This::wxGridCellAttr().
 hasFont(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGridCellAttr),
   wxe_util:call(?wxGridCellAttr_HasFont,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGridCellAttr()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellattr.html#wxgridcellattrhasalignment">external documentation</a>.
+-spec hasAlignment(This) -> boolean() when
+	This::wxGridCellAttr().
 hasAlignment(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGridCellAttr),
   wxe_util:call(?wxGridCellAttr_HasAlignment,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGridCellAttr()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellattr.html#wxgridcellattrhasrenderer">external documentation</a>.
+-spec hasRenderer(This) -> boolean() when
+	This::wxGridCellAttr().
 hasRenderer(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGridCellAttr),
   wxe_util:call(?wxGridCellAttr_HasRenderer,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGridCellAttr()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellattr.html#wxgridcellattrhaseditor">external documentation</a>.
+-spec hasEditor(This) -> boolean() when
+	This::wxGridCellAttr().
 hasEditor(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGridCellAttr),
   wxe_util:call(?wxGridCellAttr_HasEditor,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGridCellAttr()) -> wx:colour()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellattr.html#wxgridcellattrgettextcolour">external documentation</a>.
+-spec getTextColour(This) -> wx:wx_colour() when
+	This::wxGridCellAttr().
 getTextColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGridCellAttr),
   wxe_util:call(?wxGridCellAttr_GetTextColour,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGridCellAttr()) -> wx:colour()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellattr.html#wxgridcellattrgetbackgroundcolour">external documentation</a>.
+-spec getBackgroundColour(This) -> wx:wx_colour() when
+	This::wxGridCellAttr().
 getBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGridCellAttr),
   wxe_util:call(?wxGridCellAttr_GetBackgroundColour,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGridCellAttr()) -> wxFont:wxFont()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellattr.html#wxgridcellattrgetfont">external documentation</a>.
+-spec getFont(This) -> wxFont:wxFont() when
+	This::wxGridCellAttr().
 getFont(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGridCellAttr),
   wxe_util:call(?wxGridCellAttr_GetFont,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGridCellAttr()) -> {HAlign::integer(), VAlign::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellattr.html#wxgridcellattrgetalignment">external documentation</a>.
+-spec getAlignment(This) -> {HAlign::integer(), VAlign::integer()} when
+	This::wxGridCellAttr().
 getAlignment(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGridCellAttr),
   wxe_util:call(?wxGridCellAttr_GetAlignment,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGridCellAttr(), Grid::wxGrid:wxGrid(), Row::integer(), Col::integer()) -> wxGridCellRenderer:wxGridCellRenderer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellattr.html#wxgridcellattrgetrenderer">external documentation</a>.
+-spec getRenderer(This, Grid, Row, Col) -> wxGridCellRenderer:wxGridCellRenderer() when
+	This::wxGridCellAttr(), Grid::wxGrid:wxGrid(), Row::integer(), Col::integer().
 getRenderer(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=GridT,ref=GridRef},Row,Col)
  when is_integer(Row),is_integer(Col) ->
   ?CLASS(ThisT,wxGridCellAttr),
@@ -181,8 +203,9 @@ getRenderer(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=GridT,ref=GridRef},Row,
   wxe_util:call(?wxGridCellAttr_GetRenderer,
   <<ThisRef:32/?UI,GridRef:32/?UI,Row:32/?UI,Col:32/?UI>>).
 
-%% @spec (This::wxGridCellAttr(), Grid::wxGrid:wxGrid(), Row::integer(), Col::integer()) -> wxGridCellEditor:wxGridCellEditor()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellattr.html#wxgridcellattrgeteditor">external documentation</a>.
+-spec getEditor(This, Grid, Row, Col) -> wxGridCellEditor:wxGridCellEditor() when
+	This::wxGridCellAttr(), Grid::wxGrid:wxGrid(), Row::integer(), Col::integer().
 getEditor(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=GridT,ref=GridRef},Row,Col)
  when is_integer(Row),is_integer(Col) ->
   ?CLASS(ThisT,wxGridCellAttr),
@@ -190,15 +213,17 @@ getEditor(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=GridT,ref=GridRef},Row,Co
   wxe_util:call(?wxGridCellAttr_GetEditor,
   <<ThisRef:32/?UI,GridRef:32/?UI,Row:32/?UI,Col:32/?UI>>).
 
-%% @spec (This::wxGridCellAttr()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellattr.html#wxgridcellattrisreadonly">external documentation</a>.
+-spec isReadOnly(This) -> boolean() when
+	This::wxGridCellAttr().
 isReadOnly(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGridCellAttr),
   wxe_util:call(?wxGridCellAttr_IsReadOnly,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGridCellAttr(), DefAttr::wxGridCellAttr()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellattr.html#wxgridcellattrsetdefattr">external documentation</a>.
+-spec setDefAttr(This, DefAttr) -> ok when
+	This::wxGridCellAttr(), DefAttr::wxGridCellAttr().
 setDefAttr(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=DefAttrT,ref=DefAttrRef}) ->
   ?CLASS(ThisT,wxGridCellAttr),
   ?CLASS(DefAttrT,wxGridCellAttr),
diff --git a/lib/wx/src/gen/wxGridCellBoolEditor.erl b/lib/wx/src/gen/wxGridCellBoolEditor.erl
index a54cfe5eab..c4a68ac597 100644
--- a/lib/wx/src/gen/wxGridCellBoolEditor.erl
+++ b/lib/wx/src/gen/wxGridCellBoolEditor.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2012. 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
@@ -33,32 +33,37 @@
 -export([beginEdit/4,endEdit/4,handleReturn/2,isCreated/1,paintBackground/3,
   parent_class/1,reset/1,setSize/2,show/2,show/3,startingClick/1,startingKey/2]).
 
+-export_type([wxGridCellBoolEditor/0]).
 %% @hidden
 parent_class(wxGridCellEditor) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxGridCellBoolEditor()
+-type wxGridCellBoolEditor() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellbooleditor.html#wxgridcellbooleditorwxgridcellbooleditor">external documentation</a>.
+-spec new() -> wxGridCellBoolEditor().
 new() ->
   wxe_util:construct(?wxGridCellBoolEditor_new,
   <<>>).
 
-%% @spec (Value::string()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellbooleditor.html#wxgridcellbooleditoristruevalue">external documentation</a>.
+-spec isTrueValue(Value) -> boolean() when
+	Value::string().
 isTrueValue(Value)
  when is_list(Value) ->
   Value_UC = unicode:characters_to_binary([Value,0]),
   wxe_util:call(?wxGridCellBoolEditor_IsTrueValue,
   <<(byte_size(Value_UC)):32/?UI,(Value_UC)/binary, 0:(((8- ((4+byte_size(Value_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec () -> ok
 %% @equiv useStringValues([])
+-spec useStringValues() -> ok.
+
 useStringValues() ->
   useStringValues([]).
 
-%% @spec ([Option]) -> ok
-%% Option = {valueTrue, string()} | {valueFalse, string()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellbooleditor.html#wxgridcellbooleditorusestringvalues">external documentation</a>.
+-spec useStringValues([Option]) -> ok when
+	Option :: {valueTrue, string()}
+		 | {valueFalse, string()}.
 useStringValues(Options)
  when is_list(Options) ->
   MOpts = fun({valueTrue, ValueTrue}, Acc) ->   ValueTrue_UC = unicode:characters_to_binary([ValueTrue,0]),[<<1:32/?UI,(byte_size(ValueTrue_UC)):32/?UI,(ValueTrue_UC)/binary, 0:(((8- ((0+byte_size(ValueTrue_UC)) band 16#7)) band 16#7))/unit:8>>|Acc];
@@ -68,8 +73,8 @@ useStringValues(Options)
   wxe_util:cast(?wxGridCellBoolEditor_UseStringValues,
   <<BinOpt/binary>>).
 
-%% @spec (This::wxGridCellBoolEditor()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxGridCellBoolEditor) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxGridCellBoolEditor),
   wxe_util:destroy(?wxGridCellBoolEditor_destroy,Obj),
diff --git a/lib/wx/src/gen/wxGridCellBoolRenderer.erl b/lib/wx/src/gen/wxGridCellBoolRenderer.erl
index a98091f62c..ae9d4baf47 100644
--- a/lib/wx/src/gen/wxGridCellBoolRenderer.erl
+++ b/lib/wx/src/gen/wxGridCellBoolRenderer.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2012. 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
@@ -32,18 +32,20 @@
 %% inherited exports
 -export([draw/8,getBestSize/6,parent_class/1]).
 
+-export_type([wxGridCellBoolRenderer/0]).
 %% @hidden
 parent_class(wxGridCellRenderer) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxGridCellBoolRenderer()
+-type wxGridCellBoolRenderer() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellboolrenderer.html#wxgridcellboolrendererwxgridcellboolrenderer">external documentation</a>.
+-spec new() -> wxGridCellBoolRenderer().
 new() ->
   wxe_util:construct(?wxGridCellBoolRenderer_new,
   <<>>).
 
-%% @spec (This::wxGridCellBoolRenderer()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxGridCellBoolRenderer) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxGridCellBoolRenderer),
   wxe_util:destroy(?wxGridCellBoolRenderer_destroy,Obj),
diff --git a/lib/wx/src/gen/wxGridCellChoiceEditor.erl b/lib/wx/src/gen/wxGridCellChoiceEditor.erl
index 1adee550f8..d8ed206f07 100644
--- a/lib/wx/src/gen/wxGridCellChoiceEditor.erl
+++ b/lib/wx/src/gen/wxGridCellChoiceEditor.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2012. 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
@@ -33,19 +33,24 @@
 -export([beginEdit/4,endEdit/4,handleReturn/2,isCreated/1,paintBackground/3,
   parent_class/1,reset/1,setSize/2,show/2,show/3,startingClick/1,startingKey/2]).
 
+-export_type([wxGridCellChoiceEditor/0]).
 %% @hidden
 parent_class(wxGridCellEditor) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (Choices::[[string()]]) -> wxGridCellChoiceEditor()
+-type wxGridCellChoiceEditor() :: wx:wx_object().
 %% @equiv new(Choices, [])
+-spec new(Choices) -> wxGridCellChoiceEditor() when
+	Choices::[[string()]].
+
 new(Choices)
  when is_list(Choices) ->
   new(Choices, []).
 
-%% @spec (Choices::[[string()]], [Option]) -> wxGridCellChoiceEditor()
-%% Option = {allowOthers, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellchoiceeditor.html#wxgridcellchoiceeditorwxgridcellchoiceeditor">external documentation</a>.
+-spec new(Choices, [Option]) -> wxGridCellChoiceEditor() when
+	Choices::[[string()]],
+	Option :: {allowOthers, boolean()}.
 new(Choices, Options)
  when is_list(Choices),is_list(Options) ->
   Choices_UCA = [unicode:characters_to_binary([ChoicesTemp,0]) || 
@@ -56,8 +61,9 @@ new(Choices, Options)
   wxe_util:construct(?wxGridCellChoiceEditor_new,
   <<(length(Choices_UCA)):32/?UI, (<< <<(byte_size(UC_Str)):32/?UI, UC_Str/binary>>|| UC_Str <- Choices_UCA>>)/binary, 0:(((8- ((4 + lists:sum([byte_size(S)+4||S<-Choices_UCA])) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxGridCellChoiceEditor(), Params::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellchoiceeditor.html#wxgridcellchoiceeditorsetparameters">external documentation</a>.
+-spec setParameters(This, Params) -> ok when
+	This::wxGridCellChoiceEditor(), Params::string().
 setParameters(#wx_ref{type=ThisT,ref=ThisRef},Params)
  when is_list(Params) ->
   ?CLASS(ThisT,wxGridCellChoiceEditor),
@@ -65,8 +71,8 @@ setParameters(#wx_ref{type=ThisT,ref=ThisRef},Params)
   wxe_util:cast(?wxGridCellChoiceEditor_SetParameters,
   <<ThisRef:32/?UI,(byte_size(Params_UC)):32/?UI,(Params_UC)/binary, 0:(((8- ((0+byte_size(Params_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxGridCellChoiceEditor()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxGridCellChoiceEditor) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxGridCellChoiceEditor),
   wxe_util:destroy(?wxGridCellChoiceEditor_destroy,Obj),
diff --git a/lib/wx/src/gen/wxGridCellEditor.erl b/lib/wx/src/gen/wxGridCellEditor.erl
index de1ebc5a4c..e84cdeb49a 100644
--- a/lib/wx/src/gen/wxGridCellEditor.erl
+++ b/lib/wx/src/gen/wxGridCellEditor.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -30,11 +30,14 @@
 %% inherited exports
 -export([parent_class/1]).
 
+-export_type([wxGridCellEditor/0]).
 %% @hidden
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (This::wxGridCellEditor(), Parent::wxWindow:wxWindow(), Id::integer(), EvtHandler::wxEvtHandler:wxEvtHandler()) -> ok
+-type wxGridCellEditor() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcelleditor.html#wxgridcelleditorcreate">external documentation</a>.
+-spec create(This, Parent, Id, EvtHandler) -> ok when
+	This::wxGridCellEditor(), Parent::wxWindow:wxWindow(), Id::integer(), EvtHandler::wxEvtHandler:wxEvtHandler().
 create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id,#wx_ref{type=EvtHandlerT,ref=EvtHandlerRef})
  when is_integer(Id) ->
   ?CLASS(ThisT,wxGridCellEditor),
@@ -43,30 +46,35 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id,#w
   wxe_util:cast(?wxGridCellEditor_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI,Id:32/?UI,EvtHandlerRef:32/?UI>>).
 
-%% @spec (This::wxGridCellEditor()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcelleditor.html#wxgridcelleditoriscreated">external documentation</a>.
+-spec isCreated(This) -> boolean() when
+	This::wxGridCellEditor().
 isCreated(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGridCellEditor),
   wxe_util:call(?wxGridCellEditor_IsCreated,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGridCellEditor(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcelleditor.html#wxgridcelleditorsetsize">external documentation</a>.
+-spec setSize(This, Rect) -> ok when
+	This::wxGridCellEditor(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}.
 setSize(#wx_ref{type=ThisT,ref=ThisRef},{RectX,RectY,RectW,RectH})
  when is_integer(RectX),is_integer(RectY),is_integer(RectW),is_integer(RectH) ->
   ?CLASS(ThisT,wxGridCellEditor),
   wxe_util:cast(?wxGridCellEditor_SetSize,
   <<ThisRef:32/?UI,RectX:32/?UI,RectY:32/?UI,RectW:32/?UI,RectH:32/?UI>>).
 
-%% @spec (This::wxGridCellEditor(), Show::bool()) -> ok
 %% @equiv show(This,Show, [])
+-spec show(This, Show) -> ok when
+	This::wxGridCellEditor(), Show::boolean().
+
 show(This,Show)
  when is_record(This, wx_ref),is_boolean(Show) ->
   show(This,Show, []).
 
-%% @spec (This::wxGridCellEditor(), Show::bool(), [Option]) -> ok
-%% Option = {attr, wxGridCellAttr:wxGridCellAttr()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcelleditor.html#wxgridcelleditorshow">external documentation</a>.
+-spec show(This, Show, [Option]) -> ok when
+	This::wxGridCellEditor(), Show::boolean(),
+	Option :: {attr, wxGridCellAttr:wxGridCellAttr()}.
 show(#wx_ref{type=ThisT,ref=ThisRef},Show, Options)
  when is_boolean(Show),is_list(Options) ->
   ?CLASS(ThisT,wxGridCellEditor),
@@ -76,8 +84,9 @@ show(#wx_ref{type=ThisT,ref=ThisRef},Show, Options)
   wxe_util:cast(?wxGridCellEditor_Show,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Show)):32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxGridCellEditor(), RectCell::{X::integer(), Y::integer(), W::integer(), H::integer()}, Attr::wxGridCellAttr:wxGridCellAttr()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcelleditor.html#wxgridcelleditorpaintbackground">external documentation</a>.
+-spec paintBackground(This, RectCell, Attr) -> ok when
+	This::wxGridCellEditor(), RectCell::{X::integer(), Y::integer(), W::integer(), H::integer()}, Attr::wxGridCellAttr:wxGridCellAttr().
 paintBackground(#wx_ref{type=ThisT,ref=ThisRef},{RectCellX,RectCellY,RectCellW,RectCellH},#wx_ref{type=AttrT,ref=AttrRef})
  when is_integer(RectCellX),is_integer(RectCellY),is_integer(RectCellW),is_integer(RectCellH) ->
   ?CLASS(ThisT,wxGridCellEditor),
@@ -85,8 +94,9 @@ paintBackground(#wx_ref{type=ThisT,ref=ThisRef},{RectCellX,RectCellY,RectCellW,R
   wxe_util:cast(?wxGridCellEditor_PaintBackground,
   <<ThisRef:32/?UI,RectCellX:32/?UI,RectCellY:32/?UI,RectCellW:32/?UI,RectCellH:32/?UI,AttrRef:32/?UI>>).
 
-%% @spec (This::wxGridCellEditor(), Row::integer(), Col::integer(), Grid::wxGrid:wxGrid()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcelleditor.html#wxgridcelleditorbeginedit">external documentation</a>.
+-spec beginEdit(This, Row, Col, Grid) -> ok when
+	This::wxGridCellEditor(), Row::integer(), Col::integer(), Grid::wxGrid:wxGrid().
 beginEdit(#wx_ref{type=ThisT,ref=ThisRef},Row,Col,#wx_ref{type=GridT,ref=GridRef})
  when is_integer(Row),is_integer(Col) ->
   ?CLASS(ThisT,wxGridCellEditor),
@@ -94,8 +104,9 @@ beginEdit(#wx_ref{type=ThisT,ref=ThisRef},Row,Col,#wx_ref{type=GridT,ref=GridRef
   wxe_util:cast(?wxGridCellEditor_BeginEdit,
   <<ThisRef:32/?UI,Row:32/?UI,Col:32/?UI,GridRef:32/?UI>>).
 
-%% @spec (This::wxGridCellEditor(), Row::integer(), Col::integer(), Grid::wxGrid:wxGrid()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcelleditor.html#wxgridcelleditorendedit">external documentation</a>.
+-spec endEdit(This, Row, Col, Grid) -> boolean() when
+	This::wxGridCellEditor(), Row::integer(), Col::integer(), Grid::wxGrid:wxGrid().
 endEdit(#wx_ref{type=ThisT,ref=ThisRef},Row,Col,#wx_ref{type=GridT,ref=GridRef})
  when is_integer(Row),is_integer(Col) ->
   ?CLASS(ThisT,wxGridCellEditor),
@@ -103,30 +114,34 @@ endEdit(#wx_ref{type=ThisT,ref=ThisRef},Row,Col,#wx_ref{type=GridT,ref=GridRef})
   wxe_util:call(?wxGridCellEditor_EndEdit,
   <<ThisRef:32/?UI,Row:32/?UI,Col:32/?UI,GridRef:32/?UI>>).
 
-%% @spec (This::wxGridCellEditor()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcelleditor.html#wxgridcelleditorreset">external documentation</a>.
+-spec reset(This) -> ok when
+	This::wxGridCellEditor().
 reset(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGridCellEditor),
   wxe_util:cast(?wxGridCellEditor_Reset,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGridCellEditor(), Event::wxKeyEvent:wxKeyEvent()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcelleditor.html#wxgridcelleditorstartingkey">external documentation</a>.
+-spec startingKey(This, Event) -> ok when
+	This::wxGridCellEditor(), Event::wxKeyEvent:wxKeyEvent().
 startingKey(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=EventT,ref=EventRef}) ->
   ?CLASS(ThisT,wxGridCellEditor),
   ?CLASS(EventT,wxKeyEvent),
   wxe_util:cast(?wxGridCellEditor_StartingKey,
   <<ThisRef:32/?UI,EventRef:32/?UI>>).
 
-%% @spec (This::wxGridCellEditor()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcelleditor.html#wxgridcelleditorstartingclick">external documentation</a>.
+-spec startingClick(This) -> ok when
+	This::wxGridCellEditor().
 startingClick(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGridCellEditor),
   wxe_util:cast(?wxGridCellEditor_StartingClick,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGridCellEditor(), Event::wxKeyEvent:wxKeyEvent()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcelleditor.html#wxgridcelleditorhandlereturn">external documentation</a>.
+-spec handleReturn(This, Event) -> ok when
+	This::wxGridCellEditor(), Event::wxKeyEvent:wxKeyEvent().
 handleReturn(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=EventT,ref=EventRef}) ->
   ?CLASS(ThisT,wxGridCellEditor),
   ?CLASS(EventT,wxKeyEvent),
diff --git a/lib/wx/src/gen/wxGridCellFloatEditor.erl b/lib/wx/src/gen/wxGridCellFloatEditor.erl
index 3caad74f0e..ebb5aa04d4 100644
--- a/lib/wx/src/gen/wxGridCellFloatEditor.erl
+++ b/lib/wx/src/gen/wxGridCellFloatEditor.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2012. 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
@@ -33,18 +33,22 @@
 -export([beginEdit/4,endEdit/4,handleReturn/2,isCreated/1,paintBackground/3,
   parent_class/1,reset/1,setSize/2,show/2,show/3,startingClick/1,startingKey/2]).
 
+-export_type([wxGridCellFloatEditor/0]).
 %% @hidden
 parent_class(wxGridCellEditor) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxGridCellFloatEditor()
+-type wxGridCellFloatEditor() :: wx:wx_object().
 %% @equiv new([])
+-spec new() -> wxGridCellFloatEditor().
+
 new() ->
   new([]).
 
-%% @spec ([Option]) -> wxGridCellFloatEditor()
-%% Option = {width, integer()} | {precision, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellfloateditor.html#wxgridcellfloateditorwxgridcellfloateditor">external documentation</a>.
+-spec new([Option]) -> wxGridCellFloatEditor() when
+	Option :: {width, integer()}
+		 | {precision, integer()}.
 new(Options)
  when is_list(Options) ->
   MOpts = fun({width, Width}, Acc) -> [<<1:32/?UI,Width:32/?UI>>|Acc];
@@ -54,8 +58,9 @@ new(Options)
   wxe_util:construct(?wxGridCellFloatEditor_new,
   <<BinOpt/binary>>).
 
-%% @spec (This::wxGridCellFloatEditor(), Params::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellfloateditor.html#wxgridcellfloateditorsetparameters">external documentation</a>.
+-spec setParameters(This, Params) -> ok when
+	This::wxGridCellFloatEditor(), Params::string().
 setParameters(#wx_ref{type=ThisT,ref=ThisRef},Params)
  when is_list(Params) ->
   ?CLASS(ThisT,wxGridCellFloatEditor),
@@ -63,8 +68,8 @@ setParameters(#wx_ref{type=ThisT,ref=ThisRef},Params)
   wxe_util:cast(?wxGridCellFloatEditor_SetParameters,
   <<ThisRef:32/?UI,(byte_size(Params_UC)):32/?UI,(Params_UC)/binary, 0:(((8- ((0+byte_size(Params_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxGridCellFloatEditor()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxGridCellFloatEditor) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxGridCellFloatEditor),
   wxe_util:destroy(?wxGridCellFloatEditor_destroy,Obj),
diff --git a/lib/wx/src/gen/wxGridCellFloatRenderer.erl b/lib/wx/src/gen/wxGridCellFloatRenderer.erl
index 84ffd21b37..4e3450c90b 100644
--- a/lib/wx/src/gen/wxGridCellFloatRenderer.erl
+++ b/lib/wx/src/gen/wxGridCellFloatRenderer.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2012. 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
@@ -34,19 +34,23 @@
 %% inherited exports
 -export([draw/8,getBestSize/6,parent_class/1]).
 
+-export_type([wxGridCellFloatRenderer/0]).
 %% @hidden
 parent_class(wxGridCellStringRenderer) -> true;
 parent_class(wxGridCellRenderer) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxGridCellFloatRenderer()
+-type wxGridCellFloatRenderer() :: wx:wx_object().
 %% @equiv new([])
+-spec new() -> wxGridCellFloatRenderer().
+
 new() ->
   new([]).
 
-%% @spec ([Option]) -> wxGridCellFloatRenderer()
-%% Option = {width, integer()} | {precision, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellfloatrenderer.html#wxgridcellfloatrendererwxgridcellfloatrenderer">external documentation</a>.
+-spec new([Option]) -> wxGridCellFloatRenderer() when
+	Option :: {width, integer()}
+		 | {precision, integer()}.
 new(Options)
  when is_list(Options) ->
   MOpts = fun({width, Width}, Acc) -> [<<1:32/?UI,Width:32/?UI>>|Acc];
@@ -56,22 +60,25 @@ new(Options)
   wxe_util:construct(?wxGridCellFloatRenderer_new,
   <<BinOpt/binary>>).
 
-%% @spec (This::wxGridCellFloatRenderer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellfloatrenderer.html#wxgridcellfloatrenderergetprecision">external documentation</a>.
+-spec getPrecision(This) -> integer() when
+	This::wxGridCellFloatRenderer().
 getPrecision(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGridCellFloatRenderer),
   wxe_util:call(?wxGridCellFloatRenderer_GetPrecision,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGridCellFloatRenderer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellfloatrenderer.html#wxgridcellfloatrenderergetwidth">external documentation</a>.
+-spec getWidth(This) -> integer() when
+	This::wxGridCellFloatRenderer().
 getWidth(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGridCellFloatRenderer),
   wxe_util:call(?wxGridCellFloatRenderer_GetWidth,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGridCellFloatRenderer(), Params::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellfloatrenderer.html#wxgridcellfloatrenderersetparameters">external documentation</a>.
+-spec setParameters(This, Params) -> ok when
+	This::wxGridCellFloatRenderer(), Params::string().
 setParameters(#wx_ref{type=ThisT,ref=ThisRef},Params)
  when is_list(Params) ->
   ?CLASS(ThisT,wxGridCellFloatRenderer),
@@ -79,24 +86,26 @@ setParameters(#wx_ref{type=ThisT,ref=ThisRef},Params)
   wxe_util:cast(?wxGridCellFloatRenderer_SetParameters,
   <<ThisRef:32/?UI,(byte_size(Params_UC)):32/?UI,(Params_UC)/binary, 0:(((8- ((0+byte_size(Params_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxGridCellFloatRenderer(), Precision::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellfloatrenderer.html#wxgridcellfloatrenderersetprecision">external documentation</a>.
+-spec setPrecision(This, Precision) -> ok when
+	This::wxGridCellFloatRenderer(), Precision::integer().
 setPrecision(#wx_ref{type=ThisT,ref=ThisRef},Precision)
  when is_integer(Precision) ->
   ?CLASS(ThisT,wxGridCellFloatRenderer),
   wxe_util:cast(?wxGridCellFloatRenderer_SetPrecision,
   <<ThisRef:32/?UI,Precision:32/?UI>>).
 
-%% @spec (This::wxGridCellFloatRenderer(), Width::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellfloatrenderer.html#wxgridcellfloatrenderersetwidth">external documentation</a>.
+-spec setWidth(This, Width) -> ok when
+	This::wxGridCellFloatRenderer(), Width::integer().
 setWidth(#wx_ref{type=ThisT,ref=ThisRef},Width)
  when is_integer(Width) ->
   ?CLASS(ThisT,wxGridCellFloatRenderer),
   wxe_util:cast(?wxGridCellFloatRenderer_SetWidth,
   <<ThisRef:32/?UI,Width:32/?UI>>).
 
-%% @spec (This::wxGridCellFloatRenderer()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxGridCellFloatRenderer) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxGridCellFloatRenderer),
   wxe_util:destroy(?wxGridCellFloatRenderer_destroy,Obj),
diff --git a/lib/wx/src/gen/wxGridCellNumberEditor.erl b/lib/wx/src/gen/wxGridCellNumberEditor.erl
index 4ebdbb14e9..c3ac0c41d5 100644
--- a/lib/wx/src/gen/wxGridCellNumberEditor.erl
+++ b/lib/wx/src/gen/wxGridCellNumberEditor.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2012. 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
@@ -34,19 +34,23 @@
 -export([beginEdit/4,endEdit/4,handleReturn/2,isCreated/1,paintBackground/3,
   parent_class/1,reset/1,setSize/2,show/2,show/3,startingClick/1,startingKey/2]).
 
+-export_type([wxGridCellNumberEditor/0]).
 %% @hidden
 parent_class(wxGridCellTextEditor) -> true;
 parent_class(wxGridCellEditor) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxGridCellNumberEditor()
+-type wxGridCellNumberEditor() :: wx:wx_object().
 %% @equiv new([])
+-spec new() -> wxGridCellNumberEditor().
+
 new() ->
   new([]).
 
-%% @spec ([Option]) -> wxGridCellNumberEditor()
-%% Option = {min, integer()} | {max, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellnumbereditor.html#wxgridcellnumbereditorwxgridcellnumbereditor">external documentation</a>.
+-spec new([Option]) -> wxGridCellNumberEditor() when
+	Option :: {min, integer()}
+		 | {max, integer()}.
 new(Options)
  when is_list(Options) ->
   MOpts = fun({min, Min}, Acc) -> [<<1:32/?UI,Min:32/?UI>>|Acc];
@@ -56,15 +60,17 @@ new(Options)
   wxe_util:construct(?wxGridCellNumberEditor_new,
   <<BinOpt/binary>>).
 
-%% @spec (This::wxGridCellNumberEditor()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellnumbereditor.html#wxgridcellnumbereditorgetvalue">external documentation</a>.
+-spec getValue(This) -> string() when
+	This::wxGridCellNumberEditor().
 getValue(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGridCellNumberEditor),
   wxe_util:call(?wxGridCellNumberEditor_GetValue,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGridCellNumberEditor(), Params::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellnumbereditor.html#wxgridcellnumbereditorsetparameters">external documentation</a>.
+-spec setParameters(This, Params) -> ok when
+	This::wxGridCellNumberEditor(), Params::string().
 setParameters(#wx_ref{type=ThisT,ref=ThisRef},Params)
  when is_list(Params) ->
   ?CLASS(ThisT,wxGridCellNumberEditor),
@@ -72,8 +78,8 @@ setParameters(#wx_ref{type=ThisT,ref=ThisRef},Params)
   wxe_util:cast(?wxGridCellNumberEditor_SetParameters,
   <<ThisRef:32/?UI,(byte_size(Params_UC)):32/?UI,(Params_UC)/binary, 0:(((8- ((0+byte_size(Params_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxGridCellNumberEditor()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxGridCellNumberEditor) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxGridCellNumberEditor),
   wxe_util:destroy(?wxGridCellNumberEditor_destroy,Obj),
diff --git a/lib/wx/src/gen/wxGridCellNumberRenderer.erl b/lib/wx/src/gen/wxGridCellNumberRenderer.erl
index 651057bb4b..5d5bd89960 100644
--- a/lib/wx/src/gen/wxGridCellNumberRenderer.erl
+++ b/lib/wx/src/gen/wxGridCellNumberRenderer.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2012. 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
@@ -33,19 +33,21 @@
 %% inherited exports
 -export([draw/8,getBestSize/6,parent_class/1]).
 
+-export_type([wxGridCellNumberRenderer/0]).
 %% @hidden
 parent_class(wxGridCellStringRenderer) -> true;
 parent_class(wxGridCellRenderer) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxGridCellNumberRenderer()
+-type wxGridCellNumberRenderer() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellnumberrenderer.html#wxgridcellnumberrendererwxgridcellnumberrenderer">external documentation</a>.
+-spec new() -> wxGridCellNumberRenderer().
 new() ->
   wxe_util:construct(?wxGridCellNumberRenderer_new,
   <<>>).
 
-%% @spec (This::wxGridCellNumberRenderer()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxGridCellNumberRenderer) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxGridCellNumberRenderer),
   wxe_util:destroy(?wxGridCellNumberRenderer_destroy,Obj),
diff --git a/lib/wx/src/gen/wxGridCellRenderer.erl b/lib/wx/src/gen/wxGridCellRenderer.erl
index 765c116a48..42d376a347 100644
--- a/lib/wx/src/gen/wxGridCellRenderer.erl
+++ b/lib/wx/src/gen/wxGridCellRenderer.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -29,11 +29,14 @@
 %% inherited exports
 -export([parent_class/1]).
 
+-export_type([wxGridCellRenderer/0]).
 %% @hidden
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (This::wxGridCellRenderer(), Grid::wxGrid:wxGrid(), Attr::wxGridCellAttr:wxGridCellAttr(), Dc::wxDC:wxDC(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}, Row::integer(), Col::integer(), IsSelected::bool()) -> ok
+-type wxGridCellRenderer() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellrenderer.html#wxgridcellrendererdraw">external documentation</a>.
+-spec draw(This, Grid, Attr, Dc, Rect, Row, Col, IsSelected) -> ok when
+	This::wxGridCellRenderer(), Grid::wxGrid:wxGrid(), Attr::wxGridCellAttr:wxGridCellAttr(), Dc::wxDC:wxDC(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}, Row::integer(), Col::integer(), IsSelected::boolean().
 draw(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=GridT,ref=GridRef},#wx_ref{type=AttrT,ref=AttrRef},#wx_ref{type=DcT,ref=DcRef},{RectX,RectY,RectW,RectH},Row,Col,IsSelected)
  when is_integer(RectX),is_integer(RectY),is_integer(RectW),is_integer(RectH),is_integer(Row),is_integer(Col),is_boolean(IsSelected) ->
   ?CLASS(ThisT,wxGridCellRenderer),
@@ -43,8 +46,9 @@ draw(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=GridT,ref=GridRef},#wx_ref{typ
   wxe_util:cast(?wxGridCellRenderer_Draw,
   <<ThisRef:32/?UI,GridRef:32/?UI,AttrRef:32/?UI,DcRef:32/?UI,RectX:32/?UI,RectY:32/?UI,RectW:32/?UI,RectH:32/?UI,Row:32/?UI,Col:32/?UI,(wxe_util:from_bool(IsSelected)):32/?UI>>).
 
-%% @spec (This::wxGridCellRenderer(), Grid::wxGrid:wxGrid(), Attr::wxGridCellAttr:wxGridCellAttr(), Dc::wxDC:wxDC(), Row::integer(), Col::integer()) -> {W::integer(), H::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellrenderer.html#wxgridcellrenderergetbestsize">external documentation</a>.
+-spec getBestSize(This, Grid, Attr, Dc, Row, Col) -> {W::integer(), H::integer()} when
+	This::wxGridCellRenderer(), Grid::wxGrid:wxGrid(), Attr::wxGridCellAttr:wxGridCellAttr(), Dc::wxDC:wxDC(), Row::integer(), Col::integer().
 getBestSize(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=GridT,ref=GridRef},#wx_ref{type=AttrT,ref=AttrRef},#wx_ref{type=DcT,ref=DcRef},Row,Col)
  when is_integer(Row),is_integer(Col) ->
   ?CLASS(ThisT,wxGridCellRenderer),
diff --git a/lib/wx/src/gen/wxGridCellStringRenderer.erl b/lib/wx/src/gen/wxGridCellStringRenderer.erl
index 28a79e0453..36887a3d52 100644
--- a/lib/wx/src/gen/wxGridCellStringRenderer.erl
+++ b/lib/wx/src/gen/wxGridCellStringRenderer.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2012. 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
@@ -32,18 +32,20 @@
 %% inherited exports
 -export([draw/8,getBestSize/6,parent_class/1]).
 
+-export_type([wxGridCellStringRenderer/0]).
 %% @hidden
 parent_class(wxGridCellRenderer) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxGridCellStringRenderer()
+-type wxGridCellStringRenderer() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellstringrenderer.html#wxgridcellstringrendererwxgridcellstringrenderer">external documentation</a>.
+-spec new() -> wxGridCellStringRenderer().
 new() ->
   wxe_util:construct(?wxGridCellStringRenderer_new,
   <<>>).
 
-%% @spec (This::wxGridCellStringRenderer()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxGridCellStringRenderer) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxGridCellStringRenderer),
   wxe_util:destroy(?wxGridCellStringRenderer_destroy,Obj),
diff --git a/lib/wx/src/gen/wxGridCellTextEditor.erl b/lib/wx/src/gen/wxGridCellTextEditor.erl
index d9ab1dc107..e849de7afd 100644
--- a/lib/wx/src/gen/wxGridCellTextEditor.erl
+++ b/lib/wx/src/gen/wxGridCellTextEditor.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2012. 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
@@ -33,18 +33,21 @@
 -export([beginEdit/4,endEdit/4,handleReturn/2,isCreated/1,paintBackground/3,
   parent_class/1,reset/1,setSize/2,show/2,show/3,startingClick/1,startingKey/2]).
 
+-export_type([wxGridCellTextEditor/0]).
 %% @hidden
 parent_class(wxGridCellEditor) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxGridCellTextEditor()
+-type wxGridCellTextEditor() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcelltexteditor.html#wxgridcelltexteditorwxgridcelltexteditor">external documentation</a>.
+-spec new() -> wxGridCellTextEditor().
 new() ->
   wxe_util:construct(?wxGridCellTextEditor_new,
   <<>>).
 
-%% @spec (This::wxGridCellTextEditor(), Params::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcelltexteditor.html#wxgridcelltexteditorsetparameters">external documentation</a>.
+-spec setParameters(This, Params) -> ok when
+	This::wxGridCellTextEditor(), Params::string().
 setParameters(#wx_ref{type=ThisT,ref=ThisRef},Params)
  when is_list(Params) ->
   ?CLASS(ThisT,wxGridCellTextEditor),
@@ -52,8 +55,8 @@ setParameters(#wx_ref{type=ThisT,ref=ThisRef},Params)
   wxe_util:cast(?wxGridCellTextEditor_SetParameters,
   <<ThisRef:32/?UI,(byte_size(Params_UC)):32/?UI,(Params_UC)/binary, 0:(((8- ((0+byte_size(Params_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxGridCellTextEditor()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxGridCellTextEditor) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxGridCellTextEditor),
   wxe_util:destroy(?wxGridCellTextEditor_destroy,Obj),
diff --git a/lib/wx/src/gen/wxGridEvent.erl b/lib/wx/src/gen/wxGridEvent.erl
index 123088afb5..59c2ad53b5 100644
--- a/lib/wx/src/gen/wxGridEvent.erl
+++ b/lib/wx/src/gen/wxGridEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -42,63 +42,73 @@
   isSelection/1,parent_class/1,resumePropagation/2,setInt/2,setString/2,
   shouldPropagate/1,skip/1,skip/2,stopPropagation/1,veto/1]).
 
+-export_type([wxGridEvent/0]).
 %% @hidden
 parent_class(wxNotifyEvent) -> true;
 parent_class(wxCommandEvent) -> true;
 parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (This::wxGridEvent()) -> bool()
+-type wxGridEvent() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridevent.html#wxgrideventaltdown">external documentation</a>.
+-spec altDown(This) -> boolean() when
+	This::wxGridEvent().
 altDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGridEvent),
   wxe_util:call(?wxGridEvent_AltDown,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGridEvent()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridevent.html#wxgrideventcontroldown">external documentation</a>.
+-spec controlDown(This) -> boolean() when
+	This::wxGridEvent().
 controlDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGridEvent),
   wxe_util:call(?wxGridEvent_ControlDown,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGridEvent()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridevent.html#wxgrideventgetcol">external documentation</a>.
+-spec getCol(This) -> integer() when
+	This::wxGridEvent().
 getCol(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGridEvent),
   wxe_util:call(?wxGridEvent_GetCol,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGridEvent()) -> {X::integer(), Y::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridevent.html#wxgrideventgetposition">external documentation</a>.
+-spec getPosition(This) -> {X::integer(), Y::integer()} when
+	This::wxGridEvent().
 getPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGridEvent),
   wxe_util:call(?wxGridEvent_GetPosition,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGridEvent()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridevent.html#wxgrideventgetrow">external documentation</a>.
+-spec getRow(This) -> integer() when
+	This::wxGridEvent().
 getRow(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGridEvent),
   wxe_util:call(?wxGridEvent_GetRow,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGridEvent()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridevent.html#wxgrideventmetadown">external documentation</a>.
+-spec metaDown(This) -> boolean() when
+	This::wxGridEvent().
 metaDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGridEvent),
   wxe_util:call(?wxGridEvent_MetaDown,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGridEvent()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridevent.html#wxgrideventselecting">external documentation</a>.
+-spec selecting(This) -> boolean() when
+	This::wxGridEvent().
 selecting(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGridEvent),
   wxe_util:call(?wxGridEvent_Selecting,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGridEvent()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridevent.html#wxgrideventshiftdown">external documentation</a>.
+-spec shiftDown(This) -> boolean() when
+	This::wxGridEvent().
 shiftDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGridEvent),
   wxe_util:call(?wxGridEvent_ShiftDown,
diff --git a/lib/wx/src/gen/wxGridSizer.erl b/lib/wx/src/gen/wxGridSizer.erl
index fd8580c70d..0893105352 100644
--- a/lib/wx/src/gen/wxGridSizer.erl
+++ b/lib/wx/src/gen/wxGridSizer.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -41,19 +41,25 @@
   setMinSize/2,setMinSize/3,setSizeHints/2,setVirtualSizeHints/2,show/2,
   show/3]).
 
+-export_type([wxGridSizer/0]).
 %% @hidden
 parent_class(wxSizer) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (Cols::integer()) -> wxGridSizer()
+-type wxGridSizer() :: wx:wx_object().
 %% @equiv new(Cols, [])
+-spec new(Cols) -> wxGridSizer() when
+	Cols::integer().
+
 new(Cols)
  when is_integer(Cols) ->
   new(Cols, []).
 
-%% @spec (Cols::integer(), [Option]) -> wxGridSizer()
-%% Option = {vgap, integer()} | {hgap, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridsizer.html#wxgridsizerwxgridsizer">external documentation</a>.
+-spec new(Cols, [Option]) -> wxGridSizer() when
+	Cols::integer(),
+	Option :: {vgap, integer()}
+		 | {hgap, integer()}.
 new(Cols, Options)
  when is_integer(Cols),is_list(Options) ->
   MOpts = fun({vgap, Vgap}, Acc) -> [<<1:32/?UI,Vgap:32/?UI>>|Acc];
@@ -63,75 +69,84 @@ new(Cols, Options)
   wxe_util:construct(?wxGridSizer_new_2,
   <<Cols:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (Rows::integer(), Cols::integer(), Vgap::integer(), Hgap::integer()) -> wxGridSizer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridsizer.html#wxgridsizerwxgridsizer">external documentation</a>.
+-spec new(Rows, Cols, Vgap, Hgap) -> wxGridSizer() when
+	Rows::integer(), Cols::integer(), Vgap::integer(), Hgap::integer().
 new(Rows,Cols,Vgap,Hgap)
  when is_integer(Rows),is_integer(Cols),is_integer(Vgap),is_integer(Hgap) ->
   wxe_util:construct(?wxGridSizer_new_4,
   <<Rows:32/?UI,Cols:32/?UI,Vgap:32/?UI,Hgap:32/?UI>>).
 
-%% @spec (This::wxGridSizer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridsizer.html#wxgridsizergetcols">external documentation</a>.
+-spec getCols(This) -> integer() when
+	This::wxGridSizer().
 getCols(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGridSizer),
   wxe_util:call(?wxGridSizer_GetCols,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGridSizer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridsizer.html#wxgridsizergethgap">external documentation</a>.
+-spec getHGap(This) -> integer() when
+	This::wxGridSizer().
 getHGap(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGridSizer),
   wxe_util:call(?wxGridSizer_GetHGap,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGridSizer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridsizer.html#wxgridsizergetrows">external documentation</a>.
+-spec getRows(This) -> integer() when
+	This::wxGridSizer().
 getRows(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGridSizer),
   wxe_util:call(?wxGridSizer_GetRows,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGridSizer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridsizer.html#wxgridsizergetvgap">external documentation</a>.
+-spec getVGap(This) -> integer() when
+	This::wxGridSizer().
 getVGap(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGridSizer),
   wxe_util:call(?wxGridSizer_GetVGap,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxGridSizer(), Cols::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridsizer.html#wxgridsizersetcols">external documentation</a>.
+-spec setCols(This, Cols) -> ok when
+	This::wxGridSizer(), Cols::integer().
 setCols(#wx_ref{type=ThisT,ref=ThisRef},Cols)
  when is_integer(Cols) ->
   ?CLASS(ThisT,wxGridSizer),
   wxe_util:cast(?wxGridSizer_SetCols,
   <<ThisRef:32/?UI,Cols:32/?UI>>).
 
-%% @spec (This::wxGridSizer(), Gap::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridsizer.html#wxgridsizersethgap">external documentation</a>.
+-spec setHGap(This, Gap) -> ok when
+	This::wxGridSizer(), Gap::integer().
 setHGap(#wx_ref{type=ThisT,ref=ThisRef},Gap)
  when is_integer(Gap) ->
   ?CLASS(ThisT,wxGridSizer),
   wxe_util:cast(?wxGridSizer_SetHGap,
   <<ThisRef:32/?UI,Gap:32/?UI>>).
 
-%% @spec (This::wxGridSizer(), Rows::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridsizer.html#wxgridsizersetrows">external documentation</a>.
+-spec setRows(This, Rows) -> ok when
+	This::wxGridSizer(), Rows::integer().
 setRows(#wx_ref{type=ThisT,ref=ThisRef},Rows)
  when is_integer(Rows) ->
   ?CLASS(ThisT,wxGridSizer),
   wxe_util:cast(?wxGridSizer_SetRows,
   <<ThisRef:32/?UI,Rows:32/?UI>>).
 
-%% @spec (This::wxGridSizer(), Gap::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridsizer.html#wxgridsizersetvgap">external documentation</a>.
+-spec setVGap(This, Gap) -> ok when
+	This::wxGridSizer(), Gap::integer().
 setVGap(#wx_ref{type=ThisT,ref=ThisRef},Gap)
  when is_integer(Gap) ->
   ?CLASS(ThisT,wxGridSizer),
   wxe_util:cast(?wxGridSizer_SetVGap,
   <<ThisRef:32/?UI,Gap:32/?UI>>).
 
-%% @spec (This::wxGridSizer()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxGridSizer) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxGridSizer),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxHelpEvent.erl b/lib/wx/src/gen/wxHelpEvent.erl
index b80903c314..70da136be8 100644
--- a/lib/wx/src/gen/wxHelpEvent.erl
+++ b/lib/wx/src/gen/wxHelpEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -37,38 +37,42 @@
 -export([getId/1,getSkipped/1,getTimestamp/1,isCommandEvent/1,parent_class/1,
   resumePropagation/2,shouldPropagate/1,skip/1,skip/2,stopPropagation/1]).
 
+-export_type([wxHelpEvent/0]).
 %% @hidden
 parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (This::wxHelpEvent()) -> Origin
-%% Origin = integer()
+-type wxHelpEvent() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhelpevent.html#wxhelpeventgetorigin">external documentation</a>.
-%%<br /> Origin is one of ?wxHelpEvent_Origin_Unknown | ?wxHelpEvent_Origin_Keyboard | ?wxHelpEvent_Origin_HelpButton
+%%<br /> Res = ?wxHelpEvent_Origin_Unknown | ?wxHelpEvent_Origin_Keyboard | ?wxHelpEvent_Origin_HelpButton
+-spec getOrigin(This) -> wx:wx_enum() when
+	This::wxHelpEvent().
 getOrigin(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxHelpEvent),
   wxe_util:call(?wxHelpEvent_GetOrigin,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxHelpEvent()) -> {X::integer(), Y::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhelpevent.html#wxhelpeventgetposition">external documentation</a>.
+-spec getPosition(This) -> {X::integer(), Y::integer()} when
+	This::wxHelpEvent().
 getPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxHelpEvent),
   wxe_util:call(?wxHelpEvent_GetPosition,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxHelpEvent(), Origin::Origin) -> ok
-%% Origin = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhelpevent.html#wxhelpeventsetorigin">external documentation</a>.
-%%<br /> Origin is one of ?wxHelpEvent_Origin_Unknown | ?wxHelpEvent_Origin_Keyboard | ?wxHelpEvent_Origin_HelpButton
+%%<br /> Origin = ?wxHelpEvent_Origin_Unknown | ?wxHelpEvent_Origin_Keyboard | ?wxHelpEvent_Origin_HelpButton
+-spec setOrigin(This, Origin) -> ok when
+	This::wxHelpEvent(), Origin::wx:wx_enum().
 setOrigin(#wx_ref{type=ThisT,ref=ThisRef},Origin)
  when is_integer(Origin) ->
   ?CLASS(ThisT,wxHelpEvent),
   wxe_util:cast(?wxHelpEvent_SetOrigin,
   <<ThisRef:32/?UI,Origin:32/?UI>>).
 
-%% @spec (This::wxHelpEvent(), Pos::{X::integer(), Y::integer()}) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhelpevent.html#wxhelpeventsetposition">external documentation</a>.
+-spec setPosition(This, Pos) -> ok when
+	This::wxHelpEvent(), Pos::{X::integer(), Y::integer()}.
 setPosition(#wx_ref{type=ThisT,ref=ThisRef},{PosX,PosY})
  when is_integer(PosX),is_integer(PosY) ->
   ?CLASS(ThisT,wxHelpEvent),
diff --git a/lib/wx/src/gen/wxHtmlEasyPrinting.erl b/lib/wx/src/gen/wxHtmlEasyPrinting.erl
index 15d673169a..5f1f55af64 100644
--- a/lib/wx/src/gen/wxHtmlEasyPrinting.erl
+++ b/lib/wx/src/gen/wxHtmlEasyPrinting.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -32,17 +32,21 @@
 %% inherited exports
 -export([parent_class/1]).
 
+-export_type([wxHtmlEasyPrinting/0]).
 %% @hidden
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxHtmlEasyPrinting()
+-type wxHtmlEasyPrinting() :: wx:wx_object().
 %% @equiv new([])
+-spec new() -> wxHtmlEasyPrinting().
+
 new() ->
   new([]).
 
-%% @spec ([Option]) -> wxHtmlEasyPrinting()
-%% Option = {name, string()} | {parentWindow, wxWindow:wxWindow()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmleasyprinting.html#wxhtmleasyprintingwxhtmleasyprinting">external documentation</a>.
+-spec new([Option]) -> wxHtmlEasyPrinting() when
+	Option :: {name, string()}
+		 | {parentWindow, wxWindow:wxWindow()}.
 new(Options)
  when is_list(Options) ->
   MOpts = fun({name, Name}, Acc) ->   Name_UC = unicode:characters_to_binary([Name,0]),[<<1:32/?UI,(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((0+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8>>|Acc];
@@ -52,22 +56,25 @@ new(Options)
   wxe_util:construct(?wxHtmlEasyPrinting_new,
   <<BinOpt/binary>>).
 
-%% @spec (This::wxHtmlEasyPrinting()) -> wxPrintData:wxPrintData()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmleasyprinting.html#wxhtmleasyprintinggetprintdata">external documentation</a>.
+-spec getPrintData(This) -> wxPrintData:wxPrintData() when
+	This::wxHtmlEasyPrinting().
 getPrintData(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxHtmlEasyPrinting),
   wxe_util:call(?wxHtmlEasyPrinting_GetPrintData,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxHtmlEasyPrinting()) -> wxPageSetupDialogData:wxPageSetupDialogData()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmleasyprinting.html#wxhtmleasyprintinggetpagesetupdata">external documentation</a>.
+-spec getPageSetupData(This) -> wxPageSetupDialogData:wxPageSetupDialogData() when
+	This::wxHtmlEasyPrinting().
 getPageSetupData(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxHtmlEasyPrinting),
   wxe_util:call(?wxHtmlEasyPrinting_GetPageSetupData,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxHtmlEasyPrinting(), Htmlfile::string()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmleasyprinting.html#wxhtmleasyprintingpreviewfile">external documentation</a>.
+-spec previewFile(This, Htmlfile) -> boolean() when
+	This::wxHtmlEasyPrinting(), Htmlfile::string().
 previewFile(#wx_ref{type=ThisT,ref=ThisRef},Htmlfile)
  when is_list(Htmlfile) ->
   ?CLASS(ThisT,wxHtmlEasyPrinting),
@@ -75,15 +82,18 @@ previewFile(#wx_ref{type=ThisT,ref=ThisRef},Htmlfile)
   wxe_util:call(?wxHtmlEasyPrinting_PreviewFile,
   <<ThisRef:32/?UI,(byte_size(Htmlfile_UC)):32/?UI,(Htmlfile_UC)/binary, 0:(((8- ((0+byte_size(Htmlfile_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxHtmlEasyPrinting(), Htmltext::string()) -> bool()
 %% @equiv previewText(This,Htmltext, [])
+-spec previewText(This, Htmltext) -> boolean() when
+	This::wxHtmlEasyPrinting(), Htmltext::string().
+
 previewText(This,Htmltext)
  when is_record(This, wx_ref),is_list(Htmltext) ->
   previewText(This,Htmltext, []).
 
-%% @spec (This::wxHtmlEasyPrinting(), Htmltext::string(), [Option]) -> bool()
-%% Option = {basepath, string()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmleasyprinting.html#wxhtmleasyprintingpreviewtext">external documentation</a>.
+-spec previewText(This, Htmltext, [Option]) -> boolean() when
+	This::wxHtmlEasyPrinting(), Htmltext::string(),
+	Option :: {basepath, string()}.
 previewText(#wx_ref{type=ThisT,ref=ThisRef},Htmltext, Options)
  when is_list(Htmltext),is_list(Options) ->
   ?CLASS(ThisT,wxHtmlEasyPrinting),
@@ -94,8 +104,9 @@ previewText(#wx_ref{type=ThisT,ref=ThisRef},Htmltext, Options)
   wxe_util:call(?wxHtmlEasyPrinting_PreviewText,
   <<ThisRef:32/?UI,(byte_size(Htmltext_UC)):32/?UI,(Htmltext_UC)/binary, 0:(((8- ((0+byte_size(Htmltext_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxHtmlEasyPrinting(), Htmlfile::string()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmleasyprinting.html#wxhtmleasyprintingprintfile">external documentation</a>.
+-spec printFile(This, Htmlfile) -> boolean() when
+	This::wxHtmlEasyPrinting(), Htmlfile::string().
 printFile(#wx_ref{type=ThisT,ref=ThisRef},Htmlfile)
  when is_list(Htmlfile) ->
   ?CLASS(ThisT,wxHtmlEasyPrinting),
@@ -103,15 +114,18 @@ printFile(#wx_ref{type=ThisT,ref=ThisRef},Htmlfile)
   wxe_util:call(?wxHtmlEasyPrinting_PrintFile,
   <<ThisRef:32/?UI,(byte_size(Htmlfile_UC)):32/?UI,(Htmlfile_UC)/binary, 0:(((8- ((0+byte_size(Htmlfile_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxHtmlEasyPrinting(), Htmltext::string()) -> bool()
 %% @equiv printText(This,Htmltext, [])
+-spec printText(This, Htmltext) -> boolean() when
+	This::wxHtmlEasyPrinting(), Htmltext::string().
+
 printText(This,Htmltext)
  when is_record(This, wx_ref),is_list(Htmltext) ->
   printText(This,Htmltext, []).
 
-%% @spec (This::wxHtmlEasyPrinting(), Htmltext::string(), [Option]) -> bool()
-%% Option = {basepath, string()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmleasyprinting.html#wxhtmleasyprintingprinttext">external documentation</a>.
+-spec printText(This, Htmltext, [Option]) -> boolean() when
+	This::wxHtmlEasyPrinting(), Htmltext::string(),
+	Option :: {basepath, string()}.
 printText(#wx_ref{type=ThisT,ref=ThisRef},Htmltext, Options)
  when is_list(Htmltext),is_list(Options) ->
   ?CLASS(ThisT,wxHtmlEasyPrinting),
@@ -122,22 +136,26 @@ printText(#wx_ref{type=ThisT,ref=ThisRef},Htmltext, Options)
   wxe_util:call(?wxHtmlEasyPrinting_PrintText,
   <<ThisRef:32/?UI,(byte_size(Htmltext_UC)):32/?UI,(Htmltext_UC)/binary, 0:(((8- ((0+byte_size(Htmltext_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxHtmlEasyPrinting()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmleasyprinting.html#wxhtmleasyprintingpagesetup">external documentation</a>.
+-spec pageSetup(This) -> ok when
+	This::wxHtmlEasyPrinting().
 pageSetup(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxHtmlEasyPrinting),
   wxe_util:cast(?wxHtmlEasyPrinting_PageSetup,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxHtmlEasyPrinting(), Normal_face::string(), Fixed_face::string()) -> ok
 %% @equiv setFonts(This,Normal_face,Fixed_face, [])
+-spec setFonts(This, Normal_face, Fixed_face) -> ok when
+	This::wxHtmlEasyPrinting(), Normal_face::string(), Fixed_face::string().
+
 setFonts(This,Normal_face,Fixed_face)
  when is_record(This, wx_ref),is_list(Normal_face),is_list(Fixed_face) ->
   setFonts(This,Normal_face,Fixed_face, []).
 
-%% @spec (This::wxHtmlEasyPrinting(), Normal_face::string(), Fixed_face::string(), [Option]) -> ok
-%% Option = {sizes, [integer()]}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmleasyprinting.html#wxhtmleasyprintingsetfonts">external documentation</a>.
+-spec setFonts(This, Normal_face, Fixed_face, [Option]) -> ok when
+	This::wxHtmlEasyPrinting(), Normal_face::string(), Fixed_face::string(),
+	Option :: {sizes, [integer()]}.
 setFonts(#wx_ref{type=ThisT,ref=ThisRef},Normal_face,Fixed_face, Options)
  when is_list(Normal_face),is_list(Fixed_face),is_list(Options) ->
   ?CLASS(ThisT,wxHtmlEasyPrinting),
@@ -150,15 +168,18 @@ setFonts(#wx_ref{type=ThisT,ref=ThisRef},Normal_face,Fixed_face, Options)
   wxe_util:cast(?wxHtmlEasyPrinting_SetFonts,
   <<ThisRef:32/?UI,(byte_size(Normal_face_UC)):32/?UI,(Normal_face_UC)/binary, 0:(((8- ((0+byte_size(Normal_face_UC)) band 16#7)) band 16#7))/unit:8,(byte_size(Fixed_face_UC)):32/?UI,(Fixed_face_UC)/binary, 0:(((8- ((4+byte_size(Fixed_face_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxHtmlEasyPrinting(), Header::string()) -> ok
 %% @equiv setHeader(This,Header, [])
+-spec setHeader(This, Header) -> ok when
+	This::wxHtmlEasyPrinting(), Header::string().
+
 setHeader(This,Header)
  when is_record(This, wx_ref),is_list(Header) ->
   setHeader(This,Header, []).
 
-%% @spec (This::wxHtmlEasyPrinting(), Header::string(), [Option]) -> ok
-%% Option = {pg, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmleasyprinting.html#wxhtmleasyprintingsetheader">external documentation</a>.
+-spec setHeader(This, Header, [Option]) -> ok when
+	This::wxHtmlEasyPrinting(), Header::string(),
+	Option :: {pg, integer()}.
 setHeader(#wx_ref{type=ThisT,ref=ThisRef},Header, Options)
  when is_list(Header),is_list(Options) ->
   ?CLASS(ThisT,wxHtmlEasyPrinting),
@@ -169,15 +190,18 @@ setHeader(#wx_ref{type=ThisT,ref=ThisRef},Header, Options)
   wxe_util:cast(?wxHtmlEasyPrinting_SetHeader,
   <<ThisRef:32/?UI,(byte_size(Header_UC)):32/?UI,(Header_UC)/binary, 0:(((8- ((0+byte_size(Header_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxHtmlEasyPrinting(), Footer::string()) -> ok
 %% @equiv setFooter(This,Footer, [])
+-spec setFooter(This, Footer) -> ok when
+	This::wxHtmlEasyPrinting(), Footer::string().
+
 setFooter(This,Footer)
  when is_record(This, wx_ref),is_list(Footer) ->
   setFooter(This,Footer, []).
 
-%% @spec (This::wxHtmlEasyPrinting(), Footer::string(), [Option]) -> ok
-%% Option = {pg, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmleasyprinting.html#wxhtmleasyprintingsetfooter">external documentation</a>.
+-spec setFooter(This, Footer, [Option]) -> ok when
+	This::wxHtmlEasyPrinting(), Footer::string(),
+	Option :: {pg, integer()}.
 setFooter(#wx_ref{type=ThisT,ref=ThisRef},Footer, Options)
  when is_list(Footer),is_list(Options) ->
   ?CLASS(ThisT,wxHtmlEasyPrinting),
@@ -188,8 +212,8 @@ setFooter(#wx_ref{type=ThisT,ref=ThisRef},Footer, Options)
   wxe_util:cast(?wxHtmlEasyPrinting_SetFooter,
   <<ThisRef:32/?UI,(byte_size(Footer_UC)):32/?UI,(Footer_UC)/binary, 0:(((8- ((0+byte_size(Footer_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxHtmlEasyPrinting()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxHtmlEasyPrinting) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxHtmlEasyPrinting),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxHtmlLinkEvent.erl b/lib/wx/src/gen/wxHtmlLinkEvent.erl
index 166493ccbc..94fe670f35 100644
--- a/lib/wx/src/gen/wxHtmlLinkEvent.erl
+++ b/lib/wx/src/gen/wxHtmlLinkEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2012. 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
@@ -40,13 +40,16 @@
   parent_class/1,resumePropagation/2,setInt/2,setString/2,shouldPropagate/1,
   skip/1,skip/2,stopPropagation/1]).
 
+-export_type([wxHtmlLinkEvent/0]).
 %% @hidden
 parent_class(wxCommandEvent) -> true;
 parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (This::wxHtmlLinkEvent()) -> wx:wxHtmlLinkInfo()
+-type wxHtmlLinkEvent() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmllinkevent.html#wxhtmllinkeventgetlinkinfo">external documentation</a>.
+-spec getLinkInfo(This) -> wx:wx_wxHtmlLinkInfo() when
+	This::wxHtmlLinkEvent().
 getLinkInfo(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxHtmlLinkEvent),
   wxe_util:call(?wxHtmlLinkEvent_GetLinkInfo,
diff --git a/lib/wx/src/gen/wxHtmlWindow.erl b/lib/wx/src/gen/wxHtmlWindow.erl
index 891e5481fb..c8237ec31d 100644
--- a/lib/wx/src/gen/wxHtmlWindow.erl
+++ b/lib/wx/src/gen/wxHtmlWindow.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2012. 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
@@ -79,6 +79,7 @@
   transferDataToWindow/1,update/1,updateWindowUI/1,updateWindowUI/2,
   validate/1,warpPointer/3]).
 
+-export_type([wxHtmlWindow/0]).
 %% @hidden
 parent_class(wxScrolledWindow) -> true;
 parent_class(wxPanel) -> true;
@@ -86,21 +87,28 @@ parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxHtmlWindow()
+-type wxHtmlWindow() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmlwindow.html#wxhtmlwindowwxhtmlwindow">external documentation</a>.
+-spec new() -> wxHtmlWindow().
 new() ->
   wxe_util:construct(?wxHtmlWindow_new_0,
   <<>>).
 
-%% @spec (Parent::wxWindow:wxWindow()) -> wxHtmlWindow()
 %% @equiv new(Parent, [])
+-spec new(Parent) -> wxHtmlWindow() when
+	Parent::wxWindow:wxWindow().
+
 new(Parent)
  when is_record(Parent, wx_ref) ->
   new(Parent, []).
 
-%% @spec (Parent::wxWindow:wxWindow(), [Option]) -> wxHtmlWindow()
-%% Option = {id, integer()} | {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmlwindow.html#wxhtmlwindowwxhtmlwindow">external documentation</a>.
+-spec new(Parent, [Option]) -> wxHtmlWindow() when
+	Parent::wxWindow:wxWindow(),
+	Option :: {id, integer()}
+		 | {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}.
 new(#wx_ref{type=ParentT,ref=ParentRef}, Options)
  when is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -113,8 +121,9 @@ new(#wx_ref{type=ParentT,ref=ParentRef}, Options)
   wxe_util:construct(?wxHtmlWindow_new_2,
   <<ParentRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxHtmlWindow(), Source::string()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmlwindow.html#wxhtmlwindowappendtopage">external documentation</a>.
+-spec appendToPage(This, Source) -> boolean() when
+	This::wxHtmlWindow(), Source::string().
 appendToPage(#wx_ref{type=ThisT,ref=ThisRef},Source)
  when is_list(Source) ->
   ?CLASS(ThisT,wxHtmlWindow),
@@ -122,71 +131,81 @@ appendToPage(#wx_ref{type=ThisT,ref=ThisRef},Source)
   wxe_util:call(?wxHtmlWindow_AppendToPage,
   <<ThisRef:32/?UI,(byte_size(Source_UC)):32/?UI,(Source_UC)/binary, 0:(((8- ((0+byte_size(Source_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxHtmlWindow()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmlwindow.html#wxhtmlwindowgetopenedanchor">external documentation</a>.
+-spec getOpenedAnchor(This) -> string() when
+	This::wxHtmlWindow().
 getOpenedAnchor(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxHtmlWindow),
   wxe_util:call(?wxHtmlWindow_GetOpenedAnchor,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxHtmlWindow()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmlwindow.html#wxhtmlwindowgetopenedpage">external documentation</a>.
+-spec getOpenedPage(This) -> string() when
+	This::wxHtmlWindow().
 getOpenedPage(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxHtmlWindow),
   wxe_util:call(?wxHtmlWindow_GetOpenedPage,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxHtmlWindow()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmlwindow.html#wxhtmlwindowgetopenedpagetitle">external documentation</a>.
+-spec getOpenedPageTitle(This) -> string() when
+	This::wxHtmlWindow().
 getOpenedPageTitle(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxHtmlWindow),
   wxe_util:call(?wxHtmlWindow_GetOpenedPageTitle,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxHtmlWindow()) -> wxFrame:wxFrame()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmlwindow.html#wxhtmlwindowgetrelatedframe">external documentation</a>.
+-spec getRelatedFrame(This) -> wxFrame:wxFrame() when
+	This::wxHtmlWindow().
 getRelatedFrame(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxHtmlWindow),
   wxe_util:call(?wxHtmlWindow_GetRelatedFrame,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxHtmlWindow()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmlwindow.html#wxhtmlwindowhistoryback">external documentation</a>.
+-spec historyBack(This) -> boolean() when
+	This::wxHtmlWindow().
 historyBack(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxHtmlWindow),
   wxe_util:call(?wxHtmlWindow_HistoryBack,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxHtmlWindow()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmlwindow.html#wxhtmlwindowhistorycanback">external documentation</a>.
+-spec historyCanBack(This) -> boolean() when
+	This::wxHtmlWindow().
 historyCanBack(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxHtmlWindow),
   wxe_util:call(?wxHtmlWindow_HistoryCanBack,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxHtmlWindow()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmlwindow.html#wxhtmlwindowhistorycanforward">external documentation</a>.
+-spec historyCanForward(This) -> boolean() when
+	This::wxHtmlWindow().
 historyCanForward(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxHtmlWindow),
   wxe_util:call(?wxHtmlWindow_HistoryCanForward,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxHtmlWindow()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmlwindow.html#wxhtmlwindowhistoryclear">external documentation</a>.
+-spec historyClear(This) -> ok when
+	This::wxHtmlWindow().
 historyClear(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxHtmlWindow),
   wxe_util:cast(?wxHtmlWindow_HistoryClear,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxHtmlWindow()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmlwindow.html#wxhtmlwindowhistoryforward">external documentation</a>.
+-spec historyForward(This) -> boolean() when
+	This::wxHtmlWindow().
 historyForward(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxHtmlWindow),
   wxe_util:call(?wxHtmlWindow_HistoryForward,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxHtmlWindow(), Filename::string()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmlwindow.html#wxhtmlwindowloadfile">external documentation</a>.
+-spec loadFile(This, Filename) -> boolean() when
+	This::wxHtmlWindow(), Filename::string().
 loadFile(#wx_ref{type=ThisT,ref=ThisRef},Filename)
  when is_list(Filename) ->
   ?CLASS(ThisT,wxHtmlWindow),
@@ -194,8 +213,9 @@ loadFile(#wx_ref{type=ThisT,ref=ThisRef},Filename)
   wxe_util:call(?wxHtmlWindow_LoadFile,
   <<ThisRef:32/?UI,(byte_size(Filename_UC)):32/?UI,(Filename_UC)/binary, 0:(((8- ((0+byte_size(Filename_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxHtmlWindow(), Location::string()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmlwindow.html#wxhtmlwindowloadpage">external documentation</a>.
+-spec loadPage(This, Location) -> boolean() when
+	This::wxHtmlWindow(), Location::string().
 loadPage(#wx_ref{type=ThisT,ref=ThisRef},Location)
  when is_list(Location) ->
   ?CLASS(ThisT,wxHtmlWindow),
@@ -203,53 +223,61 @@ loadPage(#wx_ref{type=ThisT,ref=ThisRef},Location)
   wxe_util:call(?wxHtmlWindow_LoadPage,
   <<ThisRef:32/?UI,(byte_size(Location_UC)):32/?UI,(Location_UC)/binary, 0:(((8- ((0+byte_size(Location_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxHtmlWindow()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmlwindow.html#wxhtmlwindowselectall">external documentation</a>.
+-spec selectAll(This) -> ok when
+	This::wxHtmlWindow().
 selectAll(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxHtmlWindow),
   wxe_util:cast(?wxHtmlWindow_SelectAll,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxHtmlWindow()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmlwindow.html#wxhtmlwindowselectiontotext">external documentation</a>.
+-spec selectionToText(This) -> string() when
+	This::wxHtmlWindow().
 selectionToText(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxHtmlWindow),
   wxe_util:call(?wxHtmlWindow_SelectionToText,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxHtmlWindow(), Pos::{X::integer(), Y::integer()}) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmlwindow.html#wxhtmlwindowselectline">external documentation</a>.
+-spec selectLine(This, Pos) -> ok when
+	This::wxHtmlWindow(), Pos::{X::integer(), Y::integer()}.
 selectLine(#wx_ref{type=ThisT,ref=ThisRef},{PosX,PosY})
  when is_integer(PosX),is_integer(PosY) ->
   ?CLASS(ThisT,wxHtmlWindow),
   wxe_util:cast(?wxHtmlWindow_SelectLine,
   <<ThisRef:32/?UI,PosX:32/?UI,PosY:32/?UI>>).
 
-%% @spec (This::wxHtmlWindow(), Pos::{X::integer(), Y::integer()}) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmlwindow.html#wxhtmlwindowselectword">external documentation</a>.
+-spec selectWord(This, Pos) -> ok when
+	This::wxHtmlWindow(), Pos::{X::integer(), Y::integer()}.
 selectWord(#wx_ref{type=ThisT,ref=ThisRef},{PosX,PosY})
  when is_integer(PosX),is_integer(PosY) ->
   ?CLASS(ThisT,wxHtmlWindow),
   wxe_util:cast(?wxHtmlWindow_SelectWord,
   <<ThisRef:32/?UI,PosX:32/?UI,PosY:32/?UI>>).
 
-%% @spec (This::wxHtmlWindow(), B::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmlwindow.html#wxhtmlwindowsetborders">external documentation</a>.
+-spec setBorders(This, B) -> ok when
+	This::wxHtmlWindow(), B::integer().
 setBorders(#wx_ref{type=ThisT,ref=ThisRef},B)
  when is_integer(B) ->
   ?CLASS(ThisT,wxHtmlWindow),
   wxe_util:cast(?wxHtmlWindow_SetBorders,
   <<ThisRef:32/?UI,B:32/?UI>>).
 
-%% @spec (This::wxHtmlWindow(), Normal_face::string(), Fixed_face::string()) -> ok
 %% @equiv setFonts(This,Normal_face,Fixed_face, [])
+-spec setFonts(This, Normal_face, Fixed_face) -> ok when
+	This::wxHtmlWindow(), Normal_face::string(), Fixed_face::string().
+
 setFonts(This,Normal_face,Fixed_face)
  when is_record(This, wx_ref),is_list(Normal_face),is_list(Fixed_face) ->
   setFonts(This,Normal_face,Fixed_face, []).
 
-%% @spec (This::wxHtmlWindow(), Normal_face::string(), Fixed_face::string(), [Option]) -> ok
-%% Option = {sizes, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmlwindow.html#wxhtmlwindowsetfonts">external documentation</a>.
+-spec setFonts(This, Normal_face, Fixed_face, [Option]) -> ok when
+	This::wxHtmlWindow(), Normal_face::string(), Fixed_face::string(),
+	Option :: {sizes, integer()}.
 setFonts(#wx_ref{type=ThisT,ref=ThisRef},Normal_face,Fixed_face, Options)
  when is_list(Normal_face),is_list(Fixed_face),is_list(Options) ->
   ?CLASS(ThisT,wxHtmlWindow),
@@ -261,8 +289,9 @@ setFonts(#wx_ref{type=ThisT,ref=ThisRef},Normal_face,Fixed_face, Options)
   wxe_util:cast(?wxHtmlWindow_SetFonts,
   <<ThisRef:32/?UI,(byte_size(Normal_face_UC)):32/?UI,(Normal_face_UC)/binary, 0:(((8- ((0+byte_size(Normal_face_UC)) band 16#7)) band 16#7))/unit:8,(byte_size(Fixed_face_UC)):32/?UI,(Fixed_face_UC)/binary, 0:(((8- ((4+byte_size(Fixed_face_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxHtmlWindow(), Source::string()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmlwindow.html#wxhtmlwindowsetpage">external documentation</a>.
+-spec setPage(This, Source) -> boolean() when
+	This::wxHtmlWindow(), Source::string().
 setPage(#wx_ref{type=ThisT,ref=ThisRef},Source)
  when is_list(Source) ->
   ?CLASS(ThisT,wxHtmlWindow),
@@ -270,8 +299,9 @@ setPage(#wx_ref{type=ThisT,ref=ThisRef},Source)
   wxe_util:call(?wxHtmlWindow_SetPage,
   <<ThisRef:32/?UI,(byte_size(Source_UC)):32/?UI,(Source_UC)/binary, 0:(((8- ((0+byte_size(Source_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxHtmlWindow(), Frame::wxFrame:wxFrame(), Format::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmlwindow.html#wxhtmlwindowsetrelatedframe">external documentation</a>.
+-spec setRelatedFrame(This, Frame, Format) -> ok when
+	This::wxHtmlWindow(), Frame::wxFrame:wxFrame(), Format::string().
 setRelatedFrame(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FrameT,ref=FrameRef},Format)
  when is_list(Format) ->
   ?CLASS(ThisT,wxHtmlWindow),
@@ -280,23 +310,25 @@ setRelatedFrame(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FrameT,ref=FrameRef
   wxe_util:cast(?wxHtmlWindow_SetRelatedFrame,
   <<ThisRef:32/?UI,FrameRef:32/?UI,(byte_size(Format_UC)):32/?UI,(Format_UC)/binary, 0:(((8- ((4+byte_size(Format_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxHtmlWindow(), Bar::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmlwindow.html#wxhtmlwindowsetrelatedstatusbar">external documentation</a>.
+-spec setRelatedStatusBar(This, Bar) -> ok when
+	This::wxHtmlWindow(), Bar::integer().
 setRelatedStatusBar(#wx_ref{type=ThisT,ref=ThisRef},Bar)
  when is_integer(Bar) ->
   ?CLASS(ThisT,wxHtmlWindow),
   wxe_util:cast(?wxHtmlWindow_SetRelatedStatusBar,
   <<ThisRef:32/?UI,Bar:32/?UI>>).
 
-%% @spec (This::wxHtmlWindow()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmlwindow.html#wxhtmlwindowtotext">external documentation</a>.
+-spec toText(This) -> string() when
+	This::wxHtmlWindow().
 toText(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxHtmlWindow),
   wxe_util:call(?wxHtmlWindow_ToText,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxHtmlWindow()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxHtmlWindow) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxHtmlWindow),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxIcon.erl b/lib/wx/src/gen/wxIcon.erl
index 5b224c00b6..0e218f9917 100644
--- a/lib/wx/src/gen/wxIcon.erl
+++ b/lib/wx/src/gen/wxIcon.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -35,24 +35,23 @@
   saveFile/3,saveFile/4,setDepth/2,setHeight/2,setMask/2,setPalette/2,
   setWidth/2]).
 
+-export_type([wxIcon/0]).
 %% @hidden
 parent_class(wxBitmap) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxIcon()
+-type wxIcon() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxicon.html#wxiconwxicon">external documentation</a>.
+-spec new() -> wxIcon().
 new() ->
   wxe_util:construct(?wxIcon_new_0,
   <<>>).
 
-%% @spec (X::string()|term()) -> wxIcon()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxicon.html#wxiconwxicon">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% new(Filename::string()) -> new(Filename, []) </c></p>
-%% <p><c>
-%% new(Loc::wx:wx()) -> wxIcon() </c>
-%% </p>
+-spec new(Filename) -> wxIcon() when
+	Filename::string();
+      (Loc) -> wxIcon() when
+	Loc::wx:wx().
 
 new(Filename)
  when is_list(Filename) ->
@@ -62,11 +61,13 @@ new(#wx_ref{type=LocT,ref=LocRef}) ->
   wxe_util:construct(?wxIcon_new_1,
   <<LocRef:32/?UI>>).
 
-%% @spec (Filename::string(), [Option]) -> wxIcon()
-%% Option = {type, WxBitmapType} | {desiredWidth, integer()} | {desiredHeight, integer()}
-%% WxBitmapType = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxicon.html#wxiconwxicon">external documentation</a>.
-%%<br /> WxBitmapType is one of ?wxBITMAP_TYPE_INVALID | ?wxBITMAP_TYPE_BMP | ?wxBITMAP_TYPE_BMP_RESOURCE | ?wxBITMAP_TYPE_RESOURCE | ?wxBITMAP_TYPE_ICO | ?wxBITMAP_TYPE_ICO_RESOURCE | ?wxBITMAP_TYPE_CUR | ?wxBITMAP_TYPE_CUR_RESOURCE | ?wxBITMAP_TYPE_XBM | ?wxBITMAP_TYPE_XBM_DATA | ?wxBITMAP_TYPE_XPM | ?wxBITMAP_TYPE_XPM_DATA | ?wxBITMAP_TYPE_TIF | ?wxBITMAP_TYPE_TIF_RESOURCE | ?wxBITMAP_TYPE_GIF | ?wxBITMAP_TYPE_GIF_RESOURCE | ?wxBITMAP_TYPE_PNG | ?wxBITMAP_TYPE_PNG_RESOURCE | ?wxBITMAP_TYPE_JPEG | ?wxBITMAP_TYPE_JPEG_RESOURCE | ?wxBITMAP_TYPE_PNM | ?wxBITMAP_TYPE_PNM_RESOURCE | ?wxBITMAP_TYPE_PCX | ?wxBITMAP_TYPE_PCX_RESOURCE | ?wxBITMAP_TYPE_PICT | ?wxBITMAP_TYPE_PICT_RESOURCE | ?wxBITMAP_TYPE_ICON | ?wxBITMAP_TYPE_ICON_RESOURCE | ?wxBITMAP_TYPE_ANI | ?wxBITMAP_TYPE_IFF | ?wxBITMAP_TYPE_TGA | ?wxBITMAP_TYPE_MACCURSOR | ?wxBITMAP_TYPE_MACCURSOR_RESOURCE | ?wxBITMAP_TYPE_ANY
+%%<br /> Type = ?wxBITMAP_TYPE_INVALID | ?wxBITMAP_TYPE_BMP | ?wxBITMAP_TYPE_BMP_RESOURCE | ?wxBITMAP_TYPE_RESOURCE | ?wxBITMAP_TYPE_ICO | ?wxBITMAP_TYPE_ICO_RESOURCE | ?wxBITMAP_TYPE_CUR | ?wxBITMAP_TYPE_CUR_RESOURCE | ?wxBITMAP_TYPE_XBM | ?wxBITMAP_TYPE_XBM_DATA | ?wxBITMAP_TYPE_XPM | ?wxBITMAP_TYPE_XPM_DATA | ?wxBITMAP_TYPE_TIF | ?wxBITMAP_TYPE_TIF_RESOURCE | ?wxBITMAP_TYPE_GIF | ?wxBITMAP_TYPE_GIF_RESOURCE | ?wxBITMAP_TYPE_PNG | ?wxBITMAP_TYPE_PNG_RESOURCE | ?wxBITMAP_TYPE_JPEG | ?wxBITMAP_TYPE_JPEG_RESOURCE | ?wxBITMAP_TYPE_PNM | ?wxBITMAP_TYPE_PNM_RESOURCE | ?wxBITMAP_TYPE_PCX | ?wxBITMAP_TYPE_PCX_RESOURCE | ?wxBITMAP_TYPE_PICT | ?wxBITMAP_TYPE_PICT_RESOURCE | ?wxBITMAP_TYPE_ICON | ?wxBITMAP_TYPE_ICON_RESOURCE | ?wxBITMAP_TYPE_ANI | ?wxBITMAP_TYPE_IFF | ?wxBITMAP_TYPE_TGA | ?wxBITMAP_TYPE_MACCURSOR | ?wxBITMAP_TYPE_MACCURSOR_RESOURCE | ?wxBITMAP_TYPE_ANY
+-spec new(Filename, [Option]) -> wxIcon() when
+	Filename::string(),
+	Option :: {type, wx:wx_enum()}
+		 | {desiredWidth, integer()}
+		 | {desiredHeight, integer()}.
 new(Filename, Options)
  when is_list(Filename),is_list(Options) ->
   Filename_UC = unicode:characters_to_binary([Filename,0]),
@@ -78,16 +79,17 @@ new(Filename, Options)
   wxe_util:construct(?wxIcon_new_2,
   <<(byte_size(Filename_UC)):32/?UI,(Filename_UC)/binary, 0:(((8- ((4+byte_size(Filename_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxIcon(), Bmp::wxBitmap:wxBitmap()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxicon.html#wxiconcopyfrombitmap">external documentation</a>.
+-spec copyFromBitmap(This, Bmp) -> ok when
+	This::wxIcon(), Bmp::wxBitmap:wxBitmap().
 copyFromBitmap(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BmpT,ref=BmpRef}) ->
   ?CLASS(ThisT,wxIcon),
   ?CLASS(BmpT,wxBitmap),
   wxe_util:cast(?wxIcon_CopyFromBitmap,
   <<ThisRef:32/?UI,BmpRef:32/?UI>>).
 
-%% @spec (This::wxIcon()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxIcon) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxIcon),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxIconBundle.erl b/lib/wx/src/gen/wxIconBundle.erl
index 011b2dd1ac..4d4614f171 100644
--- a/lib/wx/src/gen/wxIconBundle.erl
+++ b/lib/wx/src/gen/wxIconBundle.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -29,17 +29,20 @@
 %% inherited exports
 -export([parent_class/1]).
 
+-export_type([wxIconBundle/0]).
 %% @hidden
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxIconBundle()
+-type wxIconBundle() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxiconbundle.html#wxiconbundlewxiconbundle">external documentation</a>.
+-spec new() -> wxIconBundle().
 new() ->
   wxe_util:construct(?wxIconBundle_new_0,
   <<>>).
 
-%% @spec (Ic::wxIconBundle() | wxIcon:wxIcon()) -> wxIconBundle()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxiconbundle.html#wxiconbundlewxiconbundle">external documentation</a>.
+-spec new(Ic) -> wxIconBundle() when
+	Ic::wxIconBundle() | wxIcon:wxIcon().
 new(#wx_ref{type=IcT,ref=IcRef}) ->
   IcOP = case ?CLASS_T(IcT,wxIconBundle) of
      true ->
@@ -50,24 +53,27 @@ new(#wx_ref{type=IcT,ref=IcRef}) ->
   wxe_util:construct(IcOP,
   <<IcRef:32/?UI>>).
 
-%% @spec (File::string(), Type::integer()) -> wxIconBundle()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxiconbundle.html#wxiconbundlewxiconbundle">external documentation</a>.
+-spec new(File, Type) -> wxIconBundle() when
+	File::string(), Type::integer().
 new(File,Type)
  when is_list(File),is_integer(Type) ->
   File_UC = unicode:characters_to_binary([File,0]),
   wxe_util:construct(?wxIconBundle_new_2,
   <<(byte_size(File_UC)):32/?UI,(File_UC)/binary, 0:(((8- ((4+byte_size(File_UC)) band 16#7)) band 16#7))/unit:8,Type:32/?UI>>).
 
-%% @spec (This::wxIconBundle(), Icon::wxIcon:wxIcon()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxiconbundle.html#wxiconbundleaddicon">external documentation</a>.
+-spec addIcon(This, Icon) -> ok when
+	This::wxIconBundle(), Icon::wxIcon:wxIcon().
 addIcon(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=IconT,ref=IconRef}) ->
   ?CLASS(ThisT,wxIconBundle),
   ?CLASS(IconT,wxIcon),
   wxe_util:cast(?wxIconBundle_AddIcon_1,
   <<ThisRef:32/?UI,IconRef:32/?UI>>).
 
-%% @spec (This::wxIconBundle(), File::string(), Type::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxiconbundle.html#wxiconbundleaddicon">external documentation</a>.
+-spec addIcon(This, File, Type) -> ok when
+	This::wxIconBundle(), File::string(), Type::integer().
 addIcon(#wx_ref{type=ThisT,ref=ThisRef},File,Type)
  when is_list(File),is_integer(Type) ->
   ?CLASS(ThisT,wxIconBundle),
@@ -75,22 +81,20 @@ addIcon(#wx_ref{type=ThisT,ref=ThisRef},File,Type)
   wxe_util:cast(?wxIconBundle_AddIcon_2,
   <<ThisRef:32/?UI,(byte_size(File_UC)):32/?UI,(File_UC)/binary, 0:(((8- ((0+byte_size(File_UC)) band 16#7)) band 16#7))/unit:8,Type:32/?UI>>).
 
-%% @spec (This::wxIconBundle()) -> wxIcon:wxIcon()
 %% @equiv getIcon(This, [])
+-spec getIcon(This) -> wxIcon:wxIcon() when
+	This::wxIconBundle().
+
 getIcon(This)
  when is_record(This, wx_ref) ->
   getIcon(This, []).
 
-%% @spec (This::wxIconBundle(),X::term()) -> wxIcon:wxIcon()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxiconbundle.html#wxiconbundlegeticon">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% getIcon(This::wxIconBundle(), [Option]) -> wxIcon:wxIcon() </c>
-%%<br /> Option = {size, integer()}
-%% </p>
-%% <p><c>
-%% getIcon(This::wxIconBundle(), Size::{W::integer(), H::integer()}) -> wxIcon:wxIcon() </c>
-%% </p>
+-spec getIcon(This, [Option]) -> wxIcon:wxIcon() when
+	This::wxIconBundle(),
+	Option :: {size, integer()};
+      (This, Size) -> wxIcon:wxIcon() when
+	This::wxIconBundle(), Size::{W::integer(), H::integer()}.
 getIcon(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxIconBundle),
@@ -105,8 +109,8 @@ getIcon(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH})
   wxe_util:call(?wxIconBundle_GetIcon_1_1,
   <<ThisRef:32/?UI,SizeW:32/?UI,SizeH:32/?UI>>).
 
-%% @spec (This::wxIconBundle()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxIconBundle) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxIconBundle),
   wxe_util:destroy(?wxIconBundle_destruct,Obj),
diff --git a/lib/wx/src/gen/wxIconizeEvent.erl b/lib/wx/src/gen/wxIconizeEvent.erl
index 647d8019a1..f428ebf70f 100644
--- a/lib/wx/src/gen/wxIconizeEvent.erl
+++ b/lib/wx/src/gen/wxIconizeEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -37,12 +37,15 @@
 -export([getId/1,getSkipped/1,getTimestamp/1,isCommandEvent/1,parent_class/1,
   resumePropagation/2,shouldPropagate/1,skip/1,skip/2,stopPropagation/1]).
 
+-export_type([wxIconizeEvent/0]).
 %% @hidden
 parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (This::wxIconizeEvent()) -> bool()
+-type wxIconizeEvent() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxiconizeevent.html#wxiconizeeventiconized">external documentation</a>.
+-spec iconized(This) -> boolean() when
+	This::wxIconizeEvent().
 iconized(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxIconizeEvent),
   wxe_util:call(?wxIconizeEvent_Iconized,
diff --git a/lib/wx/src/gen/wxIdleEvent.erl b/lib/wx/src/gen/wxIdleEvent.erl
index 87ed7e0cd2..4749026446 100644
--- a/lib/wx/src/gen/wxIdleEvent.erl
+++ b/lib/wx/src/gen/wxIdleEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -37,34 +37,39 @@
 -export([getId/1,getSkipped/1,getTimestamp/1,isCommandEvent/1,parent_class/1,
   resumePropagation/2,shouldPropagate/1,skip/1,skip/2,stopPropagation/1]).
 
+-export_type([wxIdleEvent/0]).
 %% @hidden
 parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (Win::wxWindow:wxWindow()) -> bool()
+-type wxIdleEvent() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxidleevent.html#wxidleeventcansend">external documentation</a>.
+-spec canSend(Win) -> boolean() when
+	Win::wxWindow:wxWindow().
 canSend(#wx_ref{type=WinT,ref=WinRef}) ->
   ?CLASS(WinT,wxWindow),
   wxe_util:call(?wxIdleEvent_CanSend,
   <<WinRef:32/?UI>>).
 
-%% @spec () -> WxIdleMode
-%% WxIdleMode = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxidleevent.html#wxidleeventgetmode">external documentation</a>.
-%%<br /> WxIdleMode is one of ?wxIDLE_PROCESS_ALL | ?wxIDLE_PROCESS_SPECIFIED
+%%<br /> Res = ?wxIDLE_PROCESS_ALL | ?wxIDLE_PROCESS_SPECIFIED
+-spec getMode() -> wx:wx_enum().
 getMode() ->
   wxe_util:call(?wxIdleEvent_GetMode,
   <<>>).
 
-%% @spec (This::wxIdleEvent()) -> ok
 %% @equiv requestMore(This, [])
+-spec requestMore(This) -> ok when
+	This::wxIdleEvent().
+
 requestMore(This)
  when is_record(This, wx_ref) ->
   requestMore(This, []).
 
-%% @spec (This::wxIdleEvent(), [Option]) -> ok
-%% Option = {needMore, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxidleevent.html#wxidleeventrequestmore">external documentation</a>.
+-spec requestMore(This, [Option]) -> ok when
+	This::wxIdleEvent(),
+	Option :: {needMore, boolean()}.
 requestMore(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxIdleEvent),
@@ -74,17 +79,18 @@ requestMore(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxIdleEvent_RequestMore,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxIdleEvent()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxidleevent.html#wxidleeventmorerequested">external documentation</a>.
+-spec moreRequested(This) -> boolean() when
+	This::wxIdleEvent().
 moreRequested(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxIdleEvent),
   wxe_util:call(?wxIdleEvent_MoreRequested,
   <<ThisRef:32/?UI>>).
 
-%% @spec (Mode::WxIdleMode) -> ok
-%% WxIdleMode = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxidleevent.html#wxidleeventsetmode">external documentation</a>.
-%%<br /> WxIdleMode is one of ?wxIDLE_PROCESS_ALL | ?wxIDLE_PROCESS_SPECIFIED
+%%<br /> Mode = ?wxIDLE_PROCESS_ALL | ?wxIDLE_PROCESS_SPECIFIED
+-spec setMode(Mode) -> ok when
+	Mode::wx:wx_enum().
 setMode(Mode)
  when is_integer(Mode) ->
   wxe_util:cast(?wxIdleEvent_SetMode,
diff --git a/lib/wx/src/gen/wxImage.erl b/lib/wx/src/gen/wxImage.erl
index ea41a78a40..3f8cb2be22 100644
--- a/lib/wx/src/gen/wxImage.erl
+++ b/lib/wx/src/gen/wxImage.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -47,30 +47,32 @@
 %% inherited exports
 -export([parent_class/1]).
 
+-export_type([wxImage/0]).
 %% @hidden
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxImage()
+-type wxImage() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagewximage">external documentation</a>.
+-spec new() -> wxImage().
 new() ->
   wxe_util:construct(?wxImage_new_0,
   <<>>).
 
-%% @spec (Name::string()) -> wxImage()
 %% @equiv new(Name, [])
+-spec new(Name) -> wxImage() when
+	Name::string().
+
 new(Name)
  when is_list(Name) ->
   new(Name, []).
 
-%% @spec (X::integer()|string(),X::integer()|term()) -> wxImage()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagewximage">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% new(Width::integer(), Height::integer()) -> new(Width,Height, []) </c></p>
-%% <p><c>
-%% new(Name::string(), [Option]) -> wxImage() </c>
-%%<br /> Option = {type, integer()} | {index, integer()}
-%% </p>
+-spec new(Width, Height) -> wxImage() when
+	Width::integer(), Height::integer();
+      (Name, [Option]) -> wxImage() when
+	Name::string(),
+	Option :: {type, integer()}
+		 | {index, integer()}.
 
 new(Width,Height)
  when is_integer(Width),is_integer(Height) ->
@@ -85,19 +87,15 @@ new(Name, Options)
   wxe_util:construct(?wxImage_new_2,
   <<(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((4+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (X::integer()|string(),X::integer()|string(),X::binary()|term()) -> wxImage()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagewximage">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% new(Width::integer(), Height::integer(), Data::binary()) -> new(Width,Height,Data, []) </c></p>
-%% <p><c>
-%% new(Width::integer(), Height::integer(), [Option]) -> wxImage() </c>
-%%<br /> Option = {clear, bool()}
-%% </p>
-%% <p><c>
-%% new(Name::string(), Mimetype::string(), [Option]) -> wxImage() </c>
-%%<br /> Option = {index, integer()}
-%% </p>
+-spec new(Width, Height, Data) -> wxImage() when
+	Width::integer(), Height::integer(), Data::binary();
+      (Width, Height, [Option]) -> wxImage() when
+	Width::integer(), Height::integer(),
+	Option :: {clear, boolean()};
+      (Name, Mimetype, [Option]) -> wxImage() when
+	Name::string(), Mimetype::string(),
+	Option :: {index, integer()}.
 
 new(Width,Height,Data)
  when is_integer(Width),is_integer(Height),is_binary(Data) ->
@@ -119,15 +117,12 @@ new(Name,Mimetype, Options)
   wxe_util:construct(?wxImage_new_3_1,
   <<(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((4+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8,(byte_size(Mimetype_UC)):32/?UI,(Mimetype_UC)/binary, 0:(((8- ((4+byte_size(Mimetype_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (Width::integer(),Height::integer(),Data::binary(),X::binary()|term()) -> wxImage()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagewximage">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% new(Width::integer(), Height::integer(), Data::binary(), Alpha::binary()) -> new(Width,Height,Data,Alpha, []) </c></p>
-%% <p><c>
-%% new(Width::integer(), Height::integer(), Data::binary(), [Option]) -> wxImage() </c>
-%%<br /> Option = {static_data, bool()}
-%% </p>
+-spec new(Width, Height, Data, Alpha) -> wxImage() when
+	Width::integer(), Height::integer(), Data::binary(), Alpha::binary();
+      (Width, Height, Data, [Option]) -> wxImage() when
+	Width::integer(), Height::integer(), Data::binary(),
+	Option :: {static_data, boolean()}.
 
 new(Width,Height,Data,Alpha)
  when is_integer(Width),is_integer(Height),is_binary(Data),is_binary(Alpha) ->
@@ -141,9 +136,10 @@ new(Width,Height,Data, Options)
   wxe_util:construct(?wxImage_new_4,
   <<Width:32/?UI,Height:32/?UI, BinOpt/binary>>).
 
-%% @spec (Width::integer(), Height::integer(), Data::binary(), Alpha::binary(), [Option]) -> wxImage()
-%% Option = {static_data, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagewximage">external documentation</a>.
+-spec new(Width, Height, Data, Alpha, [Option]) -> wxImage() when
+	Width::integer(), Height::integer(), Data::binary(), Alpha::binary(),
+	Option :: {static_data, boolean()}.
 new(Width,Height,Data,Alpha, Options)
  when is_integer(Width),is_integer(Height),is_binary(Data),is_binary(Alpha),is_list(Options) ->
   wxe_util:send_bin(Data),
@@ -154,39 +150,45 @@ new(Width,Height,Data,Alpha, Options)
   wxe_util:construct(?wxImage_new_5,
   <<Width:32/?UI,Height:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxImage(), Radius::integer()) -> wxImage()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximageblur">external documentation</a>.
+-spec blur(This, Radius) -> wxImage() when
+	This::wxImage(), Radius::integer().
 blur(#wx_ref{type=ThisT,ref=ThisRef},Radius)
  when is_integer(Radius) ->
   ?CLASS(ThisT,wxImage),
   wxe_util:call(?wxImage_Blur,
   <<ThisRef:32/?UI,Radius:32/?UI>>).
 
-%% @spec (This::wxImage(), Radius::integer()) -> wxImage()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximageblurhorizontal">external documentation</a>.
+-spec blurHorizontal(This, Radius) -> wxImage() when
+	This::wxImage(), Radius::integer().
 blurHorizontal(#wx_ref{type=ThisT,ref=ThisRef},Radius)
  when is_integer(Radius) ->
   ?CLASS(ThisT,wxImage),
   wxe_util:call(?wxImage_BlurHorizontal,
   <<ThisRef:32/?UI,Radius:32/?UI>>).
 
-%% @spec (This::wxImage(), Radius::integer()) -> wxImage()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximageblurvertical">external documentation</a>.
+-spec blurVertical(This, Radius) -> wxImage() when
+	This::wxImage(), Radius::integer().
 blurVertical(#wx_ref{type=ThisT,ref=ThisRef},Radius)
  when is_integer(Radius) ->
   ?CLASS(ThisT,wxImage),
   wxe_util:call(?wxImage_BlurVertical,
   <<ThisRef:32/?UI,Radius:32/?UI>>).
 
-%% @spec (This::wxImage()) -> bool()
 %% @equiv convertAlphaToMask(This, [])
+-spec convertAlphaToMask(This) -> boolean() when
+	This::wxImage().
+
 convertAlphaToMask(This)
  when is_record(This, wx_ref) ->
   convertAlphaToMask(This, []).
 
-%% @spec (This::wxImage(), [Option]) -> bool()
-%% Option = {threshold, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximageconvertalphatomask">external documentation</a>.
+-spec convertAlphaToMask(This, [Option]) -> boolean() when
+	This::wxImage(),
+	Option :: {threshold, integer()}.
 convertAlphaToMask(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxImage),
@@ -196,15 +198,20 @@ convertAlphaToMask(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxImage_ConvertAlphaToMask,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxImage()) -> wxImage()
 %% @equiv convertToGreyscale(This, [])
+-spec convertToGreyscale(This) -> wxImage() when
+	This::wxImage().
+
 convertToGreyscale(This)
  when is_record(This, wx_ref) ->
   convertToGreyscale(This, []).
 
-%% @spec (This::wxImage(), [Option]) -> wxImage()
-%% Option = {lr, float()} | {lg, float()} | {lb, float()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximageconverttogreyscale">external documentation</a>.
+-spec convertToGreyscale(This, [Option]) -> wxImage() when
+	This::wxImage(),
+	Option :: {lr, float()}
+		 | {lg, float()}
+		 | {lb, float()}.
 convertToGreyscale(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxImage),
@@ -216,36 +223,37 @@ convertToGreyscale(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxImage_ConvertToGreyscale,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxImage(), R::integer(), G::integer(), B::integer()) -> wxImage()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximageconverttomono">external documentation</a>.
+-spec convertToMono(This, R, G, B) -> wxImage() when
+	This::wxImage(), R::integer(), G::integer(), B::integer().
 convertToMono(#wx_ref{type=ThisT,ref=ThisRef},R,G,B)
  when is_integer(R),is_integer(G),is_integer(B) ->
   ?CLASS(ThisT,wxImage),
   wxe_util:call(?wxImage_ConvertToMono,
   <<ThisRef:32/?UI,R:32/?UI,G:32/?UI,B:32/?UI>>).
 
-%% @spec (This::wxImage()) -> wxImage()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagecopy">external documentation</a>.
+-spec copy(This) -> wxImage() when
+	This::wxImage().
 copy(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxImage),
   wxe_util:call(?wxImage_Copy,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxImage(), Width::integer(), Height::integer()) -> bool()
 %% @equiv create(This,Width,Height, [])
+-spec create(This, Width, Height) -> boolean() when
+	This::wxImage(), Width::integer(), Height::integer().
+
 create(This,Width,Height)
  when is_record(This, wx_ref),is_integer(Width),is_integer(Height) ->
   create(This,Width,Height, []).
 
-%% @spec (This::wxImage(),Width::integer(),Height::integer(),X::binary()|term()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagecreate">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% create(This::wxImage(), Width::integer(), Height::integer(), Data::binary()) -> create(This,Width,Height,Data, []) </c></p>
-%% <p><c>
-%% create(This::wxImage(), Width::integer(), Height::integer(), [Option]) -> bool() </c>
-%%<br /> Option = {clear, bool()}
-%% </p>
+-spec create(This, Width, Height, Data) -> boolean() when
+	This::wxImage(), Width::integer(), Height::integer(), Data::binary();
+      (This, Width, Height, [Option]) -> boolean() when
+	This::wxImage(), Width::integer(), Height::integer(),
+	Option :: {clear, boolean()}.
 
 create(This,Width,Height,Data)
  when is_record(This, wx_ref),is_integer(Width),is_integer(Height),is_binary(Data) ->
@@ -259,15 +267,12 @@ create(#wx_ref{type=ThisT,ref=ThisRef},Width,Height, Options)
   wxe_util:call(?wxImage_Create_3,
   <<ThisRef:32/?UI,Width:32/?UI,Height:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxImage(),Width::integer(),Height::integer(),Data::binary(),X::binary()|term()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagecreate">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% create(This::wxImage(), Width::integer(), Height::integer(), Data::binary(), Alpha::binary()) -> create(This,Width,Height,Data,Alpha, []) </c></p>
-%% <p><c>
-%% create(This::wxImage(), Width::integer(), Height::integer(), Data::binary(), [Option]) -> bool() </c>
-%%<br /> Option = {static_data, bool()}
-%% </p>
+-spec create(This, Width, Height, Data, Alpha) -> boolean() when
+	This::wxImage(), Width::integer(), Height::integer(), Data::binary(), Alpha::binary();
+      (This, Width, Height, Data, [Option]) -> boolean() when
+	This::wxImage(), Width::integer(), Height::integer(), Data::binary(),
+	Option :: {static_data, boolean()}.
 
 create(This,Width,Height,Data,Alpha)
  when is_record(This, wx_ref),is_integer(Width),is_integer(Height),is_binary(Data),is_binary(Alpha) ->
@@ -282,9 +287,10 @@ create(#wx_ref{type=ThisT,ref=ThisRef},Width,Height,Data, Options)
   wxe_util:call(?wxImage_Create_4,
   <<ThisRef:32/?UI,Width:32/?UI,Height:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxImage(), Width::integer(), Height::integer(), Data::binary(), Alpha::binary(), [Option]) -> bool()
-%% Option = {static_data, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagecreate">external documentation</a>.
+-spec create(This, Width, Height, Data, Alpha, [Option]) -> boolean() when
+	This::wxImage(), Width::integer(), Height::integer(), Data::binary(), Alpha::binary(),
+	Option :: {static_data, boolean()}.
 create(#wx_ref{type=ThisT,ref=ThisRef},Width,Height,Data,Alpha, Options)
  when is_integer(Width),is_integer(Height),is_binary(Data),is_binary(Alpha),is_list(Options) ->
   ?CLASS(ThisT,wxImage),
@@ -296,22 +302,30 @@ create(#wx_ref{type=ThisT,ref=ThisRef},Width,Height,Data,Alpha, Options)
   wxe_util:call(?wxImage_Create_5,
   <<ThisRef:32/?UI,Width:32/?UI,Height:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxImage()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagedestroy">external documentation</a>.
+-spec 'Destroy'(This) -> ok when
+	This::wxImage().
 'Destroy'(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxImage),
   wxe_util:cast(?wxImage_Destroy,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxImage()) -> {bool(), R::integer(), G::integer(), B::integer()}
 %% @equiv findFirstUnusedColour(This, [])
+-spec findFirstUnusedColour(This) -> Result when
+	Result ::{Res ::boolean(), R::integer(), G::integer(), B::integer()},
+	This::wxImage().
+
 findFirstUnusedColour(This)
  when is_record(This, wx_ref) ->
   findFirstUnusedColour(This, []).
 
-%% @spec (This::wxImage(), [Option]) -> {bool(), R::integer(), G::integer(), B::integer()}
-%% Option = {startR, integer()} | {startG, integer()} | {startB, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagefindfirstunusedcolour">external documentation</a>.
+-spec findFirstUnusedColour(This, [Option]) -> Result when
+	Result :: {Res ::boolean(), R::integer(), G::integer(), B::integer()},
+	This::wxImage(),
+	Option :: {startR, integer()}
+		 | {startG, integer()}
+		 | {startB, integer()}.
 findFirstUnusedColour(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxImage),
@@ -323,59 +337,67 @@ findFirstUnusedColour(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxImage_FindFirstUnusedColour,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec () -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagegetimageextwildcard">external documentation</a>.
+-spec getImageExtWildcard() -> string().
 getImageExtWildcard() ->
   wxe_util:call(?wxImage_GetImageExtWildcard,
   <<>>).
 
-%% @spec (This::wxImage()) -> binary()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagegetalpha">external documentation</a>.
+-spec getAlpha(This) -> binary() when
+	This::wxImage().
 getAlpha(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxImage),
   wxe_util:call(?wxImage_GetAlpha_0,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxImage(), X::integer(), Y::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagegetalpha">external documentation</a>.
+-spec getAlpha(This, X, Y) -> integer() when
+	This::wxImage(), X::integer(), Y::integer().
 getAlpha(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
  when is_integer(X),is_integer(Y) ->
   ?CLASS(ThisT,wxImage),
   wxe_util:call(?wxImage_GetAlpha_2,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI>>).
 
-%% @spec (This::wxImage(), X::integer(), Y::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagegetblue">external documentation</a>.
+-spec getBlue(This, X, Y) -> integer() when
+	This::wxImage(), X::integer(), Y::integer().
 getBlue(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
  when is_integer(X),is_integer(Y) ->
   ?CLASS(ThisT,wxImage),
   wxe_util:call(?wxImage_GetBlue,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI>>).
 
-%% @spec (This::wxImage()) -> binary()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagegetdata">external documentation</a>.
+-spec getData(This) -> binary() when
+	This::wxImage().
 getData(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxImage),
   wxe_util:call(?wxImage_GetData,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxImage(), X::integer(), Y::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagegetgreen">external documentation</a>.
+-spec getGreen(This, X, Y) -> integer() when
+	This::wxImage(), X::integer(), Y::integer().
 getGreen(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
  when is_integer(X),is_integer(Y) ->
   ?CLASS(ThisT,wxImage),
   wxe_util:call(?wxImage_GetGreen,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI>>).
 
-%% @spec (Name::string()) -> integer()
 %% @equiv getImageCount(Name, [])
+-spec getImageCount(Name) -> integer() when
+	Name::string().
+
 getImageCount(Name)
  when is_list(Name) ->
   getImageCount(Name, []).
 
-%% @spec (Name::string(), [Option]) -> integer()
-%% Option = {type, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagegetimagecount">external documentation</a>.
+-spec getImageCount(Name, [Option]) -> integer() when
+	Name::string(),
+	Option :: {type, integer()}.
 getImageCount(Name, Options)
  when is_list(Name),is_list(Options) ->
   Name_UC = unicode:characters_to_binary([Name,0]),
@@ -385,87 +407,100 @@ getImageCount(Name, Options)
   wxe_util:call(?wxImage_GetImageCount,
   <<(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((4+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxImage()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagegetheight">external documentation</a>.
+-spec getHeight(This) -> integer() when
+	This::wxImage().
 getHeight(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxImage),
   wxe_util:call(?wxImage_GetHeight,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxImage()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagegetmaskblue">external documentation</a>.
+-spec getMaskBlue(This) -> integer() when
+	This::wxImage().
 getMaskBlue(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxImage),
   wxe_util:call(?wxImage_GetMaskBlue,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxImage()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagegetmaskgreen">external documentation</a>.
+-spec getMaskGreen(This) -> integer() when
+	This::wxImage().
 getMaskGreen(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxImage),
   wxe_util:call(?wxImage_GetMaskGreen,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxImage()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagegetmaskred">external documentation</a>.
+-spec getMaskRed(This) -> integer() when
+	This::wxImage().
 getMaskRed(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxImage),
   wxe_util:call(?wxImage_GetMaskRed,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxImage()) -> {bool(), R::integer(), G::integer(), B::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagegetorfindmaskcolour">external documentation</a>.
+-spec getOrFindMaskColour(This) -> Result when
+	Result ::{Res ::boolean(), R::integer(), G::integer(), B::integer()},
+	This::wxImage().
 getOrFindMaskColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxImage),
   wxe_util:call(?wxImage_GetOrFindMaskColour,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxImage()) -> wxPalette:wxPalette()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagegetpalette">external documentation</a>.
+-spec getPalette(This) -> wxPalette:wxPalette() when
+	This::wxImage().
 getPalette(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxImage),
   wxe_util:call(?wxImage_GetPalette,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxImage(), X::integer(), Y::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagegetred">external documentation</a>.
+-spec getRed(This, X, Y) -> integer() when
+	This::wxImage(), X::integer(), Y::integer().
 getRed(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
  when is_integer(X),is_integer(Y) ->
   ?CLASS(ThisT,wxImage),
   wxe_util:call(?wxImage_GetRed,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI>>).
 
-%% @spec (This::wxImage(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}) -> wxImage()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagegetsubimage">external documentation</a>.
+-spec getSubImage(This, Rect) -> wxImage() when
+	This::wxImage(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}.
 getSubImage(#wx_ref{type=ThisT,ref=ThisRef},{RectX,RectY,RectW,RectH})
  when is_integer(RectX),is_integer(RectY),is_integer(RectW),is_integer(RectH) ->
   ?CLASS(ThisT,wxImage),
   wxe_util:call(?wxImage_GetSubImage,
   <<ThisRef:32/?UI,RectX:32/?UI,RectY:32/?UI,RectW:32/?UI,RectH:32/?UI>>).
 
-%% @spec (This::wxImage()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagegetwidth">external documentation</a>.
+-spec getWidth(This) -> integer() when
+	This::wxImage().
 getWidth(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxImage),
   wxe_util:call(?wxImage_GetWidth,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxImage()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagehasalpha">external documentation</a>.
+-spec hasAlpha(This) -> boolean() when
+	This::wxImage().
 hasAlpha(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxImage),
   wxe_util:call(?wxImage_HasAlpha,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxImage()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagehasmask">external documentation</a>.
+-spec hasMask(This) -> boolean() when
+	This::wxImage().
 hasMask(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxImage),
   wxe_util:call(?wxImage_HasMask,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxImage(), Name::string()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagegetoption">external documentation</a>.
+-spec getOption(This, Name) -> string() when
+	This::wxImage(), Name::string().
 getOption(#wx_ref{type=ThisT,ref=ThisRef},Name)
  when is_list(Name) ->
   ?CLASS(ThisT,wxImage),
@@ -473,8 +508,9 @@ getOption(#wx_ref{type=ThisT,ref=ThisRef},Name)
   wxe_util:call(?wxImage_GetOption,
   <<ThisRef:32/?UI,(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((0+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxImage(), Name::string()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagegetoptionint">external documentation</a>.
+-spec getOptionInt(This, Name) -> integer() when
+	This::wxImage(), Name::string().
 getOptionInt(#wx_ref{type=ThisT,ref=ThisRef},Name)
  when is_list(Name) ->
   ?CLASS(ThisT,wxImage),
@@ -482,8 +518,9 @@ getOptionInt(#wx_ref{type=ThisT,ref=ThisRef},Name)
   wxe_util:call(?wxImage_GetOptionInt,
   <<ThisRef:32/?UI,(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((0+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxImage(), Name::string()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagehasoption">external documentation</a>.
+-spec hasOption(This, Name) -> boolean() when
+	This::wxImage(), Name::string().
 hasOption(#wx_ref{type=ThisT,ref=ThisRef},Name)
  when is_list(Name) ->
   ?CLASS(ThisT,wxImage),
@@ -491,28 +528,32 @@ hasOption(#wx_ref{type=ThisT,ref=ThisRef},Name)
   wxe_util:call(?wxImage_HasOption,
   <<ThisRef:32/?UI,(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((0+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxImage()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximageinitalpha">external documentation</a>.
+-spec initAlpha(This) -> ok when
+	This::wxImage().
 initAlpha(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxImage),
   wxe_util:cast(?wxImage_InitAlpha,
   <<ThisRef:32/?UI>>).
 
-%% @spec () -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximageinitstandardhandlers">external documentation</a>.
+-spec initStandardHandlers() -> ok.
 initStandardHandlers() ->
   wxe_util:cast(?wxImage_InitStandardHandlers,
   <<>>).
 
-%% @spec (This::wxImage(), X::integer(), Y::integer()) -> bool()
 %% @equiv isTransparent(This,X,Y, [])
+-spec isTransparent(This, X, Y) -> boolean() when
+	This::wxImage(), X::integer(), Y::integer().
+
 isTransparent(This,X,Y)
  when is_record(This, wx_ref),is_integer(X),is_integer(Y) ->
   isTransparent(This,X,Y, []).
 
-%% @spec (This::wxImage(), X::integer(), Y::integer(), [Option]) -> bool()
-%% Option = {threshold, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximageistransparent">external documentation</a>.
+-spec isTransparent(This, X, Y, [Option]) -> boolean() when
+	This::wxImage(), X::integer(), Y::integer(),
+	Option :: {threshold, integer()}.
 isTransparent(#wx_ref{type=ThisT,ref=ThisRef},X,Y, Options)
  when is_integer(X),is_integer(Y),is_list(Options) ->
   ?CLASS(ThisT,wxImage),
@@ -522,15 +563,19 @@ isTransparent(#wx_ref{type=ThisT,ref=ThisRef},X,Y, Options)
   wxe_util:call(?wxImage_IsTransparent,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxImage(), Name::string()) -> bool()
 %% @equiv loadFile(This,Name, [])
+-spec loadFile(This, Name) -> boolean() when
+	This::wxImage(), Name::string().
+
 loadFile(This,Name)
  when is_record(This, wx_ref),is_list(Name) ->
   loadFile(This,Name, []).
 
-%% @spec (This::wxImage(), Name::string(), [Option]) -> bool()
-%% Option = {type, integer()} | {index, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximageloadfile">external documentation</a>.
+-spec loadFile(This, Name, [Option]) -> boolean() when
+	This::wxImage(), Name::string(),
+	Option :: {type, integer()}
+		 | {index, integer()}.
 loadFile(#wx_ref{type=ThisT,ref=ThisRef},Name, Options)
  when is_list(Name),is_list(Options) ->
   ?CLASS(ThisT,wxImage),
@@ -542,9 +587,10 @@ loadFile(#wx_ref{type=ThisT,ref=ThisRef},Name, Options)
   wxe_util:call(?wxImage_LoadFile_2,
   <<ThisRef:32/?UI,(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((0+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxImage(), Name::string(), Mimetype::string(), [Option]) -> bool()
-%% Option = {index, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximageloadfile">external documentation</a>.
+-spec loadFile(This, Name, Mimetype, [Option]) -> boolean() when
+	This::wxImage(), Name::string(), Mimetype::string(),
+	Option :: {index, integer()}.
 loadFile(#wx_ref{type=ThisT,ref=ThisRef},Name,Mimetype, Options)
  when is_list(Name),is_list(Mimetype),is_list(Options) ->
   ?CLASS(ThisT,wxImage),
@@ -556,30 +602,35 @@ loadFile(#wx_ref{type=ThisT,ref=ThisRef},Name,Mimetype, Options)
   wxe_util:call(?wxImage_LoadFile_3,
   <<ThisRef:32/?UI,(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((0+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8,(byte_size(Mimetype_UC)):32/?UI,(Mimetype_UC)/binary, 0:(((8- ((4+byte_size(Mimetype_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxImage()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximageok">external documentation</a>.
+-spec ok(This) -> boolean() when
+	This::wxImage().
 ok(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxImage),
   wxe_util:call(?wxImage_Ok,
   <<ThisRef:32/?UI>>).
 
-%% @spec (Name::string()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximageremovehandler">external documentation</a>.
+-spec removeHandler(Name) -> boolean() when
+	Name::string().
 removeHandler(Name)
  when is_list(Name) ->
   Name_UC = unicode:characters_to_binary([Name,0]),
   wxe_util:call(?wxImage_RemoveHandler,
   <<(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((4+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxImage()) -> wxImage()
 %% @equiv mirror(This, [])
+-spec mirror(This) -> wxImage() when
+	This::wxImage().
+
 mirror(This)
  when is_record(This, wx_ref) ->
   mirror(This, []).
 
-%% @spec (This::wxImage(), [Option]) -> wxImage()
-%% Option = {horizontally, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagemirror">external documentation</a>.
+-spec mirror(This, [Option]) -> wxImage() when
+	This::wxImage(),
+	Option :: {horizontally, boolean()}.
 mirror(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxImage),
@@ -589,23 +640,27 @@ mirror(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxImage_Mirror,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxImage(), R1::integer(), G1::integer(), B1::integer(), R2::integer(), G2::integer(), B2::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagereplace">external documentation</a>.
+-spec replace(This, R1, G1, B1, R2, G2, B2) -> ok when
+	This::wxImage(), R1::integer(), G1::integer(), B1::integer(), R2::integer(), G2::integer(), B2::integer().
 replace(#wx_ref{type=ThisT,ref=ThisRef},R1,G1,B1,R2,G2,B2)
  when is_integer(R1),is_integer(G1),is_integer(B1),is_integer(R2),is_integer(G2),is_integer(B2) ->
   ?CLASS(ThisT,wxImage),
   wxe_util:cast(?wxImage_Replace,
   <<ThisRef:32/?UI,R1:32/?UI,G1:32/?UI,B1:32/?UI,R2:32/?UI,G2:32/?UI,B2:32/?UI>>).
 
-%% @spec (This::wxImage(), Width::integer(), Height::integer()) -> wxImage()
 %% @equiv rescale(This,Width,Height, [])
+-spec rescale(This, Width, Height) -> wxImage() when
+	This::wxImage(), Width::integer(), Height::integer().
+
 rescale(This,Width,Height)
  when is_record(This, wx_ref),is_integer(Width),is_integer(Height) ->
   rescale(This,Width,Height, []).
 
-%% @spec (This::wxImage(), Width::integer(), Height::integer(), [Option]) -> wxImage()
-%% Option = {quality, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagerescale">external documentation</a>.
+-spec rescale(This, Width, Height, [Option]) -> wxImage() when
+	This::wxImage(), Width::integer(), Height::integer(),
+	Option :: {quality, integer()}.
 rescale(#wx_ref{type=ThisT,ref=ThisRef},Width,Height, Options)
  when is_integer(Width),is_integer(Height),is_list(Options) ->
   ?CLASS(ThisT,wxImage),
@@ -615,15 +670,20 @@ rescale(#wx_ref{type=ThisT,ref=ThisRef},Width,Height, Options)
   wxe_util:call(?wxImage_Rescale,
   <<ThisRef:32/?UI,Width:32/?UI,Height:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxImage(), Size::{W::integer(), H::integer()}, Pos::{X::integer(), Y::integer()}) -> wxImage()
 %% @equiv resize(This,Size,Pos, [])
+-spec resize(This, Size, Pos) -> wxImage() when
+	This::wxImage(), Size::{W::integer(), H::integer()}, Pos::{X::integer(), Y::integer()}.
+
 resize(This,Size={SizeW,SizeH},Pos={PosX,PosY})
  when is_record(This, wx_ref),is_integer(SizeW),is_integer(SizeH),is_integer(PosX),is_integer(PosY) ->
   resize(This,Size,Pos, []).
 
-%% @spec (This::wxImage(), Size::{W::integer(), H::integer()}, Pos::{X::integer(), Y::integer()}, [Option]) -> wxImage()
-%% Option = {r, integer()} | {g, integer()} | {b, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximageresize">external documentation</a>.
+-spec resize(This, Size, Pos, [Option]) -> wxImage() when
+	This::wxImage(), Size::{W::integer(), H::integer()}, Pos::{X::integer(), Y::integer()},
+	Option :: {r, integer()}
+		 | {g, integer()}
+		 | {b, integer()}.
 resize(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH},{PosX,PosY}, Options)
  when is_integer(SizeW),is_integer(SizeH),is_integer(PosX),is_integer(PosY),is_list(Options) ->
   ?CLASS(ThisT,wxImage),
@@ -635,15 +695,19 @@ resize(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH},{PosX,PosY}, Options)
   wxe_util:call(?wxImage_Resize,
   <<ThisRef:32/?UI,SizeW:32/?UI,SizeH:32/?UI,PosX:32/?UI,PosY:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxImage(), Angle::float(), Centre_of_rotation::{X::integer(), Y::integer()}) -> wxImage()
 %% @equiv rotate(This,Angle,Centre_of_rotation, [])
+-spec rotate(This, Angle, Centre_of_rotation) -> wxImage() when
+	This::wxImage(), Angle::float(), Centre_of_rotation::{X::integer(), Y::integer()}.
+
 rotate(This,Angle,Centre_of_rotation={Centre_of_rotationX,Centre_of_rotationY})
  when is_record(This, wx_ref),is_float(Angle),is_integer(Centre_of_rotationX),is_integer(Centre_of_rotationY) ->
   rotate(This,Angle,Centre_of_rotation, []).
 
-%% @spec (This::wxImage(), Angle::float(), Centre_of_rotation::{X::integer(), Y::integer()}, [Option]) -> wxImage()
-%% Option = {interpolating, bool()} | {offset_after_rotation, {X::integer(), Y::integer()}}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagerotate">external documentation</a>.
+-spec rotate(This, Angle, Centre_of_rotation, [Option]) -> wxImage() when
+	This::wxImage(), Angle::float(), Centre_of_rotation::{X::integer(), Y::integer()},
+	Option :: {interpolating, boolean()}
+		 | {offset_after_rotation, {X::integer(), Y::integer()}}.
 rotate(#wx_ref{type=ThisT,ref=ThisRef},Angle,{Centre_of_rotationX,Centre_of_rotationY}, Options)
  when is_float(Angle),is_integer(Centre_of_rotationX),is_integer(Centre_of_rotationY),is_list(Options) ->
   ?CLASS(ThisT,wxImage),
@@ -654,23 +718,27 @@ rotate(#wx_ref{type=ThisT,ref=ThisRef},Angle,{Centre_of_rotationX,Centre_of_rota
   wxe_util:call(?wxImage_Rotate,
   <<ThisRef:32/?UI,0:32,Angle:64/?F,Centre_of_rotationX:32/?UI,Centre_of_rotationY:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxImage(), Angle::float()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagerotatehue">external documentation</a>.
+-spec rotateHue(This, Angle) -> ok when
+	This::wxImage(), Angle::float().
 rotateHue(#wx_ref{type=ThisT,ref=ThisRef},Angle)
  when is_float(Angle) ->
   ?CLASS(ThisT,wxImage),
   wxe_util:cast(?wxImage_RotateHue,
   <<ThisRef:32/?UI,0:32,Angle:64/?F>>).
 
-%% @spec (This::wxImage()) -> wxImage()
 %% @equiv rotate90(This, [])
+-spec rotate90(This) -> wxImage() when
+	This::wxImage().
+
 rotate90(This)
  when is_record(This, wx_ref) ->
   rotate90(This, []).
 
-%% @spec (This::wxImage(), [Option]) -> wxImage()
-%% Option = {clockwise, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagerotate90">external documentation</a>.
+-spec rotate90(This, [Option]) -> wxImage() when
+	This::wxImage(),
+	Option :: {clockwise, boolean()}.
 rotate90(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxImage),
@@ -680,8 +748,9 @@ rotate90(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxImage_Rotate90,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxImage(), Name::string()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagesavefile">external documentation</a>.
+-spec saveFile(This, Name) -> boolean() when
+	This::wxImage(), Name::string().
 saveFile(#wx_ref{type=ThisT,ref=ThisRef},Name)
  when is_list(Name) ->
   ?CLASS(ThisT,wxImage),
@@ -689,15 +758,11 @@ saveFile(#wx_ref{type=ThisT,ref=ThisRef},Name)
   wxe_util:call(?wxImage_SaveFile_1,
   <<ThisRef:32/?UI,(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((0+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxImage(),Name::string(),X::integer()|string()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagesavefile">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% saveFile(This::wxImage(), Name::string(), Type::integer()) -> bool() </c>
-%% </p>
-%% <p><c>
-%% saveFile(This::wxImage(), Name::string(), Mimetype::string()) -> bool() </c>
-%% </p>
+-spec saveFile(This, Name, Type) -> boolean() when
+	This::wxImage(), Name::string(), Type::integer();
+      (This, Name, Mimetype) -> boolean() when
+	This::wxImage(), Name::string(), Mimetype::string().
 saveFile(#wx_ref{type=ThisT,ref=ThisRef},Name,Type)
  when is_list(Name),is_integer(Type) ->
   ?CLASS(ThisT,wxImage),
@@ -712,15 +777,18 @@ saveFile(#wx_ref{type=ThisT,ref=ThisRef},Name,Mimetype)
   wxe_util:call(?wxImage_SaveFile_2_1,
   <<ThisRef:32/?UI,(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((0+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8,(byte_size(Mimetype_UC)):32/?UI,(Mimetype_UC)/binary, 0:(((8- ((4+byte_size(Mimetype_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxImage(), Width::integer(), Height::integer()) -> wxImage()
 %% @equiv scale(This,Width,Height, [])
+-spec scale(This, Width, Height) -> wxImage() when
+	This::wxImage(), Width::integer(), Height::integer().
+
 scale(This,Width,Height)
  when is_record(This, wx_ref),is_integer(Width),is_integer(Height) ->
   scale(This,Width,Height, []).
 
-%% @spec (This::wxImage(), Width::integer(), Height::integer(), [Option]) -> wxImage()
-%% Option = {quality, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagescale">external documentation</a>.
+-spec scale(This, Width, Height, [Option]) -> wxImage() when
+	This::wxImage(), Width::integer(), Height::integer(),
+	Option :: {quality, integer()}.
 scale(#wx_ref{type=ThisT,ref=ThisRef},Width,Height, Options)
  when is_integer(Width),is_integer(Height),is_list(Options) ->
   ?CLASS(ThisT,wxImage),
@@ -730,15 +798,20 @@ scale(#wx_ref{type=ThisT,ref=ThisRef},Width,Height, Options)
   wxe_util:call(?wxImage_Scale,
   <<ThisRef:32/?UI,Width:32/?UI,Height:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxImage(), Size::{W::integer(), H::integer()}, Pos::{X::integer(), Y::integer()}) -> wxImage()
 %% @equiv size(This,Size,Pos, [])
+-spec size(This, Size, Pos) -> wxImage() when
+	This::wxImage(), Size::{W::integer(), H::integer()}, Pos::{X::integer(), Y::integer()}.
+
 size(This,Size={SizeW,SizeH},Pos={PosX,PosY})
  when is_record(This, wx_ref),is_integer(SizeW),is_integer(SizeH),is_integer(PosX),is_integer(PosY) ->
   size(This,Size,Pos, []).
 
-%% @spec (This::wxImage(), Size::{W::integer(), H::integer()}, Pos::{X::integer(), Y::integer()}, [Option]) -> wxImage()
-%% Option = {r, integer()} | {g, integer()} | {b, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagesize">external documentation</a>.
+-spec size(This, Size, Pos, [Option]) -> wxImage() when
+	This::wxImage(), Size::{W::integer(), H::integer()}, Pos::{X::integer(), Y::integer()},
+	Option :: {r, integer()}
+		 | {g, integer()}
+		 | {b, integer()}.
 size(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH},{PosX,PosY}, Options)
  when is_integer(SizeW),is_integer(SizeH),is_integer(PosX),is_integer(PosY),is_list(Options) ->
   ?CLASS(ThisT,wxImage),
@@ -750,15 +823,18 @@ size(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH},{PosX,PosY}, Options)
   wxe_util:call(?wxImage_Size,
   <<ThisRef:32/?UI,SizeW:32/?UI,SizeH:32/?UI,PosX:32/?UI,PosY:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxImage(), Alpha::binary()) -> ok
 %% @equiv setAlpha(This,Alpha, [])
+-spec setAlpha(This, Alpha) -> ok when
+	This::wxImage(), Alpha::binary().
+
 setAlpha(This,Alpha)
  when is_record(This, wx_ref),is_binary(Alpha) ->
   setAlpha(This,Alpha, []).
 
-%% @spec (This::wxImage(), Alpha::binary(), [Option]) -> ok
-%% Option = {static_data, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagesetalpha">external documentation</a>.
+-spec setAlpha(This, Alpha, [Option]) -> ok when
+	This::wxImage(), Alpha::binary(),
+	Option :: {static_data, boolean()}.
 setAlpha(#wx_ref{type=ThisT,ref=ThisRef},Alpha, Options)
  when is_binary(Alpha),is_list(Options) ->
   ?CLASS(ThisT,wxImage),
@@ -769,23 +845,27 @@ setAlpha(#wx_ref{type=ThisT,ref=ThisRef},Alpha, Options)
   wxe_util:cast(?wxImage_SetAlpha_2,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxImage(), X::integer(), Y::integer(), Alpha::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagesetalpha">external documentation</a>.
+-spec setAlpha(This, X, Y, Alpha) -> ok when
+	This::wxImage(), X::integer(), Y::integer(), Alpha::integer().
 setAlpha(#wx_ref{type=ThisT,ref=ThisRef},X,Y,Alpha)
  when is_integer(X),is_integer(Y),is_integer(Alpha) ->
   ?CLASS(ThisT,wxImage),
   wxe_util:cast(?wxImage_SetAlpha_3,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI,Alpha:32/?UI>>).
 
-%% @spec (This::wxImage(), Data::binary()) -> ok
 %% @equiv setData(This,Data, [])
+-spec setData(This, Data) -> ok when
+	This::wxImage(), Data::binary().
+
 setData(This,Data)
  when is_record(This, wx_ref),is_binary(Data) ->
   setData(This,Data, []).
 
-%% @spec (This::wxImage(), Data::binary(), [Option]) -> ok
-%% Option = {static_data, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagesetdata">external documentation</a>.
+-spec setData(This, Data, [Option]) -> ok when
+	This::wxImage(), Data::binary(),
+	Option :: {static_data, boolean()}.
 setData(#wx_ref{type=ThisT,ref=ThisRef},Data, Options)
  when is_binary(Data),is_list(Options) ->
   ?CLASS(ThisT,wxImage),
@@ -796,15 +876,18 @@ setData(#wx_ref{type=ThisT,ref=ThisRef},Data, Options)
   wxe_util:cast(?wxImage_SetData_2,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxImage(), Data::binary(), New_width::integer(), New_height::integer()) -> ok
 %% @equiv setData(This,Data,New_width,New_height, [])
+-spec setData(This, Data, New_width, New_height) -> ok when
+	This::wxImage(), Data::binary(), New_width::integer(), New_height::integer().
+
 setData(This,Data,New_width,New_height)
  when is_record(This, wx_ref),is_binary(Data),is_integer(New_width),is_integer(New_height) ->
   setData(This,Data,New_width,New_height, []).
 
-%% @spec (This::wxImage(), Data::binary(), New_width::integer(), New_height::integer(), [Option]) -> ok
-%% Option = {static_data, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagesetdata">external documentation</a>.
+-spec setData(This, Data, New_width, New_height, [Option]) -> ok when
+	This::wxImage(), Data::binary(), New_width::integer(), New_height::integer(),
+	Option :: {static_data, boolean()}.
 setData(#wx_ref{type=ThisT,ref=ThisRef},Data,New_width,New_height, Options)
  when is_binary(Data),is_integer(New_width),is_integer(New_height),is_list(Options) ->
   ?CLASS(ThisT,wxImage),
@@ -815,15 +898,18 @@ setData(#wx_ref{type=ThisT,ref=ThisRef},Data,New_width,New_height, Options)
   wxe_util:cast(?wxImage_SetData_4,
   <<ThisRef:32/?UI,New_width:32/?UI,New_height:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxImage()) -> ok
 %% @equiv setMask(This, [])
+-spec setMask(This) -> ok when
+	This::wxImage().
+
 setMask(This)
  when is_record(This, wx_ref) ->
   setMask(This, []).
 
-%% @spec (This::wxImage(), [Option]) -> ok
-%% Option = {mask, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagesetmask">external documentation</a>.
+-spec setMask(This, [Option]) -> ok when
+	This::wxImage(),
+	Option :: {mask, boolean()}.
 setMask(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxImage),
@@ -833,16 +919,18 @@ setMask(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxImage_SetMask,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxImage(), R::integer(), G::integer(), B::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagesetmaskcolour">external documentation</a>.
+-spec setMaskColour(This, R, G, B) -> ok when
+	This::wxImage(), R::integer(), G::integer(), B::integer().
 setMaskColour(#wx_ref{type=ThisT,ref=ThisRef},R,G,B)
  when is_integer(R),is_integer(G),is_integer(B) ->
   ?CLASS(ThisT,wxImage),
   wxe_util:cast(?wxImage_SetMaskColour,
   <<ThisRef:32/?UI,R:32/?UI,G:32/?UI,B:32/?UI>>).
 
-%% @spec (This::wxImage(), Mask::wxImage(), Mr::integer(), Mg::integer(), Mb::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagesetmaskfromimage">external documentation</a>.
+-spec setMaskFromImage(This, Mask, Mr, Mg, Mb) -> boolean() when
+	This::wxImage(), Mask::wxImage(), Mr::integer(), Mg::integer(), Mb::integer().
 setMaskFromImage(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=MaskT,ref=MaskRef},Mr,Mg,Mb)
  when is_integer(Mr),is_integer(Mg),is_integer(Mb) ->
   ?CLASS(ThisT,wxImage),
@@ -850,15 +938,11 @@ setMaskFromImage(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=MaskT,ref=MaskRef}
   wxe_util:call(?wxImage_SetMaskFromImage,
   <<ThisRef:32/?UI,MaskRef:32/?UI,Mr:32/?UI,Mg:32/?UI,Mb:32/?UI>>).
 
-%% @spec (This::wxImage(),Name::string(),X::integer()|string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagesetoption">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% setOption(This::wxImage(), Name::string(), Value::integer()) -> ok </c>
-%% </p>
-%% <p><c>
-%% setOption(This::wxImage(), Name::string(), Value::string()) -> ok </c>
-%% </p>
+-spec setOption(This, Name, Value) -> ok when
+	This::wxImage(), Name::string(), Value::integer();
+      (This, Name, Value) -> ok when
+	This::wxImage(), Name::string(), Value::string().
 setOption(#wx_ref{type=ThisT,ref=ThisRef},Name,Value)
  when is_list(Name),is_integer(Value) ->
   ?CLASS(ThisT,wxImage),
@@ -873,32 +957,35 @@ setOption(#wx_ref{type=ThisT,ref=ThisRef},Name,Value)
   wxe_util:cast(?wxImage_SetOption_2_1,
   <<ThisRef:32/?UI,(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((0+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8,(byte_size(Value_UC)):32/?UI,(Value_UC)/binary, 0:(((8- ((4+byte_size(Value_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxImage(), Palette::wxPalette:wxPalette()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagesetpalette">external documentation</a>.
+-spec setPalette(This, Palette) -> ok when
+	This::wxImage(), Palette::wxPalette:wxPalette().
 setPalette(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PaletteT,ref=PaletteRef}) ->
   ?CLASS(ThisT,wxImage),
   ?CLASS(PaletteT,wxPalette),
   wxe_util:cast(?wxImage_SetPalette,
   <<ThisRef:32/?UI,PaletteRef:32/?UI>>).
 
-%% @spec (This::wxImage(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}, R::integer(), G::integer(), B::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagesetrgb">external documentation</a>.
+-spec setRGB(This, Rect, R, G, B) -> ok when
+	This::wxImage(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}, R::integer(), G::integer(), B::integer().
 setRGB(#wx_ref{type=ThisT,ref=ThisRef},{RectX,RectY,RectW,RectH},R,G,B)
  when is_integer(RectX),is_integer(RectY),is_integer(RectW),is_integer(RectH),is_integer(R),is_integer(G),is_integer(B) ->
   ?CLASS(ThisT,wxImage),
   wxe_util:cast(?wxImage_SetRGB_4,
   <<ThisRef:32/?UI,RectX:32/?UI,RectY:32/?UI,RectW:32/?UI,RectH:32/?UI,R:32/?UI,G:32/?UI,B:32/?UI>>).
 
-%% @spec (This::wxImage(), X::integer(), Y::integer(), R::integer(), G::integer(), B::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagesetrgb">external documentation</a>.
+-spec setRGB(This, X, Y, R, G, B) -> ok when
+	This::wxImage(), X::integer(), Y::integer(), R::integer(), G::integer(), B::integer().
 setRGB(#wx_ref{type=ThisT,ref=ThisRef},X,Y,R,G,B)
  when is_integer(X),is_integer(Y),is_integer(R),is_integer(G),is_integer(B) ->
   ?CLASS(ThisT,wxImage),
   wxe_util:cast(?wxImage_SetRGB_5,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI,R:32/?UI,G:32/?UI,B:32/?UI>>).
 
-%% @spec (This::wxImage()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxImage) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxImage),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxImageList.erl b/lib/wx/src/gen/wxImageList.erl
index f805a234df..a2049ce052 100644
--- a/lib/wx/src/gen/wxImageList.erl
+++ b/lib/wx/src/gen/wxImageList.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -31,24 +31,30 @@
 %% inherited exports
 -export([parent_class/1]).
 
+-export_type([wxImageList/0]).
 %% @hidden
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxImageList()
+-type wxImageList() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximagelist.html#wximagelistwximagelist">external documentation</a>.
+-spec new() -> wxImageList().
 new() ->
   wxe_util:construct(?wxImageList_new_0,
   <<>>).
 
-%% @spec (Width::integer(), Height::integer()) -> wxImageList()
 %% @equiv new(Width,Height, [])
+-spec new(Width, Height) -> wxImageList() when
+	Width::integer(), Height::integer().
+
 new(Width,Height)
  when is_integer(Width),is_integer(Height) ->
   new(Width,Height, []).
 
-%% @spec (Width::integer(), Height::integer(), [Option]) -> wxImageList()
-%% Option = {mask, bool()} | {initialCount, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximagelist.html#wximagelistwximagelist">external documentation</a>.
+-spec new(Width, Height, [Option]) -> wxImageList() when
+	Width::integer(), Height::integer(),
+	Option :: {mask, boolean()}
+		 | {initialCount, integer()}.
 new(Width,Height, Options)
  when is_integer(Width),is_integer(Height),is_list(Options) ->
   MOpts = fun({mask, Mask}, Acc) -> [<<1:32/?UI,(wxe_util:from_bool(Mask)):32/?UI>>|Acc];
@@ -58,23 +64,20 @@ new(Width,Height, Options)
   wxe_util:construct(?wxImageList_new_3,
   <<Width:32/?UI,Height:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxImageList(), Bitmap::wxBitmap:wxBitmap()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximagelist.html#wximagelistadd">external documentation</a>.
+-spec add(This, Bitmap) -> integer() when
+	This::wxImageList(), Bitmap::wxBitmap:wxBitmap().
 add(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BitmapT,ref=BitmapRef}) ->
   ?CLASS(ThisT,wxImageList),
   ?CLASS(BitmapT,wxBitmap),
   wxe_util:call(?wxImageList_Add_1,
   <<ThisRef:32/?UI,BitmapRef:32/?UI>>).
 
-%% @spec (This::wxImageList(),Bitmap::wxBitmap:wxBitmap(),X::term()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximagelist.html#wximagelistadd">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% add(This::wxImageList(), Bitmap::wxBitmap:wxBitmap(), Mask::wxBitmap:wxBitmap()) -> integer() </c>
-%% </p>
-%% <p><c>
-%% add(This::wxImageList(), Bitmap::wxBitmap:wxBitmap(), MaskColour::wx:colour()) -> integer() </c>
-%% </p>
+-spec add(This, Bitmap, Mask) -> integer() when
+	This::wxImageList(), Bitmap::wxBitmap:wxBitmap(), Mask::wxBitmap:wxBitmap();
+      (This, Bitmap, MaskColour) -> integer() when
+	This::wxImageList(), Bitmap::wxBitmap:wxBitmap(), MaskColour::wx:wx_colour().
 add(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BitmapT,ref=BitmapRef},#wx_ref{type=MaskT,ref=MaskRef}) ->
   ?CLASS(ThisT,wxImageList),
   ?CLASS(BitmapT,wxBitmap),
@@ -88,15 +91,19 @@ add(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BitmapT,ref=BitmapRef},MaskColo
   wxe_util:call(?wxImageList_Add_2_1,
   <<ThisRef:32/?UI,BitmapRef:32/?UI,(wxe_util:colour_bin(MaskColour)):16/binary>>).
 
-%% @spec (This::wxImageList(), Width::integer(), Height::integer()) -> bool()
 %% @equiv create(This,Width,Height, [])
+-spec create(This, Width, Height) -> boolean() when
+	This::wxImageList(), Width::integer(), Height::integer().
+
 create(This,Width,Height)
  when is_record(This, wx_ref),is_integer(Width),is_integer(Height) ->
   create(This,Width,Height, []).
 
-%% @spec (This::wxImageList(), Width::integer(), Height::integer(), [Option]) -> bool()
-%% Option = {mask, bool()} | {initialCount, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximagelist.html#wximagelistcreate">external documentation</a>.
+-spec create(This, Width, Height, [Option]) -> boolean() when
+	This::wxImageList(), Width::integer(), Height::integer(),
+	Option :: {mask, boolean()}
+		 | {initialCount, integer()}.
 create(#wx_ref{type=ThisT,ref=ThisRef},Width,Height, Options)
  when is_integer(Width),is_integer(Height),is_list(Options) ->
   ?CLASS(ThisT,wxImageList),
@@ -107,15 +114,19 @@ create(#wx_ref{type=ThisT,ref=ThisRef},Width,Height, Options)
   wxe_util:call(?wxImageList_Create,
   <<ThisRef:32/?UI,Width:32/?UI,Height:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxImageList(), Index::integer(), Dc::wxDC:wxDC(), X::integer(), Y::integer()) -> bool()
 %% @equiv draw(This,Index,Dc,X,Y, [])
+-spec draw(This, Index, Dc, X, Y) -> boolean() when
+	This::wxImageList(), Index::integer(), Dc::wxDC:wxDC(), X::integer(), Y::integer().
+
 draw(This,Index,Dc,X,Y)
  when is_record(This, wx_ref),is_integer(Index),is_record(Dc, wx_ref),is_integer(X),is_integer(Y) ->
   draw(This,Index,Dc,X,Y, []).
 
-%% @spec (This::wxImageList(), Index::integer(), Dc::wxDC:wxDC(), X::integer(), Y::integer(), [Option]) -> bool()
-%% Option = {flags, integer()} | {solidBackground, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximagelist.html#wximagelistdraw">external documentation</a>.
+-spec draw(This, Index, Dc, X, Y, [Option]) -> boolean() when
+	This::wxImageList(), Index::integer(), Dc::wxDC:wxDC(), X::integer(), Y::integer(),
+	Option :: {flags, integer()}
+		 | {solidBackground, boolean()}.
 draw(#wx_ref{type=ThisT,ref=ThisRef},Index,#wx_ref{type=DcT,ref=DcRef},X,Y, Options)
  when is_integer(Index),is_integer(X),is_integer(Y),is_list(Options) ->
   ?CLASS(ThisT,wxImageList),
@@ -127,54 +138,62 @@ draw(#wx_ref{type=ThisT,ref=ThisRef},Index,#wx_ref{type=DcT,ref=DcRef},X,Y, Opti
   wxe_util:call(?wxImageList_Draw,
   <<ThisRef:32/?UI,Index:32/?UI,DcRef:32/?UI,X:32/?UI,Y:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxImageList(), Index::integer()) -> wxBitmap:wxBitmap()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximagelist.html#wximagelistgetbitmap">external documentation</a>.
+-spec getBitmap(This, Index) -> wxBitmap:wxBitmap() when
+	This::wxImageList(), Index::integer().
 getBitmap(#wx_ref{type=ThisT,ref=ThisRef},Index)
  when is_integer(Index) ->
   ?CLASS(ThisT,wxImageList),
   wxe_util:call(?wxImageList_GetBitmap,
   <<ThisRef:32/?UI,Index:32/?UI>>).
 
-%% @spec (This::wxImageList(), Index::integer()) -> wxIcon:wxIcon()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximagelist.html#wximagelistgeticon">external documentation</a>.
+-spec getIcon(This, Index) -> wxIcon:wxIcon() when
+	This::wxImageList(), Index::integer().
 getIcon(#wx_ref{type=ThisT,ref=ThisRef},Index)
  when is_integer(Index) ->
   ?CLASS(ThisT,wxImageList),
   wxe_util:call(?wxImageList_GetIcon,
   <<ThisRef:32/?UI,Index:32/?UI>>).
 
-%% @spec (This::wxImageList()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximagelist.html#wximagelistgetimagecount">external documentation</a>.
+-spec getImageCount(This) -> integer() when
+	This::wxImageList().
 getImageCount(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxImageList),
   wxe_util:call(?wxImageList_GetImageCount,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxImageList(), Index::integer()) -> {bool(), Width::integer(), Height::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximagelist.html#wximagelistgetsize">external documentation</a>.
+-spec getSize(This, Index) -> Result when
+	Result ::{Res ::boolean(), Width::integer(), Height::integer()},
+	This::wxImageList(), Index::integer().
 getSize(#wx_ref{type=ThisT,ref=ThisRef},Index)
  when is_integer(Index) ->
   ?CLASS(ThisT,wxImageList),
   wxe_util:call(?wxImageList_GetSize,
   <<ThisRef:32/?UI,Index:32/?UI>>).
 
-%% @spec (This::wxImageList(), Index::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximagelist.html#wximagelistremove">external documentation</a>.
+-spec remove(This, Index) -> boolean() when
+	This::wxImageList(), Index::integer().
 remove(#wx_ref{type=ThisT,ref=ThisRef},Index)
  when is_integer(Index) ->
   ?CLASS(ThisT,wxImageList),
   wxe_util:call(?wxImageList_Remove,
   <<ThisRef:32/?UI,Index:32/?UI>>).
 
-%% @spec (This::wxImageList()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximagelist.html#wximagelistremoveall">external documentation</a>.
+-spec removeAll(This) -> boolean() when
+	This::wxImageList().
 removeAll(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxImageList),
   wxe_util:call(?wxImageList_RemoveAll,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxImageList(), Index::integer(), Bitmap::wxBitmap:wxBitmap()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximagelist.html#wximagelistreplace">external documentation</a>.
+-spec replace(This, Index, Bitmap) -> boolean() when
+	This::wxImageList(), Index::integer(), Bitmap::wxBitmap:wxBitmap().
 replace(#wx_ref{type=ThisT,ref=ThisRef},Index,#wx_ref{type=BitmapT,ref=BitmapRef})
  when is_integer(Index) ->
   ?CLASS(ThisT,wxImageList),
@@ -182,8 +201,9 @@ replace(#wx_ref{type=ThisT,ref=ThisRef},Index,#wx_ref{type=BitmapT,ref=BitmapRef
   wxe_util:call(?wxImageList_Replace_2,
   <<ThisRef:32/?UI,Index:32/?UI,BitmapRef:32/?UI>>).
 
-%% @spec (This::wxImageList(), Index::integer(), Bitmap::wxBitmap:wxBitmap(), Mask::wxBitmap:wxBitmap()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximagelist.html#wximagelistreplace">external documentation</a>.
+-spec replace(This, Index, Bitmap, Mask) -> boolean() when
+	This::wxImageList(), Index::integer(), Bitmap::wxBitmap:wxBitmap(), Mask::wxBitmap:wxBitmap().
 replace(#wx_ref{type=ThisT,ref=ThisRef},Index,#wx_ref{type=BitmapT,ref=BitmapRef},#wx_ref{type=MaskT,ref=MaskRef})
  when is_integer(Index) ->
   ?CLASS(ThisT,wxImageList),
@@ -192,8 +212,8 @@ replace(#wx_ref{type=ThisT,ref=ThisRef},Index,#wx_ref{type=BitmapT,ref=BitmapRef
   wxe_util:call(?wxImageList_Replace_3,
   <<ThisRef:32/?UI,Index:32/?UI,BitmapRef:32/?UI,MaskRef:32/?UI>>).
 
-%% @spec (This::wxImageList()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxImageList) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxImageList),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxJoystickEvent.erl b/lib/wx/src/gen/wxJoystickEvent.erl
index 2f149a50f8..979c36cd8c 100644
--- a/lib/wx/src/gen/wxJoystickEvent.erl
+++ b/lib/wx/src/gen/wxJoystickEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -39,19 +39,24 @@
 -export([getId/1,getSkipped/1,getTimestamp/1,isCommandEvent/1,parent_class/1,
   resumePropagation/2,shouldPropagate/1,skip/1,skip/2,stopPropagation/1]).
 
+-export_type([wxJoystickEvent/0]).
 %% @hidden
 parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (This::wxJoystickEvent()) -> bool()
+-type wxJoystickEvent() :: wx:wx_object().
 %% @equiv buttonDown(This, [])
+-spec buttonDown(This) -> boolean() when
+	This::wxJoystickEvent().
+
 buttonDown(This)
  when is_record(This, wx_ref) ->
   buttonDown(This, []).
 
-%% @spec (This::wxJoystickEvent(), [Option]) -> bool()
-%% Option = {but, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxjoystickevent.html#wxjoystickeventbuttondown">external documentation</a>.
+-spec buttonDown(This, [Option]) -> boolean() when
+	This::wxJoystickEvent(),
+	Option :: {but, integer()}.
 buttonDown(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxJoystickEvent),
@@ -61,15 +66,18 @@ buttonDown(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxJoystickEvent_ButtonDown,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxJoystickEvent()) -> bool()
 %% @equiv buttonIsDown(This, [])
+-spec buttonIsDown(This) -> boolean() when
+	This::wxJoystickEvent().
+
 buttonIsDown(This)
  when is_record(This, wx_ref) ->
   buttonIsDown(This, []).
 
-%% @spec (This::wxJoystickEvent(), [Option]) -> bool()
-%% Option = {but, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxjoystickevent.html#wxjoystickeventbuttonisdown">external documentation</a>.
+-spec buttonIsDown(This, [Option]) -> boolean() when
+	This::wxJoystickEvent(),
+	Option :: {but, integer()}.
 buttonIsDown(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxJoystickEvent),
@@ -79,15 +87,18 @@ buttonIsDown(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxJoystickEvent_ButtonIsDown,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxJoystickEvent()) -> bool()
 %% @equiv buttonUp(This, [])
+-spec buttonUp(This) -> boolean() when
+	This::wxJoystickEvent().
+
 buttonUp(This)
  when is_record(This, wx_ref) ->
   buttonUp(This, []).
 
-%% @spec (This::wxJoystickEvent(), [Option]) -> bool()
-%% Option = {but, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxjoystickevent.html#wxjoystickeventbuttonup">external documentation</a>.
+-spec buttonUp(This, [Option]) -> boolean() when
+	This::wxJoystickEvent(),
+	Option :: {but, integer()}.
 buttonUp(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxJoystickEvent),
@@ -97,57 +108,65 @@ buttonUp(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxJoystickEvent_ButtonUp,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxJoystickEvent()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxjoystickevent.html#wxjoystickeventgetbuttonchange">external documentation</a>.
+-spec getButtonChange(This) -> integer() when
+	This::wxJoystickEvent().
 getButtonChange(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxJoystickEvent),
   wxe_util:call(?wxJoystickEvent_GetButtonChange,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxJoystickEvent()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxjoystickevent.html#wxjoystickeventgetbuttonstate">external documentation</a>.
+-spec getButtonState(This) -> integer() when
+	This::wxJoystickEvent().
 getButtonState(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxJoystickEvent),
   wxe_util:call(?wxJoystickEvent_GetButtonState,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxJoystickEvent()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxjoystickevent.html#wxjoystickeventgetjoystick">external documentation</a>.
+-spec getJoystick(This) -> integer() when
+	This::wxJoystickEvent().
 getJoystick(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxJoystickEvent),
   wxe_util:call(?wxJoystickEvent_GetJoystick,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxJoystickEvent()) -> {X::integer(), Y::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxjoystickevent.html#wxjoystickeventgetposition">external documentation</a>.
+-spec getPosition(This) -> {X::integer(), Y::integer()} when
+	This::wxJoystickEvent().
 getPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxJoystickEvent),
   wxe_util:call(?wxJoystickEvent_GetPosition,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxJoystickEvent()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxjoystickevent.html#wxjoystickeventgetzposition">external documentation</a>.
+-spec getZPosition(This) -> integer() when
+	This::wxJoystickEvent().
 getZPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxJoystickEvent),
   wxe_util:call(?wxJoystickEvent_GetZPosition,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxJoystickEvent()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxjoystickevent.html#wxjoystickeventisbutton">external documentation</a>.
+-spec isButton(This) -> boolean() when
+	This::wxJoystickEvent().
 isButton(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxJoystickEvent),
   wxe_util:call(?wxJoystickEvent_IsButton,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxJoystickEvent()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxjoystickevent.html#wxjoystickeventismove">external documentation</a>.
+-spec isMove(This) -> boolean() when
+	This::wxJoystickEvent().
 isMove(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxJoystickEvent),
   wxe_util:call(?wxJoystickEvent_IsMove,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxJoystickEvent()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxjoystickevent.html#wxjoystickeventiszmove">external documentation</a>.
+-spec isZMove(This) -> boolean() when
+	This::wxJoystickEvent().
 isZMove(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxJoystickEvent),
   wxe_util:call(?wxJoystickEvent_IsZMove,
diff --git a/lib/wx/src/gen/wxKeyEvent.erl b/lib/wx/src/gen/wxKeyEvent.erl
index edda5ee0a6..107d4be685 100644
--- a/lib/wx/src/gen/wxKeyEvent.erl
+++ b/lib/wx/src/gen/wxKeyEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -39,103 +39,119 @@
 -export([getId/1,getSkipped/1,getTimestamp/1,isCommandEvent/1,parent_class/1,
   resumePropagation/2,shouldPropagate/1,skip/1,skip/2,stopPropagation/1]).
 
+-export_type([wxKeyEvent/0]).
 %% @hidden
 parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (This::wxKeyEvent()) -> bool()
+-type wxKeyEvent() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxkeyevent.html#wxkeyeventaltdown">external documentation</a>.
+-spec altDown(This) -> boolean() when
+	This::wxKeyEvent().
 altDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxKeyEvent),
   wxe_util:call(?wxKeyEvent_AltDown,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxKeyEvent()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxkeyevent.html#wxkeyeventcmddown">external documentation</a>.
+-spec cmdDown(This) -> boolean() when
+	This::wxKeyEvent().
 cmdDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxKeyEvent),
   wxe_util:call(?wxKeyEvent_CmdDown,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxKeyEvent()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxkeyevent.html#wxkeyeventcontroldown">external documentation</a>.
+-spec controlDown(This) -> boolean() when
+	This::wxKeyEvent().
 controlDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxKeyEvent),
   wxe_util:call(?wxKeyEvent_ControlDown,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxKeyEvent()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxkeyevent.html#wxkeyeventgetkeycode">external documentation</a>.
+-spec getKeyCode(This) -> integer() when
+	This::wxKeyEvent().
 getKeyCode(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxKeyEvent),
   wxe_util:call(?wxKeyEvent_GetKeyCode,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxKeyEvent()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxkeyevent.html#wxkeyeventgetmodifiers">external documentation</a>.
+-spec getModifiers(This) -> integer() when
+	This::wxKeyEvent().
 getModifiers(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxKeyEvent),
   wxe_util:call(?wxKeyEvent_GetModifiers,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxKeyEvent()) -> {X::integer(), Y::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxkeyevent.html#wxkeyeventgetposition">external documentation</a>.
+-spec getPosition(This) -> {X::integer(), Y::integer()} when
+	This::wxKeyEvent().
 getPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxKeyEvent),
   wxe_util:call(?wxKeyEvent_GetPosition,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxKeyEvent()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxkeyevent.html#wxkeyeventgetrawkeycode">external documentation</a>.
+-spec getRawKeyCode(This) -> integer() when
+	This::wxKeyEvent().
 getRawKeyCode(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxKeyEvent),
   wxe_util:call(?wxKeyEvent_GetRawKeyCode,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxKeyEvent()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxkeyevent.html#wxkeyeventgetrawkeyflags">external documentation</a>.
+-spec getRawKeyFlags(This) -> integer() when
+	This::wxKeyEvent().
 getRawKeyFlags(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxKeyEvent),
   wxe_util:call(?wxKeyEvent_GetRawKeyFlags,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxKeyEvent()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxkeyevent.html#wxkeyeventgetunicodekey">external documentation</a>.
+-spec getUnicodeKey(This) -> integer() when
+	This::wxKeyEvent().
 getUnicodeKey(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxKeyEvent),
   wxe_util:call(?wxKeyEvent_GetUnicodeKey,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxKeyEvent()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxkeyevent.html#wxkeyeventgetx">external documentation</a>.
+-spec getX(This) -> integer() when
+	This::wxKeyEvent().
 getX(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxKeyEvent),
   wxe_util:call(?wxKeyEvent_GetX,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxKeyEvent()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxkeyevent.html#wxkeyeventgety">external documentation</a>.
+-spec getY(This) -> integer() when
+	This::wxKeyEvent().
 getY(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxKeyEvent),
   wxe_util:call(?wxKeyEvent_GetY,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxKeyEvent()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxkeyevent.html#wxkeyeventhasmodifiers">external documentation</a>.
+-spec hasModifiers(This) -> boolean() when
+	This::wxKeyEvent().
 hasModifiers(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxKeyEvent),
   wxe_util:call(?wxKeyEvent_HasModifiers,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxKeyEvent()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxkeyevent.html#wxkeyeventmetadown">external documentation</a>.
+-spec metaDown(This) -> boolean() when
+	This::wxKeyEvent().
 metaDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxKeyEvent),
   wxe_util:call(?wxKeyEvent_MetaDown,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxKeyEvent()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxkeyevent.html#wxkeyeventshiftdown">external documentation</a>.
+-spec shiftDown(This) -> boolean() when
+	This::wxKeyEvent().
 shiftDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxKeyEvent),
   wxe_util:call(?wxKeyEvent_ShiftDown,
diff --git a/lib/wx/src/gen/wxLayoutAlgorithm.erl b/lib/wx/src/gen/wxLayoutAlgorithm.erl
index c17abeaed1..c9a7314c87 100644
--- a/lib/wx/src/gen/wxLayoutAlgorithm.erl
+++ b/lib/wx/src/gen/wxLayoutAlgorithm.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -30,24 +30,29 @@
 %% inherited exports
 -export([parent_class/1]).
 
+-export_type([wxLayoutAlgorithm/0]).
 %% @hidden
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxLayoutAlgorithm()
+-type wxLayoutAlgorithm() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlayoutalgorithm.html#wxlayoutalgorithmwxlayoutalgorithm">external documentation</a>.
+-spec new() -> wxLayoutAlgorithm().
 new() ->
   wxe_util:construct(?wxLayoutAlgorithm_new,
   <<>>).
 
-%% @spec (This::wxLayoutAlgorithm(), Frame::wxFrame:wxFrame()) -> bool()
 %% @equiv layoutFrame(This,Frame, [])
+-spec layoutFrame(This, Frame) -> boolean() when
+	This::wxLayoutAlgorithm(), Frame::wxFrame:wxFrame().
+
 layoutFrame(This,Frame)
  when is_record(This, wx_ref),is_record(Frame, wx_ref) ->
   layoutFrame(This,Frame, []).
 
-%% @spec (This::wxLayoutAlgorithm(), Frame::wxFrame:wxFrame(), [Option]) -> bool()
-%% Option = {mainWindow, wxWindow:wxWindow()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlayoutalgorithm.html#wxlayoutalgorithmlayoutframe">external documentation</a>.
+-spec layoutFrame(This, Frame, [Option]) -> boolean() when
+	This::wxLayoutAlgorithm(), Frame::wxFrame:wxFrame(),
+	Option :: {mainWindow, wxWindow:wxWindow()}.
 layoutFrame(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FrameT,ref=FrameRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxLayoutAlgorithm),
@@ -58,15 +63,18 @@ layoutFrame(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FrameT,ref=FrameRef}, O
   wxe_util:call(?wxLayoutAlgorithm_LayoutFrame,
   <<ThisRef:32/?UI,FrameRef:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxLayoutAlgorithm(), Frame::wxMDIParentFrame:wxMDIParentFrame()) -> bool()
 %% @equiv layoutMDIFrame(This,Frame, [])
+-spec layoutMDIFrame(This, Frame) -> boolean() when
+	This::wxLayoutAlgorithm(), Frame::wxMDIParentFrame:wxMDIParentFrame().
+
 layoutMDIFrame(This,Frame)
  when is_record(This, wx_ref),is_record(Frame, wx_ref) ->
   layoutMDIFrame(This,Frame, []).
 
-%% @spec (This::wxLayoutAlgorithm(), Frame::wxMDIParentFrame:wxMDIParentFrame(), [Option]) -> bool()
-%% Option = {rect, {X::integer(), Y::integer(), W::integer(), H::integer()}}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlayoutalgorithm.html#wxlayoutalgorithmlayoutmdiframe">external documentation</a>.
+-spec layoutMDIFrame(This, Frame, [Option]) -> boolean() when
+	This::wxLayoutAlgorithm(), Frame::wxMDIParentFrame:wxMDIParentFrame(),
+	Option :: {rect, {X::integer(), Y::integer(), W::integer(), H::integer()}}.
 layoutMDIFrame(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FrameT,ref=FrameRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxLayoutAlgorithm),
@@ -77,15 +85,18 @@ layoutMDIFrame(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FrameT,ref=FrameRef}
   wxe_util:call(?wxLayoutAlgorithm_LayoutMDIFrame,
   <<ThisRef:32/?UI,FrameRef:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxLayoutAlgorithm(), Frame::wxWindow:wxWindow()) -> bool()
 %% @equiv layoutWindow(This,Frame, [])
+-spec layoutWindow(This, Frame) -> boolean() when
+	This::wxLayoutAlgorithm(), Frame::wxWindow:wxWindow().
+
 layoutWindow(This,Frame)
  when is_record(This, wx_ref),is_record(Frame, wx_ref) ->
   layoutWindow(This,Frame, []).
 
-%% @spec (This::wxLayoutAlgorithm(), Frame::wxWindow:wxWindow(), [Option]) -> bool()
-%% Option = {mainWindow, wxWindow:wxWindow()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlayoutalgorithm.html#wxlayoutalgorithmlayoutwindow">external documentation</a>.
+-spec layoutWindow(This, Frame, [Option]) -> boolean() when
+	This::wxLayoutAlgorithm(), Frame::wxWindow:wxWindow(),
+	Option :: {mainWindow, wxWindow:wxWindow()}.
 layoutWindow(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FrameT,ref=FrameRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxLayoutAlgorithm),
@@ -96,8 +107,8 @@ layoutWindow(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FrameT,ref=FrameRef},
   wxe_util:call(?wxLayoutAlgorithm_LayoutWindow,
   <<ThisRef:32/?UI,FrameRef:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxLayoutAlgorithm()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxLayoutAlgorithm) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxLayoutAlgorithm),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxListBox.erl b/lib/wx/src/gen/wxListBox.erl
index cc30bf95e4..5cd8ba8127 100644
--- a/lib/wx/src/gen/wxListBox.erl
+++ b/lib/wx/src/gen/wxListBox.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -74,6 +74,7 @@
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
 
+-export_type([wxListBox/0]).
 %% @hidden
 parent_class(wxControlWithItems) -> true;
 parent_class(wxControl) -> true;
@@ -81,21 +82,29 @@ parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxListBox()
+-type wxListBox() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbox.html#wxlistboxwxlistbox">external documentation</a>.
+-spec new() -> wxListBox().
 new() ->
   wxe_util:construct(?wxListBox_new_0,
   <<>>).
 
-%% @spec (Parent::wxWindow:wxWindow(), Id::integer()) -> wxListBox()
 %% @equiv new(Parent,Id, [])
+-spec new(Parent, Id) -> wxListBox() when
+	Parent::wxWindow:wxWindow(), Id::integer().
+
 new(Parent,Id)
  when is_record(Parent, wx_ref),is_integer(Id) ->
   new(Parent,Id, []).
 
-%% @spec (Parent::wxWindow:wxWindow(), Id::integer(), [Option]) -> wxListBox()
-%% Option = {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {choices, [[string()]]} | {style, integer()} | {validator, wx:wx()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbox.html#wxlistboxwxlistbox">external documentation</a>.
+-spec new(Parent, Id, [Option]) -> wxListBox() when
+	Parent::wxWindow:wxWindow(), Id::integer(),
+	Option :: {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {choices, [[string()]]}
+		 | {style, integer()}
+		 | {validator, wx:wx()}.
 new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
  when is_integer(Id),is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -109,15 +118,19 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
   wxe_util:construct(?wxListBox_new_3,
   <<ParentRef:32/?UI,Id:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxListBox(), Parent::wxWindow:wxWindow(), Id::integer(), Pos::{X::integer(), Y::integer()}, Size::{W::integer(), H::integer()}, Choices::[[string()]]) -> bool()
 %% @equiv create(This,Parent,Id,Pos,Size,Choices, [])
+-spec create(This, Parent, Id, Pos, Size, Choices) -> boolean() when
+	This::wxListBox(), Parent::wxWindow:wxWindow(), Id::integer(), Pos::{X::integer(), Y::integer()}, Size::{W::integer(), H::integer()}, Choices::[[string()]].
+
 create(This,Parent,Id,Pos={PosX,PosY},Size={SizeW,SizeH},Choices)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id),is_integer(PosX),is_integer(PosY),is_integer(SizeW),is_integer(SizeH),is_list(Choices) ->
   create(This,Parent,Id,Pos,Size,Choices, []).
 
-%% @spec (This::wxListBox(), Parent::wxWindow:wxWindow(), Id::integer(), Pos::{X::integer(), Y::integer()}, Size::{W::integer(), H::integer()}, Choices::[[string()]], [Option]) -> bool()
-%% Option = {style, integer()} | {validator, wx:wx()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbox.html#wxlistboxcreate">external documentation</a>.
+-spec create(This, Parent, Id, Pos, Size, Choices, [Option]) -> boolean() when
+	This::wxListBox(), Parent::wxWindow:wxWindow(), Id::integer(), Pos::{X::integer(), Y::integer()}, Size::{W::integer(), H::integer()}, Choices::[[string()]],
+	Option :: {style, integer()}
+		 | {validator, wx:wx()}.
 create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id,{PosX,PosY},{SizeW,SizeH},Choices, Options)
  when is_integer(Id),is_integer(PosX),is_integer(PosY),is_integer(SizeW),is_integer(SizeH),is_list(Choices),is_list(Options) ->
   ?CLASS(ThisT,wxListBox),
@@ -131,23 +144,27 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id,{P
   wxe_util:call(?wxListBox_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI,Id:32/?UI,PosX:32/?UI,PosY:32/?UI,SizeW:32/?UI,SizeH:32/?UI,(length(Choices_UCA)):32/?UI, (<< <<(byte_size(UC_Str)):32/?UI, UC_Str/binary>>|| UC_Str <- Choices_UCA>>)/binary, 0:(((8- ((0 + lists:sum([byte_size(S)+4||S<-Choices_UCA])) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxListBox(), N::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbox.html#wxlistboxdeselect">external documentation</a>.
+-spec deselect(This, N) -> ok when
+	This::wxListBox(), N::integer().
 deselect(#wx_ref{type=ThisT,ref=ThisRef},N)
  when is_integer(N) ->
   ?CLASS(ThisT,wxListBox),
   wxe_util:cast(?wxListBox_Deselect,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @spec (This::wxListBox()) -> {integer(), ASelections::[integer()]}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbox.html#wxlistboxgetselections">external documentation</a>.
+-spec getSelections(This) -> Result when
+	Result ::{Res ::integer(), ASelections::[integer()]},
+	This::wxListBox().
 getSelections(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxListBox),
   wxe_util:call(?wxListBox_GetSelections,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxListBox(), Items::[[string()]], Pos::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbox.html#wxlistboxinsertitems">external documentation</a>.
+-spec insertItems(This, Items, Pos) -> ok when
+	This::wxListBox(), Items::[[string()]], Pos::integer().
 insertItems(#wx_ref{type=ThisT,ref=ThisRef},Items,Pos)
  when is_list(Items),is_integer(Pos) ->
   ?CLASS(ThisT,wxListBox),
@@ -156,16 +173,18 @@ insertItems(#wx_ref{type=ThisT,ref=ThisRef},Items,Pos)
   wxe_util:cast(?wxListBox_InsertItems,
   <<ThisRef:32/?UI,(length(Items_UCA)):32/?UI, (<< <<(byte_size(UC_Str)):32/?UI, UC_Str/binary>>|| UC_Str <- Items_UCA>>)/binary, 0:(((8- ((0 + lists:sum([byte_size(S)+4||S<-Items_UCA])) band 16#7)) band 16#7))/unit:8,Pos:32/?UI>>).
 
-%% @spec (This::wxListBox(), N::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbox.html#wxlistboxisselected">external documentation</a>.
+-spec isSelected(This, N) -> boolean() when
+	This::wxListBox(), N::integer().
 isSelected(#wx_ref{type=ThisT,ref=ThisRef},N)
  when is_integer(N) ->
   ?CLASS(ThisT,wxListBox),
   wxe_util:call(?wxListBox_IsSelected,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @spec (This::wxListBox(), Items::[[string()]]) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbox.html#wxlistboxset">external documentation</a>.
+-spec set(This, Items) -> ok when
+	This::wxListBox(), Items::[[string()]].
 set(#wx_ref{type=ThisT,ref=ThisRef},Items)
  when is_list(Items) ->
   ?CLASS(ThisT,wxListBox),
@@ -174,23 +193,20 @@ set(#wx_ref{type=ThisT,ref=ThisRef},Items)
   wxe_util:cast(?wxListBox_Set,
   <<ThisRef:32/?UI,(length(Items_UCA)):32/?UI, (<< <<(byte_size(UC_Str)):32/?UI, UC_Str/binary>>|| UC_Str <- Items_UCA>>)/binary, 0:(((8- ((0 + lists:sum([byte_size(S)+4||S<-Items_UCA])) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxListBox(), Point::{X::integer(), Y::integer()}) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbox.html#wxlistboxhittest">external documentation</a>.
+-spec hitTest(This, Point) -> integer() when
+	This::wxListBox(), Point::{X::integer(), Y::integer()}.
 hitTest(#wx_ref{type=ThisT,ref=ThisRef},{PointX,PointY})
  when is_integer(PointX),is_integer(PointY) ->
   ?CLASS(ThisT,wxListBox),
   wxe_util:call(?wxListBox_HitTest,
   <<ThisRef:32/?UI,PointX:32/?UI,PointY:32/?UI>>).
 
-%% @spec (This::wxListBox(),X::integer()|string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbox.html#wxlistboxsetfirstitem">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% setFirstItem(This::wxListBox(), N::integer()) -> ok </c>
-%% </p>
-%% <p><c>
-%% setFirstItem(This::wxListBox(), S::string()) -> ok </c>
-%% </p>
+-spec setFirstItem(This, N) -> ok when
+	This::wxListBox(), N::integer();
+      (This, S) -> ok when
+	This::wxListBox(), S::string().
 setFirstItem(#wx_ref{type=ThisT,ref=ThisRef},N)
  when is_integer(N) ->
   ?CLASS(ThisT,wxListBox),
@@ -203,8 +219,8 @@ setFirstItem(#wx_ref{type=ThisT,ref=ThisRef},S)
   wxe_util:cast(?wxListBox_SetFirstItem_1_1,
   <<ThisRef:32/?UI,(byte_size(S_UC)):32/?UI,(S_UC)/binary, 0:(((8- ((0+byte_size(S_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxListBox()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxListBox) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxListBox),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxListCtrl.erl b/lib/wx/src/gen/wxListCtrl.erl
index fa99897171..ae2db0ae2f 100644
--- a/lib/wx/src/gen/wxListCtrl.erl
+++ b/lib/wx/src/gen/wxListCtrl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -83,12 +83,14 @@
   show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,update/1,
   updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
 
+-export_type([wxListCtrl/0]).
 %% @hidden
 parent_class(wxControl) -> true;
 parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
+-type wxListCtrl() :: wx:wx_object().
 
 %% @spec () -> wxListCtrl()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlwxlistctrl">external documentation</a>.
@@ -141,15 +143,18 @@ new(#wx_ref{type=ParentT,ref=ParentRef}, Options)
     BinOpt = list_to_binary(lists:foldl(MOpts, [<<0:32>>], Options)),
     wxe_util:construct(?wxListCtrl_new_2, <<ParentRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxListCtrl()) -> bool()
 %% @equiv arrange(This, [])
+-spec arrange(This) -> boolean() when
+	This::wxListCtrl().
+
 arrange(This)
  when is_record(This, wx_ref) ->
   arrange(This, []).
 
-%% @spec (This::wxListCtrl(), [Option]) -> bool()
-%% Option = {flag, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlarrange">external documentation</a>.
+-spec arrange(This, [Option]) -> boolean() when
+	This::wxListCtrl(),
+	Option :: {flag, integer()}.
 arrange(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxListCtrl),
@@ -159,8 +164,9 @@ arrange(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxListCtrl_Arrange,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxListCtrl(), ImageList::wxImageList:wxImageList(), Which::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlassignimagelist">external documentation</a>.
+-spec assignImageList(This, ImageList, Which) -> ok when
+	This::wxListCtrl(), ImageList::wxImageList:wxImageList(), Which::integer().
 assignImageList(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ImageListT,ref=ImageListRef},Which)
  when is_integer(Which) ->
   ?CLASS(ThisT,wxListCtrl),
@@ -168,8 +174,9 @@ assignImageList(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ImageListT,ref=Imag
   wxe_util:cast(?wxListCtrl_AssignImageList,
   <<ThisRef:32/?UI,ImageListRef:32/?UI,Which:32/?UI>>).
 
-%% @spec (This::wxListCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlclearall">external documentation</a>.
+-spec clearAll(This) -> ok when
+	This::wxListCtrl().
 clearAll(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxListCtrl),
   wxe_util:cast(?wxListCtrl_ClearAll,
@@ -210,61 +217,64 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef}, Opti
   wxe_util:call(?wxListCtrl_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxListCtrl()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrldeleteallitems">external documentation</a>.
+-spec deleteAllItems(This) -> boolean() when
+	This::wxListCtrl().
 deleteAllItems(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxListCtrl),
   wxe_util:call(?wxListCtrl_DeleteAllItems,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxListCtrl(), Col::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrldeletecolumn">external documentation</a>.
+-spec deleteColumn(This, Col) -> boolean() when
+	This::wxListCtrl(), Col::integer().
 deleteColumn(#wx_ref{type=ThisT,ref=ThisRef},Col)
  when is_integer(Col) ->
   ?CLASS(ThisT,wxListCtrl),
   wxe_util:call(?wxListCtrl_DeleteColumn,
   <<ThisRef:32/?UI,Col:32/?UI>>).
 
-%% @spec (This::wxListCtrl(), Item::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrldeleteitem">external documentation</a>.
+-spec deleteItem(This, Item) -> boolean() when
+	This::wxListCtrl(), Item::integer().
 deleteItem(#wx_ref{type=ThisT,ref=ThisRef},Item)
  when is_integer(Item) ->
   ?CLASS(ThisT,wxListCtrl),
   wxe_util:call(?wxListCtrl_DeleteItem,
   <<ThisRef:32/?UI,Item:32/?UI>>).
 
-%% @spec (This::wxListCtrl(), Item::integer()) -> wxTextCtrl:wxTextCtrl()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrleditlabel">external documentation</a>.
+-spec editLabel(This, Item) -> wxTextCtrl:wxTextCtrl() when
+	This::wxListCtrl(), Item::integer().
 editLabel(#wx_ref{type=ThisT,ref=ThisRef},Item)
  when is_integer(Item) ->
   ?CLASS(ThisT,wxListCtrl),
   wxe_util:call(?wxListCtrl_EditLabel,
   <<ThisRef:32/?UI,Item:32/?UI>>).
 
-%% @spec (This::wxListCtrl(), Item::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlensurevisible">external documentation</a>.
+-spec ensureVisible(This, Item) -> boolean() when
+	This::wxListCtrl(), Item::integer().
 ensureVisible(#wx_ref{type=ThisT,ref=ThisRef},Item)
  when is_integer(Item) ->
   ?CLASS(ThisT,wxListCtrl),
   wxe_util:call(?wxListCtrl_EnsureVisible,
   <<ThisRef:32/?UI,Item:32/?UI>>).
 
-%% @spec (This::wxListCtrl(), Start::integer(), Str::string()) -> integer()
 %% @equiv findItem(This,Start,Str, [])
+-spec findItem(This, Start, Str) -> integer() when
+	This::wxListCtrl(), Start::integer(), Str::string().
+
 findItem(This,Start,Str)
  when is_record(This, wx_ref),is_integer(Start),is_list(Str) ->
   findItem(This,Start,Str, []).
 
-%% @spec (This::wxListCtrl(),Start::integer(),X::string()|term(),X::term()|integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlfinditem">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% findItem(This::wxListCtrl(), Start::integer(), Str::string(), [Option]) -> integer() </c>
-%%<br /> Option = {partial, bool()}
-%% </p>
-%% <p><c>
-%% findItem(This::wxListCtrl(), Start::integer(), Pt::{X::integer(), Y::integer()}, Direction::integer()) -> integer() </c>
-%% </p>
+-spec findItem(This, Start, Str, [Option]) -> integer() when
+	This::wxListCtrl(), Start::integer(), Str::string(),
+	Option :: {partial, boolean()};
+      (This, Start, Pt, Direction) -> integer() when
+	This::wxListCtrl(), Start::integer(), Pt::{X::integer(), Y::integer()}, Direction::integer().
 findItem(#wx_ref{type=ThisT,ref=ThisRef},Start,Str, Options)
  when is_integer(Start),is_list(Str),is_list(Options) ->
   ?CLASS(ThisT,wxListCtrl),
@@ -280,8 +290,9 @@ findItem(#wx_ref{type=ThisT,ref=ThisRef},Start,{PtX,PtY},Direction)
   wxe_util:call(?wxListCtrl_FindItem_3_1,
   <<ThisRef:32/?UI,Start:32/?UI,PtX:32/?UI,PtY:32/?UI,Direction:32/?UI>>).
 
-%% @spec (This::wxListCtrl(), Col::integer(), Item::wxListItem:wxListItem()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlgetcolumn">external documentation</a>.
+-spec getColumn(This, Col, Item) -> boolean() when
+	This::wxListCtrl(), Col::integer(), Item::wxListItem:wxListItem().
 getColumn(#wx_ref{type=ThisT,ref=ThisRef},Col,#wx_ref{type=ItemT,ref=ItemRef})
  when is_integer(Col) ->
   ?CLASS(ThisT,wxListCtrl),
@@ -289,99 +300,113 @@ getColumn(#wx_ref{type=ThisT,ref=ThisRef},Col,#wx_ref{type=ItemT,ref=ItemRef})
   wxe_util:call(?wxListCtrl_GetColumn,
   <<ThisRef:32/?UI,Col:32/?UI,ItemRef:32/?UI>>).
 
-%% @spec (This::wxListCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlgetcolumncount">external documentation</a>.
+-spec getColumnCount(This) -> integer() when
+	This::wxListCtrl().
 getColumnCount(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxListCtrl),
   wxe_util:call(?wxListCtrl_GetColumnCount,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxListCtrl(), Col::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlgetcolumnwidth">external documentation</a>.
+-spec getColumnWidth(This, Col) -> integer() when
+	This::wxListCtrl(), Col::integer().
 getColumnWidth(#wx_ref{type=ThisT,ref=ThisRef},Col)
  when is_integer(Col) ->
   ?CLASS(ThisT,wxListCtrl),
   wxe_util:call(?wxListCtrl_GetColumnWidth,
   <<ThisRef:32/?UI,Col:32/?UI>>).
 
-%% @spec (This::wxListCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlgetcountperpage">external documentation</a>.
+-spec getCountPerPage(This) -> integer() when
+	This::wxListCtrl().
 getCountPerPage(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxListCtrl),
   wxe_util:call(?wxListCtrl_GetCountPerPage,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxListCtrl()) -> wxTextCtrl:wxTextCtrl()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlgeteditcontrol">external documentation</a>.
+-spec getEditControl(This) -> wxTextCtrl:wxTextCtrl() when
+	This::wxListCtrl().
 getEditControl(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxListCtrl),
   wxe_util:call(?wxListCtrl_GetEditControl,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxListCtrl(), Which::integer()) -> wxImageList:wxImageList()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlgetimagelist">external documentation</a>.
+-spec getImageList(This, Which) -> wxImageList:wxImageList() when
+	This::wxListCtrl(), Which::integer().
 getImageList(#wx_ref{type=ThisT,ref=ThisRef},Which)
  when is_integer(Which) ->
   ?CLASS(ThisT,wxListCtrl),
   wxe_util:call(?wxListCtrl_GetImageList,
   <<ThisRef:32/?UI,Which:32/?UI>>).
 
-%% @spec (This::wxListCtrl(), Info::wxListItem:wxListItem()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlgetitem">external documentation</a>.
+-spec getItem(This, Info) -> boolean() when
+	This::wxListCtrl(), Info::wxListItem:wxListItem().
 getItem(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=InfoT,ref=InfoRef}) ->
   ?CLASS(ThisT,wxListCtrl),
   ?CLASS(InfoT,wxListItem),
   wxe_util:call(?wxListCtrl_GetItem,
   <<ThisRef:32/?UI,InfoRef:32/?UI>>).
 
-%% @spec (This::wxListCtrl(), Item::integer()) -> wx:colour()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlgetitembackgroundcolour">external documentation</a>.
+-spec getItemBackgroundColour(This, Item) -> wx:wx_colour() when
+	This::wxListCtrl(), Item::integer().
 getItemBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef},Item)
  when is_integer(Item) ->
   ?CLASS(ThisT,wxListCtrl),
   wxe_util:call(?wxListCtrl_GetItemBackgroundColour,
   <<ThisRef:32/?UI,Item:32/?UI>>).
 
-%% @spec (This::wxListCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlgetitemcount">external documentation</a>.
+-spec getItemCount(This) -> integer() when
+	This::wxListCtrl().
 getItemCount(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxListCtrl),
   wxe_util:call(?wxListCtrl_GetItemCount,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxListCtrl(), Item::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlgetitemdata">external documentation</a>.
+-spec getItemData(This, Item) -> integer() when
+	This::wxListCtrl(), Item::integer().
 getItemData(#wx_ref{type=ThisT,ref=ThisRef},Item)
  when is_integer(Item) ->
   ?CLASS(ThisT,wxListCtrl),
   wxe_util:call(?wxListCtrl_GetItemData,
   <<ThisRef:32/?UI,Item:32/?UI>>).
 
-%% @spec (This::wxListCtrl(), Item::integer()) -> wxFont:wxFont()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlgetitemfont">external documentation</a>.
+-spec getItemFont(This, Item) -> wxFont:wxFont() when
+	This::wxListCtrl(), Item::integer().
 getItemFont(#wx_ref{type=ThisT,ref=ThisRef},Item)
  when is_integer(Item) ->
   ?CLASS(ThisT,wxListCtrl),
   wxe_util:call(?wxListCtrl_GetItemFont,
   <<ThisRef:32/?UI,Item:32/?UI>>).
 
-%% @spec (This::wxListCtrl(), Item::integer(), Pos::{X::integer(), Y::integer()}) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlgetitemposition">external documentation</a>.
+-spec getItemPosition(This, Item, Pos) -> boolean() when
+	This::wxListCtrl(), Item::integer(), Pos::{X::integer(), Y::integer()}.
 getItemPosition(#wx_ref{type=ThisT,ref=ThisRef},Item,{PosX,PosY})
  when is_integer(Item),is_integer(PosX),is_integer(PosY) ->
   ?CLASS(ThisT,wxListCtrl),
   wxe_util:call(?wxListCtrl_GetItemPosition,
   <<ThisRef:32/?UI,Item:32/?UI,PosX:32/?UI,PosY:32/?UI>>).
 
-%% @spec (This::wxListCtrl(), Item::integer(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}) -> bool()
 %% @equiv getItemRect(This,Item,Rect, [])
+-spec getItemRect(This, Item, Rect) -> boolean() when
+	This::wxListCtrl(), Item::integer(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}.
+
 getItemRect(This,Item,Rect={RectX,RectY,RectW,RectH})
  when is_record(This, wx_ref),is_integer(Item),is_integer(RectX),is_integer(RectY),is_integer(RectW),is_integer(RectH) ->
   getItemRect(This,Item,Rect, []).
 
-%% @spec (This::wxListCtrl(), Item::integer(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}, [Option]) -> bool()
-%% Option = {code, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlgetitemrect">external documentation</a>.
+-spec getItemRect(This, Item, Rect, [Option]) -> boolean() when
+	This::wxListCtrl(), Item::integer(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()},
+	Option :: {code, integer()}.
 getItemRect(#wx_ref{type=ThisT,ref=ThisRef},Item,{RectX,RectY,RectW,RectH}, Options)
  when is_integer(Item),is_integer(RectX),is_integer(RectY),is_integer(RectW),is_integer(RectH),is_list(Options) ->
   ?CLASS(ThisT,wxListCtrl),
@@ -391,46 +416,54 @@ getItemRect(#wx_ref{type=ThisT,ref=ThisRef},Item,{RectX,RectY,RectW,RectH}, Opti
   wxe_util:call(?wxListCtrl_GetItemRect,
   <<ThisRef:32/?UI,Item:32/?UI,RectX:32/?UI,RectY:32/?UI,RectW:32/?UI,RectH:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxListCtrl()) -> {W::integer(), H::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlgetitemspacing">external documentation</a>.
+-spec getItemSpacing(This) -> {W::integer(), H::integer()} when
+	This::wxListCtrl().
 getItemSpacing(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxListCtrl),
   wxe_util:call(?wxListCtrl_GetItemSpacing,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxListCtrl(), Item::integer(), StateMask::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlgetitemstate">external documentation</a>.
+-spec getItemState(This, Item, StateMask) -> integer() when
+	This::wxListCtrl(), Item::integer(), StateMask::integer().
 getItemState(#wx_ref{type=ThisT,ref=ThisRef},Item,StateMask)
  when is_integer(Item),is_integer(StateMask) ->
   ?CLASS(ThisT,wxListCtrl),
   wxe_util:call(?wxListCtrl_GetItemState,
   <<ThisRef:32/?UI,Item:32/?UI,StateMask:32/?UI>>).
 
-%% @spec (This::wxListCtrl(), Item::integer()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlgetitemtext">external documentation</a>.
+-spec getItemText(This, Item) -> string() when
+	This::wxListCtrl(), Item::integer().
 getItemText(#wx_ref{type=ThisT,ref=ThisRef},Item)
  when is_integer(Item) ->
   ?CLASS(ThisT,wxListCtrl),
   wxe_util:call(?wxListCtrl_GetItemText,
   <<ThisRef:32/?UI,Item:32/?UI>>).
 
-%% @spec (This::wxListCtrl(), Item::integer()) -> wx:colour()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlgetitemtextcolour">external documentation</a>.
+-spec getItemTextColour(This, Item) -> wx:wx_colour() when
+	This::wxListCtrl(), Item::integer().
 getItemTextColour(#wx_ref{type=ThisT,ref=ThisRef},Item)
  when is_integer(Item) ->
   ?CLASS(ThisT,wxListCtrl),
   wxe_util:call(?wxListCtrl_GetItemTextColour,
   <<ThisRef:32/?UI,Item:32/?UI>>).
 
-%% @spec (This::wxListCtrl(), Item::integer()) -> integer()
 %% @equiv getNextItem(This,Item, [])
+-spec getNextItem(This, Item) -> integer() when
+	This::wxListCtrl(), Item::integer().
+
 getNextItem(This,Item)
  when is_record(This, wx_ref),is_integer(Item) ->
   getNextItem(This,Item, []).
 
-%% @spec (This::wxListCtrl(), Item::integer(), [Option]) -> integer()
-%% Option = {geometry, integer()} | {state, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlgetnextitem">external documentation</a>.
+-spec getNextItem(This, Item, [Option]) -> integer() when
+	This::wxListCtrl(), Item::integer(),
+	Option :: {geometry, integer()}
+		 | {state, integer()}.
 getNextItem(#wx_ref{type=ThisT,ref=ThisRef},Item, Options)
  when is_integer(Item),is_list(Options) ->
   ?CLASS(ThisT,wxListCtrl),
@@ -441,50 +474,53 @@ getNextItem(#wx_ref{type=ThisT,ref=ThisRef},Item, Options)
   wxe_util:call(?wxListCtrl_GetNextItem,
   <<ThisRef:32/?UI,Item:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxListCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlgetselecteditemcount">external documentation</a>.
+-spec getSelectedItemCount(This) -> integer() when
+	This::wxListCtrl().
 getSelectedItemCount(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxListCtrl),
   wxe_util:call(?wxListCtrl_GetSelectedItemCount,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxListCtrl()) -> wx:colour()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlgettextcolour">external documentation</a>.
+-spec getTextColour(This) -> wx:wx_colour() when
+	This::wxListCtrl().
 getTextColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxListCtrl),
   wxe_util:call(?wxListCtrl_GetTextColour,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxListCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlgettopitem">external documentation</a>.
+-spec getTopItem(This) -> integer() when
+	This::wxListCtrl().
 getTopItem(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxListCtrl),
   wxe_util:call(?wxListCtrl_GetTopItem,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxListCtrl()) -> {X::integer(), Y::integer(), W::integer(), H::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlgetviewrect">external documentation</a>.
+-spec getViewRect(This) -> {X::integer(), Y::integer(), W::integer(), H::integer()} when
+	This::wxListCtrl().
 getViewRect(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxListCtrl),
   wxe_util:call(?wxListCtrl_GetViewRect,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxListCtrl(), Point::{X::integer(), Y::integer()}) -> {integer(), Flags::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlhittest">external documentation</a>.
+-spec hitTest(This, Point) -> Result when
+	Result ::{Res ::integer(), Flags::integer()},
+	This::wxListCtrl(), Point::{X::integer(), Y::integer()}.
 hitTest(#wx_ref{type=ThisT,ref=ThisRef},{PointX,PointY})
  when is_integer(PointX),is_integer(PointY) ->
   ?CLASS(ThisT,wxListCtrl),
   wxe_util:call(?wxListCtrl_HitTest,
   <<ThisRef:32/?UI,PointX:32/?UI,PointY:32/?UI>>).
 
-%% @spec (This::wxListCtrl(),Col::integer(),X::string()|term()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlinsertcolumn">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% insertColumn(This::wxListCtrl(), Col::integer(), Heading::string()) -> insertColumn(This,Col,Heading, []) </c></p>
-%% <p><c>
-%% insertColumn(This::wxListCtrl(), Col::integer(), Info::wxListItem:wxListItem()) -> integer() </c>
-%% </p>
+-spec insertColumn(This, Col, Heading) -> integer() when
+	This::wxListCtrl(), Col::integer(), Heading::string();
+      (This, Col, Info) -> integer() when
+	This::wxListCtrl(), Col::integer(), Info::wxListItem:wxListItem().
 
 insertColumn(This,Col,Heading)
  when is_record(This, wx_ref),is_integer(Col),is_list(Heading) ->
@@ -496,9 +532,11 @@ insertColumn(#wx_ref{type=ThisT,ref=ThisRef},Col,#wx_ref{type=InfoT,ref=InfoRef}
   wxe_util:call(?wxListCtrl_InsertColumn_2,
   <<ThisRef:32/?UI,Col:32/?UI,InfoRef:32/?UI>>).
 
-%% @spec (This::wxListCtrl(), Col::integer(), Heading::string(), [Option]) -> integer()
-%% Option = {format, integer()} | {width, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlinsertcolumn">external documentation</a>.
+-spec insertColumn(This, Col, Heading, [Option]) -> integer() when
+	This::wxListCtrl(), Col::integer(), Heading::string(),
+	Option :: {format, integer()}
+		 | {width, integer()}.
 insertColumn(#wx_ref{type=ThisT,ref=ThisRef},Col,Heading, Options)
  when is_integer(Col),is_list(Heading),is_list(Options) ->
   ?CLASS(ThisT,wxListCtrl),
@@ -510,23 +548,20 @@ insertColumn(#wx_ref{type=ThisT,ref=ThisRef},Col,Heading, Options)
   wxe_util:call(?wxListCtrl_InsertColumn_3,
   <<ThisRef:32/?UI,Col:32/?UI,(byte_size(Heading_UC)):32/?UI,(Heading_UC)/binary, 0:(((8- ((4+byte_size(Heading_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxListCtrl(), Info::wxListItem:wxListItem()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlinsertitem">external documentation</a>.
+-spec insertItem(This, Info) -> integer() when
+	This::wxListCtrl(), Info::wxListItem:wxListItem().
 insertItem(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=InfoT,ref=InfoRef}) ->
   ?CLASS(ThisT,wxListCtrl),
   ?CLASS(InfoT,wxListItem),
   wxe_util:call(?wxListCtrl_InsertItem_1,
   <<ThisRef:32/?UI,InfoRef:32/?UI>>).
 
-%% @spec (This::wxListCtrl(),Index::integer(),X::integer()|string()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlinsertitem">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% insertItem(This::wxListCtrl(), Index::integer(), ImageIndex::integer()) -> integer() </c>
-%% </p>
-%% <p><c>
-%% insertItem(This::wxListCtrl(), Index::integer(), Label::string()) -> integer() </c>
-%% </p>
+-spec insertItem(This, Index, ImageIndex) -> integer() when
+	This::wxListCtrl(), Index::integer(), ImageIndex::integer();
+      (This, Index, Label) -> integer() when
+	This::wxListCtrl(), Index::integer(), Label::string().
 insertItem(#wx_ref{type=ThisT,ref=ThisRef},Index,ImageIndex)
  when is_integer(Index),is_integer(ImageIndex) ->
   ?CLASS(ThisT,wxListCtrl),
@@ -539,8 +574,9 @@ insertItem(#wx_ref{type=ThisT,ref=ThisRef},Index,Label)
   wxe_util:call(?wxListCtrl_InsertItem_2_1,
   <<ThisRef:32/?UI,Index:32/?UI,(byte_size(Label_UC)):32/?UI,(Label_UC)/binary, 0:(((8- ((4+byte_size(Label_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxListCtrl(), Index::integer(), Label::string(), ImageIndex::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlinsertitem">external documentation</a>.
+-spec insertItem(This, Index, Label, ImageIndex) -> integer() when
+	This::wxListCtrl(), Index::integer(), Label::string(), ImageIndex::integer().
 insertItem(#wx_ref{type=ThisT,ref=ThisRef},Index,Label,ImageIndex)
  when is_integer(Index),is_list(Label),is_integer(ImageIndex) ->
   ?CLASS(ThisT,wxListCtrl),
@@ -548,40 +584,45 @@ insertItem(#wx_ref{type=ThisT,ref=ThisRef},Index,Label,ImageIndex)
   wxe_util:call(?wxListCtrl_InsertItem_3,
   <<ThisRef:32/?UI,Index:32/?UI,(byte_size(Label_UC)):32/?UI,(Label_UC)/binary, 0:(((8- ((4+byte_size(Label_UC)) band 16#7)) band 16#7))/unit:8,ImageIndex:32/?UI>>).
 
-%% @spec (This::wxListCtrl(), Item::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlrefreshitem">external documentation</a>.
+-spec refreshItem(This, Item) -> ok when
+	This::wxListCtrl(), Item::integer().
 refreshItem(#wx_ref{type=ThisT,ref=ThisRef},Item)
  when is_integer(Item) ->
   ?CLASS(ThisT,wxListCtrl),
   wxe_util:cast(?wxListCtrl_RefreshItem,
   <<ThisRef:32/?UI,Item:32/?UI>>).
 
-%% @spec (This::wxListCtrl(), ItemFrom::integer(), ItemTo::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlrefreshitems">external documentation</a>.
+-spec refreshItems(This, ItemFrom, ItemTo) -> ok when
+	This::wxListCtrl(), ItemFrom::integer(), ItemTo::integer().
 refreshItems(#wx_ref{type=ThisT,ref=ThisRef},ItemFrom,ItemTo)
  when is_integer(ItemFrom),is_integer(ItemTo) ->
   ?CLASS(ThisT,wxListCtrl),
   wxe_util:cast(?wxListCtrl_RefreshItems,
   <<ThisRef:32/?UI,ItemFrom:32/?UI,ItemTo:32/?UI>>).
 
-%% @spec (This::wxListCtrl(), Dx::integer(), Dy::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlscrolllist">external documentation</a>.
+-spec scrollList(This, Dx, Dy) -> boolean() when
+	This::wxListCtrl(), Dx::integer(), Dy::integer().
 scrollList(#wx_ref{type=ThisT,ref=ThisRef},Dx,Dy)
  when is_integer(Dx),is_integer(Dy) ->
   ?CLASS(ThisT,wxListCtrl),
   wxe_util:call(?wxListCtrl_ScrollList,
   <<ThisRef:32/?UI,Dx:32/?UI,Dy:32/?UI>>).
 
-%% @spec (This::wxListCtrl(), Colour::wx:colour()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlsetbackgroundcolour">external documentation</a>.
+-spec setBackgroundColour(This, Colour) -> boolean() when
+	This::wxListCtrl(), Colour::wx:wx_colour().
 setBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef},Colour)
  when tuple_size(Colour) =:= 3; tuple_size(Colour) =:= 4 ->
   ?CLASS(ThisT,wxListCtrl),
   wxe_util:call(?wxListCtrl_SetBackgroundColour,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(Colour)):16/binary>>).
 
-%% @spec (This::wxListCtrl(), Col::integer(), Item::wxListItem:wxListItem()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlsetcolumn">external documentation</a>.
+-spec setColumn(This, Col, Item) -> boolean() when
+	This::wxListCtrl(), Col::integer(), Item::wxListItem:wxListItem().
 setColumn(#wx_ref{type=ThisT,ref=ThisRef},Col,#wx_ref{type=ItemT,ref=ItemRef})
  when is_integer(Col) ->
   ?CLASS(ThisT,wxListCtrl),
@@ -589,16 +630,18 @@ setColumn(#wx_ref{type=ThisT,ref=ThisRef},Col,#wx_ref{type=ItemT,ref=ItemRef})
   wxe_util:call(?wxListCtrl_SetColumn,
   <<ThisRef:32/?UI,Col:32/?UI,ItemRef:32/?UI>>).
 
-%% @spec (This::wxListCtrl(), Col::integer(), Width::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlsetcolumnwidth">external documentation</a>.
+-spec setColumnWidth(This, Col, Width) -> boolean() when
+	This::wxListCtrl(), Col::integer(), Width::integer().
 setColumnWidth(#wx_ref{type=ThisT,ref=ThisRef},Col,Width)
  when is_integer(Col),is_integer(Width) ->
   ?CLASS(ThisT,wxListCtrl),
   wxe_util:call(?wxListCtrl_SetColumnWidth,
   <<ThisRef:32/?UI,Col:32/?UI,Width:32/?UI>>).
 
-%% @spec (This::wxListCtrl(), ImageList::wxImageList:wxImageList(), Which::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlsetimagelist">external documentation</a>.
+-spec setImageList(This, ImageList, Which) -> ok when
+	This::wxListCtrl(), ImageList::wxImageList:wxImageList(), Which::integer().
 setImageList(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ImageListT,ref=ImageListRef},Which)
  when is_integer(Which) ->
   ?CLASS(ThisT,wxListCtrl),
@@ -606,23 +649,27 @@ setImageList(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ImageListT,ref=ImageLi
   wxe_util:cast(?wxListCtrl_SetImageList,
   <<ThisRef:32/?UI,ImageListRef:32/?UI,Which:32/?UI>>).
 
-%% @spec (This::wxListCtrl(), Info::wxListItem:wxListItem()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlsetitem">external documentation</a>.
+-spec setItem(This, Info) -> boolean() when
+	This::wxListCtrl(), Info::wxListItem:wxListItem().
 setItem(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=InfoT,ref=InfoRef}) ->
   ?CLASS(ThisT,wxListCtrl),
   ?CLASS(InfoT,wxListItem),
   wxe_util:call(?wxListCtrl_SetItem_1,
   <<ThisRef:32/?UI,InfoRef:32/?UI>>).
 
-%% @spec (This::wxListCtrl(), Index::integer(), Col::integer(), Label::string()) -> integer()
 %% @equiv setItem(This,Index,Col,Label, [])
+-spec setItem(This, Index, Col, Label) -> integer() when
+	This::wxListCtrl(), Index::integer(), Col::integer(), Label::string().
+
 setItem(This,Index,Col,Label)
  when is_record(This, wx_ref),is_integer(Index),is_integer(Col),is_list(Label) ->
   setItem(This,Index,Col,Label, []).
 
-%% @spec (This::wxListCtrl(), Index::integer(), Col::integer(), Label::string(), [Option]) -> integer()
-%% Option = {imageId, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlsetitem">external documentation</a>.
+-spec setItem(This, Index, Col, Label, [Option]) -> integer() when
+	This::wxListCtrl(), Index::integer(), Col::integer(), Label::string(),
+	Option :: {imageId, integer()}.
 setItem(#wx_ref{type=ThisT,ref=ThisRef},Index,Col,Label, Options)
  when is_integer(Index),is_integer(Col),is_list(Label),is_list(Options) ->
   ?CLASS(ThisT,wxListCtrl),
@@ -633,32 +680,36 @@ setItem(#wx_ref{type=ThisT,ref=ThisRef},Index,Col,Label, Options)
   wxe_util:call(?wxListCtrl_SetItem_4,
   <<ThisRef:32/?UI,Index:32/?UI,Col:32/?UI,(byte_size(Label_UC)):32/?UI,(Label_UC)/binary, 0:(((8- ((0+byte_size(Label_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxListCtrl(), Item::integer(), Col::wx:colour()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlsetitembackgroundcolour">external documentation</a>.
+-spec setItemBackgroundColour(This, Item, Col) -> ok when
+	This::wxListCtrl(), Item::integer(), Col::wx:wx_colour().
 setItemBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef},Item,Col)
  when is_integer(Item),tuple_size(Col) =:= 3; tuple_size(Col) =:= 4 ->
   ?CLASS(ThisT,wxListCtrl),
   wxe_util:cast(?wxListCtrl_SetItemBackgroundColour,
   <<ThisRef:32/?UI,Item:32/?UI,(wxe_util:colour_bin(Col)):16/binary>>).
 
-%% @spec (This::wxListCtrl(), Count::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlsetitemcount">external documentation</a>.
+-spec setItemCount(This, Count) -> ok when
+	This::wxListCtrl(), Count::integer().
 setItemCount(#wx_ref{type=ThisT,ref=ThisRef},Count)
  when is_integer(Count) ->
   ?CLASS(ThisT,wxListCtrl),
   wxe_util:cast(?wxListCtrl_SetItemCount,
   <<ThisRef:32/?UI,Count:32/?UI>>).
 
-%% @spec (This::wxListCtrl(), Item::integer(), Data::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlsetitemdata">external documentation</a>.
+-spec setItemData(This, Item, Data) -> boolean() when
+	This::wxListCtrl(), Item::integer(), Data::integer().
 setItemData(#wx_ref{type=ThisT,ref=ThisRef},Item,Data)
  when is_integer(Item),is_integer(Data) ->
   ?CLASS(ThisT,wxListCtrl),
   wxe_util:call(?wxListCtrl_SetItemData,
   <<ThisRef:32/?UI,Item:32/?UI,Data:32/?UI>>).
 
-%% @spec (This::wxListCtrl(), Item::integer(), F::wxFont:wxFont()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlsetitemfont">external documentation</a>.
+-spec setItemFont(This, Item, F) -> ok when
+	This::wxListCtrl(), Item::integer(), F::wxFont:wxFont().
 setItemFont(#wx_ref{type=ThisT,ref=ThisRef},Item,#wx_ref{type=FT,ref=FRef})
  when is_integer(Item) ->
   ?CLASS(ThisT,wxListCtrl),
@@ -666,15 +717,18 @@ setItemFont(#wx_ref{type=ThisT,ref=ThisRef},Item,#wx_ref{type=FT,ref=FRef})
   wxe_util:cast(?wxListCtrl_SetItemFont,
   <<ThisRef:32/?UI,Item:32/?UI,FRef:32/?UI>>).
 
-%% @spec (This::wxListCtrl(), Item::integer(), Image::integer()) -> bool()
 %% @equiv setItemImage(This,Item,Image, [])
+-spec setItemImage(This, Item, Image) -> boolean() when
+	This::wxListCtrl(), Item::integer(), Image::integer().
+
 setItemImage(This,Item,Image)
  when is_record(This, wx_ref),is_integer(Item),is_integer(Image) ->
   setItemImage(This,Item,Image, []).
 
-%% @spec (This::wxListCtrl(), Item::integer(), Image::integer(), [Option]) -> bool()
-%% Option = {selImage, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlsetitemimage">external documentation</a>.
+-spec setItemImage(This, Item, Image, [Option]) -> boolean() when
+	This::wxListCtrl(), Item::integer(), Image::integer(),
+	Option :: {selImage, integer()}.
 setItemImage(#wx_ref{type=ThisT,ref=ThisRef},Item,Image, Options)
  when is_integer(Item),is_integer(Image),is_list(Options) ->
   ?CLASS(ThisT,wxListCtrl),
@@ -684,32 +738,36 @@ setItemImage(#wx_ref{type=ThisT,ref=ThisRef},Item,Image, Options)
   wxe_util:call(?wxListCtrl_SetItemImage,
   <<ThisRef:32/?UI,Item:32/?UI,Image:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxListCtrl(), Item::integer(), Column::integer(), Image::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlsetitemcolumnimage">external documentation</a>.
+-spec setItemColumnImage(This, Item, Column, Image) -> boolean() when
+	This::wxListCtrl(), Item::integer(), Column::integer(), Image::integer().
 setItemColumnImage(#wx_ref{type=ThisT,ref=ThisRef},Item,Column,Image)
  when is_integer(Item),is_integer(Column),is_integer(Image) ->
   ?CLASS(ThisT,wxListCtrl),
   wxe_util:call(?wxListCtrl_SetItemColumnImage,
   <<ThisRef:32/?UI,Item:32/?UI,Column:32/?UI,Image:32/?UI>>).
 
-%% @spec (This::wxListCtrl(), Item::integer(), Pos::{X::integer(), Y::integer()}) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlsetitemposition">external documentation</a>.
+-spec setItemPosition(This, Item, Pos) -> boolean() when
+	This::wxListCtrl(), Item::integer(), Pos::{X::integer(), Y::integer()}.
 setItemPosition(#wx_ref{type=ThisT,ref=ThisRef},Item,{PosX,PosY})
  when is_integer(Item),is_integer(PosX),is_integer(PosY) ->
   ?CLASS(ThisT,wxListCtrl),
   wxe_util:call(?wxListCtrl_SetItemPosition,
   <<ThisRef:32/?UI,Item:32/?UI,PosX:32/?UI,PosY:32/?UI>>).
 
-%% @spec (This::wxListCtrl(), Item::integer(), State::integer(), StateMask::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlsetitemstate">external documentation</a>.
+-spec setItemState(This, Item, State, StateMask) -> boolean() when
+	This::wxListCtrl(), Item::integer(), State::integer(), StateMask::integer().
 setItemState(#wx_ref{type=ThisT,ref=ThisRef},Item,State,StateMask)
  when is_integer(Item),is_integer(State),is_integer(StateMask) ->
   ?CLASS(ThisT,wxListCtrl),
   wxe_util:call(?wxListCtrl_SetItemState,
   <<ThisRef:32/?UI,Item:32/?UI,State:32/?UI,StateMask:32/?UI>>).
 
-%% @spec (This::wxListCtrl(), Item::integer(), Str::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlsetitemtext">external documentation</a>.
+-spec setItemText(This, Item, Str) -> ok when
+	This::wxListCtrl(), Item::integer(), Str::string().
 setItemText(#wx_ref{type=ThisT,ref=ThisRef},Item,Str)
  when is_integer(Item),is_list(Str) ->
   ?CLASS(ThisT,wxListCtrl),
@@ -717,23 +775,27 @@ setItemText(#wx_ref{type=ThisT,ref=ThisRef},Item,Str)
   wxe_util:cast(?wxListCtrl_SetItemText,
   <<ThisRef:32/?UI,Item:32/?UI,(byte_size(Str_UC)):32/?UI,(Str_UC)/binary, 0:(((8- ((4+byte_size(Str_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxListCtrl(), Item::integer(), Col::wx:colour()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlsetitemtextcolour">external documentation</a>.
+-spec setItemTextColour(This, Item, Col) -> ok when
+	This::wxListCtrl(), Item::integer(), Col::wx:wx_colour().
 setItemTextColour(#wx_ref{type=ThisT,ref=ThisRef},Item,Col)
  when is_integer(Item),tuple_size(Col) =:= 3; tuple_size(Col) =:= 4 ->
   ?CLASS(ThisT,wxListCtrl),
   wxe_util:cast(?wxListCtrl_SetItemTextColour,
   <<ThisRef:32/?UI,Item:32/?UI,(wxe_util:colour_bin(Col)):16/binary>>).
 
-%% @spec (This::wxListCtrl(), Style::integer()) -> ok
 %% @equiv setSingleStyle(This,Style, [])
+-spec setSingleStyle(This, Style) -> ok when
+	This::wxListCtrl(), Style::integer().
+
 setSingleStyle(This,Style)
  when is_record(This, wx_ref),is_integer(Style) ->
   setSingleStyle(This,Style, []).
 
-%% @spec (This::wxListCtrl(), Style::integer(), [Option]) -> ok
-%% Option = {add, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlsetsinglestyle">external documentation</a>.
+-spec setSingleStyle(This, Style, [Option]) -> ok when
+	This::wxListCtrl(), Style::integer(),
+	Option :: {add, boolean()}.
 setSingleStyle(#wx_ref{type=ThisT,ref=ThisRef},Style, Options)
  when is_integer(Style),is_list(Options) ->
   ?CLASS(ThisT,wxListCtrl),
@@ -743,16 +805,18 @@ setSingleStyle(#wx_ref{type=ThisT,ref=ThisRef},Style, Options)
   wxe_util:cast(?wxListCtrl_SetSingleStyle,
   <<ThisRef:32/?UI,Style:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxListCtrl(), Col::wx:colour()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlsettextcolour">external documentation</a>.
+-spec setTextColour(This, Col) -> ok when
+	This::wxListCtrl(), Col::wx:wx_colour().
 setTextColour(#wx_ref{type=ThisT,ref=ThisRef},Col)
  when tuple_size(Col) =:= 3; tuple_size(Col) =:= 4 ->
   ?CLASS(ThisT,wxListCtrl),
   wxe_util:cast(?wxListCtrl_SetTextColour,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(Col)):16/binary>>).
 
-%% @spec (This::wxListCtrl(), Style::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlsetwindowstyleflag">external documentation</a>.
+-spec setWindowStyleFlag(This, Style) -> ok when
+	This::wxListCtrl(), Style::integer().
 setWindowStyleFlag(#wx_ref{type=ThisT,ref=ThisRef},Style)
  when is_integer(Style) ->
   ?CLASS(ThisT,wxListCtrl),
@@ -777,8 +841,8 @@ sortItems(#wx_ref{type=ThisT,ref=ThisRef}, SortCallBack)
 		end,
 	SortId = wxe_util:get_cbId(Sort),
 	wxe_util:call(?wxListCtrl_SortItems, <<ThisRef:32/?UI,SortId:32/?UI>>).
-%% @spec (This::wxListCtrl()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxListCtrl) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxListCtrl),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxListEvent.erl b/lib/wx/src/gen/wxListEvent.erl
index f7d8658acc..f09dee4e32 100644
--- a/lib/wx/src/gen/wxListEvent.erl
+++ b/lib/wx/src/gen/wxListEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -42,98 +42,113 @@
   isSelection/1,parent_class/1,resumePropagation/2,setInt/2,setString/2,
   shouldPropagate/1,skip/1,skip/2,stopPropagation/1,veto/1]).
 
+-export_type([wxListEvent/0]).
 %% @hidden
 parent_class(wxNotifyEvent) -> true;
 parent_class(wxCommandEvent) -> true;
 parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (This::wxListEvent()) -> integer()
+-type wxListEvent() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistevent.html#wxlisteventgetcachefrom">external documentation</a>.
+-spec getCacheFrom(This) -> integer() when
+	This::wxListEvent().
 getCacheFrom(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxListEvent),
   wxe_util:call(?wxListEvent_GetCacheFrom,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxListEvent()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistevent.html#wxlisteventgetcacheto">external documentation</a>.
+-spec getCacheTo(This) -> integer() when
+	This::wxListEvent().
 getCacheTo(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxListEvent),
   wxe_util:call(?wxListEvent_GetCacheTo,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxListEvent()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistevent.html#wxlisteventgetkeycode">external documentation</a>.
+-spec getKeyCode(This) -> integer() when
+	This::wxListEvent().
 getKeyCode(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxListEvent),
   wxe_util:call(?wxListEvent_GetKeyCode,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxListEvent()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistevent.html#wxlisteventgetindex">external documentation</a>.
+-spec getIndex(This) -> integer() when
+	This::wxListEvent().
 getIndex(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxListEvent),
   wxe_util:call(?wxListEvent_GetIndex,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxListEvent()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistevent.html#wxlisteventgetcolumn">external documentation</a>.
+-spec getColumn(This) -> integer() when
+	This::wxListEvent().
 getColumn(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxListEvent),
   wxe_util:call(?wxListEvent_GetColumn,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxListEvent()) -> {X::integer(), Y::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistevent.html#wxlisteventgetpoint">external documentation</a>.
+-spec getPoint(This) -> {X::integer(), Y::integer()} when
+	This::wxListEvent().
 getPoint(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxListEvent),
   wxe_util:call(?wxListEvent_GetPoint,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxListEvent()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistevent.html#wxlisteventgetlabel">external documentation</a>.
+-spec getLabel(This) -> string() when
+	This::wxListEvent().
 getLabel(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxListEvent),
   wxe_util:call(?wxListEvent_GetLabel,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxListEvent()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistevent.html#wxlisteventgettext">external documentation</a>.
+-spec getText(This) -> string() when
+	This::wxListEvent().
 getText(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxListEvent),
   wxe_util:call(?wxListEvent_GetText,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxListEvent()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistevent.html#wxlisteventgetimage">external documentation</a>.
+-spec getImage(This) -> integer() when
+	This::wxListEvent().
 getImage(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxListEvent),
   wxe_util:call(?wxListEvent_GetImage,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxListEvent()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistevent.html#wxlisteventgetdata">external documentation</a>.
+-spec getData(This) -> integer() when
+	This::wxListEvent().
 getData(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxListEvent),
   wxe_util:call(?wxListEvent_GetData,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxListEvent()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistevent.html#wxlisteventgetmask">external documentation</a>.
+-spec getMask(This) -> integer() when
+	This::wxListEvent().
 getMask(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxListEvent),
   wxe_util:call(?wxListEvent_GetMask,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxListEvent()) -> wxListItem:wxListItem()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistevent.html#wxlisteventgetitem">external documentation</a>.
+-spec getItem(This) -> wxListItem:wxListItem() when
+	This::wxListEvent().
 getItem(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxListEvent),
   wxe_util:call(?wxListEvent_GetItem,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxListEvent()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistevent.html#wxlisteventiseditcancelled">external documentation</a>.
+-spec isEditCancelled(This) -> boolean() when
+	This::wxListEvent().
 isEditCancelled(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxListEvent),
   wxe_util:call(?wxListEvent_IsEditCancelled,
diff --git a/lib/wx/src/gen/wxListItem.erl b/lib/wx/src/gen/wxListItem.erl
index 326f674b28..f5662f8942 100644
--- a/lib/wx/src/gen/wxListItem.erl
+++ b/lib/wx/src/gen/wxListItem.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -33,184 +33,207 @@
 %% inherited exports
 -export([parent_class/1]).
 
+-export_type([wxListItem/0]).
 %% @hidden
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxListItem()
+-type wxListItem() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitem.html#wxlistitemwxlistitem">external documentation</a>.
+-spec new() -> wxListItem().
 new() ->
   wxe_util:construct(?wxListItem_new_0,
   <<>>).
 
-%% @spec (Item::wxListItem()) -> wxListItem()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitem.html#wxlistitemwxlistitem">external documentation</a>.
+-spec new(Item) -> wxListItem() when
+	Item::wxListItem().
 new(#wx_ref{type=ItemT,ref=ItemRef}) ->
   ?CLASS(ItemT,wxListItem),
   wxe_util:construct(?wxListItem_new_1,
   <<ItemRef:32/?UI>>).
 
-%% @spec (This::wxListItem()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitem.html#wxlistitemclear">external documentation</a>.
+-spec clear(This) -> ok when
+	This::wxListItem().
 clear(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxListItem),
   wxe_util:cast(?wxListItem_Clear,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxListItem()) -> WxListColumnFormat
-%% WxListColumnFormat = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitem.html#wxlistitemgetalign">external documentation</a>.
-%%<br /> WxListColumnFormat is one of ?wxLIST_FORMAT_LEFT | ?wxLIST_FORMAT_RIGHT | ?wxLIST_FORMAT_CENTRE | ?wxLIST_FORMAT_CENTER
+%%<br /> Res = ?wxLIST_FORMAT_LEFT | ?wxLIST_FORMAT_RIGHT | ?wxLIST_FORMAT_CENTRE | ?wxLIST_FORMAT_CENTER
+-spec getAlign(This) -> wx:wx_enum() when
+	This::wxListItem().
 getAlign(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxListItem),
   wxe_util:call(?wxListItem_GetAlign,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxListItem()) -> wx:colour()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitem.html#wxlistitemgetbackgroundcolour">external documentation</a>.
+-spec getBackgroundColour(This) -> wx:wx_colour() when
+	This::wxListItem().
 getBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxListItem),
   wxe_util:call(?wxListItem_GetBackgroundColour,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxListItem()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitem.html#wxlistitemgetcolumn">external documentation</a>.
+-spec getColumn(This) -> integer() when
+	This::wxListItem().
 getColumn(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxListItem),
   wxe_util:call(?wxListItem_GetColumn,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxListItem()) -> wxFont:wxFont()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitem.html#wxlistitemgetfont">external documentation</a>.
+-spec getFont(This) -> wxFont:wxFont() when
+	This::wxListItem().
 getFont(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxListItem),
   wxe_util:call(?wxListItem_GetFont,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxListItem()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitem.html#wxlistitemgetid">external documentation</a>.
+-spec getId(This) -> integer() when
+	This::wxListItem().
 getId(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxListItem),
   wxe_util:call(?wxListItem_GetId,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxListItem()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitem.html#wxlistitemgetimage">external documentation</a>.
+-spec getImage(This) -> integer() when
+	This::wxListItem().
 getImage(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxListItem),
   wxe_util:call(?wxListItem_GetImage,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxListItem()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitem.html#wxlistitemgetmask">external documentation</a>.
+-spec getMask(This) -> integer() when
+	This::wxListItem().
 getMask(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxListItem),
   wxe_util:call(?wxListItem_GetMask,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxListItem()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitem.html#wxlistitemgetstate">external documentation</a>.
+-spec getState(This) -> integer() when
+	This::wxListItem().
 getState(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxListItem),
   wxe_util:call(?wxListItem_GetState,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxListItem()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitem.html#wxlistitemgettext">external documentation</a>.
+-spec getText(This) -> string() when
+	This::wxListItem().
 getText(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxListItem),
   wxe_util:call(?wxListItem_GetText,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxListItem()) -> wx:colour()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitem.html#wxlistitemgettextcolour">external documentation</a>.
+-spec getTextColour(This) -> wx:wx_colour() when
+	This::wxListItem().
 getTextColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxListItem),
   wxe_util:call(?wxListItem_GetTextColour,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxListItem()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitem.html#wxlistitemgetwidth">external documentation</a>.
+-spec getWidth(This) -> integer() when
+	This::wxListItem().
 getWidth(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxListItem),
   wxe_util:call(?wxListItem_GetWidth,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxListItem(), Align::WxListColumnFormat) -> ok
-%% WxListColumnFormat = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitem.html#wxlistitemsetalign">external documentation</a>.
-%%<br /> WxListColumnFormat is one of ?wxLIST_FORMAT_LEFT | ?wxLIST_FORMAT_RIGHT | ?wxLIST_FORMAT_CENTRE | ?wxLIST_FORMAT_CENTER
+%%<br /> Align = ?wxLIST_FORMAT_LEFT | ?wxLIST_FORMAT_RIGHT | ?wxLIST_FORMAT_CENTRE | ?wxLIST_FORMAT_CENTER
+-spec setAlign(This, Align) -> ok when
+	This::wxListItem(), Align::wx:wx_enum().
 setAlign(#wx_ref{type=ThisT,ref=ThisRef},Align)
  when is_integer(Align) ->
   ?CLASS(ThisT,wxListItem),
   wxe_util:cast(?wxListItem_SetAlign,
   <<ThisRef:32/?UI,Align:32/?UI>>).
 
-%% @spec (This::wxListItem(), ColBack::wx:colour()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitem.html#wxlistitemsetbackgroundcolour">external documentation</a>.
+-spec setBackgroundColour(This, ColBack) -> ok when
+	This::wxListItem(), ColBack::wx:wx_colour().
 setBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef},ColBack)
  when tuple_size(ColBack) =:= 3; tuple_size(ColBack) =:= 4 ->
   ?CLASS(ThisT,wxListItem),
   wxe_util:cast(?wxListItem_SetBackgroundColour,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(ColBack)):16/binary>>).
 
-%% @spec (This::wxListItem(), Col::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitem.html#wxlistitemsetcolumn">external documentation</a>.
+-spec setColumn(This, Col) -> ok when
+	This::wxListItem(), Col::integer().
 setColumn(#wx_ref{type=ThisT,ref=ThisRef},Col)
  when is_integer(Col) ->
   ?CLASS(ThisT,wxListItem),
   wxe_util:cast(?wxListItem_SetColumn,
   <<ThisRef:32/?UI,Col:32/?UI>>).
 
-%% @spec (This::wxListItem(), Font::wxFont:wxFont()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitem.html#wxlistitemsetfont">external documentation</a>.
+-spec setFont(This, Font) -> ok when
+	This::wxListItem(), Font::wxFont:wxFont().
 setFont(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FontT,ref=FontRef}) ->
   ?CLASS(ThisT,wxListItem),
   ?CLASS(FontT,wxFont),
   wxe_util:cast(?wxListItem_SetFont,
   <<ThisRef:32/?UI,FontRef:32/?UI>>).
 
-%% @spec (This::wxListItem(), Id::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitem.html#wxlistitemsetid">external documentation</a>.
+-spec setId(This, Id) -> ok when
+	This::wxListItem(), Id::integer().
 setId(#wx_ref{type=ThisT,ref=ThisRef},Id)
  when is_integer(Id) ->
   ?CLASS(ThisT,wxListItem),
   wxe_util:cast(?wxListItem_SetId,
   <<ThisRef:32/?UI,Id:32/?UI>>).
 
-%% @spec (This::wxListItem(), Image::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitem.html#wxlistitemsetimage">external documentation</a>.
+-spec setImage(This, Image) -> ok when
+	This::wxListItem(), Image::integer().
 setImage(#wx_ref{type=ThisT,ref=ThisRef},Image)
  when is_integer(Image) ->
   ?CLASS(ThisT,wxListItem),
   wxe_util:cast(?wxListItem_SetImage,
   <<ThisRef:32/?UI,Image:32/?UI>>).
 
-%% @spec (This::wxListItem(), Mask::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitem.html#wxlistitemsetmask">external documentation</a>.
+-spec setMask(This, Mask) -> ok when
+	This::wxListItem(), Mask::integer().
 setMask(#wx_ref{type=ThisT,ref=ThisRef},Mask)
  when is_integer(Mask) ->
   ?CLASS(ThisT,wxListItem),
   wxe_util:cast(?wxListItem_SetMask,
   <<ThisRef:32/?UI,Mask:32/?UI>>).
 
-%% @spec (This::wxListItem(), State::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitem.html#wxlistitemsetstate">external documentation</a>.
+-spec setState(This, State) -> ok when
+	This::wxListItem(), State::integer().
 setState(#wx_ref{type=ThisT,ref=ThisRef},State)
  when is_integer(State) ->
   ?CLASS(ThisT,wxListItem),
   wxe_util:cast(?wxListItem_SetState,
   <<ThisRef:32/?UI,State:32/?UI>>).
 
-%% @spec (This::wxListItem(), StateMask::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitem.html#wxlistitemsetstatemask">external documentation</a>.
+-spec setStateMask(This, StateMask) -> ok when
+	This::wxListItem(), StateMask::integer().
 setStateMask(#wx_ref{type=ThisT,ref=ThisRef},StateMask)
  when is_integer(StateMask) ->
   ?CLASS(ThisT,wxListItem),
   wxe_util:cast(?wxListItem_SetStateMask,
   <<ThisRef:32/?UI,StateMask:32/?UI>>).
 
-%% @spec (This::wxListItem(), Text::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitem.html#wxlistitemsettext">external documentation</a>.
+-spec setText(This, Text) -> ok when
+	This::wxListItem(), Text::string().
 setText(#wx_ref{type=ThisT,ref=ThisRef},Text)
  when is_list(Text) ->
   ?CLASS(ThisT,wxListItem),
@@ -218,24 +241,26 @@ setText(#wx_ref{type=ThisT,ref=ThisRef},Text)
   wxe_util:cast(?wxListItem_SetText,
   <<ThisRef:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxListItem(), ColText::wx:colour()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitem.html#wxlistitemsettextcolour">external documentation</a>.
+-spec setTextColour(This, ColText) -> ok when
+	This::wxListItem(), ColText::wx:wx_colour().
 setTextColour(#wx_ref{type=ThisT,ref=ThisRef},ColText)
  when tuple_size(ColText) =:= 3; tuple_size(ColText) =:= 4 ->
   ?CLASS(ThisT,wxListItem),
   wxe_util:cast(?wxListItem_SetTextColour,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(ColText)):16/binary>>).
 
-%% @spec (This::wxListItem(), Width::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitem.html#wxlistitemsetwidth">external documentation</a>.
+-spec setWidth(This, Width) -> ok when
+	This::wxListItem(), Width::integer().
 setWidth(#wx_ref{type=ThisT,ref=ThisRef},Width)
  when is_integer(Width) ->
   ?CLASS(ThisT,wxListItem),
   wxe_util:cast(?wxListItem_SetWidth,
   <<ThisRef:32/?UI,Width:32/?UI>>).
 
-%% @spec (This::wxListItem()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxListItem) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxListItem),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxListItemAttr.erl b/lib/wx/src/gen/wxListItemAttr.erl
index 1a43c71854..4616e551ec 100644
--- a/lib/wx/src/gen/wxListItemAttr.erl
+++ b/lib/wx/src/gen/wxListItemAttr.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -31,91 +31,103 @@
 %% inherited exports
 -export([parent_class/1]).
 
+-export_type([wxListItemAttr/0]).
 %% @hidden
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxListItemAttr()
+-type wxListItemAttr() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitemattr.html#wxlistitemattrwxlistitemattr">external documentation</a>.
+-spec new() -> wxListItemAttr().
 new() ->
   wxe_util:construct(?wxListItemAttr_new_0,
   <<>>).
 
-%% @spec (ColText::wx:colour(), ColBack::wx:colour(), Font::wxFont:wxFont()) -> wxListItemAttr()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitemattr.html#wxlistitemattrwxlistitemattr">external documentation</a>.
+-spec new(ColText, ColBack, Font) -> wxListItemAttr() when
+	ColText::wx:wx_colour(), ColBack::wx:wx_colour(), Font::wxFont:wxFont().
 new(ColText,ColBack,#wx_ref{type=FontT,ref=FontRef})
  when tuple_size(ColText) =:= 3; tuple_size(ColText) =:= 4,tuple_size(ColBack) =:= 3; tuple_size(ColBack) =:= 4 ->
   ?CLASS(FontT,wxFont),
   wxe_util:construct(?wxListItemAttr_new_3,
   <<(wxe_util:colour_bin(ColText)):16/binary,(wxe_util:colour_bin(ColBack)):16/binary,FontRef:32/?UI>>).
 
-%% @spec (This::wxListItemAttr()) -> wx:colour()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitemattr.html#wxlistitemattrgetbackgroundcolour">external documentation</a>.
+-spec getBackgroundColour(This) -> wx:wx_colour() when
+	This::wxListItemAttr().
 getBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxListItemAttr),
   wxe_util:call(?wxListItemAttr_GetBackgroundColour,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxListItemAttr()) -> wxFont:wxFont()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitemattr.html#wxlistitemattrgetfont">external documentation</a>.
+-spec getFont(This) -> wxFont:wxFont() when
+	This::wxListItemAttr().
 getFont(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxListItemAttr),
   wxe_util:call(?wxListItemAttr_GetFont,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxListItemAttr()) -> wx:colour()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitemattr.html#wxlistitemattrgettextcolour">external documentation</a>.
+-spec getTextColour(This) -> wx:wx_colour() when
+	This::wxListItemAttr().
 getTextColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxListItemAttr),
   wxe_util:call(?wxListItemAttr_GetTextColour,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxListItemAttr()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitemattr.html#wxlistitemattrhasbackgroundcolour">external documentation</a>.
+-spec hasBackgroundColour(This) -> boolean() when
+	This::wxListItemAttr().
 hasBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxListItemAttr),
   wxe_util:call(?wxListItemAttr_HasBackgroundColour,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxListItemAttr()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitemattr.html#wxlistitemattrhasfont">external documentation</a>.
+-spec hasFont(This) -> boolean() when
+	This::wxListItemAttr().
 hasFont(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxListItemAttr),
   wxe_util:call(?wxListItemAttr_HasFont,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxListItemAttr()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitemattr.html#wxlistitemattrhastextcolour">external documentation</a>.
+-spec hasTextColour(This) -> boolean() when
+	This::wxListItemAttr().
 hasTextColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxListItemAttr),
   wxe_util:call(?wxListItemAttr_HasTextColour,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxListItemAttr(), ColBack::wx:colour()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitemattr.html#wxlistitemattrsetbackgroundcolour">external documentation</a>.
+-spec setBackgroundColour(This, ColBack) -> ok when
+	This::wxListItemAttr(), ColBack::wx:wx_colour().
 setBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef},ColBack)
  when tuple_size(ColBack) =:= 3; tuple_size(ColBack) =:= 4 ->
   ?CLASS(ThisT,wxListItemAttr),
   wxe_util:cast(?wxListItemAttr_SetBackgroundColour,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(ColBack)):16/binary>>).
 
-%% @spec (This::wxListItemAttr(), Font::wxFont:wxFont()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitemattr.html#wxlistitemattrsetfont">external documentation</a>.
+-spec setFont(This, Font) -> ok when
+	This::wxListItemAttr(), Font::wxFont:wxFont().
 setFont(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FontT,ref=FontRef}) ->
   ?CLASS(ThisT,wxListItemAttr),
   ?CLASS(FontT,wxFont),
   wxe_util:cast(?wxListItemAttr_SetFont,
   <<ThisRef:32/?UI,FontRef:32/?UI>>).
 
-%% @spec (This::wxListItemAttr(), ColText::wx:colour()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitemattr.html#wxlistitemattrsettextcolour">external documentation</a>.
+-spec setTextColour(This, ColText) -> ok when
+	This::wxListItemAttr(), ColText::wx:wx_colour().
 setTextColour(#wx_ref{type=ThisT,ref=ThisRef},ColText)
  when tuple_size(ColText) =:= 3; tuple_size(ColText) =:= 4 ->
   ?CLASS(ThisT,wxListItemAttr),
   wxe_util:cast(?wxListItemAttr_SetTextColour,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(ColText)):16/binary>>).
 
-%% @spec (This::wxListItemAttr()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxListItemAttr) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxListItemAttr),
   wxe_util:destroy(?wxListItemAttr_destroy,Obj),
diff --git a/lib/wx/src/gen/wxListView.erl b/lib/wx/src/gen/wxListView.erl
index 95a233a562..87cc28cd15 100644
--- a/lib/wx/src/gen/wxListView.erl
+++ b/lib/wx/src/gen/wxListView.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -70,67 +70,78 @@
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
 
+-export_type([wxListView/0]).
 %% @hidden
 parent_class(wxControl) -> true;
 parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (This::wxListView(), Col::integer()) -> ok
+-type wxListView() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistview.html#wxlistviewclearcolumnimage">external documentation</a>.
+-spec clearColumnImage(This, Col) -> ok when
+	This::wxListView(), Col::integer().
 clearColumnImage(#wx_ref{type=ThisT,ref=ThisRef},Col)
  when is_integer(Col) ->
   ?CLASS(ThisT,wxListView),
   wxe_util:cast(?wxListView_ClearColumnImage,
   <<ThisRef:32/?UI,Col:32/?UI>>).
 
-%% @spec (This::wxListView(), Index::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistview.html#wxlistviewfocus">external documentation</a>.
+-spec focus(This, Index) -> ok when
+	This::wxListView(), Index::integer().
 focus(#wx_ref{type=ThisT,ref=ThisRef},Index)
  when is_integer(Index) ->
   ?CLASS(ThisT,wxListView),
   wxe_util:cast(?wxListView_Focus,
   <<ThisRef:32/?UI,Index:32/?UI>>).
 
-%% @spec (This::wxListView()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistview.html#wxlistviewgetfirstselected">external documentation</a>.
+-spec getFirstSelected(This) -> integer() when
+	This::wxListView().
 getFirstSelected(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxListView),
   wxe_util:call(?wxListView_GetFirstSelected,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxListView()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistview.html#wxlistviewgetfocuseditem">external documentation</a>.
+-spec getFocusedItem(This) -> integer() when
+	This::wxListView().
 getFocusedItem(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxListView),
   wxe_util:call(?wxListView_GetFocusedItem,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxListView(), Item::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistview.html#wxlistviewgetnextselected">external documentation</a>.
+-spec getNextSelected(This, Item) -> integer() when
+	This::wxListView(), Item::integer().
 getNextSelected(#wx_ref{type=ThisT,ref=ThisRef},Item)
  when is_integer(Item) ->
   ?CLASS(ThisT,wxListView),
   wxe_util:call(?wxListView_GetNextSelected,
   <<ThisRef:32/?UI,Item:32/?UI>>).
 
-%% @spec (This::wxListView(), Index::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistview.html#wxlistviewisselected">external documentation</a>.
+-spec isSelected(This, Index) -> boolean() when
+	This::wxListView(), Index::integer().
 isSelected(#wx_ref{type=ThisT,ref=ThisRef},Index)
  when is_integer(Index) ->
   ?CLASS(ThisT,wxListView),
   wxe_util:call(?wxListView_IsSelected,
   <<ThisRef:32/?UI,Index:32/?UI>>).
 
-%% @spec (This::wxListView(), N::integer()) -> ok
 %% @equiv select(This,N, [])
+-spec select(This, N) -> ok when
+	This::wxListView(), N::integer().
+
 select(This,N)
  when is_record(This, wx_ref),is_integer(N) ->
   select(This,N, []).
 
-%% @spec (This::wxListView(), N::integer(), [Option]) -> ok
-%% Option = {on, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistview.html#wxlistviewselect">external documentation</a>.
+-spec select(This, N, [Option]) -> ok when
+	This::wxListView(), N::integer(),
+	Option :: {on, boolean()}.
 select(#wx_ref{type=ThisT,ref=ThisRef},N, Options)
  when is_integer(N),is_list(Options) ->
   ?CLASS(ThisT,wxListView),
@@ -140,8 +151,9 @@ select(#wx_ref{type=ThisT,ref=ThisRef},N, Options)
   wxe_util:cast(?wxListView_Select,
   <<ThisRef:32/?UI,N:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxListView(), Col::integer(), Image::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistview.html#wxlistviewsetcolumnimage">external documentation</a>.
+-spec setColumnImage(This, Col, Image) -> ok when
+	This::wxListView(), Col::integer(), Image::integer().
 setColumnImage(#wx_ref{type=ThisT,ref=ThisRef},Col,Image)
  when is_integer(Col),is_integer(Image) ->
   ?CLASS(ThisT,wxListView),
diff --git a/lib/wx/src/gen/wxListbook.erl b/lib/wx/src/gen/wxListbook.erl
index c204dc87a1..bacc615004 100644
--- a/lib/wx/src/gen/wxListbook.erl
+++ b/lib/wx/src/gen/wxListbook.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2012. 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
@@ -74,27 +74,34 @@
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
 
+-export_type([wxListbook/0]).
 %% @hidden
 parent_class(wxControl) -> true;
 parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxListbook()
+-type wxListbook() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbook.html#wxlistbookwxlistbook">external documentation</a>.
+-spec new() -> wxListbook().
 new() ->
   wxe_util:construct(?wxListbook_new_0,
   <<>>).
 
-%% @spec (Parent::wxWindow:wxWindow(), Id::integer()) -> wxListbook()
 %% @equiv new(Parent,Id, [])
+-spec new(Parent, Id) -> wxListbook() when
+	Parent::wxWindow:wxWindow(), Id::integer().
+
 new(Parent,Id)
  when is_record(Parent, wx_ref),is_integer(Id) ->
   new(Parent,Id, []).
 
-%% @spec (Parent::wxWindow:wxWindow(), Id::integer(), [Option]) -> wxListbook()
-%% Option = {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbook.html#wxlistbookwxlistbook">external documentation</a>.
+-spec new(Parent, Id, [Option]) -> wxListbook() when
+	Parent::wxWindow:wxWindow(), Id::integer(),
+	Option :: {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}.
 new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
  when is_integer(Id),is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -106,15 +113,19 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
   wxe_util:construct(?wxListbook_new_3,
   <<ParentRef:32/?UI,Id:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxListbook(), Page::wxWindow:wxWindow(), Text::string()) -> bool()
 %% @equiv addPage(This,Page,Text, [])
+-spec addPage(This, Page, Text) -> boolean() when
+	This::wxListbook(), Page::wxWindow:wxWindow(), Text::string().
+
 addPage(This,Page,Text)
  when is_record(This, wx_ref),is_record(Page, wx_ref),is_list(Text) ->
   addPage(This,Page,Text, []).
 
-%% @spec (This::wxListbook(), Page::wxWindow:wxWindow(), Text::string(), [Option]) -> bool()
-%% Option = {bSelect, bool()} | {imageId, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbook.html#wxlistbookaddpage">external documentation</a>.
+-spec addPage(This, Page, Text, [Option]) -> boolean() when
+	This::wxListbook(), Page::wxWindow:wxWindow(), Text::string(),
+	Option :: {bSelect, boolean()}
+		 | {imageId, integer()}.
 addPage(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PageT,ref=PageRef},Text, Options)
  when is_list(Text),is_list(Options) ->
   ?CLASS(ThisT,wxListbook),
@@ -127,15 +138,18 @@ addPage(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PageT,ref=PageRef},Text, Op
   wxe_util:call(?wxListbook_AddPage,
   <<ThisRef:32/?UI,PageRef:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((4+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxListbook()) -> ok
 %% @equiv advanceSelection(This, [])
+-spec advanceSelection(This) -> ok when
+	This::wxListbook().
+
 advanceSelection(This)
  when is_record(This, wx_ref) ->
   advanceSelection(This, []).
 
-%% @spec (This::wxListbook(), [Option]) -> ok
-%% Option = {forward, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbook.html#wxlistbookadvanceselection">external documentation</a>.
+-spec advanceSelection(This, [Option]) -> ok when
+	This::wxListbook(),
+	Option :: {forward, boolean()}.
 advanceSelection(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxListbook),
@@ -145,23 +159,29 @@ advanceSelection(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxListbook_AdvanceSelection,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxListbook(), ImageList::wxImageList:wxImageList()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbook.html#wxlistbookassignimagelist">external documentation</a>.
+-spec assignImageList(This, ImageList) -> ok when
+	This::wxListbook(), ImageList::wxImageList:wxImageList().
 assignImageList(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ImageListT,ref=ImageListRef}) ->
   ?CLASS(ThisT,wxListbook),
   ?CLASS(ImageListT,wxImageList),
   wxe_util:cast(?wxListbook_AssignImageList,
   <<ThisRef:32/?UI,ImageListRef:32/?UI>>).
 
-%% @spec (This::wxListbook(), Parent::wxWindow:wxWindow(), Id::integer()) -> bool()
 %% @equiv create(This,Parent,Id, [])
+-spec create(This, Parent, Id) -> boolean() when
+	This::wxListbook(), Parent::wxWindow:wxWindow(), Id::integer().
+
 create(This,Parent,Id)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id) ->
   create(This,Parent,Id, []).
 
-%% @spec (This::wxListbook(), Parent::wxWindow:wxWindow(), Id::integer(), [Option]) -> bool()
-%% Option = {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbook.html#wxlistbookcreate">external documentation</a>.
+-spec create(This, Parent, Id, [Option]) -> boolean() when
+	This::wxListbook(), Parent::wxWindow:wxWindow(), Id::integer(),
+	Option :: {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}.
 create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
  when is_integer(Id),is_list(Options) ->
   ?CLASS(ThisT,wxListbook),
@@ -174,98 +194,114 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id, O
   wxe_util:call(?wxListbook_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI,Id:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxListbook()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbook.html#wxlistbookdeleteallpages">external documentation</a>.
+-spec deleteAllPages(This) -> boolean() when
+	This::wxListbook().
 deleteAllPages(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxListbook),
   wxe_util:call(?wxListbook_DeleteAllPages,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxListbook(), N::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbook.html#wxlistbookdeletepage">external documentation</a>.
+-spec deletePage(This, N) -> boolean() when
+	This::wxListbook(), N::integer().
 deletePage(#wx_ref{type=ThisT,ref=ThisRef},N)
  when is_integer(N) ->
   ?CLASS(ThisT,wxListbook),
   wxe_util:call(?wxListbook_DeletePage,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @spec (This::wxListbook(), N::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbook.html#wxlistbookremovepage">external documentation</a>.
+-spec removePage(This, N) -> boolean() when
+	This::wxListbook(), N::integer().
 removePage(#wx_ref{type=ThisT,ref=ThisRef},N)
  when is_integer(N) ->
   ?CLASS(ThisT,wxListbook),
   wxe_util:call(?wxListbook_RemovePage,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @spec (This::wxListbook()) -> wxWindow:wxWindow()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbook.html#wxlistbookgetcurrentpage">external documentation</a>.
+-spec getCurrentPage(This) -> wxWindow:wxWindow() when
+	This::wxListbook().
 getCurrentPage(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxListbook),
   wxe_util:call(?wxListbook_GetCurrentPage,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxListbook()) -> wxImageList:wxImageList()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbook.html#wxlistbookgetimagelist">external documentation</a>.
+-spec getImageList(This) -> wxImageList:wxImageList() when
+	This::wxListbook().
 getImageList(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxListbook),
   wxe_util:call(?wxListbook_GetImageList,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxListbook(), N::integer()) -> wxWindow:wxWindow()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbook.html#wxlistbookgetpage">external documentation</a>.
+-spec getPage(This, N) -> wxWindow:wxWindow() when
+	This::wxListbook(), N::integer().
 getPage(#wx_ref{type=ThisT,ref=ThisRef},N)
  when is_integer(N) ->
   ?CLASS(ThisT,wxListbook),
   wxe_util:call(?wxListbook_GetPage,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @spec (This::wxListbook()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbook.html#wxlistbookgetpagecount">external documentation</a>.
+-spec getPageCount(This) -> integer() when
+	This::wxListbook().
 getPageCount(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxListbook),
   wxe_util:call(?wxListbook_GetPageCount,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxListbook(), N::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbook.html#wxlistbookgetpageimage">external documentation</a>.
+-spec getPageImage(This, N) -> integer() when
+	This::wxListbook(), N::integer().
 getPageImage(#wx_ref{type=ThisT,ref=ThisRef},N)
  when is_integer(N) ->
   ?CLASS(ThisT,wxListbook),
   wxe_util:call(?wxListbook_GetPageImage,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @spec (This::wxListbook(), N::integer()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbook.html#wxlistbookgetpagetext">external documentation</a>.
+-spec getPageText(This, N) -> string() when
+	This::wxListbook(), N::integer().
 getPageText(#wx_ref{type=ThisT,ref=ThisRef},N)
  when is_integer(N) ->
   ?CLASS(ThisT,wxListbook),
   wxe_util:call(?wxListbook_GetPageText,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @spec (This::wxListbook()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbook.html#wxlistbookgetselection">external documentation</a>.
+-spec getSelection(This) -> integer() when
+	This::wxListbook().
 getSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxListbook),
   wxe_util:call(?wxListbook_GetSelection,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxListbook(), Pt::{X::integer(), Y::integer()}) -> {integer(), Flags::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbook.html#wxlistbookhittest">external documentation</a>.
+-spec hitTest(This, Pt) -> Result when
+	Result ::{Res ::integer(), Flags::integer()},
+	This::wxListbook(), Pt::{X::integer(), Y::integer()}.
 hitTest(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY})
  when is_integer(PtX),is_integer(PtY) ->
   ?CLASS(ThisT,wxListbook),
   wxe_util:call(?wxListbook_HitTest,
   <<ThisRef:32/?UI,PtX:32/?UI,PtY:32/?UI>>).
 
-%% @spec (This::wxListbook(), N::integer(), Page::wxWindow:wxWindow(), Text::string()) -> bool()
 %% @equiv insertPage(This,N,Page,Text, [])
+-spec insertPage(This, N, Page, Text) -> boolean() when
+	This::wxListbook(), N::integer(), Page::wxWindow:wxWindow(), Text::string().
+
 insertPage(This,N,Page,Text)
  when is_record(This, wx_ref),is_integer(N),is_record(Page, wx_ref),is_list(Text) ->
   insertPage(This,N,Page,Text, []).
 
-%% @spec (This::wxListbook(), N::integer(), Page::wxWindow:wxWindow(), Text::string(), [Option]) -> bool()
-%% Option = {bSelect, bool()} | {imageId, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbook.html#wxlistbookinsertpage">external documentation</a>.
+-spec insertPage(This, N, Page, Text, [Option]) -> boolean() when
+	This::wxListbook(), N::integer(), Page::wxWindow:wxWindow(), Text::string(),
+	Option :: {bSelect, boolean()}
+		 | {imageId, integer()}.
 insertPage(#wx_ref{type=ThisT,ref=ThisRef},N,#wx_ref{type=PageT,ref=PageRef},Text, Options)
  when is_integer(N),is_list(Text),is_list(Options) ->
   ?CLASS(ThisT,wxListbook),
@@ -278,32 +314,36 @@ insertPage(#wx_ref{type=ThisT,ref=ThisRef},N,#wx_ref{type=PageT,ref=PageRef},Tex
   wxe_util:call(?wxListbook_InsertPage,
   <<ThisRef:32/?UI,N:32/?UI,PageRef:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxListbook(), ImageList::wxImageList:wxImageList()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbook.html#wxlistbooksetimagelist">external documentation</a>.
+-spec setImageList(This, ImageList) -> ok when
+	This::wxListbook(), ImageList::wxImageList:wxImageList().
 setImageList(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ImageListT,ref=ImageListRef}) ->
   ?CLASS(ThisT,wxListbook),
   ?CLASS(ImageListT,wxImageList),
   wxe_util:cast(?wxListbook_SetImageList,
   <<ThisRef:32/?UI,ImageListRef:32/?UI>>).
 
-%% @spec (This::wxListbook(), Size::{W::integer(), H::integer()}) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbook.html#wxlistbooksetpagesize">external documentation</a>.
+-spec setPageSize(This, Size) -> ok when
+	This::wxListbook(), Size::{W::integer(), H::integer()}.
 setPageSize(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH})
  when is_integer(SizeW),is_integer(SizeH) ->
   ?CLASS(ThisT,wxListbook),
   wxe_util:cast(?wxListbook_SetPageSize,
   <<ThisRef:32/?UI,SizeW:32/?UI,SizeH:32/?UI>>).
 
-%% @spec (This::wxListbook(), N::integer(), ImageId::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbook.html#wxlistbooksetpageimage">external documentation</a>.
+-spec setPageImage(This, N, ImageId) -> boolean() when
+	This::wxListbook(), N::integer(), ImageId::integer().
 setPageImage(#wx_ref{type=ThisT,ref=ThisRef},N,ImageId)
  when is_integer(N),is_integer(ImageId) ->
   ?CLASS(ThisT,wxListbook),
   wxe_util:call(?wxListbook_SetPageImage,
   <<ThisRef:32/?UI,N:32/?UI,ImageId:32/?UI>>).
 
-%% @spec (This::wxListbook(), N::integer(), StrText::string()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbook.html#wxlistbooksetpagetext">external documentation</a>.
+-spec setPageText(This, N, StrText) -> boolean() when
+	This::wxListbook(), N::integer(), StrText::string().
 setPageText(#wx_ref{type=ThisT,ref=ThisRef},N,StrText)
  when is_integer(N),is_list(StrText) ->
   ?CLASS(ThisT,wxListbook),
@@ -311,24 +351,26 @@ setPageText(#wx_ref{type=ThisT,ref=ThisRef},N,StrText)
   wxe_util:call(?wxListbook_SetPageText,
   <<ThisRef:32/?UI,N:32/?UI,(byte_size(StrText_UC)):32/?UI,(StrText_UC)/binary, 0:(((8- ((4+byte_size(StrText_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxListbook(), N::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbook.html#wxlistbooksetselection">external documentation</a>.
+-spec setSelection(This, N) -> integer() when
+	This::wxListbook(), N::integer().
 setSelection(#wx_ref{type=ThisT,ref=ThisRef},N)
  when is_integer(N) ->
   ?CLASS(ThisT,wxListbook),
   wxe_util:call(?wxListbook_SetSelection,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @spec (This::wxListbook(), N::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbook.html#wxlistbookchangeselection">external documentation</a>.
+-spec changeSelection(This, N) -> integer() when
+	This::wxListbook(), N::integer().
 changeSelection(#wx_ref{type=ThisT,ref=ThisRef},N)
  when is_integer(N) ->
   ?CLASS(ThisT,wxListbook),
   wxe_util:call(?wxListbook_ChangeSelection,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @spec (This::wxListbook()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxListbook) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxListbook),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxLogNull.erl b/lib/wx/src/gen/wxLogNull.erl
index 676fdf6d85..fb53e0d151 100644
--- a/lib/wx/src/gen/wxLogNull.erl
+++ b/lib/wx/src/gen/wxLogNull.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2012. 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
@@ -29,17 +29,19 @@
 %% inherited exports
 -export([parent_class/1]).
 
+-export_type([wxLogNull/0]).
 %% @hidden
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxLogNull()
+-type wxLogNull() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlognull.html#wxlognullwxlognull">external documentation</a>.
+-spec new() -> wxLogNull().
 new() ->
   wxe_util:construct(?wxLogNull_new,
   <<>>).
 
-%% @spec (This::wxLogNull()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxLogNull) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxLogNull),
   wxe_util:destroy(?wxLogNull_destroy,Obj),
diff --git a/lib/wx/src/gen/wxMDIChildFrame.erl b/lib/wx/src/gen/wxMDIChildFrame.erl
index d3e1edda55..6b9905b72b 100644
--- a/lib/wx/src/gen/wxMDIChildFrame.erl
+++ b/lib/wx/src/gen/wxMDIChildFrame.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -80,6 +80,7 @@
   thaw/1,transferDataFromWindow/1,transferDataToWindow/1,update/1,updateWindowUI/1,
   updateWindowUI/2,validate/1,warpPointer/3]).
 
+-export_type([wxMDIChildFrame/0]).
 %% @hidden
 parent_class(wxFrame) -> true;
 parent_class(wxTopLevelWindow) -> true;
@@ -87,21 +88,27 @@ parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxMDIChildFrame()
+-type wxMDIChildFrame() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmdichildframe.html#wxmdichildframewxmdichildframe">external documentation</a>.
+-spec new() -> wxMDIChildFrame().
 new() ->
   wxe_util:construct(?wxMDIChildFrame_new_0,
   <<>>).
 
-%% @spec (Parent::wxMDIParentFrame:wxMDIParentFrame(), Id::integer(), Title::string()) -> wxMDIChildFrame()
 %% @equiv new(Parent,Id,Title, [])
+-spec new(Parent, Id, Title) -> wxMDIChildFrame() when
+	Parent::wxMDIParentFrame:wxMDIParentFrame(), Id::integer(), Title::string().
+
 new(Parent,Id,Title)
  when is_record(Parent, wx_ref),is_integer(Id),is_list(Title) ->
   new(Parent,Id,Title, []).
 
-%% @spec (Parent::wxMDIParentFrame:wxMDIParentFrame(), Id::integer(), Title::string(), [Option]) -> wxMDIChildFrame()
-%% Option = {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmdichildframe.html#wxmdichildframewxmdichildframe">external documentation</a>.
+-spec new(Parent, Id, Title, [Option]) -> wxMDIChildFrame() when
+	Parent::wxMDIParentFrame:wxMDIParentFrame(), Id::integer(), Title::string(),
+	Option :: {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}.
 new(#wx_ref{type=ParentT,ref=ParentRef},Id,Title, Options)
  when is_integer(Id),is_list(Title),is_list(Options) ->
   ?CLASS(ParentT,wxMDIParentFrame),
@@ -114,22 +121,28 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Id,Title, Options)
   wxe_util:construct(?wxMDIChildFrame_new_4,
   <<ParentRef:32/?UI,Id:32/?UI,(byte_size(Title_UC)):32/?UI,(Title_UC)/binary, 0:(((8- ((4+byte_size(Title_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxMDIChildFrame()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmdichildframe.html#wxmdichildframeactivate">external documentation</a>.
+-spec activate(This) -> ok when
+	This::wxMDIChildFrame().
 activate(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMDIChildFrame),
   wxe_util:cast(?wxMDIChildFrame_Activate,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxMDIChildFrame(), Parent::wxMDIParentFrame:wxMDIParentFrame(), Id::integer(), Title::string()) -> bool()
 %% @equiv create(This,Parent,Id,Title, [])
+-spec create(This, Parent, Id, Title) -> boolean() when
+	This::wxMDIChildFrame(), Parent::wxMDIParentFrame:wxMDIParentFrame(), Id::integer(), Title::string().
+
 create(This,Parent,Id,Title)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id),is_list(Title) ->
   create(This,Parent,Id,Title, []).
 
-%% @spec (This::wxMDIChildFrame(), Parent::wxMDIParentFrame:wxMDIParentFrame(), Id::integer(), Title::string(), [Option]) -> bool()
-%% Option = {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmdichildframe.html#wxmdichildframecreate">external documentation</a>.
+-spec create(This, Parent, Id, Title, [Option]) -> boolean() when
+	This::wxMDIChildFrame(), Parent::wxMDIParentFrame:wxMDIParentFrame(), Id::integer(), Title::string(),
+	Option :: {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}.
 create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id,Title, Options)
  when is_integer(Id),is_list(Title),is_list(Options) ->
   ?CLASS(ThisT,wxMDIChildFrame),
@@ -143,15 +156,18 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id,Ti
   wxe_util:call(?wxMDIChildFrame_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI,Id: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, BinOpt/binary>>).
 
-%% @spec (This::wxMDIChildFrame()) -> ok
 %% @equiv maximize(This, [])
+-spec maximize(This) -> ok when
+	This::wxMDIChildFrame().
+
 maximize(This)
  when is_record(This, wx_ref) ->
   maximize(This, []).
 
-%% @spec (This::wxMDIChildFrame(), [Option]) -> ok
-%% Option = {maximize, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmdichildframe.html#wxmdichildframemaximize">external documentation</a>.
+-spec maximize(This, [Option]) -> ok when
+	This::wxMDIChildFrame(),
+	Option :: {maximize, boolean()}.
 maximize(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxMDIChildFrame),
@@ -161,15 +177,16 @@ maximize(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxMDIChildFrame_Maximize,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxMDIChildFrame()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmdichildframe.html#wxmdichildframerestore">external documentation</a>.
+-spec restore(This) -> ok when
+	This::wxMDIChildFrame().
 restore(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMDIChildFrame),
   wxe_util:cast(?wxMDIChildFrame_Restore,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxMDIChildFrame()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxMDIChildFrame) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxMDIChildFrame),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxMDIClientWindow.erl b/lib/wx/src/gen/wxMDIClientWindow.erl
index 79a11b4eb7..7399b8be26 100644
--- a/lib/wx/src/gen/wxMDIClientWindow.erl
+++ b/lib/wx/src/gen/wxMDIClientWindow.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -68,26 +68,31 @@
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
 
+-export_type([wxMDIClientWindow/0]).
 %% @hidden
 parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxMDIClientWindow()
+-type wxMDIClientWindow() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmdiclientwindow.html#wxmdiclientwindowwxmdiclientwindow">external documentation</a>.
+-spec new() -> wxMDIClientWindow().
 new() ->
   wxe_util:construct(?wxMDIClientWindow_new_0,
   <<>>).
 
-%% @spec (Parent::wxMDIParentFrame:wxMDIParentFrame()) -> wxMDIClientWindow()
 %% @equiv new(Parent, [])
+-spec new(Parent) -> wxMDIClientWindow() when
+	Parent::wxMDIParentFrame:wxMDIParentFrame().
+
 new(Parent)
  when is_record(Parent, wx_ref) ->
   new(Parent, []).
 
-%% @spec (Parent::wxMDIParentFrame:wxMDIParentFrame(), [Option]) -> wxMDIClientWindow()
-%% Option = {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmdiclientwindow.html#wxmdiclientwindowwxmdiclientwindow">external documentation</a>.
+-spec new(Parent, [Option]) -> wxMDIClientWindow() when
+	Parent::wxMDIParentFrame:wxMDIParentFrame(),
+	Option :: {style, integer()}.
 new(#wx_ref{type=ParentT,ref=ParentRef}, Options)
  when is_list(Options) ->
   ?CLASS(ParentT,wxMDIParentFrame),
@@ -97,15 +102,18 @@ new(#wx_ref{type=ParentT,ref=ParentRef}, Options)
   wxe_util:construct(?wxMDIClientWindow_new_2,
   <<ParentRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxMDIClientWindow(), Parent::wxMDIParentFrame:wxMDIParentFrame()) -> bool()
 %% @equiv createClient(This,Parent, [])
+-spec createClient(This, Parent) -> boolean() when
+	This::wxMDIClientWindow(), Parent::wxMDIParentFrame:wxMDIParentFrame().
+
 createClient(This,Parent)
  when is_record(This, wx_ref),is_record(Parent, wx_ref) ->
   createClient(This,Parent, []).
 
-%% @spec (This::wxMDIClientWindow(), Parent::wxMDIParentFrame:wxMDIParentFrame(), [Option]) -> bool()
-%% Option = {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmdiclientwindow.html#wxmdiclientwindowcreateclient">external documentation</a>.
+-spec createClient(This, Parent, [Option]) -> boolean() when
+	This::wxMDIClientWindow(), Parent::wxMDIParentFrame:wxMDIParentFrame(),
+	Option :: {style, integer()}.
 createClient(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxMDIClientWindow),
@@ -116,8 +124,8 @@ createClient(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef}
   wxe_util:call(?wxMDIClientWindow_CreateClient,
   <<ThisRef:32/?UI,ParentRef:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxMDIClientWindow()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxMDIClientWindow) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxMDIClientWindow),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxMDIParentFrame.erl b/lib/wx/src/gen/wxMDIParentFrame.erl
index 7f8a305876..545d52c3cd 100644
--- a/lib/wx/src/gen/wxMDIParentFrame.erl
+++ b/lib/wx/src/gen/wxMDIParentFrame.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -82,6 +82,7 @@
   transferDataToWindow/1,update/1,updateWindowUI/1,updateWindowUI/2,
   validate/1,warpPointer/3]).
 
+-export_type([wxMDIParentFrame/0]).
 %% @hidden
 parent_class(wxFrame) -> true;
 parent_class(wxTopLevelWindow) -> true;
@@ -89,21 +90,27 @@ parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxMDIParentFrame()
+-type wxMDIParentFrame() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmdiparentframe.html#wxmdiparentframewxmdiparentframe">external documentation</a>.
+-spec new() -> wxMDIParentFrame().
 new() ->
   wxe_util:construct(?wxMDIParentFrame_new_0,
   <<>>).
 
-%% @spec (Parent::wxWindow:wxWindow(), Id::integer(), Title::string()) -> wxMDIParentFrame()
 %% @equiv new(Parent,Id,Title, [])
+-spec new(Parent, Id, Title) -> wxMDIParentFrame() when
+	Parent::wxWindow:wxWindow(), Id::integer(), Title::string().
+
 new(Parent,Id,Title)
  when is_record(Parent, wx_ref),is_integer(Id),is_list(Title) ->
   new(Parent,Id,Title, []).
 
-%% @spec (Parent::wxWindow:wxWindow(), Id::integer(), Title::string(), [Option]) -> wxMDIParentFrame()
-%% Option = {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmdiparentframe.html#wxmdiparentframewxmdiparentframe">external documentation</a>.
+-spec new(Parent, Id, Title, [Option]) -> wxMDIParentFrame() when
+	Parent::wxWindow:wxWindow(), Id::integer(), Title::string(),
+	Option :: {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}.
 new(#wx_ref{type=ParentT,ref=ParentRef},Id,Title, Options)
  when is_integer(Id),is_list(Title),is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -116,43 +123,52 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Id,Title, Options)
   wxe_util:construct(?wxMDIParentFrame_new_4,
   <<ParentRef:32/?UI,Id:32/?UI,(byte_size(Title_UC)):32/?UI,(Title_UC)/binary, 0:(((8- ((4+byte_size(Title_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxMDIParentFrame()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmdiparentframe.html#wxmdiparentframeactivatenext">external documentation</a>.
+-spec activateNext(This) -> ok when
+	This::wxMDIParentFrame().
 activateNext(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMDIParentFrame),
   wxe_util:cast(?wxMDIParentFrame_ActivateNext,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxMDIParentFrame()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmdiparentframe.html#wxmdiparentframeactivateprevious">external documentation</a>.
+-spec activatePrevious(This) -> ok when
+	This::wxMDIParentFrame().
 activatePrevious(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMDIParentFrame),
   wxe_util:cast(?wxMDIParentFrame_ActivatePrevious,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxMDIParentFrame()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmdiparentframe.html#wxmdiparentframearrangeicons">external documentation</a>.
+-spec arrangeIcons(This) -> ok when
+	This::wxMDIParentFrame().
 arrangeIcons(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMDIParentFrame),
   wxe_util:cast(?wxMDIParentFrame_ArrangeIcons,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxMDIParentFrame()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmdiparentframe.html#wxmdiparentframecascade">external documentation</a>.
+-spec cascade(This) -> ok when
+	This::wxMDIParentFrame().
 cascade(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMDIParentFrame),
   wxe_util:cast(?wxMDIParentFrame_Cascade,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxMDIParentFrame(), Parent::wxWindow:wxWindow(), Id::integer(), Title::string()) -> bool()
 %% @equiv create(This,Parent,Id,Title, [])
+-spec create(This, Parent, Id, Title) -> boolean() when
+	This::wxMDIParentFrame(), Parent::wxWindow:wxWindow(), Id::integer(), Title::string().
+
 create(This,Parent,Id,Title)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id),is_list(Title) ->
   create(This,Parent,Id,Title, []).
 
-%% @spec (This::wxMDIParentFrame(), Parent::wxWindow:wxWindow(), Id::integer(), Title::string(), [Option]) -> bool()
-%% Option = {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmdiparentframe.html#wxmdiparentframecreate">external documentation</a>.
+-spec create(This, Parent, Id, Title, [Option]) -> boolean() when
+	This::wxMDIParentFrame(), Parent::wxWindow:wxWindow(), Id::integer(), Title::string(),
+	Option :: {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}.
 create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id,Title, Options)
  when is_integer(Id),is_list(Title),is_list(Options) ->
   ?CLASS(ThisT,wxMDIParentFrame),
@@ -166,31 +182,35 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id,Ti
   wxe_util:call(?wxMDIParentFrame_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI,Id: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, BinOpt/binary>>).
 
-%% @spec (This::wxMDIParentFrame()) -> wxMDIChildFrame:wxMDIChildFrame()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmdiparentframe.html#wxmdiparentframegetactivechild">external documentation</a>.
+-spec getActiveChild(This) -> wxMDIChildFrame:wxMDIChildFrame() when
+	This::wxMDIParentFrame().
 getActiveChild(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMDIParentFrame),
   wxe_util:call(?wxMDIParentFrame_GetActiveChild,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxMDIParentFrame()) -> wxMDIClientWindow:wxMDIClientWindow()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmdiparentframe.html#wxmdiparentframegetclientwindow">external documentation</a>.
+-spec getClientWindow(This) -> wxMDIClientWindow:wxMDIClientWindow() when
+	This::wxMDIParentFrame().
 getClientWindow(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMDIParentFrame),
   wxe_util:call(?wxMDIParentFrame_GetClientWindow,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxMDIParentFrame()) -> ok
 %% @equiv tile(This, [])
+-spec tile(This) -> ok when
+	This::wxMDIParentFrame().
+
 tile(This)
  when is_record(This, wx_ref) ->
   tile(This, []).
 
-%% @spec (This::wxMDIParentFrame(), [Option]) -> ok
-%% Option = {orient, WxOrientation}
-%% WxOrientation = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmdiparentframe.html#wxmdiparentframetile">external documentation</a>.
-%%<br /> WxOrientation is one of ?wxHORIZONTAL | ?wxVERTICAL | ?wxBOTH
+%%<br /> Orient = ?wxHORIZONTAL | ?wxVERTICAL | ?wxBOTH
+-spec tile(This, [Option]) -> ok when
+	This::wxMDIParentFrame(),
+	Option :: {orient, wx:wx_enum()}.
 tile(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxMDIParentFrame),
@@ -200,8 +220,8 @@ tile(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxMDIParentFrame_Tile,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxMDIParentFrame()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxMDIParentFrame) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxMDIParentFrame),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxMask.erl b/lib/wx/src/gen/wxMask.erl
index 3b5d3340ea..488cddc260 100644
--- a/lib/wx/src/gen/wxMask.erl
+++ b/lib/wx/src/gen/wxMask.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -29,31 +29,30 @@
 %% inherited exports
 -export([parent_class/1]).
 
+-export_type([wxMask/0]).
 %% @hidden
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxMask()
+-type wxMask() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmask.html#wxmaskwxmask">external documentation</a>.
+-spec new() -> wxMask().
 new() ->
   wxe_util:construct(?wxMask_new_0,
   <<>>).
 
-%% @spec (Bitmap::wxBitmap:wxBitmap()) -> wxMask()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmask.html#wxmaskwxmask">external documentation</a>.
+-spec new(Bitmap) -> wxMask() when
+	Bitmap::wxBitmap:wxBitmap().
 new(#wx_ref{type=BitmapT,ref=BitmapRef}) ->
   ?CLASS(BitmapT,wxBitmap),
   wxe_util:construct(?wxMask_new_1,
   <<BitmapRef:32/?UI>>).
 
-%% @spec (Bitmap::wxBitmap:wxBitmap(),X::integer()|term()) -> wxMask()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmask.html#wxmaskwxmask">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% new(Bitmap::wxBitmap:wxBitmap(), PaletteIndex::integer()) -> wxMask() </c>
-%% </p>
-%% <p><c>
-%% new(Bitmap::wxBitmap:wxBitmap(), Colour::wx:colour()) -> wxMask() </c>
-%% </p>
+-spec new(Bitmap, PaletteIndex) -> wxMask() when
+	Bitmap::wxBitmap:wxBitmap(), PaletteIndex::integer();
+      (Bitmap, Colour) -> wxMask() when
+	Bitmap::wxBitmap:wxBitmap(), Colour::wx:wx_colour().
 new(#wx_ref{type=BitmapT,ref=BitmapRef},PaletteIndex)
  when is_integer(PaletteIndex) ->
   ?CLASS(BitmapT,wxBitmap),
@@ -65,23 +64,20 @@ new(#wx_ref{type=BitmapT,ref=BitmapRef},Colour)
   wxe_util:construct(?wxMask_new_2_1,
   <<BitmapRef:32/?UI,(wxe_util:colour_bin(Colour)):16/binary>>).
 
-%% @spec (This::wxMask(), Bitmap::wxBitmap:wxBitmap()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmask.html#wxmaskcreate">external documentation</a>.
+-spec create(This, Bitmap) -> boolean() when
+	This::wxMask(), Bitmap::wxBitmap:wxBitmap().
 create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BitmapT,ref=BitmapRef}) ->
   ?CLASS(ThisT,wxMask),
   ?CLASS(BitmapT,wxBitmap),
   wxe_util:call(?wxMask_Create_1,
   <<ThisRef:32/?UI,BitmapRef:32/?UI>>).
 
-%% @spec (This::wxMask(),Bitmap::wxBitmap:wxBitmap(),X::integer()|term()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmask.html#wxmaskcreate">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% create(This::wxMask(), Bitmap::wxBitmap:wxBitmap(), PaletteIndex::integer()) -> bool() </c>
-%% </p>
-%% <p><c>
-%% create(This::wxMask(), Bitmap::wxBitmap:wxBitmap(), Colour::wx:colour()) -> bool() </c>
-%% </p>
+-spec create(This, Bitmap, PaletteIndex) -> boolean() when
+	This::wxMask(), Bitmap::wxBitmap:wxBitmap(), PaletteIndex::integer();
+      (This, Bitmap, Colour) -> boolean() when
+	This::wxMask(), Bitmap::wxBitmap:wxBitmap(), Colour::wx:wx_colour().
 create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BitmapT,ref=BitmapRef},PaletteIndex)
  when is_integer(PaletteIndex) ->
   ?CLASS(ThisT,wxMask),
@@ -95,8 +91,8 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BitmapT,ref=BitmapRef},Colou
   wxe_util:call(?wxMask_Create_2_1,
   <<ThisRef:32/?UI,BitmapRef:32/?UI,(wxe_util:colour_bin(Colour)):16/binary>>).
 
-%% @spec (This::wxMask()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxMask) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxMask),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxMaximizeEvent.erl b/lib/wx/src/gen/wxMaximizeEvent.erl
index 6dd371908b..5f7b7e890d 100644
--- a/lib/wx/src/gen/wxMaximizeEvent.erl
+++ b/lib/wx/src/gen/wxMaximizeEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -37,10 +37,12 @@
 -export([getId/1,getSkipped/1,getTimestamp/1,isCommandEvent/1,parent_class/1,
   resumePropagation/2,shouldPropagate/1,skip/1,skip/2,stopPropagation/1]).
 
+-export_type([wxMaximizeEvent/0]).
 %% @hidden
 parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
+-type wxMaximizeEvent() :: wx:wx_object().
  %% From wxEvent
 %% @hidden
 stopPropagation(This) -> wxEvent:stopPropagation(This).
diff --git a/lib/wx/src/gen/wxMemoryDC.erl b/lib/wx/src/gen/wxMemoryDC.erl
index d17ebba4b7..a8e287eb0a 100644
--- a/lib/wx/src/gen/wxMemoryDC.erl
+++ b/lib/wx/src/gen/wxMemoryDC.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -52,18 +52,21 @@
   setPen/2,setTextBackground/2,setTextForeground/2,setUserScale/3,startDoc/2,
   startPage/1]).
 
+-export_type([wxMemoryDC/0]).
 %% @hidden
 parent_class(wxDC) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxMemoryDC()
+-type wxMemoryDC() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmemorydc.html#wxmemorydcwxmemorydc">external documentation</a>.
+-spec new() -> wxMemoryDC().
 new() ->
   wxe_util:construct(?wxMemoryDC_new_0,
   <<>>).
 
-%% @spec (Dc::wxDC:wxDC() | wxBitmap:wxBitmap()) -> wxMemoryDC()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmemorydc.html#wxmemorydcwxmemorydc">external documentation</a>.
+-spec new(Dc) -> wxMemoryDC() when
+	Dc::wxDC:wxDC() | wxBitmap:wxBitmap().
 new(#wx_ref{type=DcT,ref=DcRef}) ->
   DcOP = case ?CLASS_T(DcT,wxDC) of
      true ->
@@ -74,24 +77,26 @@ new(#wx_ref{type=DcT,ref=DcRef}) ->
   wxe_util:construct(DcOP,
   <<DcRef:32/?UI>>).
 
-%% @spec (This::wxMemoryDC(), Bmp::wxBitmap:wxBitmap()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmemorydc.html#wxmemorydcselectobject">external documentation</a>.
+-spec selectObject(This, Bmp) -> ok when
+	This::wxMemoryDC(), Bmp::wxBitmap:wxBitmap().
 selectObject(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BmpT,ref=BmpRef}) ->
   ?CLASS(ThisT,wxMemoryDC),
   ?CLASS(BmpT,wxBitmap),
   wxe_util:cast(?wxMemoryDC_SelectObject,
   <<ThisRef:32/?UI,BmpRef:32/?UI>>).
 
-%% @spec (This::wxMemoryDC(), Bmp::wxBitmap:wxBitmap()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmemorydc.html#wxmemorydcselectobjectassource">external documentation</a>.
+-spec selectObjectAsSource(This, Bmp) -> ok when
+	This::wxMemoryDC(), Bmp::wxBitmap:wxBitmap().
 selectObjectAsSource(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BmpT,ref=BmpRef}) ->
   ?CLASS(ThisT,wxMemoryDC),
   ?CLASS(BmpT,wxBitmap),
   wxe_util:cast(?wxMemoryDC_SelectObjectAsSource,
   <<ThisRef:32/?UI,BmpRef:32/?UI>>).
 
-%% @spec (This::wxMemoryDC()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxMemoryDC) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxMemoryDC),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxMenu.erl b/lib/wx/src/gen/wxMenu.erl
index 615a845d11..dd674b117d 100644
--- a/lib/wx/src/gen/wxMenu.erl
+++ b/lib/wx/src/gen/wxMenu.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -40,18 +40,21 @@
 %% inherited exports
 -export([connect/2,connect/3,disconnect/1,disconnect/2,disconnect/3,parent_class/1]).
 
+-export_type([wxMenu/0]).
 %% @hidden
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxMenu()
+-type wxMenu() :: wx:wx_object().
 %% @equiv new([])
+-spec new() -> wxMenu().
+
 new() ->
   new([]).
 
-%% @spec ([Option]) -> wxMenu()
-%% Option = {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenuwxmenu">external documentation</a>.
+-spec new([Option]) -> wxMenu() when
+	Option :: {style, integer()}.
 new(Options)
  when is_list(Options) ->
   MOpts = fun({style, Style}, Acc) -> [<<1:32/?UI,Style:32/?UI>>|Acc];
@@ -60,9 +63,10 @@ new(Options)
   wxe_util:construct(?wxMenu_new_1,
   <<BinOpt/binary>>).
 
-%% @spec (Title::string(), [Option]) -> wxMenu()
-%% Option = {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenuwxmenu">external documentation</a>.
+-spec new(Title, [Option]) -> wxMenu() when
+	Title::string(),
+	Option :: {style, integer()}.
 new(Title, Options)
  when is_list(Title),is_list(Options) ->
   Title_UC = unicode:characters_to_binary([Title,0]),
@@ -72,31 +76,30 @@ new(Title, Options)
   wxe_util:construct(?wxMenu_new_2,
   <<(byte_size(Title_UC)):32/?UI,(Title_UC)/binary, 0:(((8- ((4+byte_size(Title_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxMenu(), Item::wxMenuItem:wxMenuItem()) -> wxMenuItem:wxMenuItem()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenuappend">external documentation</a>.
+-spec append(This, Item) -> wxMenuItem:wxMenuItem() when
+	This::wxMenu(), Item::wxMenuItem:wxMenuItem().
 append(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ItemT,ref=ItemRef}) ->
   ?CLASS(ThisT,wxMenu),
   ?CLASS(ItemT,wxMenuItem),
   wxe_util:call(?wxMenu_Append_1,
   <<ThisRef:32/?UI,ItemRef:32/?UI>>).
 
-%% @spec (This::wxMenu(), Itemid::integer(), Text::string()) -> wxMenuItem:wxMenuItem()
 %% @equiv append(This,Itemid,Text, [])
+-spec append(This, Itemid, Text) -> wxMenuItem:wxMenuItem() when
+	This::wxMenu(), Itemid::integer(), Text::string().
+
 append(This,Itemid,Text)
  when is_record(This, wx_ref),is_integer(Itemid),is_list(Text) ->
   append(This,Itemid,Text, []).
 
-%% @spec (This::wxMenu(),Itemid::integer(),Text::string(),X::wxMenu()|term()) -> wxMenuItem:wxMenuItem()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenuappend">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% append(This::wxMenu(), Itemid::integer(), Text::string(), Submenu::wxMenu()) -> append(This,Itemid,Text,Submenu, []) </c></p>
-%% <p><c>
-%% append(This::wxMenu(), Itemid::integer(), Text::string(), [Option]) -> wxMenuItem:wxMenuItem() </c>
-%%<br /> Option = {help, string()} | {kind, WxItemKind}
-%%<br /> WxItemKind = integer()
-%%<br /> WxItemKind is one of ?wxITEM_SEPARATOR | ?wxITEM_NORMAL | ?wxITEM_CHECK | ?wxITEM_RADIO | ?wxITEM_MAX
-%% </p>
+-spec append(This, Itemid, Text, Submenu) -> wxMenuItem:wxMenuItem() when
+	This::wxMenu(), Itemid::integer(), Text::string(), Submenu::wxMenu();
+      (This, Itemid, Text, [Option]) -> wxMenuItem:wxMenuItem() when
+	This::wxMenu(), Itemid::integer(), Text::string(),
+	Option :: {help, string()}
+		 | {kind, wx:wx_enum()}.
 
 append(This,Itemid,Text,Submenu)
  when is_record(This, wx_ref),is_integer(Itemid),is_list(Text),is_record(Submenu, wx_ref) ->
@@ -112,16 +115,12 @@ append(#wx_ref{type=ThisT,ref=ThisRef},Itemid,Text, Options)
   wxe_util:call(?wxMenu_Append_3,
   <<ThisRef:32/?UI,Itemid:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((4+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxMenu(),Itemid::integer(),Text::string(),X::string()|wxMenu(),X::bool()|term()) -> ok|wxMenuItem:wxMenuItem()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenuappend">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% append(This::wxMenu(), Itemid::integer(), Text::string(), Help::string(), IsCheckable::bool()) -> ok </c>
-%% </p>
-%% <p><c>
-%% append(This::wxMenu(), Itemid::integer(), Text::string(), Submenu::wxMenu(), [Option]) -> wxMenuItem:wxMenuItem() </c>
-%%<br /> Option = {help, string()}
-%% </p>
+-spec append(This, Itemid, Text, Help, IsCheckable) -> ok when
+	This::wxMenu(), Itemid::integer(), Text::string(), Help::string(), IsCheckable::boolean();
+      (This, Itemid, Text, Submenu, [Option]) -> wxMenuItem:wxMenuItem() when
+	This::wxMenu(), Itemid::integer(), Text::string(), Submenu::wxMenu(),
+	Option :: {help, string()}.
 append(#wx_ref{type=ThisT,ref=ThisRef},Itemid,Text,Help,IsCheckable)
  when is_integer(Itemid),is_list(Text),is_list(Help),is_boolean(IsCheckable) ->
   ?CLASS(ThisT,wxMenu),
@@ -140,15 +139,18 @@ append(#wx_ref{type=ThisT,ref=ThisRef},Itemid,Text,#wx_ref{type=SubmenuT,ref=Sub
   wxe_util:call(?wxMenu_Append_4_1,
   <<ThisRef:32/?UI,Itemid:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((4+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8,SubmenuRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxMenu(), Itemid::integer(), Text::string()) -> wxMenuItem:wxMenuItem()
 %% @equiv appendCheckItem(This,Itemid,Text, [])
+-spec appendCheckItem(This, Itemid, Text) -> wxMenuItem:wxMenuItem() when
+	This::wxMenu(), Itemid::integer(), Text::string().
+
 appendCheckItem(This,Itemid,Text)
  when is_record(This, wx_ref),is_integer(Itemid),is_list(Text) ->
   appendCheckItem(This,Itemid,Text, []).
 
-%% @spec (This::wxMenu(), Itemid::integer(), Text::string(), [Option]) -> wxMenuItem:wxMenuItem()
-%% Option = {help, string()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenuappendcheckitem">external documentation</a>.
+-spec appendCheckItem(This, Itemid, Text, [Option]) -> wxMenuItem:wxMenuItem() when
+	This::wxMenu(), Itemid::integer(), Text::string(),
+	Option :: {help, string()}.
 appendCheckItem(#wx_ref{type=ThisT,ref=ThisRef},Itemid,Text, Options)
  when is_integer(Itemid),is_list(Text),is_list(Options) ->
   ?CLASS(ThisT,wxMenu),
@@ -159,15 +161,18 @@ appendCheckItem(#wx_ref{type=ThisT,ref=ThisRef},Itemid,Text, Options)
   wxe_util:call(?wxMenu_AppendCheckItem,
   <<ThisRef:32/?UI,Itemid:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((4+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxMenu(), Itemid::integer(), Text::string()) -> wxMenuItem:wxMenuItem()
 %% @equiv appendRadioItem(This,Itemid,Text, [])
+-spec appendRadioItem(This, Itemid, Text) -> wxMenuItem:wxMenuItem() when
+	This::wxMenu(), Itemid::integer(), Text::string().
+
 appendRadioItem(This,Itemid,Text)
  when is_record(This, wx_ref),is_integer(Itemid),is_list(Text) ->
   appendRadioItem(This,Itemid,Text, []).
 
-%% @spec (This::wxMenu(), Itemid::integer(), Text::string(), [Option]) -> wxMenuItem:wxMenuItem()
-%% Option = {help, string()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenuappendradioitem">external documentation</a>.
+-spec appendRadioItem(This, Itemid, Text, [Option]) -> wxMenuItem:wxMenuItem() when
+	This::wxMenu(), Itemid::integer(), Text::string(),
+	Option :: {help, string()}.
 appendRadioItem(#wx_ref{type=ThisT,ref=ThisRef},Itemid,Text, Options)
  when is_integer(Itemid),is_list(Text),is_list(Options) ->
   ?CLASS(ThisT,wxMenu),
@@ -178,37 +183,36 @@ appendRadioItem(#wx_ref{type=ThisT,ref=ThisRef},Itemid,Text, Options)
   wxe_util:call(?wxMenu_AppendRadioItem,
   <<ThisRef:32/?UI,Itemid:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((4+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxMenu()) -> wxMenuItem:wxMenuItem()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenuappendseparator">external documentation</a>.
+-spec appendSeparator(This) -> wxMenuItem:wxMenuItem() when
+	This::wxMenu().
 appendSeparator(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMenu),
   wxe_util:call(?wxMenu_AppendSeparator,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxMenu()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenubreak">external documentation</a>.
+-spec break(This) -> ok when
+	This::wxMenu().
 break(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMenu),
   wxe_util:cast(?wxMenu_Break,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxMenu(), Itemid::integer(), Check::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenucheck">external documentation</a>.
+-spec check(This, Itemid, Check) -> ok when
+	This::wxMenu(), Itemid::integer(), Check::boolean().
 check(#wx_ref{type=ThisT,ref=ThisRef},Itemid,Check)
  when is_integer(Itemid),is_boolean(Check) ->
   ?CLASS(ThisT,wxMenu),
   wxe_util:cast(?wxMenu_Check,
   <<ThisRef:32/?UI,Itemid:32/?UI,(wxe_util:from_bool(Check)):32/?UI>>).
 
-%% @spec (This::wxMenu(),X::integer()|term()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenudelete">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% delete(This::wxMenu(), Itemid::integer()) -> bool() </c>
-%% </p>
-%% <p><c>
-%% delete(This::wxMenu(), Item::wxMenuItem:wxMenuItem()) -> bool() </c>
-%% </p>
+-spec delete(This, Itemid) -> boolean() when
+	This::wxMenu(), Itemid::integer();
+      (This, Item) -> boolean() when
+	This::wxMenu(), Item::wxMenuItem:wxMenuItem().
 delete(#wx_ref{type=ThisT,ref=ThisRef},Itemid)
  when is_integer(Itemid) ->
   ?CLASS(ThisT,wxMenu),
@@ -220,15 +224,11 @@ delete(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ItemT,ref=ItemRef}) ->
   wxe_util:call(?wxMenu_Delete_1_1,
   <<ThisRef:32/?UI,ItemRef:32/?UI>>).
 
-%% @spec (This::wxMenu(),X::integer()|term()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenudestroy">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% 'Destroy'(This::wxMenu(), Itemid::integer()) -> bool() </c>
-%% </p>
-%% <p><c>
-%% 'Destroy'(This::wxMenu(), Item::wxMenuItem:wxMenuItem()) -> bool() </c>
-%% </p>
+-spec 'Destroy'(This, Itemid) -> boolean() when
+	This::wxMenu(), Itemid::integer();
+      (This, Item) -> boolean() when
+	This::wxMenu(), Item::wxMenuItem:wxMenuItem().
 'Destroy'(#wx_ref{type=ThisT,ref=ThisRef},Itemid)
  when is_integer(Itemid) ->
   ?CLASS(ThisT,wxMenu),
@@ -240,23 +240,20 @@ delete(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ItemT,ref=ItemRef}) ->
   wxe_util:call(?wxMenu_Destroy_1_1,
   <<ThisRef:32/?UI,ItemRef:32/?UI>>).
 
-%% @spec (This::wxMenu(), Itemid::integer(), Enable::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenuenable">external documentation</a>.
+-spec enable(This, Itemid, Enable) -> ok when
+	This::wxMenu(), Itemid::integer(), Enable::boolean().
 enable(#wx_ref{type=ThisT,ref=ThisRef},Itemid,Enable)
  when is_integer(Itemid),is_boolean(Enable) ->
   ?CLASS(ThisT,wxMenu),
   wxe_util:cast(?wxMenu_Enable,
   <<ThisRef:32/?UI,Itemid:32/?UI,(wxe_util:from_bool(Enable)):32/?UI>>).
 
-%% @spec (This::wxMenu(),X::integer()|string()) -> wxMenuItem:wxMenuItem()|integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenufinditem">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% findItem(This::wxMenu(), Itemid::integer()) -> wxMenuItem:wxMenuItem() </c>
-%% </p>
-%% <p><c>
-%% findItem(This::wxMenu(), Item::string()) -> integer() </c>
-%% </p>
+-spec findItem(This, Itemid) -> wxMenuItem:wxMenuItem() when
+	This::wxMenu(), Itemid::integer();
+      (This, Item) -> integer() when
+	This::wxMenu(), Item::string().
 findItem(#wx_ref{type=ThisT,ref=ThisRef},Itemid)
  when is_integer(Itemid) ->
   ?CLASS(ThisT,wxMenu),
@@ -269,59 +266,62 @@ findItem(#wx_ref{type=ThisT,ref=ThisRef},Item)
   wxe_util:call(?wxMenu_FindItem_1,
   <<ThisRef:32/?UI,(byte_size(Item_UC)):32/?UI,(Item_UC)/binary, 0:(((8- ((0+byte_size(Item_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxMenu(), Position::integer()) -> wxMenuItem:wxMenuItem()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenufinditembyposition">external documentation</a>.
+-spec findItemByPosition(This, Position) -> wxMenuItem:wxMenuItem() when
+	This::wxMenu(), Position::integer().
 findItemByPosition(#wx_ref{type=ThisT,ref=ThisRef},Position)
  when is_integer(Position) ->
   ?CLASS(ThisT,wxMenu),
   wxe_util:call(?wxMenu_FindItemByPosition,
   <<ThisRef:32/?UI,Position:32/?UI>>).
 
-%% @spec (This::wxMenu(), Itemid::integer()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenugethelpstring">external documentation</a>.
+-spec getHelpString(This, Itemid) -> string() when
+	This::wxMenu(), Itemid::integer().
 getHelpString(#wx_ref{type=ThisT,ref=ThisRef},Itemid)
  when is_integer(Itemid) ->
   ?CLASS(ThisT,wxMenu),
   wxe_util:call(?wxMenu_GetHelpString,
   <<ThisRef:32/?UI,Itemid:32/?UI>>).
 
-%% @spec (This::wxMenu(), Itemid::integer()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenugetlabel">external documentation</a>.
+-spec getLabel(This, Itemid) -> string() when
+	This::wxMenu(), Itemid::integer().
 getLabel(#wx_ref{type=ThisT,ref=ThisRef},Itemid)
  when is_integer(Itemid) ->
   ?CLASS(ThisT,wxMenu),
   wxe_util:call(?wxMenu_GetLabel,
   <<ThisRef:32/?UI,Itemid:32/?UI>>).
 
-%% @spec (This::wxMenu()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenugetmenuitemcount">external documentation</a>.
+-spec getMenuItemCount(This) -> integer() when
+	This::wxMenu().
 getMenuItemCount(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMenu),
   wxe_util:call(?wxMenu_GetMenuItemCount,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxMenu()) -> [wxMenuItem:wxMenuItem()]
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenugetmenuitems">external documentation</a>.
+-spec getMenuItems(This) -> [wxMenuItem:wxMenuItem()] when
+	This::wxMenu().
 getMenuItems(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMenu),
   wxe_util:call(?wxMenu_GetMenuItems,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxMenu()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenugettitle">external documentation</a>.
+-spec getTitle(This) -> string() when
+	This::wxMenu().
 getTitle(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMenu),
   wxe_util:call(?wxMenu_GetTitle,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxMenu(),Pos::integer(),X::integer()|term()) -> wxMenuItem:wxMenuItem()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenuinsert">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% insert(This::wxMenu(), Pos::integer(), Itemid::integer()) -> insert(This,Pos,Itemid, []) </c></p>
-%% <p><c>
-%% insert(This::wxMenu(), Pos::integer(), Item::wxMenuItem:wxMenuItem()) -> wxMenuItem:wxMenuItem() </c>
-%% </p>
+-spec insert(This, Pos, Itemid) -> wxMenuItem:wxMenuItem() when
+	This::wxMenu(), Pos::integer(), Itemid::integer();
+      (This, Pos, Item) -> wxMenuItem:wxMenuItem() when
+	This::wxMenu(), Pos::integer(), Item::wxMenuItem:wxMenuItem().
 
 insert(This,Pos,Itemid)
  when is_record(This, wx_ref),is_integer(Pos),is_integer(Itemid) ->
@@ -333,11 +333,13 @@ insert(#wx_ref{type=ThisT,ref=ThisRef},Pos,#wx_ref{type=ItemT,ref=ItemRef})
   wxe_util:call(?wxMenu_Insert_2,
   <<ThisRef:32/?UI,Pos:32/?UI,ItemRef:32/?UI>>).
 
-%% @spec (This::wxMenu(), Pos::integer(), Itemid::integer(), [Option]) -> wxMenuItem:wxMenuItem()
-%% Option = {text, string()} | {help, string()} | {kind, WxItemKind}
-%% WxItemKind = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenuinsert">external documentation</a>.
-%%<br /> WxItemKind is one of ?wxITEM_SEPARATOR | ?wxITEM_NORMAL | ?wxITEM_CHECK | ?wxITEM_RADIO | ?wxITEM_MAX
+%%<br /> Kind = ?wxITEM_SEPARATOR | ?wxITEM_NORMAL | ?wxITEM_CHECK | ?wxITEM_RADIO | ?wxITEM_MAX
+-spec insert(This, Pos, Itemid, [Option]) -> wxMenuItem:wxMenuItem() when
+	This::wxMenu(), Pos::integer(), Itemid::integer(),
+	Option :: {text, string()}
+		 | {help, string()}
+		 | {kind, wx:wx_enum()}.
 insert(#wx_ref{type=ThisT,ref=ThisRef},Pos,Itemid, Options)
  when is_integer(Pos),is_integer(Itemid),is_list(Options) ->
   ?CLASS(ThisT,wxMenu),
@@ -349,22 +351,20 @@ insert(#wx_ref{type=ThisT,ref=ThisRef},Pos,Itemid, Options)
   wxe_util:call(?wxMenu_Insert_3,
   <<ThisRef:32/?UI,Pos:32/?UI,Itemid:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxMenu(), Pos::integer(), Itemid::integer(), Text::string(), Submenu::wxMenu()) -> wxMenuItem:wxMenuItem()
 %% @equiv insert(This,Pos,Itemid,Text,Submenu, [])
+-spec insert(This, Pos, Itemid, Text, Submenu) -> wxMenuItem:wxMenuItem() when
+	This::wxMenu(), Pos::integer(), Itemid::integer(), Text::string(), Submenu::wxMenu().
+
 insert(This,Pos,Itemid,Text,Submenu)
  when is_record(This, wx_ref),is_integer(Pos),is_integer(Itemid),is_list(Text),is_record(Submenu, wx_ref) ->
   insert(This,Pos,Itemid,Text,Submenu, []).
 
-%% @spec (This::wxMenu(),Pos::integer(),Itemid::integer(),Text::string(),X::string()|wxMenu(),X::bool()|term()) -> ok|wxMenuItem:wxMenuItem()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenuinsert">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% insert(This::wxMenu(), Pos::integer(), Itemid::integer(), Text::string(), Help::string(), IsCheckable::bool()) -> ok </c>
-%% </p>
-%% <p><c>
-%% insert(This::wxMenu(), Pos::integer(), Itemid::integer(), Text::string(), Submenu::wxMenu(), [Option]) -> wxMenuItem:wxMenuItem() </c>
-%%<br /> Option = {help, string()}
-%% </p>
+-spec insert(This, Pos, Itemid, Text, Help, IsCheckable) -> ok when
+	This::wxMenu(), Pos::integer(), Itemid::integer(), Text::string(), Help::string(), IsCheckable::boolean();
+      (This, Pos, Itemid, Text, Submenu, [Option]) -> wxMenuItem:wxMenuItem() when
+	This::wxMenu(), Pos::integer(), Itemid::integer(), Text::string(), Submenu::wxMenu(),
+	Option :: {help, string()}.
 insert(#wx_ref{type=ThisT,ref=ThisRef},Pos,Itemid,Text,Help,IsCheckable)
  when is_integer(Pos),is_integer(Itemid),is_list(Text),is_list(Help),is_boolean(IsCheckable) ->
   ?CLASS(ThisT,wxMenu),
@@ -383,15 +383,18 @@ insert(#wx_ref{type=ThisT,ref=ThisRef},Pos,Itemid,Text,#wx_ref{type=SubmenuT,ref
   wxe_util:call(?wxMenu_Insert_5_1,
   <<ThisRef:32/?UI,Pos:32/?UI,Itemid:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8,SubmenuRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxMenu(), Pos::integer(), Itemid::integer(), Text::string()) -> wxMenuItem:wxMenuItem()
 %% @equiv insertCheckItem(This,Pos,Itemid,Text, [])
+-spec insertCheckItem(This, Pos, Itemid, Text) -> wxMenuItem:wxMenuItem() when
+	This::wxMenu(), Pos::integer(), Itemid::integer(), Text::string().
+
 insertCheckItem(This,Pos,Itemid,Text)
  when is_record(This, wx_ref),is_integer(Pos),is_integer(Itemid),is_list(Text) ->
   insertCheckItem(This,Pos,Itemid,Text, []).
 
-%% @spec (This::wxMenu(), Pos::integer(), Itemid::integer(), Text::string(), [Option]) -> wxMenuItem:wxMenuItem()
-%% Option = {help, string()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenuinsertcheckitem">external documentation</a>.
+-spec insertCheckItem(This, Pos, Itemid, Text, [Option]) -> wxMenuItem:wxMenuItem() when
+	This::wxMenu(), Pos::integer(), Itemid::integer(), Text::string(),
+	Option :: {help, string()}.
 insertCheckItem(#wx_ref{type=ThisT,ref=ThisRef},Pos,Itemid,Text, Options)
  when is_integer(Pos),is_integer(Itemid),is_list(Text),is_list(Options) ->
   ?CLASS(ThisT,wxMenu),
@@ -402,15 +405,18 @@ insertCheckItem(#wx_ref{type=ThisT,ref=ThisRef},Pos,Itemid,Text, Options)
   wxe_util:call(?wxMenu_InsertCheckItem,
   <<ThisRef:32/?UI,Pos:32/?UI,Itemid:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxMenu(), Pos::integer(), Itemid::integer(), Text::string()) -> wxMenuItem:wxMenuItem()
 %% @equiv insertRadioItem(This,Pos,Itemid,Text, [])
+-spec insertRadioItem(This, Pos, Itemid, Text) -> wxMenuItem:wxMenuItem() when
+	This::wxMenu(), Pos::integer(), Itemid::integer(), Text::string().
+
 insertRadioItem(This,Pos,Itemid,Text)
  when is_record(This, wx_ref),is_integer(Pos),is_integer(Itemid),is_list(Text) ->
   insertRadioItem(This,Pos,Itemid,Text, []).
 
-%% @spec (This::wxMenu(), Pos::integer(), Itemid::integer(), Text::string(), [Option]) -> wxMenuItem:wxMenuItem()
-%% Option = {help, string()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenuinsertradioitem">external documentation</a>.
+-spec insertRadioItem(This, Pos, Itemid, Text, [Option]) -> wxMenuItem:wxMenuItem() when
+	This::wxMenu(), Pos::integer(), Itemid::integer(), Text::string(),
+	Option :: {help, string()}.
 insertRadioItem(#wx_ref{type=ThisT,ref=ThisRef},Pos,Itemid,Text, Options)
  when is_integer(Pos),is_integer(Itemid),is_list(Text),is_list(Options) ->
   ?CLASS(ThisT,wxMenu),
@@ -421,38 +427,38 @@ insertRadioItem(#wx_ref{type=ThisT,ref=ThisRef},Pos,Itemid,Text, Options)
   wxe_util:call(?wxMenu_InsertRadioItem,
   <<ThisRef:32/?UI,Pos:32/?UI,Itemid:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxMenu(), Pos::integer()) -> wxMenuItem:wxMenuItem()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenuinsertseparator">external documentation</a>.
+-spec insertSeparator(This, Pos) -> wxMenuItem:wxMenuItem() when
+	This::wxMenu(), Pos::integer().
 insertSeparator(#wx_ref{type=ThisT,ref=ThisRef},Pos)
  when is_integer(Pos) ->
   ?CLASS(ThisT,wxMenu),
   wxe_util:call(?wxMenu_InsertSeparator,
   <<ThisRef:32/?UI,Pos:32/?UI>>).
 
-%% @spec (This::wxMenu(), Itemid::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenuischecked">external documentation</a>.
+-spec isChecked(This, Itemid) -> boolean() when
+	This::wxMenu(), Itemid::integer().
 isChecked(#wx_ref{type=ThisT,ref=ThisRef},Itemid)
  when is_integer(Itemid) ->
   ?CLASS(ThisT,wxMenu),
   wxe_util:call(?wxMenu_IsChecked,
   <<ThisRef:32/?UI,Itemid:32/?UI>>).
 
-%% @spec (This::wxMenu(), Itemid::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenuisenabled">external documentation</a>.
+-spec isEnabled(This, Itemid) -> boolean() when
+	This::wxMenu(), Itemid::integer().
 isEnabled(#wx_ref{type=ThisT,ref=ThisRef},Itemid)
  when is_integer(Itemid) ->
   ?CLASS(ThisT,wxMenu),
   wxe_util:call(?wxMenu_IsEnabled,
   <<ThisRef:32/?UI,Itemid:32/?UI>>).
 
-%% @spec (This::wxMenu(),X::integer()|term()) -> wxMenuItem:wxMenuItem()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenuprepend">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% prepend(This::wxMenu(), Itemid::integer()) -> prepend(This,Itemid, []) </c></p>
-%% <p><c>
-%% prepend(This::wxMenu(), Item::wxMenuItem:wxMenuItem()) -> wxMenuItem:wxMenuItem() </c>
-%% </p>
+-spec prepend(This, Itemid) -> wxMenuItem:wxMenuItem() when
+	This::wxMenu(), Itemid::integer();
+      (This, Item) -> wxMenuItem:wxMenuItem() when
+	This::wxMenu(), Item::wxMenuItem:wxMenuItem().
 
 prepend(This,Itemid)
  when is_record(This, wx_ref),is_integer(Itemid) ->
@@ -463,11 +469,13 @@ prepend(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ItemT,ref=ItemRef}) ->
   wxe_util:call(?wxMenu_Prepend_1,
   <<ThisRef:32/?UI,ItemRef:32/?UI>>).
 
-%% @spec (This::wxMenu(), Itemid::integer(), [Option]) -> wxMenuItem:wxMenuItem()
-%% Option = {text, string()} | {help, string()} | {kind, WxItemKind}
-%% WxItemKind = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenuprepend">external documentation</a>.
-%%<br /> WxItemKind is one of ?wxITEM_SEPARATOR | ?wxITEM_NORMAL | ?wxITEM_CHECK | ?wxITEM_RADIO | ?wxITEM_MAX
+%%<br /> Kind = ?wxITEM_SEPARATOR | ?wxITEM_NORMAL | ?wxITEM_CHECK | ?wxITEM_RADIO | ?wxITEM_MAX
+-spec prepend(This, Itemid, [Option]) -> wxMenuItem:wxMenuItem() when
+	This::wxMenu(), Itemid::integer(),
+	Option :: {text, string()}
+		 | {help, string()}
+		 | {kind, wx:wx_enum()}.
 prepend(#wx_ref{type=ThisT,ref=ThisRef},Itemid, Options)
  when is_integer(Itemid),is_list(Options) ->
   ?CLASS(ThisT,wxMenu),
@@ -479,22 +487,20 @@ prepend(#wx_ref{type=ThisT,ref=ThisRef},Itemid, Options)
   wxe_util:call(?wxMenu_Prepend_2,
   <<ThisRef:32/?UI,Itemid:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxMenu(), Itemid::integer(), Text::string(), Submenu::wxMenu()) -> wxMenuItem:wxMenuItem()
 %% @equiv prepend(This,Itemid,Text,Submenu, [])
+-spec prepend(This, Itemid, Text, Submenu) -> wxMenuItem:wxMenuItem() when
+	This::wxMenu(), Itemid::integer(), Text::string(), Submenu::wxMenu().
+
 prepend(This,Itemid,Text,Submenu)
  when is_record(This, wx_ref),is_integer(Itemid),is_list(Text),is_record(Submenu, wx_ref) ->
   prepend(This,Itemid,Text,Submenu, []).
 
-%% @spec (This::wxMenu(),Itemid::integer(),Text::string(),X::string()|wxMenu(),X::bool()|term()) -> ok|wxMenuItem:wxMenuItem()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenuprepend">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% prepend(This::wxMenu(), Itemid::integer(), Text::string(), Help::string(), IsCheckable::bool()) -> ok </c>
-%% </p>
-%% <p><c>
-%% prepend(This::wxMenu(), Itemid::integer(), Text::string(), Submenu::wxMenu(), [Option]) -> wxMenuItem:wxMenuItem() </c>
-%%<br /> Option = {help, string()}
-%% </p>
+-spec prepend(This, Itemid, Text, Help, IsCheckable) -> ok when
+	This::wxMenu(), Itemid::integer(), Text::string(), Help::string(), IsCheckable::boolean();
+      (This, Itemid, Text, Submenu, [Option]) -> wxMenuItem:wxMenuItem() when
+	This::wxMenu(), Itemid::integer(), Text::string(), Submenu::wxMenu(),
+	Option :: {help, string()}.
 prepend(#wx_ref{type=ThisT,ref=ThisRef},Itemid,Text,Help,IsCheckable)
  when is_integer(Itemid),is_list(Text),is_list(Help),is_boolean(IsCheckable) ->
   ?CLASS(ThisT,wxMenu),
@@ -513,15 +519,18 @@ prepend(#wx_ref{type=ThisT,ref=ThisRef},Itemid,Text,#wx_ref{type=SubmenuT,ref=Su
   wxe_util:call(?wxMenu_Prepend_4_1,
   <<ThisRef:32/?UI,Itemid:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((4+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8,SubmenuRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxMenu(), Itemid::integer(), Text::string()) -> wxMenuItem:wxMenuItem()
 %% @equiv prependCheckItem(This,Itemid,Text, [])
+-spec prependCheckItem(This, Itemid, Text) -> wxMenuItem:wxMenuItem() when
+	This::wxMenu(), Itemid::integer(), Text::string().
+
 prependCheckItem(This,Itemid,Text)
  when is_record(This, wx_ref),is_integer(Itemid),is_list(Text) ->
   prependCheckItem(This,Itemid,Text, []).
 
-%% @spec (This::wxMenu(), Itemid::integer(), Text::string(), [Option]) -> wxMenuItem:wxMenuItem()
-%% Option = {help, string()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenuprependcheckitem">external documentation</a>.
+-spec prependCheckItem(This, Itemid, Text, [Option]) -> wxMenuItem:wxMenuItem() when
+	This::wxMenu(), Itemid::integer(), Text::string(),
+	Option :: {help, string()}.
 prependCheckItem(#wx_ref{type=ThisT,ref=ThisRef},Itemid,Text, Options)
  when is_integer(Itemid),is_list(Text),is_list(Options) ->
   ?CLASS(ThisT,wxMenu),
@@ -532,15 +541,18 @@ prependCheckItem(#wx_ref{type=ThisT,ref=ThisRef},Itemid,Text, Options)
   wxe_util:call(?wxMenu_PrependCheckItem,
   <<ThisRef:32/?UI,Itemid:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((4+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxMenu(), Itemid::integer(), Text::string()) -> wxMenuItem:wxMenuItem()
 %% @equiv prependRadioItem(This,Itemid,Text, [])
+-spec prependRadioItem(This, Itemid, Text) -> wxMenuItem:wxMenuItem() when
+	This::wxMenu(), Itemid::integer(), Text::string().
+
 prependRadioItem(This,Itemid,Text)
  when is_record(This, wx_ref),is_integer(Itemid),is_list(Text) ->
   prependRadioItem(This,Itemid,Text, []).
 
-%% @spec (This::wxMenu(), Itemid::integer(), Text::string(), [Option]) -> wxMenuItem:wxMenuItem()
-%% Option = {help, string()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenuprependradioitem">external documentation</a>.
+-spec prependRadioItem(This, Itemid, Text, [Option]) -> wxMenuItem:wxMenuItem() when
+	This::wxMenu(), Itemid::integer(), Text::string(),
+	Option :: {help, string()}.
 prependRadioItem(#wx_ref{type=ThisT,ref=ThisRef},Itemid,Text, Options)
  when is_integer(Itemid),is_list(Text),is_list(Options) ->
   ?CLASS(ThisT,wxMenu),
@@ -551,22 +563,19 @@ prependRadioItem(#wx_ref{type=ThisT,ref=ThisRef},Itemid,Text, Options)
   wxe_util:call(?wxMenu_PrependRadioItem,
   <<ThisRef:32/?UI,Itemid:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((4+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxMenu()) -> wxMenuItem:wxMenuItem()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenuprependseparator">external documentation</a>.
+-spec prependSeparator(This) -> wxMenuItem:wxMenuItem() when
+	This::wxMenu().
 prependSeparator(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMenu),
   wxe_util:call(?wxMenu_PrependSeparator,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxMenu(),X::integer()|term()) -> wxMenuItem:wxMenuItem()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenuremove">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% remove(This::wxMenu(), Itemid::integer()) -> wxMenuItem:wxMenuItem() </c>
-%% </p>
-%% <p><c>
-%% remove(This::wxMenu(), Item::wxMenuItem:wxMenuItem()) -> wxMenuItem:wxMenuItem() </c>
-%% </p>
+-spec remove(This, Itemid) -> wxMenuItem:wxMenuItem() when
+	This::wxMenu(), Itemid::integer();
+      (This, Item) -> wxMenuItem:wxMenuItem() when
+	This::wxMenu(), Item::wxMenuItem:wxMenuItem().
 remove(#wx_ref{type=ThisT,ref=ThisRef},Itemid)
  when is_integer(Itemid) ->
   ?CLASS(ThisT,wxMenu),
@@ -578,8 +587,9 @@ remove(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ItemT,ref=ItemRef}) ->
   wxe_util:call(?wxMenu_Remove_1_1,
   <<ThisRef:32/?UI,ItemRef:32/?UI>>).
 
-%% @spec (This::wxMenu(), Itemid::integer(), HelpString::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenusethelpstring">external documentation</a>.
+-spec setHelpString(This, Itemid, HelpString) -> ok when
+	This::wxMenu(), Itemid::integer(), HelpString::string().
 setHelpString(#wx_ref{type=ThisT,ref=ThisRef},Itemid,HelpString)
  when is_integer(Itemid),is_list(HelpString) ->
   ?CLASS(ThisT,wxMenu),
@@ -587,8 +597,9 @@ setHelpString(#wx_ref{type=ThisT,ref=ThisRef},Itemid,HelpString)
   wxe_util:cast(?wxMenu_SetHelpString,
   <<ThisRef:32/?UI,Itemid:32/?UI,(byte_size(HelpString_UC)):32/?UI,(HelpString_UC)/binary, 0:(((8- ((4+byte_size(HelpString_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxMenu(), Itemid::integer(), Label::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenusetlabel">external documentation</a>.
+-spec setLabel(This, Itemid, Label) -> ok when
+	This::wxMenu(), Itemid::integer(), Label::string().
 setLabel(#wx_ref{type=ThisT,ref=ThisRef},Itemid,Label)
  when is_integer(Itemid),is_list(Label) ->
   ?CLASS(ThisT,wxMenu),
@@ -596,8 +607,9 @@ setLabel(#wx_ref{type=ThisT,ref=ThisRef},Itemid,Label)
   wxe_util:cast(?wxMenu_SetLabel,
   <<ThisRef:32/?UI,Itemid:32/?UI,(byte_size(Label_UC)):32/?UI,(Label_UC)/binary, 0:(((8- ((4+byte_size(Label_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxMenu(), Title::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenusettitle">external documentation</a>.
+-spec setTitle(This, Title) -> ok when
+	This::wxMenu(), Title::string().
 setTitle(#wx_ref{type=ThisT,ref=ThisRef},Title)
  when is_list(Title) ->
   ?CLASS(ThisT,wxMenu),
@@ -605,8 +617,8 @@ setTitle(#wx_ref{type=ThisT,ref=ThisRef},Title)
   wxe_util:cast(?wxMenu_SetTitle,
   <<ThisRef: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>>).
 
-%% @spec (This::wxMenu()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxMenu) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxMenu),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxMenuBar.erl b/lib/wx/src/gen/wxMenuBar.erl
index 4ed1b2cbe6..3538e58791 100644
--- a/lib/wx/src/gen/wxMenuBar.erl
+++ b/lib/wx/src/gen/wxMenuBar.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -72,26 +72,30 @@
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
 
+-export_type([wxMenuBar/0]).
 %% @hidden
 parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxMenuBar()
+-type wxMenuBar() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubarwxmenubar">external documentation</a>.
+-spec new() -> wxMenuBar().
 new() ->
   wxe_util:construct(?wxMenuBar_new_0,
   <<>>).
 
-%% @spec (Style::integer()) -> wxMenuBar()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubarwxmenubar">external documentation</a>.
+-spec new(Style) -> wxMenuBar() when
+	Style::integer().
 new(Style)
  when is_integer(Style) ->
   wxe_util:construct(?wxMenuBar_new_1,
   <<Style:32/?UI>>).
 
-%% @spec (This::wxMenuBar(), Menu::wxMenu:wxMenu(), Title::string()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubarappend">external documentation</a>.
+-spec append(This, Menu, Title) -> boolean() when
+	This::wxMenuBar(), Menu::wxMenu:wxMenu(), Title::string().
 append(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=MenuT,ref=MenuRef},Title)
  when is_list(Title) ->
   ?CLASS(ThisT,wxMenuBar),
@@ -100,23 +104,27 @@ append(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=MenuT,ref=MenuRef},Title)
   wxe_util:call(?wxMenuBar_Append,
   <<ThisRef:32/?UI,MenuRef:32/?UI,(byte_size(Title_UC)):32/?UI,(Title_UC)/binary, 0:(((8- ((4+byte_size(Title_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxMenuBar(), Itemid::integer(), Check::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubarcheck">external documentation</a>.
+-spec check(This, Itemid, Check) -> ok when
+	This::wxMenuBar(), Itemid::integer(), Check::boolean().
 check(#wx_ref{type=ThisT,ref=ThisRef},Itemid,Check)
  when is_integer(Itemid),is_boolean(Check) ->
   ?CLASS(ThisT,wxMenuBar),
   wxe_util:cast(?wxMenuBar_Check,
   <<ThisRef:32/?UI,Itemid:32/?UI,(wxe_util:from_bool(Check)):32/?UI>>).
 
-%% @spec (This::wxMenuBar()) -> bool()
 %% @equiv enable(This, [])
+-spec enable(This) -> boolean() when
+	This::wxMenuBar().
+
 enable(This)
  when is_record(This, wx_ref) ->
   enable(This, []).
 
-%% @spec (This::wxMenuBar(), [Option]) -> bool()
-%% Option = {enable, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubarenable">external documentation</a>.
+-spec enable(This, [Option]) -> boolean() when
+	This::wxMenuBar(),
+	Option :: {enable, boolean()}.
 enable(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxMenuBar),
@@ -126,24 +134,27 @@ enable(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxMenuBar_Enable_1,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxMenuBar(), Itemid::integer(), Enable::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubarenable">external documentation</a>.
+-spec enable(This, Itemid, Enable) -> ok when
+	This::wxMenuBar(), Itemid::integer(), Enable::boolean().
 enable(#wx_ref{type=ThisT,ref=ThisRef},Itemid,Enable)
  when is_integer(Itemid),is_boolean(Enable) ->
   ?CLASS(ThisT,wxMenuBar),
   wxe_util:cast(?wxMenuBar_Enable_2,
   <<ThisRef:32/?UI,Itemid:32/?UI,(wxe_util:from_bool(Enable)):32/?UI>>).
 
-%% @spec (This::wxMenuBar(), Pos::integer(), Flag::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubarenabletop">external documentation</a>.
+-spec enableTop(This, Pos, Flag) -> ok when
+	This::wxMenuBar(), Pos::integer(), Flag::boolean().
 enableTop(#wx_ref{type=ThisT,ref=ThisRef},Pos,Flag)
  when is_integer(Pos),is_boolean(Flag) ->
   ?CLASS(ThisT,wxMenuBar),
   wxe_util:cast(?wxMenuBar_EnableTop,
   <<ThisRef:32/?UI,Pos:32/?UI,(wxe_util:from_bool(Flag)):32/?UI>>).
 
-%% @spec (This::wxMenuBar(), Title::string()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubarfindmenu">external documentation</a>.
+-spec findMenu(This, Title) -> integer() when
+	This::wxMenuBar(), Title::string().
 findMenu(#wx_ref{type=ThisT,ref=ThisRef},Title)
  when is_list(Title) ->
   ?CLASS(ThisT,wxMenuBar),
@@ -151,8 +162,9 @@ findMenu(#wx_ref{type=ThisT,ref=ThisRef},Title)
   wxe_util:call(?wxMenuBar_FindMenu,
   <<ThisRef: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>>).
 
-%% @spec (This::wxMenuBar(), MenuString::string(), ItemString::string()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubarfindmenuitem">external documentation</a>.
+-spec findMenuItem(This, MenuString, ItemString) -> integer() when
+	This::wxMenuBar(), MenuString::string(), ItemString::string().
 findMenuItem(#wx_ref{type=ThisT,ref=ThisRef},MenuString,ItemString)
  when is_list(MenuString),is_list(ItemString) ->
   ?CLASS(ThisT,wxMenuBar),
@@ -161,62 +173,70 @@ findMenuItem(#wx_ref{type=ThisT,ref=ThisRef},MenuString,ItemString)
   wxe_util:call(?wxMenuBar_FindMenuItem,
   <<ThisRef:32/?UI,(byte_size(MenuString_UC)):32/?UI,(MenuString_UC)/binary, 0:(((8- ((0+byte_size(MenuString_UC)) band 16#7)) band 16#7))/unit:8,(byte_size(ItemString_UC)):32/?UI,(ItemString_UC)/binary, 0:(((8- ((4+byte_size(ItemString_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxMenuBar(), Id::integer()) -> wxMenuItem:wxMenuItem()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubarfinditem">external documentation</a>.
+-spec findItem(This, Id) -> wxMenuItem:wxMenuItem() when
+	This::wxMenuBar(), Id::integer().
 findItem(#wx_ref{type=ThisT,ref=ThisRef},Id)
  when is_integer(Id) ->
   ?CLASS(ThisT,wxMenuBar),
   wxe_util:call(?wxMenuBar_FindItem,
   <<ThisRef:32/?UI,Id:32/?UI>>).
 
-%% @spec (This::wxMenuBar(), Itemid::integer()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubargethelpstring">external documentation</a>.
+-spec getHelpString(This, Itemid) -> string() when
+	This::wxMenuBar(), Itemid::integer().
 getHelpString(#wx_ref{type=ThisT,ref=ThisRef},Itemid)
  when is_integer(Itemid) ->
   ?CLASS(ThisT,wxMenuBar),
   wxe_util:call(?wxMenuBar_GetHelpString,
   <<ThisRef:32/?UI,Itemid:32/?UI>>).
 
-%% @spec (This::wxMenuBar()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubargetlabel">external documentation</a>.
+-spec getLabel(This) -> string() when
+	This::wxMenuBar().
 getLabel(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMenuBar),
   wxe_util:call(?wxMenuBar_GetLabel_0,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxMenuBar(), Itemid::integer()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubargetlabel">external documentation</a>.
+-spec getLabel(This, Itemid) -> string() when
+	This::wxMenuBar(), Itemid::integer().
 getLabel(#wx_ref{type=ThisT,ref=ThisRef},Itemid)
  when is_integer(Itemid) ->
   ?CLASS(ThisT,wxMenuBar),
   wxe_util:call(?wxMenuBar_GetLabel_1,
   <<ThisRef:32/?UI,Itemid:32/?UI>>).
 
-%% @spec (This::wxMenuBar(), Pos::integer()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubargetlabeltop">external documentation</a>.
+-spec getLabelTop(This, Pos) -> string() when
+	This::wxMenuBar(), Pos::integer().
 getLabelTop(#wx_ref{type=ThisT,ref=ThisRef},Pos)
  when is_integer(Pos) ->
   ?CLASS(ThisT,wxMenuBar),
   wxe_util:call(?wxMenuBar_GetLabelTop,
   <<ThisRef:32/?UI,Pos:32/?UI>>).
 
-%% @spec (This::wxMenuBar(), Pos::integer()) -> wxMenu:wxMenu()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubargetmenu">external documentation</a>.
+-spec getMenu(This, Pos) -> wxMenu:wxMenu() when
+	This::wxMenuBar(), Pos::integer().
 getMenu(#wx_ref{type=ThisT,ref=ThisRef},Pos)
  when is_integer(Pos) ->
   ?CLASS(ThisT,wxMenuBar),
   wxe_util:call(?wxMenuBar_GetMenu,
   <<ThisRef:32/?UI,Pos:32/?UI>>).
 
-%% @spec (This::wxMenuBar()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubargetmenucount">external documentation</a>.
+-spec getMenuCount(This) -> integer() when
+	This::wxMenuBar().
 getMenuCount(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMenuBar),
   wxe_util:call(?wxMenuBar_GetMenuCount,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxMenuBar(), Pos::integer(), Menu::wxMenu:wxMenu(), Title::string()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubarinsert">external documentation</a>.
+-spec insert(This, Pos, Menu, Title) -> boolean() when
+	This::wxMenuBar(), Pos::integer(), Menu::wxMenu:wxMenu(), Title::string().
 insert(#wx_ref{type=ThisT,ref=ThisRef},Pos,#wx_ref{type=MenuT,ref=MenuRef},Title)
  when is_integer(Pos),is_list(Title) ->
   ?CLASS(ThisT,wxMenuBar),
@@ -225,39 +245,44 @@ insert(#wx_ref{type=ThisT,ref=ThisRef},Pos,#wx_ref{type=MenuT,ref=MenuRef},Title
   wxe_util:call(?wxMenuBar_Insert,
   <<ThisRef:32/?UI,Pos:32/?UI,MenuRef: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>>).
 
-%% @spec (This::wxMenuBar(), Itemid::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubarischecked">external documentation</a>.
+-spec isChecked(This, Itemid) -> boolean() when
+	This::wxMenuBar(), Itemid::integer().
 isChecked(#wx_ref{type=ThisT,ref=ThisRef},Itemid)
  when is_integer(Itemid) ->
   ?CLASS(ThisT,wxMenuBar),
   wxe_util:call(?wxMenuBar_IsChecked,
   <<ThisRef:32/?UI,Itemid:32/?UI>>).
 
-%% @spec (This::wxMenuBar()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubarisenabled">external documentation</a>.
+-spec isEnabled(This) -> boolean() when
+	This::wxMenuBar().
 isEnabled(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMenuBar),
   wxe_util:call(?wxMenuBar_IsEnabled_0,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxMenuBar(), Itemid::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubarisenabled">external documentation</a>.
+-spec isEnabled(This, Itemid) -> boolean() when
+	This::wxMenuBar(), Itemid::integer().
 isEnabled(#wx_ref{type=ThisT,ref=ThisRef},Itemid)
  when is_integer(Itemid) ->
   ?CLASS(ThisT,wxMenuBar),
   wxe_util:call(?wxMenuBar_IsEnabled_1,
   <<ThisRef:32/?UI,Itemid:32/?UI>>).
 
-%% @spec (This::wxMenuBar(), Pos::integer()) -> wxMenu:wxMenu()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubarremove">external documentation</a>.
+-spec remove(This, Pos) -> wxMenu:wxMenu() when
+	This::wxMenuBar(), Pos::integer().
 remove(#wx_ref{type=ThisT,ref=ThisRef},Pos)
  when is_integer(Pos) ->
   ?CLASS(ThisT,wxMenuBar),
   wxe_util:call(?wxMenuBar_Remove,
   <<ThisRef:32/?UI,Pos:32/?UI>>).
 
-%% @spec (This::wxMenuBar(), Pos::integer(), Menu::wxMenu:wxMenu(), Title::string()) -> wxMenu:wxMenu()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubarreplace">external documentation</a>.
+-spec replace(This, Pos, Menu, Title) -> wxMenu:wxMenu() when
+	This::wxMenuBar(), Pos::integer(), Menu::wxMenu:wxMenu(), Title::string().
 replace(#wx_ref{type=ThisT,ref=ThisRef},Pos,#wx_ref{type=MenuT,ref=MenuRef},Title)
  when is_integer(Pos),is_list(Title) ->
   ?CLASS(ThisT,wxMenuBar),
@@ -266,8 +291,9 @@ replace(#wx_ref{type=ThisT,ref=ThisRef},Pos,#wx_ref{type=MenuT,ref=MenuRef},Titl
   wxe_util:call(?wxMenuBar_Replace,
   <<ThisRef:32/?UI,Pos:32/?UI,MenuRef: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>>).
 
-%% @spec (This::wxMenuBar(), Itemid::integer(), HelpString::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubarsethelpstring">external documentation</a>.
+-spec setHelpString(This, Itemid, HelpString) -> ok when
+	This::wxMenuBar(), Itemid::integer(), HelpString::string().
 setHelpString(#wx_ref{type=ThisT,ref=ThisRef},Itemid,HelpString)
  when is_integer(Itemid),is_list(HelpString) ->
   ?CLASS(ThisT,wxMenuBar),
@@ -275,8 +301,9 @@ setHelpString(#wx_ref{type=ThisT,ref=ThisRef},Itemid,HelpString)
   wxe_util:cast(?wxMenuBar_SetHelpString,
   <<ThisRef:32/?UI,Itemid:32/?UI,(byte_size(HelpString_UC)):32/?UI,(HelpString_UC)/binary, 0:(((8- ((4+byte_size(HelpString_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxMenuBar(), S::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubarsetlabel">external documentation</a>.
+-spec setLabel(This, S) -> ok when
+	This::wxMenuBar(), S::string().
 setLabel(#wx_ref{type=ThisT,ref=ThisRef},S)
  when is_list(S) ->
   ?CLASS(ThisT,wxMenuBar),
@@ -284,8 +311,9 @@ setLabel(#wx_ref{type=ThisT,ref=ThisRef},S)
   wxe_util:cast(?wxMenuBar_SetLabel_1,
   <<ThisRef:32/?UI,(byte_size(S_UC)):32/?UI,(S_UC)/binary, 0:(((8- ((0+byte_size(S_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxMenuBar(), Itemid::integer(), Label::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubarsetlabel">external documentation</a>.
+-spec setLabel(This, Itemid, Label) -> ok when
+	This::wxMenuBar(), Itemid::integer(), Label::string().
 setLabel(#wx_ref{type=ThisT,ref=ThisRef},Itemid,Label)
  when is_integer(Itemid),is_list(Label) ->
   ?CLASS(ThisT,wxMenuBar),
@@ -293,8 +321,9 @@ setLabel(#wx_ref{type=ThisT,ref=ThisRef},Itemid,Label)
   wxe_util:cast(?wxMenuBar_SetLabel_2,
   <<ThisRef:32/?UI,Itemid:32/?UI,(byte_size(Label_UC)):32/?UI,(Label_UC)/binary, 0:(((8- ((4+byte_size(Label_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxMenuBar(), Pos::integer(), Label::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubarsetlabeltop">external documentation</a>.
+-spec setLabelTop(This, Pos, Label) -> ok when
+	This::wxMenuBar(), Pos::integer(), Label::string().
 setLabelTop(#wx_ref{type=ThisT,ref=ThisRef},Pos,Label)
  when is_integer(Pos),is_list(Label) ->
   ?CLASS(ThisT,wxMenuBar),
@@ -302,8 +331,8 @@ setLabelTop(#wx_ref{type=ThisT,ref=ThisRef},Pos,Label)
   wxe_util:cast(?wxMenuBar_SetLabelTop,
   <<ThisRef:32/?UI,Pos:32/?UI,(byte_size(Label_UC)):32/?UI,(Label_UC)/binary, 0:(((8- ((4+byte_size(Label_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxMenuBar()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxMenuBar) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxMenuBar),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxMenuEvent.erl b/lib/wx/src/gen/wxMenuEvent.erl
index fe368e679a..84c4760aa6 100644
--- a/lib/wx/src/gen/wxMenuEvent.erl
+++ b/lib/wx/src/gen/wxMenuEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -37,26 +37,31 @@
 -export([getId/1,getSkipped/1,getTimestamp/1,isCommandEvent/1,parent_class/1,
   resumePropagation/2,shouldPropagate/1,skip/1,skip/2,stopPropagation/1]).
 
+-export_type([wxMenuEvent/0]).
 %% @hidden
 parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (This::wxMenuEvent()) -> wxMenu:wxMenu()
+-type wxMenuEvent() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenuevent.html#wxmenueventgetmenu">external documentation</a>.
+-spec getMenu(This) -> wxMenu:wxMenu() when
+	This::wxMenuEvent().
 getMenu(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMenuEvent),
   wxe_util:call(?wxMenuEvent_GetMenu,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxMenuEvent()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenuevent.html#wxmenueventgetmenuid">external documentation</a>.
+-spec getMenuId(This) -> integer() when
+	This::wxMenuEvent().
 getMenuId(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMenuEvent),
   wxe_util:call(?wxMenuEvent_GetMenuId,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxMenuEvent()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenuevent.html#wxmenueventispopup">external documentation</a>.
+-spec isPopup(This) -> boolean() when
+	This::wxMenuEvent().
 isPopup(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMenuEvent),
   wxe_util:call(?wxMenuEvent_IsPopup,
diff --git a/lib/wx/src/gen/wxMenuItem.erl b/lib/wx/src/gen/wxMenuItem.erl
index e2bbe681c5..76ce8408ed 100644
--- a/lib/wx/src/gen/wxMenuItem.erl
+++ b/lib/wx/src/gen/wxMenuItem.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -32,19 +32,26 @@
 %% inherited exports
 -export([parent_class/1]).
 
+-export_type([wxMenuItem/0]).
 %% @hidden
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxMenuItem()
+-type wxMenuItem() :: wx:wx_object().
 %% @equiv new([])
+-spec new() -> wxMenuItem().
+
 new() ->
   new([]).
 
-%% @spec ([Option]) -> wxMenuItem()
-%% Option = {parentMenu, wxMenu:wxMenu()} | {id, integer()} | {text, string()} | {help, string()} | {kind, WxItemKind} | {subMenu, wxMenu:wxMenu()}
-%% WxItemKind = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenuitem.html#wxmenuitemwxmenuitem">external documentation</a>.
-%%<br /> WxItemKind is one of ?wxITEM_SEPARATOR | ?wxITEM_NORMAL | ?wxITEM_CHECK | ?wxITEM_RADIO | ?wxITEM_MAX
+%%<br /> Kind = ?wxITEM_SEPARATOR | ?wxITEM_NORMAL | ?wxITEM_CHECK | ?wxITEM_RADIO | ?wxITEM_MAX
+-spec new([Option]) -> wxMenuItem() when
+	Option :: {parentMenu, wxMenu:wxMenu()}
+		 | {id, integer()}
+		 | {text, string()}
+		 | {help, string()}
+		 | {kind, wx:wx_enum()}
+		 | {subMenu, wxMenu:wxMenu()}.
 new(Options)
  when is_list(Options) ->
   MOpts = fun({parentMenu, #wx_ref{type=ParentMenuT,ref=ParentMenuRef}}, Acc) ->   ?CLASS(ParentMenuT,wxMenu),[<<1:32/?UI,ParentMenuRef:32/?UI>>|Acc];
@@ -58,15 +65,18 @@ new(Options)
   wxe_util:construct(?wxMenuItem_new,
   <<BinOpt/binary>>).
 
-%% @spec (This::wxMenuItem()) -> ok
 %% @equiv check(This, [])
+-spec check(This) -> ok when
+	This::wxMenuItem().
+
 check(This)
  when is_record(This, wx_ref) ->
   check(This, []).
 
-%% @spec (This::wxMenuItem(), [Option]) -> ok
-%% Option = {check, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenuitem.html#wxmenuitemcheck">external documentation</a>.
+-spec check(This, [Option]) -> ok when
+	This::wxMenuItem(),
+	Option :: {check, boolean()}.
 check(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxMenuItem),
@@ -76,15 +86,18 @@ check(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxMenuItem_Check,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxMenuItem()) -> ok
 %% @equiv enable(This, [])
+-spec enable(This) -> ok when
+	This::wxMenuItem().
+
 enable(This)
  when is_record(This, wx_ref) ->
   enable(This, []).
 
-%% @spec (This::wxMenuItem(), [Option]) -> ok
-%% Option = {enable, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenuitem.html#wxmenuitemenable">external documentation</a>.
+-spec enable(This, [Option]) -> ok when
+	This::wxMenuItem(),
+	Option :: {enable, boolean()}.
 enable(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxMenuItem),
@@ -94,117 +107,132 @@ enable(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxMenuItem_Enable,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxMenuItem()) -> wxBitmap:wxBitmap()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenuitem.html#wxmenuitemgetbitmap">external documentation</a>.
+-spec getBitmap(This) -> wxBitmap:wxBitmap() when
+	This::wxMenuItem().
 getBitmap(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMenuItem),
   wxe_util:call(?wxMenuItem_GetBitmap,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxMenuItem()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenuitem.html#wxmenuitemgethelp">external documentation</a>.
+-spec getHelp(This) -> string() when
+	This::wxMenuItem().
 getHelp(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMenuItem),
   wxe_util:call(?wxMenuItem_GetHelp,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxMenuItem()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenuitem.html#wxmenuitemgetid">external documentation</a>.
+-spec getId(This) -> integer() when
+	This::wxMenuItem().
 getId(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMenuItem),
   wxe_util:call(?wxMenuItem_GetId,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxMenuItem()) -> WxItemKind
-%% WxItemKind = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenuitem.html#wxmenuitemgetkind">external documentation</a>.
-%%<br /> WxItemKind is one of ?wxITEM_SEPARATOR | ?wxITEM_NORMAL | ?wxITEM_CHECK | ?wxITEM_RADIO | ?wxITEM_MAX
+%%<br /> Res = ?wxITEM_SEPARATOR | ?wxITEM_NORMAL | ?wxITEM_CHECK | ?wxITEM_RADIO | ?wxITEM_MAX
+-spec getKind(This) -> wx:wx_enum() when
+	This::wxMenuItem().
 getKind(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMenuItem),
   wxe_util:call(?wxMenuItem_GetKind,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxMenuItem()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenuitem.html#wxmenuitemgetlabel">external documentation</a>.
+-spec getLabel(This) -> string() when
+	This::wxMenuItem().
 getLabel(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMenuItem),
   wxe_util:call(?wxMenuItem_GetLabel,
   <<ThisRef:32/?UI>>).
 
-%% @spec (Text::string()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenuitem.html#wxmenuitemgetlabelfromtext">external documentation</a>.
+-spec getLabelFromText(Text) -> string() when
+	Text::string().
 getLabelFromText(Text)
  when is_list(Text) ->
   Text_UC = unicode:characters_to_binary([Text,0]),
   wxe_util:call(?wxMenuItem_GetLabelFromText,
   <<(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((4+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxMenuItem()) -> wxMenu:wxMenu()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenuitem.html#wxmenuitemgetmenu">external documentation</a>.
+-spec getMenu(This) -> wxMenu:wxMenu() when
+	This::wxMenuItem().
 getMenu(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMenuItem),
   wxe_util:call(?wxMenuItem_GetMenu,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxMenuItem()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenuitem.html#wxmenuitemgettext">external documentation</a>.
+-spec getText(This) -> string() when
+	This::wxMenuItem().
 getText(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMenuItem),
   wxe_util:call(?wxMenuItem_GetText,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxMenuItem()) -> wxMenu:wxMenu()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenuitem.html#wxmenuitemgetsubmenu">external documentation</a>.
+-spec getSubMenu(This) -> wxMenu:wxMenu() when
+	This::wxMenuItem().
 getSubMenu(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMenuItem),
   wxe_util:call(?wxMenuItem_GetSubMenu,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxMenuItem()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenuitem.html#wxmenuitemischeckable">external documentation</a>.
+-spec isCheckable(This) -> boolean() when
+	This::wxMenuItem().
 isCheckable(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMenuItem),
   wxe_util:call(?wxMenuItem_IsCheckable,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxMenuItem()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenuitem.html#wxmenuitemischecked">external documentation</a>.
+-spec isChecked(This) -> boolean() when
+	This::wxMenuItem().
 isChecked(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMenuItem),
   wxe_util:call(?wxMenuItem_IsChecked,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxMenuItem()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenuitem.html#wxmenuitemisenabled">external documentation</a>.
+-spec isEnabled(This) -> boolean() when
+	This::wxMenuItem().
 isEnabled(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMenuItem),
   wxe_util:call(?wxMenuItem_IsEnabled,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxMenuItem()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenuitem.html#wxmenuitemisseparator">external documentation</a>.
+-spec isSeparator(This) -> boolean() when
+	This::wxMenuItem().
 isSeparator(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMenuItem),
   wxe_util:call(?wxMenuItem_IsSeparator,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxMenuItem()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenuitem.html#wxmenuitemissubmenu">external documentation</a>.
+-spec isSubMenu(This) -> boolean() when
+	This::wxMenuItem().
 isSubMenu(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMenuItem),
   wxe_util:call(?wxMenuItem_IsSubMenu,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxMenuItem(), Bitmap::wxBitmap:wxBitmap()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenuitem.html#wxmenuitemsetbitmap">external documentation</a>.
+-spec setBitmap(This, Bitmap) -> ok when
+	This::wxMenuItem(), Bitmap::wxBitmap:wxBitmap().
 setBitmap(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BitmapT,ref=BitmapRef}) ->
   ?CLASS(ThisT,wxMenuItem),
   ?CLASS(BitmapT,wxBitmap),
   wxe_util:cast(?wxMenuItem_SetBitmap,
   <<ThisRef:32/?UI,BitmapRef:32/?UI>>).
 
-%% @spec (This::wxMenuItem(), Str::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenuitem.html#wxmenuitemsethelp">external documentation</a>.
+-spec setHelp(This, Str) -> ok when
+	This::wxMenuItem(), Str::string().
 setHelp(#wx_ref{type=ThisT,ref=ThisRef},Str)
  when is_list(Str) ->
   ?CLASS(ThisT,wxMenuItem),
@@ -212,24 +240,27 @@ setHelp(#wx_ref{type=ThisT,ref=ThisRef},Str)
   wxe_util:cast(?wxMenuItem_SetHelp,
   <<ThisRef:32/?UI,(byte_size(Str_UC)):32/?UI,(Str_UC)/binary, 0:(((8- ((0+byte_size(Str_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxMenuItem(), Menu::wxMenu:wxMenu()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenuitem.html#wxmenuitemsetmenu">external documentation</a>.
+-spec setMenu(This, Menu) -> ok when
+	This::wxMenuItem(), Menu::wxMenu:wxMenu().
 setMenu(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=MenuT,ref=MenuRef}) ->
   ?CLASS(ThisT,wxMenuItem),
   ?CLASS(MenuT,wxMenu),
   wxe_util:cast(?wxMenuItem_SetMenu,
   <<ThisRef:32/?UI,MenuRef:32/?UI>>).
 
-%% @spec (This::wxMenuItem(), Menu::wxMenu:wxMenu()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenuitem.html#wxmenuitemsetsubmenu">external documentation</a>.
+-spec setSubMenu(This, Menu) -> ok when
+	This::wxMenuItem(), Menu::wxMenu:wxMenu().
 setSubMenu(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=MenuT,ref=MenuRef}) ->
   ?CLASS(ThisT,wxMenuItem),
   ?CLASS(MenuT,wxMenu),
   wxe_util:cast(?wxMenuItem_SetSubMenu,
   <<ThisRef:32/?UI,MenuRef:32/?UI>>).
 
-%% @spec (This::wxMenuItem(), Str::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenuitem.html#wxmenuitemsettext">external documentation</a>.
+-spec setText(This, Str) -> ok when
+	This::wxMenuItem(), Str::string().
 setText(#wx_ref{type=ThisT,ref=ThisRef},Str)
  when is_list(Str) ->
   ?CLASS(ThisT,wxMenuItem),
@@ -237,8 +268,8 @@ setText(#wx_ref{type=ThisT,ref=ThisRef},Str)
   wxe_util:cast(?wxMenuItem_SetText,
   <<ThisRef:32/?UI,(byte_size(Str_UC)):32/?UI,(Str_UC)/binary, 0:(((8- ((0+byte_size(Str_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxMenuItem()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxMenuItem) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxMenuItem),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxMessageDialog.erl b/lib/wx/src/gen/wxMessageDialog.erl
index d13bb7cb6e..0748b22530 100644
--- a/lib/wx/src/gen/wxMessageDialog.erl
+++ b/lib/wx/src/gen/wxMessageDialog.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -77,6 +77,7 @@
   transferDataFromWindow/1,transferDataToWindow/1,update/1,updateWindowUI/1,
   updateWindowUI/2,validate/1,warpPointer/3]).
 
+-export_type([wxMessageDialog/0]).
 %% @hidden
 parent_class(wxDialog) -> true;
 parent_class(wxTopLevelWindow) -> true;
@@ -84,15 +85,21 @@ parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (Parent::wxWindow:wxWindow(), Message::string()) -> wxMessageDialog()
+-type wxMessageDialog() :: wx:wx_object().
 %% @equiv new(Parent,Message, [])
+-spec new(Parent, Message) -> wxMessageDialog() when
+	Parent::wxWindow:wxWindow(), Message::string().
+
 new(Parent,Message)
  when is_record(Parent, wx_ref),is_list(Message) ->
   new(Parent,Message, []).
 
-%% @spec (Parent::wxWindow:wxWindow(), Message::string(), [Option]) -> wxMessageDialog()
-%% Option = {caption, string()} | {style, integer()} | {pos, {X::integer(), Y::integer()}}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmessagedialog.html#wxmessagedialogwxmessagedialog">external documentation</a>.
+-spec new(Parent, Message, [Option]) -> wxMessageDialog() when
+	Parent::wxWindow:wxWindow(), Message::string(),
+	Option :: {caption, string()}
+		 | {style, integer()}
+		 | {pos, {X::integer(), Y::integer()}}.
 new(#wx_ref{type=ParentT,ref=ParentRef},Message, Options)
  when is_list(Message),is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -105,8 +112,8 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Message, Options)
   wxe_util:construct(?wxMessageDialog_new,
   <<ParentRef: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, BinOpt/binary>>).
 
-%% @spec (This::wxMessageDialog()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxMessageDialog) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxMessageDialog),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxMiniFrame.erl b/lib/wx/src/gen/wxMiniFrame.erl
index 108ebcfb0e..0ddec78c0e 100644
--- a/lib/wx/src/gen/wxMiniFrame.erl
+++ b/lib/wx/src/gen/wxMiniFrame.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -80,6 +80,7 @@
   transferDataToWindow/1,update/1,updateWindowUI/1,updateWindowUI/2,
   validate/1,warpPointer/3]).
 
+-export_type([wxMiniFrame/0]).
 %% @hidden
 parent_class(wxFrame) -> true;
 parent_class(wxTopLevelWindow) -> true;
@@ -87,21 +88,27 @@ parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxMiniFrame()
+-type wxMiniFrame() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxminiframe.html#wxminiframewxminiframe">external documentation</a>.
+-spec new() -> wxMiniFrame().
 new() ->
   wxe_util:construct(?wxMiniFrame_new_0,
   <<>>).
 
-%% @spec (Parent::wxWindow:wxWindow(), Id::integer(), Title::string()) -> wxMiniFrame()
 %% @equiv new(Parent,Id,Title, [])
+-spec new(Parent, Id, Title) -> wxMiniFrame() when
+	Parent::wxWindow:wxWindow(), Id::integer(), Title::string().
+
 new(Parent,Id,Title)
  when is_record(Parent, wx_ref),is_integer(Id),is_list(Title) ->
   new(Parent,Id,Title, []).
 
-%% @spec (Parent::wxWindow:wxWindow(), Id::integer(), Title::string(), [Option]) -> wxMiniFrame()
-%% Option = {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxminiframe.html#wxminiframewxminiframe">external documentation</a>.
+-spec new(Parent, Id, Title, [Option]) -> wxMiniFrame() when
+	Parent::wxWindow:wxWindow(), Id::integer(), Title::string(),
+	Option :: {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}.
 new(#wx_ref{type=ParentT,ref=ParentRef},Id,Title, Options)
  when is_integer(Id),is_list(Title),is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -114,15 +121,20 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Id,Title, Options)
   wxe_util:construct(?wxMiniFrame_new_4,
   <<ParentRef:32/?UI,Id:32/?UI,(byte_size(Title_UC)):32/?UI,(Title_UC)/binary, 0:(((8- ((4+byte_size(Title_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxMiniFrame(), Parent::wxWindow:wxWindow(), Id::integer(), Title::string()) -> bool()
 %% @equiv create(This,Parent,Id,Title, [])
+-spec create(This, Parent, Id, Title) -> boolean() when
+	This::wxMiniFrame(), Parent::wxWindow:wxWindow(), Id::integer(), Title::string().
+
 create(This,Parent,Id,Title)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id),is_list(Title) ->
   create(This,Parent,Id,Title, []).
 
-%% @spec (This::wxMiniFrame(), Parent::wxWindow:wxWindow(), Id::integer(), Title::string(), [Option]) -> bool()
-%% Option = {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxminiframe.html#wxminiframecreate">external documentation</a>.
+-spec create(This, Parent, Id, Title, [Option]) -> boolean() when
+	This::wxMiniFrame(), Parent::wxWindow:wxWindow(), Id::integer(), Title::string(),
+	Option :: {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}.
 create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id,Title, Options)
  when is_integer(Id),is_list(Title),is_list(Options) ->
   ?CLASS(ThisT,wxMiniFrame),
@@ -136,8 +148,8 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id,Ti
   wxe_util:call(?wxMiniFrame_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI,Id: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, BinOpt/binary>>).
 
-%% @spec (This::wxMiniFrame()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxMiniFrame) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxMiniFrame),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxMirrorDC.erl b/lib/wx/src/gen/wxMirrorDC.erl
index c218bd7e72..53fa259fb3 100644
--- a/lib/wx/src/gen/wxMirrorDC.erl
+++ b/lib/wx/src/gen/wxMirrorDC.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -52,20 +52,23 @@
   setPen/2,setTextBackground/2,setTextForeground/2,setUserScale/3,startDoc/2,
   startPage/1]).
 
+-export_type([wxMirrorDC/0]).
 %% @hidden
 parent_class(wxDC) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (Dc::wxDC:wxDC(), Mirror::bool()) -> wxMirrorDC()
+-type wxMirrorDC() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmirrordc.html#wxmirrordcwxmirrordc">external documentation</a>.
+-spec new(Dc, Mirror) -> wxMirrorDC() when
+	Dc::wxDC:wxDC(), Mirror::boolean().
 new(#wx_ref{type=DcT,ref=DcRef},Mirror)
  when is_boolean(Mirror) ->
   ?CLASS(DcT,wxDC),
   wxe_util:construct(?wxMirrorDC_new,
   <<DcRef:32/?UI,(wxe_util:from_bool(Mirror)):32/?UI>>).
 
-%% @spec (This::wxMirrorDC()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxMirrorDC) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxMirrorDC),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxMouseCaptureChangedEvent.erl b/lib/wx/src/gen/wxMouseCaptureChangedEvent.erl
index cb921bf2df..659582b611 100644
--- a/lib/wx/src/gen/wxMouseCaptureChangedEvent.erl
+++ b/lib/wx/src/gen/wxMouseCaptureChangedEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -37,12 +37,15 @@
 -export([getId/1,getSkipped/1,getTimestamp/1,isCommandEvent/1,parent_class/1,
   resumePropagation/2,shouldPropagate/1,skip/1,skip/2,stopPropagation/1]).
 
+-export_type([wxMouseCaptureChangedEvent/0]).
 %% @hidden
 parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (This::wxMouseCaptureChangedEvent()) -> wxWindow:wxWindow()
+-type wxMouseCaptureChangedEvent() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmousecapturechangedevent.html#wxmousecapturechangedeventgetcapturedwindow">external documentation</a>.
+-spec getCapturedWindow(This) -> wxWindow:wxWindow() when
+	This::wxMouseCaptureChangedEvent().
 getCapturedWindow(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMouseCaptureChangedEvent),
   wxe_util:call(?wxMouseCaptureChangedEvent_GetCapturedWindow,
diff --git a/lib/wx/src/gen/wxMouseEvent.erl b/lib/wx/src/gen/wxMouseEvent.erl
index a91d2a2e99..97ea9e908f 100644
--- a/lib/wx/src/gen/wxMouseEvent.erl
+++ b/lib/wx/src/gen/wxMouseEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -43,34 +43,41 @@
 -export([getId/1,getSkipped/1,getTimestamp/1,isCommandEvent/1,parent_class/1,
   resumePropagation/2,shouldPropagate/1,skip/1,skip/2,stopPropagation/1]).
 
+-export_type([wxMouseEvent/0]).
 %% @hidden
 parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (This::wxMouseEvent()) -> bool()
+-type wxMouseEvent() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventaltdown">external documentation</a>.
+-spec altDown(This) -> boolean() when
+	This::wxMouseEvent().
 altDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMouseEvent),
   wxe_util:call(?wxMouseEvent_AltDown,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxMouseEvent(), But::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventbutton">external documentation</a>.
+-spec button(This, But) -> boolean() when
+	This::wxMouseEvent(), But::integer().
 button(#wx_ref{type=ThisT,ref=ThisRef},But)
  when is_integer(But) ->
   ?CLASS(ThisT,wxMouseEvent),
   wxe_util:call(?wxMouseEvent_Button,
   <<ThisRef:32/?UI,But:32/?UI>>).
 
-%% @spec (This::wxMouseEvent()) -> bool()
 %% @equiv buttonDClick(This, [])
+-spec buttonDClick(This) -> boolean() when
+	This::wxMouseEvent().
+
 buttonDClick(This)
  when is_record(This, wx_ref) ->
   buttonDClick(This, []).
 
-%% @spec (This::wxMouseEvent(), [Option]) -> bool()
-%% Option = {but, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventbuttondclick">external documentation</a>.
+-spec buttonDClick(This, [Option]) -> boolean() when
+	This::wxMouseEvent(),
+	Option :: {but, integer()}.
 buttonDClick(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxMouseEvent),
@@ -80,15 +87,18 @@ buttonDClick(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxMouseEvent_ButtonDClick,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxMouseEvent()) -> bool()
 %% @equiv buttonDown(This, [])
+-spec buttonDown(This) -> boolean() when
+	This::wxMouseEvent().
+
 buttonDown(This)
  when is_record(This, wx_ref) ->
   buttonDown(This, []).
 
-%% @spec (This::wxMouseEvent(), [Option]) -> bool()
-%% Option = {but, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventbuttondown">external documentation</a>.
+-spec buttonDown(This, [Option]) -> boolean() when
+	This::wxMouseEvent(),
+	Option :: {but, integer()}.
 buttonDown(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxMouseEvent),
@@ -98,15 +108,18 @@ buttonDown(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxMouseEvent_ButtonDown,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxMouseEvent()) -> bool()
 %% @equiv buttonUp(This, [])
+-spec buttonUp(This) -> boolean() when
+	This::wxMouseEvent().
+
 buttonUp(This)
  when is_record(This, wx_ref) ->
   buttonUp(This, []).
 
-%% @spec (This::wxMouseEvent(), [Option]) -> bool()
-%% Option = {but, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventbuttonup">external documentation</a>.
+-spec buttonUp(This, [Option]) -> boolean() when
+	This::wxMouseEvent(),
+	Option :: {but, integer()}.
 buttonUp(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxMouseEvent),
@@ -116,212 +129,242 @@ buttonUp(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxMouseEvent_ButtonUp,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxMouseEvent()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventcmddown">external documentation</a>.
+-spec cmdDown(This) -> boolean() when
+	This::wxMouseEvent().
 cmdDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMouseEvent),
   wxe_util:call(?wxMouseEvent_CmdDown,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxMouseEvent()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventcontroldown">external documentation</a>.
+-spec controlDown(This) -> boolean() when
+	This::wxMouseEvent().
 controlDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMouseEvent),
   wxe_util:call(?wxMouseEvent_ControlDown,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxMouseEvent()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventdragging">external documentation</a>.
+-spec dragging(This) -> boolean() when
+	This::wxMouseEvent().
 dragging(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMouseEvent),
   wxe_util:call(?wxMouseEvent_Dragging,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxMouseEvent()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseevententering">external documentation</a>.
+-spec entering(This) -> boolean() when
+	This::wxMouseEvent().
 entering(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMouseEvent),
   wxe_util:call(?wxMouseEvent_Entering,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxMouseEvent()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventgetbutton">external documentation</a>.
+-spec getButton(This) -> integer() when
+	This::wxMouseEvent().
 getButton(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMouseEvent),
   wxe_util:call(?wxMouseEvent_GetButton,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxMouseEvent()) -> {X::integer(), Y::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventgetposition">external documentation</a>.
+-spec getPosition(This) -> {X::integer(), Y::integer()} when
+	This::wxMouseEvent().
 getPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMouseEvent),
   wxe_util:call(?wxMouseEvent_GetPosition,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxMouseEvent(), Dc::wxDC:wxDC()) -> {X::integer(), Y::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventgetlogicalposition">external documentation</a>.
+-spec getLogicalPosition(This, Dc) -> {X::integer(), Y::integer()} when
+	This::wxMouseEvent(), Dc::wxDC:wxDC().
 getLogicalPosition(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=DcT,ref=DcRef}) ->
   ?CLASS(ThisT,wxMouseEvent),
   ?CLASS(DcT,wxDC),
   wxe_util:call(?wxMouseEvent_GetLogicalPosition,
   <<ThisRef:32/?UI,DcRef:32/?UI>>).
 
-%% @spec (This::wxMouseEvent()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventgetlinesperaction">external documentation</a>.
+-spec getLinesPerAction(This) -> integer() when
+	This::wxMouseEvent().
 getLinesPerAction(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMouseEvent),
   wxe_util:call(?wxMouseEvent_GetLinesPerAction,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxMouseEvent()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventgetwheelrotation">external documentation</a>.
+-spec getWheelRotation(This) -> integer() when
+	This::wxMouseEvent().
 getWheelRotation(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMouseEvent),
   wxe_util:call(?wxMouseEvent_GetWheelRotation,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxMouseEvent()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventgetwheeldelta">external documentation</a>.
+-spec getWheelDelta(This) -> integer() when
+	This::wxMouseEvent().
 getWheelDelta(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMouseEvent),
   wxe_util:call(?wxMouseEvent_GetWheelDelta,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxMouseEvent()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventgetx">external documentation</a>.
+-spec getX(This) -> integer() when
+	This::wxMouseEvent().
 getX(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMouseEvent),
   wxe_util:call(?wxMouseEvent_GetX,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxMouseEvent()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventgety">external documentation</a>.
+-spec getY(This) -> integer() when
+	This::wxMouseEvent().
 getY(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMouseEvent),
   wxe_util:call(?wxMouseEvent_GetY,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxMouseEvent()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventisbutton">external documentation</a>.
+-spec isButton(This) -> boolean() when
+	This::wxMouseEvent().
 isButton(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMouseEvent),
   wxe_util:call(?wxMouseEvent_IsButton,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxMouseEvent()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventispagescroll">external documentation</a>.
+-spec isPageScroll(This) -> boolean() when
+	This::wxMouseEvent().
 isPageScroll(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMouseEvent),
   wxe_util:call(?wxMouseEvent_IsPageScroll,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxMouseEvent()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventleaving">external documentation</a>.
+-spec leaving(This) -> boolean() when
+	This::wxMouseEvent().
 leaving(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMouseEvent),
   wxe_util:call(?wxMouseEvent_Leaving,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxMouseEvent()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventleftdclick">external documentation</a>.
+-spec leftDClick(This) -> boolean() when
+	This::wxMouseEvent().
 leftDClick(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMouseEvent),
   wxe_util:call(?wxMouseEvent_LeftDClick,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxMouseEvent()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventleftdown">external documentation</a>.
+-spec leftDown(This) -> boolean() when
+	This::wxMouseEvent().
 leftDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMouseEvent),
   wxe_util:call(?wxMouseEvent_LeftDown,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxMouseEvent()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventleftisdown">external documentation</a>.
+-spec leftIsDown(This) -> boolean() when
+	This::wxMouseEvent().
 leftIsDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMouseEvent),
   wxe_util:call(?wxMouseEvent_LeftIsDown,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxMouseEvent()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventleftup">external documentation</a>.
+-spec leftUp(This) -> boolean() when
+	This::wxMouseEvent().
 leftUp(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMouseEvent),
   wxe_util:call(?wxMouseEvent_LeftUp,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxMouseEvent()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventmetadown">external documentation</a>.
+-spec metaDown(This) -> boolean() when
+	This::wxMouseEvent().
 metaDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMouseEvent),
   wxe_util:call(?wxMouseEvent_MetaDown,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxMouseEvent()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventmiddledclick">external documentation</a>.
+-spec middleDClick(This) -> boolean() when
+	This::wxMouseEvent().
 middleDClick(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMouseEvent),
   wxe_util:call(?wxMouseEvent_MiddleDClick,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxMouseEvent()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventmiddledown">external documentation</a>.
+-spec middleDown(This) -> boolean() when
+	This::wxMouseEvent().
 middleDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMouseEvent),
   wxe_util:call(?wxMouseEvent_MiddleDown,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxMouseEvent()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventmiddleisdown">external documentation</a>.
+-spec middleIsDown(This) -> boolean() when
+	This::wxMouseEvent().
 middleIsDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMouseEvent),
   wxe_util:call(?wxMouseEvent_MiddleIsDown,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxMouseEvent()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventmiddleup">external documentation</a>.
+-spec middleUp(This) -> boolean() when
+	This::wxMouseEvent().
 middleUp(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMouseEvent),
   wxe_util:call(?wxMouseEvent_MiddleUp,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxMouseEvent()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventmoving">external documentation</a>.
+-spec moving(This) -> boolean() when
+	This::wxMouseEvent().
 moving(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMouseEvent),
   wxe_util:call(?wxMouseEvent_Moving,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxMouseEvent()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventrightdclick">external documentation</a>.
+-spec rightDClick(This) -> boolean() when
+	This::wxMouseEvent().
 rightDClick(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMouseEvent),
   wxe_util:call(?wxMouseEvent_RightDClick,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxMouseEvent()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventrightdown">external documentation</a>.
+-spec rightDown(This) -> boolean() when
+	This::wxMouseEvent().
 rightDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMouseEvent),
   wxe_util:call(?wxMouseEvent_RightDown,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxMouseEvent()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventrightisdown">external documentation</a>.
+-spec rightIsDown(This) -> boolean() when
+	This::wxMouseEvent().
 rightIsDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMouseEvent),
   wxe_util:call(?wxMouseEvent_RightIsDown,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxMouseEvent()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventrightup">external documentation</a>.
+-spec rightUp(This) -> boolean() when
+	This::wxMouseEvent().
 rightUp(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMouseEvent),
   wxe_util:call(?wxMouseEvent_RightUp,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxMouseEvent()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventshiftdown">external documentation</a>.
+-spec shiftDown(This) -> boolean() when
+	This::wxMouseEvent().
 shiftDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMouseEvent),
   wxe_util:call(?wxMouseEvent_ShiftDown,
diff --git a/lib/wx/src/gen/wxMoveEvent.erl b/lib/wx/src/gen/wxMoveEvent.erl
index 97cf803310..b2f2fa74df 100644
--- a/lib/wx/src/gen/wxMoveEvent.erl
+++ b/lib/wx/src/gen/wxMoveEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -37,12 +37,15 @@
 -export([getId/1,getSkipped/1,getTimestamp/1,isCommandEvent/1,parent_class/1,
   resumePropagation/2,shouldPropagate/1,skip/1,skip/2,stopPropagation/1]).
 
+-export_type([wxMoveEvent/0]).
 %% @hidden
 parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (This::wxMoveEvent()) -> {X::integer(), Y::integer()}
+-type wxMoveEvent() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmoveevent.html#wxmoveeventgetposition">external documentation</a>.
+-spec getPosition(This) -> {X::integer(), Y::integer()} when
+	This::wxMoveEvent().
 getPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMoveEvent),
   wxe_util:call(?wxMoveEvent_GetPosition,
diff --git a/lib/wx/src/gen/wxMultiChoiceDialog.erl b/lib/wx/src/gen/wxMultiChoiceDialog.erl
index 6fae0c4860..7c19a1ca42 100644
--- a/lib/wx/src/gen/wxMultiChoiceDialog.erl
+++ b/lib/wx/src/gen/wxMultiChoiceDialog.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -77,6 +77,7 @@
   transferDataFromWindow/1,transferDataToWindow/1,update/1,updateWindowUI/1,
   updateWindowUI/2,validate/1,warpPointer/3]).
 
+-export_type([wxMultiChoiceDialog/0]).
 %% @hidden
 parent_class(wxDialog) -> true;
 parent_class(wxTopLevelWindow) -> true;
@@ -84,21 +85,26 @@ parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxMultiChoiceDialog()
+-type wxMultiChoiceDialog() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmultichoicedialog.html#wxmultichoicedialogwxmultichoicedialog">external documentation</a>.
+-spec new() -> wxMultiChoiceDialog().
 new() ->
   wxe_util:construct(?wxMultiChoiceDialog_new_0,
   <<>>).
 
-%% @spec (Parent::wxWindow:wxWindow(), Message::string(), Caption::string(), Choices::[[string()]]) -> wxMultiChoiceDialog()
 %% @equiv new(Parent,Message,Caption,Choices, [])
+-spec new(Parent, Message, Caption, Choices) -> wxMultiChoiceDialog() when
+	Parent::wxWindow:wxWindow(), Message::string(), Caption::string(), Choices::[[string()]].
+
 new(Parent,Message,Caption,Choices)
  when is_record(Parent, wx_ref),is_list(Message),is_list(Caption),is_list(Choices) ->
   new(Parent,Message,Caption,Choices, []).
 
-%% @spec (Parent::wxWindow:wxWindow(), Message::string(), Caption::string(), Choices::[[string()]], [Option]) -> wxMultiChoiceDialog()
-%% Option = {style, integer()} | {pos, {X::integer(), Y::integer()}}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmultichoicedialog.html#wxmultichoicedialogwxmultichoicedialog">external documentation</a>.
+-spec new(Parent, Message, Caption, Choices, [Option]) -> wxMultiChoiceDialog() when
+	Parent::wxWindow:wxWindow(), Message::string(), Caption::string(), Choices::[[string()]],
+	Option :: {style, integer()}
+		 | {pos, {X::integer(), Y::integer()}}.
 new(#wx_ref{type=ParentT,ref=ParentRef},Message,Caption,Choices, Options)
  when is_list(Message),is_list(Caption),is_list(Choices),is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -113,15 +119,17 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Message,Caption,Choices, Options)
   wxe_util:construct(?wxMultiChoiceDialog_new_5,
   <<ParentRef: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,(byte_size(Caption_UC)):32/?UI,(Caption_UC)/binary, 0:(((8- ((4+byte_size(Caption_UC)) band 16#7)) band 16#7))/unit:8,(length(Choices_UCA)):32/?UI, (<< <<(byte_size(UC_Str)):32/?UI, UC_Str/binary>>|| UC_Str <- Choices_UCA>>)/binary, 0:(((8- ((4 + lists:sum([byte_size(S)+4||S<-Choices_UCA])) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxMultiChoiceDialog()) -> [integer()]
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmultichoicedialog.html#wxmultichoicedialoggetselections">external documentation</a>.
+-spec getSelections(This) -> [integer()] when
+	This::wxMultiChoiceDialog().
 getSelections(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxMultiChoiceDialog),
   wxe_util:call(?wxMultiChoiceDialog_GetSelections,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxMultiChoiceDialog(), Selections::[integer()]) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmultichoicedialog.html#wxmultichoicedialogsetselections">external documentation</a>.
+-spec setSelections(This, Selections) -> ok when
+	This::wxMultiChoiceDialog(), Selections::[integer()].
 setSelections(#wx_ref{type=ThisT,ref=ThisRef},Selections)
  when is_list(Selections) ->
   ?CLASS(ThisT,wxMultiChoiceDialog),
@@ -129,8 +137,8 @@ setSelections(#wx_ref{type=ThisT,ref=ThisRef},Selections)
   <<ThisRef:32/?UI,(length(Selections)):32/?UI,
         (<< <<C:32/?I>> || C <- Selections>>)/binary, 0:(((0+length(Selections)) rem 2)*32)>>).
 
-%% @spec (This::wxMultiChoiceDialog()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxMultiChoiceDialog) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxMultiChoiceDialog),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxNavigationKeyEvent.erl b/lib/wx/src/gen/wxNavigationKeyEvent.erl
index 7cf7dff9aa..7559639fcd 100644
--- a/lib/wx/src/gen/wxNavigationKeyEvent.erl
+++ b/lib/wx/src/gen/wxNavigationKeyEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -38,64 +38,74 @@
 -export([getId/1,getSkipped/1,getTimestamp/1,isCommandEvent/1,parent_class/1,
   resumePropagation/2,shouldPropagate/1,skip/1,skip/2,stopPropagation/1]).
 
+-export_type([wxNavigationKeyEvent/0]).
 %% @hidden
 parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (This::wxNavigationKeyEvent()) -> bool()
+-type wxNavigationKeyEvent() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnavigationkeyevent.html#wxnavigationkeyeventgetdirection">external documentation</a>.
+-spec getDirection(This) -> boolean() when
+	This::wxNavigationKeyEvent().
 getDirection(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxNavigationKeyEvent),
   wxe_util:call(?wxNavigationKeyEvent_GetDirection,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxNavigationKeyEvent(), BForward::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnavigationkeyevent.html#wxnavigationkeyeventsetdirection">external documentation</a>.
+-spec setDirection(This, BForward) -> ok when
+	This::wxNavigationKeyEvent(), BForward::boolean().
 setDirection(#wx_ref{type=ThisT,ref=ThisRef},BForward)
  when is_boolean(BForward) ->
   ?CLASS(ThisT,wxNavigationKeyEvent),
   wxe_util:cast(?wxNavigationKeyEvent_SetDirection,
   <<ThisRef:32/?UI,(wxe_util:from_bool(BForward)):32/?UI>>).
 
-%% @spec (This::wxNavigationKeyEvent()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnavigationkeyevent.html#wxnavigationkeyeventiswindowchange">external documentation</a>.
+-spec isWindowChange(This) -> boolean() when
+	This::wxNavigationKeyEvent().
 isWindowChange(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxNavigationKeyEvent),
   wxe_util:call(?wxNavigationKeyEvent_IsWindowChange,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxNavigationKeyEvent(), BIs::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnavigationkeyevent.html#wxnavigationkeyeventsetwindowchange">external documentation</a>.
+-spec setWindowChange(This, BIs) -> ok when
+	This::wxNavigationKeyEvent(), BIs::boolean().
 setWindowChange(#wx_ref{type=ThisT,ref=ThisRef},BIs)
  when is_boolean(BIs) ->
   ?CLASS(ThisT,wxNavigationKeyEvent),
   wxe_util:cast(?wxNavigationKeyEvent_SetWindowChange,
   <<ThisRef:32/?UI,(wxe_util:from_bool(BIs)):32/?UI>>).
 
-%% @spec (This::wxNavigationKeyEvent()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnavigationkeyevent.html#wxnavigationkeyeventisfromtab">external documentation</a>.
+-spec isFromTab(This) -> boolean() when
+	This::wxNavigationKeyEvent().
 isFromTab(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxNavigationKeyEvent),
   wxe_util:call(?wxNavigationKeyEvent_IsFromTab,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxNavigationKeyEvent(), BIs::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnavigationkeyevent.html#wxnavigationkeyeventsetfromtab">external documentation</a>.
+-spec setFromTab(This, BIs) -> ok when
+	This::wxNavigationKeyEvent(), BIs::boolean().
 setFromTab(#wx_ref{type=ThisT,ref=ThisRef},BIs)
  when is_boolean(BIs) ->
   ?CLASS(ThisT,wxNavigationKeyEvent),
   wxe_util:cast(?wxNavigationKeyEvent_SetFromTab,
   <<ThisRef:32/?UI,(wxe_util:from_bool(BIs)):32/?UI>>).
 
-%% @spec (This::wxNavigationKeyEvent()) -> wxWindow:wxWindow()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnavigationkeyevent.html#wxnavigationkeyeventgetcurrentfocus">external documentation</a>.
+-spec getCurrentFocus(This) -> wxWindow:wxWindow() when
+	This::wxNavigationKeyEvent().
 getCurrentFocus(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxNavigationKeyEvent),
   wxe_util:call(?wxNavigationKeyEvent_GetCurrentFocus,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxNavigationKeyEvent(), Win::wxWindow:wxWindow()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnavigationkeyevent.html#wxnavigationkeyeventsetcurrentfocus">external documentation</a>.
+-spec setCurrentFocus(This, Win) -> ok when
+	This::wxNavigationKeyEvent(), Win::wxWindow:wxWindow().
 setCurrentFocus(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WinT,ref=WinRef}) ->
   ?CLASS(ThisT,wxNavigationKeyEvent),
   ?CLASS(WinT,wxWindow),
diff --git a/lib/wx/src/gen/wxNcPaintEvent.erl b/lib/wx/src/gen/wxNcPaintEvent.erl
index b45420a2fc..4dd292a0be 100644
--- a/lib/wx/src/gen/wxNcPaintEvent.erl
+++ b/lib/wx/src/gen/wxNcPaintEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -37,10 +37,12 @@
 -export([getId/1,getSkipped/1,getTimestamp/1,isCommandEvent/1,parent_class/1,
   resumePropagation/2,shouldPropagate/1,skip/1,skip/2,stopPropagation/1]).
 
+-export_type([wxNcPaintEvent/0]).
 %% @hidden
 parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
+-type wxNcPaintEvent() :: wx:wx_object().
  %% From wxEvent
 %% @hidden
 stopPropagation(This) -> wxEvent:stopPropagation(This).
diff --git a/lib/wx/src/gen/wxNotebook.erl b/lib/wx/src/gen/wxNotebook.erl
index b918de5bb4..da0b9c13bf 100644
--- a/lib/wx/src/gen/wxNotebook.erl
+++ b/lib/wx/src/gen/wxNotebook.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -74,27 +74,34 @@
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
 
+-export_type([wxNotebook/0]).
 %% @hidden
 parent_class(wxControl) -> true;
 parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxNotebook()
+-type wxNotebook() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebook.html#wxnotebookwxnotebook">external documentation</a>.
+-spec new() -> wxNotebook().
 new() ->
   wxe_util:construct(?wxNotebook_new_0,
   <<>>).
 
-%% @spec (Parent::wxWindow:wxWindow(), Winid::integer()) -> wxNotebook()
 %% @equiv new(Parent,Winid, [])
+-spec new(Parent, Winid) -> wxNotebook() when
+	Parent::wxWindow:wxWindow(), Winid::integer().
+
 new(Parent,Winid)
  when is_record(Parent, wx_ref),is_integer(Winid) ->
   new(Parent,Winid, []).
 
-%% @spec (Parent::wxWindow:wxWindow(), Winid::integer(), [Option]) -> wxNotebook()
-%% Option = {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebook.html#wxnotebookwxnotebook">external documentation</a>.
+-spec new(Parent, Winid, [Option]) -> wxNotebook() when
+	Parent::wxWindow:wxWindow(), Winid::integer(),
+	Option :: {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}.
 new(#wx_ref{type=ParentT,ref=ParentRef},Winid, Options)
  when is_integer(Winid),is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -106,15 +113,19 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Winid, Options)
   wxe_util:construct(?wxNotebook_new_3,
   <<ParentRef:32/?UI,Winid:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxNotebook(), Page::wxWindow:wxWindow(), Text::string()) -> bool()
 %% @equiv addPage(This,Page,Text, [])
+-spec addPage(This, Page, Text) -> boolean() when
+	This::wxNotebook(), Page::wxWindow:wxWindow(), Text::string().
+
 addPage(This,Page,Text)
  when is_record(This, wx_ref),is_record(Page, wx_ref),is_list(Text) ->
   addPage(This,Page,Text, []).
 
-%% @spec (This::wxNotebook(), Page::wxWindow:wxWindow(), Text::string(), [Option]) -> bool()
-%% Option = {bSelect, bool()} | {imageId, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebook.html#wxnotebookaddpage">external documentation</a>.
+-spec addPage(This, Page, Text, [Option]) -> boolean() when
+	This::wxNotebook(), Page::wxWindow:wxWindow(), Text::string(),
+	Option :: {bSelect, boolean()}
+		 | {imageId, integer()}.
 addPage(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PageT,ref=PageRef},Text, Options)
  when is_list(Text),is_list(Options) ->
   ?CLASS(ThisT,wxNotebook),
@@ -127,15 +138,18 @@ addPage(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PageT,ref=PageRef},Text, Op
   wxe_util:call(?wxNotebook_AddPage,
   <<ThisRef:32/?UI,PageRef:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((4+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxNotebook()) -> ok
 %% @equiv advanceSelection(This, [])
+-spec advanceSelection(This) -> ok when
+	This::wxNotebook().
+
 advanceSelection(This)
  when is_record(This, wx_ref) ->
   advanceSelection(This, []).
 
-%% @spec (This::wxNotebook(), [Option]) -> ok
-%% Option = {forward, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebook.html#wxnotebookadvanceselection">external documentation</a>.
+-spec advanceSelection(This, [Option]) -> ok when
+	This::wxNotebook(),
+	Option :: {forward, boolean()}.
 advanceSelection(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxNotebook),
@@ -145,23 +159,29 @@ advanceSelection(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxNotebook_AdvanceSelection,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxNotebook(), ImageList::wxImageList:wxImageList()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebook.html#wxnotebookassignimagelist">external documentation</a>.
+-spec assignImageList(This, ImageList) -> ok when
+	This::wxNotebook(), ImageList::wxImageList:wxImageList().
 assignImageList(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ImageListT,ref=ImageListRef}) ->
   ?CLASS(ThisT,wxNotebook),
   ?CLASS(ImageListT,wxImageList),
   wxe_util:cast(?wxNotebook_AssignImageList,
   <<ThisRef:32/?UI,ImageListRef:32/?UI>>).
 
-%% @spec (This::wxNotebook(), Parent::wxWindow:wxWindow(), Id::integer()) -> bool()
 %% @equiv create(This,Parent,Id, [])
+-spec create(This, Parent, Id) -> boolean() when
+	This::wxNotebook(), Parent::wxWindow:wxWindow(), Id::integer().
+
 create(This,Parent,Id)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id) ->
   create(This,Parent,Id, []).
 
-%% @spec (This::wxNotebook(), Parent::wxWindow:wxWindow(), Id::integer(), [Option]) -> bool()
-%% Option = {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebook.html#wxnotebookcreate">external documentation</a>.
+-spec create(This, Parent, Id, [Option]) -> boolean() when
+	This::wxNotebook(), Parent::wxWindow:wxWindow(), Id::integer(),
+	Option :: {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}.
 create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
  when is_integer(Id),is_list(Options) ->
   ?CLASS(ThisT,wxNotebook),
@@ -174,112 +194,130 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id, O
   wxe_util:call(?wxNotebook_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI,Id:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxNotebook()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebook.html#wxnotebookdeleteallpages">external documentation</a>.
+-spec deleteAllPages(This) -> boolean() when
+	This::wxNotebook().
 deleteAllPages(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxNotebook),
   wxe_util:call(?wxNotebook_DeleteAllPages,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxNotebook(), NPage::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebook.html#wxnotebookdeletepage">external documentation</a>.
+-spec deletePage(This, NPage) -> boolean() when
+	This::wxNotebook(), NPage::integer().
 deletePage(#wx_ref{type=ThisT,ref=ThisRef},NPage)
  when is_integer(NPage) ->
   ?CLASS(ThisT,wxNotebook),
   wxe_util:call(?wxNotebook_DeletePage,
   <<ThisRef:32/?UI,NPage:32/?UI>>).
 
-%% @spec (This::wxNotebook(), NPage::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebook.html#wxnotebookremovepage">external documentation</a>.
+-spec removePage(This, NPage) -> boolean() when
+	This::wxNotebook(), NPage::integer().
 removePage(#wx_ref{type=ThisT,ref=ThisRef},NPage)
  when is_integer(NPage) ->
   ?CLASS(ThisT,wxNotebook),
   wxe_util:call(?wxNotebook_RemovePage,
   <<ThisRef:32/?UI,NPage:32/?UI>>).
 
-%% @spec (This::wxNotebook()) -> wxWindow:wxWindow()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebook.html#wxnotebookgetcurrentpage">external documentation</a>.
+-spec getCurrentPage(This) -> wxWindow:wxWindow() when
+	This::wxNotebook().
 getCurrentPage(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxNotebook),
   wxe_util:call(?wxNotebook_GetCurrentPage,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxNotebook()) -> wxImageList:wxImageList()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebook.html#wxnotebookgetimagelist">external documentation</a>.
+-spec getImageList(This) -> wxImageList:wxImageList() when
+	This::wxNotebook().
 getImageList(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxNotebook),
   wxe_util:call(?wxNotebook_GetImageList,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxNotebook(), N::integer()) -> wxWindow:wxWindow()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebook.html#wxnotebookgetpage">external documentation</a>.
+-spec getPage(This, N) -> wxWindow:wxWindow() when
+	This::wxNotebook(), N::integer().
 getPage(#wx_ref{type=ThisT,ref=ThisRef},N)
  when is_integer(N) ->
   ?CLASS(ThisT,wxNotebook),
   wxe_util:call(?wxNotebook_GetPage,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @spec (This::wxNotebook()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebook.html#wxnotebookgetpagecount">external documentation</a>.
+-spec getPageCount(This) -> integer() when
+	This::wxNotebook().
 getPageCount(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxNotebook),
   wxe_util:call(?wxNotebook_GetPageCount,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxNotebook(), NPage::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebook.html#wxnotebookgetpageimage">external documentation</a>.
+-spec getPageImage(This, NPage) -> integer() when
+	This::wxNotebook(), NPage::integer().
 getPageImage(#wx_ref{type=ThisT,ref=ThisRef},NPage)
  when is_integer(NPage) ->
   ?CLASS(ThisT,wxNotebook),
   wxe_util:call(?wxNotebook_GetPageImage,
   <<ThisRef:32/?UI,NPage:32/?UI>>).
 
-%% @spec (This::wxNotebook(), NPage::integer()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebook.html#wxnotebookgetpagetext">external documentation</a>.
+-spec getPageText(This, NPage) -> string() when
+	This::wxNotebook(), NPage::integer().
 getPageText(#wx_ref{type=ThisT,ref=ThisRef},NPage)
  when is_integer(NPage) ->
   ?CLASS(ThisT,wxNotebook),
   wxe_util:call(?wxNotebook_GetPageText,
   <<ThisRef:32/?UI,NPage:32/?UI>>).
 
-%% @spec (This::wxNotebook()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebook.html#wxnotebookgetrowcount">external documentation</a>.
+-spec getRowCount(This) -> integer() when
+	This::wxNotebook().
 getRowCount(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxNotebook),
   wxe_util:call(?wxNotebook_GetRowCount,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxNotebook()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebook.html#wxnotebookgetselection">external documentation</a>.
+-spec getSelection(This) -> integer() when
+	This::wxNotebook().
 getSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxNotebook),
   wxe_util:call(?wxNotebook_GetSelection,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxNotebook()) -> wx:colour()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebook.html#wxnotebookgetthemebackgroundcolour">external documentation</a>.
+-spec getThemeBackgroundColour(This) -> wx:wx_colour() when
+	This::wxNotebook().
 getThemeBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxNotebook),
   wxe_util:call(?wxNotebook_GetThemeBackgroundColour,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxNotebook(), Pt::{X::integer(), Y::integer()}) -> {integer(), Flags::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebook.html#wxnotebookhittest">external documentation</a>.
+-spec hitTest(This, Pt) -> Result when
+	Result ::{Res ::integer(), Flags::integer()},
+	This::wxNotebook(), Pt::{X::integer(), Y::integer()}.
 hitTest(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY})
  when is_integer(PtX),is_integer(PtY) ->
   ?CLASS(ThisT,wxNotebook),
   wxe_util:call(?wxNotebook_HitTest,
   <<ThisRef:32/?UI,PtX:32/?UI,PtY:32/?UI>>).
 
-%% @spec (This::wxNotebook(), Position::integer(), Win::wxWindow:wxWindow(), StrText::string()) -> bool()
 %% @equiv insertPage(This,Position,Win,StrText, [])
+-spec insertPage(This, Position, Win, StrText) -> boolean() when
+	This::wxNotebook(), Position::integer(), Win::wxWindow:wxWindow(), StrText::string().
+
 insertPage(This,Position,Win,StrText)
  when is_record(This, wx_ref),is_integer(Position),is_record(Win, wx_ref),is_list(StrText) ->
   insertPage(This,Position,Win,StrText, []).
 
-%% @spec (This::wxNotebook(), Position::integer(), Win::wxWindow:wxWindow(), StrText::string(), [Option]) -> bool()
-%% Option = {bSelect, bool()} | {imageId, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebook.html#wxnotebookinsertpage">external documentation</a>.
+-spec insertPage(This, Position, Win, StrText, [Option]) -> boolean() when
+	This::wxNotebook(), Position::integer(), Win::wxWindow:wxWindow(), StrText::string(),
+	Option :: {bSelect, boolean()}
+		 | {imageId, integer()}.
 insertPage(#wx_ref{type=ThisT,ref=ThisRef},Position,#wx_ref{type=WinT,ref=WinRef},StrText, Options)
  when is_integer(Position),is_list(StrText),is_list(Options) ->
   ?CLASS(ThisT,wxNotebook),
@@ -292,40 +330,45 @@ insertPage(#wx_ref{type=ThisT,ref=ThisRef},Position,#wx_ref{type=WinT,ref=WinRef
   wxe_util:call(?wxNotebook_InsertPage,
   <<ThisRef:32/?UI,Position:32/?UI,WinRef:32/?UI,(byte_size(StrText_UC)):32/?UI,(StrText_UC)/binary, 0:(((8- ((0+byte_size(StrText_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxNotebook(), ImageList::wxImageList:wxImageList()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebook.html#wxnotebooksetimagelist">external documentation</a>.
+-spec setImageList(This, ImageList) -> ok when
+	This::wxNotebook(), ImageList::wxImageList:wxImageList().
 setImageList(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ImageListT,ref=ImageListRef}) ->
   ?CLASS(ThisT,wxNotebook),
   ?CLASS(ImageListT,wxImageList),
   wxe_util:cast(?wxNotebook_SetImageList,
   <<ThisRef:32/?UI,ImageListRef:32/?UI>>).
 
-%% @spec (This::wxNotebook(), Padding::{W::integer(), H::integer()}) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebook.html#wxnotebooksetpadding">external documentation</a>.
+-spec setPadding(This, Padding) -> ok when
+	This::wxNotebook(), Padding::{W::integer(), H::integer()}.
 setPadding(#wx_ref{type=ThisT,ref=ThisRef},{PaddingW,PaddingH})
  when is_integer(PaddingW),is_integer(PaddingH) ->
   ?CLASS(ThisT,wxNotebook),
   wxe_util:cast(?wxNotebook_SetPadding,
   <<ThisRef:32/?UI,PaddingW:32/?UI,PaddingH:32/?UI>>).
 
-%% @spec (This::wxNotebook(), Size::{W::integer(), H::integer()}) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebook.html#wxnotebooksetpagesize">external documentation</a>.
+-spec setPageSize(This, Size) -> ok when
+	This::wxNotebook(), Size::{W::integer(), H::integer()}.
 setPageSize(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH})
  when is_integer(SizeW),is_integer(SizeH) ->
   ?CLASS(ThisT,wxNotebook),
   wxe_util:cast(?wxNotebook_SetPageSize,
   <<ThisRef:32/?UI,SizeW:32/?UI,SizeH:32/?UI>>).
 
-%% @spec (This::wxNotebook(), NPage::integer(), NImage::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebook.html#wxnotebooksetpageimage">external documentation</a>.
+-spec setPageImage(This, NPage, NImage) -> boolean() when
+	This::wxNotebook(), NPage::integer(), NImage::integer().
 setPageImage(#wx_ref{type=ThisT,ref=ThisRef},NPage,NImage)
  when is_integer(NPage),is_integer(NImage) ->
   ?CLASS(ThisT,wxNotebook),
   wxe_util:call(?wxNotebook_SetPageImage,
   <<ThisRef:32/?UI,NPage:32/?UI,NImage:32/?UI>>).
 
-%% @spec (This::wxNotebook(), NPage::integer(), StrText::string()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebook.html#wxnotebooksetpagetext">external documentation</a>.
+-spec setPageText(This, NPage, StrText) -> boolean() when
+	This::wxNotebook(), NPage::integer(), StrText::string().
 setPageText(#wx_ref{type=ThisT,ref=ThisRef},NPage,StrText)
  when is_integer(NPage),is_list(StrText) ->
   ?CLASS(ThisT,wxNotebook),
@@ -333,24 +376,26 @@ setPageText(#wx_ref{type=ThisT,ref=ThisRef},NPage,StrText)
   wxe_util:call(?wxNotebook_SetPageText,
   <<ThisRef:32/?UI,NPage:32/?UI,(byte_size(StrText_UC)):32/?UI,(StrText_UC)/binary, 0:(((8- ((4+byte_size(StrText_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxNotebook(), NPage::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebook.html#wxnotebooksetselection">external documentation</a>.
+-spec setSelection(This, NPage) -> integer() when
+	This::wxNotebook(), NPage::integer().
 setSelection(#wx_ref{type=ThisT,ref=ThisRef},NPage)
  when is_integer(NPage) ->
   ?CLASS(ThisT,wxNotebook),
   wxe_util:call(?wxNotebook_SetSelection,
   <<ThisRef:32/?UI,NPage:32/?UI>>).
 
-%% @spec (This::wxNotebook(), NPage::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebook.html#wxnotebookchangeselection">external documentation</a>.
+-spec changeSelection(This, NPage) -> integer() when
+	This::wxNotebook(), NPage::integer().
 changeSelection(#wx_ref{type=ThisT,ref=ThisRef},NPage)
  when is_integer(NPage) ->
   ?CLASS(ThisT,wxNotebook),
   wxe_util:call(?wxNotebook_ChangeSelection,
   <<ThisRef:32/?UI,NPage:32/?UI>>).
 
-%% @spec (This::wxNotebook()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxNotebook) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxNotebook),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxNotebookEvent.erl b/lib/wx/src/gen/wxNotebookEvent.erl
index 6be826bdd2..72c0bb9cf4 100644
--- a/lib/wx/src/gen/wxNotebookEvent.erl
+++ b/lib/wx/src/gen/wxNotebookEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -41,36 +41,42 @@
   isSelection/1,parent_class/1,resumePropagation/2,setInt/2,setString/2,
   shouldPropagate/1,skip/1,skip/2,stopPropagation/1,veto/1]).
 
+-export_type([wxNotebookEvent/0]).
 %% @hidden
 parent_class(wxNotifyEvent) -> true;
 parent_class(wxCommandEvent) -> true;
 parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (This::wxNotebookEvent()) -> integer()
+-type wxNotebookEvent() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebookevent.html#wxnotebookeventgetoldselection">external documentation</a>.
+-spec getOldSelection(This) -> integer() when
+	This::wxNotebookEvent().
 getOldSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxNotebookEvent),
   wxe_util:call(?wxNotebookEvent_GetOldSelection,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxNotebookEvent()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebookevent.html#wxnotebookeventgetselection">external documentation</a>.
+-spec getSelection(This) -> integer() when
+	This::wxNotebookEvent().
 getSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxNotebookEvent),
   wxe_util:call(?wxNotebookEvent_GetSelection,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxNotebookEvent(), NOldSel::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebookevent.html#wxnotebookeventsetoldselection">external documentation</a>.
+-spec setOldSelection(This, NOldSel) -> ok when
+	This::wxNotebookEvent(), NOldSel::integer().
 setOldSelection(#wx_ref{type=ThisT,ref=ThisRef},NOldSel)
  when is_integer(NOldSel) ->
   ?CLASS(ThisT,wxNotebookEvent),
   wxe_util:cast(?wxNotebookEvent_SetOldSelection,
   <<ThisRef:32/?UI,NOldSel:32/?UI>>).
 
-%% @spec (This::wxNotebookEvent(), NSel::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebookevent.html#wxnotebookeventsetselection">external documentation</a>.
+-spec setSelection(This, NSel) -> ok when
+	This::wxNotebookEvent(), NSel::integer().
 setSelection(#wx_ref{type=ThisT,ref=ThisRef},NSel)
  when is_integer(NSel) ->
   ?CLASS(ThisT,wxNotebookEvent),
diff --git a/lib/wx/src/gen/wxNotifyEvent.erl b/lib/wx/src/gen/wxNotifyEvent.erl
index b2a6da16f0..7ba23469be 100644
--- a/lib/wx/src/gen/wxNotifyEvent.erl
+++ b/lib/wx/src/gen/wxNotifyEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -36,27 +36,32 @@
   parent_class/1,resumePropagation/2,setInt/2,setString/2,shouldPropagate/1,
   skip/1,skip/2,stopPropagation/1]).
 
+-export_type([wxNotifyEvent/0]).
 %% @hidden
 parent_class(wxCommandEvent) -> true;
 parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (This::wxNotifyEvent()) -> ok
+-type wxNotifyEvent() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotifyevent.html#wxnotifyeventallow">external documentation</a>.
+-spec allow(This) -> ok when
+	This::wxNotifyEvent().
 allow(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxNotifyEvent),
   wxe_util:cast(?wxNotifyEvent_Allow,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxNotifyEvent()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotifyevent.html#wxnotifyeventisallowed">external documentation</a>.
+-spec isAllowed(This) -> boolean() when
+	This::wxNotifyEvent().
 isAllowed(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxNotifyEvent),
   wxe_util:call(?wxNotifyEvent_IsAllowed,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxNotifyEvent()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotifyevent.html#wxnotifyeventveto">external documentation</a>.
+-spec veto(This) -> ok when
+	This::wxNotifyEvent().
 veto(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxNotifyEvent),
   wxe_util:cast(?wxNotifyEvent_Veto,
diff --git a/lib/wx/src/gen/wxPageSetupDialog.erl b/lib/wx/src/gen/wxPageSetupDialog.erl
index 2c11863a21..227e72b679 100644
--- a/lib/wx/src/gen/wxPageSetupDialog.erl
+++ b/lib/wx/src/gen/wxPageSetupDialog.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -29,18 +29,23 @@
 %% inherited exports
 -export([parent_class/1]).
 
+-export_type([wxPageSetupDialog/0]).
 %% @hidden
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (Parent::wxWindow:wxWindow()) -> wxPageSetupDialog()
+-type wxPageSetupDialog() :: wx:wx_object().
 %% @equiv new(Parent, [])
+-spec new(Parent) -> wxPageSetupDialog() when
+	Parent::wxWindow:wxWindow().
+
 new(Parent)
  when is_record(Parent, wx_ref) ->
   new(Parent, []).
 
-%% @spec (Parent::wxWindow:wxWindow(), [Option]) -> wxPageSetupDialog()
-%% Option = {data, wxPageSetupDialogData:wxPageSetupDialogData()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialog.html#wxpagesetupdialogwxpagesetupdialog">external documentation</a>.
+-spec new(Parent, [Option]) -> wxPageSetupDialog() when
+	Parent::wxWindow:wxWindow(),
+	Option :: {data, wxPageSetupDialogData:wxPageSetupDialogData()}.
 new(#wx_ref{type=ParentT,ref=ParentRef}, Options)
  when is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -50,22 +55,24 @@ new(#wx_ref{type=ParentT,ref=ParentRef}, Options)
   wxe_util:construct(?wxPageSetupDialog_new,
   <<ParentRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxPageSetupDialog()) -> wxPageSetupDialogData:wxPageSetupDialogData()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialog.html#wxpagesetupdialoggetpagesetupdata">external documentation</a>.
+-spec getPageSetupData(This) -> wxPageSetupDialogData:wxPageSetupDialogData() when
+	This::wxPageSetupDialog().
 getPageSetupData(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPageSetupDialog),
   wxe_util:call(?wxPageSetupDialog_GetPageSetupData,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPageSetupDialog()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialog.html#wxpagesetupdialogshowmodal">external documentation</a>.
+-spec showModal(This) -> integer() when
+	This::wxPageSetupDialog().
 showModal(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPageSetupDialog),
   wxe_util:call(?wxPageSetupDialog_ShowModal,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPageSetupDialog()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxPageSetupDialog) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxPageSetupDialog),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxPageSetupDialogData.erl b/lib/wx/src/gen/wxPageSetupDialogData.erl
index 00b4ca2a36..4670526067 100644
--- a/lib/wx/src/gen/wxPageSetupDialogData.erl
+++ b/lib/wx/src/gen/wxPageSetupDialogData.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -36,17 +36,20 @@
 %% inherited exports
 -export([parent_class/1]).
 
+-export_type([wxPageSetupDialogData/0]).
 %% @hidden
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxPageSetupDialogData()
+-type wxPageSetupDialogData() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatawxpagesetupdialogdata">external documentation</a>.
+-spec new() -> wxPageSetupDialogData().
 new() ->
   wxe_util:construct(?wxPageSetupDialogData_new_0,
   <<>>).
 
-%% @spec (PrintData::wxPrintData:wxPrintData() | wxPageSetupDialogData()) -> wxPageSetupDialogData()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatawxpagesetupdialogdata">external documentation</a>.
+-spec new(PrintData) -> wxPageSetupDialogData() when
+	PrintData::wxPrintData:wxPrintData() | wxPageSetupDialogData().
 new(#wx_ref{type=PrintDataT,ref=PrintDataRef}) ->
   PrintDataOP = case ?CLASS_T(PrintDataT,wxPrintData) of
      true ->
@@ -57,216 +60,239 @@ new(#wx_ref{type=PrintDataT,ref=PrintDataRef}) ->
   wxe_util:construct(PrintDataOP,
   <<PrintDataRef:32/?UI>>).
 
-%% @spec (This::wxPageSetupDialogData(), Flag::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdataenablehelp">external documentation</a>.
+-spec enableHelp(This, Flag) -> ok when
+	This::wxPageSetupDialogData(), Flag::boolean().
 enableHelp(#wx_ref{type=ThisT,ref=ThisRef},Flag)
  when is_boolean(Flag) ->
   ?CLASS(ThisT,wxPageSetupDialogData),
   wxe_util:cast(?wxPageSetupDialogData_EnableHelp,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Flag)):32/?UI>>).
 
-%% @spec (This::wxPageSetupDialogData(), Flag::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdataenablemargins">external documentation</a>.
+-spec enableMargins(This, Flag) -> ok when
+	This::wxPageSetupDialogData(), Flag::boolean().
 enableMargins(#wx_ref{type=ThisT,ref=ThisRef},Flag)
  when is_boolean(Flag) ->
   ?CLASS(ThisT,wxPageSetupDialogData),
   wxe_util:cast(?wxPageSetupDialogData_EnableMargins,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Flag)):32/?UI>>).
 
-%% @spec (This::wxPageSetupDialogData(), Flag::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdataenableorientation">external documentation</a>.
+-spec enableOrientation(This, Flag) -> ok when
+	This::wxPageSetupDialogData(), Flag::boolean().
 enableOrientation(#wx_ref{type=ThisT,ref=ThisRef},Flag)
  when is_boolean(Flag) ->
   ?CLASS(ThisT,wxPageSetupDialogData),
   wxe_util:cast(?wxPageSetupDialogData_EnableOrientation,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Flag)):32/?UI>>).
 
-%% @spec (This::wxPageSetupDialogData(), Flag::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdataenablepaper">external documentation</a>.
+-spec enablePaper(This, Flag) -> ok when
+	This::wxPageSetupDialogData(), Flag::boolean().
 enablePaper(#wx_ref{type=ThisT,ref=ThisRef},Flag)
  when is_boolean(Flag) ->
   ?CLASS(ThisT,wxPageSetupDialogData),
   wxe_util:cast(?wxPageSetupDialogData_EnablePaper,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Flag)):32/?UI>>).
 
-%% @spec (This::wxPageSetupDialogData(), Flag::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdataenableprinter">external documentation</a>.
+-spec enablePrinter(This, Flag) -> ok when
+	This::wxPageSetupDialogData(), Flag::boolean().
 enablePrinter(#wx_ref{type=ThisT,ref=ThisRef},Flag)
  when is_boolean(Flag) ->
   ?CLASS(ThisT,wxPageSetupDialogData),
   wxe_util:cast(?wxPageSetupDialogData_EnablePrinter,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Flag)):32/?UI>>).
 
-%% @spec (This::wxPageSetupDialogData()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatagetdefaultminmargins">external documentation</a>.
+-spec getDefaultMinMargins(This) -> boolean() when
+	This::wxPageSetupDialogData().
 getDefaultMinMargins(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPageSetupDialogData),
   wxe_util:call(?wxPageSetupDialogData_GetDefaultMinMargins,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPageSetupDialogData()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatagetenablemargins">external documentation</a>.
+-spec getEnableMargins(This) -> boolean() when
+	This::wxPageSetupDialogData().
 getEnableMargins(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPageSetupDialogData),
   wxe_util:call(?wxPageSetupDialogData_GetEnableMargins,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPageSetupDialogData()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatagetenableorientation">external documentation</a>.
+-spec getEnableOrientation(This) -> boolean() when
+	This::wxPageSetupDialogData().
 getEnableOrientation(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPageSetupDialogData),
   wxe_util:call(?wxPageSetupDialogData_GetEnableOrientation,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPageSetupDialogData()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatagetenablepaper">external documentation</a>.
+-spec getEnablePaper(This) -> boolean() when
+	This::wxPageSetupDialogData().
 getEnablePaper(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPageSetupDialogData),
   wxe_util:call(?wxPageSetupDialogData_GetEnablePaper,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPageSetupDialogData()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatagetenableprinter">external documentation</a>.
+-spec getEnablePrinter(This) -> boolean() when
+	This::wxPageSetupDialogData().
 getEnablePrinter(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPageSetupDialogData),
   wxe_util:call(?wxPageSetupDialogData_GetEnablePrinter,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPageSetupDialogData()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatagetenablehelp">external documentation</a>.
+-spec getEnableHelp(This) -> boolean() when
+	This::wxPageSetupDialogData().
 getEnableHelp(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPageSetupDialogData),
   wxe_util:call(?wxPageSetupDialogData_GetEnableHelp,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPageSetupDialogData()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatagetdefaultinfo">external documentation</a>.
+-spec getDefaultInfo(This) -> boolean() when
+	This::wxPageSetupDialogData().
 getDefaultInfo(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPageSetupDialogData),
   wxe_util:call(?wxPageSetupDialogData_GetDefaultInfo,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPageSetupDialogData()) -> {X::integer(), Y::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatagetmargintopleft">external documentation</a>.
+-spec getMarginTopLeft(This) -> {X::integer(), Y::integer()} when
+	This::wxPageSetupDialogData().
 getMarginTopLeft(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPageSetupDialogData),
   wxe_util:call(?wxPageSetupDialogData_GetMarginTopLeft,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPageSetupDialogData()) -> {X::integer(), Y::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatagetmarginbottomright">external documentation</a>.
+-spec getMarginBottomRight(This) -> {X::integer(), Y::integer()} when
+	This::wxPageSetupDialogData().
 getMarginBottomRight(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPageSetupDialogData),
   wxe_util:call(?wxPageSetupDialogData_GetMarginBottomRight,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPageSetupDialogData()) -> {X::integer(), Y::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatagetminmargintopleft">external documentation</a>.
+-spec getMinMarginTopLeft(This) -> {X::integer(), Y::integer()} when
+	This::wxPageSetupDialogData().
 getMinMarginTopLeft(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPageSetupDialogData),
   wxe_util:call(?wxPageSetupDialogData_GetMinMarginTopLeft,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPageSetupDialogData()) -> {X::integer(), Y::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatagetminmarginbottomright">external documentation</a>.
+-spec getMinMarginBottomRight(This) -> {X::integer(), Y::integer()} when
+	This::wxPageSetupDialogData().
 getMinMarginBottomRight(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPageSetupDialogData),
   wxe_util:call(?wxPageSetupDialogData_GetMinMarginBottomRight,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPageSetupDialogData()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatagetpaperid">external documentation</a>.
+-spec getPaperId(This) -> integer() when
+	This::wxPageSetupDialogData().
 getPaperId(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPageSetupDialogData),
   wxe_util:call(?wxPageSetupDialogData_GetPaperId,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPageSetupDialogData()) -> {W::integer(), H::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatagetpapersize">external documentation</a>.
+-spec getPaperSize(This) -> {W::integer(), H::integer()} when
+	This::wxPageSetupDialogData().
 getPaperSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPageSetupDialogData),
   wxe_util:call(?wxPageSetupDialogData_GetPaperSize,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPageSetupDialogData()) -> wxPrintData:wxPrintData()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatagetprintdata">external documentation</a>.
+-spec getPrintData(This) -> wxPrintData:wxPrintData() when
+	This::wxPageSetupDialogData().
 getPrintData(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPageSetupDialogData),
   wxe_util:call(?wxPageSetupDialogData_GetPrintData,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPageSetupDialogData()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdataisok">external documentation</a>.
+-spec isOk(This) -> boolean() when
+	This::wxPageSetupDialogData().
 isOk(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPageSetupDialogData),
   wxe_util:call(?wxPageSetupDialogData_IsOk,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPageSetupDialogData(), Flag::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatasetdefaultinfo">external documentation</a>.
+-spec setDefaultInfo(This, Flag) -> ok when
+	This::wxPageSetupDialogData(), Flag::boolean().
 setDefaultInfo(#wx_ref{type=ThisT,ref=ThisRef},Flag)
  when is_boolean(Flag) ->
   ?CLASS(ThisT,wxPageSetupDialogData),
   wxe_util:cast(?wxPageSetupDialogData_SetDefaultInfo,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Flag)):32/?UI>>).
 
-%% @spec (This::wxPageSetupDialogData(), Flag::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatasetdefaultminmargins">external documentation</a>.
+-spec setDefaultMinMargins(This, Flag) -> ok when
+	This::wxPageSetupDialogData(), Flag::boolean().
 setDefaultMinMargins(#wx_ref{type=ThisT,ref=ThisRef},Flag)
  when is_boolean(Flag) ->
   ?CLASS(ThisT,wxPageSetupDialogData),
   wxe_util:cast(?wxPageSetupDialogData_SetDefaultMinMargins,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Flag)):32/?UI>>).
 
-%% @spec (This::wxPageSetupDialogData(), Pt::{X::integer(), Y::integer()}) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatasetmargintopleft">external documentation</a>.
+-spec setMarginTopLeft(This, Pt) -> ok when
+	This::wxPageSetupDialogData(), Pt::{X::integer(), Y::integer()}.
 setMarginTopLeft(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY})
  when is_integer(PtX),is_integer(PtY) ->
   ?CLASS(ThisT,wxPageSetupDialogData),
   wxe_util:cast(?wxPageSetupDialogData_SetMarginTopLeft,
   <<ThisRef:32/?UI,PtX:32/?UI,PtY:32/?UI>>).
 
-%% @spec (This::wxPageSetupDialogData(), Pt::{X::integer(), Y::integer()}) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatasetmarginbottomright">external documentation</a>.
+-spec setMarginBottomRight(This, Pt) -> ok when
+	This::wxPageSetupDialogData(), Pt::{X::integer(), Y::integer()}.
 setMarginBottomRight(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY})
  when is_integer(PtX),is_integer(PtY) ->
   ?CLASS(ThisT,wxPageSetupDialogData),
   wxe_util:cast(?wxPageSetupDialogData_SetMarginBottomRight,
   <<ThisRef:32/?UI,PtX:32/?UI,PtY:32/?UI>>).
 
-%% @spec (This::wxPageSetupDialogData(), Pt::{X::integer(), Y::integer()}) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatasetminmargintopleft">external documentation</a>.
+-spec setMinMarginTopLeft(This, Pt) -> ok when
+	This::wxPageSetupDialogData(), Pt::{X::integer(), Y::integer()}.
 setMinMarginTopLeft(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY})
  when is_integer(PtX),is_integer(PtY) ->
   ?CLASS(ThisT,wxPageSetupDialogData),
   wxe_util:cast(?wxPageSetupDialogData_SetMinMarginTopLeft,
   <<ThisRef:32/?UI,PtX:32/?UI,PtY:32/?UI>>).
 
-%% @spec (This::wxPageSetupDialogData(), Pt::{X::integer(), Y::integer()}) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatasetminmarginbottomright">external documentation</a>.
+-spec setMinMarginBottomRight(This, Pt) -> ok when
+	This::wxPageSetupDialogData(), Pt::{X::integer(), Y::integer()}.
 setMinMarginBottomRight(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY})
  when is_integer(PtX),is_integer(PtY) ->
   ?CLASS(ThisT,wxPageSetupDialogData),
   wxe_util:cast(?wxPageSetupDialogData_SetMinMarginBottomRight,
   <<ThisRef:32/?UI,PtX:32/?UI,PtY:32/?UI>>).
 
-%% @spec (This::wxPageSetupDialogData(), Id::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatasetpaperid">external documentation</a>.
+-spec setPaperId(This, Id) -> ok when
+	This::wxPageSetupDialogData(), Id::integer().
 setPaperId(#wx_ref{type=ThisT,ref=ThisRef},Id)
  when is_integer(Id) ->
   ?CLASS(ThisT,wxPageSetupDialogData),
   wxe_util:cast(?wxPageSetupDialogData_SetPaperId,
   <<ThisRef:32/?UI,Id:32/?UI>>).
 
-%% @spec (This::wxPageSetupDialogData(),X::integer()|term()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatasetpapersize">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% setPaperSize(This::wxPageSetupDialogData(), Id::integer()) -> ok </c>
-%% </p>
-%% <p><c>
-%% setPaperSize(This::wxPageSetupDialogData(), Sz::{W::integer(), H::integer()}) -> ok </c>
-%% </p>
+-spec setPaperSize(This, Id) -> ok when
+	This::wxPageSetupDialogData(), Id::integer();
+      (This, Sz) -> ok when
+	This::wxPageSetupDialogData(), Sz::{W::integer(), H::integer()}.
 setPaperSize(#wx_ref{type=ThisT,ref=ThisRef},Id)
  when is_integer(Id) ->
   ?CLASS(ThisT,wxPageSetupDialogData),
@@ -278,16 +304,17 @@ setPaperSize(#wx_ref{type=ThisT,ref=ThisRef},{SzW,SzH})
   wxe_util:cast(?wxPageSetupDialogData_SetPaperSize_1_1,
   <<ThisRef:32/?UI,SzW:32/?UI,SzH:32/?UI>>).
 
-%% @spec (This::wxPageSetupDialogData(), PrintData::wxPrintData:wxPrintData()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatasetprintdata">external documentation</a>.
+-spec setPrintData(This, PrintData) -> ok when
+	This::wxPageSetupDialogData(), PrintData::wxPrintData:wxPrintData().
 setPrintData(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PrintDataT,ref=PrintDataRef}) ->
   ?CLASS(ThisT,wxPageSetupDialogData),
   ?CLASS(PrintDataT,wxPrintData),
   wxe_util:cast(?wxPageSetupDialogData_SetPrintData,
   <<ThisRef:32/?UI,PrintDataRef:32/?UI>>).
 
-%% @spec (This::wxPageSetupDialogData()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxPageSetupDialogData) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxPageSetupDialogData),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxPaintDC.erl b/lib/wx/src/gen/wxPaintDC.erl
index 47d5947097..e81772b87b 100644
--- a/lib/wx/src/gen/wxPaintDC.erl
+++ b/lib/wx/src/gen/wxPaintDC.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -53,26 +53,29 @@
   setPen/2,setTextBackground/2,setTextForeground/2,setUserScale/3,startDoc/2,
   startPage/1]).
 
+-export_type([wxPaintDC/0]).
 %% @hidden
 parent_class(wxWindowDC) -> true;
 parent_class(wxDC) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxPaintDC()
+-type wxPaintDC() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpaintdc.html#wxpaintdcwxpaintdc">external documentation</a>.
+-spec new() -> wxPaintDC().
 new() ->
   wxe_util:construct(?wxPaintDC_new_0,
   <<>>).
 
-%% @spec (Win::wxWindow:wxWindow()) -> wxPaintDC()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpaintdc.html#wxpaintdcwxpaintdc">external documentation</a>.
+-spec new(Win) -> wxPaintDC() when
+	Win::wxWindow:wxWindow().
 new(#wx_ref{type=WinT,ref=WinRef}) ->
   ?CLASS(WinT,wxWindow),
   wxe_util:construct(?wxPaintDC_new_1,
   <<WinRef:32/?UI>>).
 
-%% @spec (This::wxPaintDC()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxPaintDC) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxPaintDC),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxPaintEvent.erl b/lib/wx/src/gen/wxPaintEvent.erl
index 2603e61623..a13db607a4 100644
--- a/lib/wx/src/gen/wxPaintEvent.erl
+++ b/lib/wx/src/gen/wxPaintEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -37,10 +37,12 @@
 -export([getId/1,getSkipped/1,getTimestamp/1,isCommandEvent/1,parent_class/1,
   resumePropagation/2,shouldPropagate/1,skip/1,skip/2,stopPropagation/1]).
 
+-export_type([wxPaintEvent/0]).
 %% @hidden
 parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
+-type wxPaintEvent() :: wx:wx_object().
  %% From wxEvent
 %% @hidden
 stopPropagation(This) -> wxEvent:stopPropagation(This).
diff --git a/lib/wx/src/gen/wxPalette.erl b/lib/wx/src/gen/wxPalette.erl
index 3d8e811988..a3005bff80 100644
--- a/lib/wx/src/gen/wxPalette.erl
+++ b/lib/wx/src/gen/wxPalette.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -30,17 +30,20 @@
 %% inherited exports
 -export([parent_class/1]).
 
+-export_type([wxPalette/0]).
 %% @hidden
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxPalette()
+-type wxPalette() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpalette.html#wxpalettewxpalette">external documentation</a>.
+-spec new() -> wxPalette().
 new() ->
   wxe_util:construct(?wxPalette_new_0,
   <<>>).
 
-%% @spec (Red::binary(), Green::binary(), Blue::binary()) -> wxPalette()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpalette.html#wxpalettewxpalette">external documentation</a>.
+-spec new(Red, Green, Blue) -> wxPalette() when
+	Red::binary(), Green::binary(), Blue::binary().
 new(Red,Green,Blue)
  when is_binary(Red),is_binary(Green),is_binary(Blue) ->
   wxe_util:send_bin(Red),
@@ -49,8 +52,9 @@ new(Red,Green,Blue)
   wxe_util:construct(?wxPalette_new_4,
   <<>>).
 
-%% @spec (This::wxPalette(), Red::binary(), Green::binary(), Blue::binary()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpalette.html#wxpalettecreate">external documentation</a>.
+-spec create(This, Red, Green, Blue) -> boolean() when
+	This::wxPalette(), Red::binary(), Green::binary(), Blue::binary().
 create(#wx_ref{type=ThisT,ref=ThisRef},Red,Green,Blue)
  when is_binary(Red),is_binary(Green),is_binary(Blue) ->
   ?CLASS(ThisT,wxPalette),
@@ -60,38 +64,43 @@ create(#wx_ref{type=ThisT,ref=ThisRef},Red,Green,Blue)
   wxe_util:call(?wxPalette_Create,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPalette()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpalette.html#wxpalettegetcolourscount">external documentation</a>.
+-spec getColoursCount(This) -> integer() when
+	This::wxPalette().
 getColoursCount(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPalette),
   wxe_util:call(?wxPalette_GetColoursCount,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPalette(), Red::integer(), Green::integer(), Blue::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpalette.html#wxpalettegetpixel">external documentation</a>.
+-spec getPixel(This, Red, Green, Blue) -> integer() when
+	This::wxPalette(), Red::integer(), Green::integer(), Blue::integer().
 getPixel(#wx_ref{type=ThisT,ref=ThisRef},Red,Green,Blue)
  when is_integer(Red),is_integer(Green),is_integer(Blue) ->
   ?CLASS(ThisT,wxPalette),
   wxe_util:call(?wxPalette_GetPixel,
   <<ThisRef:32/?UI,Red:32/?UI,Green:32/?UI,Blue:32/?UI>>).
 
-%% @spec (This::wxPalette(), Pixel::integer()) -> {bool(), Red::integer(), Green::integer(), Blue::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpalette.html#wxpalettegetrgb">external documentation</a>.
+-spec getRGB(This, Pixel) -> Result when
+	Result ::{Res ::boolean(), Red::integer(), Green::integer(), Blue::integer()},
+	This::wxPalette(), Pixel::integer().
 getRGB(#wx_ref{type=ThisT,ref=ThisRef},Pixel)
  when is_integer(Pixel) ->
   ?CLASS(ThisT,wxPalette),
   wxe_util:call(?wxPalette_GetRGB,
   <<ThisRef:32/?UI,Pixel:32/?UI>>).
 
-%% @spec (This::wxPalette()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpalette.html#wxpaletteisok">external documentation</a>.
+-spec isOk(This) -> boolean() when
+	This::wxPalette().
 isOk(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPalette),
   wxe_util:call(?wxPalette_IsOk,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPalette()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxPalette) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxPalette),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxPaletteChangedEvent.erl b/lib/wx/src/gen/wxPaletteChangedEvent.erl
index 1831bf1375..aa9ae68ec2 100644
--- a/lib/wx/src/gen/wxPaletteChangedEvent.erl
+++ b/lib/wx/src/gen/wxPaletteChangedEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -37,20 +37,24 @@
 -export([getId/1,getSkipped/1,getTimestamp/1,isCommandEvent/1,parent_class/1,
   resumePropagation/2,shouldPropagate/1,skip/1,skip/2,stopPropagation/1]).
 
+-export_type([wxPaletteChangedEvent/0]).
 %% @hidden
 parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (This::wxPaletteChangedEvent(), Win::wxWindow:wxWindow()) -> ok
+-type wxPaletteChangedEvent() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpalettechangedevent.html#wxpalettechangedeventsetchangedwindow">external documentation</a>.
+-spec setChangedWindow(This, Win) -> ok when
+	This::wxPaletteChangedEvent(), Win::wxWindow:wxWindow().
 setChangedWindow(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WinT,ref=WinRef}) ->
   ?CLASS(ThisT,wxPaletteChangedEvent),
   ?CLASS(WinT,wxWindow),
   wxe_util:cast(?wxPaletteChangedEvent_SetChangedWindow,
   <<ThisRef:32/?UI,WinRef:32/?UI>>).
 
-%% @spec (This::wxPaletteChangedEvent()) -> wxWindow:wxWindow()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpalettechangedevent.html#wxpalettechangedeventgetchangedwindow">external documentation</a>.
+-spec getChangedWindow(This) -> wxWindow:wxWindow() when
+	This::wxPaletteChangedEvent().
 getChangedWindow(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPaletteChangedEvent),
   wxe_util:call(?wxPaletteChangedEvent_GetChangedWindow,
diff --git a/lib/wx/src/gen/wxPanel.erl b/lib/wx/src/gen/wxPanel.erl
index 59fba03102..fb1781a775 100644
--- a/lib/wx/src/gen/wxPanel.erl
+++ b/lib/wx/src/gen/wxPanel.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -68,26 +68,34 @@
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
 
+-export_type([wxPanel/0]).
 %% @hidden
 parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxPanel()
+-type wxPanel() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpanel.html#wxpanelwxpanel">external documentation</a>.
+-spec new() -> wxPanel().
 new() ->
   wxe_util:construct(?wxPanel_new_0,
   <<>>).
 
-%% @spec (Parent::wxWindow:wxWindow()) -> wxPanel()
 %% @equiv new(Parent, [])
+-spec new(Parent) -> wxPanel() when
+	Parent::wxWindow:wxWindow().
+
 new(Parent)
  when is_record(Parent, wx_ref) ->
   new(Parent, []).
 
-%% @spec (Parent::wxWindow:wxWindow(), [Option]) -> wxPanel()
-%% Option = {winid, integer()} | {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpanel.html#wxpanelwxpanel">external documentation</a>.
+-spec new(Parent, [Option]) -> wxPanel() when
+	Parent::wxWindow:wxWindow(),
+	Option :: {winid, integer()}
+		 | {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}.
 new(#wx_ref{type=ParentT,ref=ParentRef}, Options)
  when is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -100,15 +108,18 @@ new(#wx_ref{type=ParentT,ref=ParentRef}, Options)
   wxe_util:construct(?wxPanel_new_2,
   <<ParentRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (Parent::wxWindow:wxWindow(), X::integer(), Y::integer(), Width::integer(), Height::integer()) -> wxPanel()
 %% @equiv new(Parent,X,Y,Width,Height, [])
+-spec new(Parent, X, Y, Width, Height) -> wxPanel() when
+	Parent::wxWindow:wxWindow(), X::integer(), Y::integer(), Width::integer(), Height::integer().
+
 new(Parent,X,Y,Width,Height)
  when is_record(Parent, wx_ref),is_integer(X),is_integer(Y),is_integer(Width),is_integer(Height) ->
   new(Parent,X,Y,Width,Height, []).
 
-%% @spec (Parent::wxWindow:wxWindow(), X::integer(), Y::integer(), Width::integer(), Height::integer(), [Option]) -> wxPanel()
-%% Option = {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpanel.html#wxpanelwxpanel">external documentation</a>.
+-spec new(Parent, X, Y, Width, Height, [Option]) -> wxPanel() when
+	Parent::wxWindow:wxWindow(), X::integer(), Y::integer(), Width::integer(), Height::integer(),
+	Option :: {style, integer()}.
 new(#wx_ref{type=ParentT,ref=ParentRef},X,Y,Width,Height, Options)
  when is_integer(X),is_integer(Y),is_integer(Width),is_integer(Height),is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -118,15 +129,16 @@ new(#wx_ref{type=ParentT,ref=ParentRef},X,Y,Width,Height, Options)
   wxe_util:construct(?wxPanel_new_6,
   <<ParentRef:32/?UI,X:32/?UI,Y:32/?UI,Width:32/?UI,Height:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxPanel()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpanel.html#wxpanelinitdialog">external documentation</a>.
+-spec initDialog(This) -> ok when
+	This::wxPanel().
 initDialog(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPanel),
   wxe_util:cast(?wxPanel_InitDialog,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPanel()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxPanel) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxPanel),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxPasswordEntryDialog.erl b/lib/wx/src/gen/wxPasswordEntryDialog.erl
index 07a0bcef56..7508bf6506 100644
--- a/lib/wx/src/gen/wxPasswordEntryDialog.erl
+++ b/lib/wx/src/gen/wxPasswordEntryDialog.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -79,6 +79,7 @@
   transferDataFromWindow/1,transferDataToWindow/1,update/1,updateWindowUI/1,
   updateWindowUI/2,validate/1,warpPointer/3]).
 
+-export_type([wxPasswordEntryDialog/0]).
 %% @hidden
 parent_class(wxTextEntryDialog) -> true;
 parent_class(wxDialog) -> true;
@@ -87,15 +88,22 @@ parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (Parent::wxWindow:wxWindow(), Message::string()) -> wxPasswordEntryDialog()
+-type wxPasswordEntryDialog() :: wx:wx_object().
 %% @equiv new(Parent,Message, [])
+-spec new(Parent, Message) -> wxPasswordEntryDialog() when
+	Parent::wxWindow:wxWindow(), Message::string().
+
 new(Parent,Message)
  when is_record(Parent, wx_ref),is_list(Message) ->
   new(Parent,Message, []).
 
-%% @spec (Parent::wxWindow:wxWindow(), Message::string(), [Option]) -> wxPasswordEntryDialog()
-%% Option = {caption, string()} | {value, string()} | {style, integer()} | {pos, {X::integer(), Y::integer()}}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpasswordentrydialog.html#wxpasswordentrydialogwxpasswordentrydialog">external documentation</a>.
+-spec new(Parent, Message, [Option]) -> wxPasswordEntryDialog() when
+	Parent::wxWindow:wxWindow(), Message::string(),
+	Option :: {caption, string()}
+		 | {value, string()}
+		 | {style, integer()}
+		 | {pos, {X::integer(), Y::integer()}}.
 new(#wx_ref{type=ParentT,ref=ParentRef},Message, Options)
  when is_list(Message),is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -109,8 +117,8 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Message, Options)
   wxe_util:construct(?wxPasswordEntryDialog_new,
   <<ParentRef: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, BinOpt/binary>>).
 
-%% @spec (This::wxPasswordEntryDialog()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxPasswordEntryDialog) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxPasswordEntryDialog),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxPen.erl b/lib/wx/src/gen/wxPen.erl
index ada95b0ee3..629f3edfd7 100644
--- a/lib/wx/src/gen/wxPen.erl
+++ b/lib/wx/src/gen/wxPen.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -31,24 +31,30 @@
 %% inherited exports
 -export([parent_class/1]).
 
+-export_type([wxPen/0]).
 %% @hidden
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxPen()
+-type wxPen() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpen.html#wxpenwxpen">external documentation</a>.
+-spec new() -> wxPen().
 new() ->
   wxe_util:construct(?wxPen_new_0,
   <<>>).
 
-%% @spec (Colour::wx:colour()) -> wxPen()
 %% @equiv new(Colour, [])
+-spec new(Colour) -> wxPen() when
+	Colour::wx:wx_colour().
+
 new(Colour)
  when tuple_size(Colour) =:= 3; tuple_size(Colour) =:= 4 ->
   new(Colour, []).
 
-%% @spec (Colour::wx:colour(), [Option]) -> wxPen()
-%% Option = {width, integer()} | {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpen.html#wxpenwxpen">external documentation</a>.
+-spec new(Colour, [Option]) -> wxPen() when
+	Colour::wx:wx_colour(),
+	Option :: {width, integer()}
+		 | {style, integer()}.
 new(Colour, Options)
  when tuple_size(Colour) =:= 3; tuple_size(Colour) =:= 4,is_list(Options) ->
   MOpts = fun({width, Width}, Acc) -> [<<1:32/?UI,Width:32/?UI>>|Acc];
@@ -58,98 +64,110 @@ new(Colour, Options)
   wxe_util:construct(?wxPen_new_2,
   <<(wxe_util:colour_bin(Colour)):16/binary, BinOpt/binary>>).
 
-%% @spec (This::wxPen()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpen.html#wxpengetcap">external documentation</a>.
+-spec getCap(This) -> integer() when
+	This::wxPen().
 getCap(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPen),
   wxe_util:call(?wxPen_GetCap,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPen()) -> wx:colour()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpen.html#wxpengetcolour">external documentation</a>.
+-spec getColour(This) -> wx:wx_colour() when
+	This::wxPen().
 getColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPen),
   wxe_util:call(?wxPen_GetColour,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPen()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpen.html#wxpengetjoin">external documentation</a>.
+-spec getJoin(This) -> integer() when
+	This::wxPen().
 getJoin(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPen),
   wxe_util:call(?wxPen_GetJoin,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPen()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpen.html#wxpengetstyle">external documentation</a>.
+-spec getStyle(This) -> integer() when
+	This::wxPen().
 getStyle(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPen),
   wxe_util:call(?wxPen_GetStyle,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPen()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpen.html#wxpengetwidth">external documentation</a>.
+-spec getWidth(This) -> integer() when
+	This::wxPen().
 getWidth(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPen),
   wxe_util:call(?wxPen_GetWidth,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPen()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpen.html#wxpenisok">external documentation</a>.
+-spec isOk(This) -> boolean() when
+	This::wxPen().
 isOk(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPen),
   wxe_util:call(?wxPen_IsOk,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPen(), CapStyle::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpen.html#wxpensetcap">external documentation</a>.
+-spec setCap(This, CapStyle) -> ok when
+	This::wxPen(), CapStyle::integer().
 setCap(#wx_ref{type=ThisT,ref=ThisRef},CapStyle)
  when is_integer(CapStyle) ->
   ?CLASS(ThisT,wxPen),
   wxe_util:cast(?wxPen_SetCap,
   <<ThisRef:32/?UI,CapStyle:32/?UI>>).
 
-%% @spec (This::wxPen(), Colour::wx:colour()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpen.html#wxpensetcolour">external documentation</a>.
+-spec setColour(This, Colour) -> ok when
+	This::wxPen(), Colour::wx:wx_colour().
 setColour(#wx_ref{type=ThisT,ref=ThisRef},Colour)
  when tuple_size(Colour) =:= 3; tuple_size(Colour) =:= 4 ->
   ?CLASS(ThisT,wxPen),
   wxe_util:cast(?wxPen_SetColour_1,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(Colour)):16/binary>>).
 
-%% @spec (This::wxPen(), Red::integer(), Green::integer(), Blue::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpen.html#wxpensetcolour">external documentation</a>.
+-spec setColour(This, Red, Green, Blue) -> ok when
+	This::wxPen(), Red::integer(), Green::integer(), Blue::integer().
 setColour(#wx_ref{type=ThisT,ref=ThisRef},Red,Green,Blue)
  when is_integer(Red),is_integer(Green),is_integer(Blue) ->
   ?CLASS(ThisT,wxPen),
   wxe_util:cast(?wxPen_SetColour_3,
   <<ThisRef:32/?UI,Red:32/?UI,Green:32/?UI,Blue:32/?UI>>).
 
-%% @spec (This::wxPen(), JoinStyle::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpen.html#wxpensetjoin">external documentation</a>.
+-spec setJoin(This, JoinStyle) -> ok when
+	This::wxPen(), JoinStyle::integer().
 setJoin(#wx_ref{type=ThisT,ref=ThisRef},JoinStyle)
  when is_integer(JoinStyle) ->
   ?CLASS(ThisT,wxPen),
   wxe_util:cast(?wxPen_SetJoin,
   <<ThisRef:32/?UI,JoinStyle:32/?UI>>).
 
-%% @spec (This::wxPen(), Style::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpen.html#wxpensetstyle">external documentation</a>.
+-spec setStyle(This, Style) -> ok when
+	This::wxPen(), Style::integer().
 setStyle(#wx_ref{type=ThisT,ref=ThisRef},Style)
  when is_integer(Style) ->
   ?CLASS(ThisT,wxPen),
   wxe_util:cast(?wxPen_SetStyle,
   <<ThisRef:32/?UI,Style:32/?UI>>).
 
-%% @spec (This::wxPen(), Width::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpen.html#wxpensetwidth">external documentation</a>.
+-spec setWidth(This, Width) -> ok when
+	This::wxPen(), Width::integer().
 setWidth(#wx_ref{type=ThisT,ref=ThisRef},Width)
  when is_integer(Width) ->
   ?CLASS(ThisT,wxPen),
   wxe_util:cast(?wxPen_SetWidth,
   <<ThisRef:32/?UI,Width:32/?UI>>).
 
-%% @spec (This::wxPen()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxPen) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxPen),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxPickerBase.erl b/lib/wx/src/gen/wxPickerBase.erl
index e60ab4f9d8..2253127d84 100644
--- a/lib/wx/src/gen/wxPickerBase.erl
+++ b/lib/wx/src/gen/wxPickerBase.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -72,87 +72,101 @@
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
 
+-export_type([wxPickerBase/0]).
 %% @hidden
 parent_class(wxControl) -> true;
 parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (This::wxPickerBase(), Newmargin::integer()) -> ok
+-type wxPickerBase() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpickerbase.html#wxpickerbasesetinternalmargin">external documentation</a>.
+-spec setInternalMargin(This, Newmargin) -> ok when
+	This::wxPickerBase(), Newmargin::integer().
 setInternalMargin(#wx_ref{type=ThisT,ref=ThisRef},Newmargin)
  when is_integer(Newmargin) ->
   ?CLASS(ThisT,wxPickerBase),
   wxe_util:cast(?wxPickerBase_SetInternalMargin,
   <<ThisRef:32/?UI,Newmargin:32/?UI>>).
 
-%% @spec (This::wxPickerBase()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpickerbase.html#wxpickerbasegetinternalmargin">external documentation</a>.
+-spec getInternalMargin(This) -> integer() when
+	This::wxPickerBase().
 getInternalMargin(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPickerBase),
   wxe_util:call(?wxPickerBase_GetInternalMargin,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPickerBase(), Prop::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpickerbase.html#wxpickerbasesettextctrlproportion">external documentation</a>.
+-spec setTextCtrlProportion(This, Prop) -> ok when
+	This::wxPickerBase(), Prop::integer().
 setTextCtrlProportion(#wx_ref{type=ThisT,ref=ThisRef},Prop)
  when is_integer(Prop) ->
   ?CLASS(ThisT,wxPickerBase),
   wxe_util:cast(?wxPickerBase_SetTextCtrlProportion,
   <<ThisRef:32/?UI,Prop:32/?UI>>).
 
-%% @spec (This::wxPickerBase(), Prop::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpickerbase.html#wxpickerbasesetpickerctrlproportion">external documentation</a>.
+-spec setPickerCtrlProportion(This, Prop) -> ok when
+	This::wxPickerBase(), Prop::integer().
 setPickerCtrlProportion(#wx_ref{type=ThisT,ref=ThisRef},Prop)
  when is_integer(Prop) ->
   ?CLASS(ThisT,wxPickerBase),
   wxe_util:cast(?wxPickerBase_SetPickerCtrlProportion,
   <<ThisRef:32/?UI,Prop:32/?UI>>).
 
-%% @spec (This::wxPickerBase()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpickerbase.html#wxpickerbasegettextctrlproportion">external documentation</a>.
+-spec getTextCtrlProportion(This) -> integer() when
+	This::wxPickerBase().
 getTextCtrlProportion(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPickerBase),
   wxe_util:call(?wxPickerBase_GetTextCtrlProportion,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPickerBase()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpickerbase.html#wxpickerbasegetpickerctrlproportion">external documentation</a>.
+-spec getPickerCtrlProportion(This) -> integer() when
+	This::wxPickerBase().
 getPickerCtrlProportion(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPickerBase),
   wxe_util:call(?wxPickerBase_GetPickerCtrlProportion,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPickerBase()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpickerbase.html#wxpickerbasehastextctrl">external documentation</a>.
+-spec hasTextCtrl(This) -> boolean() when
+	This::wxPickerBase().
 hasTextCtrl(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPickerBase),
   wxe_util:call(?wxPickerBase_HasTextCtrl,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPickerBase()) -> wxTextCtrl:wxTextCtrl()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpickerbase.html#wxpickerbasegettextctrl">external documentation</a>.
+-spec getTextCtrl(This) -> wxTextCtrl:wxTextCtrl() when
+	This::wxPickerBase().
 getTextCtrl(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPickerBase),
   wxe_util:call(?wxPickerBase_GetTextCtrl,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPickerBase()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpickerbase.html#wxpickerbaseistextctrlgrowable">external documentation</a>.
+-spec isTextCtrlGrowable(This) -> boolean() when
+	This::wxPickerBase().
 isTextCtrlGrowable(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPickerBase),
   wxe_util:call(?wxPickerBase_IsTextCtrlGrowable,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPickerBase()) -> ok
 %% @equiv setPickerCtrlGrowable(This, [])
+-spec setPickerCtrlGrowable(This) -> ok when
+	This::wxPickerBase().
+
 setPickerCtrlGrowable(This)
  when is_record(This, wx_ref) ->
   setPickerCtrlGrowable(This, []).
 
-%% @spec (This::wxPickerBase(), [Option]) -> ok
-%% Option = {grow, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpickerbase.html#wxpickerbasesetpickerctrlgrowable">external documentation</a>.
+-spec setPickerCtrlGrowable(This, [Option]) -> ok when
+	This::wxPickerBase(),
+	Option :: {grow, boolean()}.
 setPickerCtrlGrowable(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxPickerBase),
@@ -162,15 +176,18 @@ setPickerCtrlGrowable(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxPickerBase_SetPickerCtrlGrowable,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxPickerBase()) -> ok
 %% @equiv setTextCtrlGrowable(This, [])
+-spec setTextCtrlGrowable(This) -> ok when
+	This::wxPickerBase().
+
 setTextCtrlGrowable(This)
  when is_record(This, wx_ref) ->
   setTextCtrlGrowable(This, []).
 
-%% @spec (This::wxPickerBase(), [Option]) -> ok
-%% Option = {grow, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpickerbase.html#wxpickerbasesettextctrlgrowable">external documentation</a>.
+-spec setTextCtrlGrowable(This, [Option]) -> ok when
+	This::wxPickerBase(),
+	Option :: {grow, boolean()}.
 setTextCtrlGrowable(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxPickerBase),
@@ -180,8 +197,9 @@ setTextCtrlGrowable(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxPickerBase_SetTextCtrlGrowable,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxPickerBase()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpickerbase.html#wxpickerbaseispickerctrlgrowable">external documentation</a>.
+-spec isPickerCtrlGrowable(This) -> boolean() when
+	This::wxPickerBase().
 isPickerCtrlGrowable(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPickerBase),
   wxe_util:call(?wxPickerBase_IsPickerCtrlGrowable,
diff --git a/lib/wx/src/gen/wxPostScriptDC.erl b/lib/wx/src/gen/wxPostScriptDC.erl
index df3edfade9..4e08ef8c81 100644
--- a/lib/wx/src/gen/wxPostScriptDC.erl
+++ b/lib/wx/src/gen/wxPostScriptDC.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -52,38 +52,42 @@
   setPen/2,setTextBackground/2,setTextForeground/2,setUserScale/3,startDoc/2,
   startPage/1]).
 
+-export_type([wxPostScriptDC/0]).
 %% @hidden
 parent_class(wxDC) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxPostScriptDC()
+-type wxPostScriptDC() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpostscriptdc.html#wxpostscriptdcwxpostscriptdc">external documentation</a>.
+-spec new() -> wxPostScriptDC().
 new() ->
   wxe_util:construct(?wxPostScriptDC_new_0,
   <<>>).
 
-%% @spec (PrintData::wxPrintData:wxPrintData()) -> wxPostScriptDC()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpostscriptdc.html#wxpostscriptdcwxpostscriptdc">external documentation</a>.
+-spec new(PrintData) -> wxPostScriptDC() when
+	PrintData::wxPrintData:wxPrintData().
 new(#wx_ref{type=PrintDataT,ref=PrintDataRef}) ->
   ?CLASS(PrintDataT,wxPrintData),
   wxe_util:construct(?wxPostScriptDC_new_1,
   <<PrintDataRef:32/?UI>>).
 
-%% @spec (Ppi::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpostscriptdc.html#wxpostscriptdcsetresolution">external documentation</a>.
+-spec setResolution(Ppi) -> ok when
+	Ppi::integer().
 setResolution(Ppi)
  when is_integer(Ppi) ->
   wxe_util:cast(?wxPostScriptDC_SetResolution,
   <<Ppi:32/?UI>>).
 
-%% @spec () -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpostscriptdc.html#wxpostscriptdcgetresolution">external documentation</a>.
+-spec getResolution() -> integer().
 getResolution() ->
   wxe_util:call(?wxPostScriptDC_GetResolution,
   <<>>).
 
-%% @spec (This::wxPostScriptDC()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxPostScriptDC) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxPostScriptDC),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxPreviewCanvas.erl b/lib/wx/src/gen/wxPreviewCanvas.erl
index d33aeedb70..cc9f43e5e4 100644
--- a/lib/wx/src/gen/wxPreviewCanvas.erl
+++ b/lib/wx/src/gen/wxPreviewCanvas.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -74,6 +74,7 @@
   transferDataToWindow/1,update/1,updateWindowUI/1,updateWindowUI/2,
   validate/1,warpPointer/3]).
 
+-export_type([wxPreviewCanvas/0]).
 %% @hidden
 parent_class(wxScrolledWindow) -> true;
 parent_class(wxPanel) -> true;
@@ -81,6 +82,7 @@ parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
+-type wxPreviewCanvas() :: wx:wx_object().
  %% From wxScrolledWindow
 %% @hidden
 setTargetWindow(This,Target) -> wxScrolledWindow:setTargetWindow(This,Target).
diff --git a/lib/wx/src/gen/wxPreviewControlBar.erl b/lib/wx/src/gen/wxPreviewControlBar.erl
index e85af625e2..b59ac18443 100644
--- a/lib/wx/src/gen/wxPreviewControlBar.erl
+++ b/lib/wx/src/gen/wxPreviewControlBar.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -70,21 +70,28 @@
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
 
+-export_type([wxPreviewControlBar/0]).
 %% @hidden
 parent_class(wxPanel) -> true;
 parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (Preview::wxPrintPreview:wxPrintPreview(), Buttons::integer(), Parent::wxWindow:wxWindow()) -> wxPreviewControlBar()
+-type wxPreviewControlBar() :: wx:wx_object().
 %% @equiv new(Preview,Buttons,Parent, [])
+-spec new(Preview, Buttons, Parent) -> wxPreviewControlBar() when
+	Preview::wxPrintPreview:wxPrintPreview(), Buttons::integer(), Parent::wxWindow:wxWindow().
+
 new(Preview,Buttons,Parent)
  when is_record(Preview, wx_ref),is_integer(Buttons),is_record(Parent, wx_ref) ->
   new(Preview,Buttons,Parent, []).
 
-%% @spec (Preview::wxPrintPreview:wxPrintPreview(), Buttons::integer(), Parent::wxWindow:wxWindow(), [Option]) -> wxPreviewControlBar()
-%% Option = {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpreviewcontrolbar.html#wxpreviewcontrolbarwxpreviewcontrolbar">external documentation</a>.
+-spec new(Preview, Buttons, Parent, [Option]) -> wxPreviewControlBar() when
+	Preview::wxPrintPreview:wxPrintPreview(), Buttons::integer(), Parent::wxWindow:wxWindow(),
+	Option :: {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}.
 new(#wx_ref{type=PreviewT,ref=PreviewRef},Buttons,#wx_ref{type=ParentT,ref=ParentRef}, Options)
  when is_integer(Buttons),is_list(Options) ->
   ?CLASS(PreviewT,wxPrintPreview),
@@ -97,37 +104,41 @@ new(#wx_ref{type=PreviewT,ref=PreviewRef},Buttons,#wx_ref{type=ParentT,ref=Paren
   wxe_util:construct(?wxPreviewControlBar_new,
   <<PreviewRef:32/?UI,Buttons:32/?UI,ParentRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxPreviewControlBar()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpreviewcontrolbar.html#wxpreviewcontrolbarcreatebuttons">external documentation</a>.
+-spec createButtons(This) -> ok when
+	This::wxPreviewControlBar().
 createButtons(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPreviewControlBar),
   wxe_util:cast(?wxPreviewControlBar_CreateButtons,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPreviewControlBar()) -> wxPrintPreview:wxPrintPreview()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpreviewcontrolbar.html#wxpreviewcontrolbargetprintpreview">external documentation</a>.
+-spec getPrintPreview(This) -> wxPrintPreview:wxPrintPreview() when
+	This::wxPreviewControlBar().
 getPrintPreview(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPreviewControlBar),
   wxe_util:call(?wxPreviewControlBar_GetPrintPreview,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPreviewControlBar()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpreviewcontrolbar.html#wxpreviewcontrolbargetzoomcontrol">external documentation</a>.
+-spec getZoomControl(This) -> integer() when
+	This::wxPreviewControlBar().
 getZoomControl(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPreviewControlBar),
   wxe_util:call(?wxPreviewControlBar_GetZoomControl,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPreviewControlBar(), Zoom::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpreviewcontrolbar.html#wxpreviewcontrolbarsetzoomcontrol">external documentation</a>.
+-spec setZoomControl(This, Zoom) -> ok when
+	This::wxPreviewControlBar(), Zoom::integer().
 setZoomControl(#wx_ref{type=ThisT,ref=ThisRef},Zoom)
  when is_integer(Zoom) ->
   ?CLASS(ThisT,wxPreviewControlBar),
   wxe_util:cast(?wxPreviewControlBar_SetZoomControl,
   <<ThisRef:32/?UI,Zoom:32/?UI>>).
 
-%% @spec (This::wxPreviewControlBar()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxPreviewControlBar) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxPreviewControlBar),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxPreviewFrame.erl b/lib/wx/src/gen/wxPreviewFrame.erl
index da43f86030..162e7b1621 100644
--- a/lib/wx/src/gen/wxPreviewFrame.erl
+++ b/lib/wx/src/gen/wxPreviewFrame.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -81,6 +81,7 @@
   transferDataToWindow/1,update/1,updateWindowUI/1,updateWindowUI/2,
   validate/1,warpPointer/3]).
 
+-export_type([wxPreviewFrame/0]).
 %% @hidden
 parent_class(wxFrame) -> true;
 parent_class(wxTopLevelWindow) -> true;
@@ -88,15 +89,22 @@ parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (Preview::wxPrintPreview:wxPrintPreview(), Parent::wxWindow:wxWindow()) -> wxPreviewFrame()
+-type wxPreviewFrame() :: wx:wx_object().
 %% @equiv new(Preview,Parent, [])
+-spec new(Preview, Parent) -> wxPreviewFrame() when
+	Preview::wxPrintPreview:wxPrintPreview(), Parent::wxWindow:wxWindow().
+
 new(Preview,Parent)
  when is_record(Preview, wx_ref),is_record(Parent, wx_ref) ->
   new(Preview,Parent, []).
 
-%% @spec (Preview::wxPrintPreview:wxPrintPreview(), Parent::wxWindow:wxWindow(), [Option]) -> wxPreviewFrame()
-%% Option = {title, string()} | {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpreviewframe.html#wxpreviewframewxpreviewframe">external documentation</a>.
+-spec new(Preview, Parent, [Option]) -> wxPreviewFrame() when
+	Preview::wxPrintPreview:wxPrintPreview(), Parent::wxWindow:wxWindow(),
+	Option :: {title, string()}
+		 | {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}.
 new(#wx_ref{type=PreviewT,ref=PreviewRef},#wx_ref{type=ParentT,ref=ParentRef}, Options)
  when is_list(Options) ->
   ?CLASS(PreviewT,wxPrintPreview),
@@ -110,37 +118,41 @@ new(#wx_ref{type=PreviewT,ref=PreviewRef},#wx_ref{type=ParentT,ref=ParentRef}, O
   wxe_util:construct(?wxPreviewFrame_new,
   <<PreviewRef:32/?UI,ParentRef:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxPreviewFrame()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpreviewframe.html#wxpreviewframecreatecontrolbar">external documentation</a>.
+-spec createControlBar(This) -> ok when
+	This::wxPreviewFrame().
 createControlBar(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPreviewFrame),
   wxe_util:cast(?wxPreviewFrame_CreateControlBar,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPreviewFrame()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpreviewframe.html#wxpreviewframecreatecanvas">external documentation</a>.
+-spec createCanvas(This) -> ok when
+	This::wxPreviewFrame().
 createCanvas(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPreviewFrame),
   wxe_util:cast(?wxPreviewFrame_CreateCanvas,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPreviewFrame()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpreviewframe.html#wxpreviewframeinitialize">external documentation</a>.
+-spec initialize(This) -> ok when
+	This::wxPreviewFrame().
 initialize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPreviewFrame),
   wxe_util:cast(?wxPreviewFrame_Initialize,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPreviewFrame(), Event::wxCloseEvent:wxCloseEvent()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpreviewframe.html#wxpreviewframeonclosewindow">external documentation</a>.
+-spec onCloseWindow(This, Event) -> ok when
+	This::wxPreviewFrame(), Event::wxCloseEvent:wxCloseEvent().
 onCloseWindow(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=EventT,ref=EventRef}) ->
   ?CLASS(ThisT,wxPreviewFrame),
   ?CLASS(EventT,wxCloseEvent),
   wxe_util:cast(?wxPreviewFrame_OnCloseWindow,
   <<ThisRef:32/?UI,EventRef:32/?UI>>).
 
-%% @spec (This::wxPreviewFrame()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxPreviewFrame) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxPreviewFrame),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxPrintData.erl b/lib/wx/src/gen/wxPrintData.erl
index f3e8ad3612..5b5f872abc 100644
--- a/lib/wx/src/gen/wxPrintData.erl
+++ b/lib/wx/src/gen/wxPrintData.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -32,158 +32,175 @@
 %% inherited exports
 -export([parent_class/1]).
 
+-export_type([wxPrintData/0]).
 %% @hidden
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxPrintData()
+-type wxPrintData() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdata.html#wxprintdatawxprintdata">external documentation</a>.
+-spec new() -> wxPrintData().
 new() ->
   wxe_util:construct(?wxPrintData_new_0,
   <<>>).
 
-%% @spec (PrintData::wxPrintData()) -> wxPrintData()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdata.html#wxprintdatawxprintdata">external documentation</a>.
+-spec new(PrintData) -> wxPrintData() when
+	PrintData::wxPrintData().
 new(#wx_ref{type=PrintDataT,ref=PrintDataRef}) ->
   ?CLASS(PrintDataT,wxPrintData),
   wxe_util:construct(?wxPrintData_new_1,
   <<PrintDataRef:32/?UI>>).
 
-%% @spec (This::wxPrintData()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdata.html#wxprintdatagetcollate">external documentation</a>.
+-spec getCollate(This) -> boolean() when
+	This::wxPrintData().
 getCollate(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPrintData),
   wxe_util:call(?wxPrintData_GetCollate,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPrintData()) -> WxPrintBin
-%% WxPrintBin = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdata.html#wxprintdatagetbin">external documentation</a>.
-%%<br /> WxPrintBin is one of ?wxPRINTBIN_DEFAULT | ?wxPRINTBIN_ONLYONE | ?wxPRINTBIN_LOWER | ?wxPRINTBIN_MIDDLE | ?wxPRINTBIN_MANUAL | ?wxPRINTBIN_ENVELOPE | ?wxPRINTBIN_ENVMANUAL | ?wxPRINTBIN_AUTO | ?wxPRINTBIN_TRACTOR | ?wxPRINTBIN_SMALLFMT | ?wxPRINTBIN_LARGEFMT | ?wxPRINTBIN_LARGECAPACITY | ?wxPRINTBIN_CASSETTE | ?wxPRINTBIN_FORMSOURCE | ?wxPRINTBIN_USER
+%%<br /> Res = ?wxPRINTBIN_DEFAULT | ?wxPRINTBIN_ONLYONE | ?wxPRINTBIN_LOWER | ?wxPRINTBIN_MIDDLE | ?wxPRINTBIN_MANUAL | ?wxPRINTBIN_ENVELOPE | ?wxPRINTBIN_ENVMANUAL | ?wxPRINTBIN_AUTO | ?wxPRINTBIN_TRACTOR | ?wxPRINTBIN_SMALLFMT | ?wxPRINTBIN_LARGEFMT | ?wxPRINTBIN_LARGECAPACITY | ?wxPRINTBIN_CASSETTE | ?wxPRINTBIN_FORMSOURCE | ?wxPRINTBIN_USER
+-spec getBin(This) -> wx:wx_enum() when
+	This::wxPrintData().
 getBin(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPrintData),
   wxe_util:call(?wxPrintData_GetBin,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPrintData()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdata.html#wxprintdatagetcolour">external documentation</a>.
+-spec getColour(This) -> boolean() when
+	This::wxPrintData().
 getColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPrintData),
   wxe_util:call(?wxPrintData_GetColour,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPrintData()) -> WxDuplexMode
-%% WxDuplexMode = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdata.html#wxprintdatagetduplex">external documentation</a>.
-%%<br /> WxDuplexMode is one of ?wxDUPLEX_SIMPLEX | ?wxDUPLEX_HORIZONTAL | ?wxDUPLEX_VERTICAL
+%%<br /> Res = ?wxDUPLEX_SIMPLEX | ?wxDUPLEX_HORIZONTAL | ?wxDUPLEX_VERTICAL
+-spec getDuplex(This) -> wx:wx_enum() when
+	This::wxPrintData().
 getDuplex(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPrintData),
   wxe_util:call(?wxPrintData_GetDuplex,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPrintData()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdata.html#wxprintdatagetnocopies">external documentation</a>.
+-spec getNoCopies(This) -> integer() when
+	This::wxPrintData().
 getNoCopies(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPrintData),
   wxe_util:call(?wxPrintData_GetNoCopies,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPrintData()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdata.html#wxprintdatagetorientation">external documentation</a>.
+-spec getOrientation(This) -> integer() when
+	This::wxPrintData().
 getOrientation(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPrintData),
   wxe_util:call(?wxPrintData_GetOrientation,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPrintData()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdata.html#wxprintdatagetpaperid">external documentation</a>.
+-spec getPaperId(This) -> integer() when
+	This::wxPrintData().
 getPaperId(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPrintData),
   wxe_util:call(?wxPrintData_GetPaperId,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPrintData()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdata.html#wxprintdatagetprintername">external documentation</a>.
+-spec getPrinterName(This) -> string() when
+	This::wxPrintData().
 getPrinterName(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPrintData),
   wxe_util:call(?wxPrintData_GetPrinterName,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPrintData()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdata.html#wxprintdatagetquality">external documentation</a>.
+-spec getQuality(This) -> integer() when
+	This::wxPrintData().
 getQuality(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPrintData),
   wxe_util:call(?wxPrintData_GetQuality,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPrintData()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdata.html#wxprintdataisok">external documentation</a>.
+-spec isOk(This) -> boolean() when
+	This::wxPrintData().
 isOk(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPrintData),
   wxe_util:call(?wxPrintData_IsOk,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPrintData(), Bin::WxPrintBin) -> ok
-%% WxPrintBin = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdata.html#wxprintdatasetbin">external documentation</a>.
-%%<br /> WxPrintBin is one of ?wxPRINTBIN_DEFAULT | ?wxPRINTBIN_ONLYONE | ?wxPRINTBIN_LOWER | ?wxPRINTBIN_MIDDLE | ?wxPRINTBIN_MANUAL | ?wxPRINTBIN_ENVELOPE | ?wxPRINTBIN_ENVMANUAL | ?wxPRINTBIN_AUTO | ?wxPRINTBIN_TRACTOR | ?wxPRINTBIN_SMALLFMT | ?wxPRINTBIN_LARGEFMT | ?wxPRINTBIN_LARGECAPACITY | ?wxPRINTBIN_CASSETTE | ?wxPRINTBIN_FORMSOURCE | ?wxPRINTBIN_USER
+%%<br /> Bin = ?wxPRINTBIN_DEFAULT | ?wxPRINTBIN_ONLYONE | ?wxPRINTBIN_LOWER | ?wxPRINTBIN_MIDDLE | ?wxPRINTBIN_MANUAL | ?wxPRINTBIN_ENVELOPE | ?wxPRINTBIN_ENVMANUAL | ?wxPRINTBIN_AUTO | ?wxPRINTBIN_TRACTOR | ?wxPRINTBIN_SMALLFMT | ?wxPRINTBIN_LARGEFMT | ?wxPRINTBIN_LARGECAPACITY | ?wxPRINTBIN_CASSETTE | ?wxPRINTBIN_FORMSOURCE | ?wxPRINTBIN_USER
+-spec setBin(This, Bin) -> ok when
+	This::wxPrintData(), Bin::wx:wx_enum().
 setBin(#wx_ref{type=ThisT,ref=ThisRef},Bin)
  when is_integer(Bin) ->
   ?CLASS(ThisT,wxPrintData),
   wxe_util:cast(?wxPrintData_SetBin,
   <<ThisRef:32/?UI,Bin:32/?UI>>).
 
-%% @spec (This::wxPrintData(), Flag::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdata.html#wxprintdatasetcollate">external documentation</a>.
+-spec setCollate(This, Flag) -> ok when
+	This::wxPrintData(), Flag::boolean().
 setCollate(#wx_ref{type=ThisT,ref=ThisRef},Flag)
  when is_boolean(Flag) ->
   ?CLASS(ThisT,wxPrintData),
   wxe_util:cast(?wxPrintData_SetCollate,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Flag)):32/?UI>>).
 
-%% @spec (This::wxPrintData(), Colour::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdata.html#wxprintdatasetcolour">external documentation</a>.
+-spec setColour(This, Colour) -> ok when
+	This::wxPrintData(), Colour::boolean().
 setColour(#wx_ref{type=ThisT,ref=ThisRef},Colour)
  when is_boolean(Colour) ->
   ?CLASS(ThisT,wxPrintData),
   wxe_util:cast(?wxPrintData_SetColour,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Colour)):32/?UI>>).
 
-%% @spec (This::wxPrintData(), Duplex::WxDuplexMode) -> ok
-%% WxDuplexMode = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdata.html#wxprintdatasetduplex">external documentation</a>.
-%%<br /> WxDuplexMode is one of ?wxDUPLEX_SIMPLEX | ?wxDUPLEX_HORIZONTAL | ?wxDUPLEX_VERTICAL
+%%<br /> Duplex = ?wxDUPLEX_SIMPLEX | ?wxDUPLEX_HORIZONTAL | ?wxDUPLEX_VERTICAL
+-spec setDuplex(This, Duplex) -> ok when
+	This::wxPrintData(), Duplex::wx:wx_enum().
 setDuplex(#wx_ref{type=ThisT,ref=ThisRef},Duplex)
  when is_integer(Duplex) ->
   ?CLASS(ThisT,wxPrintData),
   wxe_util:cast(?wxPrintData_SetDuplex,
   <<ThisRef:32/?UI,Duplex:32/?UI>>).
 
-%% @spec (This::wxPrintData(), V::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdata.html#wxprintdatasetnocopies">external documentation</a>.
+-spec setNoCopies(This, V) -> ok when
+	This::wxPrintData(), V::integer().
 setNoCopies(#wx_ref{type=ThisT,ref=ThisRef},V)
  when is_integer(V) ->
   ?CLASS(ThisT,wxPrintData),
   wxe_util:cast(?wxPrintData_SetNoCopies,
   <<ThisRef:32/?UI,V:32/?UI>>).
 
-%% @spec (This::wxPrintData(), Orient::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdata.html#wxprintdatasetorientation">external documentation</a>.
+-spec setOrientation(This, Orient) -> ok when
+	This::wxPrintData(), Orient::integer().
 setOrientation(#wx_ref{type=ThisT,ref=ThisRef},Orient)
  when is_integer(Orient) ->
   ?CLASS(ThisT,wxPrintData),
   wxe_util:cast(?wxPrintData_SetOrientation,
   <<ThisRef:32/?UI,Orient:32/?UI>>).
 
-%% @spec (This::wxPrintData(), SizeId::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdata.html#wxprintdatasetpaperid">external documentation</a>.
+-spec setPaperId(This, SizeId) -> ok when
+	This::wxPrintData(), SizeId::integer().
 setPaperId(#wx_ref{type=ThisT,ref=ThisRef},SizeId)
  when is_integer(SizeId) ->
   ?CLASS(ThisT,wxPrintData),
   wxe_util:cast(?wxPrintData_SetPaperId,
   <<ThisRef:32/?UI,SizeId:32/?UI>>).
 
-%% @spec (This::wxPrintData(), Name::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdata.html#wxprintdatasetprintername">external documentation</a>.
+-spec setPrinterName(This, Name) -> ok when
+	This::wxPrintData(), Name::string().
 setPrinterName(#wx_ref{type=ThisT,ref=ThisRef},Name)
  when is_list(Name) ->
   ?CLASS(ThisT,wxPrintData),
@@ -191,16 +208,17 @@ setPrinterName(#wx_ref{type=ThisT,ref=ThisRef},Name)
   wxe_util:cast(?wxPrintData_SetPrinterName,
   <<ThisRef:32/?UI,(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((0+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxPrintData(), Quality::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdata.html#wxprintdatasetquality">external documentation</a>.
+-spec setQuality(This, Quality) -> ok when
+	This::wxPrintData(), Quality::integer().
 setQuality(#wx_ref{type=ThisT,ref=ThisRef},Quality)
  when is_integer(Quality) ->
   ?CLASS(ThisT,wxPrintData),
   wxe_util:cast(?wxPrintData_SetQuality,
   <<ThisRef:32/?UI,Quality:32/?UI>>).
 
-%% @spec (This::wxPrintData()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxPrintData) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxPrintData),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxPrintDialog.erl b/lib/wx/src/gen/wxPrintDialog.erl
index a2f4bfa4eb..3e38bd5f10 100644
--- a/lib/wx/src/gen/wxPrintDialog.erl
+++ b/lib/wx/src/gen/wxPrintDialog.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -77,6 +77,7 @@
   transferDataFromWindow/1,transferDataToWindow/1,update/1,updateWindowUI/1,
   updateWindowUI/2,validate/1,warpPointer/3]).
 
+-export_type([wxPrintDialog/0]).
 %% @hidden
 parent_class(wxDialog) -> true;
 parent_class(wxTopLevelWindow) -> true;
@@ -84,22 +85,21 @@ parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (Parent::wxWindow:wxWindow()) -> wxPrintDialog()
+-type wxPrintDialog() :: wx:wx_object().
 %% @equiv new(Parent, [])
+-spec new(Parent) -> wxPrintDialog() when
+	Parent::wxWindow:wxWindow().
+
 new(Parent)
  when is_record(Parent, wx_ref) ->
   new(Parent, []).
 
-%% @spec (Parent::wxWindow:wxWindow(),X::term()) -> wxPrintDialog()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdialog.html#wxprintdialogwxprintdialog">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% new(Parent::wxWindow:wxWindow(), [Option]) -> wxPrintDialog() </c>
-%%<br /> Option = {data, wxPrintDialogData:wxPrintDialogData()}
-%% </p>
-%% <p><c>
-%% new(Parent::wxWindow:wxWindow(), Data::wxPrintData:wxPrintData()) -> wxPrintDialog() </c>
-%% </p>
+-spec new(Parent, [Option]) -> wxPrintDialog() when
+	Parent::wxWindow:wxWindow(),
+	Option :: {data, wxPrintDialogData:wxPrintDialogData()};
+      (Parent, Data) -> wxPrintDialog() when
+	Parent::wxWindow:wxWindow(), Data::wxPrintData:wxPrintData().
 new(#wx_ref{type=ParentT,ref=ParentRef}, Options)
  when is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -114,22 +114,24 @@ new(#wx_ref{type=ParentT,ref=ParentRef},#wx_ref{type=DataT,ref=DataRef}) ->
   wxe_util:construct(?wxPrintDialog_new_2_1,
   <<ParentRef:32/?UI,DataRef:32/?UI>>).
 
-%% @spec (This::wxPrintDialog()) -> wxPrintDialogData:wxPrintDialogData()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdialog.html#wxprintdialoggetprintdialogdata">external documentation</a>.
+-spec getPrintDialogData(This) -> wxPrintDialogData:wxPrintDialogData() when
+	This::wxPrintDialog().
 getPrintDialogData(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPrintDialog),
   wxe_util:call(?wxPrintDialog_GetPrintDialogData,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPrintDialog()) -> wxDC:wxDC()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdialog.html#wxprintdialoggetprintdc">external documentation</a>.
+-spec getPrintDC(This) -> wxDC:wxDC() when
+	This::wxPrintDialog().
 getPrintDC(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPrintDialog),
   wxe_util:call(?wxPrintDialog_GetPrintDC,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPrintDialog()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxPrintDialog) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxPrintDialog),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxPrintDialogData.erl b/lib/wx/src/gen/wxPrintDialogData.erl
index a7e8d41f2e..ec554bfb88 100644
--- a/lib/wx/src/gen/wxPrintDialogData.erl
+++ b/lib/wx/src/gen/wxPrintDialogData.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -33,17 +33,20 @@
 %% inherited exports
 -export([parent_class/1]).
 
+-export_type([wxPrintDialogData/0]).
 %% @hidden
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxPrintDialogData()
+-type wxPrintDialogData() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdialogdata.html#wxprintdialogdatawxprintdialogdata">external documentation</a>.
+-spec new() -> wxPrintDialogData().
 new() ->
   wxe_util:construct(?wxPrintDialogData_new_0,
   <<>>).
 
-%% @spec (DialogData::wxPrintDialogData() | wxPrintData:wxPrintData()) -> wxPrintDialogData()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdialogdata.html#wxprintdialogdatawxprintdialogdata">external documentation</a>.
+-spec new(DialogData) -> wxPrintDialogData() when
+	DialogData::wxPrintDialogData() | wxPrintData:wxPrintData().
 new(#wx_ref{type=DialogDataT,ref=DialogDataRef}) ->
   DialogDataOP = case ?CLASS_T(DialogDataT,wxPrintDialogData) of
      true ->
@@ -54,189 +57,213 @@ new(#wx_ref{type=DialogDataT,ref=DialogDataRef}) ->
   wxe_util:construct(DialogDataOP,
   <<DialogDataRef:32/?UI>>).
 
-%% @spec (This::wxPrintDialogData(), Flag::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdialogdata.html#wxprintdialogdataenablehelp">external documentation</a>.
+-spec enableHelp(This, Flag) -> ok when
+	This::wxPrintDialogData(), Flag::boolean().
 enableHelp(#wx_ref{type=ThisT,ref=ThisRef},Flag)
  when is_boolean(Flag) ->
   ?CLASS(ThisT,wxPrintDialogData),
   wxe_util:cast(?wxPrintDialogData_EnableHelp,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Flag)):32/?UI>>).
 
-%% @spec (This::wxPrintDialogData(), Flag::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdialogdata.html#wxprintdialogdataenablepagenumbers">external documentation</a>.
+-spec enablePageNumbers(This, Flag) -> ok when
+	This::wxPrintDialogData(), Flag::boolean().
 enablePageNumbers(#wx_ref{type=ThisT,ref=ThisRef},Flag)
  when is_boolean(Flag) ->
   ?CLASS(ThisT,wxPrintDialogData),
   wxe_util:cast(?wxPrintDialogData_EnablePageNumbers,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Flag)):32/?UI>>).
 
-%% @spec (This::wxPrintDialogData(), Flag::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdialogdata.html#wxprintdialogdataenableprinttofile">external documentation</a>.
+-spec enablePrintToFile(This, Flag) -> ok when
+	This::wxPrintDialogData(), Flag::boolean().
 enablePrintToFile(#wx_ref{type=ThisT,ref=ThisRef},Flag)
  when is_boolean(Flag) ->
   ?CLASS(ThisT,wxPrintDialogData),
   wxe_util:cast(?wxPrintDialogData_EnablePrintToFile,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Flag)):32/?UI>>).
 
-%% @spec (This::wxPrintDialogData(), Flag::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdialogdata.html#wxprintdialogdataenableselection">external documentation</a>.
+-spec enableSelection(This, Flag) -> ok when
+	This::wxPrintDialogData(), Flag::boolean().
 enableSelection(#wx_ref{type=ThisT,ref=ThisRef},Flag)
  when is_boolean(Flag) ->
   ?CLASS(ThisT,wxPrintDialogData),
   wxe_util:cast(?wxPrintDialogData_EnableSelection,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Flag)):32/?UI>>).
 
-%% @spec (This::wxPrintDialogData()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdialogdata.html#wxprintdialogdatagetallpages">external documentation</a>.
+-spec getAllPages(This) -> boolean() when
+	This::wxPrintDialogData().
 getAllPages(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPrintDialogData),
   wxe_util:call(?wxPrintDialogData_GetAllPages,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPrintDialogData()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdialogdata.html#wxprintdialogdatagetcollate">external documentation</a>.
+-spec getCollate(This) -> boolean() when
+	This::wxPrintDialogData().
 getCollate(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPrintDialogData),
   wxe_util:call(?wxPrintDialogData_GetCollate,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPrintDialogData()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdialogdata.html#wxprintdialogdatagetfrompage">external documentation</a>.
+-spec getFromPage(This) -> integer() when
+	This::wxPrintDialogData().
 getFromPage(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPrintDialogData),
   wxe_util:call(?wxPrintDialogData_GetFromPage,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPrintDialogData()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdialogdata.html#wxprintdialogdatagetmaxpage">external documentation</a>.
+-spec getMaxPage(This) -> integer() when
+	This::wxPrintDialogData().
 getMaxPage(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPrintDialogData),
   wxe_util:call(?wxPrintDialogData_GetMaxPage,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPrintDialogData()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdialogdata.html#wxprintdialogdatagetminpage">external documentation</a>.
+-spec getMinPage(This) -> integer() when
+	This::wxPrintDialogData().
 getMinPage(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPrintDialogData),
   wxe_util:call(?wxPrintDialogData_GetMinPage,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPrintDialogData()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdialogdata.html#wxprintdialogdatagetnocopies">external documentation</a>.
+-spec getNoCopies(This) -> integer() when
+	This::wxPrintDialogData().
 getNoCopies(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPrintDialogData),
   wxe_util:call(?wxPrintDialogData_GetNoCopies,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPrintDialogData()) -> wxPrintData:wxPrintData()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdialogdata.html#wxprintdialogdatagetprintdata">external documentation</a>.
+-spec getPrintData(This) -> wxPrintData:wxPrintData() when
+	This::wxPrintDialogData().
 getPrintData(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPrintDialogData),
   wxe_util:call(?wxPrintDialogData_GetPrintData,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPrintDialogData()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdialogdata.html#wxprintdialogdatagetprinttofile">external documentation</a>.
+-spec getPrintToFile(This) -> boolean() when
+	This::wxPrintDialogData().
 getPrintToFile(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPrintDialogData),
   wxe_util:call(?wxPrintDialogData_GetPrintToFile,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPrintDialogData()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdialogdata.html#wxprintdialogdatagetselection">external documentation</a>.
+-spec getSelection(This) -> boolean() when
+	This::wxPrintDialogData().
 getSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPrintDialogData),
   wxe_util:call(?wxPrintDialogData_GetSelection,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPrintDialogData()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdialogdata.html#wxprintdialogdatagettopage">external documentation</a>.
+-spec getToPage(This) -> integer() when
+	This::wxPrintDialogData().
 getToPage(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPrintDialogData),
   wxe_util:call(?wxPrintDialogData_GetToPage,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPrintDialogData()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdialogdata.html#wxprintdialogdataisok">external documentation</a>.
+-spec isOk(This) -> boolean() when
+	This::wxPrintDialogData().
 isOk(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPrintDialogData),
   wxe_util:call(?wxPrintDialogData_IsOk,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPrintDialogData(), Flag::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdialogdata.html#wxprintdialogdatasetcollate">external documentation</a>.
+-spec setCollate(This, Flag) -> ok when
+	This::wxPrintDialogData(), Flag::boolean().
 setCollate(#wx_ref{type=ThisT,ref=ThisRef},Flag)
  when is_boolean(Flag) ->
   ?CLASS(ThisT,wxPrintDialogData),
   wxe_util:cast(?wxPrintDialogData_SetCollate,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Flag)):32/?UI>>).
 
-%% @spec (This::wxPrintDialogData(), V::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdialogdata.html#wxprintdialogdatasetfrompage">external documentation</a>.
+-spec setFromPage(This, V) -> ok when
+	This::wxPrintDialogData(), V::integer().
 setFromPage(#wx_ref{type=ThisT,ref=ThisRef},V)
  when is_integer(V) ->
   ?CLASS(ThisT,wxPrintDialogData),
   wxe_util:cast(?wxPrintDialogData_SetFromPage,
   <<ThisRef:32/?UI,V:32/?UI>>).
 
-%% @spec (This::wxPrintDialogData(), V::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdialogdata.html#wxprintdialogdatasetmaxpage">external documentation</a>.
+-spec setMaxPage(This, V) -> ok when
+	This::wxPrintDialogData(), V::integer().
 setMaxPage(#wx_ref{type=ThisT,ref=ThisRef},V)
  when is_integer(V) ->
   ?CLASS(ThisT,wxPrintDialogData),
   wxe_util:cast(?wxPrintDialogData_SetMaxPage,
   <<ThisRef:32/?UI,V:32/?UI>>).
 
-%% @spec (This::wxPrintDialogData(), V::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdialogdata.html#wxprintdialogdatasetminpage">external documentation</a>.
+-spec setMinPage(This, V) -> ok when
+	This::wxPrintDialogData(), V::integer().
 setMinPage(#wx_ref{type=ThisT,ref=ThisRef},V)
  when is_integer(V) ->
   ?CLASS(ThisT,wxPrintDialogData),
   wxe_util:cast(?wxPrintDialogData_SetMinPage,
   <<ThisRef:32/?UI,V:32/?UI>>).
 
-%% @spec (This::wxPrintDialogData(), V::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdialogdata.html#wxprintdialogdatasetnocopies">external documentation</a>.
+-spec setNoCopies(This, V) -> ok when
+	This::wxPrintDialogData(), V::integer().
 setNoCopies(#wx_ref{type=ThisT,ref=ThisRef},V)
  when is_integer(V) ->
   ?CLASS(ThisT,wxPrintDialogData),
   wxe_util:cast(?wxPrintDialogData_SetNoCopies,
   <<ThisRef:32/?UI,V:32/?UI>>).
 
-%% @spec (This::wxPrintDialogData(), PrintData::wxPrintData:wxPrintData()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdialogdata.html#wxprintdialogdatasetprintdata">external documentation</a>.
+-spec setPrintData(This, PrintData) -> ok when
+	This::wxPrintDialogData(), PrintData::wxPrintData:wxPrintData().
 setPrintData(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PrintDataT,ref=PrintDataRef}) ->
   ?CLASS(ThisT,wxPrintDialogData),
   ?CLASS(PrintDataT,wxPrintData),
   wxe_util:cast(?wxPrintDialogData_SetPrintData,
   <<ThisRef:32/?UI,PrintDataRef:32/?UI>>).
 
-%% @spec (This::wxPrintDialogData(), Flag::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdialogdata.html#wxprintdialogdatasetprinttofile">external documentation</a>.
+-spec setPrintToFile(This, Flag) -> ok when
+	This::wxPrintDialogData(), Flag::boolean().
 setPrintToFile(#wx_ref{type=ThisT,ref=ThisRef},Flag)
  when is_boolean(Flag) ->
   ?CLASS(ThisT,wxPrintDialogData),
   wxe_util:cast(?wxPrintDialogData_SetPrintToFile,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Flag)):32/?UI>>).
 
-%% @spec (This::wxPrintDialogData(), Flag::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdialogdata.html#wxprintdialogdatasetselection">external documentation</a>.
+-spec setSelection(This, Flag) -> ok when
+	This::wxPrintDialogData(), Flag::boolean().
 setSelection(#wx_ref{type=ThisT,ref=ThisRef},Flag)
  when is_boolean(Flag) ->
   ?CLASS(ThisT,wxPrintDialogData),
   wxe_util:cast(?wxPrintDialogData_SetSelection,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Flag)):32/?UI>>).
 
-%% @spec (This::wxPrintDialogData(), V::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdialogdata.html#wxprintdialogdatasettopage">external documentation</a>.
+-spec setToPage(This, V) -> ok when
+	This::wxPrintDialogData(), V::integer().
 setToPage(#wx_ref{type=ThisT,ref=ThisRef},V)
  when is_integer(V) ->
   ?CLASS(ThisT,wxPrintDialogData),
   wxe_util:cast(?wxPrintDialogData_SetToPage,
   <<ThisRef:32/?UI,V:32/?UI>>).
 
-%% @spec (This::wxPrintDialogData()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxPrintDialogData) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxPrintDialogData),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxPrintPreview.erl b/lib/wx/src/gen/wxPrintPreview.erl
index 6f9a0f653f..717589c871 100644
--- a/lib/wx/src/gen/wxPrintPreview.erl
+++ b/lib/wx/src/gen/wxPrintPreview.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -32,18 +32,24 @@
 %% inherited exports
 -export([parent_class/1]).
 
+-export_type([wxPrintPreview/0]).
 %% @hidden
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (Printout::wxPrintout:wxPrintout()) -> wxPrintPreview()
+-type wxPrintPreview() :: wx:wx_object().
 %% @equiv new(Printout, [])
+-spec new(Printout) -> wxPrintPreview() when
+	Printout::wxPrintout:wxPrintout().
+
 new(Printout)
  when is_record(Printout, wx_ref) ->
   new(Printout, []).
 
-%% @spec (Printout::wxPrintout:wxPrintout(), [Option]) -> wxPrintPreview()
-%% Option = {printoutForPrinting, wxPrintout:wxPrintout()} | {data, wxPrintDialogData:wxPrintDialogData()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintpreview.html#wxprintpreviewwxprintpreview">external documentation</a>.
+-spec new(Printout, [Option]) -> wxPrintPreview() when
+	Printout::wxPrintout:wxPrintout(),
+	Option :: {printoutForPrinting, wxPrintout:wxPrintout()}
+		 | {data, wxPrintDialogData:wxPrintDialogData()}.
 new(#wx_ref{type=PrintoutT,ref=PrintoutRef}, Options)
  when is_list(Options) ->
   ?CLASS(PrintoutT,wxPrintout),
@@ -54,8 +60,9 @@ new(#wx_ref{type=PrintoutT,ref=PrintoutRef}, Options)
   wxe_util:construct(?wxPrintPreview_new_2,
   <<PrintoutRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (Printout::wxPrintout:wxPrintout(), PrintoutForPrinting::wxPrintout:wxPrintout(), Data::wxPrintData:wxPrintData()) -> wxPrintPreview()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintpreview.html#wxprintpreviewwxprintpreview">external documentation</a>.
+-spec new(Printout, PrintoutForPrinting, Data) -> wxPrintPreview() when
+	Printout::wxPrintout:wxPrintout(), PrintoutForPrinting::wxPrintout:wxPrintout(), Data::wxPrintData:wxPrintData().
 new(#wx_ref{type=PrintoutT,ref=PrintoutRef},#wx_ref{type=PrintoutForPrintingT,ref=PrintoutForPrintingRef},#wx_ref{type=DataT,ref=DataRef}) ->
   ?CLASS(PrintoutT,wxPrintout),
   ?CLASS(PrintoutForPrintingT,wxPrintout),
@@ -63,64 +70,73 @@ new(#wx_ref{type=PrintoutT,ref=PrintoutRef},#wx_ref{type=PrintoutForPrintingT,re
   wxe_util:construct(?wxPrintPreview_new_3,
   <<PrintoutRef:32/?UI,PrintoutForPrintingRef:32/?UI,DataRef:32/?UI>>).
 
-%% @spec (This::wxPrintPreview()) -> wxPreviewCanvas:wxPreviewCanvas()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintpreview.html#wxprintpreviewgetcanvas">external documentation</a>.
+-spec getCanvas(This) -> wxPreviewCanvas:wxPreviewCanvas() when
+	This::wxPrintPreview().
 getCanvas(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPrintPreview),
   wxe_util:call(?wxPrintPreview_GetCanvas,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPrintPreview()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintpreview.html#wxprintpreviewgetcurrentpage">external documentation</a>.
+-spec getCurrentPage(This) -> integer() when
+	This::wxPrintPreview().
 getCurrentPage(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPrintPreview),
   wxe_util:call(?wxPrintPreview_GetCurrentPage,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPrintPreview()) -> wxFrame:wxFrame()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintpreview.html#wxprintpreviewgetframe">external documentation</a>.
+-spec getFrame(This) -> wxFrame:wxFrame() when
+	This::wxPrintPreview().
 getFrame(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPrintPreview),
   wxe_util:call(?wxPrintPreview_GetFrame,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPrintPreview()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintpreview.html#wxprintpreviewgetmaxpage">external documentation</a>.
+-spec getMaxPage(This) -> integer() when
+	This::wxPrintPreview().
 getMaxPage(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPrintPreview),
   wxe_util:call(?wxPrintPreview_GetMaxPage,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPrintPreview()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintpreview.html#wxprintpreviewgetminpage">external documentation</a>.
+-spec getMinPage(This) -> integer() when
+	This::wxPrintPreview().
 getMinPage(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPrintPreview),
   wxe_util:call(?wxPrintPreview_GetMinPage,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPrintPreview()) -> wxPrintout:wxPrintout()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintpreview.html#wxprintpreviewgetprintout">external documentation</a>.
+-spec getPrintout(This) -> wxPrintout:wxPrintout() when
+	This::wxPrintPreview().
 getPrintout(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPrintPreview),
   wxe_util:call(?wxPrintPreview_GetPrintout,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPrintPreview()) -> wxPrintout:wxPrintout()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintpreview.html#wxprintpreviewgetprintoutforprinting">external documentation</a>.
+-spec getPrintoutForPrinting(This) -> wxPrintout:wxPrintout() when
+	This::wxPrintPreview().
 getPrintoutForPrinting(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPrintPreview),
   wxe_util:call(?wxPrintPreview_GetPrintoutForPrinting,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPrintPreview()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintpreview.html#wxprintpreviewisok">external documentation</a>.
+-spec isOk(This) -> boolean() when
+	This::wxPrintPreview().
 isOk(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPrintPreview),
   wxe_util:call(?wxPrintPreview_IsOk,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPrintPreview(), Canvas::wxPreviewCanvas:wxPreviewCanvas(), Dc::wxDC:wxDC()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintpreview.html#wxprintpreviewpaintpage">external documentation</a>.
+-spec paintPage(This, Canvas, Dc) -> boolean() when
+	This::wxPrintPreview(), Canvas::wxPreviewCanvas:wxPreviewCanvas(), Dc::wxDC:wxDC().
 paintPage(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=CanvasT,ref=CanvasRef},#wx_ref{type=DcT,ref=DcRef}) ->
   ?CLASS(ThisT,wxPrintPreview),
   ?CLASS(CanvasT,wxPreviewCanvas),
@@ -128,64 +144,71 @@ paintPage(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=CanvasT,ref=CanvasRef},#w
   wxe_util:call(?wxPrintPreview_PaintPage,
   <<ThisRef:32/?UI,CanvasRef:32/?UI,DcRef:32/?UI>>).
 
-%% @spec (This::wxPrintPreview(), Interactive::bool()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintpreview.html#wxprintpreviewprint">external documentation</a>.
+-spec print(This, Interactive) -> boolean() when
+	This::wxPrintPreview(), Interactive::boolean().
 print(#wx_ref{type=ThisT,ref=ThisRef},Interactive)
  when is_boolean(Interactive) ->
   ?CLASS(ThisT,wxPrintPreview),
   wxe_util:call(?wxPrintPreview_Print,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Interactive)):32/?UI>>).
 
-%% @spec (This::wxPrintPreview(), PageNum::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintpreview.html#wxprintpreviewrenderpage">external documentation</a>.
+-spec renderPage(This, PageNum) -> boolean() when
+	This::wxPrintPreview(), PageNum::integer().
 renderPage(#wx_ref{type=ThisT,ref=ThisRef},PageNum)
  when is_integer(PageNum) ->
   ?CLASS(ThisT,wxPrintPreview),
   wxe_util:call(?wxPrintPreview_RenderPage,
   <<ThisRef:32/?UI,PageNum:32/?UI>>).
 
-%% @spec (This::wxPrintPreview(), Canvas::wxPreviewCanvas:wxPreviewCanvas()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintpreview.html#wxprintpreviewsetcanvas">external documentation</a>.
+-spec setCanvas(This, Canvas) -> ok when
+	This::wxPrintPreview(), Canvas::wxPreviewCanvas:wxPreviewCanvas().
 setCanvas(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=CanvasT,ref=CanvasRef}) ->
   ?CLASS(ThisT,wxPrintPreview),
   ?CLASS(CanvasT,wxPreviewCanvas),
   wxe_util:cast(?wxPrintPreview_SetCanvas,
   <<ThisRef:32/?UI,CanvasRef:32/?UI>>).
 
-%% @spec (This::wxPrintPreview(), PageNum::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintpreview.html#wxprintpreviewsetcurrentpage">external documentation</a>.
+-spec setCurrentPage(This, PageNum) -> boolean() when
+	This::wxPrintPreview(), PageNum::integer().
 setCurrentPage(#wx_ref{type=ThisT,ref=ThisRef},PageNum)
  when is_integer(PageNum) ->
   ?CLASS(ThisT,wxPrintPreview),
   wxe_util:call(?wxPrintPreview_SetCurrentPage,
   <<ThisRef:32/?UI,PageNum:32/?UI>>).
 
-%% @spec (This::wxPrintPreview(), Frame::wxFrame:wxFrame()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintpreview.html#wxprintpreviewsetframe">external documentation</a>.
+-spec setFrame(This, Frame) -> ok when
+	This::wxPrintPreview(), Frame::wxFrame:wxFrame().
 setFrame(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FrameT,ref=FrameRef}) ->
   ?CLASS(ThisT,wxPrintPreview),
   ?CLASS(FrameT,wxFrame),
   wxe_util:cast(?wxPrintPreview_SetFrame,
   <<ThisRef:32/?UI,FrameRef:32/?UI>>).
 
-%% @spec (This::wxPrintPreview(), Printout::wxPrintout:wxPrintout()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintpreview.html#wxprintpreviewsetprintout">external documentation</a>.
+-spec setPrintout(This, Printout) -> ok when
+	This::wxPrintPreview(), Printout::wxPrintout:wxPrintout().
 setPrintout(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PrintoutT,ref=PrintoutRef}) ->
   ?CLASS(ThisT,wxPrintPreview),
   ?CLASS(PrintoutT,wxPrintout),
   wxe_util:cast(?wxPrintPreview_SetPrintout,
   <<ThisRef:32/?UI,PrintoutRef:32/?UI>>).
 
-%% @spec (This::wxPrintPreview(), Percent::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintpreview.html#wxprintpreviewsetzoom">external documentation</a>.
+-spec setZoom(This, Percent) -> ok when
+	This::wxPrintPreview(), Percent::integer().
 setZoom(#wx_ref{type=ThisT,ref=ThisRef},Percent)
  when is_integer(Percent) ->
   ?CLASS(ThisT,wxPrintPreview),
   wxe_util:cast(?wxPrintPreview_SetZoom,
   <<ThisRef:32/?UI,Percent:32/?UI>>).
 
-%% @spec (This::wxPrintPreview()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxPrintPreview) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxPrintPreview),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxPrinter.erl b/lib/wx/src/gen/wxPrinter.erl
index af9afe18af..64c70bd75f 100644
--- a/lib/wx/src/gen/wxPrinter.erl
+++ b/lib/wx/src/gen/wxPrinter.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -30,17 +30,20 @@
 %% inherited exports
 -export([parent_class/1]).
 
+-export_type([wxPrinter/0]).
 %% @hidden
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxPrinter()
+-type wxPrinter() :: wx:wx_object().
 %% @equiv new([])
+-spec new() -> wxPrinter().
+
 new() ->
   new([]).
 
-%% @spec ([Option]) -> wxPrinter()
-%% Option = {data, wxPrintDialogData:wxPrintDialogData()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprinter.html#wxprinterwxprinter">external documentation</a>.
+-spec new([Option]) -> wxPrinter() when
+	Option :: {data, wxPrintDialogData:wxPrintDialogData()}.
 new(Options)
  when is_list(Options) ->
   MOpts = fun({data, #wx_ref{type=DataT,ref=DataRef}}, Acc) ->   ?CLASS(DataT,wxPrintDialogData),[<<1:32/?UI,DataRef:32/?UI>>|Acc];
@@ -49,8 +52,9 @@ new(Options)
   wxe_util:construct(?wxPrinter_new,
   <<BinOpt/binary>>).
 
-%% @spec (This::wxPrinter(), Parent::wxWindow:wxWindow(), Printout::wxPrintout:wxPrintout()) -> wxWindow:wxWindow()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprinter.html#wxprintercreateabortwindow">external documentation</a>.
+-spec createAbortWindow(This, Parent, Printout) -> wxWindow:wxWindow() when
+	This::wxPrinter(), Parent::wxWindow:wxWindow(), Printout::wxPrintout:wxPrintout().
 createAbortWindow(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},#wx_ref{type=PrintoutT,ref=PrintoutRef}) ->
   ?CLASS(ThisT,wxPrinter),
   ?CLASS(ParentT,wxWindow),
@@ -58,37 +62,41 @@ createAbortWindow(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=Paren
   wxe_util:call(?wxPrinter_CreateAbortWindow,
   <<ThisRef:32/?UI,ParentRef:32/?UI,PrintoutRef:32/?UI>>).
 
-%% @spec (This::wxPrinter()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprinter.html#wxprintergetabort">external documentation</a>.
+-spec getAbort(This) -> boolean() when
+	This::wxPrinter().
 getAbort(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPrinter),
   wxe_util:call(?wxPrinter_GetAbort,
   <<ThisRef:32/?UI>>).
 
-%% @spec () -> WxPrinterError
-%% WxPrinterError = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprinter.html#wxprintergetlasterror">external documentation</a>.
-%%<br /> WxPrinterError is one of ?wxPRINTER_NO_ERROR | ?wxPRINTER_CANCELLED | ?wxPRINTER_ERROR
+%%<br /> Res = ?wxPRINTER_NO_ERROR | ?wxPRINTER_CANCELLED | ?wxPRINTER_ERROR
+-spec getLastError() -> wx:wx_enum().
 getLastError() ->
   wxe_util:call(?wxPrinter_GetLastError,
   <<>>).
 
-%% @spec (This::wxPrinter()) -> wxPrintDialogData:wxPrintDialogData()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprinter.html#wxprintergetprintdialogdata">external documentation</a>.
+-spec getPrintDialogData(This) -> wxPrintDialogData:wxPrintDialogData() when
+	This::wxPrinter().
 getPrintDialogData(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPrinter),
   wxe_util:call(?wxPrinter_GetPrintDialogData,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPrinter(), Parent::wxWindow:wxWindow(), Printout::wxPrintout:wxPrintout()) -> bool()
 %% @equiv print(This,Parent,Printout, [])
+-spec print(This, Parent, Printout) -> boolean() when
+	This::wxPrinter(), Parent::wxWindow:wxWindow(), Printout::wxPrintout:wxPrintout().
+
 print(This,Parent,Printout)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_record(Printout, wx_ref) ->
   print(This,Parent,Printout, []).
 
-%% @spec (This::wxPrinter(), Parent::wxWindow:wxWindow(), Printout::wxPrintout:wxPrintout(), [Option]) -> bool()
-%% Option = {prompt, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprinter.html#wxprinterprint">external documentation</a>.
+-spec print(This, Parent, Printout, [Option]) -> boolean() when
+	This::wxPrinter(), Parent::wxWindow:wxWindow(), Printout::wxPrintout:wxPrintout(),
+	Option :: {prompt, boolean()}.
 print(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},#wx_ref{type=PrintoutT,ref=PrintoutRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxPrinter),
@@ -100,16 +108,18 @@ print(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},#wx_re
   wxe_util:call(?wxPrinter_Print,
   <<ThisRef:32/?UI,ParentRef:32/?UI,PrintoutRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxPrinter(), Parent::wxWindow:wxWindow()) -> wxDC:wxDC()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprinter.html#wxprinterprintdialog">external documentation</a>.
+-spec printDialog(This, Parent) -> wxDC:wxDC() when
+	This::wxPrinter(), Parent::wxWindow:wxWindow().
 printDialog(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef}) ->
   ?CLASS(ThisT,wxPrinter),
   ?CLASS(ParentT,wxWindow),
   wxe_util:call(?wxPrinter_PrintDialog,
   <<ThisRef:32/?UI,ParentRef:32/?UI>>).
 
-%% @spec (This::wxPrinter(), Parent::wxWindow:wxWindow(), Printout::wxPrintout:wxPrintout(), Message::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprinter.html#wxprinterreporterror">external documentation</a>.
+-spec reportError(This, Parent, Printout, Message) -> ok when
+	This::wxPrinter(), Parent::wxWindow:wxWindow(), Printout::wxPrintout:wxPrintout(), Message::string().
 reportError(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},#wx_ref{type=PrintoutT,ref=PrintoutRef},Message)
  when is_list(Message) ->
   ?CLASS(ThisT,wxPrinter),
@@ -119,16 +129,17 @@ reportError(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},
   wxe_util:cast(?wxPrinter_ReportError,
   <<ThisRef:32/?UI,ParentRef:32/?UI,PrintoutRef: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>>).
 
-%% @spec (This::wxPrinter(), Parent::wxWindow:wxWindow()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprinter.html#wxprintersetup">external documentation</a>.
+-spec setup(This, Parent) -> boolean() when
+	This::wxPrinter(), Parent::wxWindow:wxWindow().
 setup(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef}) ->
   ?CLASS(ThisT,wxPrinter),
   ?CLASS(ParentT,wxWindow),
   wxe_util:call(?wxPrinter_Setup,
   <<ThisRef:32/?UI,ParentRef:32/?UI>>).
 
-%% @spec (This::wxPrinter()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxPrinter) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxPrinter),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxPrintout.erl b/lib/wx/src/gen/wxPrintout.erl
index a34c030275..2afb9a54f7 100644
--- a/lib/wx/src/gen/wxPrintout.erl
+++ b/lib/wx/src/gen/wxPrintout.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -34,9 +34,11 @@
 %% inherited exports
 -export([parent_class/1]).
 
+-export_type([wxPrintout/0]).
 %% @hidden
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
+-type wxPrintout() :: wx:wx_object().
 
 %% @spec (Title::string(), OnPrintPage::function()) -> wxPrintout:wxPrintout()
 %% @doc @equiv new(Title, OnPrintPage, [])
@@ -118,80 +120,91 @@ new(Title, OnPrintPage, Opts) when is_list(Title), is_function(OnPrintPage), is_
 			  OnPrintPageId:32/?UI,
 			  BinOpt/binary>>).
 
-%% @spec (This::wxPrintout()) -> wxDC:wxDC()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintout.html#wxprintoutgetdc">external documentation</a>.
+-spec getDC(This) -> wxDC:wxDC() when
+	This::wxPrintout().
 getDC(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPrintout),
   wxe_util:call(?wxPrintout_GetDC,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPrintout()) -> {W::integer(), H::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintout.html#wxprintoutgetpagesizemm">external documentation</a>.
+-spec getPageSizeMM(This) -> {W::integer(), H::integer()} when
+	This::wxPrintout().
 getPageSizeMM(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPrintout),
   wxe_util:call(?wxPrintout_GetPageSizeMM,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPrintout()) -> {W::integer(), H::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintout.html#wxprintoutgetpagesizepixels">external documentation</a>.
+-spec getPageSizePixels(This) -> {W::integer(), H::integer()} when
+	This::wxPrintout().
 getPageSizePixels(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPrintout),
   wxe_util:call(?wxPrintout_GetPageSizePixels,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPrintout()) -> {X::integer(), Y::integer(), W::integer(), H::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintout.html#wxprintoutgetpaperrectpixels">external documentation</a>.
+-spec getPaperRectPixels(This) -> {X::integer(), Y::integer(), W::integer(), H::integer()} when
+	This::wxPrintout().
 getPaperRectPixels(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPrintout),
   wxe_util:call(?wxPrintout_GetPaperRectPixels,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPrintout()) -> {X::integer(), Y::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintout.html#wxprintoutgetppiprinter">external documentation</a>.
+-spec getPPIPrinter(This) -> {X::integer(), Y::integer()} when
+	This::wxPrintout().
 getPPIPrinter(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPrintout),
   wxe_util:call(?wxPrintout_GetPPIPrinter,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPrintout()) -> {X::integer(), Y::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintout.html#wxprintoutgetppiscreen">external documentation</a>.
+-spec getPPIScreen(This) -> {X::integer(), Y::integer()} when
+	This::wxPrintout().
 getPPIScreen(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPrintout),
   wxe_util:call(?wxPrintout_GetPPIScreen,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPrintout()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintout.html#wxprintoutgettitle">external documentation</a>.
+-spec getTitle(This) -> string() when
+	This::wxPrintout().
 getTitle(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPrintout),
   wxe_util:call(?wxPrintout_GetTitle,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPrintout()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintout.html#wxprintoutispreview">external documentation</a>.
+-spec isPreview(This) -> boolean() when
+	This::wxPrintout().
 isPreview(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPrintout),
   wxe_util:call(?wxPrintout_IsPreview,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPrintout(), ImageSize::{W::integer(), H::integer()}) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintout.html#wxprintoutfitthissizetopaper">external documentation</a>.
+-spec fitThisSizeToPaper(This, ImageSize) -> ok when
+	This::wxPrintout(), ImageSize::{W::integer(), H::integer()}.
 fitThisSizeToPaper(#wx_ref{type=ThisT,ref=ThisRef},{ImageSizeW,ImageSizeH})
  when is_integer(ImageSizeW),is_integer(ImageSizeH) ->
   ?CLASS(ThisT,wxPrintout),
   wxe_util:cast(?wxPrintout_FitThisSizeToPaper,
   <<ThisRef:32/?UI,ImageSizeW:32/?UI,ImageSizeH:32/?UI>>).
 
-%% @spec (This::wxPrintout(), ImageSize::{W::integer(), H::integer()}) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintout.html#wxprintoutfitthissizetopage">external documentation</a>.
+-spec fitThisSizeToPage(This, ImageSize) -> ok when
+	This::wxPrintout(), ImageSize::{W::integer(), H::integer()}.
 fitThisSizeToPage(#wx_ref{type=ThisT,ref=ThisRef},{ImageSizeW,ImageSizeH})
  when is_integer(ImageSizeW),is_integer(ImageSizeH) ->
   ?CLASS(ThisT,wxPrintout),
   wxe_util:cast(?wxPrintout_FitThisSizeToPage,
   <<ThisRef:32/?UI,ImageSizeW:32/?UI,ImageSizeH:32/?UI>>).
 
-%% @spec (This::wxPrintout(), ImageSize::{W::integer(), H::integer()}, PageSetupData::wxPageSetupDialogData:wxPageSetupDialogData()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintout.html#wxprintoutfitthissizetopagemargins">external documentation</a>.
+-spec fitThisSizeToPageMargins(This, ImageSize, PageSetupData) -> ok when
+	This::wxPrintout(), ImageSize::{W::integer(), H::integer()}, PageSetupData::wxPageSetupDialogData:wxPageSetupDialogData().
 fitThisSizeToPageMargins(#wx_ref{type=ThisT,ref=ThisRef},{ImageSizeW,ImageSizeH},#wx_ref{type=PageSetupDataT,ref=PageSetupDataRef})
  when is_integer(ImageSizeW),is_integer(ImageSizeH) ->
   ?CLASS(ThisT,wxPrintout),
@@ -199,75 +212,84 @@ fitThisSizeToPageMargins(#wx_ref{type=ThisT,ref=ThisRef},{ImageSizeW,ImageSizeH}
   wxe_util:cast(?wxPrintout_FitThisSizeToPageMargins,
   <<ThisRef:32/?UI,ImageSizeW:32/?UI,ImageSizeH:32/?UI,PageSetupDataRef:32/?UI>>).
 
-%% @spec (This::wxPrintout()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintout.html#wxprintoutmapscreensizetopaper">external documentation</a>.
+-spec mapScreenSizeToPaper(This) -> ok when
+	This::wxPrintout().
 mapScreenSizeToPaper(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPrintout),
   wxe_util:cast(?wxPrintout_MapScreenSizeToPaper,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPrintout()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintout.html#wxprintoutmapscreensizetopage">external documentation</a>.
+-spec mapScreenSizeToPage(This) -> ok when
+	This::wxPrintout().
 mapScreenSizeToPage(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPrintout),
   wxe_util:cast(?wxPrintout_MapScreenSizeToPage,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPrintout(), PageSetupData::wxPageSetupDialogData:wxPageSetupDialogData()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintout.html#wxprintoutmapscreensizetopagemargins">external documentation</a>.
+-spec mapScreenSizeToPageMargins(This, PageSetupData) -> ok when
+	This::wxPrintout(), PageSetupData::wxPageSetupDialogData:wxPageSetupDialogData().
 mapScreenSizeToPageMargins(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PageSetupDataT,ref=PageSetupDataRef}) ->
   ?CLASS(ThisT,wxPrintout),
   ?CLASS(PageSetupDataT,wxPageSetupDialogData),
   wxe_util:cast(?wxPrintout_MapScreenSizeToPageMargins,
   <<ThisRef:32/?UI,PageSetupDataRef:32/?UI>>).
 
-%% @spec (This::wxPrintout()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintout.html#wxprintoutmapscreensizetodevice">external documentation</a>.
+-spec mapScreenSizeToDevice(This) -> ok when
+	This::wxPrintout().
 mapScreenSizeToDevice(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPrintout),
   wxe_util:cast(?wxPrintout_MapScreenSizeToDevice,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPrintout()) -> {X::integer(), Y::integer(), W::integer(), H::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintout.html#wxprintoutgetlogicalpaperrect">external documentation</a>.
+-spec getLogicalPaperRect(This) -> {X::integer(), Y::integer(), W::integer(), H::integer()} when
+	This::wxPrintout().
 getLogicalPaperRect(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPrintout),
   wxe_util:call(?wxPrintout_GetLogicalPaperRect,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPrintout()) -> {X::integer(), Y::integer(), W::integer(), H::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintout.html#wxprintoutgetlogicalpagerect">external documentation</a>.
+-spec getLogicalPageRect(This) -> {X::integer(), Y::integer(), W::integer(), H::integer()} when
+	This::wxPrintout().
 getLogicalPageRect(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPrintout),
   wxe_util:call(?wxPrintout_GetLogicalPageRect,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxPrintout(), PageSetupData::wxPageSetupDialogData:wxPageSetupDialogData()) -> {X::integer(), Y::integer(), W::integer(), H::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintout.html#wxprintoutgetlogicalpagemarginsrect">external documentation</a>.
+-spec getLogicalPageMarginsRect(This, PageSetupData) -> {X::integer(), Y::integer(), W::integer(), H::integer()} when
+	This::wxPrintout(), PageSetupData::wxPageSetupDialogData:wxPageSetupDialogData().
 getLogicalPageMarginsRect(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PageSetupDataT,ref=PageSetupDataRef}) ->
   ?CLASS(ThisT,wxPrintout),
   ?CLASS(PageSetupDataT,wxPageSetupDialogData),
   wxe_util:call(?wxPrintout_GetLogicalPageMarginsRect,
   <<ThisRef:32/?UI,PageSetupDataRef:32/?UI>>).
 
-%% @spec (This::wxPrintout(), X::integer(), Y::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintout.html#wxprintoutsetlogicalorigin">external documentation</a>.
+-spec setLogicalOrigin(This, X, Y) -> ok when
+	This::wxPrintout(), X::integer(), Y::integer().
 setLogicalOrigin(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
  when is_integer(X),is_integer(Y) ->
   ?CLASS(ThisT,wxPrintout),
   wxe_util:cast(?wxPrintout_SetLogicalOrigin,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI>>).
 
-%% @spec (This::wxPrintout(), Xoff::integer(), Yoff::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintout.html#wxprintoutoffsetlogicalorigin">external documentation</a>.
+-spec offsetLogicalOrigin(This, Xoff, Yoff) -> ok when
+	This::wxPrintout(), Xoff::integer(), Yoff::integer().
 offsetLogicalOrigin(#wx_ref{type=ThisT,ref=ThisRef},Xoff,Yoff)
  when is_integer(Xoff),is_integer(Yoff) ->
   ?CLASS(ThisT,wxPrintout),
   wxe_util:cast(?wxPrintout_OffsetLogicalOrigin,
   <<ThisRef:32/?UI,Xoff:32/?UI,Yoff:32/?UI>>).
 
-%% @spec (This::wxPrintout()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxPrintout) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxPrintout),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxProgressDialog.erl b/lib/wx/src/gen/wxProgressDialog.erl
index 69e73454b5..679e87aab2 100644
--- a/lib/wx/src/gen/wxProgressDialog.erl
+++ b/lib/wx/src/gen/wxProgressDialog.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -77,6 +77,7 @@
   transferDataFromWindow/1,transferDataToWindow/1,updateWindowUI/1,
   updateWindowUI/2,validate/1,warpPointer/3]).
 
+-export_type([wxProgressDialog/0]).
 %% @hidden
 parent_class(wxDialog) -> true;
 parent_class(wxTopLevelWindow) -> true;
@@ -84,15 +85,21 @@ parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (Title::string(), Message::string()) -> wxProgressDialog()
+-type wxProgressDialog() :: wx:wx_object().
 %% @equiv new(Title,Message, [])
+-spec new(Title, Message) -> wxProgressDialog() when
+	Title::string(), Message::string().
+
 new(Title,Message)
  when is_list(Title),is_list(Message) ->
   new(Title,Message, []).
 
-%% @spec (Title::string(), Message::string(), [Option]) -> wxProgressDialog()
-%% Option = {maximum, integer()} | {parent, wxWindow:wxWindow()} | {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprogressdialog.html#wxprogressdialogwxprogressdialog">external documentation</a>.
+-spec new(Title, Message, [Option]) -> wxProgressDialog() when
+	Title::string(), Message::string(),
+	Option :: {maximum, integer()}
+		 | {parent, wxWindow:wxWindow()}
+		 | {style, integer()}.
 new(Title,Message, Options)
  when is_list(Title),is_list(Message),is_list(Options) ->
   Title_UC = unicode:characters_to_binary([Title,0]),
@@ -105,29 +112,34 @@ new(Title,Message, Options)
   wxe_util:construct(?wxProgressDialog_new,
   <<(byte_size(Title_UC)):32/?UI,(Title_UC)/binary, 0:(((8- ((4+byte_size(Title_UC)) band 16#7)) band 16#7))/unit:8,(byte_size(Message_UC)):32/?UI,(Message_UC)/binary, 0:(((8- ((4+byte_size(Message_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxProgressDialog()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprogressdialog.html#wxprogressdialogresume">external documentation</a>.
+-spec resume(This) -> ok when
+	This::wxProgressDialog().
 resume(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxProgressDialog),
   wxe_util:cast(?wxProgressDialog_Resume,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxProgressDialog()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprogressdialog.html#wxprogressdialogupdate">external documentation</a>.
+-spec update(This) -> ok when
+	This::wxProgressDialog().
 update(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxProgressDialog),
   wxe_util:cast(?wxProgressDialog_Update_0,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxProgressDialog(), Value::integer()) -> bool()
 %% @equiv update(This,Value, [])
+-spec update(This, Value) -> boolean() when
+	This::wxProgressDialog(), Value::integer().
+
 update(This,Value)
  when is_record(This, wx_ref),is_integer(Value) ->
   update(This,Value, []).
 
-%% @spec (This::wxProgressDialog(), Value::integer(), [Option]) -> bool()
-%% Option = {newmsg, string()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprogressdialog.html#wxprogressdialogupdate">external documentation</a>.
+-spec update(This, Value, [Option]) -> boolean() when
+	This::wxProgressDialog(), Value::integer(),
+	Option :: {newmsg, string()}.
 update(#wx_ref{type=ThisT,ref=ThisRef},Value, Options)
  when is_integer(Value),is_list(Options) ->
   ?CLASS(ThisT,wxProgressDialog),
@@ -137,8 +149,8 @@ update(#wx_ref{type=ThisT,ref=ThisRef},Value, Options)
   wxe_util:call(?wxProgressDialog_Update_2,
   <<ThisRef:32/?UI,Value:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxProgressDialog()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxProgressDialog) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxProgressDialog),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxQueryNewPaletteEvent.erl b/lib/wx/src/gen/wxQueryNewPaletteEvent.erl
index 96c493e4a6..8123d62fe1 100644
--- a/lib/wx/src/gen/wxQueryNewPaletteEvent.erl
+++ b/lib/wx/src/gen/wxQueryNewPaletteEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -37,20 +37,24 @@
 -export([getId/1,getSkipped/1,getTimestamp/1,isCommandEvent/1,parent_class/1,
   resumePropagation/2,shouldPropagate/1,skip/1,skip/2,stopPropagation/1]).
 
+-export_type([wxQueryNewPaletteEvent/0]).
 %% @hidden
 parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (This::wxQueryNewPaletteEvent(), Realized::bool()) -> ok
+-type wxQueryNewPaletteEvent() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxquerynewpaletteevent.html#wxquerynewpaletteeventsetpaletterealized">external documentation</a>.
+-spec setPaletteRealized(This, Realized) -> ok when
+	This::wxQueryNewPaletteEvent(), Realized::boolean().
 setPaletteRealized(#wx_ref{type=ThisT,ref=ThisRef},Realized)
  when is_boolean(Realized) ->
   ?CLASS(ThisT,wxQueryNewPaletteEvent),
   wxe_util:cast(?wxQueryNewPaletteEvent_SetPaletteRealized,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Realized)):32/?UI>>).
 
-%% @spec (This::wxQueryNewPaletteEvent()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxquerynewpaletteevent.html#wxquerynewpaletteeventgetpaletterealized">external documentation</a>.
+-spec getPaletteRealized(This) -> boolean() when
+	This::wxQueryNewPaletteEvent().
 getPaletteRealized(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxQueryNewPaletteEvent),
   wxe_util:call(?wxQueryNewPaletteEvent_GetPaletteRealized,
diff --git a/lib/wx/src/gen/wxRadioBox.erl b/lib/wx/src/gen/wxRadioBox.erl
index 766a691108..4d02633922 100644
--- a/lib/wx/src/gen/wxRadioBox.erl
+++ b/lib/wx/src/gen/wxRadioBox.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -72,21 +72,28 @@
   thaw/1,transferDataFromWindow/1,transferDataToWindow/1,update/1,updateWindowUI/1,
   updateWindowUI/2,validate/1,warpPointer/3]).
 
+-export_type([wxRadioBox/0]).
 %% @hidden
 parent_class(wxControl) -> true;
 parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (Parent::wxWindow:wxWindow(), Id::integer(), Title::string(), Pos::{X::integer(), Y::integer()}, Size::{W::integer(), H::integer()}, Choices::[[string()]]) -> wxRadioBox()
+-type wxRadioBox() :: wx:wx_object().
 %% @equiv new(Parent,Id,Title,Pos,Size,Choices, [])
+-spec new(Parent, Id, Title, Pos, Size, Choices) -> wxRadioBox() when
+	Parent::wxWindow:wxWindow(), Id::integer(), Title::string(), Pos::{X::integer(), Y::integer()}, Size::{W::integer(), H::integer()}, Choices::[[string()]].
+
 new(Parent,Id,Title,Pos={PosX,PosY},Size={SizeW,SizeH},Choices)
  when is_record(Parent, wx_ref),is_integer(Id),is_list(Title),is_integer(PosX),is_integer(PosY),is_integer(SizeW),is_integer(SizeH),is_list(Choices) ->
   new(Parent,Id,Title,Pos,Size,Choices, []).
 
-%% @spec (Parent::wxWindow:wxWindow(), Id::integer(), Title::string(), Pos::{X::integer(), Y::integer()}, Size::{W::integer(), H::integer()}, Choices::[[string()]], [Option]) -> wxRadioBox()
-%% Option = {majorDim, integer()} | {style, integer()} | {val, wx:wx()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxradiobox.html#wxradioboxwxradiobox">external documentation</a>.
+-spec new(Parent, Id, Title, Pos, Size, Choices, [Option]) -> wxRadioBox() when
+	Parent::wxWindow:wxWindow(), Id::integer(), Title::string(), Pos::{X::integer(), Y::integer()}, Size::{W::integer(), H::integer()}, Choices::[[string()]],
+	Option :: {majorDim, integer()}
+		 | {style, integer()}
+		 | {val, wx:wx()}.
 new(#wx_ref{type=ParentT,ref=ParentRef},Id,Title,{PosX,PosY},{SizeW,SizeH},Choices, Options)
  when is_integer(Id),is_list(Title),is_integer(PosX),is_integer(PosY),is_integer(SizeW),is_integer(SizeH),is_list(Choices),is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -101,15 +108,20 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Id,Title,{PosX,PosY},{SizeW,SizeH},Choic
   wxe_util:construct(?wxRadioBox_new,
   <<ParentRef:32/?UI,Id:32/?UI,(byte_size(Title_UC)):32/?UI,(Title_UC)/binary, 0:(((8- ((4+byte_size(Title_UC)) band 16#7)) band 16#7))/unit:8,PosX:32/?UI,PosY:32/?UI,SizeW:32/?UI,SizeH:32/?UI,(length(Choices_UCA)):32/?UI, (<< <<(byte_size(UC_Str)):32/?UI, UC_Str/binary>>|| UC_Str <- Choices_UCA>>)/binary, 0:(((8- ((4 + lists:sum([byte_size(S)+4||S<-Choices_UCA])) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxRadioBox(), Parent::wxWindow:wxWindow(), Id::integer(), Title::string(), Pos::{X::integer(), Y::integer()}, Size::{W::integer(), H::integer()}, Choices::[[string()]]) -> bool()
 %% @equiv create(This,Parent,Id,Title,Pos,Size,Choices, [])
+-spec create(This, Parent, Id, Title, Pos, Size, Choices) -> boolean() when
+	This::wxRadioBox(), Parent::wxWindow:wxWindow(), Id::integer(), Title::string(), Pos::{X::integer(), Y::integer()}, Size::{W::integer(), H::integer()}, Choices::[[string()]].
+
 create(This,Parent,Id,Title,Pos={PosX,PosY},Size={SizeW,SizeH},Choices)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id),is_list(Title),is_integer(PosX),is_integer(PosY),is_integer(SizeW),is_integer(SizeH),is_list(Choices) ->
   create(This,Parent,Id,Title,Pos,Size,Choices, []).
 
-%% @spec (This::wxRadioBox(), Parent::wxWindow:wxWindow(), Id::integer(), Title::string(), Pos::{X::integer(), Y::integer()}, Size::{W::integer(), H::integer()}, Choices::[[string()]], [Option]) -> bool()
-%% Option = {majorDim, integer()} | {style, integer()} | {val, wx:wx()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxradiobox.html#wxradioboxcreate">external documentation</a>.
+-spec create(This, Parent, Id, Title, Pos, Size, Choices, [Option]) -> boolean() when
+	This::wxRadioBox(), Parent::wxWindow:wxWindow(), Id::integer(), Title::string(), Pos::{X::integer(), Y::integer()}, Size::{W::integer(), H::integer()}, Choices::[[string()]],
+	Option :: {majorDim, integer()}
+		 | {style, integer()}
+		 | {val, wx:wx()}.
 create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id,Title,{PosX,PosY},{SizeW,SizeH},Choices, Options)
  when is_integer(Id),is_list(Title),is_integer(PosX),is_integer(PosY),is_integer(SizeW),is_integer(SizeH),is_list(Choices),is_list(Options) ->
   ?CLASS(ThisT,wxRadioBox),
@@ -125,21 +137,20 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id,Ti
   wxe_util:call(?wxRadioBox_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI,Id: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,PosX:32/?UI,PosY:32/?UI,SizeW:32/?UI,SizeH:32/?UI,(length(Choices_UCA)):32/?UI, (<< <<(byte_size(UC_Str)):32/?UI, UC_Str/binary>>|| UC_Str <- Choices_UCA>>)/binary, 0:(((8- ((4 + lists:sum([byte_size(S)+4||S<-Choices_UCA])) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxRadioBox()) -> bool()
 %% @equiv enable(This, [])
+-spec enable(This) -> boolean() when
+	This::wxRadioBox().
+
 enable(This)
  when is_record(This, wx_ref) ->
   enable(This, []).
 
-%% @spec (This::wxRadioBox(),X::integer()|term()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxradiobox.html#wxradioboxenable">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% enable(This::wxRadioBox(), N::integer()) -> enable(This,N, []) </c></p>
-%% <p><c>
-%% enable(This::wxRadioBox(), [Option]) -> bool() </c>
-%%<br /> Option = {enable, bool()}
-%% </p>
+-spec enable(This, N) -> boolean() when
+	This::wxRadioBox(), N::integer();
+      (This, [Option]) -> boolean() when
+	This::wxRadioBox(),
+	Option :: {enable, boolean()}.
 
 enable(This,N)
  when is_record(This, wx_ref),is_integer(N) ->
@@ -153,9 +164,10 @@ enable(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxRadioBox_Enable_1,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxRadioBox(), N::integer(), [Option]) -> bool()
-%% Option = {enable, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxradiobox.html#wxradioboxenable">external documentation</a>.
+-spec enable(This, N, [Option]) -> boolean() when
+	This::wxRadioBox(), N::integer(),
+	Option :: {enable, boolean()}.
 enable(#wx_ref{type=ThisT,ref=ThisRef},N, Options)
  when is_integer(N),is_list(Options) ->
   ?CLASS(ThisT,wxRadioBox),
@@ -165,44 +177,46 @@ enable(#wx_ref{type=ThisT,ref=ThisRef},N, Options)
   wxe_util:call(?wxRadioBox_Enable_2,
   <<ThisRef:32/?UI,N:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxRadioBox()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxradiobox.html#wxradioboxgetselection">external documentation</a>.
+-spec getSelection(This) -> integer() when
+	This::wxRadioBox().
 getSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxRadioBox),
   wxe_util:call(?wxRadioBox_GetSelection,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxRadioBox(), N::integer()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxradiobox.html#wxradioboxgetstring">external documentation</a>.
+-spec getString(This, N) -> string() when
+	This::wxRadioBox(), N::integer().
 getString(#wx_ref{type=ThisT,ref=ThisRef},N)
  when is_integer(N) ->
   ?CLASS(ThisT,wxRadioBox),
   wxe_util:call(?wxRadioBox_GetString,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @spec (This::wxRadioBox(), N::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxradiobox.html#wxradioboxsetselection">external documentation</a>.
+-spec setSelection(This, N) -> ok when
+	This::wxRadioBox(), N::integer().
 setSelection(#wx_ref{type=ThisT,ref=ThisRef},N)
  when is_integer(N) ->
   ?CLASS(ThisT,wxRadioBox),
   wxe_util:cast(?wxRadioBox_SetSelection,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @spec (This::wxRadioBox()) -> bool()
 %% @equiv show(This, [])
+-spec show(This) -> boolean() when
+	This::wxRadioBox().
+
 show(This)
  when is_record(This, wx_ref) ->
   show(This, []).
 
-%% @spec (This::wxRadioBox(),X::integer()|term()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxradiobox.html#wxradioboxshow">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% show(This::wxRadioBox(), N::integer()) -> show(This,N, []) </c></p>
-%% <p><c>
-%% show(This::wxRadioBox(), [Option]) -> bool() </c>
-%%<br /> Option = {show, bool()}
-%% </p>
+-spec show(This, N) -> boolean() when
+	This::wxRadioBox(), N::integer();
+      (This, [Option]) -> boolean() when
+	This::wxRadioBox(),
+	Option :: {show, boolean()}.
 
 show(This,N)
  when is_record(This, wx_ref),is_integer(N) ->
@@ -216,9 +230,10 @@ show(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxRadioBox_Show_1,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxRadioBox(), N::integer(), [Option]) -> bool()
-%% Option = {show, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxradiobox.html#wxradioboxshow">external documentation</a>.
+-spec show(This, N, [Option]) -> boolean() when
+	This::wxRadioBox(), N::integer(),
+	Option :: {show, boolean()}.
 show(#wx_ref{type=ThisT,ref=ThisRef},N, Options)
  when is_integer(N),is_list(Options) ->
   ?CLASS(ThisT,wxRadioBox),
@@ -228,62 +243,70 @@ show(#wx_ref{type=ThisT,ref=ThisRef},N, Options)
   wxe_util:call(?wxRadioBox_Show_2,
   <<ThisRef:32/?UI,N:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxRadioBox()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxradiobox.html#wxradioboxgetcolumncount">external documentation</a>.
+-spec getColumnCount(This) -> integer() when
+	This::wxRadioBox().
 getColumnCount(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxRadioBox),
   wxe_util:call(?wxRadioBox_GetColumnCount,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxRadioBox(), N::integer()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxradiobox.html#wxradioboxgetitemhelptext">external documentation</a>.
+-spec getItemHelpText(This, N) -> string() when
+	This::wxRadioBox(), N::integer().
 getItemHelpText(#wx_ref{type=ThisT,ref=ThisRef},N)
  when is_integer(N) ->
   ?CLASS(ThisT,wxRadioBox),
   wxe_util:call(?wxRadioBox_GetItemHelpText,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @spec (This::wxRadioBox(), Item::integer()) -> wxToolTip:wxToolTip()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxradiobox.html#wxradioboxgetitemtooltip">external documentation</a>.
+-spec getItemToolTip(This, Item) -> wxToolTip:wxToolTip() when
+	This::wxRadioBox(), Item::integer().
 getItemToolTip(#wx_ref{type=ThisT,ref=ThisRef},Item)
  when is_integer(Item) ->
   ?CLASS(ThisT,wxRadioBox),
   wxe_util:call(?wxRadioBox_GetItemToolTip,
   <<ThisRef:32/?UI,Item:32/?UI>>).
 
-%% @spec (This::wxRadioBox(), Pt::{X::integer(), Y::integer()}) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxradiobox.html#wxradioboxgetitemfrompoint">external documentation</a>.
+-spec getItemFromPoint(This, Pt) -> integer() when
+	This::wxRadioBox(), Pt::{X::integer(), Y::integer()}.
 getItemFromPoint(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY})
  when is_integer(PtX),is_integer(PtY) ->
   ?CLASS(ThisT,wxRadioBox),
   wxe_util:call(?wxRadioBox_GetItemFromPoint,
   <<ThisRef:32/?UI,PtX:32/?UI,PtY:32/?UI>>).
 
-%% @spec (This::wxRadioBox()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxradiobox.html#wxradioboxgetrowcount">external documentation</a>.
+-spec getRowCount(This) -> integer() when
+	This::wxRadioBox().
 getRowCount(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxRadioBox),
   wxe_util:call(?wxRadioBox_GetRowCount,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxRadioBox(), N::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxradiobox.html#wxradioboxisitemenabled">external documentation</a>.
+-spec isItemEnabled(This, N) -> boolean() when
+	This::wxRadioBox(), N::integer().
 isItemEnabled(#wx_ref{type=ThisT,ref=ThisRef},N)
  when is_integer(N) ->
   ?CLASS(ThisT,wxRadioBox),
   wxe_util:call(?wxRadioBox_IsItemEnabled,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @spec (This::wxRadioBox(), N::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxradiobox.html#wxradioboxisitemshown">external documentation</a>.
+-spec isItemShown(This, N) -> boolean() when
+	This::wxRadioBox(), N::integer().
 isItemShown(#wx_ref{type=ThisT,ref=ThisRef},N)
  when is_integer(N) ->
   ?CLASS(ThisT,wxRadioBox),
   wxe_util:call(?wxRadioBox_IsItemShown,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @spec (This::wxRadioBox(), N::integer(), HelpText::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxradiobox.html#wxradioboxsetitemhelptext">external documentation</a>.
+-spec setItemHelpText(This, N, HelpText) -> ok when
+	This::wxRadioBox(), N::integer(), HelpText::string().
 setItemHelpText(#wx_ref{type=ThisT,ref=ThisRef},N,HelpText)
  when is_integer(N),is_list(HelpText) ->
   ?CLASS(ThisT,wxRadioBox),
@@ -291,8 +314,9 @@ setItemHelpText(#wx_ref{type=ThisT,ref=ThisRef},N,HelpText)
   wxe_util:cast(?wxRadioBox_SetItemHelpText,
   <<ThisRef:32/?UI,N:32/?UI,(byte_size(HelpText_UC)):32/?UI,(HelpText_UC)/binary, 0:(((8- ((4+byte_size(HelpText_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxRadioBox(), Item::integer(), Text::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxradiobox.html#wxradioboxsetitemtooltip">external documentation</a>.
+-spec setItemToolTip(This, Item, Text) -> ok when
+	This::wxRadioBox(), Item::integer(), Text::string().
 setItemToolTip(#wx_ref{type=ThisT,ref=ThisRef},Item,Text)
  when is_integer(Item),is_list(Text) ->
   ?CLASS(ThisT,wxRadioBox),
@@ -300,8 +324,8 @@ setItemToolTip(#wx_ref{type=ThisT,ref=ThisRef},Item,Text)
   wxe_util:cast(?wxRadioBox_SetItemToolTip,
   <<ThisRef:32/?UI,Item:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((4+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxRadioBox()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxRadioBox) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxRadioBox),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxRadioButton.erl b/lib/wx/src/gen/wxRadioButton.erl
index c4665837b5..d95972da22 100644
--- a/lib/wx/src/gen/wxRadioButton.erl
+++ b/lib/wx/src/gen/wxRadioButton.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -69,27 +69,35 @@
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
 
+-export_type([wxRadioButton/0]).
 %% @hidden
 parent_class(wxControl) -> true;
 parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxRadioButton()
+-type wxRadioButton() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxradiobutton.html#wxradiobuttonwxradiobutton">external documentation</a>.
+-spec new() -> wxRadioButton().
 new() ->
   wxe_util:construct(?wxRadioButton_new_0,
   <<>>).
 
-%% @spec (Parent::wxWindow:wxWindow(), Id::integer(), Label::string()) -> wxRadioButton()
 %% @equiv new(Parent,Id,Label, [])
+-spec new(Parent, Id, Label) -> wxRadioButton() when
+	Parent::wxWindow:wxWindow(), Id::integer(), Label::string().
+
 new(Parent,Id,Label)
  when is_record(Parent, wx_ref),is_integer(Id),is_list(Label) ->
   new(Parent,Id,Label, []).
 
-%% @spec (Parent::wxWindow:wxWindow(), Id::integer(), Label::string(), [Option]) -> wxRadioButton()
-%% Option = {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()} | {validator, wx:wx()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxradiobutton.html#wxradiobuttonwxradiobutton">external documentation</a>.
+-spec new(Parent, Id, Label, [Option]) -> wxRadioButton() when
+	Parent::wxWindow:wxWindow(), Id::integer(), Label::string(),
+	Option :: {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}
+		 | {validator, wx:wx()}.
 new(#wx_ref{type=ParentT,ref=ParentRef},Id,Label, Options)
  when is_integer(Id),is_list(Label),is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -103,15 +111,21 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Id,Label, Options)
   wxe_util:construct(?wxRadioButton_new_4,
   <<ParentRef:32/?UI,Id:32/?UI,(byte_size(Label_UC)):32/?UI,(Label_UC)/binary, 0:(((8- ((4+byte_size(Label_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxRadioButton(), Parent::wxWindow:wxWindow(), Id::integer(), Label::string()) -> bool()
 %% @equiv create(This,Parent,Id,Label, [])
+-spec create(This, Parent, Id, Label) -> boolean() when
+	This::wxRadioButton(), Parent::wxWindow:wxWindow(), Id::integer(), Label::string().
+
 create(This,Parent,Id,Label)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id),is_list(Label) ->
   create(This,Parent,Id,Label, []).
 
-%% @spec (This::wxRadioButton(), Parent::wxWindow:wxWindow(), Id::integer(), Label::string(), [Option]) -> bool()
-%% Option = {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()} | {validator, wx:wx()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxradiobutton.html#wxradiobuttoncreate">external documentation</a>.
+-spec create(This, Parent, Id, Label, [Option]) -> boolean() when
+	This::wxRadioButton(), Parent::wxWindow:wxWindow(), Id::integer(), Label::string(),
+	Option :: {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}
+		 | {validator, wx:wx()}.
 create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id,Label, Options)
  when is_integer(Id),is_list(Label),is_list(Options) ->
   ?CLASS(ThisT,wxRadioButton),
@@ -126,23 +140,25 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id,La
   wxe_util:call(?wxRadioButton_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI,Id:32/?UI,(byte_size(Label_UC)):32/?UI,(Label_UC)/binary, 0:(((8- ((0+byte_size(Label_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxRadioButton()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxradiobutton.html#wxradiobuttongetvalue">external documentation</a>.
+-spec getValue(This) -> boolean() when
+	This::wxRadioButton().
 getValue(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxRadioButton),
   wxe_util:call(?wxRadioButton_GetValue,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxRadioButton(), Val::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxradiobutton.html#wxradiobuttonsetvalue">external documentation</a>.
+-spec setValue(This, Val) -> ok when
+	This::wxRadioButton(), Val::boolean().
 setValue(#wx_ref{type=ThisT,ref=ThisRef},Val)
  when is_boolean(Val) ->
   ?CLASS(ThisT,wxRadioButton),
   wxe_util:cast(?wxRadioButton_SetValue,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Val)):32/?UI>>).
 
-%% @spec (This::wxRadioButton()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxRadioButton) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxRadioButton),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxRegion.erl b/lib/wx/src/gen/wxRegion.erl
index 9107a4d6b1..0239558a5a 100644
--- a/lib/wx/src/gen/wxRegion.erl
+++ b/lib/wx/src/gen/wxRegion.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -32,24 +32,22 @@
 %% inherited exports
 -export([parent_class/1]).
 
+-export_type([wxRegion/0]).
 %% @hidden
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxRegion()
+-type wxRegion() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxregion.html#wxregionwxregion">external documentation</a>.
+-spec new() -> wxRegion().
 new() ->
   wxe_util:construct(?wxRegion_new_0,
   <<>>).
 
-%% @spec (X::term()) -> wxRegion()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxregion.html#wxregionwxregion">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% new(Bmp::wxBitmap:wxBitmap()) -> wxRegion() </c>
-%% </p>
-%% <p><c>
-%% new(Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}) -> wxRegion() </c>
-%% </p>
+-spec new(Bmp) -> wxRegion() when
+	Bmp::wxBitmap:wxBitmap();
+      (Rect) -> wxRegion() when
+	Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}.
 new(#wx_ref{type=BmpT,ref=BmpRef}) ->
   ?CLASS(BmpT,wxBitmap),
   wxe_util:construct(?wxRegion_new_1_0,
@@ -59,40 +57,36 @@ new({RectX,RectY,RectW,RectH})
   wxe_util:construct(?wxRegion_new_1_1,
   <<RectX:32/?UI,RectY:32/?UI,RectW:32/?UI,RectH:32/?UI>>).
 
-%% @spec (TopLeft::{X::integer(), Y::integer()}, BottomRight::{X::integer(), Y::integer()}) -> wxRegion()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxregion.html#wxregionwxregion">external documentation</a>.
+-spec new(TopLeft, BottomRight) -> wxRegion() when
+	TopLeft::{X::integer(), Y::integer()}, BottomRight::{X::integer(), Y::integer()}.
 new({TopLeftX,TopLeftY},{BottomRightX,BottomRightY})
  when is_integer(TopLeftX),is_integer(TopLeftY),is_integer(BottomRightX),is_integer(BottomRightY) ->
   wxe_util:construct(?wxRegion_new_2,
   <<TopLeftX:32/?UI,TopLeftY:32/?UI,BottomRightX:32/?UI,BottomRightY:32/?UI>>).
 
-%% @spec (X::integer(), Y::integer(), W::integer(), H::integer()) -> wxRegion()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxregion.html#wxregionwxregion">external documentation</a>.
+-spec new(X, Y, W, H) -> wxRegion() when
+	X::integer(), Y::integer(), W::integer(), H::integer().
 new(X,Y,W,H)
  when is_integer(X),is_integer(Y),is_integer(W),is_integer(H) ->
   wxe_util:construct(?wxRegion_new_4,
   <<X:32/?UI,Y:32/?UI,W:32/?UI,H:32/?UI>>).
 
-%% @spec (This::wxRegion()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxregion.html#wxregionclear">external documentation</a>.
+-spec clear(This) -> ok when
+	This::wxRegion().
 clear(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxRegion),
   wxe_util:cast(?wxRegion_Clear,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxRegion(),X::term()) -> WxRegionContain
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxregion.html#wxregioncontains">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% contains(This::wxRegion(), Pt::{X::integer(), Y::integer()}) -> WxRegionContain </c>
-%%<br /> WxRegionContain = integer()
-%%<br /> WxRegionContain is one of ?wxOutRegion | ?wxPartRegion | ?wxInRegion
-%% </p>
-%% <p><c>
-%% contains(This::wxRegion(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}) -> WxRegionContain </c>
-%%<br /> WxRegionContain = integer()
-%%<br /> WxRegionContain is one of ?wxOutRegion | ?wxPartRegion | ?wxInRegion
-%% </p>
+%%<br /> Res = ?wxOutRegion | ?wxPartRegion | ?wxInRegion
+-spec contains(This, Pt) -> wx:wx_enum() when
+	This::wxRegion(), Pt::{X::integer(), Y::integer()};
+      (This, Rect) -> wx:wx_enum() when
+	This::wxRegion(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}.
 contains(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY})
  when is_integer(PtX),is_integer(PtY) ->
   ?CLASS(ThisT,wxRegion),
@@ -104,49 +98,47 @@ contains(#wx_ref{type=ThisT,ref=ThisRef},{RectX,RectY,RectW,RectH})
   wxe_util:call(?wxRegion_Contains_1_1,
   <<ThisRef:32/?UI,RectX:32/?UI,RectY:32/?UI,RectW:32/?UI,RectH:32/?UI>>).
 
-%% @spec (This::wxRegion(), X::integer(), Y::integer()) -> WxRegionContain
-%% WxRegionContain = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxregion.html#wxregioncontains">external documentation</a>.
-%%<br /> WxRegionContain is one of ?wxOutRegion | ?wxPartRegion | ?wxInRegion
+%%<br /> Res = ?wxOutRegion | ?wxPartRegion | ?wxInRegion
+-spec contains(This, X, Y) -> wx:wx_enum() when
+	This::wxRegion(), X::integer(), Y::integer().
 contains(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
  when is_integer(X),is_integer(Y) ->
   ?CLASS(ThisT,wxRegion),
   wxe_util:call(?wxRegion_Contains_2,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI>>).
 
-%% @spec (This::wxRegion(), X::integer(), Y::integer(), W::integer(), H::integer()) -> WxRegionContain
-%% WxRegionContain = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxregion.html#wxregioncontains">external documentation</a>.
-%%<br /> WxRegionContain is one of ?wxOutRegion | ?wxPartRegion | ?wxInRegion
+%%<br /> Res = ?wxOutRegion | ?wxPartRegion | ?wxInRegion
+-spec contains(This, X, Y, W, H) -> wx:wx_enum() when
+	This::wxRegion(), X::integer(), Y::integer(), W::integer(), H::integer().
 contains(#wx_ref{type=ThisT,ref=ThisRef},X,Y,W,H)
  when is_integer(X),is_integer(Y),is_integer(W),is_integer(H) ->
   ?CLASS(ThisT,wxRegion),
   wxe_util:call(?wxRegion_Contains_4,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI,W:32/?UI,H:32/?UI>>).
 
-%% @spec (This::wxRegion()) -> wxBitmap:wxBitmap()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxregion.html#wxregionconverttobitmap">external documentation</a>.
+-spec convertToBitmap(This) -> wxBitmap:wxBitmap() when
+	This::wxRegion().
 convertToBitmap(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxRegion),
   wxe_util:call(?wxRegion_ConvertToBitmap,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxRegion()) -> {X::integer(), Y::integer(), W::integer(), H::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxregion.html#wxregiongetbox">external documentation</a>.
+-spec getBox(This) -> {X::integer(), Y::integer(), W::integer(), H::integer()} when
+	This::wxRegion().
 getBox(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxRegion),
   wxe_util:call(?wxRegion_GetBox,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxRegion(),X::wxRegion()|term()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxregion.html#wxregionintersect">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% intersect(This::wxRegion(), Region::wxRegion()) -> bool() </c>
-%% </p>
-%% <p><c>
-%% intersect(This::wxRegion(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}) -> bool() </c>
-%% </p>
+-spec intersect(This, Region) -> boolean() when
+	This::wxRegion(), Region::wxRegion();
+      (This, Rect) -> boolean() when
+	This::wxRegion(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}.
 intersect(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=RegionT,ref=RegionRef}) ->
   ?CLASS(ThisT,wxRegion),
   ?CLASS(RegionT,wxRegion),
@@ -158,30 +150,28 @@ intersect(#wx_ref{type=ThisT,ref=ThisRef},{RectX,RectY,RectW,RectH})
   wxe_util:call(?wxRegion_Intersect_1_1,
   <<ThisRef:32/?UI,RectX:32/?UI,RectY:32/?UI,RectW:32/?UI,RectH:32/?UI>>).
 
-%% @spec (This::wxRegion(), X::integer(), Y::integer(), W::integer(), H::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxregion.html#wxregionintersect">external documentation</a>.
+-spec intersect(This, X, Y, W, H) -> boolean() when
+	This::wxRegion(), X::integer(), Y::integer(), W::integer(), H::integer().
 intersect(#wx_ref{type=ThisT,ref=ThisRef},X,Y,W,H)
  when is_integer(X),is_integer(Y),is_integer(W),is_integer(H) ->
   ?CLASS(ThisT,wxRegion),
   wxe_util:call(?wxRegion_Intersect_4,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI,W:32/?UI,H:32/?UI>>).
 
-%% @spec (This::wxRegion()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxregion.html#wxregionisempty">external documentation</a>.
+-spec isEmpty(This) -> boolean() when
+	This::wxRegion().
 isEmpty(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxRegion),
   wxe_util:call(?wxRegion_IsEmpty,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxRegion(),X::wxRegion()|term()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxregion.html#wxregionsubtract">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% subtract(This::wxRegion(), Region::wxRegion()) -> bool() </c>
-%% </p>
-%% <p><c>
-%% subtract(This::wxRegion(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}) -> bool() </c>
-%% </p>
+-spec subtract(This, Region) -> boolean() when
+	This::wxRegion(), Region::wxRegion();
+      (This, Rect) -> boolean() when
+	This::wxRegion(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}.
 subtract(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=RegionT,ref=RegionRef}) ->
   ?CLASS(ThisT,wxRegion),
   ?CLASS(RegionT,wxRegion),
@@ -193,39 +183,38 @@ subtract(#wx_ref{type=ThisT,ref=ThisRef},{RectX,RectY,RectW,RectH})
   wxe_util:call(?wxRegion_Subtract_1_1,
   <<ThisRef:32/?UI,RectX:32/?UI,RectY:32/?UI,RectW:32/?UI,RectH:32/?UI>>).
 
-%% @spec (This::wxRegion(), X::integer(), Y::integer(), W::integer(), H::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxregion.html#wxregionsubtract">external documentation</a>.
+-spec subtract(This, X, Y, W, H) -> boolean() when
+	This::wxRegion(), X::integer(), Y::integer(), W::integer(), H::integer().
 subtract(#wx_ref{type=ThisT,ref=ThisRef},X,Y,W,H)
  when is_integer(X),is_integer(Y),is_integer(W),is_integer(H) ->
   ?CLASS(ThisT,wxRegion),
   wxe_util:call(?wxRegion_Subtract_4,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI,W:32/?UI,H:32/?UI>>).
 
-%% @spec (This::wxRegion(), Pt::{X::integer(), Y::integer()}) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxregion.html#wxregionoffset">external documentation</a>.
+-spec offset(This, Pt) -> boolean() when
+	This::wxRegion(), Pt::{X::integer(), Y::integer()}.
 offset(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY})
  when is_integer(PtX),is_integer(PtY) ->
   ?CLASS(ThisT,wxRegion),
   wxe_util:call(?wxRegion_Offset_1,
   <<ThisRef:32/?UI,PtX:32/?UI,PtY:32/?UI>>).
 
-%% @spec (This::wxRegion(), X::integer(), Y::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxregion.html#wxregionoffset">external documentation</a>.
+-spec offset(This, X, Y) -> boolean() when
+	This::wxRegion(), X::integer(), Y::integer().
 offset(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
  when is_integer(X),is_integer(Y) ->
   ?CLASS(ThisT,wxRegion),
   wxe_util:call(?wxRegion_Offset_2,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI>>).
 
-%% @spec (This::wxRegion(),X::term()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxregion.html#wxregionunion">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% union(This::wxRegion(), Region::wxRegion() | wxBitmap:wxBitmap()) -> bool() </c>
-%% </p>
-%% <p><c>
-%% union(This::wxRegion(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}) -> bool() </c>
-%% </p>
+-spec union(This, Region) -> boolean() when
+	This::wxRegion(), Region::wxRegion() | wxBitmap:wxBitmap();
+      (This, Rect) -> boolean() when
+	This::wxRegion(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}.
 union(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=RegionT,ref=RegionRef}) ->
   ?CLASS(ThisT,wxRegion),
   RegionOP = case ?CLASS_T(RegionT,wxRegion) of
@@ -242,15 +231,18 @@ union(#wx_ref{type=ThisT,ref=ThisRef},{RectX,RectY,RectW,RectH})
   wxe_util:call(?wxRegion_Union_1_2,
   <<ThisRef:32/?UI,RectX:32/?UI,RectY:32/?UI,RectW:32/?UI,RectH:32/?UI>>).
 
-%% @spec (This::wxRegion(), Bmp::wxBitmap:wxBitmap(), Transp::wx:colour()) -> bool()
 %% @equiv union(This,Bmp,Transp, [])
+-spec union(This, Bmp, Transp) -> boolean() when
+	This::wxRegion(), Bmp::wxBitmap:wxBitmap(), Transp::wx:wx_colour().
+
 union(This,Bmp,Transp)
  when is_record(This, wx_ref),is_record(Bmp, wx_ref),tuple_size(Transp) =:= 3; tuple_size(Transp) =:= 4 ->
   union(This,Bmp,Transp, []).
 
-%% @spec (This::wxRegion(), Bmp::wxBitmap:wxBitmap(), Transp::wx:colour(), [Option]) -> bool()
-%% Option = {tolerance, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxregion.html#wxregionunion">external documentation</a>.
+-spec union(This, Bmp, Transp, [Option]) -> boolean() when
+	This::wxRegion(), Bmp::wxBitmap:wxBitmap(), Transp::wx:wx_colour(),
+	Option :: {tolerance, integer()}.
 union(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BmpT,ref=BmpRef},Transp, Options)
  when tuple_size(Transp) =:= 3; tuple_size(Transp) =:= 4,is_list(Options) ->
   ?CLASS(ThisT,wxRegion),
@@ -261,23 +253,20 @@ union(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BmpT,ref=BmpRef},Transp, Opti
   wxe_util:call(?wxRegion_Union_3,
   <<ThisRef:32/?UI,BmpRef:32/?UI,(wxe_util:colour_bin(Transp)):16/binary, BinOpt/binary>>).
 
-%% @spec (This::wxRegion(), X::integer(), Y::integer(), W::integer(), H::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxregion.html#wxregionunion">external documentation</a>.
+-spec union(This, X, Y, W, H) -> boolean() when
+	This::wxRegion(), X::integer(), Y::integer(), W::integer(), H::integer().
 union(#wx_ref{type=ThisT,ref=ThisRef},X,Y,W,H)
  when is_integer(X),is_integer(Y),is_integer(W),is_integer(H) ->
   ?CLASS(ThisT,wxRegion),
   wxe_util:call(?wxRegion_Union_4,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI,W:32/?UI,H:32/?UI>>).
 
-%% @spec (This::wxRegion(),X::wxRegion()|term()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxregion.html#wxregionxor">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% 'Xor'(This::wxRegion(), Region::wxRegion()) -> bool() </c>
-%% </p>
-%% <p><c>
-%% 'Xor'(This::wxRegion(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}) -> bool() </c>
-%% </p>
+-spec 'Xor'(This, Region) -> boolean() when
+	This::wxRegion(), Region::wxRegion();
+      (This, Rect) -> boolean() when
+	This::wxRegion(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}.
 'Xor'(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=RegionT,ref=RegionRef}) ->
   ?CLASS(ThisT,wxRegion),
   ?CLASS(RegionT,wxRegion),
@@ -289,16 +278,17 @@ union(#wx_ref{type=ThisT,ref=ThisRef},X,Y,W,H)
   wxe_util:call(?wxRegion_Xor_1_1,
   <<ThisRef:32/?UI,RectX:32/?UI,RectY:32/?UI,RectW:32/?UI,RectH:32/?UI>>).
 
-%% @spec (This::wxRegion(), X::integer(), Y::integer(), W::integer(), H::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxregion.html#wxregionxor">external documentation</a>.
+-spec 'Xor'(This, X, Y, W, H) -> boolean() when
+	This::wxRegion(), X::integer(), Y::integer(), W::integer(), H::integer().
 'Xor'(#wx_ref{type=ThisT,ref=ThisRef},X,Y,W,H)
  when is_integer(X),is_integer(Y),is_integer(W),is_integer(H) ->
   ?CLASS(ThisT,wxRegion),
   wxe_util:call(?wxRegion_Xor_4,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI,W:32/?UI,H:32/?UI>>).
 
-%% @spec (This::wxRegion()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxRegion) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxRegion),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxSashEvent.erl b/lib/wx/src/gen/wxSashEvent.erl
index f9c58a04b1..6ca4bf73ea 100644
--- a/lib/wx/src/gen/wxSashEvent.erl
+++ b/lib/wx/src/gen/wxSashEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -40,31 +40,34 @@
   parent_class/1,resumePropagation/2,setInt/2,setString/2,shouldPropagate/1,
   skip/1,skip/2,stopPropagation/1]).
 
+-export_type([wxSashEvent/0]).
 %% @hidden
 parent_class(wxCommandEvent) -> true;
 parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (This::wxSashEvent()) -> WxSashEdgePosition
-%% WxSashEdgePosition = integer()
+-type wxSashEvent() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsashevent.html#wxsasheventgetedge">external documentation</a>.
-%%<br /> WxSashEdgePosition is one of ?wxSASH_TOP | ?wxSASH_RIGHT | ?wxSASH_BOTTOM | ?wxSASH_LEFT | ?wxSASH_NONE
+%%<br /> Res = ?wxSASH_TOP | ?wxSASH_RIGHT | ?wxSASH_BOTTOM | ?wxSASH_LEFT | ?wxSASH_NONE
+-spec getEdge(This) -> wx:wx_enum() when
+	This::wxSashEvent().
 getEdge(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSashEvent),
   wxe_util:call(?wxSashEvent_GetEdge,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSashEvent()) -> {X::integer(), Y::integer(), W::integer(), H::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsashevent.html#wxsasheventgetdragrect">external documentation</a>.
+-spec getDragRect(This) -> {X::integer(), Y::integer(), W::integer(), H::integer()} when
+	This::wxSashEvent().
 getDragRect(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSashEvent),
   wxe_util:call(?wxSashEvent_GetDragRect,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSashEvent()) -> WxSashDragStatus
-%% WxSashDragStatus = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsashevent.html#wxsasheventgetdragstatus">external documentation</a>.
-%%<br /> WxSashDragStatus is one of ?wxSASH_STATUS_OK | ?wxSASH_STATUS_OUT_OF_RANGE
+%%<br /> Res = ?wxSASH_STATUS_OK | ?wxSASH_STATUS_OUT_OF_RANGE
+-spec getDragStatus(This) -> wx:wx_enum() when
+	This::wxSashEvent().
 getDragStatus(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSashEvent),
   wxe_util:call(?wxSashEvent_GetDragStatus,
diff --git a/lib/wx/src/gen/wxSashLayoutWindow.erl b/lib/wx/src/gen/wxSashLayoutWindow.erl
index eb8eb38011..252ff4d7dd 100644
--- a/lib/wx/src/gen/wxSashLayoutWindow.erl
+++ b/lib/wx/src/gen/wxSashLayoutWindow.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -74,27 +74,35 @@
   transferDataToWindow/1,update/1,updateWindowUI/1,updateWindowUI/2,
   validate/1,warpPointer/3]).
 
+-export_type([wxSashLayoutWindow/0]).
 %% @hidden
 parent_class(wxSashWindow) -> true;
 parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxSashLayoutWindow()
+-type wxSashLayoutWindow() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsashlayoutwindow.html#wxsashlayoutwindowwxsashlayoutwindow">external documentation</a>.
+-spec new() -> wxSashLayoutWindow().
 new() ->
   wxe_util:construct(?wxSashLayoutWindow_new_0,
   <<>>).
 
-%% @spec (Parent::wxWindow:wxWindow()) -> wxSashLayoutWindow()
 %% @equiv new(Parent, [])
+-spec new(Parent) -> wxSashLayoutWindow() when
+	Parent::wxWindow:wxWindow().
+
 new(Parent)
  when is_record(Parent, wx_ref) ->
   new(Parent, []).
 
-%% @spec (Parent::wxWindow:wxWindow(), [Option]) -> wxSashLayoutWindow()
-%% Option = {id, integer()} | {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsashlayoutwindow.html#wxsashlayoutwindowwxsashlayoutwindow">external documentation</a>.
+-spec new(Parent, [Option]) -> wxSashLayoutWindow() when
+	Parent::wxWindow:wxWindow(),
+	Option :: {id, integer()}
+		 | {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}.
 new(#wx_ref{type=ParentT,ref=ParentRef}, Options)
  when is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -107,15 +115,21 @@ new(#wx_ref{type=ParentT,ref=ParentRef}, Options)
   wxe_util:construct(?wxSashLayoutWindow_new_2,
   <<ParentRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxSashLayoutWindow(), Parent::wxWindow:wxWindow()) -> bool()
 %% @equiv create(This,Parent, [])
+-spec create(This, Parent) -> boolean() when
+	This::wxSashLayoutWindow(), Parent::wxWindow:wxWindow().
+
 create(This,Parent)
  when is_record(This, wx_ref),is_record(Parent, wx_ref) ->
   create(This,Parent, []).
 
-%% @spec (This::wxSashLayoutWindow(), Parent::wxWindow:wxWindow(), [Option]) -> bool()
-%% Option = {id, integer()} | {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsashlayoutwindow.html#wxsashlayoutwindowcreate">external documentation</a>.
+-spec create(This, Parent, [Option]) -> boolean() when
+	This::wxSashLayoutWindow(), Parent::wxWindow:wxWindow(),
+	Option :: {id, integer()}
+		 | {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}.
 create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxSashLayoutWindow),
@@ -129,54 +143,55 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef}, Opti
   wxe_util:call(?wxSashLayoutWindow_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxSashLayoutWindow()) -> WxLayoutAlignment
-%% WxLayoutAlignment = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsashlayoutwindow.html#wxsashlayoutwindowgetalignment">external documentation</a>.
-%%<br /> WxLayoutAlignment is one of ?wxLAYOUT_NONE | ?wxLAYOUT_TOP | ?wxLAYOUT_LEFT | ?wxLAYOUT_RIGHT | ?wxLAYOUT_BOTTOM
+%%<br /> Res = ?wxLAYOUT_NONE | ?wxLAYOUT_TOP | ?wxLAYOUT_LEFT | ?wxLAYOUT_RIGHT | ?wxLAYOUT_BOTTOM
+-spec getAlignment(This) -> wx:wx_enum() when
+	This::wxSashLayoutWindow().
 getAlignment(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSashLayoutWindow),
   wxe_util:call(?wxSashLayoutWindow_GetAlignment,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSashLayoutWindow()) -> WxLayoutOrientation
-%% WxLayoutOrientation = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsashlayoutwindow.html#wxsashlayoutwindowgetorientation">external documentation</a>.
-%%<br /> WxLayoutOrientation is one of ?wxLAYOUT_HORIZONTAL | ?wxLAYOUT_VERTICAL
+%%<br /> Res = ?wxLAYOUT_HORIZONTAL | ?wxLAYOUT_VERTICAL
+-spec getOrientation(This) -> wx:wx_enum() when
+	This::wxSashLayoutWindow().
 getOrientation(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSashLayoutWindow),
   wxe_util:call(?wxSashLayoutWindow_GetOrientation,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSashLayoutWindow(), Align::WxLayoutAlignment) -> ok
-%% WxLayoutAlignment = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsashlayoutwindow.html#wxsashlayoutwindowsetalignment">external documentation</a>.
-%%<br /> WxLayoutAlignment is one of ?wxLAYOUT_NONE | ?wxLAYOUT_TOP | ?wxLAYOUT_LEFT | ?wxLAYOUT_RIGHT | ?wxLAYOUT_BOTTOM
+%%<br /> Align = ?wxLAYOUT_NONE | ?wxLAYOUT_TOP | ?wxLAYOUT_LEFT | ?wxLAYOUT_RIGHT | ?wxLAYOUT_BOTTOM
+-spec setAlignment(This, Align) -> ok when
+	This::wxSashLayoutWindow(), Align::wx:wx_enum().
 setAlignment(#wx_ref{type=ThisT,ref=ThisRef},Align)
  when is_integer(Align) ->
   ?CLASS(ThisT,wxSashLayoutWindow),
   wxe_util:cast(?wxSashLayoutWindow_SetAlignment,
   <<ThisRef:32/?UI,Align:32/?UI>>).
 
-%% @spec (This::wxSashLayoutWindow(), Size::{W::integer(), H::integer()}) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsashlayoutwindow.html#wxsashlayoutwindowsetdefaultsize">external documentation</a>.
+-spec setDefaultSize(This, Size) -> ok when
+	This::wxSashLayoutWindow(), Size::{W::integer(), H::integer()}.
 setDefaultSize(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH})
  when is_integer(SizeW),is_integer(SizeH) ->
   ?CLASS(ThisT,wxSashLayoutWindow),
   wxe_util:cast(?wxSashLayoutWindow_SetDefaultSize,
   <<ThisRef:32/?UI,SizeW:32/?UI,SizeH:32/?UI>>).
 
-%% @spec (This::wxSashLayoutWindow(), Orient::WxLayoutOrientation) -> ok
-%% WxLayoutOrientation = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsashlayoutwindow.html#wxsashlayoutwindowsetorientation">external documentation</a>.
-%%<br /> WxLayoutOrientation is one of ?wxLAYOUT_HORIZONTAL | ?wxLAYOUT_VERTICAL
+%%<br /> Orient = ?wxLAYOUT_HORIZONTAL | ?wxLAYOUT_VERTICAL
+-spec setOrientation(This, Orient) -> ok when
+	This::wxSashLayoutWindow(), Orient::wx:wx_enum().
 setOrientation(#wx_ref{type=ThisT,ref=ThisRef},Orient)
  when is_integer(Orient) ->
   ?CLASS(ThisT,wxSashLayoutWindow),
   wxe_util:cast(?wxSashLayoutWindow_SetOrientation,
   <<ThisRef:32/?UI,Orient:32/?UI>>).
 
-%% @spec (This::wxSashLayoutWindow()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxSashLayoutWindow) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxSashLayoutWindow),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxSashWindow.erl b/lib/wx/src/gen/wxSashWindow.erl
index 698cfb8fb6..c3f0d17eb4 100644
--- a/lib/wx/src/gen/wxSashWindow.erl
+++ b/lib/wx/src/gen/wxSashWindow.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -70,26 +70,34 @@
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
 
+-export_type([wxSashWindow/0]).
 %% @hidden
 parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxSashWindow()
+-type wxSashWindow() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsashwindow.html#wxsashwindowwxsashwindow">external documentation</a>.
+-spec new() -> wxSashWindow().
 new() ->
   wxe_util:construct(?wxSashWindow_new_0,
   <<>>).
 
-%% @spec (Parent::wxWindow:wxWindow()) -> wxSashWindow()
 %% @equiv new(Parent, [])
+-spec new(Parent) -> wxSashWindow() when
+	Parent::wxWindow:wxWindow().
+
 new(Parent)
  when is_record(Parent, wx_ref) ->
   new(Parent, []).
 
-%% @spec (Parent::wxWindow:wxWindow(), [Option]) -> wxSashWindow()
-%% Option = {id, integer()} | {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsashwindow.html#wxsashwindowwxsashwindow">external documentation</a>.
+-spec new(Parent, [Option]) -> wxSashWindow() when
+	Parent::wxWindow:wxWindow(),
+	Option :: {id, integer()}
+		 | {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}.
 new(#wx_ref{type=ParentT,ref=ParentRef}, Options)
  when is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -102,88 +110,96 @@ new(#wx_ref{type=ParentT,ref=ParentRef}, Options)
   wxe_util:construct(?wxSashWindow_new_2,
   <<ParentRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxSashWindow(), Edge::WxSashEdgePosition) -> bool()
-%% WxSashEdgePosition = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsashwindow.html#wxsashwindowgetsashvisible">external documentation</a>.
-%%<br /> WxSashEdgePosition is one of ?wxSASH_TOP | ?wxSASH_RIGHT | ?wxSASH_BOTTOM | ?wxSASH_LEFT | ?wxSASH_NONE
+%%<br /> Edge = ?wxSASH_TOP | ?wxSASH_RIGHT | ?wxSASH_BOTTOM | ?wxSASH_LEFT | ?wxSASH_NONE
+-spec getSashVisible(This, Edge) -> boolean() when
+	This::wxSashWindow(), Edge::wx:wx_enum().
 getSashVisible(#wx_ref{type=ThisT,ref=ThisRef},Edge)
  when is_integer(Edge) ->
   ?CLASS(ThisT,wxSashWindow),
   wxe_util:call(?wxSashWindow_GetSashVisible,
   <<ThisRef:32/?UI,Edge:32/?UI>>).
 
-%% @spec (This::wxSashWindow()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsashwindow.html#wxsashwindowgetmaximumsizex">external documentation</a>.
+-spec getMaximumSizeX(This) -> integer() when
+	This::wxSashWindow().
 getMaximumSizeX(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSashWindow),
   wxe_util:call(?wxSashWindow_GetMaximumSizeX,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSashWindow()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsashwindow.html#wxsashwindowgetmaximumsizey">external documentation</a>.
+-spec getMaximumSizeY(This) -> integer() when
+	This::wxSashWindow().
 getMaximumSizeY(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSashWindow),
   wxe_util:call(?wxSashWindow_GetMaximumSizeY,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSashWindow()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsashwindow.html#wxsashwindowgetminimumsizex">external documentation</a>.
+-spec getMinimumSizeX(This) -> integer() when
+	This::wxSashWindow().
 getMinimumSizeX(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSashWindow),
   wxe_util:call(?wxSashWindow_GetMinimumSizeX,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSashWindow()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsashwindow.html#wxsashwindowgetminimumsizey">external documentation</a>.
+-spec getMinimumSizeY(This) -> integer() when
+	This::wxSashWindow().
 getMinimumSizeY(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSashWindow),
   wxe_util:call(?wxSashWindow_GetMinimumSizeY,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSashWindow(), Max::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsashwindow.html#wxsashwindowsetmaximumsizex">external documentation</a>.
+-spec setMaximumSizeX(This, Max) -> ok when
+	This::wxSashWindow(), Max::integer().
 setMaximumSizeX(#wx_ref{type=ThisT,ref=ThisRef},Max)
  when is_integer(Max) ->
   ?CLASS(ThisT,wxSashWindow),
   wxe_util:cast(?wxSashWindow_SetMaximumSizeX,
   <<ThisRef:32/?UI,Max:32/?UI>>).
 
-%% @spec (This::wxSashWindow(), Max::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsashwindow.html#wxsashwindowsetmaximumsizey">external documentation</a>.
+-spec setMaximumSizeY(This, Max) -> ok when
+	This::wxSashWindow(), Max::integer().
 setMaximumSizeY(#wx_ref{type=ThisT,ref=ThisRef},Max)
  when is_integer(Max) ->
   ?CLASS(ThisT,wxSashWindow),
   wxe_util:cast(?wxSashWindow_SetMaximumSizeY,
   <<ThisRef:32/?UI,Max:32/?UI>>).
 
-%% @spec (This::wxSashWindow(), Min::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsashwindow.html#wxsashwindowsetminimumsizex">external documentation</a>.
+-spec setMinimumSizeX(This, Min) -> ok when
+	This::wxSashWindow(), Min::integer().
 setMinimumSizeX(#wx_ref{type=ThisT,ref=ThisRef},Min)
  when is_integer(Min) ->
   ?CLASS(ThisT,wxSashWindow),
   wxe_util:cast(?wxSashWindow_SetMinimumSizeX,
   <<ThisRef:32/?UI,Min:32/?UI>>).
 
-%% @spec (This::wxSashWindow(), Min::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsashwindow.html#wxsashwindowsetminimumsizey">external documentation</a>.
+-spec setMinimumSizeY(This, Min) -> ok when
+	This::wxSashWindow(), Min::integer().
 setMinimumSizeY(#wx_ref{type=ThisT,ref=ThisRef},Min)
  when is_integer(Min) ->
   ?CLASS(ThisT,wxSashWindow),
   wxe_util:cast(?wxSashWindow_SetMinimumSizeY,
   <<ThisRef:32/?UI,Min:32/?UI>>).
 
-%% @spec (This::wxSashWindow(), Edge::WxSashEdgePosition, Sash::bool()) -> ok
-%% WxSashEdgePosition = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsashwindow.html#wxsashwindowsetsashvisible">external documentation</a>.
-%%<br /> WxSashEdgePosition is one of ?wxSASH_TOP | ?wxSASH_RIGHT | ?wxSASH_BOTTOM | ?wxSASH_LEFT | ?wxSASH_NONE
+%%<br /> Edge = ?wxSASH_TOP | ?wxSASH_RIGHT | ?wxSASH_BOTTOM | ?wxSASH_LEFT | ?wxSASH_NONE
+-spec setSashVisible(This, Edge, Sash) -> ok when
+	This::wxSashWindow(), Edge::wx:wx_enum(), Sash::boolean().
 setSashVisible(#wx_ref{type=ThisT,ref=ThisRef},Edge,Sash)
  when is_integer(Edge),is_boolean(Sash) ->
   ?CLASS(ThisT,wxSashWindow),
   wxe_util:cast(?wxSashWindow_SetSashVisible,
   <<ThisRef:32/?UI,Edge:32/?UI,(wxe_util:from_bool(Sash)):32/?UI>>).
 
-%% @spec (This::wxSashWindow()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxSashWindow) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxSashWindow),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxScreenDC.erl b/lib/wx/src/gen/wxScreenDC.erl
index 4d7466f4f1..baf9726946 100644
--- a/lib/wx/src/gen/wxScreenDC.erl
+++ b/lib/wx/src/gen/wxScreenDC.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -52,18 +52,20 @@
   setPen/2,setTextBackground/2,setTextForeground/2,setUserScale/3,startDoc/2,
   startPage/1]).
 
+-export_type([wxScreenDC/0]).
 %% @hidden
 parent_class(wxDC) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxScreenDC()
+-type wxScreenDC() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxscreendc.html#wxscreendcwxscreendc">external documentation</a>.
+-spec new() -> wxScreenDC().
 new() ->
   wxe_util:construct(?wxScreenDC_new,
   <<>>).
 
-%% @spec (This::wxScreenDC()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxScreenDC) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxScreenDC),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxScrollBar.erl b/lib/wx/src/gen/wxScrollBar.erl
index 5c7890009f..baa5918c9e 100644
--- a/lib/wx/src/gen/wxScrollBar.erl
+++ b/lib/wx/src/gen/wxScrollBar.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -70,27 +70,35 @@
   transferDataToWindow/1,update/1,updateWindowUI/1,updateWindowUI/2,
   validate/1,warpPointer/3]).
 
+-export_type([wxScrollBar/0]).
 %% @hidden
 parent_class(wxControl) -> true;
 parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxScrollBar()
+-type wxScrollBar() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxscrollbar.html#wxscrollbarwxscrollbar">external documentation</a>.
+-spec new() -> wxScrollBar().
 new() ->
   wxe_util:construct(?wxScrollBar_new_0,
   <<>>).
 
-%% @spec (Parent::wxWindow:wxWindow(), Id::integer()) -> wxScrollBar()
 %% @equiv new(Parent,Id, [])
+-spec new(Parent, Id) -> wxScrollBar() when
+	Parent::wxWindow:wxWindow(), Id::integer().
+
 new(Parent,Id)
  when is_record(Parent, wx_ref),is_integer(Id) ->
   new(Parent,Id, []).
 
-%% @spec (Parent::wxWindow:wxWindow(), Id::integer(), [Option]) -> wxScrollBar()
-%% Option = {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()} | {validator, wx:wx()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxscrollbar.html#wxscrollbarwxscrollbar">external documentation</a>.
+-spec new(Parent, Id, [Option]) -> wxScrollBar() when
+	Parent::wxWindow:wxWindow(), Id::integer(),
+	Option :: {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}
+		 | {validator, wx:wx()}.
 new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
  when is_integer(Id),is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -103,15 +111,21 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
   wxe_util:construct(?wxScrollBar_new_3,
   <<ParentRef:32/?UI,Id:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxScrollBar(), Parent::wxWindow:wxWindow(), Id::integer()) -> bool()
 %% @equiv create(This,Parent,Id, [])
+-spec create(This, Parent, Id) -> boolean() when
+	This::wxScrollBar(), Parent::wxWindow:wxWindow(), Id::integer().
+
 create(This,Parent,Id)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id) ->
   create(This,Parent,Id, []).
 
-%% @spec (This::wxScrollBar(), Parent::wxWindow:wxWindow(), Id::integer(), [Option]) -> bool()
-%% Option = {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()} | {validator, wx:wx()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxscrollbar.html#wxscrollbarcreate">external documentation</a>.
+-spec create(This, Parent, Id, [Option]) -> boolean() when
+	This::wxScrollBar(), Parent::wxWindow:wxWindow(), Id::integer(),
+	Option :: {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}
+		 | {validator, wx:wx()}.
 create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
  when is_integer(Id),is_list(Options) ->
   ?CLASS(ThisT,wxScrollBar),
@@ -125,51 +139,59 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id, O
   wxe_util:call(?wxScrollBar_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI,Id:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxScrollBar()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxscrollbar.html#wxscrollbargetrange">external documentation</a>.
+-spec getRange(This) -> integer() when
+	This::wxScrollBar().
 getRange(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxScrollBar),
   wxe_util:call(?wxScrollBar_GetRange,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxScrollBar()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxscrollbar.html#wxscrollbargetpagesize">external documentation</a>.
+-spec getPageSize(This) -> integer() when
+	This::wxScrollBar().
 getPageSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxScrollBar),
   wxe_util:call(?wxScrollBar_GetPageSize,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxScrollBar()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxscrollbar.html#wxscrollbargetthumbposition">external documentation</a>.
+-spec getThumbPosition(This) -> integer() when
+	This::wxScrollBar().
 getThumbPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxScrollBar),
   wxe_util:call(?wxScrollBar_GetThumbPosition,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxScrollBar()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxscrollbar.html#wxscrollbargetthumbsize">external documentation</a>.
+-spec getThumbSize(This) -> integer() when
+	This::wxScrollBar().
 getThumbSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxScrollBar),
   wxe_util:call(?wxScrollBar_GetThumbSize,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxScrollBar(), ViewStart::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxscrollbar.html#wxscrollbarsetthumbposition">external documentation</a>.
+-spec setThumbPosition(This, ViewStart) -> ok when
+	This::wxScrollBar(), ViewStart::integer().
 setThumbPosition(#wx_ref{type=ThisT,ref=ThisRef},ViewStart)
  when is_integer(ViewStart) ->
   ?CLASS(ThisT,wxScrollBar),
   wxe_util:cast(?wxScrollBar_SetThumbPosition,
   <<ThisRef:32/?UI,ViewStart:32/?UI>>).
 
-%% @spec (This::wxScrollBar(), Position::integer(), ThumbSize::integer(), Range::integer(), PageSize::integer()) -> ok
 %% @equiv setScrollbar(This,Position,ThumbSize,Range,PageSize, [])
+-spec setScrollbar(This, Position, ThumbSize, Range, PageSize) -> ok when
+	This::wxScrollBar(), Position::integer(), ThumbSize::integer(), Range::integer(), PageSize::integer().
+
 setScrollbar(This,Position,ThumbSize,Range,PageSize)
  when is_record(This, wx_ref),is_integer(Position),is_integer(ThumbSize),is_integer(Range),is_integer(PageSize) ->
   setScrollbar(This,Position,ThumbSize,Range,PageSize, []).
 
-%% @spec (This::wxScrollBar(), Position::integer(), ThumbSize::integer(), Range::integer(), PageSize::integer(), [Option]) -> ok
-%% Option = {refresh, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxscrollbar.html#wxscrollbarsetscrollbar">external documentation</a>.
+-spec setScrollbar(This, Position, ThumbSize, Range, PageSize, [Option]) -> ok when
+	This::wxScrollBar(), Position::integer(), ThumbSize::integer(), Range::integer(), PageSize::integer(),
+	Option :: {refresh, boolean()}.
 setScrollbar(#wx_ref{type=ThisT,ref=ThisRef},Position,ThumbSize,Range,PageSize, Options)
  when is_integer(Position),is_integer(ThumbSize),is_integer(Range),is_integer(PageSize),is_list(Options) ->
   ?CLASS(ThisT,wxScrollBar),
@@ -179,8 +201,8 @@ setScrollbar(#wx_ref{type=ThisT,ref=ThisRef},Position,ThumbSize,Range,PageSize,
   wxe_util:cast(?wxScrollBar_SetScrollbar,
   <<ThisRef:32/?UI,Position:32/?UI,ThumbSize:32/?UI,Range:32/?UI,PageSize:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxScrollBar()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxScrollBar) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxScrollBar),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxScrollEvent.erl b/lib/wx/src/gen/wxScrollEvent.erl
index 61b99fa360..6939859d92 100644
--- a/lib/wx/src/gen/wxScrollEvent.erl
+++ b/lib/wx/src/gen/wxScrollEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -40,20 +40,24 @@
   parent_class/1,resumePropagation/2,setInt/2,setString/2,shouldPropagate/1,
   skip/1,skip/2,stopPropagation/1]).
 
+-export_type([wxScrollEvent/0]).
 %% @hidden
 parent_class(wxCommandEvent) -> true;
 parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (This::wxScrollEvent()) -> integer()
+-type wxScrollEvent() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxscrollevent.html#wxscrolleventgetorientation">external documentation</a>.
+-spec getOrientation(This) -> integer() when
+	This::wxScrollEvent().
 getOrientation(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxScrollEvent),
   wxe_util:call(?wxScrollEvent_GetOrientation,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxScrollEvent()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxscrollevent.html#wxscrolleventgetposition">external documentation</a>.
+-spec getPosition(This) -> integer() when
+	This::wxScrollEvent().
 getPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxScrollEvent),
   wxe_util:call(?wxScrollEvent_GetPosition,
diff --git a/lib/wx/src/gen/wxScrollWinEvent.erl b/lib/wx/src/gen/wxScrollWinEvent.erl
index 6b33b6b564..c899d37dff 100644
--- a/lib/wx/src/gen/wxScrollWinEvent.erl
+++ b/lib/wx/src/gen/wxScrollWinEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -37,19 +37,23 @@
 -export([getId/1,getSkipped/1,getTimestamp/1,isCommandEvent/1,parent_class/1,
   resumePropagation/2,shouldPropagate/1,skip/1,skip/2,stopPropagation/1]).
 
+-export_type([wxScrollWinEvent/0]).
 %% @hidden
 parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (This::wxScrollWinEvent()) -> integer()
+-type wxScrollWinEvent() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxscrollwinevent.html#wxscrollwineventgetorientation">external documentation</a>.
+-spec getOrientation(This) -> integer() when
+	This::wxScrollWinEvent().
 getOrientation(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxScrollWinEvent),
   wxe_util:call(?wxScrollWinEvent_GetOrientation,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxScrollWinEvent()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxscrollwinevent.html#wxscrollwineventgetposition">external documentation</a>.
+-spec getPosition(This) -> integer() when
+	This::wxScrollWinEvent().
 getPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxScrollWinEvent),
   wxe_util:call(?wxScrollWinEvent_GetPosition,
diff --git a/lib/wx/src/gen/wxScrolledWindow.erl b/lib/wx/src/gen/wxScrolledWindow.erl
index 0693a79760..b4ecc68a6c 100644
--- a/lib/wx/src/gen/wxScrolledWindow.erl
+++ b/lib/wx/src/gen/wxScrolledWindow.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -72,27 +72,35 @@
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
 
+-export_type([wxScrolledWindow/0]).
 %% @hidden
 parent_class(wxPanel) -> true;
 parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxScrolledWindow()
+-type wxScrolledWindow() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxscrolledwindow.html#wxscrolledwindowwxscrolledwindow">external documentation</a>.
+-spec new() -> wxScrolledWindow().
 new() ->
   wxe_util:construct(?wxScrolledWindow_new_0,
   <<>>).
 
-%% @spec (Parent::wxWindow:wxWindow()) -> wxScrolledWindow()
 %% @equiv new(Parent, [])
+-spec new(Parent) -> wxScrolledWindow() when
+	Parent::wxWindow:wxWindow().
+
 new(Parent)
  when is_record(Parent, wx_ref) ->
   new(Parent, []).
 
-%% @spec (Parent::wxWindow:wxWindow(), [Option]) -> wxScrolledWindow()
-%% Option = {winid, integer()} | {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxscrolledwindow.html#wxscrolledwindowwxscrolledwindow">external documentation</a>.
+-spec new(Parent, [Option]) -> wxScrolledWindow() when
+	Parent::wxWindow:wxWindow(),
+	Option :: {winid, integer()}
+		 | {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}.
 new(#wx_ref{type=ParentT,ref=ParentRef}, Options)
  when is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -105,93 +113,108 @@ new(#wx_ref{type=ParentT,ref=ParentRef}, Options)
   wxe_util:construct(?wxScrolledWindow_new_2,
   <<ParentRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxScrolledWindow(), Pt::{X::integer(), Y::integer()}) -> {X::integer(), Y::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxscrolledwindow.html#wxscrolledwindowcalcscrolledposition">external documentation</a>.
+-spec calcScrolledPosition(This, Pt) -> {X::integer(), Y::integer()} when
+	This::wxScrolledWindow(), Pt::{X::integer(), Y::integer()}.
 calcScrolledPosition(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY})
  when is_integer(PtX),is_integer(PtY) ->
   ?CLASS(ThisT,wxScrolledWindow),
   wxe_util:call(?wxScrolledWindow_CalcScrolledPosition_1,
   <<ThisRef:32/?UI,PtX:32/?UI,PtY:32/?UI>>).
 
-%% @spec (This::wxScrolledWindow(), X::integer(), Y::integer()) -> {Xx::integer(), Yy::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxscrolledwindow.html#wxscrolledwindowcalcscrolledposition">external documentation</a>.
+-spec calcScrolledPosition(This, X, Y) -> {Xx::integer(), Yy::integer()} when
+	This::wxScrolledWindow(), X::integer(), Y::integer().
 calcScrolledPosition(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
  when is_integer(X),is_integer(Y) ->
   ?CLASS(ThisT,wxScrolledWindow),
   wxe_util:call(?wxScrolledWindow_CalcScrolledPosition_4,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI>>).
 
-%% @spec (This::wxScrolledWindow(), Pt::{X::integer(), Y::integer()}) -> {X::integer(), Y::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxscrolledwindow.html#wxscrolledwindowcalcunscrolledposition">external documentation</a>.
+-spec calcUnscrolledPosition(This, Pt) -> {X::integer(), Y::integer()} when
+	This::wxScrolledWindow(), Pt::{X::integer(), Y::integer()}.
 calcUnscrolledPosition(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY})
  when is_integer(PtX),is_integer(PtY) ->
   ?CLASS(ThisT,wxScrolledWindow),
   wxe_util:call(?wxScrolledWindow_CalcUnscrolledPosition_1,
   <<ThisRef:32/?UI,PtX:32/?UI,PtY:32/?UI>>).
 
-%% @spec (This::wxScrolledWindow(), X::integer(), Y::integer()) -> {Xx::integer(), Yy::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxscrolledwindow.html#wxscrolledwindowcalcunscrolledposition">external documentation</a>.
+-spec calcUnscrolledPosition(This, X, Y) -> {Xx::integer(), Yy::integer()} when
+	This::wxScrolledWindow(), X::integer(), Y::integer().
 calcUnscrolledPosition(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
  when is_integer(X),is_integer(Y) ->
   ?CLASS(ThisT,wxScrolledWindow),
   wxe_util:call(?wxScrolledWindow_CalcUnscrolledPosition_4,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI>>).
 
-%% @spec (This::wxScrolledWindow(), X_scrolling::bool(), Y_scrolling::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxscrolledwindow.html#wxscrolledwindowenablescrolling">external documentation</a>.
+-spec enableScrolling(This, X_scrolling, Y_scrolling) -> ok when
+	This::wxScrolledWindow(), X_scrolling::boolean(), Y_scrolling::boolean().
 enableScrolling(#wx_ref{type=ThisT,ref=ThisRef},X_scrolling,Y_scrolling)
  when is_boolean(X_scrolling),is_boolean(Y_scrolling) ->
   ?CLASS(ThisT,wxScrolledWindow),
   wxe_util:cast(?wxScrolledWindow_EnableScrolling,
   <<ThisRef:32/?UI,(wxe_util:from_bool(X_scrolling)):32/?UI,(wxe_util:from_bool(Y_scrolling)):32/?UI>>).
 
-%% @spec (This::wxScrolledWindow()) -> {PixelsPerUnitX::integer(), PixelsPerUnitY::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxscrolledwindow.html#wxscrolledwindowgetscrollpixelsperunit">external documentation</a>.
+-spec getScrollPixelsPerUnit(This) -> {PixelsPerUnitX::integer(), PixelsPerUnitY::integer()} when
+	This::wxScrolledWindow().
 getScrollPixelsPerUnit(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxScrolledWindow),
   wxe_util:call(?wxScrolledWindow_GetScrollPixelsPerUnit,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxScrolledWindow()) -> {X::integer(), Y::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxscrolledwindow.html#wxscrolledwindowgetviewstart">external documentation</a>.
+-spec getViewStart(This) -> {X::integer(), Y::integer()} when
+	This::wxScrolledWindow().
 getViewStart(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxScrolledWindow),
   wxe_util:call(?wxScrolledWindow_GetViewStart,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxScrolledWindow(), Dc::wxDC:wxDC()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxscrolledwindow.html#wxscrolledwindowdopreparedc">external documentation</a>.
+-spec doPrepareDC(This, Dc) -> ok when
+	This::wxScrolledWindow(), Dc::wxDC:wxDC().
 doPrepareDC(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=DcT,ref=DcRef}) ->
   ?CLASS(ThisT,wxScrolledWindow),
   ?CLASS(DcT,wxDC),
   wxe_util:cast(?wxScrolledWindow_DoPrepareDC,
   <<ThisRef:32/?UI,DcRef:32/?UI>>).
 
-%% @spec (This::wxScrolledWindow(), Dc::wxDC:wxDC()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxscrolledwindow.html#wxscrolledwindowpreparedc">external documentation</a>.
+-spec prepareDC(This, Dc) -> ok when
+	This::wxScrolledWindow(), Dc::wxDC:wxDC().
 prepareDC(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=DcT,ref=DcRef}) ->
   ?CLASS(ThisT,wxScrolledWindow),
   ?CLASS(DcT,wxDC),
   wxe_util:cast(?wxScrolledWindow_PrepareDC,
   <<ThisRef:32/?UI,DcRef:32/?UI>>).
 
-%% @spec (This::wxScrolledWindow(), X::integer(), Y::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxscrolledwindow.html#wxscrolledwindowscroll">external documentation</a>.
+-spec scroll(This, X, Y) -> ok when
+	This::wxScrolledWindow(), X::integer(), Y::integer().
 scroll(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
  when is_integer(X),is_integer(Y) ->
   ?CLASS(ThisT,wxScrolledWindow),
   wxe_util:cast(?wxScrolledWindow_Scroll,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI>>).
 
-%% @spec (This::wxScrolledWindow(), PixelsPerUnitX::integer(), PixelsPerUnitY::integer(), NoUnitsX::integer(), NoUnitsY::integer()) -> ok
 %% @equiv setScrollbars(This,PixelsPerUnitX,PixelsPerUnitY,NoUnitsX,NoUnitsY, [])
+-spec setScrollbars(This, PixelsPerUnitX, PixelsPerUnitY, NoUnitsX, NoUnitsY) -> ok when
+	This::wxScrolledWindow(), PixelsPerUnitX::integer(), PixelsPerUnitY::integer(), NoUnitsX::integer(), NoUnitsY::integer().
+
 setScrollbars(This,PixelsPerUnitX,PixelsPerUnitY,NoUnitsX,NoUnitsY)
  when is_record(This, wx_ref),is_integer(PixelsPerUnitX),is_integer(PixelsPerUnitY),is_integer(NoUnitsX),is_integer(NoUnitsY) ->
   setScrollbars(This,PixelsPerUnitX,PixelsPerUnitY,NoUnitsX,NoUnitsY, []).
 
-%% @spec (This::wxScrolledWindow(), PixelsPerUnitX::integer(), PixelsPerUnitY::integer(), NoUnitsX::integer(), NoUnitsY::integer(), [Option]) -> ok
-%% Option = {xPos, integer()} | {yPos, integer()} | {noRefresh, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxscrolledwindow.html#wxscrolledwindowsetscrollbars">external documentation</a>.
+-spec setScrollbars(This, PixelsPerUnitX, PixelsPerUnitY, NoUnitsX, NoUnitsY, [Option]) -> ok when
+	This::wxScrolledWindow(), PixelsPerUnitX::integer(), PixelsPerUnitY::integer(), NoUnitsX::integer(), NoUnitsY::integer(),
+	Option :: {xPos, integer()}
+		 | {yPos, integer()}
+		 | {noRefresh, boolean()}.
 setScrollbars(#wx_ref{type=ThisT,ref=ThisRef},PixelsPerUnitX,PixelsPerUnitY,NoUnitsX,NoUnitsY, Options)
  when is_integer(PixelsPerUnitX),is_integer(PixelsPerUnitY),is_integer(NoUnitsX),is_integer(NoUnitsY),is_list(Options) ->
   ?CLASS(ThisT,wxScrolledWindow),
@@ -203,24 +226,26 @@ setScrollbars(#wx_ref{type=ThisT,ref=ThisRef},PixelsPerUnitX,PixelsPerUnitY,NoUn
   wxe_util:cast(?wxScrolledWindow_SetScrollbars,
   <<ThisRef:32/?UI,PixelsPerUnitX:32/?UI,PixelsPerUnitY:32/?UI,NoUnitsX:32/?UI,NoUnitsY:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxScrolledWindow(), Xstep::integer(), Ystep::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxscrolledwindow.html#wxscrolledwindowsetscrollrate">external documentation</a>.
+-spec setScrollRate(This, Xstep, Ystep) -> ok when
+	This::wxScrolledWindow(), Xstep::integer(), Ystep::integer().
 setScrollRate(#wx_ref{type=ThisT,ref=ThisRef},Xstep,Ystep)
  when is_integer(Xstep),is_integer(Ystep) ->
   ?CLASS(ThisT,wxScrolledWindow),
   wxe_util:cast(?wxScrolledWindow_SetScrollRate,
   <<ThisRef:32/?UI,Xstep:32/?UI,Ystep:32/?UI>>).
 
-%% @spec (This::wxScrolledWindow(), Target::wxWindow:wxWindow()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxscrolledwindow.html#wxscrolledwindowsettargetwindow">external documentation</a>.
+-spec setTargetWindow(This, Target) -> ok when
+	This::wxScrolledWindow(), Target::wxWindow:wxWindow().
 setTargetWindow(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=TargetT,ref=TargetRef}) ->
   ?CLASS(ThisT,wxScrolledWindow),
   ?CLASS(TargetT,wxWindow),
   wxe_util:cast(?wxScrolledWindow_SetTargetWindow,
   <<ThisRef:32/?UI,TargetRef:32/?UI>>).
 
-%% @spec (This::wxScrolledWindow()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxScrolledWindow) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxScrolledWindow),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxSetCursorEvent.erl b/lib/wx/src/gen/wxSetCursorEvent.erl
index 75a41eb6ad..23ff963001 100644
--- a/lib/wx/src/gen/wxSetCursorEvent.erl
+++ b/lib/wx/src/gen/wxSetCursorEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -37,40 +37,47 @@
 -export([getId/1,getSkipped/1,getTimestamp/1,isCommandEvent/1,parent_class/1,
   resumePropagation/2,shouldPropagate/1,skip/1,skip/2,stopPropagation/1]).
 
+-export_type([wxSetCursorEvent/0]).
 %% @hidden
 parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (This::wxSetCursorEvent()) -> wxCursor:wxCursor()
+-type wxSetCursorEvent() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsetcursorevent.html#wxsetcursoreventgetcursor">external documentation</a>.
+-spec getCursor(This) -> wxCursor:wxCursor() when
+	This::wxSetCursorEvent().
 getCursor(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSetCursorEvent),
   wxe_util:call(?wxSetCursorEvent_GetCursor,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSetCursorEvent()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsetcursorevent.html#wxsetcursoreventgetx">external documentation</a>.
+-spec getX(This) -> integer() when
+	This::wxSetCursorEvent().
 getX(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSetCursorEvent),
   wxe_util:call(?wxSetCursorEvent_GetX,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSetCursorEvent()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsetcursorevent.html#wxsetcursoreventgety">external documentation</a>.
+-spec getY(This) -> integer() when
+	This::wxSetCursorEvent().
 getY(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSetCursorEvent),
   wxe_util:call(?wxSetCursorEvent_GetY,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSetCursorEvent()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsetcursorevent.html#wxsetcursoreventhascursor">external documentation</a>.
+-spec hasCursor(This) -> boolean() when
+	This::wxSetCursorEvent().
 hasCursor(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSetCursorEvent),
   wxe_util:call(?wxSetCursorEvent_HasCursor,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSetCursorEvent(), Cursor::wxCursor:wxCursor()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsetcursorevent.html#wxsetcursoreventsetcursor">external documentation</a>.
+-spec setCursor(This, Cursor) -> ok when
+	This::wxSetCursorEvent(), Cursor::wxCursor:wxCursor().
 setCursor(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=CursorT,ref=CursorRef}) ->
   ?CLASS(ThisT,wxSetCursorEvent),
   ?CLASS(CursorT,wxCursor),
diff --git a/lib/wx/src/gen/wxShowEvent.erl b/lib/wx/src/gen/wxShowEvent.erl
index 7d5c8300d3..ffafa0978f 100644
--- a/lib/wx/src/gen/wxShowEvent.erl
+++ b/lib/wx/src/gen/wxShowEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -37,20 +37,24 @@
 -export([getId/1,getSkipped/1,getTimestamp/1,isCommandEvent/1,parent_class/1,
   resumePropagation/2,shouldPropagate/1,skip/1,skip/2,stopPropagation/1]).
 
+-export_type([wxShowEvent/0]).
 %% @hidden
 parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (This::wxShowEvent(), Show::bool()) -> ok
+-type wxShowEvent() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxshowevent.html#wxshoweventsetshow">external documentation</a>.
+-spec setShow(This, Show) -> ok when
+	This::wxShowEvent(), Show::boolean().
 setShow(#wx_ref{type=ThisT,ref=ThisRef},Show)
  when is_boolean(Show) ->
   ?CLASS(ThisT,wxShowEvent),
   wxe_util:cast(?wxShowEvent_SetShow,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Show)):32/?UI>>).
 
-%% @spec (This::wxShowEvent()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxshowevent.html#wxshoweventgetshow">external documentation</a>.
+-spec getShow(This) -> boolean() when
+	This::wxShowEvent().
 getShow(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxShowEvent),
   wxe_util:call(?wxShowEvent_GetShow,
diff --git a/lib/wx/src/gen/wxSingleChoiceDialog.erl b/lib/wx/src/gen/wxSingleChoiceDialog.erl
index e2b835917e..741e935e41 100644
--- a/lib/wx/src/gen/wxSingleChoiceDialog.erl
+++ b/lib/wx/src/gen/wxSingleChoiceDialog.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -77,6 +77,7 @@
   transferDataFromWindow/1,transferDataToWindow/1,update/1,updateWindowUI/1,
   updateWindowUI/2,validate/1,warpPointer/3]).
 
+-export_type([wxSingleChoiceDialog/0]).
 %% @hidden
 parent_class(wxDialog) -> true;
 parent_class(wxTopLevelWindow) -> true;
@@ -84,21 +85,26 @@ parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxSingleChoiceDialog()
+-type wxSingleChoiceDialog() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsinglechoicedialog.html#wxsinglechoicedialogwxsinglechoicedialog">external documentation</a>.
+-spec new() -> wxSingleChoiceDialog().
 new() ->
   wxe_util:construct(?wxSingleChoiceDialog_new_0,
   <<>>).
 
-%% @spec (Parent::wxWindow:wxWindow(), Message::string(), Caption::string(), Choices::[[string()]]) -> wxSingleChoiceDialog()
 %% @equiv new(Parent,Message,Caption,Choices, [])
+-spec new(Parent, Message, Caption, Choices) -> wxSingleChoiceDialog() when
+	Parent::wxWindow:wxWindow(), Message::string(), Caption::string(), Choices::[[string()]].
+
 new(Parent,Message,Caption,Choices)
  when is_record(Parent, wx_ref),is_list(Message),is_list(Caption),is_list(Choices) ->
   new(Parent,Message,Caption,Choices, []).
 
-%% @spec (Parent::wxWindow:wxWindow(), Message::string(), Caption::string(), Choices::[[string()]], [Option]) -> wxSingleChoiceDialog()
-%% Option = {style, integer()} | {pos, {X::integer(), Y::integer()}}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsinglechoicedialog.html#wxsinglechoicedialogwxsinglechoicedialog">external documentation</a>.
+-spec new(Parent, Message, Caption, Choices, [Option]) -> wxSingleChoiceDialog() when
+	Parent::wxWindow:wxWindow(), Message::string(), Caption::string(), Choices::[[string()]],
+	Option :: {style, integer()}
+		 | {pos, {X::integer(), Y::integer()}}.
 new(#wx_ref{type=ParentT,ref=ParentRef},Message,Caption,Choices, Options)
  when is_list(Message),is_list(Caption),is_list(Choices),is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -113,30 +119,33 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Message,Caption,Choices, Options)
   wxe_util:construct(?wxSingleChoiceDialog_new_5,
   <<ParentRef: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,(byte_size(Caption_UC)):32/?UI,(Caption_UC)/binary, 0:(((8- ((4+byte_size(Caption_UC)) band 16#7)) band 16#7))/unit:8,(length(Choices_UCA)):32/?UI, (<< <<(byte_size(UC_Str)):32/?UI, UC_Str/binary>>|| UC_Str <- Choices_UCA>>)/binary, 0:(((8- ((4 + lists:sum([byte_size(S)+4||S<-Choices_UCA])) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxSingleChoiceDialog()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsinglechoicedialog.html#wxsinglechoicedialoggetselection">external documentation</a>.
+-spec getSelection(This) -> integer() when
+	This::wxSingleChoiceDialog().
 getSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSingleChoiceDialog),
   wxe_util:call(?wxSingleChoiceDialog_GetSelection,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSingleChoiceDialog()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsinglechoicedialog.html#wxsinglechoicedialoggetstringselection">external documentation</a>.
+-spec getStringSelection(This) -> string() when
+	This::wxSingleChoiceDialog().
 getStringSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSingleChoiceDialog),
   wxe_util:call(?wxSingleChoiceDialog_GetStringSelection,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSingleChoiceDialog(), Sel::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsinglechoicedialog.html#wxsinglechoicedialogsetselection">external documentation</a>.
+-spec setSelection(This, Sel) -> ok when
+	This::wxSingleChoiceDialog(), Sel::integer().
 setSelection(#wx_ref{type=ThisT,ref=ThisRef},Sel)
  when is_integer(Sel) ->
   ?CLASS(ThisT,wxSingleChoiceDialog),
   wxe_util:cast(?wxSingleChoiceDialog_SetSelection,
   <<ThisRef:32/?UI,Sel:32/?UI>>).
 
-%% @spec (This::wxSingleChoiceDialog()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxSingleChoiceDialog) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxSingleChoiceDialog),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxSizeEvent.erl b/lib/wx/src/gen/wxSizeEvent.erl
index 0898f4aed9..c51e48bc59 100644
--- a/lib/wx/src/gen/wxSizeEvent.erl
+++ b/lib/wx/src/gen/wxSizeEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -37,12 +37,15 @@
 -export([getId/1,getSkipped/1,getTimestamp/1,isCommandEvent/1,parent_class/1,
   resumePropagation/2,shouldPropagate/1,skip/1,skip/2,stopPropagation/1]).
 
+-export_type([wxSizeEvent/0]).
 %% @hidden
 parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (This::wxSizeEvent()) -> {W::integer(), H::integer()}
+-type wxSizeEvent() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeevent.html#wxsizeeventgetsize">external documentation</a>.
+-spec getSize(This) -> {W::integer(), H::integer()} when
+	This::wxSizeEvent().
 getSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSizeEvent),
   wxe_util:call(?wxSizeEvent_GetSize,
diff --git a/lib/wx/src/gen/wxSizer.erl b/lib/wx/src/gen/wxSizer.erl
index 0f1a92f379..999724d38f 100644
--- a/lib/wx/src/gen/wxSizer.erl
+++ b/lib/wx/src/gen/wxSizer.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -36,27 +36,30 @@
 %% inherited exports
 -export([parent_class/1]).
 
+-export_type([wxSizer/0]).
 %% @hidden
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (This::wxSizer(), Window::wxWindow:wxWindow() | wxSizer()) -> wxSizerItem:wxSizerItem()
+-type wxSizer() :: wx:wx_object().
 %% @equiv add(This,Window, [])
+-spec add(This, Window) -> wxSizerItem:wxSizerItem() when
+	This::wxSizer(), Window::wxWindow:wxWindow() | wxSizer().
+
 add(This,Window)
  when is_record(This, wx_ref),is_record(Window, wx_ref) ->
   add(This,Window, []).
 
-%% @spec (This::wxSizer(),X::integer()|term(),X::integer()|term()) -> wxSizerItem:wxSizerItem()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizeradd">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% add(This::wxSizer(), Width::integer(), Height::integer()) -> add(This,Width,Height, []) </c></p>
-%% <p><c>
-%% add(This::wxSizer(), Window::wxWindow:wxWindow() | wxSizer(), [Option]) -> wxSizerItem:wxSizerItem() </c>
-%%<br /> Option = {proportion, integer()} | {flag, integer()} | {border, integer()} | {userData, wx:wx()}
-%% </p>
-%% <p><c>
-%% add(This::wxSizer(), Window::wxWindow:wxWindow() | wxSizer(), Flags::wxSizerFlags:wxSizerFlags()) -> wxSizerItem:wxSizerItem() </c>
-%% </p>
+-spec add(This, Width, Height) -> wxSizerItem:wxSizerItem() when
+	This::wxSizer(), Width::integer(), Height::integer();
+      (This, Window, [Option]) -> wxSizerItem:wxSizerItem() when
+	This::wxSizer(), Window::wxWindow:wxWindow() | wxSizer(),
+	Option :: {proportion, integer()}
+		 | {flag, integer()}
+		 | {border, integer()}
+		 | {userData, wx:wx()};
+      (This, Window, Flags) -> wxSizerItem:wxSizerItem() when
+	This::wxSizer(), Window::wxWindow:wxWindow() | wxSizer(), Flags::wxSizerFlags:wxSizerFlags().
 
 add(This,Width,Height)
  when is_record(This, wx_ref),is_integer(Width),is_integer(Height) ->
@@ -91,9 +94,13 @@ add(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef},#wx_ref{
   wxe_util:call(WindowOP,
   <<ThisRef:32/?UI,WindowRef:32/?UI,FlagsRef:32/?UI>>).
 
-%% @spec (This::wxSizer(), Width::integer(), Height::integer(), [Option]) -> wxSizerItem:wxSizerItem()
-%% Option = {proportion, integer()} | {flag, integer()} | {border, integer()} | {userData, wx:wx()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizeradd">external documentation</a>.
+-spec add(This, Width, Height, [Option]) -> wxSizerItem:wxSizerItem() when
+	This::wxSizer(), Width::integer(), Height::integer(),
+	Option :: {proportion, integer()}
+		 | {flag, integer()}
+		 | {border, integer()}
+		 | {userData, wx:wx()}.
 add(#wx_ref{type=ThisT,ref=ThisRef},Width,Height, Options)
  when is_integer(Width),is_integer(Height),is_list(Options) ->
   ?CLASS(ThisT,wxSizer),
@@ -106,23 +113,27 @@ add(#wx_ref{type=ThisT,ref=ThisRef},Width,Height, Options)
   wxe_util:call(?wxSizer_Add_3,
   <<ThisRef:32/?UI,Width:32/?UI,Height:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxSizer(), Size::integer()) -> wxSizerItem:wxSizerItem()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizeraddspacer">external documentation</a>.
+-spec addSpacer(This, Size) -> wxSizerItem:wxSizerItem() when
+	This::wxSizer(), Size::integer().
 addSpacer(#wx_ref{type=ThisT,ref=ThisRef},Size)
  when is_integer(Size) ->
   ?CLASS(ThisT,wxSizer),
   wxe_util:call(?wxSizer_AddSpacer,
   <<ThisRef:32/?UI,Size:32/?UI>>).
 
-%% @spec (This::wxSizer()) -> wxSizerItem:wxSizerItem()
 %% @equiv addStretchSpacer(This, [])
+-spec addStretchSpacer(This) -> wxSizerItem:wxSizerItem() when
+	This::wxSizer().
+
 addStretchSpacer(This)
  when is_record(This, wx_ref) ->
   addStretchSpacer(This, []).
 
-%% @spec (This::wxSizer(), [Option]) -> wxSizerItem:wxSizerItem()
-%% Option = {prop, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizeraddstretchspacer">external documentation</a>.
+-spec addStretchSpacer(This, [Option]) -> wxSizerItem:wxSizerItem() when
+	This::wxSizer(),
+	Option :: {prop, integer()}.
 addStretchSpacer(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxSizer),
@@ -132,22 +143,26 @@ addStretchSpacer(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxSizer_AddStretchSpacer,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxSizer()) -> {W::integer(), H::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizercalcmin">external documentation</a>.
+-spec calcMin(This) -> {W::integer(), H::integer()} when
+	This::wxSizer().
 calcMin(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSizer),
   wxe_util:call(?wxSizer_CalcMin,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSizer()) -> ok
 %% @equiv clear(This, [])
+-spec clear(This) -> ok when
+	This::wxSizer().
+
 clear(This)
  when is_record(This, wx_ref) ->
   clear(This, []).
 
-%% @spec (This::wxSizer(), [Option]) -> ok
-%% Option = {delete_windows, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizerclear">external documentation</a>.
+-spec clear(This, [Option]) -> ok when
+	This::wxSizer(),
+	Option :: {delete_windows, boolean()}.
 clear(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxSizer),
@@ -157,15 +172,11 @@ clear(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxSizer_Clear,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxSizer(),X::integer()|term()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizerdetach">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% detach(This::wxSizer(), Index::integer()) -> bool() </c>
-%% </p>
-%% <p><c>
-%% detach(This::wxSizer(), Window::wxWindow:wxWindow() | wxSizer()) -> bool() </c>
-%% </p>
+-spec detach(This, Index) -> boolean() when
+	This::wxSizer(), Index::integer();
+      (This, Window) -> boolean() when
+	This::wxSizer(), Window::wxWindow:wxWindow() | wxSizer().
 detach(#wx_ref{type=ThisT,ref=ThisRef},Index)
  when is_integer(Index) ->
   ?CLASS(ThisT,wxSizer),
@@ -182,37 +193,37 @@ detach(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef}) ->
   wxe_util:call(WindowOP,
   <<ThisRef:32/?UI,WindowRef:32/?UI>>).
 
-%% @spec (This::wxSizer(), Window::wxWindow:wxWindow()) -> {W::integer(), H::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizerfit">external documentation</a>.
+-spec fit(This, Window) -> {W::integer(), H::integer()} when
+	This::wxSizer(), Window::wxWindow:wxWindow().
 fit(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef}) ->
   ?CLASS(ThisT,wxSizer),
   ?CLASS(WindowT,wxWindow),
   wxe_util:call(?wxSizer_Fit,
   <<ThisRef:32/?UI,WindowRef:32/?UI>>).
 
-%% @spec (This::wxSizer(), Window::wxWindow:wxWindow()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizerfitinside">external documentation</a>.
+-spec fitInside(This, Window) -> ok when
+	This::wxSizer(), Window::wxWindow:wxWindow().
 fitInside(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef}) ->
   ?CLASS(ThisT,wxSizer),
   ?CLASS(WindowT,wxWindow),
   wxe_util:cast(?wxSizer_FitInside,
   <<ThisRef:32/?UI,WindowRef:32/?UI>>).
 
-%% @spec (This::wxSizer()) -> [wxSizerItem:wxSizerItem()]
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizergetchildren">external documentation</a>.
+-spec getChildren(This) -> [wxSizerItem:wxSizerItem()] when
+	This::wxSizer().
 getChildren(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSizer),
   wxe_util:call(?wxSizer_GetChildren,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSizer(),X::term()|integer()) -> wxSizerItem:wxSizerItem()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizergetitem">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% getItem(This::wxSizer(), Window::wxWindow:wxWindow() | wxSizer()) -> getItem(This,Window, []) </c></p>
-%% <p><c>
-%% getItem(This::wxSizer(), Index::integer()) -> wxSizerItem:wxSizerItem() </c>
-%% </p>
+-spec getItem(This, Window) -> wxSizerItem:wxSizerItem() when
+	This::wxSizer(), Window::wxWindow:wxWindow() | wxSizer();
+      (This, Index) -> wxSizerItem:wxSizerItem() when
+	This::wxSizer(), Index::integer().
 
 getItem(This,Window)
  when is_record(This, wx_ref),is_record(Window, wx_ref) ->
@@ -223,9 +234,10 @@ getItem(#wx_ref{type=ThisT,ref=ThisRef},Index)
   wxe_util:call(?wxSizer_GetItem_1,
   <<ThisRef:32/?UI,Index:32/?UI>>).
 
-%% @spec (This::wxSizer(), Window::wxWindow:wxWindow() | wxSizer(), [Option]) -> wxSizerItem:wxSizerItem()
-%% Option = {recursive, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizergetitem">external documentation</a>.
+-spec getItem(This, Window, [Option]) -> wxSizerItem:wxSizerItem() when
+	This::wxSizer(), Window::wxWindow:wxWindow() | wxSizer(),
+	Option :: {recursive, boolean()}.
 getItem(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxSizer),
@@ -241,35 +253,35 @@ getItem(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef}, Opt
   wxe_util:call(WindowOP,
   <<ThisRef:32/?UI,WindowRef:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxSizer()) -> {W::integer(), H::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizergetsize">external documentation</a>.
+-spec getSize(This) -> {W::integer(), H::integer()} when
+	This::wxSizer().
 getSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSizer),
   wxe_util:call(?wxSizer_GetSize,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSizer()) -> {X::integer(), Y::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizergetposition">external documentation</a>.
+-spec getPosition(This) -> {X::integer(), Y::integer()} when
+	This::wxSizer().
 getPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSizer),
   wxe_util:call(?wxSizer_GetPosition,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSizer()) -> {W::integer(), H::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizergetminsize">external documentation</a>.
+-spec getMinSize(This) -> {W::integer(), H::integer()} when
+	This::wxSizer().
 getMinSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSizer),
   wxe_util:call(?wxSizer_GetMinSize,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSizer(),X::term()|integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizerhide">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% hide(This::wxSizer(), Window::wxWindow:wxWindow() | wxSizer()) -> hide(This,Window, []) </c></p>
-%% <p><c>
-%% hide(This::wxSizer(), Index::integer()) -> bool() </c>
-%% </p>
+-spec hide(This, Window) -> boolean() when
+	This::wxSizer(), Window::wxWindow:wxWindow() | wxSizer();
+      (This, Index) -> boolean() when
+	This::wxSizer(), Index::integer().
 
 hide(This,Window)
  when is_record(This, wx_ref),is_record(Window, wx_ref) ->
@@ -280,9 +292,10 @@ hide(#wx_ref{type=ThisT,ref=ThisRef},Index)
   wxe_util:call(?wxSizer_Hide_1,
   <<ThisRef:32/?UI,Index:32/?UI>>).
 
-%% @spec (This::wxSizer(), Window::wxWindow:wxWindow() | wxSizer(), [Option]) -> bool()
-%% Option = {recursive, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizerhide">external documentation</a>.
+-spec hide(This, Window, [Option]) -> boolean() when
+	This::wxSizer(), Window::wxWindow:wxWindow() | wxSizer(),
+	Option :: {recursive, boolean()}.
 hide(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxSizer),
@@ -298,8 +311,9 @@ hide(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef}, Option
   wxe_util:call(WindowOP,
   <<ThisRef:32/?UI,WindowRef:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxSizer(), Index::integer(), Item::wxSizerItem:wxSizerItem()) -> wxSizerItem:wxSizerItem()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizerinsert">external documentation</a>.
+-spec insert(This, Index, Item) -> wxSizerItem:wxSizerItem() when
+	This::wxSizer(), Index::integer(), Item::wxSizerItem:wxSizerItem().
 insert(#wx_ref{type=ThisT,ref=ThisRef},Index,#wx_ref{type=ItemT,ref=ItemRef})
  when is_integer(Index) ->
   ?CLASS(ThisT,wxSizer),
@@ -307,18 +321,17 @@ insert(#wx_ref{type=ThisT,ref=ThisRef},Index,#wx_ref{type=ItemT,ref=ItemRef})
   wxe_util:call(?wxSizer_Insert_2,
   <<ThisRef:32/?UI,Index:32/?UI,ItemRef:32/?UI>>).
 
-%% @spec (This::wxSizer(),Index::integer(),X::integer()|term(),X::integer()|term()) -> wxSizerItem:wxSizerItem()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizerinsert">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% insert(This::wxSizer(), Index::integer(), Width::integer(), Height::integer()) -> insert(This,Index,Width,Height, []) </c></p>
-%% <p><c>
-%% insert(This::wxSizer(), Index::integer(), Window::wxWindow:wxWindow() | wxSizer(), [Option]) -> wxSizerItem:wxSizerItem() </c>
-%%<br /> Option = {proportion, integer()} | {flag, integer()} | {border, integer()} | {userData, wx:wx()}
-%% </p>
-%% <p><c>
-%% insert(This::wxSizer(), Index::integer(), Window::wxWindow:wxWindow() | wxSizer(), Flags::wxSizerFlags:wxSizerFlags()) -> wxSizerItem:wxSizerItem() </c>
-%% </p>
+-spec insert(This, Index, Width, Height) -> wxSizerItem:wxSizerItem() when
+	This::wxSizer(), Index::integer(), Width::integer(), Height::integer();
+      (This, Index, Window, [Option]) -> wxSizerItem:wxSizerItem() when
+	This::wxSizer(), Index::integer(), Window::wxWindow:wxWindow() | wxSizer(),
+	Option :: {proportion, integer()}
+		 | {flag, integer()}
+		 | {border, integer()}
+		 | {userData, wx:wx()};
+      (This, Index, Window, Flags) -> wxSizerItem:wxSizerItem() when
+	This::wxSizer(), Index::integer(), Window::wxWindow:wxWindow() | wxSizer(), Flags::wxSizerFlags:wxSizerFlags().
 
 insert(This,Index,Width,Height)
  when is_record(This, wx_ref),is_integer(Index),is_integer(Width),is_integer(Height) ->
@@ -354,9 +367,13 @@ insert(#wx_ref{type=ThisT,ref=ThisRef},Index,#wx_ref{type=WindowT,ref=WindowRef}
   wxe_util:call(WindowOP,
   <<ThisRef:32/?UI,Index:32/?UI,WindowRef:32/?UI,FlagsRef:32/?UI>>).
 
-%% @spec (This::wxSizer(), Index::integer(), Width::integer(), Height::integer(), [Option]) -> wxSizerItem:wxSizerItem()
-%% Option = {proportion, integer()} | {flag, integer()} | {border, integer()} | {userData, wx:wx()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizerinsert">external documentation</a>.
+-spec insert(This, Index, Width, Height, [Option]) -> wxSizerItem:wxSizerItem() when
+	This::wxSizer(), Index::integer(), Width::integer(), Height::integer(),
+	Option :: {proportion, integer()}
+		 | {flag, integer()}
+		 | {border, integer()}
+		 | {userData, wx:wx()}.
 insert(#wx_ref{type=ThisT,ref=ThisRef},Index,Width,Height, Options)
  when is_integer(Index),is_integer(Width),is_integer(Height),is_list(Options) ->
   ?CLASS(ThisT,wxSizer),
@@ -369,23 +386,27 @@ insert(#wx_ref{type=ThisT,ref=ThisRef},Index,Width,Height, Options)
   wxe_util:call(?wxSizer_Insert_4,
   <<ThisRef:32/?UI,Index:32/?UI,Width:32/?UI,Height:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxSizer(), Index::integer(), Size::integer()) -> wxSizerItem:wxSizerItem()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizerinsertspacer">external documentation</a>.
+-spec insertSpacer(This, Index, Size) -> wxSizerItem:wxSizerItem() when
+	This::wxSizer(), Index::integer(), Size::integer().
 insertSpacer(#wx_ref{type=ThisT,ref=ThisRef},Index,Size)
  when is_integer(Index),is_integer(Size) ->
   ?CLASS(ThisT,wxSizer),
   wxe_util:call(?wxSizer_InsertSpacer,
   <<ThisRef:32/?UI,Index:32/?UI,Size:32/?UI>>).
 
-%% @spec (This::wxSizer(), Index::integer()) -> wxSizerItem:wxSizerItem()
 %% @equiv insertStretchSpacer(This,Index, [])
+-spec insertStretchSpacer(This, Index) -> wxSizerItem:wxSizerItem() when
+	This::wxSizer(), Index::integer().
+
 insertStretchSpacer(This,Index)
  when is_record(This, wx_ref),is_integer(Index) ->
   insertStretchSpacer(This,Index, []).
 
-%% @spec (This::wxSizer(), Index::integer(), [Option]) -> wxSizerItem:wxSizerItem()
-%% Option = {prop, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizerinsertstretchspacer">external documentation</a>.
+-spec insertStretchSpacer(This, Index, [Option]) -> wxSizerItem:wxSizerItem() when
+	This::wxSizer(), Index::integer(),
+	Option :: {prop, integer()}.
 insertStretchSpacer(#wx_ref{type=ThisT,ref=ThisRef},Index, Options)
  when is_integer(Index),is_list(Options) ->
   ?CLASS(ThisT,wxSizer),
@@ -395,15 +416,11 @@ insertStretchSpacer(#wx_ref{type=ThisT,ref=ThisRef},Index, Options)
   wxe_util:call(?wxSizer_InsertStretchSpacer,
   <<ThisRef:32/?UI,Index:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxSizer(),X::integer()|term()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizerisshown">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% isShown(This::wxSizer(), Index::integer()) -> bool() </c>
-%% </p>
-%% <p><c>
-%% isShown(This::wxSizer(), Window::wxWindow:wxWindow() | wxSizer()) -> bool() </c>
-%% </p>
+-spec isShown(This, Index) -> boolean() when
+	This::wxSizer(), Index::integer();
+      (This, Window) -> boolean() when
+	This::wxSizer(), Window::wxWindow:wxWindow() | wxSizer().
 isShown(#wx_ref{type=ThisT,ref=ThisRef},Index)
  when is_integer(Index) ->
   ?CLASS(ThisT,wxSizer),
@@ -420,33 +437,34 @@ isShown(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef}) ->
   wxe_util:call(WindowOP,
   <<ThisRef:32/?UI,WindowRef:32/?UI>>).
 
-%% @spec (This::wxSizer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizerlayout">external documentation</a>.
+-spec layout(This) -> ok when
+	This::wxSizer().
 layout(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSizer),
   wxe_util:cast(?wxSizer_Layout,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSizer(), Item::wxSizerItem:wxSizerItem()) -> wxSizerItem:wxSizerItem()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizerprepend">external documentation</a>.
+-spec prepend(This, Item) -> wxSizerItem:wxSizerItem() when
+	This::wxSizer(), Item::wxSizerItem:wxSizerItem().
 prepend(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ItemT,ref=ItemRef}) ->
   ?CLASS(ThisT,wxSizer),
   ?CLASS(ItemT,wxSizerItem),
   wxe_util:call(?wxSizer_Prepend_1,
   <<ThisRef:32/?UI,ItemRef:32/?UI>>).
 
-%% @spec (This::wxSizer(),X::integer()|term(),X::integer()|term()) -> wxSizerItem:wxSizerItem()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizerprepend">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% prepend(This::wxSizer(), Width::integer(), Height::integer()) -> prepend(This,Width,Height, []) </c></p>
-%% <p><c>
-%% prepend(This::wxSizer(), Window::wxWindow:wxWindow() | wxSizer(), [Option]) -> wxSizerItem:wxSizerItem() </c>
-%%<br /> Option = {proportion, integer()} | {flag, integer()} | {border, integer()} | {userData, wx:wx()}
-%% </p>
-%% <p><c>
-%% prepend(This::wxSizer(), Window::wxWindow:wxWindow() | wxSizer(), Flags::wxSizerFlags:wxSizerFlags()) -> wxSizerItem:wxSizerItem() </c>
-%% </p>
+-spec prepend(This, Width, Height) -> wxSizerItem:wxSizerItem() when
+	This::wxSizer(), Width::integer(), Height::integer();
+      (This, Window, [Option]) -> wxSizerItem:wxSizerItem() when
+	This::wxSizer(), Window::wxWindow:wxWindow() | wxSizer(),
+	Option :: {proportion, integer()}
+		 | {flag, integer()}
+		 | {border, integer()}
+		 | {userData, wx:wx()};
+      (This, Window, Flags) -> wxSizerItem:wxSizerItem() when
+	This::wxSizer(), Window::wxWindow:wxWindow() | wxSizer(), Flags::wxSizerFlags:wxSizerFlags().
 
 prepend(This,Width,Height)
  when is_record(This, wx_ref),is_integer(Width),is_integer(Height) ->
@@ -481,9 +499,13 @@ prepend(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef},#wx_
   wxe_util:call(WindowOP,
   <<ThisRef:32/?UI,WindowRef:32/?UI,FlagsRef:32/?UI>>).
 
-%% @spec (This::wxSizer(), Width::integer(), Height::integer(), [Option]) -> wxSizerItem:wxSizerItem()
-%% Option = {proportion, integer()} | {flag, integer()} | {border, integer()} | {userData, wx:wx()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizerprepend">external documentation</a>.
+-spec prepend(This, Width, Height, [Option]) -> wxSizerItem:wxSizerItem() when
+	This::wxSizer(), Width::integer(), Height::integer(),
+	Option :: {proportion, integer()}
+		 | {flag, integer()}
+		 | {border, integer()}
+		 | {userData, wx:wx()}.
 prepend(#wx_ref{type=ThisT,ref=ThisRef},Width,Height, Options)
  when is_integer(Width),is_integer(Height),is_list(Options) ->
   ?CLASS(ThisT,wxSizer),
@@ -496,23 +518,27 @@ prepend(#wx_ref{type=ThisT,ref=ThisRef},Width,Height, Options)
   wxe_util:call(?wxSizer_Prepend_3,
   <<ThisRef:32/?UI,Width:32/?UI,Height:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxSizer(), Size::integer()) -> wxSizerItem:wxSizerItem()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizerprependspacer">external documentation</a>.
+-spec prependSpacer(This, Size) -> wxSizerItem:wxSizerItem() when
+	This::wxSizer(), Size::integer().
 prependSpacer(#wx_ref{type=ThisT,ref=ThisRef},Size)
  when is_integer(Size) ->
   ?CLASS(ThisT,wxSizer),
   wxe_util:call(?wxSizer_PrependSpacer,
   <<ThisRef:32/?UI,Size:32/?UI>>).
 
-%% @spec (This::wxSizer()) -> wxSizerItem:wxSizerItem()
 %% @equiv prependStretchSpacer(This, [])
+-spec prependStretchSpacer(This) -> wxSizerItem:wxSizerItem() when
+	This::wxSizer().
+
 prependStretchSpacer(This)
  when is_record(This, wx_ref) ->
   prependStretchSpacer(This, []).
 
-%% @spec (This::wxSizer(), [Option]) -> wxSizerItem:wxSizerItem()
-%% Option = {prop, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizerprependstretchspacer">external documentation</a>.
+-spec prependStretchSpacer(This, [Option]) -> wxSizerItem:wxSizerItem() when
+	This::wxSizer(),
+	Option :: {prop, integer()}.
 prependStretchSpacer(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxSizer),
@@ -522,22 +548,19 @@ prependStretchSpacer(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxSizer_PrependStretchSpacer,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxSizer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizerrecalcsizes">external documentation</a>.
+-spec recalcSizes(This) -> ok when
+	This::wxSizer().
 recalcSizes(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSizer),
   wxe_util:cast(?wxSizer_RecalcSizes,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSizer(),X::integer()|wxSizer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizerremove">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% remove(This::wxSizer(), Index::integer()) -> bool() </c>
-%% </p>
-%% <p><c>
-%% remove(This::wxSizer(), Sizer::wxSizer()) -> bool() </c>
-%% </p>
+-spec remove(This, Index) -> boolean() when
+	This::wxSizer(), Index::integer();
+      (This, Sizer) -> boolean() when
+	This::wxSizer(), Sizer::wxSizer().
 remove(#wx_ref{type=ThisT,ref=ThisRef},Index)
  when is_integer(Index) ->
   ?CLASS(ThisT,wxSizer),
@@ -549,14 +572,11 @@ remove(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=SizerT,ref=SizerRef}) ->
   wxe_util:call(?wxSizer_Remove_1_1,
   <<ThisRef:32/?UI,SizerRef:32/?UI>>).
 
-%% @spec (This::wxSizer(),X::term()|integer(),X::term()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizerreplace">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% replace(This::wxSizer(), Oldwin::wxWindow:wxWindow() | wxSizer(), Newwin::wxWindow:wxWindow() | wxSizer()) -> replace(This,Oldwin,Newwin, []) </c></p>
-%% <p><c>
-%% replace(This::wxSizer(), Index::integer(), Newitem::wxSizerItem:wxSizerItem()) -> bool() </c>
-%% </p>
+-spec replace(This, Oldwin, Newwin) -> boolean() when
+	This::wxSizer(), Oldwin::wxWindow:wxWindow() | wxSizer(), Newwin::wxWindow:wxWindow() | wxSizer();
+      (This, Index, Newitem) -> boolean() when
+	This::wxSizer(), Index::integer(), Newitem::wxSizerItem:wxSizerItem().
 
 replace(This,Oldwin,Newwin)
  when is_record(This, wx_ref),is_record(Oldwin, wx_ref),is_record(Newwin, wx_ref) ->
@@ -568,9 +588,10 @@ replace(#wx_ref{type=ThisT,ref=ThisRef},Index,#wx_ref{type=NewitemT,ref=NewitemR
   wxe_util:call(?wxSizer_Replace_2,
   <<ThisRef:32/?UI,Index:32/?UI,NewitemRef:32/?UI>>).
 
-%% @spec (This::wxSizer(), Oldwin::wxWindow:wxWindow() | wxSizer(), Newwin::wxWindow:wxWindow() | wxSizer(), [Option]) -> bool()
-%% Option = {recursive, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizerreplace">external documentation</a>.
+-spec replace(This, Oldwin, Newwin, [Option]) -> boolean() when
+	This::wxSizer(), Oldwin::wxWindow:wxWindow() | wxSizer(), Newwin::wxWindow:wxWindow() | wxSizer(),
+	Option :: {recursive, boolean()}.
 replace(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=OldwinT,ref=OldwinRef},#wx_ref{type=NewwinT,ref=NewwinRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxSizer),
@@ -588,39 +609,38 @@ replace(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=OldwinT,ref=OldwinRef},#wx_
   wxe_util:call(OldwinOP,
   <<ThisRef:32/?UI,OldwinRef:32/?UI,NewwinRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxSizer(), X::integer(), Y::integer(), Width::integer(), Height::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizersetdimension">external documentation</a>.
+-spec setDimension(This, X, Y, Width, Height) -> ok when
+	This::wxSizer(), X::integer(), Y::integer(), Width::integer(), Height::integer().
 setDimension(#wx_ref{type=ThisT,ref=ThisRef},X,Y,Width,Height)
  when is_integer(X),is_integer(Y),is_integer(Width),is_integer(Height) ->
   ?CLASS(ThisT,wxSizer),
   wxe_util:cast(?wxSizer_SetDimension,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI,Width:32/?UI,Height:32/?UI>>).
 
-%% @spec (This::wxSizer(), Size::{W::integer(), H::integer()}) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizersetminsize">external documentation</a>.
+-spec setMinSize(This, Size) -> ok when
+	This::wxSizer(), Size::{W::integer(), H::integer()}.
 setMinSize(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH})
  when is_integer(SizeW),is_integer(SizeH) ->
   ?CLASS(ThisT,wxSizer),
   wxe_util:cast(?wxSizer_SetMinSize_1,
   <<ThisRef:32/?UI,SizeW:32/?UI,SizeH:32/?UI>>).
 
-%% @spec (This::wxSizer(), Width::integer(), Height::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizersetminsize">external documentation</a>.
+-spec setMinSize(This, Width, Height) -> ok when
+	This::wxSizer(), Width::integer(), Height::integer().
 setMinSize(#wx_ref{type=ThisT,ref=ThisRef},Width,Height)
  when is_integer(Width),is_integer(Height) ->
   ?CLASS(ThisT,wxSizer),
   wxe_util:cast(?wxSizer_SetMinSize_2,
   <<ThisRef:32/?UI,Width:32/?UI,Height:32/?UI>>).
 
-%% @spec (This::wxSizer(),X::integer()|term(),Size::{W::integer(), H::integer()}) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizersetitemminsize">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% setItemMinSize(This::wxSizer(), Index::integer(), Size::{W::integer(), H::integer()}) -> bool() </c>
-%% </p>
-%% <p><c>
-%% setItemMinSize(This::wxSizer(), Window::wxWindow:wxWindow() | wxSizer(), Size::{W::integer(), H::integer()}) -> bool() </c>
-%% </p>
+-spec setItemMinSize(This, Index, Size) -> boolean() when
+	This::wxSizer(), Index::integer(), Size::{W::integer(), H::integer()};
+      (This, Window, Size) -> boolean() when
+	This::wxSizer(), Window::wxWindow:wxWindow() | wxSizer(), Size::{W::integer(), H::integer()}.
 setItemMinSize(#wx_ref{type=ThisT,ref=ThisRef},Index,{SizeW,SizeH})
  when is_integer(Index),is_integer(SizeW),is_integer(SizeH) ->
   ?CLASS(ThisT,wxSizer),
@@ -638,15 +658,11 @@ setItemMinSize(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRe
   wxe_util:call(WindowOP,
   <<ThisRef:32/?UI,WindowRef:32/?UI,SizeW:32/?UI,SizeH:32/?UI>>).
 
-%% @spec (This::wxSizer(),X::integer()|term(),Width::integer(),Height::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizersetitemminsize">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% setItemMinSize(This::wxSizer(), Index::integer(), Width::integer(), Height::integer()) -> bool() </c>
-%% </p>
-%% <p><c>
-%% setItemMinSize(This::wxSizer(), Window::wxWindow:wxWindow() | wxSizer(), Width::integer(), Height::integer()) -> bool() </c>
-%% </p>
+-spec setItemMinSize(This, Index, Width, Height) -> boolean() when
+	This::wxSizer(), Index::integer(), Width::integer(), Height::integer();
+      (This, Window, Width, Height) -> boolean() when
+	This::wxSizer(), Window::wxWindow:wxWindow() | wxSizer(), Width::integer(), Height::integer().
 setItemMinSize(#wx_ref{type=ThisT,ref=ThisRef},Index,Width,Height)
  when is_integer(Index),is_integer(Width),is_integer(Height) ->
   ?CLASS(ThisT,wxSizer),
@@ -664,32 +680,31 @@ setItemMinSize(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRe
   wxe_util:call(WindowOP,
   <<ThisRef:32/?UI,WindowRef:32/?UI,Width:32/?UI,Height:32/?UI>>).
 
-%% @spec (This::wxSizer(), Window::wxWindow:wxWindow()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizersetsizehints">external documentation</a>.
+-spec setSizeHints(This, Window) -> ok when
+	This::wxSizer(), Window::wxWindow:wxWindow().
 setSizeHints(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef}) ->
   ?CLASS(ThisT,wxSizer),
   ?CLASS(WindowT,wxWindow),
   wxe_util:cast(?wxSizer_SetSizeHints,
   <<ThisRef:32/?UI,WindowRef:32/?UI>>).
 
-%% @spec (This::wxSizer(), Window::wxWindow:wxWindow()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizersetvirtualsizehints">external documentation</a>.
+-spec setVirtualSizeHints(This, Window) -> ok when
+	This::wxSizer(), Window::wxWindow:wxWindow().
 setVirtualSizeHints(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef}) ->
   ?CLASS(ThisT,wxSizer),
   ?CLASS(WindowT,wxWindow),
   wxe_util:cast(?wxSizer_SetVirtualSizeHints,
   <<ThisRef:32/?UI,WindowRef:32/?UI>>).
 
-%% @spec (This::wxSizer(),X::integer()|term()|bool()) -> bool()|bool()|ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizershow">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% show(This::wxSizer(), Index::integer()) -> show(This,Index, []) </c></p>
-%% <p><c>
-%% show(This::wxSizer(), Window::wxWindow:wxWindow() | wxSizer()) -> show(This,Window, []) </c></p>
-%% <p><c>
-%% show(This::wxSizer(), Show::bool()) -> ok </c>
-%% </p>
+-spec show(This, Index) -> boolean() when
+	This::wxSizer(), Index::integer();
+      (This, Window) -> boolean() when
+	This::wxSizer(), Window::wxWindow:wxWindow() | wxSizer();
+      (This, Show) -> ok when
+	This::wxSizer(), Show::boolean().
 
 show(This,Index)
  when is_record(This, wx_ref),is_integer(Index) ->
@@ -704,17 +719,14 @@ show(#wx_ref{type=ThisT,ref=ThisRef},Show)
   wxe_util:cast(?wxSizer_Show_1,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Show)):32/?UI>>).
 
-%% @spec (This::wxSizer(),X::integer()|term(),[Option]) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizershow">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% show(This::wxSizer(), Index::integer(), [Option]) -> bool() </c>
-%%<br /> Option = {show, bool()}
-%% </p>
-%% <p><c>
-%% show(This::wxSizer(), Window::wxWindow:wxWindow() | wxSizer(), [Option]) -> bool() </c>
-%%<br /> Option = {show, bool()} | {recursive, bool()}
-%% </p>
+-spec show(This, Index, [Option]) -> boolean() when
+	This::wxSizer(), Index::integer(),
+	Option :: {show, boolean()};
+      (This, Window, [Option]) -> boolean() when
+	This::wxSizer(), Window::wxWindow:wxWindow() | wxSizer(),
+	Option :: {show, boolean()}
+		 | {recursive, boolean()}.
 show(#wx_ref{type=ThisT,ref=ThisRef},Index, Options)
  when is_integer(Index),is_list(Options) ->
   ?CLASS(ThisT,wxSizer),
diff --git a/lib/wx/src/gen/wxSizerFlags.erl b/lib/wx/src/gen/wxSizerFlags.erl
index 2a25fd2c1a..e3bf7fed95 100644
--- a/lib/wx/src/gen/wxSizerFlags.erl
+++ b/lib/wx/src/gen/wxSizerFlags.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -30,17 +30,20 @@
 %% inherited exports
 -export([parent_class/1]).
 
+-export_type([wxSizerFlags/0]).
 %% @hidden
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxSizerFlags()
+-type wxSizerFlags() :: wx:wx_object().
 %% @equiv new([])
+-spec new() -> wxSizerFlags().
+
 new() ->
   new([]).
 
-%% @spec ([Option]) -> wxSizerFlags()
-%% Option = {proportion, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizerflags.html#wxsizerflagswxsizerflags">external documentation</a>.
+-spec new([Option]) -> wxSizerFlags() when
+	Option :: {proportion, integer()}.
 new(Options)
  when is_list(Options) ->
   MOpts = fun({proportion, Proportion}, Acc) -> [<<1:32/?UI,Proportion:32/?UI>>|Acc];
@@ -49,23 +52,27 @@ new(Options)
   wxe_util:construct(?wxSizerFlags_new,
   <<BinOpt/binary>>).
 
-%% @spec (This::wxSizerFlags(), Alignment::integer()) -> wxSizerFlags()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizerflags.html#wxsizerflagsalign">external documentation</a>.
+-spec align(This, Alignment) -> wxSizerFlags() when
+	This::wxSizerFlags(), Alignment::integer().
 align(#wx_ref{type=ThisT,ref=ThisRef},Alignment)
  when is_integer(Alignment) ->
   ?CLASS(ThisT,wxSizerFlags),
   wxe_util:call(?wxSizerFlags_Align,
   <<ThisRef:32/?UI,Alignment:32/?UI>>).
 
-%% @spec (This::wxSizerFlags()) -> wxSizerFlags()
 %% @equiv border(This, [])
+-spec border(This) -> wxSizerFlags() when
+	This::wxSizerFlags().
+
 border(This)
  when is_record(This, wx_ref) ->
   border(This, []).
 
-%% @spec (This::wxSizerFlags(), [Option]) -> wxSizerFlags()
-%% Option = {direction, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizerflags.html#wxsizerflagsborder">external documentation</a>.
+-spec border(This, [Option]) -> wxSizerFlags() when
+	This::wxSizerFlags(),
+	Option :: {direction, integer()}.
 border(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxSizerFlags),
@@ -75,59 +82,66 @@ border(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxSizerFlags_Border_1,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxSizerFlags(), Direction::integer(), BorderInPixels::integer()) -> wxSizerFlags()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizerflags.html#wxsizerflagsborder">external documentation</a>.
+-spec border(This, Direction, BorderInPixels) -> wxSizerFlags() when
+	This::wxSizerFlags(), Direction::integer(), BorderInPixels::integer().
 border(#wx_ref{type=ThisT,ref=ThisRef},Direction,BorderInPixels)
  when is_integer(Direction),is_integer(BorderInPixels) ->
   ?CLASS(ThisT,wxSizerFlags),
   wxe_util:call(?wxSizerFlags_Border_2,
   <<ThisRef:32/?UI,Direction:32/?UI,BorderInPixels:32/?UI>>).
 
-%% @spec (This::wxSizerFlags()) -> wxSizerFlags()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizerflags.html#wxsizerflagscenter">external documentation</a>.
+-spec center(This) -> wxSizerFlags() when
+	This::wxSizerFlags().
 center(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSizerFlags),
   wxe_util:call(?wxSizerFlags_Center,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSizerFlags()) -> wxSizerFlags()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizerflags.html#wxsizerflagscentre">external documentation</a>.
+-spec centre(This) -> wxSizerFlags() when
+	This::wxSizerFlags().
 centre(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSizerFlags),
   wxe_util:call(?wxSizerFlags_Centre,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSizerFlags()) -> wxSizerFlags()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizerflags.html#wxsizerflagsexpand">external documentation</a>.
+-spec expand(This) -> wxSizerFlags() when
+	This::wxSizerFlags().
 expand(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSizerFlags),
   wxe_util:call(?wxSizerFlags_Expand,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSizerFlags()) -> wxSizerFlags()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizerflags.html#wxsizerflagsleft">external documentation</a>.
+-spec left(This) -> wxSizerFlags() when
+	This::wxSizerFlags().
 left(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSizerFlags),
   wxe_util:call(?wxSizerFlags_Left,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSizerFlags(), Proportion::integer()) -> wxSizerFlags()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizerflags.html#wxsizerflagsproportion">external documentation</a>.
+-spec proportion(This, Proportion) -> wxSizerFlags() when
+	This::wxSizerFlags(), Proportion::integer().
 proportion(#wx_ref{type=ThisT,ref=ThisRef},Proportion)
  when is_integer(Proportion) ->
   ?CLASS(ThisT,wxSizerFlags),
   wxe_util:call(?wxSizerFlags_Proportion,
   <<ThisRef:32/?UI,Proportion:32/?UI>>).
 
-%% @spec (This::wxSizerFlags()) -> wxSizerFlags()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizerflags.html#wxsizerflagsright">external documentation</a>.
+-spec right(This) -> wxSizerFlags() when
+	This::wxSizerFlags().
 right(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSizerFlags),
   wxe_util:call(?wxSizerFlags_Right,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSizerFlags()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxSizerFlags) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxSizerFlags),
   wxe_util:destroy(?wxSizerFlags_destroy,Obj),
diff --git a/lib/wx/src/gen/wxSizerItem.erl b/lib/wx/src/gen/wxSizerItem.erl
index 41cb86eae2..e22befd1ad 100644
--- a/lib/wx/src/gen/wxSizerItem.erl
+++ b/lib/wx/src/gen/wxSizerItem.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -35,17 +35,20 @@
 %% inherited exports
 -export([parent_class/1]).
 
+-export_type([wxSizerItem/0]).
 %% @hidden
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxSizerItem()
+-type wxSizerItem() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemwxsizeritem">external documentation</a>.
+-spec new() -> wxSizerItem().
 new() ->
   wxe_util:construct(?wxSizerItem_new_0,
   <<>>).
 
-%% @spec (Window::wxWindow:wxWindow() | wxSizer:wxSizer(), Flags::wxSizerFlags:wxSizerFlags()) -> wxSizerItem()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemwxsizeritem">external documentation</a>.
+-spec new(Window, Flags) -> wxSizerItem() when
+	Window::wxWindow:wxWindow() | wxSizer:wxSizer(), Flags::wxSizerFlags:wxSizerFlags().
 new(#wx_ref{type=WindowT,ref=WindowRef},#wx_ref{type=FlagsT,ref=FlagsRef}) ->
   WindowOP = case ?CLASS_T(WindowT,wxWindow) of
      true ->
@@ -58,16 +61,18 @@ new(#wx_ref{type=WindowT,ref=WindowRef},#wx_ref{type=FlagsT,ref=FlagsRef}) ->
   wxe_util:construct(WindowOP,
   <<WindowRef:32/?UI,FlagsRef:32/?UI>>).
 
-%% @spec (Width::integer(), Height::integer(), Flags::wxSizerFlags:wxSizerFlags()) -> wxSizerItem()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemwxsizeritem">external documentation</a>.
+-spec new(Width, Height, Flags) -> wxSizerItem() when
+	Width::integer(), Height::integer(), Flags::wxSizerFlags:wxSizerFlags().
 new(Width,Height,#wx_ref{type=FlagsT,ref=FlagsRef})
  when is_integer(Width),is_integer(Height) ->
   ?CLASS(FlagsT,wxSizerFlags),
   wxe_util:construct(?wxSizerItem_new_3,
   <<Width:32/?UI,Height:32/?UI,FlagsRef:32/?UI>>).
 
-%% @spec (Window::wxWindow:wxWindow() | wxSizer:wxSizer(), Proportion::integer(), Flag::integer(), Border::integer(), UserData::wx:wx()) -> wxSizerItem()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemwxsizeritem">external documentation</a>.
+-spec new(Window, Proportion, Flag, Border, UserData) -> wxSizerItem() when
+	Window::wxWindow:wxWindow() | wxSizer:wxSizer(), Proportion::integer(), Flag::integer(), Border::integer(), UserData::wx:wx().
 new(#wx_ref{type=WindowT,ref=WindowRef},Proportion,Flag,Border,#wx_ref{type=UserDataT,ref=UserDataRef})
  when is_integer(Proportion),is_integer(Flag),is_integer(Border) ->
   WindowOP = case ?CLASS_T(WindowT,wxWindow) of
@@ -81,212 +86,235 @@ new(#wx_ref{type=WindowT,ref=WindowRef},Proportion,Flag,Border,#wx_ref{type=User
   wxe_util:construct(WindowOP,
   <<WindowRef:32/?UI,Proportion:32/?UI,Flag:32/?UI,Border:32/?UI,UserDataRef:32/?UI>>).
 
-%% @spec (Width::integer(), Height::integer(), Proportion::integer(), Flag::integer(), Border::integer(), UserData::wx:wx()) -> wxSizerItem()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemwxsizeritem">external documentation</a>.
+-spec new(Width, Height, Proportion, Flag, Border, UserData) -> wxSizerItem() when
+	Width::integer(), Height::integer(), Proportion::integer(), Flag::integer(), Border::integer(), UserData::wx:wx().
 new(Width,Height,Proportion,Flag,Border,#wx_ref{type=UserDataT,ref=UserDataRef})
  when is_integer(Width),is_integer(Height),is_integer(Proportion),is_integer(Flag),is_integer(Border) ->
   ?CLASS(UserDataT,wx),
   wxe_util:construct(?wxSizerItem_new_6,
   <<Width:32/?UI,Height:32/?UI,Proportion:32/?UI,Flag:32/?UI,Border:32/?UI,UserDataRef:32/?UI>>).
 
-%% @spec (This::wxSizerItem()) -> {W::integer(), H::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemcalcmin">external documentation</a>.
+-spec calcMin(This) -> {W::integer(), H::integer()} when
+	This::wxSizerItem().
 calcMin(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSizerItem),
   wxe_util:call(?wxSizerItem_CalcMin,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSizerItem()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemdeletewindows">external documentation</a>.
+-spec deleteWindows(This) -> ok when
+	This::wxSizerItem().
 deleteWindows(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSizerItem),
   wxe_util:cast(?wxSizerItem_DeleteWindows,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSizerItem()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemdetachsizer">external documentation</a>.
+-spec detachSizer(This) -> ok when
+	This::wxSizerItem().
 detachSizer(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSizerItem),
   wxe_util:cast(?wxSizerItem_DetachSizer,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSizerItem()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemgetborder">external documentation</a>.
+-spec getBorder(This) -> integer() when
+	This::wxSizerItem().
 getBorder(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSizerItem),
   wxe_util:call(?wxSizerItem_GetBorder,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSizerItem()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemgetflag">external documentation</a>.
+-spec getFlag(This) -> integer() when
+	This::wxSizerItem().
 getFlag(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSizerItem),
   wxe_util:call(?wxSizerItem_GetFlag,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSizerItem()) -> {W::integer(), H::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemgetminsize">external documentation</a>.
+-spec getMinSize(This) -> {W::integer(), H::integer()} when
+	This::wxSizerItem().
 getMinSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSizerItem),
   wxe_util:call(?wxSizerItem_GetMinSize,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSizerItem()) -> {X::integer(), Y::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemgetposition">external documentation</a>.
+-spec getPosition(This) -> {X::integer(), Y::integer()} when
+	This::wxSizerItem().
 getPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSizerItem),
   wxe_util:call(?wxSizerItem_GetPosition,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSizerItem()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemgetproportion">external documentation</a>.
+-spec getProportion(This) -> integer() when
+	This::wxSizerItem().
 getProportion(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSizerItem),
   wxe_util:call(?wxSizerItem_GetProportion,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSizerItem()) -> float()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemgetratio">external documentation</a>.
+-spec getRatio(This) -> float() when
+	This::wxSizerItem().
 getRatio(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSizerItem),
   wxe_util:call(?wxSizerItem_GetRatio,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSizerItem()) -> {X::integer(), Y::integer(), W::integer(), H::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemgetrect">external documentation</a>.
+-spec getRect(This) -> {X::integer(), Y::integer(), W::integer(), H::integer()} when
+	This::wxSizerItem().
 getRect(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSizerItem),
   wxe_util:call(?wxSizerItem_GetRect,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSizerItem()) -> {W::integer(), H::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemgetsize">external documentation</a>.
+-spec getSize(This) -> {W::integer(), H::integer()} when
+	This::wxSizerItem().
 getSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSizerItem),
   wxe_util:call(?wxSizerItem_GetSize,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSizerItem()) -> wxSizer:wxSizer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemgetsizer">external documentation</a>.
+-spec getSizer(This) -> wxSizer:wxSizer() when
+	This::wxSizerItem().
 getSizer(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSizerItem),
   wxe_util:call(?wxSizerItem_GetSizer,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSizerItem()) -> {W::integer(), H::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemgetspacer">external documentation</a>.
+-spec getSpacer(This) -> {W::integer(), H::integer()} when
+	This::wxSizerItem().
 getSpacer(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSizerItem),
   wxe_util:call(?wxSizerItem_GetSpacer,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSizerItem()) -> wx:wx()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemgetuserdata">external documentation</a>.
+-spec getUserData(This) -> wx:wx() when
+	This::wxSizerItem().
 getUserData(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSizerItem),
   wxe_util:call(?wxSizerItem_GetUserData,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSizerItem()) -> wxWindow:wxWindow()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemgetwindow">external documentation</a>.
+-spec getWindow(This) -> wxWindow:wxWindow() when
+	This::wxSizerItem().
 getWindow(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSizerItem),
   wxe_util:call(?wxSizerItem_GetWindow,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSizerItem()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemissizer">external documentation</a>.
+-spec isSizer(This) -> boolean() when
+	This::wxSizerItem().
 isSizer(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSizerItem),
   wxe_util:call(?wxSizerItem_IsSizer,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSizerItem()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemisshown">external documentation</a>.
+-spec isShown(This) -> boolean() when
+	This::wxSizerItem().
 isShown(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSizerItem),
   wxe_util:call(?wxSizerItem_IsShown,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSizerItem()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemisspacer">external documentation</a>.
+-spec isSpacer(This) -> boolean() when
+	This::wxSizerItem().
 isSpacer(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSizerItem),
   wxe_util:call(?wxSizerItem_IsSpacer,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSizerItem()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemiswindow">external documentation</a>.
+-spec isWindow(This) -> boolean() when
+	This::wxSizerItem().
 isWindow(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSizerItem),
   wxe_util:call(?wxSizerItem_IsWindow,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSizerItem(), Border::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemsetborder">external documentation</a>.
+-spec setBorder(This, Border) -> ok when
+	This::wxSizerItem(), Border::integer().
 setBorder(#wx_ref{type=ThisT,ref=ThisRef},Border)
  when is_integer(Border) ->
   ?CLASS(ThisT,wxSizerItem),
   wxe_util:cast(?wxSizerItem_SetBorder,
   <<ThisRef:32/?UI,Border:32/?UI>>).
 
-%% @spec (This::wxSizerItem(), Pos::{X::integer(), Y::integer()}, Size::{W::integer(), H::integer()}) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemsetdimension">external documentation</a>.
+-spec setDimension(This, Pos, Size) -> ok when
+	This::wxSizerItem(), Pos::{X::integer(), Y::integer()}, Size::{W::integer(), H::integer()}.
 setDimension(#wx_ref{type=ThisT,ref=ThisRef},{PosX,PosY},{SizeW,SizeH})
  when is_integer(PosX),is_integer(PosY),is_integer(SizeW),is_integer(SizeH) ->
   ?CLASS(ThisT,wxSizerItem),
   wxe_util:cast(?wxSizerItem_SetDimension,
   <<ThisRef:32/?UI,PosX:32/?UI,PosY:32/?UI,SizeW:32/?UI,SizeH:32/?UI>>).
 
-%% @spec (This::wxSizerItem(), Flag::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemsetflag">external documentation</a>.
+-spec setFlag(This, Flag) -> ok when
+	This::wxSizerItem(), Flag::integer().
 setFlag(#wx_ref{type=ThisT,ref=ThisRef},Flag)
  when is_integer(Flag) ->
   ?CLASS(ThisT,wxSizerItem),
   wxe_util:cast(?wxSizerItem_SetFlag,
   <<ThisRef:32/?UI,Flag:32/?UI>>).
 
-%% @spec (This::wxSizerItem(), X::integer(), Y::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemsetinitsize">external documentation</a>.
+-spec setInitSize(This, X, Y) -> ok when
+	This::wxSizerItem(), X::integer(), Y::integer().
 setInitSize(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
  when is_integer(X),is_integer(Y) ->
   ?CLASS(ThisT,wxSizerItem),
   wxe_util:cast(?wxSizerItem_SetInitSize,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI>>).
 
-%% @spec (This::wxSizerItem(), Size::{W::integer(), H::integer()}) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemsetminsize">external documentation</a>.
+-spec setMinSize(This, Size) -> ok when
+	This::wxSizerItem(), Size::{W::integer(), H::integer()}.
 setMinSize(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH})
  when is_integer(SizeW),is_integer(SizeH) ->
   ?CLASS(ThisT,wxSizerItem),
   wxe_util:cast(?wxSizerItem_SetMinSize_1,
   <<ThisRef:32/?UI,SizeW:32/?UI,SizeH:32/?UI>>).
 
-%% @spec (This::wxSizerItem(), X::integer(), Y::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemsetminsize">external documentation</a>.
+-spec setMinSize(This, X, Y) -> ok when
+	This::wxSizerItem(), X::integer(), Y::integer().
 setMinSize(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
  when is_integer(X),is_integer(Y) ->
   ?CLASS(ThisT,wxSizerItem),
   wxe_util:cast(?wxSizerItem_SetMinSize_2,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI>>).
 
-%% @spec (This::wxSizerItem(), Proportion::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemsetproportion">external documentation</a>.
+-spec setProportion(This, Proportion) -> ok when
+	This::wxSizerItem(), Proportion::integer().
 setProportion(#wx_ref{type=ThisT,ref=ThisRef},Proportion)
  when is_integer(Proportion) ->
   ?CLASS(ThisT,wxSizerItem),
   wxe_util:cast(?wxSizerItem_SetProportion,
   <<ThisRef:32/?UI,Proportion:32/?UI>>).
 
-%% @spec (This::wxSizerItem(),X::float()|term()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemsetratio">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% setRatio(This::wxSizerItem(), Ratio::float()) -> ok </c>
-%% </p>
-%% <p><c>
-%% setRatio(This::wxSizerItem(), Size::{W::integer(), H::integer()}) -> ok </c>
-%% </p>
+-spec setRatio(This, Ratio) -> ok when
+	This::wxSizerItem(), Ratio::float();
+      (This, Size) -> ok when
+	This::wxSizerItem(), Size::{W::integer(), H::integer()}.
 setRatio(#wx_ref{type=ThisT,ref=ThisRef},Ratio)
  when is_float(Ratio) ->
   ?CLASS(ThisT,wxSizerItem),
@@ -298,56 +326,62 @@ setRatio(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH})
   wxe_util:cast(?wxSizerItem_SetRatio_1_1,
   <<ThisRef:32/?UI,SizeW:32/?UI,SizeH:32/?UI>>).
 
-%% @spec (This::wxSizerItem(), Width::integer(), Height::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemsetratio">external documentation</a>.
+-spec setRatio(This, Width, Height) -> ok when
+	This::wxSizerItem(), Width::integer(), Height::integer().
 setRatio(#wx_ref{type=ThisT,ref=ThisRef},Width,Height)
  when is_integer(Width),is_integer(Height) ->
   ?CLASS(ThisT,wxSizerItem),
   wxe_util:cast(?wxSizerItem_SetRatio_2,
   <<ThisRef:32/?UI,Width:32/?UI,Height:32/?UI>>).
 
-%% @spec (This::wxSizerItem(), Sizer::wxSizer:wxSizer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemsetsizer">external documentation</a>.
+-spec setSizer(This, Sizer) -> ok when
+	This::wxSizerItem(), Sizer::wxSizer:wxSizer().
 setSizer(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=SizerT,ref=SizerRef}) ->
   ?CLASS(ThisT,wxSizerItem),
   ?CLASS(SizerT,wxSizer),
   wxe_util:cast(?wxSizerItem_SetSizer,
   <<ThisRef:32/?UI,SizerRef:32/?UI>>).
 
-%% @spec (This::wxSizerItem(), Size::{W::integer(), H::integer()}) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemsetspacer">external documentation</a>.
+-spec setSpacer(This, Size) -> ok when
+	This::wxSizerItem(), Size::{W::integer(), H::integer()}.
 setSpacer(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH})
  when is_integer(SizeW),is_integer(SizeH) ->
   ?CLASS(ThisT,wxSizerItem),
   wxe_util:cast(?wxSizerItem_SetSpacer_1,
   <<ThisRef:32/?UI,SizeW:32/?UI,SizeH:32/?UI>>).
 
-%% @spec (This::wxSizerItem(), Width::integer(), Height::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemsetspacer">external documentation</a>.
+-spec setSpacer(This, Width, Height) -> ok when
+	This::wxSizerItem(), Width::integer(), Height::integer().
 setSpacer(#wx_ref{type=ThisT,ref=ThisRef},Width,Height)
  when is_integer(Width),is_integer(Height) ->
   ?CLASS(ThisT,wxSizerItem),
   wxe_util:cast(?wxSizerItem_SetSpacer_2,
   <<ThisRef:32/?UI,Width:32/?UI,Height:32/?UI>>).
 
-%% @spec (This::wxSizerItem(), Window::wxWindow:wxWindow()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemsetwindow">external documentation</a>.
+-spec setWindow(This, Window) -> ok when
+	This::wxSizerItem(), Window::wxWindow:wxWindow().
 setWindow(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef}) ->
   ?CLASS(ThisT,wxSizerItem),
   ?CLASS(WindowT,wxWindow),
   wxe_util:cast(?wxSizerItem_SetWindow,
   <<ThisRef:32/?UI,WindowRef:32/?UI>>).
 
-%% @spec (This::wxSizerItem(), Show::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemshow">external documentation</a>.
+-spec show(This, Show) -> ok when
+	This::wxSizerItem(), Show::boolean().
 show(#wx_ref{type=ThisT,ref=ThisRef},Show)
  when is_boolean(Show) ->
   ?CLASS(ThisT,wxSizerItem),
   wxe_util:cast(?wxSizerItem_Show,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Show)):32/?UI>>).
 
-%% @spec (This::wxSizerItem()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxSizerItem) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxSizerItem),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxSlider.erl b/lib/wx/src/gen/wxSlider.erl
index c7a3d6f5c0..bd00e71476 100644
--- a/lib/wx/src/gen/wxSlider.erl
+++ b/lib/wx/src/gen/wxSlider.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -71,27 +71,35 @@
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
 
+-export_type([wxSlider/0]).
 %% @hidden
 parent_class(wxControl) -> true;
 parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxSlider()
+-type wxSlider() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxslider.html#wxsliderwxslider">external documentation</a>.
+-spec new() -> wxSlider().
 new() ->
   wxe_util:construct(?wxSlider_new_0,
   <<>>).
 
-%% @spec (Parent::wxWindow:wxWindow(), Id::integer(), Value::integer(), MinValue::integer(), MaxValue::integer()) -> wxSlider()
 %% @equiv new(Parent,Id,Value,MinValue,MaxValue, [])
+-spec new(Parent, Id, Value, MinValue, MaxValue) -> wxSlider() when
+	Parent::wxWindow:wxWindow(), Id::integer(), Value::integer(), MinValue::integer(), MaxValue::integer().
+
 new(Parent,Id,Value,MinValue,MaxValue)
  when is_record(Parent, wx_ref),is_integer(Id),is_integer(Value),is_integer(MinValue),is_integer(MaxValue) ->
   new(Parent,Id,Value,MinValue,MaxValue, []).
 
-%% @spec (Parent::wxWindow:wxWindow(), Id::integer(), Value::integer(), MinValue::integer(), MaxValue::integer(), [Option]) -> wxSlider()
-%% Option = {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()} | {validator, wx:wx()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxslider.html#wxsliderwxslider">external documentation</a>.
+-spec new(Parent, Id, Value, MinValue, MaxValue, [Option]) -> wxSlider() when
+	Parent::wxWindow:wxWindow(), Id::integer(), Value::integer(), MinValue::integer(), MaxValue::integer(),
+	Option :: {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}
+		 | {validator, wx:wx()}.
 new(#wx_ref{type=ParentT,ref=ParentRef},Id,Value,MinValue,MaxValue, Options)
  when is_integer(Id),is_integer(Value),is_integer(MinValue),is_integer(MaxValue),is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -104,15 +112,21 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Id,Value,MinValue,MaxValue, Options)
   wxe_util:construct(?wxSlider_new_6,
   <<ParentRef:32/?UI,Id:32/?UI,Value:32/?UI,MinValue:32/?UI,MaxValue:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxSlider(), Parent::wxWindow:wxWindow(), Id::integer(), Value::integer(), MinValue::integer(), MaxValue::integer()) -> bool()
 %% @equiv create(This,Parent,Id,Value,MinValue,MaxValue, [])
+-spec create(This, Parent, Id, Value, MinValue, MaxValue) -> boolean() when
+	This::wxSlider(), Parent::wxWindow:wxWindow(), Id::integer(), Value::integer(), MinValue::integer(), MaxValue::integer().
+
 create(This,Parent,Id,Value,MinValue,MaxValue)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id),is_integer(Value),is_integer(MinValue),is_integer(MaxValue) ->
   create(This,Parent,Id,Value,MinValue,MaxValue, []).
 
-%% @spec (This::wxSlider(), Parent::wxWindow:wxWindow(), Id::integer(), Value::integer(), MinValue::integer(), MaxValue::integer(), [Option]) -> bool()
-%% Option = {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()} | {validator, wx:wx()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxslider.html#wxslidercreate">external documentation</a>.
+-spec create(This, Parent, Id, Value, MinValue, MaxValue, [Option]) -> boolean() when
+	This::wxSlider(), Parent::wxWindow:wxWindow(), Id::integer(), Value::integer(), MinValue::integer(), MaxValue::integer(),
+	Option :: {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}
+		 | {validator, wx:wx()}.
 create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id,Value,MinValue,MaxValue, Options)
  when is_integer(Id),is_integer(Value),is_integer(MinValue),is_integer(MaxValue),is_list(Options) ->
   ?CLASS(ThisT,wxSlider),
@@ -126,90 +140,101 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id,Va
   wxe_util:call(?wxSlider_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI,Id:32/?UI,Value:32/?UI,MinValue:32/?UI,MaxValue:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxSlider()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxslider.html#wxslidergetlinesize">external documentation</a>.
+-spec getLineSize(This) -> integer() when
+	This::wxSlider().
 getLineSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSlider),
   wxe_util:call(?wxSlider_GetLineSize,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSlider()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxslider.html#wxslidergetmax">external documentation</a>.
+-spec getMax(This) -> integer() when
+	This::wxSlider().
 getMax(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSlider),
   wxe_util:call(?wxSlider_GetMax,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSlider()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxslider.html#wxslidergetmin">external documentation</a>.
+-spec getMin(This) -> integer() when
+	This::wxSlider().
 getMin(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSlider),
   wxe_util:call(?wxSlider_GetMin,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSlider()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxslider.html#wxslidergetpagesize">external documentation</a>.
+-spec getPageSize(This) -> integer() when
+	This::wxSlider().
 getPageSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSlider),
   wxe_util:call(?wxSlider_GetPageSize,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSlider()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxslider.html#wxslidergetthumblength">external documentation</a>.
+-spec getThumbLength(This) -> integer() when
+	This::wxSlider().
 getThumbLength(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSlider),
   wxe_util:call(?wxSlider_GetThumbLength,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSlider()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxslider.html#wxslidergetvalue">external documentation</a>.
+-spec getValue(This) -> integer() when
+	This::wxSlider().
 getValue(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSlider),
   wxe_util:call(?wxSlider_GetValue,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSlider(), LineSize::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxslider.html#wxslidersetlinesize">external documentation</a>.
+-spec setLineSize(This, LineSize) -> ok when
+	This::wxSlider(), LineSize::integer().
 setLineSize(#wx_ref{type=ThisT,ref=ThisRef},LineSize)
  when is_integer(LineSize) ->
   ?CLASS(ThisT,wxSlider),
   wxe_util:cast(?wxSlider_SetLineSize,
   <<ThisRef:32/?UI,LineSize:32/?UI>>).
 
-%% @spec (This::wxSlider(), PageSize::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxslider.html#wxslidersetpagesize">external documentation</a>.
+-spec setPageSize(This, PageSize) -> ok when
+	This::wxSlider(), PageSize::integer().
 setPageSize(#wx_ref{type=ThisT,ref=ThisRef},PageSize)
  when is_integer(PageSize) ->
   ?CLASS(ThisT,wxSlider),
   wxe_util:cast(?wxSlider_SetPageSize,
   <<ThisRef:32/?UI,PageSize:32/?UI>>).
 
-%% @spec (This::wxSlider(), MinValue::integer(), MaxValue::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxslider.html#wxslidersetrange">external documentation</a>.
+-spec setRange(This, MinValue, MaxValue) -> ok when
+	This::wxSlider(), MinValue::integer(), MaxValue::integer().
 setRange(#wx_ref{type=ThisT,ref=ThisRef},MinValue,MaxValue)
  when is_integer(MinValue),is_integer(MaxValue) ->
   ?CLASS(ThisT,wxSlider),
   wxe_util:cast(?wxSlider_SetRange,
   <<ThisRef:32/?UI,MinValue:32/?UI,MaxValue:32/?UI>>).
 
-%% @spec (This::wxSlider(), LenPixels::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxslider.html#wxslidersetthumblength">external documentation</a>.
+-spec setThumbLength(This, LenPixels) -> ok when
+	This::wxSlider(), LenPixels::integer().
 setThumbLength(#wx_ref{type=ThisT,ref=ThisRef},LenPixels)
  when is_integer(LenPixels) ->
   ?CLASS(ThisT,wxSlider),
   wxe_util:cast(?wxSlider_SetThumbLength,
   <<ThisRef:32/?UI,LenPixels:32/?UI>>).
 
-%% @spec (This::wxSlider(), Value::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxslider.html#wxslidersetvalue">external documentation</a>.
+-spec setValue(This, Value) -> ok when
+	This::wxSlider(), Value::integer().
 setValue(#wx_ref{type=ThisT,ref=ThisRef},Value)
  when is_integer(Value) ->
   ?CLASS(ThisT,wxSlider),
   wxe_util:cast(?wxSlider_SetValue,
   <<ThisRef:32/?UI,Value:32/?UI>>).
 
-%% @spec (This::wxSlider()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxSlider) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxSlider),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxSpinButton.erl b/lib/wx/src/gen/wxSpinButton.erl
index e269dbe329..0e987a0f09 100644
--- a/lib/wx/src/gen/wxSpinButton.erl
+++ b/lib/wx/src/gen/wxSpinButton.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -70,27 +70,35 @@
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
 
+-export_type([wxSpinButton/0]).
 %% @hidden
 parent_class(wxControl) -> true;
 parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxSpinButton()
+-type wxSpinButton() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxspinbutton.html#wxspinbuttonwxspinbutton">external documentation</a>.
+-spec new() -> wxSpinButton().
 new() ->
   wxe_util:construct(?wxSpinButton_new_0,
   <<>>).
 
-%% @spec (Parent::wxWindow:wxWindow()) -> wxSpinButton()
 %% @equiv new(Parent, [])
+-spec new(Parent) -> wxSpinButton() when
+	Parent::wxWindow:wxWindow().
+
 new(Parent)
  when is_record(Parent, wx_ref) ->
   new(Parent, []).
 
-%% @spec (Parent::wxWindow:wxWindow(), [Option]) -> wxSpinButton()
-%% Option = {id, integer()} | {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxspinbutton.html#wxspinbuttonwxspinbutton">external documentation</a>.
+-spec new(Parent, [Option]) -> wxSpinButton() when
+	Parent::wxWindow:wxWindow(),
+	Option :: {id, integer()}
+		 | {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}.
 new(#wx_ref{type=ParentT,ref=ParentRef}, Options)
  when is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -103,15 +111,21 @@ new(#wx_ref{type=ParentT,ref=ParentRef}, Options)
   wxe_util:construct(?wxSpinButton_new_2,
   <<ParentRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxSpinButton(), Parent::wxWindow:wxWindow()) -> bool()
 %% @equiv create(This,Parent, [])
+-spec create(This, Parent) -> boolean() when
+	This::wxSpinButton(), Parent::wxWindow:wxWindow().
+
 create(This,Parent)
  when is_record(This, wx_ref),is_record(Parent, wx_ref) ->
   create(This,Parent, []).
 
-%% @spec (This::wxSpinButton(), Parent::wxWindow:wxWindow(), [Option]) -> bool()
-%% Option = {id, integer()} | {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxspinbutton.html#wxspinbuttoncreate">external documentation</a>.
+-spec create(This, Parent, [Option]) -> boolean() when
+	This::wxSpinButton(), Parent::wxWindow:wxWindow(),
+	Option :: {id, integer()}
+		 | {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}.
 create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxSpinButton),
@@ -125,45 +139,50 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef}, Opti
   wxe_util:call(?wxSpinButton_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxSpinButton()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxspinbutton.html#wxspinbuttongetmax">external documentation</a>.
+-spec getMax(This) -> integer() when
+	This::wxSpinButton().
 getMax(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSpinButton),
   wxe_util:call(?wxSpinButton_GetMax,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSpinButton()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxspinbutton.html#wxspinbuttongetmin">external documentation</a>.
+-spec getMin(This) -> integer() when
+	This::wxSpinButton().
 getMin(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSpinButton),
   wxe_util:call(?wxSpinButton_GetMin,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSpinButton()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxspinbutton.html#wxspinbuttongetvalue">external documentation</a>.
+-spec getValue(This) -> integer() when
+	This::wxSpinButton().
 getValue(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSpinButton),
   wxe_util:call(?wxSpinButton_GetValue,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSpinButton(), MinVal::integer(), MaxVal::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxspinbutton.html#wxspinbuttonsetrange">external documentation</a>.
+-spec setRange(This, MinVal, MaxVal) -> ok when
+	This::wxSpinButton(), MinVal::integer(), MaxVal::integer().
 setRange(#wx_ref{type=ThisT,ref=ThisRef},MinVal,MaxVal)
  when is_integer(MinVal),is_integer(MaxVal) ->
   ?CLASS(ThisT,wxSpinButton),
   wxe_util:cast(?wxSpinButton_SetRange,
   <<ThisRef:32/?UI,MinVal:32/?UI,MaxVal:32/?UI>>).
 
-%% @spec (This::wxSpinButton(), Value::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxspinbutton.html#wxspinbuttonsetvalue">external documentation</a>.
+-spec setValue(This, Value) -> ok when
+	This::wxSpinButton(), Value::integer().
 setValue(#wx_ref{type=ThisT,ref=ThisRef},Value)
  when is_integer(Value) ->
   ?CLASS(ThisT,wxSpinButton),
   wxe_util:cast(?wxSpinButton_SetValue,
   <<ThisRef:32/?UI,Value:32/?UI>>).
 
-%% @spec (This::wxSpinButton()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxSpinButton) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxSpinButton),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxSpinCtrl.erl b/lib/wx/src/gen/wxSpinCtrl.erl
index c6e8ad2238..5de7619b34 100644
--- a/lib/wx/src/gen/wxSpinCtrl.erl
+++ b/lib/wx/src/gen/wxSpinCtrl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -70,27 +70,39 @@
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
 
+-export_type([wxSpinCtrl/0]).
 %% @hidden
 parent_class(wxControl) -> true;
 parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxSpinCtrl()
+-type wxSpinCtrl() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxspinctrl.html#wxspinctrlwxspinctrl">external documentation</a>.
+-spec new() -> wxSpinCtrl().
 new() ->
   wxe_util:construct(?wxSpinCtrl_new_0,
   <<>>).
 
-%% @spec (Parent::wxWindow:wxWindow()) -> wxSpinCtrl()
 %% @equiv new(Parent, [])
+-spec new(Parent) -> wxSpinCtrl() when
+	Parent::wxWindow:wxWindow().
+
 new(Parent)
  when is_record(Parent, wx_ref) ->
   new(Parent, []).
 
-%% @spec (Parent::wxWindow:wxWindow(), [Option]) -> wxSpinCtrl()
-%% Option = {id, integer()} | {value, string()} | {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()} | {min, integer()} | {max, integer()} | {initial, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxspinctrl.html#wxspinctrlwxspinctrl">external documentation</a>.
+-spec new(Parent, [Option]) -> wxSpinCtrl() when
+	Parent::wxWindow:wxWindow(),
+	Option :: {id, integer()}
+		 | {value, string()}
+		 | {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}
+		 | {min, integer()}
+		 | {max, integer()}
+		 | {initial, integer()}.
 new(#wx_ref{type=ParentT,ref=ParentRef}, Options)
  when is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -107,15 +119,25 @@ new(#wx_ref{type=ParentT,ref=ParentRef}, Options)
   wxe_util:construct(?wxSpinCtrl_new_2,
   <<ParentRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxSpinCtrl(), Parent::wxWindow:wxWindow()) -> bool()
 %% @equiv create(This,Parent, [])
+-spec create(This, Parent) -> boolean() when
+	This::wxSpinCtrl(), Parent::wxWindow:wxWindow().
+
 create(This,Parent)
  when is_record(This, wx_ref),is_record(Parent, wx_ref) ->
   create(This,Parent, []).
 
-%% @spec (This::wxSpinCtrl(), Parent::wxWindow:wxWindow(), [Option]) -> bool()
-%% Option = {id, integer()} | {value, string()} | {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()} | {min, integer()} | {max, integer()} | {initial, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxspinctrl.html#wxspinctrlcreate">external documentation</a>.
+-spec create(This, Parent, [Option]) -> boolean() when
+	This::wxSpinCtrl(), Parent::wxWindow:wxWindow(),
+	Option :: {id, integer()}
+		 | {value, string()}
+		 | {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}
+		 | {min, integer()}
+		 | {max, integer()}
+		 | {initial, integer()}.
 create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxSpinCtrl),
@@ -133,15 +155,11 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef}, Opti
   wxe_util:call(?wxSpinCtrl_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxSpinCtrl(),X::integer()|string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxspinctrl.html#wxspinctrlsetvalue">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% setValue(This::wxSpinCtrl(), Value::integer()) -> ok </c>
-%% </p>
-%% <p><c>
-%% setValue(This::wxSpinCtrl(), Text::string()) -> ok </c>
-%% </p>
+-spec setValue(This, Value) -> ok when
+	This::wxSpinCtrl(), Value::integer();
+      (This, Text) -> ok when
+	This::wxSpinCtrl(), Text::string().
 setValue(#wx_ref{type=ThisT,ref=ThisRef},Value)
  when is_integer(Value) ->
   ?CLASS(ThisT,wxSpinCtrl),
@@ -154,45 +172,50 @@ setValue(#wx_ref{type=ThisT,ref=ThisRef},Text)
   wxe_util:cast(?wxSpinCtrl_SetValue_1_1,
   <<ThisRef:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxSpinCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxspinctrl.html#wxspinctrlgetvalue">external documentation</a>.
+-spec getValue(This) -> integer() when
+	This::wxSpinCtrl().
 getValue(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSpinCtrl),
   wxe_util:call(?wxSpinCtrl_GetValue,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSpinCtrl(), MinVal::integer(), MaxVal::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxspinctrl.html#wxspinctrlsetrange">external documentation</a>.
+-spec setRange(This, MinVal, MaxVal) -> ok when
+	This::wxSpinCtrl(), MinVal::integer(), MaxVal::integer().
 setRange(#wx_ref{type=ThisT,ref=ThisRef},MinVal,MaxVal)
  when is_integer(MinVal),is_integer(MaxVal) ->
   ?CLASS(ThisT,wxSpinCtrl),
   wxe_util:cast(?wxSpinCtrl_SetRange,
   <<ThisRef:32/?UI,MinVal:32/?UI,MaxVal:32/?UI>>).
 
-%% @spec (This::wxSpinCtrl(), From::integer(), To::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxspinctrl.html#wxspinctrlsetselection">external documentation</a>.
+-spec setSelection(This, From, To) -> ok when
+	This::wxSpinCtrl(), From::integer(), To::integer().
 setSelection(#wx_ref{type=ThisT,ref=ThisRef},From,To)
  when is_integer(From),is_integer(To) ->
   ?CLASS(ThisT,wxSpinCtrl),
   wxe_util:cast(?wxSpinCtrl_SetSelection,
   <<ThisRef:32/?UI,From:32/?UI,To:32/?UI>>).
 
-%% @spec (This::wxSpinCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxspinctrl.html#wxspinctrlgetmin">external documentation</a>.
+-spec getMin(This) -> integer() when
+	This::wxSpinCtrl().
 getMin(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSpinCtrl),
   wxe_util:call(?wxSpinCtrl_GetMin,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSpinCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxspinctrl.html#wxspinctrlgetmax">external documentation</a>.
+-spec getMax(This) -> integer() when
+	This::wxSpinCtrl().
 getMax(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSpinCtrl),
   wxe_util:call(?wxSpinCtrl_GetMax,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSpinCtrl()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxSpinCtrl) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxSpinCtrl),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxSpinEvent.erl b/lib/wx/src/gen/wxSpinEvent.erl
index 82edc70983..ecbe557c7b 100644
--- a/lib/wx/src/gen/wxSpinEvent.erl
+++ b/lib/wx/src/gen/wxSpinEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2012. 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
@@ -41,21 +41,25 @@
   isSelection/1,parent_class/1,resumePropagation/2,setInt/2,setString/2,
   shouldPropagate/1,skip/1,skip/2,stopPropagation/1,veto/1]).
 
+-export_type([wxSpinEvent/0]).
 %% @hidden
 parent_class(wxNotifyEvent) -> true;
 parent_class(wxCommandEvent) -> true;
 parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (This::wxSpinEvent()) -> integer()
+-type wxSpinEvent() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxspinevent.html#wxspineventgetposition">external documentation</a>.
+-spec getPosition(This) -> integer() when
+	This::wxSpinEvent().
 getPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSpinEvent),
   wxe_util:call(?wxSpinEvent_GetPosition,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSpinEvent(), Pos::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxspinevent.html#wxspineventsetposition">external documentation</a>.
+-spec setPosition(This, Pos) -> ok when
+	This::wxSpinEvent(), Pos::integer().
 setPosition(#wx_ref{type=ThisT,ref=ThisRef},Pos)
  when is_integer(Pos) ->
   ?CLASS(ThisT,wxSpinEvent),
diff --git a/lib/wx/src/gen/wxSplashScreen.erl b/lib/wx/src/gen/wxSplashScreen.erl
index 79ef8e413a..e6755690e0 100644
--- a/lib/wx/src/gen/wxSplashScreen.erl
+++ b/lib/wx/src/gen/wxSplashScreen.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -80,6 +80,7 @@
   transferDataToWindow/1,update/1,updateWindowUI/1,updateWindowUI/2,
   validate/1,warpPointer/3]).
 
+-export_type([wxSplashScreen/0]).
 %% @hidden
 parent_class(wxFrame) -> true;
 parent_class(wxTopLevelWindow) -> true;
@@ -87,21 +88,27 @@ parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxSplashScreen()
+-type wxSplashScreen() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplashscreen.html#wxsplashscreenwxsplashscreen">external documentation</a>.
+-spec new() -> wxSplashScreen().
 new() ->
   wxe_util:construct(?wxSplashScreen_new_0,
   <<>>).
 
-%% @spec (Bitmap::wxBitmap:wxBitmap(), SplashStyle::integer(), Milliseconds::integer(), Parent::wxWindow:wxWindow(), Id::integer()) -> wxSplashScreen()
 %% @equiv new(Bitmap,SplashStyle,Milliseconds,Parent,Id, [])
+-spec new(Bitmap, SplashStyle, Milliseconds, Parent, Id) -> wxSplashScreen() when
+	Bitmap::wxBitmap:wxBitmap(), SplashStyle::integer(), Milliseconds::integer(), Parent::wxWindow:wxWindow(), Id::integer().
+
 new(Bitmap,SplashStyle,Milliseconds,Parent,Id)
  when is_record(Bitmap, wx_ref),is_integer(SplashStyle),is_integer(Milliseconds),is_record(Parent, wx_ref),is_integer(Id) ->
   new(Bitmap,SplashStyle,Milliseconds,Parent,Id, []).
 
-%% @spec (Bitmap::wxBitmap:wxBitmap(), SplashStyle::integer(), Milliseconds::integer(), Parent::wxWindow:wxWindow(), Id::integer(), [Option]) -> wxSplashScreen()
-%% Option = {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplashscreen.html#wxsplashscreenwxsplashscreen">external documentation</a>.
+-spec new(Bitmap, SplashStyle, Milliseconds, Parent, Id, [Option]) -> wxSplashScreen() when
+	Bitmap::wxBitmap:wxBitmap(), SplashStyle::integer(), Milliseconds::integer(), Parent::wxWindow:wxWindow(), Id::integer(),
+	Option :: {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}.
 new(#wx_ref{type=BitmapT,ref=BitmapRef},SplashStyle,Milliseconds,#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
  when is_integer(SplashStyle),is_integer(Milliseconds),is_integer(Id),is_list(Options) ->
   ?CLASS(BitmapT,wxBitmap),
@@ -114,22 +121,24 @@ new(#wx_ref{type=BitmapT,ref=BitmapRef},SplashStyle,Milliseconds,#wx_ref{type=Pa
   wxe_util:construct(?wxSplashScreen_new_6,
   <<BitmapRef:32/?UI,SplashStyle:32/?UI,Milliseconds:32/?UI,ParentRef:32/?UI,Id:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxSplashScreen()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplashscreen.html#wxsplashscreengetsplashstyle">external documentation</a>.
+-spec getSplashStyle(This) -> integer() when
+	This::wxSplashScreen().
 getSplashStyle(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSplashScreen),
   wxe_util:call(?wxSplashScreen_GetSplashStyle,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSplashScreen()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplashscreen.html#wxsplashscreengettimeout">external documentation</a>.
+-spec getTimeout(This) -> integer() when
+	This::wxSplashScreen().
 getTimeout(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSplashScreen),
   wxe_util:call(?wxSplashScreen_GetTimeout,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSplashScreen()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxSplashScreen) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxSplashScreen),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxSplitterEvent.erl b/lib/wx/src/gen/wxSplitterEvent.erl
index 512f858284..bba9b13abd 100644
--- a/lib/wx/src/gen/wxSplitterEvent.erl
+++ b/lib/wx/src/gen/wxSplitterEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2012. 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
@@ -41,42 +41,49 @@
   isSelection/1,parent_class/1,resumePropagation/2,setInt/2,setString/2,
   shouldPropagate/1,skip/1,skip/2,stopPropagation/1,veto/1]).
 
+-export_type([wxSplitterEvent/0]).
 %% @hidden
 parent_class(wxNotifyEvent) -> true;
 parent_class(wxCommandEvent) -> true;
 parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (This::wxSplitterEvent()) -> integer()
+-type wxSplitterEvent() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplitterevent.html#wxsplittereventgetsashposition">external documentation</a>.
+-spec getSashPosition(This) -> integer() when
+	This::wxSplitterEvent().
 getSashPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSplitterEvent),
   wxe_util:call(?wxSplitterEvent_GetSashPosition,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSplitterEvent()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplitterevent.html#wxsplittereventgetx">external documentation</a>.
+-spec getX(This) -> integer() when
+	This::wxSplitterEvent().
 getX(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSplitterEvent),
   wxe_util:call(?wxSplitterEvent_GetX,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSplitterEvent()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplitterevent.html#wxsplittereventgety">external documentation</a>.
+-spec getY(This) -> integer() when
+	This::wxSplitterEvent().
 getY(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSplitterEvent),
   wxe_util:call(?wxSplitterEvent_GetY,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSplitterEvent()) -> wxWindow:wxWindow()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplitterevent.html#wxsplittereventgetwindowbeingremoved">external documentation</a>.
+-spec getWindowBeingRemoved(This) -> wxWindow:wxWindow() when
+	This::wxSplitterEvent().
 getWindowBeingRemoved(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSplitterEvent),
   wxe_util:call(?wxSplitterEvent_GetWindowBeingRemoved,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSplitterEvent(), Pos::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplitterevent.html#wxsplittereventsetsashposition">external documentation</a>.
+-spec setSashPosition(This, Pos) -> ok when
+	This::wxSplitterEvent(), Pos::integer().
 setSashPosition(#wx_ref{type=ThisT,ref=ThisRef},Pos)
  when is_integer(Pos) ->
   ?CLASS(ThisT,wxSplitterEvent),
diff --git a/lib/wx/src/gen/wxSplitterWindow.erl b/lib/wx/src/gen/wxSplitterWindow.erl
index b17fed3151..37ef11fc9c 100644
--- a/lib/wx/src/gen/wxSplitterWindow.erl
+++ b/lib/wx/src/gen/wxSplitterWindow.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2012. 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
@@ -73,26 +73,34 @@
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
 
+-export_type([wxSplitterWindow/0]).
 %% @hidden
 parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxSplitterWindow()
+-type wxSplitterWindow() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplitterwindow.html#wxsplitterwindowwxsplitterwindow">external documentation</a>.
+-spec new() -> wxSplitterWindow().
 new() ->
   wxe_util:construct(?wxSplitterWindow_new_0,
   <<>>).
 
-%% @spec (Parent::wxWindow:wxWindow()) -> wxSplitterWindow()
 %% @equiv new(Parent, [])
+-spec new(Parent) -> wxSplitterWindow() when
+	Parent::wxWindow:wxWindow().
+
 new(Parent)
  when is_record(Parent, wx_ref) ->
   new(Parent, []).
 
-%% @spec (Parent::wxWindow:wxWindow(), [Option]) -> wxSplitterWindow()
-%% Option = {id, integer()} | {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplitterwindow.html#wxsplitterwindowwxsplitterwindow">external documentation</a>.
+-spec new(Parent, [Option]) -> wxSplitterWindow() when
+	Parent::wxWindow:wxWindow(),
+	Option :: {id, integer()}
+		 | {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}.
 new(#wx_ref{type=ParentT,ref=ParentRef}, Options)
  when is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -105,15 +113,21 @@ new(#wx_ref{type=ParentT,ref=ParentRef}, Options)
   wxe_util:construct(?wxSplitterWindow_new_2,
   <<ParentRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxSplitterWindow(), Parent::wxWindow:wxWindow()) -> bool()
 %% @equiv create(This,Parent, [])
+-spec create(This, Parent) -> boolean() when
+	This::wxSplitterWindow(), Parent::wxWindow:wxWindow().
+
 create(This,Parent)
  when is_record(This, wx_ref),is_record(Parent, wx_ref) ->
   create(This,Parent, []).
 
-%% @spec (This::wxSplitterWindow(), Parent::wxWindow:wxWindow(), [Option]) -> bool()
-%% Option = {id, integer()} | {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplitterwindow.html#wxsplitterwindowcreate">external documentation</a>.
+-spec create(This, Parent, [Option]) -> boolean() when
+	This::wxSplitterWindow(), Parent::wxWindow:wxWindow(),
+	Option :: {id, integer()}
+		 | {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}.
 create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxSplitterWindow),
@@ -127,67 +141,75 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef}, Opti
   wxe_util:call(?wxSplitterWindow_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxSplitterWindow()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplitterwindow.html#wxsplitterwindowgetminimumpanesize">external documentation</a>.
+-spec getMinimumPaneSize(This) -> integer() when
+	This::wxSplitterWindow().
 getMinimumPaneSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSplitterWindow),
   wxe_util:call(?wxSplitterWindow_GetMinimumPaneSize,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSplitterWindow()) -> float()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplitterwindow.html#wxsplitterwindowgetsashgravity">external documentation</a>.
+-spec getSashGravity(This) -> float() when
+	This::wxSplitterWindow().
 getSashGravity(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSplitterWindow),
   wxe_util:call(?wxSplitterWindow_GetSashGravity,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSplitterWindow()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplitterwindow.html#wxsplitterwindowgetsashposition">external documentation</a>.
+-spec getSashPosition(This) -> integer() when
+	This::wxSplitterWindow().
 getSashPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSplitterWindow),
   wxe_util:call(?wxSplitterWindow_GetSashPosition,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSplitterWindow()) -> WxSplitMode
-%% WxSplitMode = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplitterwindow.html#wxsplitterwindowgetsplitmode">external documentation</a>.
-%%<br /> WxSplitMode is one of ?wxSPLIT_HORIZONTAL | ?wxSPLIT_VERTICAL
+%%<br /> Res = ?wxSPLIT_HORIZONTAL | ?wxSPLIT_VERTICAL
+-spec getSplitMode(This) -> wx:wx_enum() when
+	This::wxSplitterWindow().
 getSplitMode(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSplitterWindow),
   wxe_util:call(?wxSplitterWindow_GetSplitMode,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSplitterWindow()) -> wxWindow:wxWindow()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplitterwindow.html#wxsplitterwindowgetwindow1">external documentation</a>.
+-spec getWindow1(This) -> wxWindow:wxWindow() when
+	This::wxSplitterWindow().
 getWindow1(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSplitterWindow),
   wxe_util:call(?wxSplitterWindow_GetWindow1,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSplitterWindow()) -> wxWindow:wxWindow()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplitterwindow.html#wxsplitterwindowgetwindow2">external documentation</a>.
+-spec getWindow2(This) -> wxWindow:wxWindow() when
+	This::wxSplitterWindow().
 getWindow2(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSplitterWindow),
   wxe_util:call(?wxSplitterWindow_GetWindow2,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSplitterWindow(), Window::wxWindow:wxWindow()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplitterwindow.html#wxsplitterwindowinitialize">external documentation</a>.
+-spec initialize(This, Window) -> ok when
+	This::wxSplitterWindow(), Window::wxWindow:wxWindow().
 initialize(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef}) ->
   ?CLASS(ThisT,wxSplitterWindow),
   ?CLASS(WindowT,wxWindow),
   wxe_util:cast(?wxSplitterWindow_Initialize,
   <<ThisRef:32/?UI,WindowRef:32/?UI>>).
 
-%% @spec (This::wxSplitterWindow()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplitterwindow.html#wxsplitterwindowissplit">external documentation</a>.
+-spec isSplit(This) -> boolean() when
+	This::wxSplitterWindow().
 isSplit(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSplitterWindow),
   wxe_util:call(?wxSplitterWindow_IsSplit,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSplitterWindow(), WinOld::wxWindow:wxWindow(), WinNew::wxWindow:wxWindow()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplitterwindow.html#wxsplitterwindowreplacewindow">external documentation</a>.
+-spec replaceWindow(This, WinOld, WinNew) -> boolean() when
+	This::wxSplitterWindow(), WinOld::wxWindow:wxWindow(), WinNew::wxWindow:wxWindow().
 replaceWindow(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WinOldT,ref=WinOldRef},#wx_ref{type=WinNewT,ref=WinNewRef}) ->
   ?CLASS(ThisT,wxSplitterWindow),
   ?CLASS(WinOldT,wxWindow),
@@ -195,23 +217,27 @@ replaceWindow(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WinOldT,ref=WinOldRef
   wxe_util:call(?wxSplitterWindow_ReplaceWindow,
   <<ThisRef:32/?UI,WinOldRef:32/?UI,WinNewRef:32/?UI>>).
 
-%% @spec (This::wxSplitterWindow(), Gravity::float()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplitterwindow.html#wxsplitterwindowsetsashgravity">external documentation</a>.
+-spec setSashGravity(This, Gravity) -> ok when
+	This::wxSplitterWindow(), Gravity::float().
 setSashGravity(#wx_ref{type=ThisT,ref=ThisRef},Gravity)
  when is_float(Gravity) ->
   ?CLASS(ThisT,wxSplitterWindow),
   wxe_util:cast(?wxSplitterWindow_SetSashGravity,
   <<ThisRef:32/?UI,0:32,Gravity:64/?F>>).
 
-%% @spec (This::wxSplitterWindow(), Position::integer()) -> ok
 %% @equiv setSashPosition(This,Position, [])
+-spec setSashPosition(This, Position) -> ok when
+	This::wxSplitterWindow(), Position::integer().
+
 setSashPosition(This,Position)
  when is_record(This, wx_ref),is_integer(Position) ->
   setSashPosition(This,Position, []).
 
-%% @spec (This::wxSplitterWindow(), Position::integer(), [Option]) -> ok
-%% Option = {redraw, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplitterwindow.html#wxsplitterwindowsetsashposition">external documentation</a>.
+-spec setSashPosition(This, Position, [Option]) -> ok when
+	This::wxSplitterWindow(), Position::integer(),
+	Option :: {redraw, boolean()}.
 setSashPosition(#wx_ref{type=ThisT,ref=ThisRef},Position, Options)
  when is_integer(Position),is_list(Options) ->
   ?CLASS(ThisT,wxSplitterWindow),
@@ -221,39 +247,45 @@ setSashPosition(#wx_ref{type=ThisT,ref=ThisRef},Position, Options)
   wxe_util:cast(?wxSplitterWindow_SetSashPosition,
   <<ThisRef:32/?UI,Position:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxSplitterWindow(), Width::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplitterwindow.html#wxsplitterwindowsetsashsize">external documentation</a>.
+-spec setSashSize(This, Width) -> ok when
+	This::wxSplitterWindow(), Width::integer().
 setSashSize(#wx_ref{type=ThisT,ref=ThisRef},Width)
  when is_integer(Width) ->
   ?CLASS(ThisT,wxSplitterWindow),
   wxe_util:cast(?wxSplitterWindow_SetSashSize,
   <<ThisRef:32/?UI,Width:32/?UI>>).
 
-%% @spec (This::wxSplitterWindow(), Min::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplitterwindow.html#wxsplitterwindowsetminimumpanesize">external documentation</a>.
+-spec setMinimumPaneSize(This, Min) -> ok when
+	This::wxSplitterWindow(), Min::integer().
 setMinimumPaneSize(#wx_ref{type=ThisT,ref=ThisRef},Min)
  when is_integer(Min) ->
   ?CLASS(ThisT,wxSplitterWindow),
   wxe_util:cast(?wxSplitterWindow_SetMinimumPaneSize,
   <<ThisRef:32/?UI,Min:32/?UI>>).
 
-%% @spec (This::wxSplitterWindow(), Mode::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplitterwindow.html#wxsplitterwindowsetsplitmode">external documentation</a>.
+-spec setSplitMode(This, Mode) -> ok when
+	This::wxSplitterWindow(), Mode::integer().
 setSplitMode(#wx_ref{type=ThisT,ref=ThisRef},Mode)
  when is_integer(Mode) ->
   ?CLASS(ThisT,wxSplitterWindow),
   wxe_util:cast(?wxSplitterWindow_SetSplitMode,
   <<ThisRef:32/?UI,Mode:32/?UI>>).
 
-%% @spec (This::wxSplitterWindow(), Window1::wxWindow:wxWindow(), Window2::wxWindow:wxWindow()) -> bool()
 %% @equiv splitHorizontally(This,Window1,Window2, [])
+-spec splitHorizontally(This, Window1, Window2) -> boolean() when
+	This::wxSplitterWindow(), Window1::wxWindow:wxWindow(), Window2::wxWindow:wxWindow().
+
 splitHorizontally(This,Window1,Window2)
  when is_record(This, wx_ref),is_record(Window1, wx_ref),is_record(Window2, wx_ref) ->
   splitHorizontally(This,Window1,Window2, []).
 
-%% @spec (This::wxSplitterWindow(), Window1::wxWindow:wxWindow(), Window2::wxWindow:wxWindow(), [Option]) -> bool()
-%% Option = {sashPosition, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplitterwindow.html#wxsplitterwindowsplithorizontally">external documentation</a>.
+-spec splitHorizontally(This, Window1, Window2, [Option]) -> boolean() when
+	This::wxSplitterWindow(), Window1::wxWindow:wxWindow(), Window2::wxWindow:wxWindow(),
+	Option :: {sashPosition, integer()}.
 splitHorizontally(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=Window1T,ref=Window1Ref},#wx_ref{type=Window2T,ref=Window2Ref}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxSplitterWindow),
@@ -265,15 +297,18 @@ splitHorizontally(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=Window1T,ref=Wind
   wxe_util:call(?wxSplitterWindow_SplitHorizontally,
   <<ThisRef:32/?UI,Window1Ref:32/?UI,Window2Ref:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxSplitterWindow(), Window1::wxWindow:wxWindow(), Window2::wxWindow:wxWindow()) -> bool()
 %% @equiv splitVertically(This,Window1,Window2, [])
+-spec splitVertically(This, Window1, Window2) -> boolean() when
+	This::wxSplitterWindow(), Window1::wxWindow:wxWindow(), Window2::wxWindow:wxWindow().
+
 splitVertically(This,Window1,Window2)
  when is_record(This, wx_ref),is_record(Window1, wx_ref),is_record(Window2, wx_ref) ->
   splitVertically(This,Window1,Window2, []).
 
-%% @spec (This::wxSplitterWindow(), Window1::wxWindow:wxWindow(), Window2::wxWindow:wxWindow(), [Option]) -> bool()
-%% Option = {sashPosition, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplitterwindow.html#wxsplitterwindowsplitvertically">external documentation</a>.
+-spec splitVertically(This, Window1, Window2, [Option]) -> boolean() when
+	This::wxSplitterWindow(), Window1::wxWindow:wxWindow(), Window2::wxWindow:wxWindow(),
+	Option :: {sashPosition, integer()}.
 splitVertically(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=Window1T,ref=Window1Ref},#wx_ref{type=Window2T,ref=Window2Ref}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxSplitterWindow),
@@ -285,15 +320,18 @@ splitVertically(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=Window1T,ref=Window
   wxe_util:call(?wxSplitterWindow_SplitVertically,
   <<ThisRef:32/?UI,Window1Ref:32/?UI,Window2Ref:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxSplitterWindow()) -> bool()
 %% @equiv unsplit(This, [])
+-spec unsplit(This) -> boolean() when
+	This::wxSplitterWindow().
+
 unsplit(This)
  when is_record(This, wx_ref) ->
   unsplit(This, []).
 
-%% @spec (This::wxSplitterWindow(), [Option]) -> bool()
-%% Option = {toRemove, wxWindow:wxWindow()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplitterwindow.html#wxsplitterwindowunsplit">external documentation</a>.
+-spec unsplit(This, [Option]) -> boolean() when
+	This::wxSplitterWindow(),
+	Option :: {toRemove, wxWindow:wxWindow()}.
 unsplit(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxSplitterWindow),
@@ -303,15 +341,16 @@ unsplit(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxSplitterWindow_Unsplit,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxSplitterWindow()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplitterwindow.html#wxsplitterwindowupdatesize">external documentation</a>.
+-spec updateSize(This) -> ok when
+	This::wxSplitterWindow().
 updateSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSplitterWindow),
   wxe_util:cast(?wxSplitterWindow_UpdateSize,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSplitterWindow()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxSplitterWindow) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxSplitterWindow),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxStaticBitmap.erl b/lib/wx/src/gen/wxStaticBitmap.erl
index 31e39b3a6c..e16cd7ef21 100644
--- a/lib/wx/src/gen/wxStaticBitmap.erl
+++ b/lib/wx/src/gen/wxStaticBitmap.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -69,27 +69,34 @@
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
 
+-export_type([wxStaticBitmap/0]).
 %% @hidden
 parent_class(wxControl) -> true;
 parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxStaticBitmap()
+-type wxStaticBitmap() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstaticbitmap.html#wxstaticbitmapwxstaticbitmap">external documentation</a>.
+-spec new() -> wxStaticBitmap().
 new() ->
   wxe_util:construct(?wxStaticBitmap_new_0,
   <<>>).
 
-%% @spec (Parent::wxWindow:wxWindow(), Id::integer(), Label::wxBitmap:wxBitmap()) -> wxStaticBitmap()
 %% @equiv new(Parent,Id,Label, [])
+-spec new(Parent, Id, Label) -> wxStaticBitmap() when
+	Parent::wxWindow:wxWindow(), Id::integer(), Label::wxBitmap:wxBitmap().
+
 new(Parent,Id,Label)
  when is_record(Parent, wx_ref),is_integer(Id),is_record(Label, wx_ref) ->
   new(Parent,Id,Label, []).
 
-%% @spec (Parent::wxWindow:wxWindow(), Id::integer(), Label::wxBitmap:wxBitmap(), [Option]) -> wxStaticBitmap()
-%% Option = {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstaticbitmap.html#wxstaticbitmapwxstaticbitmap">external documentation</a>.
+-spec new(Parent, Id, Label, [Option]) -> wxStaticBitmap() when
+	Parent::wxWindow:wxWindow(), Id::integer(), Label::wxBitmap:wxBitmap(),
+	Option :: {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}.
 new(#wx_ref{type=ParentT,ref=ParentRef},Id,#wx_ref{type=LabelT,ref=LabelRef}, Options)
  when is_integer(Id),is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -102,15 +109,20 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Id,#wx_ref{type=LabelT,ref=LabelRef}, Op
   wxe_util:construct(?wxStaticBitmap_new_4,
   <<ParentRef:32/?UI,Id:32/?UI,LabelRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxStaticBitmap(), Parent::wxWindow:wxWindow(), Id::integer(), Label::wxBitmap:wxBitmap()) -> bool()
 %% @equiv create(This,Parent,Id,Label, [])
+-spec create(This, Parent, Id, Label) -> boolean() when
+	This::wxStaticBitmap(), Parent::wxWindow:wxWindow(), Id::integer(), Label::wxBitmap:wxBitmap().
+
 create(This,Parent,Id,Label)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id),is_record(Label, wx_ref) ->
   create(This,Parent,Id,Label, []).
 
-%% @spec (This::wxStaticBitmap(), Parent::wxWindow:wxWindow(), Id::integer(), Label::wxBitmap:wxBitmap(), [Option]) -> bool()
-%% Option = {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstaticbitmap.html#wxstaticbitmapcreate">external documentation</a>.
+-spec create(This, Parent, Id, Label, [Option]) -> boolean() when
+	This::wxStaticBitmap(), Parent::wxWindow:wxWindow(), Id::integer(), Label::wxBitmap:wxBitmap(),
+	Option :: {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}.
 create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id,#wx_ref{type=LabelT,ref=LabelRef}, Options)
  when is_integer(Id),is_list(Options) ->
   ?CLASS(ThisT,wxStaticBitmap),
@@ -124,23 +136,25 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id,#w
   wxe_util:call(?wxStaticBitmap_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI,Id:32/?UI,LabelRef:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxStaticBitmap()) -> wxBitmap:wxBitmap()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstaticbitmap.html#wxstaticbitmapgetbitmap">external documentation</a>.
+-spec getBitmap(This) -> wxBitmap:wxBitmap() when
+	This::wxStaticBitmap().
 getBitmap(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStaticBitmap),
   wxe_util:call(?wxStaticBitmap_GetBitmap,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStaticBitmap(), Bitmap::wxBitmap:wxBitmap()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstaticbitmap.html#wxstaticbitmapsetbitmap">external documentation</a>.
+-spec setBitmap(This, Bitmap) -> ok when
+	This::wxStaticBitmap(), Bitmap::wxBitmap:wxBitmap().
 setBitmap(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BitmapT,ref=BitmapRef}) ->
   ?CLASS(ThisT,wxStaticBitmap),
   ?CLASS(BitmapT,wxBitmap),
   wxe_util:cast(?wxStaticBitmap_SetBitmap,
   <<ThisRef:32/?UI,BitmapRef:32/?UI>>).
 
-%% @spec (This::wxStaticBitmap()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxStaticBitmap) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxStaticBitmap),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxStaticBox.erl b/lib/wx/src/gen/wxStaticBox.erl
index ec83ff5fd9..0b02cb43e4 100644
--- a/lib/wx/src/gen/wxStaticBox.erl
+++ b/lib/wx/src/gen/wxStaticBox.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -69,27 +69,34 @@
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
 
+-export_type([wxStaticBox/0]).
 %% @hidden
 parent_class(wxControl) -> true;
 parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxStaticBox()
+-type wxStaticBox() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstaticbox.html#wxstaticboxwxstaticbox">external documentation</a>.
+-spec new() -> wxStaticBox().
 new() ->
   wxe_util:construct(?wxStaticBox_new_0,
   <<>>).
 
-%% @spec (Parent::wxWindow:wxWindow(), Id::integer(), Label::string()) -> wxStaticBox()
 %% @equiv new(Parent,Id,Label, [])
+-spec new(Parent, Id, Label) -> wxStaticBox() when
+	Parent::wxWindow:wxWindow(), Id::integer(), Label::string().
+
 new(Parent,Id,Label)
  when is_record(Parent, wx_ref),is_integer(Id),is_list(Label) ->
   new(Parent,Id,Label, []).
 
-%% @spec (Parent::wxWindow:wxWindow(), Id::integer(), Label::string(), [Option]) -> wxStaticBox()
-%% Option = {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstaticbox.html#wxstaticboxwxstaticbox">external documentation</a>.
+-spec new(Parent, Id, Label, [Option]) -> wxStaticBox() when
+	Parent::wxWindow:wxWindow(), Id::integer(), Label::string(),
+	Option :: {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}.
 new(#wx_ref{type=ParentT,ref=ParentRef},Id,Label, Options)
  when is_integer(Id),is_list(Label),is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -102,15 +109,20 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Id,Label, Options)
   wxe_util:construct(?wxStaticBox_new_4,
   <<ParentRef:32/?UI,Id:32/?UI,(byte_size(Label_UC)):32/?UI,(Label_UC)/binary, 0:(((8- ((4+byte_size(Label_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxStaticBox(), Parent::wxWindow:wxWindow(), Id::integer(), Label::string()) -> bool()
 %% @equiv create(This,Parent,Id,Label, [])
+-spec create(This, Parent, Id, Label) -> boolean() when
+	This::wxStaticBox(), Parent::wxWindow:wxWindow(), Id::integer(), Label::string().
+
 create(This,Parent,Id,Label)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id),is_list(Label) ->
   create(This,Parent,Id,Label, []).
 
-%% @spec (This::wxStaticBox(), Parent::wxWindow:wxWindow(), Id::integer(), Label::string(), [Option]) -> bool()
-%% Option = {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstaticbox.html#wxstaticboxcreate">external documentation</a>.
+-spec create(This, Parent, Id, Label, [Option]) -> boolean() when
+	This::wxStaticBox(), Parent::wxWindow:wxWindow(), Id::integer(), Label::string(),
+	Option :: {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}.
 create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id,Label, Options)
  when is_integer(Id),is_list(Label),is_list(Options) ->
   ?CLASS(ThisT,wxStaticBox),
@@ -124,8 +136,8 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id,La
   wxe_util:call(?wxStaticBox_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI,Id:32/?UI,(byte_size(Label_UC)):32/?UI,(Label_UC)/binary, 0:(((8- ((0+byte_size(Label_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxStaticBox()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxStaticBox) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxStaticBox),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxStaticBoxSizer.erl b/lib/wx/src/gen/wxStaticBoxSizer.erl
index 2cf9f64325..c73563d4cf 100644
--- a/lib/wx/src/gen/wxStaticBoxSizer.erl
+++ b/lib/wx/src/gen/wxStaticBoxSizer.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -41,19 +41,18 @@
   setItemMinSize/4,setMinSize/2,setMinSize/3,setSizeHints/2,setVirtualSizeHints/2,
   show/2,show/3]).
 
+-export_type([wxStaticBoxSizer/0]).
 %% @hidden
 parent_class(wxBoxSizer) -> true;
 parent_class(wxSizer) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (X::integer()|term(),X::term()|integer()) -> wxStaticBoxSizer()
+-type wxStaticBoxSizer() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstaticboxsizer.html#wxstaticboxsizerwxstaticboxsizer">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% new(Orient::integer(), Win::wxWindow:wxWindow()) -> new(Orient,Win, []) </c></p>
-%% <p><c>
-%% new(Box::wxStaticBox:wxStaticBox(), Orient::integer()) -> wxStaticBoxSizer() </c>
-%% </p>
+-spec new(Orient, Win) -> wxStaticBoxSizer() when
+	Orient::integer(), Win::wxWindow:wxWindow();
+      (Box, Orient) -> wxStaticBoxSizer() when
+	Box::wxStaticBox:wxStaticBox(), Orient::integer().
 
 new(Orient,Win)
  when is_integer(Orient),is_record(Win, wx_ref) ->
@@ -64,9 +63,10 @@ new(#wx_ref{type=BoxT,ref=BoxRef},Orient)
   wxe_util:construct(?wxStaticBoxSizer_new_2,
   <<BoxRef:32/?UI,Orient:32/?UI>>).
 
-%% @spec (Orient::integer(), Win::wxWindow:wxWindow(), [Option]) -> wxStaticBoxSizer()
-%% Option = {label, string()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstaticboxsizer.html#wxstaticboxsizerwxstaticboxsizer">external documentation</a>.
+-spec new(Orient, Win, [Option]) -> wxStaticBoxSizer() when
+	Orient::integer(), Win::wxWindow:wxWindow(),
+	Option :: {label, string()}.
 new(Orient,#wx_ref{type=WinT,ref=WinRef}, Options)
  when is_integer(Orient),is_list(Options) ->
   ?CLASS(WinT,wxWindow),
@@ -76,15 +76,16 @@ new(Orient,#wx_ref{type=WinT,ref=WinRef}, Options)
   wxe_util:construct(?wxStaticBoxSizer_new_3,
   <<Orient:32/?UI,WinRef:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxStaticBoxSizer()) -> wxStaticBox:wxStaticBox()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstaticboxsizer.html#wxstaticboxsizergetstaticbox">external documentation</a>.
+-spec getStaticBox(This) -> wxStaticBox:wxStaticBox() when
+	This::wxStaticBoxSizer().
 getStaticBox(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStaticBoxSizer),
   wxe_util:call(?wxStaticBoxSizer_GetStaticBox,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStaticBoxSizer()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxStaticBoxSizer) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxStaticBoxSizer),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxStaticLine.erl b/lib/wx/src/gen/wxStaticLine.erl
index a850065ba0..6298f449d4 100644
--- a/lib/wx/src/gen/wxStaticLine.erl
+++ b/lib/wx/src/gen/wxStaticLine.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -70,27 +70,35 @@
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
 
+-export_type([wxStaticLine/0]).
 %% @hidden
 parent_class(wxControl) -> true;
 parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxStaticLine()
+-type wxStaticLine() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstaticline.html#wxstaticlinewxstaticline">external documentation</a>.
+-spec new() -> wxStaticLine().
 new() ->
   wxe_util:construct(?wxStaticLine_new_0,
   <<>>).
 
-%% @spec (Parent::wxWindow:wxWindow()) -> wxStaticLine()
 %% @equiv new(Parent, [])
+-spec new(Parent) -> wxStaticLine() when
+	Parent::wxWindow:wxWindow().
+
 new(Parent)
  when is_record(Parent, wx_ref) ->
   new(Parent, []).
 
-%% @spec (Parent::wxWindow:wxWindow(), [Option]) -> wxStaticLine()
-%% Option = {id, integer()} | {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstaticline.html#wxstaticlinewxstaticline">external documentation</a>.
+-spec new(Parent, [Option]) -> wxStaticLine() when
+	Parent::wxWindow:wxWindow(),
+	Option :: {id, integer()}
+		 | {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}.
 new(#wx_ref{type=ParentT,ref=ParentRef}, Options)
  when is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -103,15 +111,21 @@ new(#wx_ref{type=ParentT,ref=ParentRef}, Options)
   wxe_util:construct(?wxStaticLine_new_2,
   <<ParentRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxStaticLine(), Parent::wxWindow:wxWindow()) -> bool()
 %% @equiv create(This,Parent, [])
+-spec create(This, Parent) -> boolean() when
+	This::wxStaticLine(), Parent::wxWindow:wxWindow().
+
 create(This,Parent)
  when is_record(This, wx_ref),is_record(Parent, wx_ref) ->
   create(This,Parent, []).
 
-%% @spec (This::wxStaticLine(), Parent::wxWindow:wxWindow(), [Option]) -> bool()
-%% Option = {id, integer()} | {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstaticline.html#wxstaticlinecreate">external documentation</a>.
+-spec create(This, Parent, [Option]) -> boolean() when
+	This::wxStaticLine(), Parent::wxWindow:wxWindow(),
+	Option :: {id, integer()}
+		 | {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}.
 create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxStaticLine),
@@ -125,21 +139,22 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef}, Opti
   wxe_util:call(?wxStaticLine_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxStaticLine()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstaticline.html#wxstaticlineisvertical">external documentation</a>.
+-spec isVertical(This) -> boolean() when
+	This::wxStaticLine().
 isVertical(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStaticLine),
   wxe_util:call(?wxStaticLine_IsVertical,
   <<ThisRef:32/?UI>>).
 
-%% @spec () -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstaticline.html#wxstaticlinegetdefaultsize">external documentation</a>.
+-spec getDefaultSize() -> integer().
 getDefaultSize() ->
   wxe_util:call(?wxStaticLine_GetDefaultSize,
   <<>>).
 
-%% @spec (This::wxStaticLine()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxStaticLine) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxStaticLine),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxStaticText.erl b/lib/wx/src/gen/wxStaticText.erl
index 301999d49a..5aa4b6a7e0 100644
--- a/lib/wx/src/gen/wxStaticText.erl
+++ b/lib/wx/src/gen/wxStaticText.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -69,27 +69,34 @@
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
 
+-export_type([wxStaticText/0]).
 %% @hidden
 parent_class(wxControl) -> true;
 parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxStaticText()
+-type wxStaticText() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstatictext.html#wxstatictextwxstatictext">external documentation</a>.
+-spec new() -> wxStaticText().
 new() ->
   wxe_util:construct(?wxStaticText_new_0,
   <<>>).
 
-%% @spec (Parent::wxWindow:wxWindow(), Id::integer(), Label::string()) -> wxStaticText()
 %% @equiv new(Parent,Id,Label, [])
+-spec new(Parent, Id, Label) -> wxStaticText() when
+	Parent::wxWindow:wxWindow(), Id::integer(), Label::string().
+
 new(Parent,Id,Label)
  when is_record(Parent, wx_ref),is_integer(Id),is_list(Label) ->
   new(Parent,Id,Label, []).
 
-%% @spec (Parent::wxWindow:wxWindow(), Id::integer(), Label::string(), [Option]) -> wxStaticText()
-%% Option = {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstatictext.html#wxstatictextwxstatictext">external documentation</a>.
+-spec new(Parent, Id, Label, [Option]) -> wxStaticText() when
+	Parent::wxWindow:wxWindow(), Id::integer(), Label::string(),
+	Option :: {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}.
 new(#wx_ref{type=ParentT,ref=ParentRef},Id,Label, Options)
  when is_integer(Id),is_list(Label),is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -102,15 +109,20 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Id,Label, Options)
   wxe_util:construct(?wxStaticText_new_4,
   <<ParentRef:32/?UI,Id:32/?UI,(byte_size(Label_UC)):32/?UI,(Label_UC)/binary, 0:(((8- ((4+byte_size(Label_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxStaticText(), Parent::wxWindow:wxWindow(), Id::integer(), Label::string()) -> bool()
 %% @equiv create(This,Parent,Id,Label, [])
+-spec create(This, Parent, Id, Label) -> boolean() when
+	This::wxStaticText(), Parent::wxWindow:wxWindow(), Id::integer(), Label::string().
+
 create(This,Parent,Id,Label)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id),is_list(Label) ->
   create(This,Parent,Id,Label, []).
 
-%% @spec (This::wxStaticText(), Parent::wxWindow:wxWindow(), Id::integer(), Label::string(), [Option]) -> bool()
-%% Option = {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstatictext.html#wxstatictextcreate">external documentation</a>.
+-spec create(This, Parent, Id, Label, [Option]) -> boolean() when
+	This::wxStaticText(), Parent::wxWindow:wxWindow(), Id::integer(), Label::string(),
+	Option :: {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}.
 create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id,Label, Options)
  when is_integer(Id),is_list(Label),is_list(Options) ->
   ?CLASS(ThisT,wxStaticText),
@@ -124,15 +136,17 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id,La
   wxe_util:call(?wxStaticText_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI,Id:32/?UI,(byte_size(Label_UC)):32/?UI,(Label_UC)/binary, 0:(((8- ((0+byte_size(Label_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxStaticText()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstatictext.html#wxstatictextgetlabel">external documentation</a>.
+-spec getLabel(This) -> string() when
+	This::wxStaticText().
 getLabel(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStaticText),
   wxe_util:call(?wxStaticText_GetLabel,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStaticText(), Label::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstatictext.html#wxstatictextsetlabel">external documentation</a>.
+-spec setLabel(This, Label) -> ok when
+	This::wxStaticText(), Label::string().
 setLabel(#wx_ref{type=ThisT,ref=ThisRef},Label)
  when is_list(Label) ->
   ?CLASS(ThisT,wxStaticText),
@@ -140,16 +154,17 @@ setLabel(#wx_ref{type=ThisT,ref=ThisRef},Label)
   wxe_util:cast(?wxStaticText_SetLabel,
   <<ThisRef:32/?UI,(byte_size(Label_UC)):32/?UI,(Label_UC)/binary, 0:(((8- ((0+byte_size(Label_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxStaticText(), Width::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstatictext.html#wxstatictextwrap">external documentation</a>.
+-spec wrap(This, Width) -> ok when
+	This::wxStaticText(), Width::integer().
 wrap(#wx_ref{type=ThisT,ref=ThisRef},Width)
  when is_integer(Width) ->
   ?CLASS(ThisT,wxStaticText),
   wxe_util:cast(?wxStaticText_Wrap,
   <<ThisRef:32/?UI,Width:32/?UI>>).
 
-%% @spec (This::wxStaticText()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxStaticText) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxStaticText),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxStatusBar.erl b/lib/wx/src/gen/wxStatusBar.erl
index 6e77761f1d..4b43a8e30b 100644
--- a/lib/wx/src/gen/wxStatusBar.erl
+++ b/lib/wx/src/gen/wxStatusBar.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -71,26 +71,32 @@
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
 
+-export_type([wxStatusBar/0]).
 %% @hidden
 parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxStatusBar()
+-type wxStatusBar() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstatusbar.html#wxstatusbarwxstatusbar">external documentation</a>.
+-spec new() -> wxStatusBar().
 new() ->
   wxe_util:construct(?wxStatusBar_new_0,
   <<>>).
 
-%% @spec (Parent::wxWindow:wxWindow()) -> wxStatusBar()
 %% @equiv new(Parent, [])
+-spec new(Parent) -> wxStatusBar() when
+	Parent::wxWindow:wxWindow().
+
 new(Parent)
  when is_record(Parent, wx_ref) ->
   new(Parent, []).
 
-%% @spec (Parent::wxWindow:wxWindow(), [Option]) -> wxStatusBar()
-%% Option = {winid, integer()} | {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstatusbar.html#wxstatusbarwxstatusbar">external documentation</a>.
+-spec new(Parent, [Option]) -> wxStatusBar() when
+	Parent::wxWindow:wxWindow(),
+	Option :: {winid, integer()}
+		 | {style, integer()}.
 new(#wx_ref{type=ParentT,ref=ParentRef}, Options)
  when is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -101,15 +107,19 @@ new(#wx_ref{type=ParentT,ref=ParentRef}, Options)
   wxe_util:construct(?wxStatusBar_new_2,
   <<ParentRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxStatusBar(), Parent::wxWindow:wxWindow()) -> bool()
 %% @equiv create(This,Parent, [])
+-spec create(This, Parent) -> boolean() when
+	This::wxStatusBar(), Parent::wxWindow:wxWindow().
+
 create(This,Parent)
  when is_record(This, wx_ref),is_record(Parent, wx_ref) ->
   create(This,Parent, []).
 
-%% @spec (This::wxStatusBar(), Parent::wxWindow:wxWindow(), [Option]) -> bool()
-%% Option = {winid, integer()} | {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstatusbar.html#wxstatusbarcreate">external documentation</a>.
+-spec create(This, Parent, [Option]) -> boolean() when
+	This::wxStatusBar(), Parent::wxWindow:wxWindow(),
+	Option :: {winid, integer()}
+		 | {style, integer()}.
 create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxStatusBar),
@@ -121,30 +131,35 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef}, Opti
   wxe_util:call(?wxStatusBar_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxStatusBar(), I::integer(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstatusbar.html#wxstatusbargetfieldrect">external documentation</a>.
+-spec getFieldRect(This, I, Rect) -> boolean() when
+	This::wxStatusBar(), I::integer(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}.
 getFieldRect(#wx_ref{type=ThisT,ref=ThisRef},I,{RectX,RectY,RectW,RectH})
  when is_integer(I),is_integer(RectX),is_integer(RectY),is_integer(RectW),is_integer(RectH) ->
   ?CLASS(ThisT,wxStatusBar),
   wxe_util:call(?wxStatusBar_GetFieldRect,
   <<ThisRef:32/?UI,I:32/?UI,RectX:32/?UI,RectY:32/?UI,RectW:32/?UI,RectH:32/?UI>>).
 
-%% @spec (This::wxStatusBar()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstatusbar.html#wxstatusbargetfieldscount">external documentation</a>.
+-spec getFieldsCount(This) -> integer() when
+	This::wxStatusBar().
 getFieldsCount(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStatusBar),
   wxe_util:call(?wxStatusBar_GetFieldsCount,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStatusBar()) -> string()
 %% @equiv getStatusText(This, [])
+-spec getStatusText(This) -> string() when
+	This::wxStatusBar().
+
 getStatusText(This)
  when is_record(This, wx_ref) ->
   getStatusText(This, []).
 
-%% @spec (This::wxStatusBar(), [Option]) -> string()
-%% Option = {number, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstatusbar.html#wxstatusbargetstatustext">external documentation</a>.
+-spec getStatusText(This, [Option]) -> string() when
+	This::wxStatusBar(),
+	Option :: {number, integer()}.
 getStatusText(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxStatusBar),
@@ -154,15 +169,18 @@ getStatusText(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxStatusBar_GetStatusText,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxStatusBar()) -> ok
 %% @equiv popStatusText(This, [])
+-spec popStatusText(This) -> ok when
+	This::wxStatusBar().
+
 popStatusText(This)
  when is_record(This, wx_ref) ->
   popStatusText(This, []).
 
-%% @spec (This::wxStatusBar(), [Option]) -> ok
-%% Option = {number, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstatusbar.html#wxstatusbarpopstatustext">external documentation</a>.
+-spec popStatusText(This, [Option]) -> ok when
+	This::wxStatusBar(),
+	Option :: {number, integer()}.
 popStatusText(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxStatusBar),
@@ -172,15 +190,18 @@ popStatusText(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxStatusBar_PopStatusText,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxStatusBar(), Text::string()) -> ok
 %% @equiv pushStatusText(This,Text, [])
+-spec pushStatusText(This, Text) -> ok when
+	This::wxStatusBar(), Text::string().
+
 pushStatusText(This,Text)
  when is_record(This, wx_ref),is_list(Text) ->
   pushStatusText(This,Text, []).
 
-%% @spec (This::wxStatusBar(), Text::string(), [Option]) -> ok
-%% Option = {number, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstatusbar.html#wxstatusbarpushstatustext">external documentation</a>.
+-spec pushStatusText(This, Text, [Option]) -> ok when
+	This::wxStatusBar(), Text::string(),
+	Option :: {number, integer()}.
 pushStatusText(#wx_ref{type=ThisT,ref=ThisRef},Text, Options)
  when is_list(Text),is_list(Options) ->
   ?CLASS(ThisT,wxStatusBar),
@@ -191,15 +212,18 @@ pushStatusText(#wx_ref{type=ThisT,ref=ThisRef},Text, Options)
   wxe_util:cast(?wxStatusBar_PushStatusText,
   <<ThisRef:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxStatusBar(), Number::integer()) -> ok
 %% @equiv setFieldsCount(This,Number, [])
+-spec setFieldsCount(This, Number) -> ok when
+	This::wxStatusBar(), Number::integer().
+
 setFieldsCount(This,Number)
  when is_record(This, wx_ref),is_integer(Number) ->
   setFieldsCount(This,Number, []).
 
-%% @spec (This::wxStatusBar(), Number::integer(), [Option]) -> ok
-%% Option = {widths, [integer()]}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstatusbar.html#wxstatusbarsetfieldscount">external documentation</a>.
+-spec setFieldsCount(This, Number, [Option]) -> ok when
+	This::wxStatusBar(), Number::integer(),
+	Option :: {widths, [integer()]}.
 setFieldsCount(#wx_ref{type=ThisT,ref=ThisRef},Number, Options)
  when is_integer(Number),is_list(Options) ->
   ?CLASS(ThisT,wxStatusBar),
@@ -210,23 +234,27 @@ setFieldsCount(#wx_ref{type=ThisT,ref=ThisRef},Number, Options)
   wxe_util:cast(?wxStatusBar_SetFieldsCount,
   <<ThisRef:32/?UI,Number:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxStatusBar(), Height::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstatusbar.html#wxstatusbarsetminheight">external documentation</a>.
+-spec setMinHeight(This, Height) -> ok when
+	This::wxStatusBar(), Height::integer().
 setMinHeight(#wx_ref{type=ThisT,ref=ThisRef},Height)
  when is_integer(Height) ->
   ?CLASS(ThisT,wxStatusBar),
   wxe_util:cast(?wxStatusBar_SetMinHeight,
   <<ThisRef:32/?UI,Height:32/?UI>>).
 
-%% @spec (This::wxStatusBar(), Text::string()) -> ok
 %% @equiv setStatusText(This,Text, [])
+-spec setStatusText(This, Text) -> ok when
+	This::wxStatusBar(), Text::string().
+
 setStatusText(This,Text)
  when is_record(This, wx_ref),is_list(Text) ->
   setStatusText(This,Text, []).
 
-%% @spec (This::wxStatusBar(), Text::string(), [Option]) -> ok
-%% Option = {number, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstatusbar.html#wxstatusbarsetstatustext">external documentation</a>.
+-spec setStatusText(This, Text, [Option]) -> ok when
+	This::wxStatusBar(), Text::string(),
+	Option :: {number, integer()}.
 setStatusText(#wx_ref{type=ThisT,ref=ThisRef},Text, Options)
  when is_list(Text),is_list(Options) ->
   ?CLASS(ThisT,wxStatusBar),
@@ -237,8 +265,9 @@ setStatusText(#wx_ref{type=ThisT,ref=ThisRef},Text, Options)
   wxe_util:cast(?wxStatusBar_SetStatusText,
   <<ThisRef:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxStatusBar(), Widths_field::[integer()]) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstatusbar.html#wxstatusbarsetstatuswidths">external documentation</a>.
+-spec setStatusWidths(This, Widths_field) -> ok when
+	This::wxStatusBar(), Widths_field::[integer()].
 setStatusWidths(#wx_ref{type=ThisT,ref=ThisRef},Widths_field)
  when is_list(Widths_field) ->
   ?CLASS(ThisT,wxStatusBar),
@@ -246,8 +275,9 @@ setStatusWidths(#wx_ref{type=ThisT,ref=ThisRef},Widths_field)
   <<ThisRef:32/?UI,(length(Widths_field)):32/?UI,
         (<< <<C:32/?I>> || C <- Widths_field>>)/binary, 0:(((0+length(Widths_field)) rem 2)*32)>>).
 
-%% @spec (This::wxStatusBar(), Styles::[integer()]) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstatusbar.html#wxstatusbarsetstatusstyles">external documentation</a>.
+-spec setStatusStyles(This, Styles) -> ok when
+	This::wxStatusBar(), Styles::[integer()].
 setStatusStyles(#wx_ref{type=ThisT,ref=ThisRef},Styles)
  when is_list(Styles) ->
   ?CLASS(ThisT,wxStatusBar),
@@ -255,8 +285,8 @@ setStatusStyles(#wx_ref{type=ThisT,ref=ThisRef},Styles)
   <<ThisRef:32/?UI,(length(Styles)):32/?UI,
         (<< <<C:32/?I>> || C <- Styles>>)/binary, 0:(((0+length(Styles)) rem 2)*32)>>).
 
-%% @spec (This::wxStatusBar()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxStatusBar) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxStatusBar),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxStdDialogButtonSizer.erl b/lib/wx/src/gen/wxStdDialogButtonSizer.erl
index 3d31907275..b8c17ab6ac 100644
--- a/lib/wx/src/gen/wxStdDialogButtonSizer.erl
+++ b/lib/wx/src/gen/wxStdDialogButtonSizer.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -42,58 +42,65 @@
   setItemMinSize/4,setMinSize/2,setMinSize/3,setSizeHints/2,setVirtualSizeHints/2,
   show/2,show/3]).
 
+-export_type([wxStdDialogButtonSizer/0]).
 %% @hidden
 parent_class(wxBoxSizer) -> true;
 parent_class(wxSizer) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxStdDialogButtonSizer()
+-type wxStdDialogButtonSizer() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstddialogbuttonsizer.html#wxstddialogbuttonsizerwxstddialogbuttonsizer">external documentation</a>.
+-spec new() -> wxStdDialogButtonSizer().
 new() ->
   wxe_util:construct(?wxStdDialogButtonSizer_new,
   <<>>).
 
-%% @spec (This::wxStdDialogButtonSizer(), Button::wxButton:wxButton()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstddialogbuttonsizer.html#wxstddialogbuttonsizeraddbutton">external documentation</a>.
+-spec addButton(This, Button) -> ok when
+	This::wxStdDialogButtonSizer(), Button::wxButton:wxButton().
 addButton(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ButtonT,ref=ButtonRef}) ->
   ?CLASS(ThisT,wxStdDialogButtonSizer),
   ?CLASS(ButtonT,wxButton),
   wxe_util:cast(?wxStdDialogButtonSizer_AddButton,
   <<ThisRef:32/?UI,ButtonRef:32/?UI>>).
 
-%% @spec (This::wxStdDialogButtonSizer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstddialogbuttonsizer.html#wxstddialogbuttonsizerrealize">external documentation</a>.
+-spec realize(This) -> ok when
+	This::wxStdDialogButtonSizer().
 realize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStdDialogButtonSizer),
   wxe_util:cast(?wxStdDialogButtonSizer_Realize,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStdDialogButtonSizer(), Button::wxButton:wxButton()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstddialogbuttonsizer.html#wxstddialogbuttonsizersetaffirmativebutton">external documentation</a>.
+-spec setAffirmativeButton(This, Button) -> ok when
+	This::wxStdDialogButtonSizer(), Button::wxButton:wxButton().
 setAffirmativeButton(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ButtonT,ref=ButtonRef}) ->
   ?CLASS(ThisT,wxStdDialogButtonSizer),
   ?CLASS(ButtonT,wxButton),
   wxe_util:cast(?wxStdDialogButtonSizer_SetAffirmativeButton,
   <<ThisRef:32/?UI,ButtonRef:32/?UI>>).
 
-%% @spec (This::wxStdDialogButtonSizer(), Button::wxButton:wxButton()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstddialogbuttonsizer.html#wxstddialogbuttonsizersetcancelbutton">external documentation</a>.
+-spec setCancelButton(This, Button) -> ok when
+	This::wxStdDialogButtonSizer(), Button::wxButton:wxButton().
 setCancelButton(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ButtonT,ref=ButtonRef}) ->
   ?CLASS(ThisT,wxStdDialogButtonSizer),
   ?CLASS(ButtonT,wxButton),
   wxe_util:cast(?wxStdDialogButtonSizer_SetCancelButton,
   <<ThisRef:32/?UI,ButtonRef:32/?UI>>).
 
-%% @spec (This::wxStdDialogButtonSizer(), Button::wxButton:wxButton()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstddialogbuttonsizer.html#wxstddialogbuttonsizersetnegativebutton">external documentation</a>.
+-spec setNegativeButton(This, Button) -> ok when
+	This::wxStdDialogButtonSizer(), Button::wxButton:wxButton().
 setNegativeButton(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ButtonT,ref=ButtonRef}) ->
   ?CLASS(ThisT,wxStdDialogButtonSizer),
   ?CLASS(ButtonT,wxButton),
   wxe_util:cast(?wxStdDialogButtonSizer_SetNegativeButton,
   <<ThisRef:32/?UI,ButtonRef:32/?UI>>).
 
-%% @spec (This::wxStdDialogButtonSizer()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxStdDialogButtonSizer) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxStdDialogButtonSizer),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxStyledTextCtrl.erl b/lib/wx/src/gen/wxStyledTextCtrl.erl
index 61f0e5afef..fdbe4faec0 100644
--- a/lib/wx/src/gen/wxStyledTextCtrl.erl
+++ b/lib/wx/src/gen/wxStyledTextCtrl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -171,27 +171,35 @@
   transferDataToWindow/1,update/1,updateWindowUI/1,updateWindowUI/2,
   validate/1,warpPointer/3]).
 
+-export_type([wxStyledTextCtrl/0]).
 %% @hidden
 parent_class(wxControl) -> true;
 parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxStyledTextCtrl()
+-type wxStyledTextCtrl() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlwxstyledtextctrl">external documentation</a>.
+-spec new() -> wxStyledTextCtrl().
 new() ->
   wxe_util:construct(?wxStyledTextCtrl_new_0,
   <<>>).
 
-%% @spec (Parent::wxWindow:wxWindow()) -> wxStyledTextCtrl()
 %% @equiv new(Parent, [])
+-spec new(Parent) -> wxStyledTextCtrl() when
+	Parent::wxWindow:wxWindow().
+
 new(Parent)
  when is_record(Parent, wx_ref) ->
   new(Parent, []).
 
-%% @spec (Parent::wxWindow:wxWindow(), [Option]) -> wxStyledTextCtrl()
-%% Option = {id, integer()} | {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlwxstyledtextctrl">external documentation</a>.
+-spec new(Parent, [Option]) -> wxStyledTextCtrl() when
+	Parent::wxWindow:wxWindow(),
+	Option :: {id, integer()}
+		 | {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}.
 new(#wx_ref{type=ParentT,ref=ParentRef}, Options)
  when is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -204,15 +212,21 @@ new(#wx_ref{type=ParentT,ref=ParentRef}, Options)
   wxe_util:construct(?wxStyledTextCtrl_new_2,
   <<ParentRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxStyledTextCtrl(), Parent::wxWindow:wxWindow()) -> bool()
 %% @equiv create(This,Parent, [])
+-spec create(This, Parent) -> boolean() when
+	This::wxStyledTextCtrl(), Parent::wxWindow:wxWindow().
+
 create(This,Parent)
  when is_record(This, wx_ref),is_record(Parent, wx_ref) ->
   create(This,Parent, []).
 
-%% @spec (This::wxStyledTextCtrl(), Parent::wxWindow:wxWindow(), [Option]) -> bool()
-%% Option = {id, integer()} | {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlcreate">external documentation</a>.
+-spec create(This, Parent, [Option]) -> boolean() when
+	This::wxStyledTextCtrl(), Parent::wxWindow:wxWindow(),
+	Option :: {id, integer()}
+		 | {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}.
 create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
@@ -226,8 +240,9 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef}, Opti
   wxe_util:call(?wxStyledTextCtrl_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxStyledTextCtrl(), Text::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrladdtext">external documentation</a>.
+-spec addText(This, Text) -> ok when
+	This::wxStyledTextCtrl(), Text::string().
 addText(#wx_ref{type=ThisT,ref=ThisRef},Text)
  when is_list(Text) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
@@ -235,16 +250,18 @@ addText(#wx_ref{type=ThisT,ref=ThisRef},Text)
   wxe_util:cast(?wxStyledTextCtrl_AddText,
   <<ThisRef:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxStyledTextCtrl(), Data::wxMemoryBuffer:wxMemoryBuffer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrladdstyledtext">external documentation</a>.
+-spec addStyledText(This, Data) -> ok when
+	This::wxStyledTextCtrl(), Data::wxMemoryBuffer:wxMemoryBuffer().
 addStyledText(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=DataT,ref=DataRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   ?CLASS(DataT,wxMemoryBuffer),
   wxe_util:cast(?wxStyledTextCtrl_AddStyledText,
   <<ThisRef:32/?UI,DataRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Pos::integer(), Text::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlinserttext">external documentation</a>.
+-spec insertText(This, Pos, Text) -> ok when
+	This::wxStyledTextCtrl(), Pos::integer(), Text::string().
 insertText(#wx_ref{type=ThisT,ref=ThisRef},Pos,Text)
  when is_integer(Pos),is_list(Text) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
@@ -252,279 +269,319 @@ insertText(#wx_ref{type=ThisT,ref=ThisRef},Pos,Text)
   wxe_util:cast(?wxStyledTextCtrl_InsertText,
   <<ThisRef:32/?UI,Pos:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((4+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlclearall">external documentation</a>.
+-spec clearAll(This) -> ok when
+	This::wxStyledTextCtrl().
 clearAll(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_ClearAll,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlcleardocumentstyle">external documentation</a>.
+-spec clearDocumentStyle(This) -> ok when
+	This::wxStyledTextCtrl().
 clearDocumentStyle(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_ClearDocumentStyle,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetlength">external documentation</a>.
+-spec getLength(This) -> integer() when
+	This::wxStyledTextCtrl().
 getLength(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetLength,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Pos::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetcharat">external documentation</a>.
+-spec getCharAt(This, Pos) -> integer() when
+	This::wxStyledTextCtrl(), Pos::integer().
 getCharAt(#wx_ref{type=ThisT,ref=ThisRef},Pos)
  when is_integer(Pos) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetCharAt,
   <<ThisRef:32/?UI,Pos:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetcurrentpos">external documentation</a>.
+-spec getCurrentPos(This) -> integer() when
+	This::wxStyledTextCtrl().
 getCurrentPos(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetCurrentPos,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetanchor">external documentation</a>.
+-spec getAnchor(This) -> integer() when
+	This::wxStyledTextCtrl().
 getAnchor(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetAnchor,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Pos::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetstyleat">external documentation</a>.
+-spec getStyleAt(This, Pos) -> integer() when
+	This::wxStyledTextCtrl(), Pos::integer().
 getStyleAt(#wx_ref{type=ThisT,ref=ThisRef},Pos)
  when is_integer(Pos) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetStyleAt,
   <<ThisRef:32/?UI,Pos:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlredo">external documentation</a>.
+-spec redo(This) -> ok when
+	This::wxStyledTextCtrl().
 redo(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_Redo,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), CollectUndo::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetundocollection">external documentation</a>.
+-spec setUndoCollection(This, CollectUndo) -> ok when
+	This::wxStyledTextCtrl(), CollectUndo::boolean().
 setUndoCollection(#wx_ref{type=ThisT,ref=ThisRef},CollectUndo)
  when is_boolean(CollectUndo) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetUndoCollection,
   <<ThisRef:32/?UI,(wxe_util:from_bool(CollectUndo)):32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlselectall">external documentation</a>.
+-spec selectAll(This) -> ok when
+	This::wxStyledTextCtrl().
 selectAll(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SelectAll,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetsavepoint">external documentation</a>.
+-spec setSavePoint(This) -> ok when
+	This::wxStyledTextCtrl().
 setSavePoint(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetSavePoint,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), StartPos::integer(), EndPos::integer()) -> wxMemoryBuffer:wxMemoryBuffer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetstyledtext">external documentation</a>.
+-spec getStyledText(This, StartPos, EndPos) -> wxMemoryBuffer:wxMemoryBuffer() when
+	This::wxStyledTextCtrl(), StartPos::integer(), EndPos::integer().
 getStyledText(#wx_ref{type=ThisT,ref=ThisRef},StartPos,EndPos)
  when is_integer(StartPos),is_integer(EndPos) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetStyledText,
   <<ThisRef:32/?UI,StartPos:32/?UI,EndPos:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlcanredo">external documentation</a>.
+-spec canRedo(This) -> boolean() when
+	This::wxStyledTextCtrl().
 canRedo(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_CanRedo,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Handle::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlmarkerlinefromhandle">external documentation</a>.
+-spec markerLineFromHandle(This, Handle) -> integer() when
+	This::wxStyledTextCtrl(), Handle::integer().
 markerLineFromHandle(#wx_ref{type=ThisT,ref=ThisRef},Handle)
  when is_integer(Handle) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_MarkerLineFromHandle,
   <<ThisRef:32/?UI,Handle:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Handle::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlmarkerdeletehandle">external documentation</a>.
+-spec markerDeleteHandle(This, Handle) -> ok when
+	This::wxStyledTextCtrl(), Handle::integer().
 markerDeleteHandle(#wx_ref{type=ThisT,ref=ThisRef},Handle)
  when is_integer(Handle) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_MarkerDeleteHandle,
   <<ThisRef:32/?UI,Handle:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetundocollection">external documentation</a>.
+-spec getUndoCollection(This) -> boolean() when
+	This::wxStyledTextCtrl().
 getUndoCollection(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetUndoCollection,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetviewwhitespace">external documentation</a>.
+-spec getViewWhiteSpace(This) -> integer() when
+	This::wxStyledTextCtrl().
 getViewWhiteSpace(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetViewWhiteSpace,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), ViewWS::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetviewwhitespace">external documentation</a>.
+-spec setViewWhiteSpace(This, ViewWS) -> ok when
+	This::wxStyledTextCtrl(), ViewWS::integer().
 setViewWhiteSpace(#wx_ref{type=ThisT,ref=ThisRef},ViewWS)
  when is_integer(ViewWS) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetViewWhiteSpace,
   <<ThisRef:32/?UI,ViewWS:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Pt::{X::integer(), Y::integer()}) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlpositionfrompoint">external documentation</a>.
+-spec positionFromPoint(This, Pt) -> integer() when
+	This::wxStyledTextCtrl(), Pt::{X::integer(), Y::integer()}.
 positionFromPoint(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY})
  when is_integer(PtX),is_integer(PtY) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_PositionFromPoint,
   <<ThisRef:32/?UI,PtX:32/?UI,PtY:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), X::integer(), Y::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlpositionfrompointclose">external documentation</a>.
+-spec positionFromPointClose(This, X, Y) -> integer() when
+	This::wxStyledTextCtrl(), X::integer(), Y::integer().
 positionFromPointClose(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
  when is_integer(X),is_integer(Y) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_PositionFromPointClose,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Line::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgotoline">external documentation</a>.
+-spec gotoLine(This, Line) -> ok when
+	This::wxStyledTextCtrl(), Line::integer().
 gotoLine(#wx_ref{type=ThisT,ref=ThisRef},Line)
  when is_integer(Line) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_GotoLine,
   <<ThisRef:32/?UI,Line:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Pos::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgotopos">external documentation</a>.
+-spec gotoPos(This, Pos) -> ok when
+	This::wxStyledTextCtrl(), Pos::integer().
 gotoPos(#wx_ref{type=ThisT,ref=ThisRef},Pos)
  when is_integer(Pos) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_GotoPos,
   <<ThisRef:32/?UI,Pos:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), PosAnchor::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetanchor">external documentation</a>.
+-spec setAnchor(This, PosAnchor) -> ok when
+	This::wxStyledTextCtrl(), PosAnchor::integer().
 setAnchor(#wx_ref{type=ThisT,ref=ThisRef},PosAnchor)
  when is_integer(PosAnchor) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetAnchor,
   <<ThisRef:32/?UI,PosAnchor:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> {string(), LinePos::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetcurline">external documentation</a>.
+-spec getCurLine(This) -> Result when
+	Result ::{Res ::string(), LinePos::integer()},
+	This::wxStyledTextCtrl().
 getCurLine(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetCurLine,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetendstyled">external documentation</a>.
+-spec getEndStyled(This) -> integer() when
+	This::wxStyledTextCtrl().
 getEndStyled(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetEndStyled,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), EolMode::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlconverteols">external documentation</a>.
+-spec convertEOLs(This, EolMode) -> ok when
+	This::wxStyledTextCtrl(), EolMode::integer().
 convertEOLs(#wx_ref{type=ThisT,ref=ThisRef},EolMode)
  when is_integer(EolMode) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_ConvertEOLs,
   <<ThisRef:32/?UI,EolMode:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgeteolmode">external documentation</a>.
+-spec getEOLMode(This) -> integer() when
+	This::wxStyledTextCtrl().
 getEOLMode(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetEOLMode,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), EolMode::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlseteolmode">external documentation</a>.
+-spec setEOLMode(This, EolMode) -> ok when
+	This::wxStyledTextCtrl(), EolMode::integer().
 setEOLMode(#wx_ref{type=ThisT,ref=ThisRef},EolMode)
  when is_integer(EolMode) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetEOLMode,
   <<ThisRef:32/?UI,EolMode:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Pos::integer(), Mask::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlstartstyling">external documentation</a>.
+-spec startStyling(This, Pos, Mask) -> ok when
+	This::wxStyledTextCtrl(), Pos::integer(), Mask::integer().
 startStyling(#wx_ref{type=ThisT,ref=ThisRef},Pos,Mask)
  when is_integer(Pos),is_integer(Mask) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_StartStyling,
   <<ThisRef:32/?UI,Pos:32/?UI,Mask:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Length::integer(), Style::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetstyling">external documentation</a>.
+-spec setStyling(This, Length, Style) -> ok when
+	This::wxStyledTextCtrl(), Length::integer(), Style::integer().
 setStyling(#wx_ref{type=ThisT,ref=ThisRef},Length,Style)
  when is_integer(Length),is_integer(Style) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetStyling,
   <<ThisRef:32/?UI,Length:32/?UI,Style:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetbuffereddraw">external documentation</a>.
+-spec getBufferedDraw(This) -> boolean() when
+	This::wxStyledTextCtrl().
 getBufferedDraw(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetBufferedDraw,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Buffered::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetbuffereddraw">external documentation</a>.
+-spec setBufferedDraw(This, Buffered) -> ok when
+	This::wxStyledTextCtrl(), Buffered::boolean().
 setBufferedDraw(#wx_ref{type=ThisT,ref=ThisRef},Buffered)
  when is_boolean(Buffered) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetBufferedDraw,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Buffered)):32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), TabWidth::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsettabwidth">external documentation</a>.
+-spec setTabWidth(This, TabWidth) -> ok when
+	This::wxStyledTextCtrl(), TabWidth::integer().
 setTabWidth(#wx_ref{type=ThisT,ref=ThisRef},TabWidth)
  when is_integer(TabWidth) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetTabWidth,
   <<ThisRef:32/?UI,TabWidth:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgettabwidth">external documentation</a>.
+-spec getTabWidth(This) -> integer() when
+	This::wxStyledTextCtrl().
 getTabWidth(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetTabWidth,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), CodePage::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetcodepage">external documentation</a>.
+-spec setCodePage(This, CodePage) -> ok when
+	This::wxStyledTextCtrl(), CodePage::integer().
 setCodePage(#wx_ref{type=ThisT,ref=ThisRef},CodePage)
  when is_integer(CodePage) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetCodePage,
   <<ThisRef:32/?UI,CodePage:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), MarkerNumber::integer(), MarkerSymbol::integer()) -> ok
 %% @equiv markerDefine(This,MarkerNumber,MarkerSymbol, [])
+-spec markerDefine(This, MarkerNumber, MarkerSymbol) -> ok when
+	This::wxStyledTextCtrl(), MarkerNumber::integer(), MarkerSymbol::integer().
+
 markerDefine(This,MarkerNumber,MarkerSymbol)
  when is_record(This, wx_ref),is_integer(MarkerNumber),is_integer(MarkerSymbol) ->
   markerDefine(This,MarkerNumber,MarkerSymbol, []).
 
-%% @spec (This::wxStyledTextCtrl(), MarkerNumber::integer(), MarkerSymbol::integer(), [Option]) -> ok
-%% Option = {foreground, wx:colour()} | {background, wx:colour()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlmarkerdefine">external documentation</a>.
+-spec markerDefine(This, MarkerNumber, MarkerSymbol, [Option]) -> ok when
+	This::wxStyledTextCtrl(), MarkerNumber::integer(), MarkerSymbol::integer(),
+	Option :: {foreground, wx:wx_colour()}
+		 | {background, wx:wx_colour()}.
 markerDefine(#wx_ref{type=ThisT,ref=ThisRef},MarkerNumber,MarkerSymbol, Options)
  when is_integer(MarkerNumber),is_integer(MarkerSymbol),is_list(Options) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
@@ -535,72 +592,81 @@ markerDefine(#wx_ref{type=ThisT,ref=ThisRef},MarkerNumber,MarkerSymbol, Options)
   wxe_util:cast(?wxStyledTextCtrl_MarkerDefine,
   <<ThisRef:32/?UI,MarkerNumber:32/?UI,MarkerSymbol:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxStyledTextCtrl(), MarkerNumber::integer(), Fore::wx:colour()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlmarkersetforeground">external documentation</a>.
+-spec markerSetForeground(This, MarkerNumber, Fore) -> ok when
+	This::wxStyledTextCtrl(), MarkerNumber::integer(), Fore::wx:wx_colour().
 markerSetForeground(#wx_ref{type=ThisT,ref=ThisRef},MarkerNumber,Fore)
  when is_integer(MarkerNumber),tuple_size(Fore) =:= 3; tuple_size(Fore) =:= 4 ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_MarkerSetForeground,
   <<ThisRef:32/?UI,MarkerNumber:32/?UI,(wxe_util:colour_bin(Fore)):16/binary>>).
 
-%% @spec (This::wxStyledTextCtrl(), MarkerNumber::integer(), Back::wx:colour()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlmarkersetbackground">external documentation</a>.
+-spec markerSetBackground(This, MarkerNumber, Back) -> ok when
+	This::wxStyledTextCtrl(), MarkerNumber::integer(), Back::wx:wx_colour().
 markerSetBackground(#wx_ref{type=ThisT,ref=ThisRef},MarkerNumber,Back)
  when is_integer(MarkerNumber),tuple_size(Back) =:= 3; tuple_size(Back) =:= 4 ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_MarkerSetBackground,
   <<ThisRef:32/?UI,MarkerNumber:32/?UI,(wxe_util:colour_bin(Back)):16/binary>>).
 
-%% @spec (This::wxStyledTextCtrl(), Line::integer(), MarkerNumber::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlmarkeradd">external documentation</a>.
+-spec markerAdd(This, Line, MarkerNumber) -> integer() when
+	This::wxStyledTextCtrl(), Line::integer(), MarkerNumber::integer().
 markerAdd(#wx_ref{type=ThisT,ref=ThisRef},Line,MarkerNumber)
  when is_integer(Line),is_integer(MarkerNumber) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_MarkerAdd,
   <<ThisRef:32/?UI,Line:32/?UI,MarkerNumber:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Line::integer(), MarkerNumber::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlmarkerdelete">external documentation</a>.
+-spec markerDelete(This, Line, MarkerNumber) -> ok when
+	This::wxStyledTextCtrl(), Line::integer(), MarkerNumber::integer().
 markerDelete(#wx_ref{type=ThisT,ref=ThisRef},Line,MarkerNumber)
  when is_integer(Line),is_integer(MarkerNumber) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_MarkerDelete,
   <<ThisRef:32/?UI,Line:32/?UI,MarkerNumber:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), MarkerNumber::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlmarkerdeleteall">external documentation</a>.
+-spec markerDeleteAll(This, MarkerNumber) -> ok when
+	This::wxStyledTextCtrl(), MarkerNumber::integer().
 markerDeleteAll(#wx_ref{type=ThisT,ref=ThisRef},MarkerNumber)
  when is_integer(MarkerNumber) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_MarkerDeleteAll,
   <<ThisRef:32/?UI,MarkerNumber:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Line::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlmarkerget">external documentation</a>.
+-spec markerGet(This, Line) -> integer() when
+	This::wxStyledTextCtrl(), Line::integer().
 markerGet(#wx_ref{type=ThisT,ref=ThisRef},Line)
  when is_integer(Line) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_MarkerGet,
   <<ThisRef:32/?UI,Line:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), LineStart::integer(), MarkerMask::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlmarkernext">external documentation</a>.
+-spec markerNext(This, LineStart, MarkerMask) -> integer() when
+	This::wxStyledTextCtrl(), LineStart::integer(), MarkerMask::integer().
 markerNext(#wx_ref{type=ThisT,ref=ThisRef},LineStart,MarkerMask)
  when is_integer(LineStart),is_integer(MarkerMask) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_MarkerNext,
   <<ThisRef:32/?UI,LineStart:32/?UI,MarkerMask:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), LineStart::integer(), MarkerMask::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlmarkerprevious">external documentation</a>.
+-spec markerPrevious(This, LineStart, MarkerMask) -> integer() when
+	This::wxStyledTextCtrl(), LineStart::integer(), MarkerMask::integer().
 markerPrevious(#wx_ref{type=ThisT,ref=ThisRef},LineStart,MarkerMask)
  when is_integer(LineStart),is_integer(MarkerMask) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_MarkerPrevious,
   <<ThisRef:32/?UI,LineStart:32/?UI,MarkerMask:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), MarkerNumber::integer(), Bmp::wxBitmap:wxBitmap()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlmarkerdefinebitmap">external documentation</a>.
+-spec markerDefineBitmap(This, MarkerNumber, Bmp) -> ok when
+	This::wxStyledTextCtrl(), MarkerNumber::integer(), Bmp::wxBitmap:wxBitmap().
 markerDefineBitmap(#wx_ref{type=ThisT,ref=ThisRef},MarkerNumber,#wx_ref{type=BmpT,ref=BmpRef})
  when is_integer(MarkerNumber) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
@@ -608,135 +674,152 @@ markerDefineBitmap(#wx_ref{type=ThisT,ref=ThisRef},MarkerNumber,#wx_ref{type=Bmp
   wxe_util:cast(?wxStyledTextCtrl_MarkerDefineBitmap,
   <<ThisRef:32/?UI,MarkerNumber:32/?UI,BmpRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Line::integer(), Set::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlmarkeraddset">external documentation</a>.
+-spec markerAddSet(This, Line, Set) -> ok when
+	This::wxStyledTextCtrl(), Line::integer(), Set::integer().
 markerAddSet(#wx_ref{type=ThisT,ref=ThisRef},Line,Set)
  when is_integer(Line),is_integer(Set) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_MarkerAddSet,
   <<ThisRef:32/?UI,Line:32/?UI,Set:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), MarkerNumber::integer(), Alpha::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlmarkersetalpha">external documentation</a>.
+-spec markerSetAlpha(This, MarkerNumber, Alpha) -> ok when
+	This::wxStyledTextCtrl(), MarkerNumber::integer(), Alpha::integer().
 markerSetAlpha(#wx_ref{type=ThisT,ref=ThisRef},MarkerNumber,Alpha)
  when is_integer(MarkerNumber),is_integer(Alpha) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_MarkerSetAlpha,
   <<ThisRef:32/?UI,MarkerNumber:32/?UI,Alpha:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Margin::integer(), MarginType::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetmargintype">external documentation</a>.
+-spec setMarginType(This, Margin, MarginType) -> ok when
+	This::wxStyledTextCtrl(), Margin::integer(), MarginType::integer().
 setMarginType(#wx_ref{type=ThisT,ref=ThisRef},Margin,MarginType)
  when is_integer(Margin),is_integer(MarginType) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetMarginType,
   <<ThisRef:32/?UI,Margin:32/?UI,MarginType:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Margin::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetmargintype">external documentation</a>.
+-spec getMarginType(This, Margin) -> integer() when
+	This::wxStyledTextCtrl(), Margin::integer().
 getMarginType(#wx_ref{type=ThisT,ref=ThisRef},Margin)
  when is_integer(Margin) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetMarginType,
   <<ThisRef:32/?UI,Margin:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Margin::integer(), PixelWidth::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetmarginwidth">external documentation</a>.
+-spec setMarginWidth(This, Margin, PixelWidth) -> ok when
+	This::wxStyledTextCtrl(), Margin::integer(), PixelWidth::integer().
 setMarginWidth(#wx_ref{type=ThisT,ref=ThisRef},Margin,PixelWidth)
  when is_integer(Margin),is_integer(PixelWidth) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetMarginWidth,
   <<ThisRef:32/?UI,Margin:32/?UI,PixelWidth:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Margin::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetmarginwidth">external documentation</a>.
+-spec getMarginWidth(This, Margin) -> integer() when
+	This::wxStyledTextCtrl(), Margin::integer().
 getMarginWidth(#wx_ref{type=ThisT,ref=ThisRef},Margin)
  when is_integer(Margin) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetMarginWidth,
   <<ThisRef:32/?UI,Margin:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Margin::integer(), Mask::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetmarginmask">external documentation</a>.
+-spec setMarginMask(This, Margin, Mask) -> ok when
+	This::wxStyledTextCtrl(), Margin::integer(), Mask::integer().
 setMarginMask(#wx_ref{type=ThisT,ref=ThisRef},Margin,Mask)
  when is_integer(Margin),is_integer(Mask) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetMarginMask,
   <<ThisRef:32/?UI,Margin:32/?UI,Mask:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Margin::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetmarginmask">external documentation</a>.
+-spec getMarginMask(This, Margin) -> integer() when
+	This::wxStyledTextCtrl(), Margin::integer().
 getMarginMask(#wx_ref{type=ThisT,ref=ThisRef},Margin)
  when is_integer(Margin) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetMarginMask,
   <<ThisRef:32/?UI,Margin:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Margin::integer(), Sensitive::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetmarginsensitive">external documentation</a>.
+-spec setMarginSensitive(This, Margin, Sensitive) -> ok when
+	This::wxStyledTextCtrl(), Margin::integer(), Sensitive::boolean().
 setMarginSensitive(#wx_ref{type=ThisT,ref=ThisRef},Margin,Sensitive)
  when is_integer(Margin),is_boolean(Sensitive) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetMarginSensitive,
   <<ThisRef:32/?UI,Margin:32/?UI,(wxe_util:from_bool(Sensitive)):32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Margin::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetmarginsensitive">external documentation</a>.
+-spec getMarginSensitive(This, Margin) -> boolean() when
+	This::wxStyledTextCtrl(), Margin::integer().
 getMarginSensitive(#wx_ref{type=ThisT,ref=ThisRef},Margin)
  when is_integer(Margin) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetMarginSensitive,
   <<ThisRef:32/?UI,Margin:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlstyleclearall">external documentation</a>.
+-spec styleClearAll(This) -> ok when
+	This::wxStyledTextCtrl().
 styleClearAll(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_StyleClearAll,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Style::integer(), Fore::wx:colour()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlstylesetforeground">external documentation</a>.
+-spec styleSetForeground(This, Style, Fore) -> ok when
+	This::wxStyledTextCtrl(), Style::integer(), Fore::wx:wx_colour().
 styleSetForeground(#wx_ref{type=ThisT,ref=ThisRef},Style,Fore)
  when is_integer(Style),tuple_size(Fore) =:= 3; tuple_size(Fore) =:= 4 ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_StyleSetForeground,
   <<ThisRef:32/?UI,Style:32/?UI,(wxe_util:colour_bin(Fore)):16/binary>>).
 
-%% @spec (This::wxStyledTextCtrl(), Style::integer(), Back::wx:colour()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlstylesetbackground">external documentation</a>.
+-spec styleSetBackground(This, Style, Back) -> ok when
+	This::wxStyledTextCtrl(), Style::integer(), Back::wx:wx_colour().
 styleSetBackground(#wx_ref{type=ThisT,ref=ThisRef},Style,Back)
  when is_integer(Style),tuple_size(Back) =:= 3; tuple_size(Back) =:= 4 ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_StyleSetBackground,
   <<ThisRef:32/?UI,Style:32/?UI,(wxe_util:colour_bin(Back)):16/binary>>).
 
-%% @spec (This::wxStyledTextCtrl(), Style::integer(), Bold::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlstylesetbold">external documentation</a>.
+-spec styleSetBold(This, Style, Bold) -> ok when
+	This::wxStyledTextCtrl(), Style::integer(), Bold::boolean().
 styleSetBold(#wx_ref{type=ThisT,ref=ThisRef},Style,Bold)
  when is_integer(Style),is_boolean(Bold) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_StyleSetBold,
   <<ThisRef:32/?UI,Style:32/?UI,(wxe_util:from_bool(Bold)):32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Style::integer(), Italic::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlstylesetitalic">external documentation</a>.
+-spec styleSetItalic(This, Style, Italic) -> ok when
+	This::wxStyledTextCtrl(), Style::integer(), Italic::boolean().
 styleSetItalic(#wx_ref{type=ThisT,ref=ThisRef},Style,Italic)
  when is_integer(Style),is_boolean(Italic) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_StyleSetItalic,
   <<ThisRef:32/?UI,Style:32/?UI,(wxe_util:from_bool(Italic)):32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Style::integer(), SizePoints::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlstylesetsize">external documentation</a>.
+-spec styleSetSize(This, Style, SizePoints) -> ok when
+	This::wxStyledTextCtrl(), Style::integer(), SizePoints::integer().
 styleSetSize(#wx_ref{type=ThisT,ref=ThisRef},Style,SizePoints)
  when is_integer(Style),is_integer(SizePoints) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_StyleSetSize,
   <<ThisRef:32/?UI,Style:32/?UI,SizePoints:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Style::integer(), FontName::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlstylesetfacename">external documentation</a>.
+-spec styleSetFaceName(This, Style, FontName) -> ok when
+	This::wxStyledTextCtrl(), Style::integer(), FontName::string().
 styleSetFaceName(#wx_ref{type=ThisT,ref=ThisRef},Style,FontName)
  when is_integer(Style),is_list(FontName) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
@@ -744,140 +827,158 @@ styleSetFaceName(#wx_ref{type=ThisT,ref=ThisRef},Style,FontName)
   wxe_util:cast(?wxStyledTextCtrl_StyleSetFaceName,
   <<ThisRef:32/?UI,Style:32/?UI,(byte_size(FontName_UC)):32/?UI,(FontName_UC)/binary, 0:(((8- ((4+byte_size(FontName_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxStyledTextCtrl(), Style::integer(), Filled::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlstyleseteolfilled">external documentation</a>.
+-spec styleSetEOLFilled(This, Style, Filled) -> ok when
+	This::wxStyledTextCtrl(), Style::integer(), Filled::boolean().
 styleSetEOLFilled(#wx_ref{type=ThisT,ref=ThisRef},Style,Filled)
  when is_integer(Style),is_boolean(Filled) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_StyleSetEOLFilled,
   <<ThisRef:32/?UI,Style:32/?UI,(wxe_util:from_bool(Filled)):32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlstyleresetdefault">external documentation</a>.
+-spec styleResetDefault(This) -> ok when
+	This::wxStyledTextCtrl().
 styleResetDefault(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_StyleResetDefault,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Style::integer(), Underline::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlstylesetunderline">external documentation</a>.
+-spec styleSetUnderline(This, Style, Underline) -> ok when
+	This::wxStyledTextCtrl(), Style::integer(), Underline::boolean().
 styleSetUnderline(#wx_ref{type=ThisT,ref=ThisRef},Style,Underline)
  when is_integer(Style),is_boolean(Underline) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_StyleSetUnderline,
   <<ThisRef:32/?UI,Style:32/?UI,(wxe_util:from_bool(Underline)):32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Style::integer(), CaseForce::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlstylesetcase">external documentation</a>.
+-spec styleSetCase(This, Style, CaseForce) -> ok when
+	This::wxStyledTextCtrl(), Style::integer(), CaseForce::integer().
 styleSetCase(#wx_ref{type=ThisT,ref=ThisRef},Style,CaseForce)
  when is_integer(Style),is_integer(CaseForce) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_StyleSetCase,
   <<ThisRef:32/?UI,Style:32/?UI,CaseForce:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Style::integer(), Hotspot::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlstylesethotspot">external documentation</a>.
+-spec styleSetHotSpot(This, Style, Hotspot) -> ok when
+	This::wxStyledTextCtrl(), Style::integer(), Hotspot::boolean().
 styleSetHotSpot(#wx_ref{type=ThisT,ref=ThisRef},Style,Hotspot)
  when is_integer(Style),is_boolean(Hotspot) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_StyleSetHotSpot,
   <<ThisRef:32/?UI,Style:32/?UI,(wxe_util:from_bool(Hotspot)):32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), UseSetting::bool(), Fore::wx:colour()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetselforeground">external documentation</a>.
+-spec setSelForeground(This, UseSetting, Fore) -> ok when
+	This::wxStyledTextCtrl(), UseSetting::boolean(), Fore::wx:wx_colour().
 setSelForeground(#wx_ref{type=ThisT,ref=ThisRef},UseSetting,Fore)
  when is_boolean(UseSetting),tuple_size(Fore) =:= 3; tuple_size(Fore) =:= 4 ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetSelForeground,
   <<ThisRef:32/?UI,(wxe_util:from_bool(UseSetting)):32/?UI,(wxe_util:colour_bin(Fore)):16/binary>>).
 
-%% @spec (This::wxStyledTextCtrl(), UseSetting::bool(), Back::wx:colour()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetselbackground">external documentation</a>.
+-spec setSelBackground(This, UseSetting, Back) -> ok when
+	This::wxStyledTextCtrl(), UseSetting::boolean(), Back::wx:wx_colour().
 setSelBackground(#wx_ref{type=ThisT,ref=ThisRef},UseSetting,Back)
  when is_boolean(UseSetting),tuple_size(Back) =:= 3; tuple_size(Back) =:= 4 ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetSelBackground,
   <<ThisRef:32/?UI,(wxe_util:from_bool(UseSetting)):32/?UI,(wxe_util:colour_bin(Back)):16/binary>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetselalpha">external documentation</a>.
+-spec getSelAlpha(This) -> integer() when
+	This::wxStyledTextCtrl().
 getSelAlpha(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetSelAlpha,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Alpha::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetselalpha">external documentation</a>.
+-spec setSelAlpha(This, Alpha) -> ok when
+	This::wxStyledTextCtrl(), Alpha::integer().
 setSelAlpha(#wx_ref{type=ThisT,ref=ThisRef},Alpha)
  when is_integer(Alpha) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetSelAlpha,
   <<ThisRef:32/?UI,Alpha:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Fore::wx:colour()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetcaretforeground">external documentation</a>.
+-spec setCaretForeground(This, Fore) -> ok when
+	This::wxStyledTextCtrl(), Fore::wx:wx_colour().
 setCaretForeground(#wx_ref{type=ThisT,ref=ThisRef},Fore)
  when tuple_size(Fore) =:= 3; tuple_size(Fore) =:= 4 ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetCaretForeground,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(Fore)):16/binary>>).
 
-%% @spec (This::wxStyledTextCtrl(), Key::integer(), Modifiers::integer(), Cmd::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlcmdkeyassign">external documentation</a>.
+-spec cmdKeyAssign(This, Key, Modifiers, Cmd) -> ok when
+	This::wxStyledTextCtrl(), Key::integer(), Modifiers::integer(), Cmd::integer().
 cmdKeyAssign(#wx_ref{type=ThisT,ref=ThisRef},Key,Modifiers,Cmd)
  when is_integer(Key),is_integer(Modifiers),is_integer(Cmd) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_CmdKeyAssign,
   <<ThisRef:32/?UI,Key:32/?UI,Modifiers:32/?UI,Cmd:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Key::integer(), Modifiers::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlcmdkeyclear">external documentation</a>.
+-spec cmdKeyClear(This, Key, Modifiers) -> ok when
+	This::wxStyledTextCtrl(), Key::integer(), Modifiers::integer().
 cmdKeyClear(#wx_ref{type=ThisT,ref=ThisRef},Key,Modifiers)
  when is_integer(Key),is_integer(Modifiers) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_CmdKeyClear,
   <<ThisRef:32/?UI,Key:32/?UI,Modifiers:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlcmdkeyclearall">external documentation</a>.
+-spec cmdKeyClearAll(This) -> ok when
+	This::wxStyledTextCtrl().
 cmdKeyClearAll(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_CmdKeyClearAll,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Length::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetstylebytes">external documentation</a>.
+-spec setStyleBytes(This, Length) -> integer() when
+	This::wxStyledTextCtrl(), Length::integer().
 setStyleBytes(#wx_ref{type=ThisT,ref=ThisRef},Length)
  when is_integer(Length) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_SetStyleBytes,
   <<ThisRef:32/?UI,Length:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Style::integer(), Visible::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlstylesetvisible">external documentation</a>.
+-spec styleSetVisible(This, Style, Visible) -> ok when
+	This::wxStyledTextCtrl(), Style::integer(), Visible::boolean().
 styleSetVisible(#wx_ref{type=ThisT,ref=ThisRef},Style,Visible)
  when is_integer(Style),is_boolean(Visible) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_StyleSetVisible,
   <<ThisRef:32/?UI,Style:32/?UI,(wxe_util:from_bool(Visible)):32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetcaretperiod">external documentation</a>.
+-spec getCaretPeriod(This) -> integer() when
+	This::wxStyledTextCtrl().
 getCaretPeriod(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetCaretPeriod,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), PeriodMilliseconds::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetcaretperiod">external documentation</a>.
+-spec setCaretPeriod(This, PeriodMilliseconds) -> ok when
+	This::wxStyledTextCtrl(), PeriodMilliseconds::integer().
 setCaretPeriod(#wx_ref{type=ThisT,ref=ThisRef},PeriodMilliseconds)
  when is_integer(PeriodMilliseconds) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetCaretPeriod,
   <<ThisRef:32/?UI,PeriodMilliseconds:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Characters::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetwordchars">external documentation</a>.
+-spec setWordChars(This, Characters) -> ok when
+	This::wxStyledTextCtrl(), Characters::string().
 setWordChars(#wx_ref{type=ThisT,ref=ThisRef},Characters)
  when is_list(Characters) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
@@ -885,130 +986,147 @@ setWordChars(#wx_ref{type=ThisT,ref=ThisRef},Characters)
   wxe_util:cast(?wxStyledTextCtrl_SetWordChars,
   <<ThisRef:32/?UI,(byte_size(Characters_UC)):32/?UI,(Characters_UC)/binary, 0:(((8- ((0+byte_size(Characters_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlbeginundoaction">external documentation</a>.
+-spec beginUndoAction(This) -> ok when
+	This::wxStyledTextCtrl().
 beginUndoAction(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_BeginUndoAction,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlendundoaction">external documentation</a>.
+-spec endUndoAction(This) -> ok when
+	This::wxStyledTextCtrl().
 endUndoAction(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_EndUndoAction,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Indic::integer(), Style::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlindicatorsetstyle">external documentation</a>.
+-spec indicatorSetStyle(This, Indic, Style) -> ok when
+	This::wxStyledTextCtrl(), Indic::integer(), Style::integer().
 indicatorSetStyle(#wx_ref{type=ThisT,ref=ThisRef},Indic,Style)
  when is_integer(Indic),is_integer(Style) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_IndicatorSetStyle,
   <<ThisRef:32/?UI,Indic:32/?UI,Style:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Indic::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlindicatorgetstyle">external documentation</a>.
+-spec indicatorGetStyle(This, Indic) -> integer() when
+	This::wxStyledTextCtrl(), Indic::integer().
 indicatorGetStyle(#wx_ref{type=ThisT,ref=ThisRef},Indic)
  when is_integer(Indic) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_IndicatorGetStyle,
   <<ThisRef:32/?UI,Indic:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Indic::integer(), Fore::wx:colour()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlindicatorsetforeground">external documentation</a>.
+-spec indicatorSetForeground(This, Indic, Fore) -> ok when
+	This::wxStyledTextCtrl(), Indic::integer(), Fore::wx:wx_colour().
 indicatorSetForeground(#wx_ref{type=ThisT,ref=ThisRef},Indic,Fore)
  when is_integer(Indic),tuple_size(Fore) =:= 3; tuple_size(Fore) =:= 4 ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_IndicatorSetForeground,
   <<ThisRef:32/?UI,Indic:32/?UI,(wxe_util:colour_bin(Fore)):16/binary>>).
 
-%% @spec (This::wxStyledTextCtrl(), Indic::integer()) -> wx:colour()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlindicatorgetforeground">external documentation</a>.
+-spec indicatorGetForeground(This, Indic) -> wx:wx_colour() when
+	This::wxStyledTextCtrl(), Indic::integer().
 indicatorGetForeground(#wx_ref{type=ThisT,ref=ThisRef},Indic)
  when is_integer(Indic) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_IndicatorGetForeground,
   <<ThisRef:32/?UI,Indic:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), UseSetting::bool(), Fore::wx:colour()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetwhitespaceforeground">external documentation</a>.
+-spec setWhitespaceForeground(This, UseSetting, Fore) -> ok when
+	This::wxStyledTextCtrl(), UseSetting::boolean(), Fore::wx:wx_colour().
 setWhitespaceForeground(#wx_ref{type=ThisT,ref=ThisRef},UseSetting,Fore)
  when is_boolean(UseSetting),tuple_size(Fore) =:= 3; tuple_size(Fore) =:= 4 ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetWhitespaceForeground,
   <<ThisRef:32/?UI,(wxe_util:from_bool(UseSetting)):32/?UI,(wxe_util:colour_bin(Fore)):16/binary>>).
 
-%% @spec (This::wxStyledTextCtrl(), UseSetting::bool(), Back::wx:colour()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetwhitespacebackground">external documentation</a>.
+-spec setWhitespaceBackground(This, UseSetting, Back) -> ok when
+	This::wxStyledTextCtrl(), UseSetting::boolean(), Back::wx:wx_colour().
 setWhitespaceBackground(#wx_ref{type=ThisT,ref=ThisRef},UseSetting,Back)
  when is_boolean(UseSetting),tuple_size(Back) =:= 3; tuple_size(Back) =:= 4 ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetWhitespaceBackground,
   <<ThisRef:32/?UI,(wxe_util:from_bool(UseSetting)):32/?UI,(wxe_util:colour_bin(Back)):16/binary>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetstylebits">external documentation</a>.
+-spec getStyleBits(This) -> integer() when
+	This::wxStyledTextCtrl().
 getStyleBits(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetStyleBits,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Line::integer(), State::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetlinestate">external documentation</a>.
+-spec setLineState(This, Line, State) -> ok when
+	This::wxStyledTextCtrl(), Line::integer(), State::integer().
 setLineState(#wx_ref{type=ThisT,ref=ThisRef},Line,State)
  when is_integer(Line),is_integer(State) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetLineState,
   <<ThisRef:32/?UI,Line:32/?UI,State:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Line::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetlinestate">external documentation</a>.
+-spec getLineState(This, Line) -> integer() when
+	This::wxStyledTextCtrl(), Line::integer().
 getLineState(#wx_ref{type=ThisT,ref=ThisRef},Line)
  when is_integer(Line) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetLineState,
   <<ThisRef:32/?UI,Line:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetmaxlinestate">external documentation</a>.
+-spec getMaxLineState(This) -> integer() when
+	This::wxStyledTextCtrl().
 getMaxLineState(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetMaxLineState,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetcaretlinevisible">external documentation</a>.
+-spec getCaretLineVisible(This) -> boolean() when
+	This::wxStyledTextCtrl().
 getCaretLineVisible(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetCaretLineVisible,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Show::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetcaretlinevisible">external documentation</a>.
+-spec setCaretLineVisible(This, Show) -> ok when
+	This::wxStyledTextCtrl(), Show::boolean().
 setCaretLineVisible(#wx_ref{type=ThisT,ref=ThisRef},Show)
  when is_boolean(Show) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetCaretLineVisible,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Show)):32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> wx:colour()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetcaretlinebackground">external documentation</a>.
+-spec getCaretLineBackground(This) -> wx:wx_colour() when
+	This::wxStyledTextCtrl().
 getCaretLineBackground(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetCaretLineBackground,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Back::wx:colour()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetcaretlinebackground">external documentation</a>.
+-spec setCaretLineBackground(This, Back) -> ok when
+	This::wxStyledTextCtrl(), Back::wx:wx_colour().
 setCaretLineBackground(#wx_ref{type=ThisT,ref=ThisRef},Back)
  when tuple_size(Back) =:= 3; tuple_size(Back) =:= 4 ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetCaretLineBackground,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(Back)):16/binary>>).
 
-%% @spec (This::wxStyledTextCtrl(), LenEntered::integer(), ItemList::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompshow">external documentation</a>.
+-spec autoCompShow(This, LenEntered, ItemList) -> ok when
+	This::wxStyledTextCtrl(), LenEntered::integer(), ItemList::string().
 autoCompShow(#wx_ref{type=ThisT,ref=ThisRef},LenEntered,ItemList)
  when is_integer(LenEntered),is_list(ItemList) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
@@ -1016,36 +1134,41 @@ autoCompShow(#wx_ref{type=ThisT,ref=ThisRef},LenEntered,ItemList)
   wxe_util:cast(?wxStyledTextCtrl_AutoCompShow,
   <<ThisRef:32/?UI,LenEntered:32/?UI,(byte_size(ItemList_UC)):32/?UI,(ItemList_UC)/binary, 0:(((8- ((4+byte_size(ItemList_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompcancel">external documentation</a>.
+-spec autoCompCancel(This) -> ok when
+	This::wxStyledTextCtrl().
 autoCompCancel(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_AutoCompCancel,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompactive">external documentation</a>.
+-spec autoCompActive(This) -> boolean() when
+	This::wxStyledTextCtrl().
 autoCompActive(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_AutoCompActive,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompposstart">external documentation</a>.
+-spec autoCompPosStart(This) -> integer() when
+	This::wxStyledTextCtrl().
 autoCompPosStart(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_AutoCompPosStart,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompcomplete">external documentation</a>.
+-spec autoCompComplete(This) -> ok when
+	This::wxStyledTextCtrl().
 autoCompComplete(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_AutoCompComplete,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), CharacterSet::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompstops">external documentation</a>.
+-spec autoCompStops(This, CharacterSet) -> ok when
+	This::wxStyledTextCtrl(), CharacterSet::string().
 autoCompStops(#wx_ref{type=ThisT,ref=ThisRef},CharacterSet)
  when is_list(CharacterSet) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
@@ -1053,23 +1176,26 @@ autoCompStops(#wx_ref{type=ThisT,ref=ThisRef},CharacterSet)
   wxe_util:cast(?wxStyledTextCtrl_AutoCompStops,
   <<ThisRef:32/?UI,(byte_size(CharacterSet_UC)):32/?UI,(CharacterSet_UC)/binary, 0:(((8- ((0+byte_size(CharacterSet_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxStyledTextCtrl(), SeparatorCharacter::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompsetseparator">external documentation</a>.
+-spec autoCompSetSeparator(This, SeparatorCharacter) -> ok when
+	This::wxStyledTextCtrl(), SeparatorCharacter::integer().
 autoCompSetSeparator(#wx_ref{type=ThisT,ref=ThisRef},SeparatorCharacter)
  when is_integer(SeparatorCharacter) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_AutoCompSetSeparator,
   <<ThisRef:32/?UI,SeparatorCharacter:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompgetseparator">external documentation</a>.
+-spec autoCompGetSeparator(This) -> integer() when
+	This::wxStyledTextCtrl().
 autoCompGetSeparator(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_AutoCompGetSeparator,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Text::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompselect">external documentation</a>.
+-spec autoCompSelect(This, Text) -> ok when
+	This::wxStyledTextCtrl(), Text::string().
 autoCompSelect(#wx_ref{type=ThisT,ref=ThisRef},Text)
  when is_list(Text) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
@@ -1077,23 +1203,26 @@ autoCompSelect(#wx_ref{type=ThisT,ref=ThisRef},Text)
   wxe_util:cast(?wxStyledTextCtrl_AutoCompSelect,
   <<ThisRef:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxStyledTextCtrl(), Cancel::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompsetcancelatstart">external documentation</a>.
+-spec autoCompSetCancelAtStart(This, Cancel) -> ok when
+	This::wxStyledTextCtrl(), Cancel::boolean().
 autoCompSetCancelAtStart(#wx_ref{type=ThisT,ref=ThisRef},Cancel)
  when is_boolean(Cancel) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_AutoCompSetCancelAtStart,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Cancel)):32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompgetcancelatstart">external documentation</a>.
+-spec autoCompGetCancelAtStart(This) -> boolean() when
+	This::wxStyledTextCtrl().
 autoCompGetCancelAtStart(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_AutoCompGetCancelAtStart,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), CharacterSet::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompsetfillups">external documentation</a>.
+-spec autoCompSetFillUps(This, CharacterSet) -> ok when
+	This::wxStyledTextCtrl(), CharacterSet::string().
 autoCompSetFillUps(#wx_ref{type=ThisT,ref=ThisRef},CharacterSet)
  when is_list(CharacterSet) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
@@ -1101,38 +1230,43 @@ autoCompSetFillUps(#wx_ref{type=ThisT,ref=ThisRef},CharacterSet)
   wxe_util:cast(?wxStyledTextCtrl_AutoCompSetFillUps,
   <<ThisRef:32/?UI,(byte_size(CharacterSet_UC)):32/?UI,(CharacterSet_UC)/binary, 0:(((8- ((0+byte_size(CharacterSet_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxStyledTextCtrl(), ChooseSingle::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompsetchoosesingle">external documentation</a>.
+-spec autoCompSetChooseSingle(This, ChooseSingle) -> ok when
+	This::wxStyledTextCtrl(), ChooseSingle::boolean().
 autoCompSetChooseSingle(#wx_ref{type=ThisT,ref=ThisRef},ChooseSingle)
  when is_boolean(ChooseSingle) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_AutoCompSetChooseSingle,
   <<ThisRef:32/?UI,(wxe_util:from_bool(ChooseSingle)):32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompgetchoosesingle">external documentation</a>.
+-spec autoCompGetChooseSingle(This) -> boolean() when
+	This::wxStyledTextCtrl().
 autoCompGetChooseSingle(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_AutoCompGetChooseSingle,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), IgnoreCase::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompsetignorecase">external documentation</a>.
+-spec autoCompSetIgnoreCase(This, IgnoreCase) -> ok when
+	This::wxStyledTextCtrl(), IgnoreCase::boolean().
 autoCompSetIgnoreCase(#wx_ref{type=ThisT,ref=ThisRef},IgnoreCase)
  when is_boolean(IgnoreCase) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_AutoCompSetIgnoreCase,
   <<ThisRef:32/?UI,(wxe_util:from_bool(IgnoreCase)):32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompgetignorecase">external documentation</a>.
+-spec autoCompGetIgnoreCase(This) -> boolean() when
+	This::wxStyledTextCtrl().
 autoCompGetIgnoreCase(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_AutoCompGetIgnoreCase,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), ListType::integer(), ItemList::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrluserlistshow">external documentation</a>.
+-spec userListShow(This, ListType, ItemList) -> ok when
+	This::wxStyledTextCtrl(), ListType::integer(), ItemList::string().
 userListShow(#wx_ref{type=ThisT,ref=ThisRef},ListType,ItemList)
  when is_integer(ListType),is_list(ItemList) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
@@ -1140,38 +1274,43 @@ userListShow(#wx_ref{type=ThisT,ref=ThisRef},ListType,ItemList)
   wxe_util:cast(?wxStyledTextCtrl_UserListShow,
   <<ThisRef:32/?UI,ListType:32/?UI,(byte_size(ItemList_UC)):32/?UI,(ItemList_UC)/binary, 0:(((8- ((4+byte_size(ItemList_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxStyledTextCtrl(), AutoHide::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompsetautohide">external documentation</a>.
+-spec autoCompSetAutoHide(This, AutoHide) -> ok when
+	This::wxStyledTextCtrl(), AutoHide::boolean().
 autoCompSetAutoHide(#wx_ref{type=ThisT,ref=ThisRef},AutoHide)
  when is_boolean(AutoHide) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_AutoCompSetAutoHide,
   <<ThisRef:32/?UI,(wxe_util:from_bool(AutoHide)):32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompgetautohide">external documentation</a>.
+-spec autoCompGetAutoHide(This) -> boolean() when
+	This::wxStyledTextCtrl().
 autoCompGetAutoHide(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_AutoCompGetAutoHide,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), DropRestOfWord::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompsetdroprestofword">external documentation</a>.
+-spec autoCompSetDropRestOfWord(This, DropRestOfWord) -> ok when
+	This::wxStyledTextCtrl(), DropRestOfWord::boolean().
 autoCompSetDropRestOfWord(#wx_ref{type=ThisT,ref=ThisRef},DropRestOfWord)
  when is_boolean(DropRestOfWord) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_AutoCompSetDropRestOfWord,
   <<ThisRef:32/?UI,(wxe_util:from_bool(DropRestOfWord)):32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompgetdroprestofword">external documentation</a>.
+-spec autoCompGetDropRestOfWord(This) -> boolean() when
+	This::wxStyledTextCtrl().
 autoCompGetDropRestOfWord(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_AutoCompGetDropRestOfWord,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Type::integer(), Bmp::wxBitmap:wxBitmap()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlregisterimage">external documentation</a>.
+-spec registerImage(This, Type, Bmp) -> ok when
+	This::wxStyledTextCtrl(), Type::integer(), Bmp::wxBitmap:wxBitmap().
 registerImage(#wx_ref{type=ThisT,ref=ThisRef},Type,#wx_ref{type=BmpT,ref=BmpRef})
  when is_integer(Type) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
@@ -1179,271 +1318,308 @@ registerImage(#wx_ref{type=ThisT,ref=ThisRef},Type,#wx_ref{type=BmpT,ref=BmpRef}
   wxe_util:cast(?wxStyledTextCtrl_RegisterImage,
   <<ThisRef:32/?UI,Type:32/?UI,BmpRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlclearregisteredimages">external documentation</a>.
+-spec clearRegisteredImages(This) -> ok when
+	This::wxStyledTextCtrl().
 clearRegisteredImages(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_ClearRegisteredImages,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompgettypeseparator">external documentation</a>.
+-spec autoCompGetTypeSeparator(This) -> integer() when
+	This::wxStyledTextCtrl().
 autoCompGetTypeSeparator(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_AutoCompGetTypeSeparator,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), SeparatorCharacter::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompsettypeseparator">external documentation</a>.
+-spec autoCompSetTypeSeparator(This, SeparatorCharacter) -> ok when
+	This::wxStyledTextCtrl(), SeparatorCharacter::integer().
 autoCompSetTypeSeparator(#wx_ref{type=ThisT,ref=ThisRef},SeparatorCharacter)
  when is_integer(SeparatorCharacter) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_AutoCompSetTypeSeparator,
   <<ThisRef:32/?UI,SeparatorCharacter:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), CharacterCount::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompsetmaxwidth">external documentation</a>.
+-spec autoCompSetMaxWidth(This, CharacterCount) -> ok when
+	This::wxStyledTextCtrl(), CharacterCount::integer().
 autoCompSetMaxWidth(#wx_ref{type=ThisT,ref=ThisRef},CharacterCount)
  when is_integer(CharacterCount) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_AutoCompSetMaxWidth,
   <<ThisRef:32/?UI,CharacterCount:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompgetmaxwidth">external documentation</a>.
+-spec autoCompGetMaxWidth(This) -> integer() when
+	This::wxStyledTextCtrl().
 autoCompGetMaxWidth(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_AutoCompGetMaxWidth,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), RowCount::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompsetmaxheight">external documentation</a>.
+-spec autoCompSetMaxHeight(This, RowCount) -> ok when
+	This::wxStyledTextCtrl(), RowCount::integer().
 autoCompSetMaxHeight(#wx_ref{type=ThisT,ref=ThisRef},RowCount)
  when is_integer(RowCount) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_AutoCompSetMaxHeight,
   <<ThisRef:32/?UI,RowCount:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompgetmaxheight">external documentation</a>.
+-spec autoCompGetMaxHeight(This) -> integer() when
+	This::wxStyledTextCtrl().
 autoCompGetMaxHeight(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_AutoCompGetMaxHeight,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), IndentSize::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetindent">external documentation</a>.
+-spec setIndent(This, IndentSize) -> ok when
+	This::wxStyledTextCtrl(), IndentSize::integer().
 setIndent(#wx_ref{type=ThisT,ref=ThisRef},IndentSize)
  when is_integer(IndentSize) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetIndent,
   <<ThisRef:32/?UI,IndentSize:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetindent">external documentation</a>.
+-spec getIndent(This) -> integer() when
+	This::wxStyledTextCtrl().
 getIndent(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetIndent,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), UseTabs::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetusetabs">external documentation</a>.
+-spec setUseTabs(This, UseTabs) -> ok when
+	This::wxStyledTextCtrl(), UseTabs::boolean().
 setUseTabs(#wx_ref{type=ThisT,ref=ThisRef},UseTabs)
  when is_boolean(UseTabs) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetUseTabs,
   <<ThisRef:32/?UI,(wxe_util:from_bool(UseTabs)):32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetusetabs">external documentation</a>.
+-spec getUseTabs(This) -> boolean() when
+	This::wxStyledTextCtrl().
 getUseTabs(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetUseTabs,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Line::integer(), IndentSize::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetlineindentation">external documentation</a>.
+-spec setLineIndentation(This, Line, IndentSize) -> ok when
+	This::wxStyledTextCtrl(), Line::integer(), IndentSize::integer().
 setLineIndentation(#wx_ref{type=ThisT,ref=ThisRef},Line,IndentSize)
  when is_integer(Line),is_integer(IndentSize) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetLineIndentation,
   <<ThisRef:32/?UI,Line:32/?UI,IndentSize:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Line::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetlineindentation">external documentation</a>.
+-spec getLineIndentation(This, Line) -> integer() when
+	This::wxStyledTextCtrl(), Line::integer().
 getLineIndentation(#wx_ref{type=ThisT,ref=ThisRef},Line)
  when is_integer(Line) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetLineIndentation,
   <<ThisRef:32/?UI,Line:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Line::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetlineindentposition">external documentation</a>.
+-spec getLineIndentPosition(This, Line) -> integer() when
+	This::wxStyledTextCtrl(), Line::integer().
 getLineIndentPosition(#wx_ref{type=ThisT,ref=ThisRef},Line)
  when is_integer(Line) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetLineIndentPosition,
   <<ThisRef:32/?UI,Line:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Pos::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetcolumn">external documentation</a>.
+-spec getColumn(This, Pos) -> integer() when
+	This::wxStyledTextCtrl(), Pos::integer().
 getColumn(#wx_ref{type=ThisT,ref=ThisRef},Pos)
  when is_integer(Pos) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetColumn,
   <<ThisRef:32/?UI,Pos:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Show::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetusehorizontalscrollbar">external documentation</a>.
+-spec setUseHorizontalScrollBar(This, Show) -> ok when
+	This::wxStyledTextCtrl(), Show::boolean().
 setUseHorizontalScrollBar(#wx_ref{type=ThisT,ref=ThisRef},Show)
  when is_boolean(Show) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetUseHorizontalScrollBar,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Show)):32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetusehorizontalscrollbar">external documentation</a>.
+-spec getUseHorizontalScrollBar(This) -> boolean() when
+	This::wxStyledTextCtrl().
 getUseHorizontalScrollBar(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetUseHorizontalScrollBar,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Show::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetindentationguides">external documentation</a>.
+-spec setIndentationGuides(This, Show) -> ok when
+	This::wxStyledTextCtrl(), Show::boolean().
 setIndentationGuides(#wx_ref{type=ThisT,ref=ThisRef},Show)
  when is_boolean(Show) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetIndentationGuides,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Show)):32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetindentationguides">external documentation</a>.
+-spec getIndentationGuides(This) -> boolean() when
+	This::wxStyledTextCtrl().
 getIndentationGuides(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetIndentationGuides,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Column::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsethighlightguide">external documentation</a>.
+-spec setHighlightGuide(This, Column) -> ok when
+	This::wxStyledTextCtrl(), Column::integer().
 setHighlightGuide(#wx_ref{type=ThisT,ref=ThisRef},Column)
  when is_integer(Column) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetHighlightGuide,
   <<ThisRef:32/?UI,Column:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgethighlightguide">external documentation</a>.
+-spec getHighlightGuide(This) -> integer() when
+	This::wxStyledTextCtrl().
 getHighlightGuide(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetHighlightGuide,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Line::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetlineendposition">external documentation</a>.
+-spec getLineEndPosition(This, Line) -> integer() when
+	This::wxStyledTextCtrl(), Line::integer().
 getLineEndPosition(#wx_ref{type=ThisT,ref=ThisRef},Line)
  when is_integer(Line) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetLineEndPosition,
   <<ThisRef:32/?UI,Line:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetcodepage">external documentation</a>.
+-spec getCodePage(This) -> integer() when
+	This::wxStyledTextCtrl().
 getCodePage(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetCodePage,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> wx:colour()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetcaretforeground">external documentation</a>.
+-spec getCaretForeground(This) -> wx:wx_colour() when
+	This::wxStyledTextCtrl().
 getCaretForeground(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetCaretForeground,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetreadonly">external documentation</a>.
+-spec getReadOnly(This) -> boolean() when
+	This::wxStyledTextCtrl().
 getReadOnly(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetReadOnly,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Pos::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetcurrentpos">external documentation</a>.
+-spec setCurrentPos(This, Pos) -> ok when
+	This::wxStyledTextCtrl(), Pos::integer().
 setCurrentPos(#wx_ref{type=ThisT,ref=ThisRef},Pos)
  when is_integer(Pos) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetCurrentPos,
   <<ThisRef:32/?UI,Pos:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Pos::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetselectionstart">external documentation</a>.
+-spec setSelectionStart(This, Pos) -> ok when
+	This::wxStyledTextCtrl(), Pos::integer().
 setSelectionStart(#wx_ref{type=ThisT,ref=ThisRef},Pos)
  when is_integer(Pos) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetSelectionStart,
   <<ThisRef:32/?UI,Pos:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetselectionstart">external documentation</a>.
+-spec getSelectionStart(This) -> integer() when
+	This::wxStyledTextCtrl().
 getSelectionStart(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetSelectionStart,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Pos::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetselectionend">external documentation</a>.
+-spec setSelectionEnd(This, Pos) -> ok when
+	This::wxStyledTextCtrl(), Pos::integer().
 setSelectionEnd(#wx_ref{type=ThisT,ref=ThisRef},Pos)
  when is_integer(Pos) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetSelectionEnd,
   <<ThisRef:32/?UI,Pos:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetselectionend">external documentation</a>.
+-spec getSelectionEnd(This) -> integer() when
+	This::wxStyledTextCtrl().
 getSelectionEnd(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetSelectionEnd,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Magnification::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetprintmagnification">external documentation</a>.
+-spec setPrintMagnification(This, Magnification) -> ok when
+	This::wxStyledTextCtrl(), Magnification::integer().
 setPrintMagnification(#wx_ref{type=ThisT,ref=ThisRef},Magnification)
  when is_integer(Magnification) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetPrintMagnification,
   <<ThisRef:32/?UI,Magnification:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetprintmagnification">external documentation</a>.
+-spec getPrintMagnification(This) -> integer() when
+	This::wxStyledTextCtrl().
 getPrintMagnification(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetPrintMagnification,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Mode::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetprintcolourmode">external documentation</a>.
+-spec setPrintColourMode(This, Mode) -> ok when
+	This::wxStyledTextCtrl(), Mode::integer().
 setPrintColourMode(#wx_ref{type=ThisT,ref=ThisRef},Mode)
  when is_integer(Mode) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetPrintColourMode,
   <<ThisRef:32/?UI,Mode:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetprintcolourmode">external documentation</a>.
+-spec getPrintColourMode(This) -> integer() when
+	This::wxStyledTextCtrl().
 getPrintColourMode(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetPrintColourMode,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), MinPos::integer(), MaxPos::integer(), Text::string()) -> integer()
 %% @equiv findText(This,MinPos,MaxPos,Text, [])
+-spec findText(This, MinPos, MaxPos, Text) -> integer() when
+	This::wxStyledTextCtrl(), MinPos::integer(), MaxPos::integer(), Text::string().
+
 findText(This,MinPos,MaxPos,Text)
  when is_record(This, wx_ref),is_integer(MinPos),is_integer(MaxPos),is_list(Text) ->
   findText(This,MinPos,MaxPos,Text, []).
 
-%% @spec (This::wxStyledTextCtrl(), MinPos::integer(), MaxPos::integer(), Text::string(), [Option]) -> integer()
-%% Option = {flags, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlfindtext">external documentation</a>.
+-spec findText(This, MinPos, MaxPos, Text, [Option]) -> integer() when
+	This::wxStyledTextCtrl(), MinPos::integer(), MaxPos::integer(), Text::string(),
+	Option :: {flags, integer()}.
 findText(#wx_ref{type=ThisT,ref=ThisRef},MinPos,MaxPos,Text, Options)
  when is_integer(MinPos),is_integer(MaxPos),is_list(Text),is_list(Options) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
@@ -1454,8 +1630,9 @@ findText(#wx_ref{type=ThisT,ref=ThisRef},MinPos,MaxPos,Text, Options)
   wxe_util:call(?wxStyledTextCtrl_FindText,
   <<ThisRef:32/?UI,MinPos:32/?UI,MaxPos:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxStyledTextCtrl(), DoDraw::bool(), StartPos::integer(), EndPos::integer(), Draw::wxDC:wxDC(), Target::wxDC:wxDC(), RenderRect::{X::integer(), Y::integer(), W::integer(), H::integer()}, PageRect::{X::integer(), Y::integer(), W::integer(), H::integer()}) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlformatrange">external documentation</a>.
+-spec formatRange(This, DoDraw, StartPos, EndPos, Draw, Target, RenderRect, PageRect) -> integer() when
+	This::wxStyledTextCtrl(), DoDraw::boolean(), StartPos::integer(), EndPos::integer(), Draw::wxDC:wxDC(), Target::wxDC:wxDC(), RenderRect::{X::integer(), Y::integer(), W::integer(), H::integer()}, PageRect::{X::integer(), Y::integer(), W::integer(), H::integer()}.
 formatRange(#wx_ref{type=ThisT,ref=ThisRef},DoDraw,StartPos,EndPos,#wx_ref{type=DrawT,ref=DrawRef},#wx_ref{type=TargetT,ref=TargetRef},{RenderRectX,RenderRectY,RenderRectW,RenderRectH},{PageRectX,PageRectY,PageRectW,PageRectH})
  when is_boolean(DoDraw),is_integer(StartPos),is_integer(EndPos),is_integer(RenderRectX),is_integer(RenderRectY),is_integer(RenderRectW),is_integer(RenderRectH),is_integer(PageRectX),is_integer(PageRectY),is_integer(PageRectW),is_integer(PageRectH) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
@@ -1464,129 +1641,146 @@ formatRange(#wx_ref{type=ThisT,ref=ThisRef},DoDraw,StartPos,EndPos,#wx_ref{type=
   wxe_util:call(?wxStyledTextCtrl_FormatRange,
   <<ThisRef:32/?UI,(wxe_util:from_bool(DoDraw)):32/?UI,StartPos:32/?UI,EndPos:32/?UI,DrawRef:32/?UI,TargetRef:32/?UI,RenderRectX:32/?UI,RenderRectY:32/?UI,RenderRectW:32/?UI,RenderRectH:32/?UI,PageRectX:32/?UI,PageRectY:32/?UI,PageRectW:32/?UI,PageRectH:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetfirstvisibleline">external documentation</a>.
+-spec getFirstVisibleLine(This) -> integer() when
+	This::wxStyledTextCtrl().
 getFirstVisibleLine(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetFirstVisibleLine,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Line::integer()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetline">external documentation</a>.
+-spec getLine(This, Line) -> string() when
+	This::wxStyledTextCtrl(), Line::integer().
 getLine(#wx_ref{type=ThisT,ref=ThisRef},Line)
  when is_integer(Line) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetLine,
   <<ThisRef:32/?UI,Line:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetlinecount">external documentation</a>.
+-spec getLineCount(This) -> integer() when
+	This::wxStyledTextCtrl().
 getLineCount(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetLineCount,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), PixelWidth::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetmarginleft">external documentation</a>.
+-spec setMarginLeft(This, PixelWidth) -> ok when
+	This::wxStyledTextCtrl(), PixelWidth::integer().
 setMarginLeft(#wx_ref{type=ThisT,ref=ThisRef},PixelWidth)
  when is_integer(PixelWidth) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetMarginLeft,
   <<ThisRef:32/?UI,PixelWidth:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetmarginleft">external documentation</a>.
+-spec getMarginLeft(This) -> integer() when
+	This::wxStyledTextCtrl().
 getMarginLeft(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetMarginLeft,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), PixelWidth::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetmarginright">external documentation</a>.
+-spec setMarginRight(This, PixelWidth) -> ok when
+	This::wxStyledTextCtrl(), PixelWidth::integer().
 setMarginRight(#wx_ref{type=ThisT,ref=ThisRef},PixelWidth)
  when is_integer(PixelWidth) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetMarginRight,
   <<ThisRef:32/?UI,PixelWidth:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetmarginright">external documentation</a>.
+-spec getMarginRight(This) -> integer() when
+	This::wxStyledTextCtrl().
 getMarginRight(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetMarginRight,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetmodify">external documentation</a>.
+-spec getModify(This) -> boolean() when
+	This::wxStyledTextCtrl().
 getModify(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetModify,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Start::integer(), End::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetselection">external documentation</a>.
+-spec setSelection(This, Start, End) -> ok when
+	This::wxStyledTextCtrl(), Start::integer(), End::integer().
 setSelection(#wx_ref{type=ThisT,ref=ThisRef},Start,End)
  when is_integer(Start),is_integer(End) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetSelection,
   <<ThisRef:32/?UI,Start:32/?UI,End:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetselectedtext">external documentation</a>.
+-spec getSelectedText(This) -> string() when
+	This::wxStyledTextCtrl().
 getSelectedText(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetSelectedText,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), StartPos::integer(), EndPos::integer()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgettextrange">external documentation</a>.
+-spec getTextRange(This, StartPos, EndPos) -> string() when
+	This::wxStyledTextCtrl(), StartPos::integer(), EndPos::integer().
 getTextRange(#wx_ref{type=ThisT,ref=ThisRef},StartPos,EndPos)
  when is_integer(StartPos),is_integer(EndPos) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetTextRange,
   <<ThisRef:32/?UI,StartPos:32/?UI,EndPos:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Normal::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlhideselection">external documentation</a>.
+-spec hideSelection(This, Normal) -> ok when
+	This::wxStyledTextCtrl(), Normal::boolean().
 hideSelection(#wx_ref{type=ThisT,ref=ThisRef},Normal)
  when is_boolean(Normal) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_HideSelection,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Normal)):32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Pos::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrllinefromposition">external documentation</a>.
+-spec lineFromPosition(This, Pos) -> integer() when
+	This::wxStyledTextCtrl(), Pos::integer().
 lineFromPosition(#wx_ref{type=ThisT,ref=ThisRef},Pos)
  when is_integer(Pos) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_LineFromPosition,
   <<ThisRef:32/?UI,Pos:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Line::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlpositionfromline">external documentation</a>.
+-spec positionFromLine(This, Line) -> integer() when
+	This::wxStyledTextCtrl(), Line::integer().
 positionFromLine(#wx_ref{type=ThisT,ref=ThisRef},Line)
  when is_integer(Line) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_PositionFromLine,
   <<ThisRef:32/?UI,Line:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Columns::integer(), Lines::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrllinescroll">external documentation</a>.
+-spec lineScroll(This, Columns, Lines) -> ok when
+	This::wxStyledTextCtrl(), Columns::integer(), Lines::integer().
 lineScroll(#wx_ref{type=ThisT,ref=ThisRef},Columns,Lines)
  when is_integer(Columns),is_integer(Lines) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_LineScroll,
   <<ThisRef:32/?UI,Columns:32/?UI,Lines:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlensurecaretvisible">external documentation</a>.
+-spec ensureCaretVisible(This) -> ok when
+	This::wxStyledTextCtrl().
 ensureCaretVisible(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_EnsureCaretVisible,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Text::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlreplaceselection">external documentation</a>.
+-spec replaceSelection(This, Text) -> ok when
+	This::wxStyledTextCtrl(), Text::string().
 replaceSelection(#wx_ref{type=ThisT,ref=ThisRef},Text)
  when is_list(Text) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
@@ -1594,72 +1788,82 @@ replaceSelection(#wx_ref{type=ThisT,ref=ThisRef},Text)
   wxe_util:cast(?wxStyledTextCtrl_ReplaceSelection,
   <<ThisRef:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxStyledTextCtrl(), ReadOnly::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetreadonly">external documentation</a>.
+-spec setReadOnly(This, ReadOnly) -> ok when
+	This::wxStyledTextCtrl(), ReadOnly::boolean().
 setReadOnly(#wx_ref{type=ThisT,ref=ThisRef},ReadOnly)
  when is_boolean(ReadOnly) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetReadOnly,
   <<ThisRef:32/?UI,(wxe_util:from_bool(ReadOnly)):32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlcanpaste">external documentation</a>.
+-spec canPaste(This) -> boolean() when
+	This::wxStyledTextCtrl().
 canPaste(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_CanPaste,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlcanundo">external documentation</a>.
+-spec canUndo(This) -> boolean() when
+	This::wxStyledTextCtrl().
 canUndo(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_CanUndo,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlemptyundobuffer">external documentation</a>.
+-spec emptyUndoBuffer(This) -> ok when
+	This::wxStyledTextCtrl().
 emptyUndoBuffer(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_EmptyUndoBuffer,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlundo">external documentation</a>.
+-spec undo(This) -> ok when
+	This::wxStyledTextCtrl().
 undo(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_Undo,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlcut">external documentation</a>.
+-spec cut(This) -> ok when
+	This::wxStyledTextCtrl().
 cut(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_Cut,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlcopy">external documentation</a>.
+-spec copy(This) -> ok when
+	This::wxStyledTextCtrl().
 copy(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_Copy,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlpaste">external documentation</a>.
+-spec paste(This) -> ok when
+	This::wxStyledTextCtrl().
 paste(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_Paste,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlclear">external documentation</a>.
+-spec clear(This) -> ok when
+	This::wxStyledTextCtrl().
 clear(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_Clear,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Text::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsettext">external documentation</a>.
+-spec setText(This, Text) -> ok when
+	This::wxStyledTextCtrl(), Text::string().
 setText(#wx_ref{type=ThisT,ref=ThisRef},Text)
  when is_list(Text) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
@@ -1667,74 +1871,84 @@ setText(#wx_ref{type=ThisT,ref=ThisRef},Text)
   wxe_util:cast(?wxStyledTextCtrl_SetText,
   <<ThisRef:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgettext">external documentation</a>.
+-spec getText(This) -> string() when
+	This::wxStyledTextCtrl().
 getText(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetText,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgettextlength">external documentation</a>.
+-spec getTextLength(This) -> integer() when
+	This::wxStyledTextCtrl().
 getTextLength(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetTextLength,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetovertype">external documentation</a>.
+-spec getOvertype(This) -> boolean() when
+	This::wxStyledTextCtrl().
 getOvertype(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetOvertype,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), PixelWidth::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetcaretwidth">external documentation</a>.
+-spec setCaretWidth(This, PixelWidth) -> ok when
+	This::wxStyledTextCtrl(), PixelWidth::integer().
 setCaretWidth(#wx_ref{type=ThisT,ref=ThisRef},PixelWidth)
  when is_integer(PixelWidth) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetCaretWidth,
   <<ThisRef:32/?UI,PixelWidth:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetcaretwidth">external documentation</a>.
+-spec getCaretWidth(This) -> integer() when
+	This::wxStyledTextCtrl().
 getCaretWidth(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetCaretWidth,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Pos::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsettargetstart">external documentation</a>.
+-spec setTargetStart(This, Pos) -> ok when
+	This::wxStyledTextCtrl(), Pos::integer().
 setTargetStart(#wx_ref{type=ThisT,ref=ThisRef},Pos)
  when is_integer(Pos) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetTargetStart,
   <<ThisRef:32/?UI,Pos:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgettargetstart">external documentation</a>.
+-spec getTargetStart(This) -> integer() when
+	This::wxStyledTextCtrl().
 getTargetStart(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetTargetStart,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Pos::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsettargetend">external documentation</a>.
+-spec setTargetEnd(This, Pos) -> ok when
+	This::wxStyledTextCtrl(), Pos::integer().
 setTargetEnd(#wx_ref{type=ThisT,ref=ThisRef},Pos)
  when is_integer(Pos) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetTargetEnd,
   <<ThisRef:32/?UI,Pos:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgettargetend">external documentation</a>.
+-spec getTargetEnd(This) -> integer() when
+	This::wxStyledTextCtrl().
 getTargetEnd(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetTargetEnd,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Text::string()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlreplacetarget">external documentation</a>.
+-spec replaceTarget(This, Text) -> integer() when
+	This::wxStyledTextCtrl(), Text::string().
 replaceTarget(#wx_ref{type=ThisT,ref=ThisRef},Text)
  when is_list(Text) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
@@ -1742,8 +1956,9 @@ replaceTarget(#wx_ref{type=ThisT,ref=ThisRef},Text)
   wxe_util:call(?wxStyledTextCtrl_ReplaceTarget,
   <<ThisRef:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxStyledTextCtrl(), Text::string()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsearchintarget">external documentation</a>.
+-spec searchInTarget(This, Text) -> integer() when
+	This::wxStyledTextCtrl(), Text::string().
 searchInTarget(#wx_ref{type=ThisT,ref=ThisRef},Text)
  when is_list(Text) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
@@ -1751,23 +1966,26 @@ searchInTarget(#wx_ref{type=ThisT,ref=ThisRef},Text)
   wxe_util:call(?wxStyledTextCtrl_SearchInTarget,
   <<ThisRef:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxStyledTextCtrl(), Flags::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetsearchflags">external documentation</a>.
+-spec setSearchFlags(This, Flags) -> ok when
+	This::wxStyledTextCtrl(), Flags::integer().
 setSearchFlags(#wx_ref{type=ThisT,ref=ThisRef},Flags)
  when is_integer(Flags) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetSearchFlags,
   <<ThisRef:32/?UI,Flags:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetsearchflags">external documentation</a>.
+-spec getSearchFlags(This) -> integer() when
+	This::wxStyledTextCtrl().
 getSearchFlags(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetSearchFlags,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Pos::integer(), Definition::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlcalltipshow">external documentation</a>.
+-spec callTipShow(This, Pos, Definition) -> ok when
+	This::wxStyledTextCtrl(), Pos::integer(), Definition::string().
 callTipShow(#wx_ref{type=ThisT,ref=ThisRef},Pos,Definition)
  when is_integer(Pos),is_list(Definition) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
@@ -1775,348 +1993,393 @@ callTipShow(#wx_ref{type=ThisT,ref=ThisRef},Pos,Definition)
   wxe_util:cast(?wxStyledTextCtrl_CallTipShow,
   <<ThisRef:32/?UI,Pos:32/?UI,(byte_size(Definition_UC)):32/?UI,(Definition_UC)/binary, 0:(((8- ((4+byte_size(Definition_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlcalltipcancel">external documentation</a>.
+-spec callTipCancel(This) -> ok when
+	This::wxStyledTextCtrl().
 callTipCancel(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_CallTipCancel,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlcalltipactive">external documentation</a>.
+-spec callTipActive(This) -> boolean() when
+	This::wxStyledTextCtrl().
 callTipActive(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_CallTipActive,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlcalltipposatstart">external documentation</a>.
+-spec callTipPosAtStart(This) -> integer() when
+	This::wxStyledTextCtrl().
 callTipPosAtStart(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_CallTipPosAtStart,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Start::integer(), End::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlcalltipsethighlight">external documentation</a>.
+-spec callTipSetHighlight(This, Start, End) -> ok when
+	This::wxStyledTextCtrl(), Start::integer(), End::integer().
 callTipSetHighlight(#wx_ref{type=ThisT,ref=ThisRef},Start,End)
  when is_integer(Start),is_integer(End) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_CallTipSetHighlight,
   <<ThisRef:32/?UI,Start:32/?UI,End:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Back::wx:colour()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlcalltipsetbackground">external documentation</a>.
+-spec callTipSetBackground(This, Back) -> ok when
+	This::wxStyledTextCtrl(), Back::wx:wx_colour().
 callTipSetBackground(#wx_ref{type=ThisT,ref=ThisRef},Back)
  when tuple_size(Back) =:= 3; tuple_size(Back) =:= 4 ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_CallTipSetBackground,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(Back)):16/binary>>).
 
-%% @spec (This::wxStyledTextCtrl(), Fore::wx:colour()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlcalltipsetforeground">external documentation</a>.
+-spec callTipSetForeground(This, Fore) -> ok when
+	This::wxStyledTextCtrl(), Fore::wx:wx_colour().
 callTipSetForeground(#wx_ref{type=ThisT,ref=ThisRef},Fore)
  when tuple_size(Fore) =:= 3; tuple_size(Fore) =:= 4 ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_CallTipSetForeground,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(Fore)):16/binary>>).
 
-%% @spec (This::wxStyledTextCtrl(), Fore::wx:colour()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlcalltipsetforegroundhighlight">external documentation</a>.
+-spec callTipSetForegroundHighlight(This, Fore) -> ok when
+	This::wxStyledTextCtrl(), Fore::wx:wx_colour().
 callTipSetForegroundHighlight(#wx_ref{type=ThisT,ref=ThisRef},Fore)
  when tuple_size(Fore) =:= 3; tuple_size(Fore) =:= 4 ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_CallTipSetForegroundHighlight,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(Fore)):16/binary>>).
 
-%% @spec (This::wxStyledTextCtrl(), TabSize::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlcalltipusestyle">external documentation</a>.
+-spec callTipUseStyle(This, TabSize) -> ok when
+	This::wxStyledTextCtrl(), TabSize::integer().
 callTipUseStyle(#wx_ref{type=ThisT,ref=ThisRef},TabSize)
  when is_integer(TabSize) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_CallTipUseStyle,
   <<ThisRef:32/?UI,TabSize:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Line::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlvisiblefromdocline">external documentation</a>.
+-spec visibleFromDocLine(This, Line) -> integer() when
+	This::wxStyledTextCtrl(), Line::integer().
 visibleFromDocLine(#wx_ref{type=ThisT,ref=ThisRef},Line)
  when is_integer(Line) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_VisibleFromDocLine,
   <<ThisRef:32/?UI,Line:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), LineDisplay::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrldoclinefromvisible">external documentation</a>.
+-spec docLineFromVisible(This, LineDisplay) -> integer() when
+	This::wxStyledTextCtrl(), LineDisplay::integer().
 docLineFromVisible(#wx_ref{type=ThisT,ref=ThisRef},LineDisplay)
  when is_integer(LineDisplay) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_DocLineFromVisible,
   <<ThisRef:32/?UI,LineDisplay:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Line::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlwrapcount">external documentation</a>.
+-spec wrapCount(This, Line) -> integer() when
+	This::wxStyledTextCtrl(), Line::integer().
 wrapCount(#wx_ref{type=ThisT,ref=ThisRef},Line)
  when is_integer(Line) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_WrapCount,
   <<ThisRef:32/?UI,Line:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Line::integer(), Level::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetfoldlevel">external documentation</a>.
+-spec setFoldLevel(This, Line, Level) -> ok when
+	This::wxStyledTextCtrl(), Line::integer(), Level::integer().
 setFoldLevel(#wx_ref{type=ThisT,ref=ThisRef},Line,Level)
  when is_integer(Line),is_integer(Level) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetFoldLevel,
   <<ThisRef:32/?UI,Line:32/?UI,Level:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Line::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetfoldlevel">external documentation</a>.
+-spec getFoldLevel(This, Line) -> integer() when
+	This::wxStyledTextCtrl(), Line::integer().
 getFoldLevel(#wx_ref{type=ThisT,ref=ThisRef},Line)
  when is_integer(Line) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetFoldLevel,
   <<ThisRef:32/?UI,Line:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Line::integer(), Level::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetlastchild">external documentation</a>.
+-spec getLastChild(This, Line, Level) -> integer() when
+	This::wxStyledTextCtrl(), Line::integer(), Level::integer().
 getLastChild(#wx_ref{type=ThisT,ref=ThisRef},Line,Level)
  when is_integer(Line),is_integer(Level) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetLastChild,
   <<ThisRef:32/?UI,Line:32/?UI,Level:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Line::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetfoldparent">external documentation</a>.
+-spec getFoldParent(This, Line) -> integer() when
+	This::wxStyledTextCtrl(), Line::integer().
 getFoldParent(#wx_ref{type=ThisT,ref=ThisRef},Line)
  when is_integer(Line) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetFoldParent,
   <<ThisRef:32/?UI,Line:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), LineStart::integer(), LineEnd::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlshowlines">external documentation</a>.
+-spec showLines(This, LineStart, LineEnd) -> ok when
+	This::wxStyledTextCtrl(), LineStart::integer(), LineEnd::integer().
 showLines(#wx_ref{type=ThisT,ref=ThisRef},LineStart,LineEnd)
  when is_integer(LineStart),is_integer(LineEnd) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_ShowLines,
   <<ThisRef:32/?UI,LineStart:32/?UI,LineEnd:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), LineStart::integer(), LineEnd::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlhidelines">external documentation</a>.
+-spec hideLines(This, LineStart, LineEnd) -> ok when
+	This::wxStyledTextCtrl(), LineStart::integer(), LineEnd::integer().
 hideLines(#wx_ref{type=ThisT,ref=ThisRef},LineStart,LineEnd)
  when is_integer(LineStart),is_integer(LineEnd) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_HideLines,
   <<ThisRef:32/?UI,LineStart:32/?UI,LineEnd:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Line::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetlinevisible">external documentation</a>.
+-spec getLineVisible(This, Line) -> boolean() when
+	This::wxStyledTextCtrl(), Line::integer().
 getLineVisible(#wx_ref{type=ThisT,ref=ThisRef},Line)
  when is_integer(Line) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetLineVisible,
   <<ThisRef:32/?UI,Line:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Line::integer(), Expanded::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetfoldexpanded">external documentation</a>.
+-spec setFoldExpanded(This, Line, Expanded) -> ok when
+	This::wxStyledTextCtrl(), Line::integer(), Expanded::boolean().
 setFoldExpanded(#wx_ref{type=ThisT,ref=ThisRef},Line,Expanded)
  when is_integer(Line),is_boolean(Expanded) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetFoldExpanded,
   <<ThisRef:32/?UI,Line:32/?UI,(wxe_util:from_bool(Expanded)):32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Line::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetfoldexpanded">external documentation</a>.
+-spec getFoldExpanded(This, Line) -> boolean() when
+	This::wxStyledTextCtrl(), Line::integer().
 getFoldExpanded(#wx_ref{type=ThisT,ref=ThisRef},Line)
  when is_integer(Line) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetFoldExpanded,
   <<ThisRef:32/?UI,Line:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Line::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrltogglefold">external documentation</a>.
+-spec toggleFold(This, Line) -> ok when
+	This::wxStyledTextCtrl(), Line::integer().
 toggleFold(#wx_ref{type=ThisT,ref=ThisRef},Line)
  when is_integer(Line) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_ToggleFold,
   <<ThisRef:32/?UI,Line:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Line::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlensurevisible">external documentation</a>.
+-spec ensureVisible(This, Line) -> ok when
+	This::wxStyledTextCtrl(), Line::integer().
 ensureVisible(#wx_ref{type=ThisT,ref=ThisRef},Line)
  when is_integer(Line) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_EnsureVisible,
   <<ThisRef:32/?UI,Line:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Flags::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetfoldflags">external documentation</a>.
+-spec setFoldFlags(This, Flags) -> ok when
+	This::wxStyledTextCtrl(), Flags::integer().
 setFoldFlags(#wx_ref{type=ThisT,ref=ThisRef},Flags)
  when is_integer(Flags) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetFoldFlags,
   <<ThisRef:32/?UI,Flags:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Line::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlensurevisibleenforcepolicy">external documentation</a>.
+-spec ensureVisibleEnforcePolicy(This, Line) -> ok when
+	This::wxStyledTextCtrl(), Line::integer().
 ensureVisibleEnforcePolicy(#wx_ref{type=ThisT,ref=ThisRef},Line)
  when is_integer(Line) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_EnsureVisibleEnforcePolicy,
   <<ThisRef:32/?UI,Line:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), TabIndents::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsettabindents">external documentation</a>.
+-spec setTabIndents(This, TabIndents) -> ok when
+	This::wxStyledTextCtrl(), TabIndents::boolean().
 setTabIndents(#wx_ref{type=ThisT,ref=ThisRef},TabIndents)
  when is_boolean(TabIndents) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetTabIndents,
   <<ThisRef:32/?UI,(wxe_util:from_bool(TabIndents)):32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgettabindents">external documentation</a>.
+-spec getTabIndents(This) -> boolean() when
+	This::wxStyledTextCtrl().
 getTabIndents(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetTabIndents,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), BsUnIndents::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetbackspaceunindents">external documentation</a>.
+-spec setBackSpaceUnIndents(This, BsUnIndents) -> ok when
+	This::wxStyledTextCtrl(), BsUnIndents::boolean().
 setBackSpaceUnIndents(#wx_ref{type=ThisT,ref=ThisRef},BsUnIndents)
  when is_boolean(BsUnIndents) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetBackSpaceUnIndents,
   <<ThisRef:32/?UI,(wxe_util:from_bool(BsUnIndents)):32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetbackspaceunindents">external documentation</a>.
+-spec getBackSpaceUnIndents(This) -> boolean() when
+	This::wxStyledTextCtrl().
 getBackSpaceUnIndents(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetBackSpaceUnIndents,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), PeriodMilliseconds::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetmousedwelltime">external documentation</a>.
+-spec setMouseDwellTime(This, PeriodMilliseconds) -> ok when
+	This::wxStyledTextCtrl(), PeriodMilliseconds::integer().
 setMouseDwellTime(#wx_ref{type=ThisT,ref=ThisRef},PeriodMilliseconds)
  when is_integer(PeriodMilliseconds) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetMouseDwellTime,
   <<ThisRef:32/?UI,PeriodMilliseconds:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetmousedwelltime">external documentation</a>.
+-spec getMouseDwellTime(This) -> integer() when
+	This::wxStyledTextCtrl().
 getMouseDwellTime(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetMouseDwellTime,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Pos::integer(), OnlyWordCharacters::bool()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlwordstartposition">external documentation</a>.
+-spec wordStartPosition(This, Pos, OnlyWordCharacters) -> integer() when
+	This::wxStyledTextCtrl(), Pos::integer(), OnlyWordCharacters::boolean().
 wordStartPosition(#wx_ref{type=ThisT,ref=ThisRef},Pos,OnlyWordCharacters)
  when is_integer(Pos),is_boolean(OnlyWordCharacters) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_WordStartPosition,
   <<ThisRef:32/?UI,Pos:32/?UI,(wxe_util:from_bool(OnlyWordCharacters)):32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Pos::integer(), OnlyWordCharacters::bool()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlwordendposition">external documentation</a>.
+-spec wordEndPosition(This, Pos, OnlyWordCharacters) -> integer() when
+	This::wxStyledTextCtrl(), Pos::integer(), OnlyWordCharacters::boolean().
 wordEndPosition(#wx_ref{type=ThisT,ref=ThisRef},Pos,OnlyWordCharacters)
  when is_integer(Pos),is_boolean(OnlyWordCharacters) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_WordEndPosition,
   <<ThisRef:32/?UI,Pos:32/?UI,(wxe_util:from_bool(OnlyWordCharacters)):32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Mode::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetwrapmode">external documentation</a>.
+-spec setWrapMode(This, Mode) -> ok when
+	This::wxStyledTextCtrl(), Mode::integer().
 setWrapMode(#wx_ref{type=ThisT,ref=ThisRef},Mode)
  when is_integer(Mode) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetWrapMode,
   <<ThisRef:32/?UI,Mode:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetwrapmode">external documentation</a>.
+-spec getWrapMode(This) -> integer() when
+	This::wxStyledTextCtrl().
 getWrapMode(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetWrapMode,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), WrapVisualFlags::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetwrapvisualflags">external documentation</a>.
+-spec setWrapVisualFlags(This, WrapVisualFlags) -> ok when
+	This::wxStyledTextCtrl(), WrapVisualFlags::integer().
 setWrapVisualFlags(#wx_ref{type=ThisT,ref=ThisRef},WrapVisualFlags)
  when is_integer(WrapVisualFlags) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetWrapVisualFlags,
   <<ThisRef:32/?UI,WrapVisualFlags:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetwrapvisualflags">external documentation</a>.
+-spec getWrapVisualFlags(This) -> integer() when
+	This::wxStyledTextCtrl().
 getWrapVisualFlags(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetWrapVisualFlags,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), WrapVisualFlagsLocation::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetwrapvisualflagslocation">external documentation</a>.
+-spec setWrapVisualFlagsLocation(This, WrapVisualFlagsLocation) -> ok when
+	This::wxStyledTextCtrl(), WrapVisualFlagsLocation::integer().
 setWrapVisualFlagsLocation(#wx_ref{type=ThisT,ref=ThisRef},WrapVisualFlagsLocation)
  when is_integer(WrapVisualFlagsLocation) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetWrapVisualFlagsLocation,
   <<ThisRef:32/?UI,WrapVisualFlagsLocation:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetwrapvisualflagslocation">external documentation</a>.
+-spec getWrapVisualFlagsLocation(This) -> integer() when
+	This::wxStyledTextCtrl().
 getWrapVisualFlagsLocation(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetWrapVisualFlagsLocation,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Indent::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetwrapstartindent">external documentation</a>.
+-spec setWrapStartIndent(This, Indent) -> ok when
+	This::wxStyledTextCtrl(), Indent::integer().
 setWrapStartIndent(#wx_ref{type=ThisT,ref=ThisRef},Indent)
  when is_integer(Indent) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetWrapStartIndent,
   <<ThisRef:32/?UI,Indent:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetwrapstartindent">external documentation</a>.
+-spec getWrapStartIndent(This) -> integer() when
+	This::wxStyledTextCtrl().
 getWrapStartIndent(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetWrapStartIndent,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Mode::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetlayoutcache">external documentation</a>.
+-spec setLayoutCache(This, Mode) -> ok when
+	This::wxStyledTextCtrl(), Mode::integer().
 setLayoutCache(#wx_ref{type=ThisT,ref=ThisRef},Mode)
  when is_integer(Mode) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetLayoutCache,
   <<ThisRef:32/?UI,Mode:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetlayoutcache">external documentation</a>.
+-spec getLayoutCache(This) -> integer() when
+	This::wxStyledTextCtrl().
 getLayoutCache(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetLayoutCache,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), PixelWidth::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetscrollwidth">external documentation</a>.
+-spec setScrollWidth(This, PixelWidth) -> ok when
+	This::wxStyledTextCtrl(), PixelWidth::integer().
 setScrollWidth(#wx_ref{type=ThisT,ref=ThisRef},PixelWidth)
  when is_integer(PixelWidth) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetScrollWidth,
   <<ThisRef:32/?UI,PixelWidth:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetscrollwidth">external documentation</a>.
+-spec getScrollWidth(This) -> integer() when
+	This::wxStyledTextCtrl().
 getScrollWidth(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetScrollWidth,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Style::integer(), Text::string()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrltextwidth">external documentation</a>.
+-spec textWidth(This, Style, Text) -> integer() when
+	This::wxStyledTextCtrl(), Style::integer(), Text::string().
 textWidth(#wx_ref{type=ThisT,ref=ThisRef},Style,Text)
  when is_integer(Style),is_list(Text) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
@@ -2124,38 +2387,43 @@ textWidth(#wx_ref{type=ThisT,ref=ThisRef},Style,Text)
   wxe_util:call(?wxStyledTextCtrl_TextWidth,
   <<ThisRef:32/?UI,Style:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((4+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetendatlastline">external documentation</a>.
+-spec getEndAtLastLine(This) -> boolean() when
+	This::wxStyledTextCtrl().
 getEndAtLastLine(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetEndAtLastLine,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Line::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrltextheight">external documentation</a>.
+-spec textHeight(This, Line) -> integer() when
+	This::wxStyledTextCtrl(), Line::integer().
 textHeight(#wx_ref{type=ThisT,ref=ThisRef},Line)
  when is_integer(Line) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_TextHeight,
   <<ThisRef:32/?UI,Line:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Show::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetuseverticalscrollbar">external documentation</a>.
+-spec setUseVerticalScrollBar(This, Show) -> ok when
+	This::wxStyledTextCtrl(), Show::boolean().
 setUseVerticalScrollBar(#wx_ref{type=ThisT,ref=ThisRef},Show)
  when is_boolean(Show) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetUseVerticalScrollBar,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Show)):32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetuseverticalscrollbar">external documentation</a>.
+-spec getUseVerticalScrollBar(This) -> boolean() when
+	This::wxStyledTextCtrl().
 getUseVerticalScrollBar(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetUseVerticalScrollBar,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Text::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlappendtext">external documentation</a>.
+-spec appendText(This, Text) -> ok when
+	This::wxStyledTextCtrl(), Text::string().
 appendText(#wx_ref{type=ThisT,ref=ThisRef},Text)
  when is_list(Text) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
@@ -2163,559 +2431,637 @@ appendText(#wx_ref{type=ThisT,ref=ThisRef},Text)
   wxe_util:cast(?wxStyledTextCtrl_AppendText,
   <<ThisRef:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgettwophasedraw">external documentation</a>.
+-spec getTwoPhaseDraw(This) -> boolean() when
+	This::wxStyledTextCtrl().
 getTwoPhaseDraw(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetTwoPhaseDraw,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), TwoPhase::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsettwophasedraw">external documentation</a>.
+-spec setTwoPhaseDraw(This, TwoPhase) -> ok when
+	This::wxStyledTextCtrl(), TwoPhase::boolean().
 setTwoPhaseDraw(#wx_ref{type=ThisT,ref=ThisRef},TwoPhase)
  when is_boolean(TwoPhase) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetTwoPhaseDraw,
   <<ThisRef:32/?UI,(wxe_util:from_bool(TwoPhase)):32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrltargetfromselection">external documentation</a>.
+-spec targetFromSelection(This) -> ok when
+	This::wxStyledTextCtrl().
 targetFromSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_TargetFromSelection,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrllinesjoin">external documentation</a>.
+-spec linesJoin(This) -> ok when
+	This::wxStyledTextCtrl().
 linesJoin(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_LinesJoin,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), PixelWidth::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrllinessplit">external documentation</a>.
+-spec linesSplit(This, PixelWidth) -> ok when
+	This::wxStyledTextCtrl(), PixelWidth::integer().
 linesSplit(#wx_ref{type=ThisT,ref=ThisRef},PixelWidth)
  when is_integer(PixelWidth) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_LinesSplit,
   <<ThisRef:32/?UI,PixelWidth:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), UseSetting::bool(), Back::wx:colour()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetfoldmargincolour">external documentation</a>.
+-spec setFoldMarginColour(This, UseSetting, Back) -> ok when
+	This::wxStyledTextCtrl(), UseSetting::boolean(), Back::wx:wx_colour().
 setFoldMarginColour(#wx_ref{type=ThisT,ref=ThisRef},UseSetting,Back)
  when is_boolean(UseSetting),tuple_size(Back) =:= 3; tuple_size(Back) =:= 4 ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetFoldMarginColour,
   <<ThisRef:32/?UI,(wxe_util:from_bool(UseSetting)):32/?UI,(wxe_util:colour_bin(Back)):16/binary>>).
 
-%% @spec (This::wxStyledTextCtrl(), UseSetting::bool(), Fore::wx:colour()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetfoldmarginhicolour">external documentation</a>.
+-spec setFoldMarginHiColour(This, UseSetting, Fore) -> ok when
+	This::wxStyledTextCtrl(), UseSetting::boolean(), Fore::wx:wx_colour().
 setFoldMarginHiColour(#wx_ref{type=ThisT,ref=ThisRef},UseSetting,Fore)
  when is_boolean(UseSetting),tuple_size(Fore) =:= 3; tuple_size(Fore) =:= 4 ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetFoldMarginHiColour,
   <<ThisRef:32/?UI,(wxe_util:from_bool(UseSetting)):32/?UI,(wxe_util:colour_bin(Fore)):16/binary>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrllinedown">external documentation</a>.
+-spec lineDown(This) -> ok when
+	This::wxStyledTextCtrl().
 lineDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_LineDown,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrllinedownextend">external documentation</a>.
+-spec lineDownExtend(This) -> ok when
+	This::wxStyledTextCtrl().
 lineDownExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_LineDownExtend,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrllineup">external documentation</a>.
+-spec lineUp(This) -> ok when
+	This::wxStyledTextCtrl().
 lineUp(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_LineUp,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrllineupextend">external documentation</a>.
+-spec lineUpExtend(This) -> ok when
+	This::wxStyledTextCtrl().
 lineUpExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_LineUpExtend,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlcharleft">external documentation</a>.
+-spec charLeft(This) -> ok when
+	This::wxStyledTextCtrl().
 charLeft(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_CharLeft,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlcharleftextend">external documentation</a>.
+-spec charLeftExtend(This) -> ok when
+	This::wxStyledTextCtrl().
 charLeftExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_CharLeftExtend,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlcharright">external documentation</a>.
+-spec charRight(This) -> ok when
+	This::wxStyledTextCtrl().
 charRight(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_CharRight,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlcharrightextend">external documentation</a>.
+-spec charRightExtend(This) -> ok when
+	This::wxStyledTextCtrl().
 charRightExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_CharRightExtend,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlwordleft">external documentation</a>.
+-spec wordLeft(This) -> ok when
+	This::wxStyledTextCtrl().
 wordLeft(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_WordLeft,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlwordleftextend">external documentation</a>.
+-spec wordLeftExtend(This) -> ok when
+	This::wxStyledTextCtrl().
 wordLeftExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_WordLeftExtend,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlwordright">external documentation</a>.
+-spec wordRight(This) -> ok when
+	This::wxStyledTextCtrl().
 wordRight(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_WordRight,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlwordrightextend">external documentation</a>.
+-spec wordRightExtend(This) -> ok when
+	This::wxStyledTextCtrl().
 wordRightExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_WordRightExtend,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlhome">external documentation</a>.
+-spec home(This) -> ok when
+	This::wxStyledTextCtrl().
 home(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_Home,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlhomeextend">external documentation</a>.
+-spec homeExtend(This) -> ok when
+	This::wxStyledTextCtrl().
 homeExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_HomeExtend,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrllineend">external documentation</a>.
+-spec lineEnd(This) -> ok when
+	This::wxStyledTextCtrl().
 lineEnd(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_LineEnd,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrllineendextend">external documentation</a>.
+-spec lineEndExtend(This) -> ok when
+	This::wxStyledTextCtrl().
 lineEndExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_LineEndExtend,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrldocumentstart">external documentation</a>.
+-spec documentStart(This) -> ok when
+	This::wxStyledTextCtrl().
 documentStart(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_DocumentStart,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrldocumentstartextend">external documentation</a>.
+-spec documentStartExtend(This) -> ok when
+	This::wxStyledTextCtrl().
 documentStartExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_DocumentStartExtend,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrldocumentend">external documentation</a>.
+-spec documentEnd(This) -> ok when
+	This::wxStyledTextCtrl().
 documentEnd(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_DocumentEnd,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrldocumentendextend">external documentation</a>.
+-spec documentEndExtend(This) -> ok when
+	This::wxStyledTextCtrl().
 documentEndExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_DocumentEndExtend,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlpageup">external documentation</a>.
+-spec pageUp(This) -> ok when
+	This::wxStyledTextCtrl().
 pageUp(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_PageUp,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlpageupextend">external documentation</a>.
+-spec pageUpExtend(This) -> ok when
+	This::wxStyledTextCtrl().
 pageUpExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_PageUpExtend,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlpagedown">external documentation</a>.
+-spec pageDown(This) -> ok when
+	This::wxStyledTextCtrl().
 pageDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_PageDown,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlpagedownextend">external documentation</a>.
+-spec pageDownExtend(This) -> ok when
+	This::wxStyledTextCtrl().
 pageDownExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_PageDownExtend,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrledittoggleovertype">external documentation</a>.
+-spec editToggleOvertype(This) -> ok when
+	This::wxStyledTextCtrl().
 editToggleOvertype(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_EditToggleOvertype,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlcancel">external documentation</a>.
+-spec cancel(This) -> ok when
+	This::wxStyledTextCtrl().
 cancel(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_Cancel,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrldeleteback">external documentation</a>.
+-spec deleteBack(This) -> ok when
+	This::wxStyledTextCtrl().
 deleteBack(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_DeleteBack,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrltab">external documentation</a>.
+-spec tab(This) -> ok when
+	This::wxStyledTextCtrl().
 tab(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_Tab,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlbacktab">external documentation</a>.
+-spec backTab(This) -> ok when
+	This::wxStyledTextCtrl().
 backTab(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_BackTab,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlnewline">external documentation</a>.
+-spec newLine(This) -> ok when
+	This::wxStyledTextCtrl().
 newLine(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_NewLine,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlformfeed">external documentation</a>.
+-spec formFeed(This) -> ok when
+	This::wxStyledTextCtrl().
 formFeed(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_FormFeed,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlvchome">external documentation</a>.
+-spec vCHome(This) -> ok when
+	This::wxStyledTextCtrl().
 vCHome(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_VCHome,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlvchomeextend">external documentation</a>.
+-spec vCHomeExtend(This) -> ok when
+	This::wxStyledTextCtrl().
 vCHomeExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_VCHomeExtend,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlzoomin">external documentation</a>.
+-spec zoomIn(This) -> ok when
+	This::wxStyledTextCtrl().
 zoomIn(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_ZoomIn,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlzoomout">external documentation</a>.
+-spec zoomOut(This) -> ok when
+	This::wxStyledTextCtrl().
 zoomOut(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_ZoomOut,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrldelwordleft">external documentation</a>.
+-spec delWordLeft(This) -> ok when
+	This::wxStyledTextCtrl().
 delWordLeft(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_DelWordLeft,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrldelwordright">external documentation</a>.
+-spec delWordRight(This) -> ok when
+	This::wxStyledTextCtrl().
 delWordRight(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_DelWordRight,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrllinecut">external documentation</a>.
+-spec lineCut(This) -> ok when
+	This::wxStyledTextCtrl().
 lineCut(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_LineCut,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrllinedelete">external documentation</a>.
+-spec lineDelete(This) -> ok when
+	This::wxStyledTextCtrl().
 lineDelete(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_LineDelete,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrllinetranspose">external documentation</a>.
+-spec lineTranspose(This) -> ok when
+	This::wxStyledTextCtrl().
 lineTranspose(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_LineTranspose,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrllineduplicate">external documentation</a>.
+-spec lineDuplicate(This) -> ok when
+	This::wxStyledTextCtrl().
 lineDuplicate(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_LineDuplicate,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrllowercase">external documentation</a>.
+-spec lowerCase(This) -> ok when
+	This::wxStyledTextCtrl().
 lowerCase(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_LowerCase,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrluppercase">external documentation</a>.
+-spec upperCase(This) -> ok when
+	This::wxStyledTextCtrl().
 upperCase(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_UpperCase,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrllinescrolldown">external documentation</a>.
+-spec lineScrollDown(This) -> ok when
+	This::wxStyledTextCtrl().
 lineScrollDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_LineScrollDown,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrllinescrollup">external documentation</a>.
+-spec lineScrollUp(This) -> ok when
+	This::wxStyledTextCtrl().
 lineScrollUp(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_LineScrollUp,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrldeletebacknotline">external documentation</a>.
+-spec deleteBackNotLine(This) -> ok when
+	This::wxStyledTextCtrl().
 deleteBackNotLine(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_DeleteBackNotLine,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlhomedisplay">external documentation</a>.
+-spec homeDisplay(This) -> ok when
+	This::wxStyledTextCtrl().
 homeDisplay(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_HomeDisplay,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlhomedisplayextend">external documentation</a>.
+-spec homeDisplayExtend(This) -> ok when
+	This::wxStyledTextCtrl().
 homeDisplayExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_HomeDisplayExtend,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrllineenddisplay">external documentation</a>.
+-spec lineEndDisplay(This) -> ok when
+	This::wxStyledTextCtrl().
 lineEndDisplay(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_LineEndDisplay,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrllineenddisplayextend">external documentation</a>.
+-spec lineEndDisplayExtend(This) -> ok when
+	This::wxStyledTextCtrl().
 lineEndDisplayExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_LineEndDisplayExtend,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlhomewrapextend">external documentation</a>.
+-spec homeWrapExtend(This) -> ok when
+	This::wxStyledTextCtrl().
 homeWrapExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_HomeWrapExtend,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrllineendwrap">external documentation</a>.
+-spec lineEndWrap(This) -> ok when
+	This::wxStyledTextCtrl().
 lineEndWrap(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_LineEndWrap,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrllineendwrapextend">external documentation</a>.
+-spec lineEndWrapExtend(This) -> ok when
+	This::wxStyledTextCtrl().
 lineEndWrapExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_LineEndWrapExtend,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlvchomewrap">external documentation</a>.
+-spec vCHomeWrap(This) -> ok when
+	This::wxStyledTextCtrl().
 vCHomeWrap(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_VCHomeWrap,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlvchomewrapextend">external documentation</a>.
+-spec vCHomeWrapExtend(This) -> ok when
+	This::wxStyledTextCtrl().
 vCHomeWrapExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_VCHomeWrapExtend,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrllinecopy">external documentation</a>.
+-spec lineCopy(This) -> ok when
+	This::wxStyledTextCtrl().
 lineCopy(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_LineCopy,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlmovecaretinsideview">external documentation</a>.
+-spec moveCaretInsideView(This) -> ok when
+	This::wxStyledTextCtrl().
 moveCaretInsideView(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_MoveCaretInsideView,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Line::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrllinelength">external documentation</a>.
+-spec lineLength(This, Line) -> integer() when
+	This::wxStyledTextCtrl(), Line::integer().
 lineLength(#wx_ref{type=ThisT,ref=ThisRef},Line)
  when is_integer(Line) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_LineLength,
   <<ThisRef:32/?UI,Line:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Pos1::integer(), Pos2::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlbracehighlight">external documentation</a>.
+-spec braceHighlight(This, Pos1, Pos2) -> ok when
+	This::wxStyledTextCtrl(), Pos1::integer(), Pos2::integer().
 braceHighlight(#wx_ref{type=ThisT,ref=ThisRef},Pos1,Pos2)
  when is_integer(Pos1),is_integer(Pos2) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_BraceHighlight,
   <<ThisRef:32/?UI,Pos1:32/?UI,Pos2:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Pos::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlbracebadlight">external documentation</a>.
+-spec braceBadLight(This, Pos) -> ok when
+	This::wxStyledTextCtrl(), Pos::integer().
 braceBadLight(#wx_ref{type=ThisT,ref=ThisRef},Pos)
  when is_integer(Pos) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_BraceBadLight,
   <<ThisRef:32/?UI,Pos:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Pos::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlbracematch">external documentation</a>.
+-spec braceMatch(This, Pos) -> integer() when
+	This::wxStyledTextCtrl(), Pos::integer().
 braceMatch(#wx_ref{type=ThisT,ref=ThisRef},Pos)
  when is_integer(Pos) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_BraceMatch,
   <<ThisRef:32/?UI,Pos:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetvieweol">external documentation</a>.
+-spec getViewEOL(This) -> boolean() when
+	This::wxStyledTextCtrl().
 getViewEOL(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetViewEOL,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Visible::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetvieweol">external documentation</a>.
+-spec setViewEOL(This, Visible) -> ok when
+	This::wxStyledTextCtrl(), Visible::boolean().
 setViewEOL(#wx_ref{type=ThisT,ref=ThisRef},Visible)
  when is_boolean(Visible) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetViewEOL,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Visible)):32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Mask::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetmodeventmask">external documentation</a>.
+-spec setModEventMask(This, Mask) -> ok when
+	This::wxStyledTextCtrl(), Mask::integer().
 setModEventMask(#wx_ref{type=ThisT,ref=ThisRef},Mask)
  when is_integer(Mask) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetModEventMask,
   <<ThisRef:32/?UI,Mask:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetedgecolumn">external documentation</a>.
+-spec getEdgeColumn(This) -> integer() when
+	This::wxStyledTextCtrl().
 getEdgeColumn(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetEdgeColumn,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Column::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetedgecolumn">external documentation</a>.
+-spec setEdgeColumn(This, Column) -> ok when
+	This::wxStyledTextCtrl(), Column::integer().
 setEdgeColumn(#wx_ref{type=ThisT,ref=ThisRef},Column)
  when is_integer(Column) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetEdgeColumn,
   <<ThisRef:32/?UI,Column:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetedgemode">external documentation</a>.
+-spec getEdgeMode(This) -> integer() when
+	This::wxStyledTextCtrl().
 getEdgeMode(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetEdgeMode,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> wx:colour()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetedgecolour">external documentation</a>.
+-spec getEdgeColour(This) -> wx:wx_colour() when
+	This::wxStyledTextCtrl().
 getEdgeColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetEdgeColour,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), EdgeColour::wx:colour()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetedgecolour">external documentation</a>.
+-spec setEdgeColour(This, EdgeColour) -> ok when
+	This::wxStyledTextCtrl(), EdgeColour::wx:wx_colour().
 setEdgeColour(#wx_ref{type=ThisT,ref=ThisRef},EdgeColour)
  when tuple_size(EdgeColour) =:= 3; tuple_size(EdgeColour) =:= 4 ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetEdgeColour,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(EdgeColour)):16/binary>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsearchanchor">external documentation</a>.
+-spec searchAnchor(This) -> ok when
+	This::wxStyledTextCtrl().
 searchAnchor(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SearchAnchor,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Flags::integer(), Text::string()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsearchnext">external documentation</a>.
+-spec searchNext(This, Flags, Text) -> integer() when
+	This::wxStyledTextCtrl(), Flags::integer(), Text::string().
 searchNext(#wx_ref{type=ThisT,ref=ThisRef},Flags,Text)
  when is_integer(Flags),is_list(Text) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
@@ -2723,8 +3069,9 @@ searchNext(#wx_ref{type=ThisT,ref=ThisRef},Flags,Text)
   wxe_util:call(?wxStyledTextCtrl_SearchNext,
   <<ThisRef:32/?UI,Flags:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((4+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxStyledTextCtrl(), Flags::integer(), Text::string()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsearchprev">external documentation</a>.
+-spec searchPrev(This, Flags, Text) -> integer() when
+	This::wxStyledTextCtrl(), Flags::integer(), Text::string().
 searchPrev(#wx_ref{type=ThisT,ref=ThisRef},Flags,Text)
  when is_integer(Flags),is_list(Text) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
@@ -2732,291 +3079,330 @@ searchPrev(#wx_ref{type=ThisT,ref=ThisRef},Flags,Text)
   wxe_util:call(?wxStyledTextCtrl_SearchPrev,
   <<ThisRef:32/?UI,Flags:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((4+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrllinesonscreen">external documentation</a>.
+-spec linesOnScreen(This) -> integer() when
+	This::wxStyledTextCtrl().
 linesOnScreen(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_LinesOnScreen,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), AllowPopUp::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlusepopup">external documentation</a>.
+-spec usePopUp(This, AllowPopUp) -> ok when
+	This::wxStyledTextCtrl(), AllowPopUp::boolean().
 usePopUp(#wx_ref{type=ThisT,ref=ThisRef},AllowPopUp)
  when is_boolean(AllowPopUp) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_UsePopUp,
   <<ThisRef:32/?UI,(wxe_util:from_bool(AllowPopUp)):32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlselectionisrectangle">external documentation</a>.
+-spec selectionIsRectangle(This) -> boolean() when
+	This::wxStyledTextCtrl().
 selectionIsRectangle(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_SelectionIsRectangle,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Zoom::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetzoom">external documentation</a>.
+-spec setZoom(This, Zoom) -> ok when
+	This::wxStyledTextCtrl(), Zoom::integer().
 setZoom(#wx_ref{type=ThisT,ref=ThisRef},Zoom)
  when is_integer(Zoom) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetZoom,
   <<ThisRef:32/?UI,Zoom:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetzoom">external documentation</a>.
+-spec getZoom(This) -> integer() when
+	This::wxStyledTextCtrl().
 getZoom(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetZoom,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetmodeventmask">external documentation</a>.
+-spec getModEventMask(This) -> integer() when
+	This::wxStyledTextCtrl().
 getModEventMask(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetModEventMask,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Focus::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetstcfocus">external documentation</a>.
+-spec setSTCFocus(This, Focus) -> ok when
+	This::wxStyledTextCtrl(), Focus::boolean().
 setSTCFocus(#wx_ref{type=ThisT,ref=ThisRef},Focus)
  when is_boolean(Focus) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetSTCFocus,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Focus)):32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetstcfocus">external documentation</a>.
+-spec getSTCFocus(This) -> boolean() when
+	This::wxStyledTextCtrl().
 getSTCFocus(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetSTCFocus,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), StatusCode::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetstatus">external documentation</a>.
+-spec setStatus(This, StatusCode) -> ok when
+	This::wxStyledTextCtrl(), StatusCode::integer().
 setStatus(#wx_ref{type=ThisT,ref=ThisRef},StatusCode)
  when is_integer(StatusCode) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetStatus,
   <<ThisRef:32/?UI,StatusCode:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetstatus">external documentation</a>.
+-spec getStatus(This) -> integer() when
+	This::wxStyledTextCtrl().
 getStatus(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetStatus,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Captures::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetmousedowncaptures">external documentation</a>.
+-spec setMouseDownCaptures(This, Captures) -> ok when
+	This::wxStyledTextCtrl(), Captures::boolean().
 setMouseDownCaptures(#wx_ref{type=ThisT,ref=ThisRef},Captures)
  when is_boolean(Captures) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetMouseDownCaptures,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Captures)):32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetmousedowncaptures">external documentation</a>.
+-spec getMouseDownCaptures(This) -> boolean() when
+	This::wxStyledTextCtrl().
 getMouseDownCaptures(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetMouseDownCaptures,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), CursorType::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetstccursor">external documentation</a>.
+-spec setSTCCursor(This, CursorType) -> ok when
+	This::wxStyledTextCtrl(), CursorType::integer().
 setSTCCursor(#wx_ref{type=ThisT,ref=ThisRef},CursorType)
  when is_integer(CursorType) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetSTCCursor,
   <<ThisRef:32/?UI,CursorType:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetstccursor">external documentation</a>.
+-spec getSTCCursor(This) -> integer() when
+	This::wxStyledTextCtrl().
 getSTCCursor(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetSTCCursor,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Symbol::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetcontrolcharsymbol">external documentation</a>.
+-spec setControlCharSymbol(This, Symbol) -> ok when
+	This::wxStyledTextCtrl(), Symbol::integer().
 setControlCharSymbol(#wx_ref{type=ThisT,ref=ThisRef},Symbol)
  when is_integer(Symbol) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetControlCharSymbol,
   <<ThisRef:32/?UI,Symbol:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetcontrolcharsymbol">external documentation</a>.
+-spec getControlCharSymbol(This) -> integer() when
+	This::wxStyledTextCtrl().
 getControlCharSymbol(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetControlCharSymbol,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlwordpartleft">external documentation</a>.
+-spec wordPartLeft(This) -> ok when
+	This::wxStyledTextCtrl().
 wordPartLeft(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_WordPartLeft,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlwordpartleftextend">external documentation</a>.
+-spec wordPartLeftExtend(This) -> ok when
+	This::wxStyledTextCtrl().
 wordPartLeftExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_WordPartLeftExtend,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlwordpartright">external documentation</a>.
+-spec wordPartRight(This) -> ok when
+	This::wxStyledTextCtrl().
 wordPartRight(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_WordPartRight,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlwordpartrightextend">external documentation</a>.
+-spec wordPartRightExtend(This) -> ok when
+	This::wxStyledTextCtrl().
 wordPartRightExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_WordPartRightExtend,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), VisiblePolicy::integer(), VisibleSlop::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetvisiblepolicy">external documentation</a>.
+-spec setVisiblePolicy(This, VisiblePolicy, VisibleSlop) -> ok when
+	This::wxStyledTextCtrl(), VisiblePolicy::integer(), VisibleSlop::integer().
 setVisiblePolicy(#wx_ref{type=ThisT,ref=ThisRef},VisiblePolicy,VisibleSlop)
  when is_integer(VisiblePolicy),is_integer(VisibleSlop) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetVisiblePolicy,
   <<ThisRef:32/?UI,VisiblePolicy:32/?UI,VisibleSlop:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrldellineleft">external documentation</a>.
+-spec delLineLeft(This) -> ok when
+	This::wxStyledTextCtrl().
 delLineLeft(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_DelLineLeft,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrldellineright">external documentation</a>.
+-spec delLineRight(This) -> ok when
+	This::wxStyledTextCtrl().
 delLineRight(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_DelLineRight,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetxoffset">external documentation</a>.
+-spec getXOffset(This) -> integer() when
+	This::wxStyledTextCtrl().
 getXOffset(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetXOffset,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlchoosecaretx">external documentation</a>.
+-spec chooseCaretX(This) -> ok when
+	This::wxStyledTextCtrl().
 chooseCaretX(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_ChooseCaretX,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), CaretPolicy::integer(), CaretSlop::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetxcaretpolicy">external documentation</a>.
+-spec setXCaretPolicy(This, CaretPolicy, CaretSlop) -> ok when
+	This::wxStyledTextCtrl(), CaretPolicy::integer(), CaretSlop::integer().
 setXCaretPolicy(#wx_ref{type=ThisT,ref=ThisRef},CaretPolicy,CaretSlop)
  when is_integer(CaretPolicy),is_integer(CaretSlop) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetXCaretPolicy,
   <<ThisRef:32/?UI,CaretPolicy:32/?UI,CaretSlop:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), CaretPolicy::integer(), CaretSlop::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetycaretpolicy">external documentation</a>.
+-spec setYCaretPolicy(This, CaretPolicy, CaretSlop) -> ok when
+	This::wxStyledTextCtrl(), CaretPolicy::integer(), CaretSlop::integer().
 setYCaretPolicy(#wx_ref{type=ThisT,ref=ThisRef},CaretPolicy,CaretSlop)
  when is_integer(CaretPolicy),is_integer(CaretSlop) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetYCaretPolicy,
   <<ThisRef:32/?UI,CaretPolicy:32/?UI,CaretSlop:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetprintwrapmode">external documentation</a>.
+-spec getPrintWrapMode(This) -> integer() when
+	This::wxStyledTextCtrl().
 getPrintWrapMode(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetPrintWrapMode,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), UseSetting::bool(), Fore::wx:colour()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsethotspotactiveforeground">external documentation</a>.
+-spec setHotspotActiveForeground(This, UseSetting, Fore) -> ok when
+	This::wxStyledTextCtrl(), UseSetting::boolean(), Fore::wx:wx_colour().
 setHotspotActiveForeground(#wx_ref{type=ThisT,ref=ThisRef},UseSetting,Fore)
  when is_boolean(UseSetting),tuple_size(Fore) =:= 3; tuple_size(Fore) =:= 4 ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetHotspotActiveForeground,
   <<ThisRef:32/?UI,(wxe_util:from_bool(UseSetting)):32/?UI,(wxe_util:colour_bin(Fore)):16/binary>>).
 
-%% @spec (This::wxStyledTextCtrl(), UseSetting::bool(), Back::wx:colour()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsethotspotactivebackground">external documentation</a>.
+-spec setHotspotActiveBackground(This, UseSetting, Back) -> ok when
+	This::wxStyledTextCtrl(), UseSetting::boolean(), Back::wx:wx_colour().
 setHotspotActiveBackground(#wx_ref{type=ThisT,ref=ThisRef},UseSetting,Back)
  when is_boolean(UseSetting),tuple_size(Back) =:= 3; tuple_size(Back) =:= 4 ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetHotspotActiveBackground,
   <<ThisRef:32/?UI,(wxe_util:from_bool(UseSetting)):32/?UI,(wxe_util:colour_bin(Back)):16/binary>>).
 
-%% @spec (This::wxStyledTextCtrl(), Underline::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsethotspotactiveunderline">external documentation</a>.
+-spec setHotspotActiveUnderline(This, Underline) -> ok when
+	This::wxStyledTextCtrl(), Underline::boolean().
 setHotspotActiveUnderline(#wx_ref{type=ThisT,ref=ThisRef},Underline)
  when is_boolean(Underline) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetHotspotActiveUnderline,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Underline)):32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), SingleLine::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsethotspotsingleline">external documentation</a>.
+-spec setHotspotSingleLine(This, SingleLine) -> ok when
+	This::wxStyledTextCtrl(), SingleLine::boolean().
 setHotspotSingleLine(#wx_ref{type=ThisT,ref=ThisRef},SingleLine)
  when is_boolean(SingleLine) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetHotspotSingleLine,
   <<ThisRef:32/?UI,(wxe_util:from_bool(SingleLine)):32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlparadownextend">external documentation</a>.
+-spec paraDownExtend(This) -> ok when
+	This::wxStyledTextCtrl().
 paraDownExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_ParaDownExtend,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlparaup">external documentation</a>.
+-spec paraUp(This) -> ok when
+	This::wxStyledTextCtrl().
 paraUp(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_ParaUp,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlparaupextend">external documentation</a>.
+-spec paraUpExtend(This) -> ok when
+	This::wxStyledTextCtrl().
 paraUpExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_ParaUpExtend,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Pos::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlpositionbefore">external documentation</a>.
+-spec positionBefore(This, Pos) -> integer() when
+	This::wxStyledTextCtrl(), Pos::integer().
 positionBefore(#wx_ref{type=ThisT,ref=ThisRef},Pos)
  when is_integer(Pos) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_PositionBefore,
   <<ThisRef:32/?UI,Pos:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Pos::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlpositionafter">external documentation</a>.
+-spec positionAfter(This, Pos) -> integer() when
+	This::wxStyledTextCtrl(), Pos::integer().
 positionAfter(#wx_ref{type=ThisT,ref=ThisRef},Pos)
  when is_integer(Pos) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_PositionAfter,
   <<ThisRef:32/?UI,Pos:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Start::integer(), End::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlcopyrange">external documentation</a>.
+-spec copyRange(This, Start, End) -> ok when
+	This::wxStyledTextCtrl(), Start::integer(), End::integer().
 copyRange(#wx_ref{type=ThisT,ref=ThisRef},Start,End)
  when is_integer(Start),is_integer(End) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_CopyRange,
   <<ThisRef:32/?UI,Start:32/?UI,End:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Length::integer(), Text::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlcopytext">external documentation</a>.
+-spec copyText(This, Length, Text) -> ok when
+	This::wxStyledTextCtrl(), Length::integer(), Text::string().
 copyText(#wx_ref{type=ThisT,ref=ThisRef},Length,Text)
  when is_integer(Length),is_list(Text) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
@@ -3024,142 +3410,162 @@ copyText(#wx_ref{type=ThisT,ref=ThisRef},Length,Text)
   wxe_util:cast(?wxStyledTextCtrl_CopyText,
   <<ThisRef:32/?UI,Length:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((4+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxStyledTextCtrl(), Mode::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetselectionmode">external documentation</a>.
+-spec setSelectionMode(This, Mode) -> ok when
+	This::wxStyledTextCtrl(), Mode::integer().
 setSelectionMode(#wx_ref{type=ThisT,ref=ThisRef},Mode)
  when is_integer(Mode) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetSelectionMode,
   <<ThisRef:32/?UI,Mode:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetselectionmode">external documentation</a>.
+-spec getSelectionMode(This) -> integer() when
+	This::wxStyledTextCtrl().
 getSelectionMode(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetSelectionMode,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrllinedownrectextend">external documentation</a>.
+-spec lineDownRectExtend(This) -> ok when
+	This::wxStyledTextCtrl().
 lineDownRectExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_LineDownRectExtend,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrllineuprectextend">external documentation</a>.
+-spec lineUpRectExtend(This) -> ok when
+	This::wxStyledTextCtrl().
 lineUpRectExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_LineUpRectExtend,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlcharleftrectextend">external documentation</a>.
+-spec charLeftRectExtend(This) -> ok when
+	This::wxStyledTextCtrl().
 charLeftRectExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_CharLeftRectExtend,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlcharrightrectextend">external documentation</a>.
+-spec charRightRectExtend(This) -> ok when
+	This::wxStyledTextCtrl().
 charRightRectExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_CharRightRectExtend,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlhomerectextend">external documentation</a>.
+-spec homeRectExtend(This) -> ok when
+	This::wxStyledTextCtrl().
 homeRectExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_HomeRectExtend,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlvchomerectextend">external documentation</a>.
+-spec vCHomeRectExtend(This) -> ok when
+	This::wxStyledTextCtrl().
 vCHomeRectExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_VCHomeRectExtend,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrllineendrectextend">external documentation</a>.
+-spec lineEndRectExtend(This) -> ok when
+	This::wxStyledTextCtrl().
 lineEndRectExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_LineEndRectExtend,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlpageuprectextend">external documentation</a>.
+-spec pageUpRectExtend(This) -> ok when
+	This::wxStyledTextCtrl().
 pageUpRectExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_PageUpRectExtend,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlpagedownrectextend">external documentation</a>.
+-spec pageDownRectExtend(This) -> ok when
+	This::wxStyledTextCtrl().
 pageDownRectExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_PageDownRectExtend,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlstutteredpageup">external documentation</a>.
+-spec stutteredPageUp(This) -> ok when
+	This::wxStyledTextCtrl().
 stutteredPageUp(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_StutteredPageUp,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlstutteredpageupextend">external documentation</a>.
+-spec stutteredPageUpExtend(This) -> ok when
+	This::wxStyledTextCtrl().
 stutteredPageUpExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_StutteredPageUpExtend,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlstutteredpagedown">external documentation</a>.
+-spec stutteredPageDown(This) -> ok when
+	This::wxStyledTextCtrl().
 stutteredPageDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_StutteredPageDown,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlstutteredpagedownextend">external documentation</a>.
+-spec stutteredPageDownExtend(This) -> ok when
+	This::wxStyledTextCtrl().
 stutteredPageDownExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_StutteredPageDownExtend,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlwordleftend">external documentation</a>.
+-spec wordLeftEnd(This) -> ok when
+	This::wxStyledTextCtrl().
 wordLeftEnd(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_WordLeftEnd,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlwordleftendextend">external documentation</a>.
+-spec wordLeftEndExtend(This) -> ok when
+	This::wxStyledTextCtrl().
 wordLeftEndExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_WordLeftEndExtend,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlwordrightend">external documentation</a>.
+-spec wordRightEnd(This) -> ok when
+	This::wxStyledTextCtrl().
 wordRightEnd(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_WordRightEnd,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlwordrightendextend">external documentation</a>.
+-spec wordRightEndExtend(This) -> ok when
+	This::wxStyledTextCtrl().
 wordRightEndExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_WordRightEndExtend,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Characters::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetwhitespacechars">external documentation</a>.
+-spec setWhitespaceChars(This, Characters) -> ok when
+	This::wxStyledTextCtrl(), Characters::string().
 setWhitespaceChars(#wx_ref{type=ThisT,ref=ThisRef},Characters)
  when is_list(Characters) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
@@ -3167,134 +3573,152 @@ setWhitespaceChars(#wx_ref{type=ThisT,ref=ThisRef},Characters)
   wxe_util:cast(?wxStyledTextCtrl_SetWhitespaceChars,
   <<ThisRef:32/?UI,(byte_size(Characters_UC)):32/?UI,(Characters_UC)/binary, 0:(((8- ((0+byte_size(Characters_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetcharsdefault">external documentation</a>.
+-spec setCharsDefault(This) -> ok when
+	This::wxStyledTextCtrl().
 setCharsDefault(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetCharsDefault,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompgetcurrent">external documentation</a>.
+-spec autoCompGetCurrent(This) -> integer() when
+	This::wxStyledTextCtrl().
 autoCompGetCurrent(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_AutoCompGetCurrent,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Bytes::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlallocate">external documentation</a>.
+-spec allocate(This, Bytes) -> ok when
+	This::wxStyledTextCtrl(), Bytes::integer().
 allocate(#wx_ref{type=ThisT,ref=ThisRef},Bytes)
  when is_integer(Bytes) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_Allocate,
   <<ThisRef:32/?UI,Bytes:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Line::integer(), Column::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlfindcolumn">external documentation</a>.
+-spec findColumn(This, Line, Column) -> integer() when
+	This::wxStyledTextCtrl(), Line::integer(), Column::integer().
 findColumn(#wx_ref{type=ThisT,ref=ThisRef},Line,Column)
  when is_integer(Line),is_integer(Column) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_FindColumn,
   <<ThisRef:32/?UI,Line:32/?UI,Column:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetcaretsticky">external documentation</a>.
+-spec getCaretSticky(This) -> boolean() when
+	This::wxStyledTextCtrl().
 getCaretSticky(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetCaretSticky,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), UseCaretStickyBehaviour::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetcaretsticky">external documentation</a>.
+-spec setCaretSticky(This, UseCaretStickyBehaviour) -> ok when
+	This::wxStyledTextCtrl(), UseCaretStickyBehaviour::boolean().
 setCaretSticky(#wx_ref{type=ThisT,ref=ThisRef},UseCaretStickyBehaviour)
  when is_boolean(UseCaretStickyBehaviour) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetCaretSticky,
   <<ThisRef:32/?UI,(wxe_util:from_bool(UseCaretStickyBehaviour)):32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrltogglecaretsticky">external documentation</a>.
+-spec toggleCaretSticky(This) -> ok when
+	This::wxStyledTextCtrl().
 toggleCaretSticky(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_ToggleCaretSticky,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Convert::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetpasteconvertendings">external documentation</a>.
+-spec setPasteConvertEndings(This, Convert) -> ok when
+	This::wxStyledTextCtrl(), Convert::boolean().
 setPasteConvertEndings(#wx_ref{type=ThisT,ref=ThisRef},Convert)
  when is_boolean(Convert) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetPasteConvertEndings,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Convert)):32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetpasteconvertendings">external documentation</a>.
+-spec getPasteConvertEndings(This) -> boolean() when
+	This::wxStyledTextCtrl().
 getPasteConvertEndings(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetPasteConvertEndings,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlselectionduplicate">external documentation</a>.
+-spec selectionDuplicate(This) -> ok when
+	This::wxStyledTextCtrl().
 selectionDuplicate(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SelectionDuplicate,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Alpha::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetcaretlinebackalpha">external documentation</a>.
+-spec setCaretLineBackAlpha(This, Alpha) -> ok when
+	This::wxStyledTextCtrl(), Alpha::integer().
 setCaretLineBackAlpha(#wx_ref{type=ThisT,ref=ThisRef},Alpha)
  when is_integer(Alpha) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetCaretLineBackAlpha,
   <<ThisRef:32/?UI,Alpha:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetcaretlinebackalpha">external documentation</a>.
+-spec getCaretLineBackAlpha(This) -> integer() when
+	This::wxStyledTextCtrl().
 getCaretLineBackAlpha(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetCaretLineBackAlpha,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlstartrecord">external documentation</a>.
+-spec startRecord(This) -> ok when
+	This::wxStyledTextCtrl().
 startRecord(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_StartRecord,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlstoprecord">external documentation</a>.
+-spec stopRecord(This) -> ok when
+	This::wxStyledTextCtrl().
 stopRecord(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_StopRecord,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Lexer::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetlexer">external documentation</a>.
+-spec setLexer(This, Lexer) -> ok when
+	This::wxStyledTextCtrl(), Lexer::integer().
 setLexer(#wx_ref{type=ThisT,ref=ThisRef},Lexer)
  when is_integer(Lexer) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetLexer,
   <<ThisRef:32/?UI,Lexer:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetlexer">external documentation</a>.
+-spec getLexer(This) -> integer() when
+	This::wxStyledTextCtrl().
 getLexer(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetLexer,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Start::integer(), End::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlcolourise">external documentation</a>.
+-spec colourise(This, Start, End) -> ok when
+	This::wxStyledTextCtrl(), Start::integer(), End::integer().
 colourise(#wx_ref{type=ThisT,ref=ThisRef},Start,End)
  when is_integer(Start),is_integer(End) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_Colourise,
   <<ThisRef:32/?UI,Start:32/?UI,End:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Key::string(), Value::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetproperty">external documentation</a>.
+-spec setProperty(This, Key, Value) -> ok when
+	This::wxStyledTextCtrl(), Key::string(), Value::string().
 setProperty(#wx_ref{type=ThisT,ref=ThisRef},Key,Value)
  when is_list(Key),is_list(Value) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
@@ -3303,8 +3727,9 @@ setProperty(#wx_ref{type=ThisT,ref=ThisRef},Key,Value)
   wxe_util:cast(?wxStyledTextCtrl_SetProperty,
   <<ThisRef:32/?UI,(byte_size(Key_UC)):32/?UI,(Key_UC)/binary, 0:(((8- ((0+byte_size(Key_UC)) band 16#7)) band 16#7))/unit:8,(byte_size(Value_UC)):32/?UI,(Value_UC)/binary, 0:(((8- ((4+byte_size(Value_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxStyledTextCtrl(), KeywordSet::integer(), KeyWords::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetkeywords">external documentation</a>.
+-spec setKeyWords(This, KeywordSet, KeyWords) -> ok when
+	This::wxStyledTextCtrl(), KeywordSet::integer(), KeyWords::string().
 setKeyWords(#wx_ref{type=ThisT,ref=ThisRef},KeywordSet,KeyWords)
  when is_integer(KeywordSet),is_list(KeyWords) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
@@ -3312,8 +3737,9 @@ setKeyWords(#wx_ref{type=ThisT,ref=ThisRef},KeywordSet,KeyWords)
   wxe_util:cast(?wxStyledTextCtrl_SetKeyWords,
   <<ThisRef:32/?UI,KeywordSet:32/?UI,(byte_size(KeyWords_UC)):32/?UI,(KeyWords_UC)/binary, 0:(((8- ((4+byte_size(KeyWords_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxStyledTextCtrl(), Language::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetlexerlanguage">external documentation</a>.
+-spec setLexerLanguage(This, Language) -> ok when
+	This::wxStyledTextCtrl(), Language::string().
 setLexerLanguage(#wx_ref{type=ThisT,ref=ThisRef},Language)
  when is_list(Language) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
@@ -3321,8 +3747,9 @@ setLexerLanguage(#wx_ref{type=ThisT,ref=ThisRef},Language)
   wxe_util:cast(?wxStyledTextCtrl_SetLexerLanguage,
   <<ThisRef:32/?UI,(byte_size(Language_UC)):32/?UI,(Language_UC)/binary, 0:(((8- ((0+byte_size(Language_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxStyledTextCtrl(), Key::string()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetproperty">external documentation</a>.
+-spec getProperty(This, Key) -> string() when
+	This::wxStyledTextCtrl(), Key::string().
 getProperty(#wx_ref{type=ThisT,ref=ThisRef},Key)
  when is_list(Key) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
@@ -3330,22 +3757,25 @@ getProperty(#wx_ref{type=ThisT,ref=ThisRef},Key)
   wxe_util:call(?wxStyledTextCtrl_GetProperty,
   <<ThisRef:32/?UI,(byte_size(Key_UC)):32/?UI,(Key_UC)/binary, 0:(((8- ((0+byte_size(Key_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetstylebitsneeded">external documentation</a>.
+-spec getStyleBitsNeeded(This) -> integer() when
+	This::wxStyledTextCtrl().
 getStyleBitsNeeded(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetStyleBitsNeeded,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetcurrentline">external documentation</a>.
+-spec getCurrentLine(This) -> integer() when
+	This::wxStyledTextCtrl().
 getCurrentLine(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetCurrentLine,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), StyleNum::integer(), Spec::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlstylesetspec">external documentation</a>.
+-spec styleSetSpec(This, StyleNum, Spec) -> ok when
+	This::wxStyledTextCtrl(), StyleNum::integer(), Spec::string().
 styleSetSpec(#wx_ref{type=ThisT,ref=ThisRef},StyleNum,Spec)
  when is_integer(StyleNum),is_list(Spec) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
@@ -3353,8 +3783,9 @@ styleSetSpec(#wx_ref{type=ThisT,ref=ThisRef},StyleNum,Spec)
   wxe_util:cast(?wxStyledTextCtrl_StyleSetSpec,
   <<ThisRef:32/?UI,StyleNum:32/?UI,(byte_size(Spec_UC)):32/?UI,(Spec_UC)/binary, 0:(((8- ((4+byte_size(Spec_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxStyledTextCtrl(), StyleNum::integer(), Font::wxFont:wxFont()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlstylesetfont">external documentation</a>.
+-spec styleSetFont(This, StyleNum, Font) -> ok when
+	This::wxStyledTextCtrl(), StyleNum::integer(), Font::wxFont:wxFont().
 styleSetFont(#wx_ref{type=ThisT,ref=ThisRef},StyleNum,#wx_ref{type=FontT,ref=FontRef})
  when is_integer(StyleNum) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
@@ -3362,17 +3793,19 @@ styleSetFont(#wx_ref{type=ThisT,ref=ThisRef},StyleNum,#wx_ref{type=FontT,ref=Fon
   wxe_util:cast(?wxStyledTextCtrl_StyleSetFont,
   <<ThisRef:32/?UI,StyleNum:32/?UI,FontRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), StyleNum::integer(), Size::integer(), FaceName::string(), Bold::bool(), Italic::bool(), Underline::bool()) -> ok
 %% @equiv styleSetFontAttr(This,StyleNum,Size,FaceName,Bold,Italic,Underline, [])
+-spec styleSetFontAttr(This, StyleNum, Size, FaceName, Bold, Italic, Underline) -> ok when
+	This::wxStyledTextCtrl(), StyleNum::integer(), Size::integer(), FaceName::string(), Bold::boolean(), Italic::boolean(), Underline::boolean().
+
 styleSetFontAttr(This,StyleNum,Size,FaceName,Bold,Italic,Underline)
  when is_record(This, wx_ref),is_integer(StyleNum),is_integer(Size),is_list(FaceName),is_boolean(Bold),is_boolean(Italic),is_boolean(Underline) ->
   styleSetFontAttr(This,StyleNum,Size,FaceName,Bold,Italic,Underline, []).
 
-%% @spec (This::wxStyledTextCtrl(), StyleNum::integer(), Size::integer(), FaceName::string(), Bold::bool(), Italic::bool(), Underline::bool(), [Option]) -> ok
-%% Option = {encoding, WxFontEncoding}
-%% WxFontEncoding = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlstylesetfontattr">external documentation</a>.
-%%<br /> WxFontEncoding is one of ?wxFONTENCODING_SYSTEM | ?wxFONTENCODING_DEFAULT | ?wxFONTENCODING_ISO8859_1 | ?wxFONTENCODING_ISO8859_2 | ?wxFONTENCODING_ISO8859_3 | ?wxFONTENCODING_ISO8859_4 | ?wxFONTENCODING_ISO8859_5 | ?wxFONTENCODING_ISO8859_6 | ?wxFONTENCODING_ISO8859_7 | ?wxFONTENCODING_ISO8859_8 | ?wxFONTENCODING_ISO8859_9 | ?wxFONTENCODING_ISO8859_10 | ?wxFONTENCODING_ISO8859_11 | ?wxFONTENCODING_ISO8859_12 | ?wxFONTENCODING_ISO8859_13 | ?wxFONTENCODING_ISO8859_14 | ?wxFONTENCODING_ISO8859_15 | ?wxFONTENCODING_ISO8859_MAX | ?wxFONTENCODING_KOI8 | ?wxFONTENCODING_KOI8_U | ?wxFONTENCODING_ALTERNATIVE | ?wxFONTENCODING_BULGARIAN | ?wxFONTENCODING_CP437 | ?wxFONTENCODING_CP850 | ?wxFONTENCODING_CP852 | ?wxFONTENCODING_CP855 | ?wxFONTENCODING_CP866 | ?wxFONTENCODING_CP874 | ?wxFONTENCODING_CP932 | ?wxFONTENCODING_CP936 | ?wxFONTENCODING_CP949 | ?wxFONTENCODING_CP950 | ?wxFONTENCODING_CP1250 | ?wxFONTENCODING_CP1251 | ?wxFONTENCODING_CP1252 | ?wxFONTENCODING_CP1253 | ?wxFONTENCODING_CP1254 | ?wxFONTENCODING_CP1255 | ?wxFONTENCODING_CP1256 | ?wxFONTENCODING_CP1257 | ?wxFONTENCODING_CP12_MAX | ?wxFONTENCODING_UTF7 | ?wxFONTENCODING_UTF8 | ?wxFONTENCODING_EUC_JP | ?wxFONTENCODING_UTF16BE | ?wxFONTENCODING_UTF16LE | ?wxFONTENCODING_UTF32BE | ?wxFONTENCODING_UTF32LE | ?wxFONTENCODING_MACROMAN | ?wxFONTENCODING_MACJAPANESE | ?wxFONTENCODING_MACCHINESETRAD | ?wxFONTENCODING_MACKOREAN | ?wxFONTENCODING_MACARABIC | ?wxFONTENCODING_MACHEBREW | ?wxFONTENCODING_MACGREEK | ?wxFONTENCODING_MACCYRILLIC | ?wxFONTENCODING_MACDEVANAGARI | ?wxFONTENCODING_MACGURMUKHI | ?wxFONTENCODING_MACGUJARATI | ?wxFONTENCODING_MACORIYA | ?wxFONTENCODING_MACBENGALI | ?wxFONTENCODING_MACTAMIL | ?wxFONTENCODING_MACTELUGU | ?wxFONTENCODING_MACKANNADA | ?wxFONTENCODING_MACMALAJALAM | ?wxFONTENCODING_MACSINHALESE | ?wxFONTENCODING_MACBURMESE | ?wxFONTENCODING_MACKHMER | ?wxFONTENCODING_MACTHAI | ?wxFONTENCODING_MACLAOTIAN | ?wxFONTENCODING_MACGEORGIAN | ?wxFONTENCODING_MACARMENIAN | ?wxFONTENCODING_MACCHINESESIMP | ?wxFONTENCODING_MACTIBETAN | ?wxFONTENCODING_MACMONGOLIAN | ?wxFONTENCODING_MACETHIOPIC | ?wxFONTENCODING_MACCENTRALEUR | ?wxFONTENCODING_MACVIATNAMESE | ?wxFONTENCODING_MACARABICEXT | ?wxFONTENCODING_MACSYMBOL | ?wxFONTENCODING_MACDINGBATS | ?wxFONTENCODING_MACTURKISH | ?wxFONTENCODING_MACCROATIAN | ?wxFONTENCODING_MACICELANDIC | ?wxFONTENCODING_MACROMANIAN | ?wxFONTENCODING_MACCELTIC | ?wxFONTENCODING_MACGAELIC | ?wxFONTENCODING_MACKEYBOARD | ?wxFONTENCODING_MAX | ?wxFONTENCODING_MACMIN | ?wxFONTENCODING_MACMAX | ?wxFONTENCODING_UTF16 | ?wxFONTENCODING_UTF32 | ?wxFONTENCODING_UNICODE | ?wxFONTENCODING_GB2312 | ?wxFONTENCODING_BIG5 | ?wxFONTENCODING_SHIFT_JIS
+%%<br /> Encoding = ?wxFONTENCODING_SYSTEM | ?wxFONTENCODING_DEFAULT | ?wxFONTENCODING_ISO8859_1 | ?wxFONTENCODING_ISO8859_2 | ?wxFONTENCODING_ISO8859_3 | ?wxFONTENCODING_ISO8859_4 | ?wxFONTENCODING_ISO8859_5 | ?wxFONTENCODING_ISO8859_6 | ?wxFONTENCODING_ISO8859_7 | ?wxFONTENCODING_ISO8859_8 | ?wxFONTENCODING_ISO8859_9 | ?wxFONTENCODING_ISO8859_10 | ?wxFONTENCODING_ISO8859_11 | ?wxFONTENCODING_ISO8859_12 | ?wxFONTENCODING_ISO8859_13 | ?wxFONTENCODING_ISO8859_14 | ?wxFONTENCODING_ISO8859_15 | ?wxFONTENCODING_ISO8859_MAX | ?wxFONTENCODING_KOI8 | ?wxFONTENCODING_KOI8_U | ?wxFONTENCODING_ALTERNATIVE | ?wxFONTENCODING_BULGARIAN | ?wxFONTENCODING_CP437 | ?wxFONTENCODING_CP850 | ?wxFONTENCODING_CP852 | ?wxFONTENCODING_CP855 | ?wxFONTENCODING_CP866 | ?wxFONTENCODING_CP874 | ?wxFONTENCODING_CP932 | ?wxFONTENCODING_CP936 | ?wxFONTENCODING_CP949 | ?wxFONTENCODING_CP950 | ?wxFONTENCODING_CP1250 | ?wxFONTENCODING_CP1251 | ?wxFONTENCODING_CP1252 | ?wxFONTENCODING_CP1253 | ?wxFONTENCODING_CP1254 | ?wxFONTENCODING_CP1255 | ?wxFONTENCODING_CP1256 | ?wxFONTENCODING_CP1257 | ?wxFONTENCODING_CP12_MAX | ?wxFONTENCODING_UTF7 | ?wxFONTENCODING_UTF8 | ?wxFONTENCODING_EUC_JP | ?wxFONTENCODING_UTF16BE | ?wxFONTENCODING_UTF16LE | ?wxFONTENCODING_UTF32BE | ?wxFONTENCODING_UTF32LE | ?wxFONTENCODING_MACROMAN | ?wxFONTENCODING_MACJAPANESE | ?wxFONTENCODING_MACCHINESETRAD | ?wxFONTENCODING_MACKOREAN | ?wxFONTENCODING_MACARABIC | ?wxFONTENCODING_MACHEBREW | ?wxFONTENCODING_MACGREEK | ?wxFONTENCODING_MACCYRILLIC | ?wxFONTENCODING_MACDEVANAGARI | ?wxFONTENCODING_MACGURMUKHI | ?wxFONTENCODING_MACGUJARATI | ?wxFONTENCODING_MACORIYA | ?wxFONTENCODING_MACBENGALI | ?wxFONTENCODING_MACTAMIL | ?wxFONTENCODING_MACTELUGU | ?wxFONTENCODING_MACKANNADA | ?wxFONTENCODING_MACMALAJALAM | ?wxFONTENCODING_MACSINHALESE | ?wxFONTENCODING_MACBURMESE | ?wxFONTENCODING_MACKHMER | ?wxFONTENCODING_MACTHAI | ?wxFONTENCODING_MACLAOTIAN | ?wxFONTENCODING_MACGEORGIAN | ?wxFONTENCODING_MACARMENIAN | ?wxFONTENCODING_MACCHINESESIMP | ?wxFONTENCODING_MACTIBETAN | ?wxFONTENCODING_MACMONGOLIAN | ?wxFONTENCODING_MACETHIOPIC | ?wxFONTENCODING_MACCENTRALEUR | ?wxFONTENCODING_MACVIATNAMESE | ?wxFONTENCODING_MACARABICEXT | ?wxFONTENCODING_MACSYMBOL | ?wxFONTENCODING_MACDINGBATS | ?wxFONTENCODING_MACTURKISH | ?wxFONTENCODING_MACCROATIAN | ?wxFONTENCODING_MACICELANDIC | ?wxFONTENCODING_MACROMANIAN | ?wxFONTENCODING_MACCELTIC | ?wxFONTENCODING_MACGAELIC | ?wxFONTENCODING_MACKEYBOARD | ?wxFONTENCODING_MAX | ?wxFONTENCODING_MACMIN | ?wxFONTENCODING_MACMAX | ?wxFONTENCODING_UTF16 | ?wxFONTENCODING_UTF32 | ?wxFONTENCODING_UNICODE | ?wxFONTENCODING_GB2312 | ?wxFONTENCODING_BIG5 | ?wxFONTENCODING_SHIFT_JIS
+-spec styleSetFontAttr(This, StyleNum, Size, FaceName, Bold, Italic, Underline, [Option]) -> ok when
+	This::wxStyledTextCtrl(), StyleNum::integer(), Size::integer(), FaceName::string(), Bold::boolean(), Italic::boolean(), Underline::boolean(),
+	Option :: {encoding, wx:wx_enum()}.
 styleSetFontAttr(#wx_ref{type=ThisT,ref=ThisRef},StyleNum,Size,FaceName,Bold,Italic,Underline, Options)
  when is_integer(StyleNum),is_integer(Size),is_list(FaceName),is_boolean(Bold),is_boolean(Italic),is_boolean(Underline),is_list(Options) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
@@ -3383,80 +3816,91 @@ styleSetFontAttr(#wx_ref{type=ThisT,ref=ThisRef},StyleNum,Size,FaceName,Bold,Ita
   wxe_util:cast(?wxStyledTextCtrl_StyleSetFontAttr,
   <<ThisRef:32/?UI,StyleNum:32/?UI,Size:32/?UI,(byte_size(FaceName_UC)):32/?UI,(FaceName_UC)/binary, 0:(((8- ((0+byte_size(FaceName_UC)) band 16#7)) band 16#7))/unit:8,(wxe_util:from_bool(Bold)):32/?UI,(wxe_util:from_bool(Italic)):32/?UI,(wxe_util:from_bool(Underline)):32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxStyledTextCtrl(), Style::integer(), CharacterSet::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlstylesetcharacterset">external documentation</a>.
+-spec styleSetCharacterSet(This, Style, CharacterSet) -> ok when
+	This::wxStyledTextCtrl(), Style::integer(), CharacterSet::integer().
 styleSetCharacterSet(#wx_ref{type=ThisT,ref=ThisRef},Style,CharacterSet)
  when is_integer(Style),is_integer(CharacterSet) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_StyleSetCharacterSet,
   <<ThisRef:32/?UI,Style:32/?UI,CharacterSet:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Style::integer(), Encoding::WxFontEncoding) -> ok
-%% WxFontEncoding = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlstylesetfontencoding">external documentation</a>.
-%%<br /> WxFontEncoding is one of ?wxFONTENCODING_SYSTEM | ?wxFONTENCODING_DEFAULT | ?wxFONTENCODING_ISO8859_1 | ?wxFONTENCODING_ISO8859_2 | ?wxFONTENCODING_ISO8859_3 | ?wxFONTENCODING_ISO8859_4 | ?wxFONTENCODING_ISO8859_5 | ?wxFONTENCODING_ISO8859_6 | ?wxFONTENCODING_ISO8859_7 | ?wxFONTENCODING_ISO8859_8 | ?wxFONTENCODING_ISO8859_9 | ?wxFONTENCODING_ISO8859_10 | ?wxFONTENCODING_ISO8859_11 | ?wxFONTENCODING_ISO8859_12 | ?wxFONTENCODING_ISO8859_13 | ?wxFONTENCODING_ISO8859_14 | ?wxFONTENCODING_ISO8859_15 | ?wxFONTENCODING_ISO8859_MAX | ?wxFONTENCODING_KOI8 | ?wxFONTENCODING_KOI8_U | ?wxFONTENCODING_ALTERNATIVE | ?wxFONTENCODING_BULGARIAN | ?wxFONTENCODING_CP437 | ?wxFONTENCODING_CP850 | ?wxFONTENCODING_CP852 | ?wxFONTENCODING_CP855 | ?wxFONTENCODING_CP866 | ?wxFONTENCODING_CP874 | ?wxFONTENCODING_CP932 | ?wxFONTENCODING_CP936 | ?wxFONTENCODING_CP949 | ?wxFONTENCODING_CP950 | ?wxFONTENCODING_CP1250 | ?wxFONTENCODING_CP1251 | ?wxFONTENCODING_CP1252 | ?wxFONTENCODING_CP1253 | ?wxFONTENCODING_CP1254 | ?wxFONTENCODING_CP1255 | ?wxFONTENCODING_CP1256 | ?wxFONTENCODING_CP1257 | ?wxFONTENCODING_CP12_MAX | ?wxFONTENCODING_UTF7 | ?wxFONTENCODING_UTF8 | ?wxFONTENCODING_EUC_JP | ?wxFONTENCODING_UTF16BE | ?wxFONTENCODING_UTF16LE | ?wxFONTENCODING_UTF32BE | ?wxFONTENCODING_UTF32LE | ?wxFONTENCODING_MACROMAN | ?wxFONTENCODING_MACJAPANESE | ?wxFONTENCODING_MACCHINESETRAD | ?wxFONTENCODING_MACKOREAN | ?wxFONTENCODING_MACARABIC | ?wxFONTENCODING_MACHEBREW | ?wxFONTENCODING_MACGREEK | ?wxFONTENCODING_MACCYRILLIC | ?wxFONTENCODING_MACDEVANAGARI | ?wxFONTENCODING_MACGURMUKHI | ?wxFONTENCODING_MACGUJARATI | ?wxFONTENCODING_MACORIYA | ?wxFONTENCODING_MACBENGALI | ?wxFONTENCODING_MACTAMIL | ?wxFONTENCODING_MACTELUGU | ?wxFONTENCODING_MACKANNADA | ?wxFONTENCODING_MACMALAJALAM | ?wxFONTENCODING_MACSINHALESE | ?wxFONTENCODING_MACBURMESE | ?wxFONTENCODING_MACKHMER | ?wxFONTENCODING_MACTHAI | ?wxFONTENCODING_MACLAOTIAN | ?wxFONTENCODING_MACGEORGIAN | ?wxFONTENCODING_MACARMENIAN | ?wxFONTENCODING_MACCHINESESIMP | ?wxFONTENCODING_MACTIBETAN | ?wxFONTENCODING_MACMONGOLIAN | ?wxFONTENCODING_MACETHIOPIC | ?wxFONTENCODING_MACCENTRALEUR | ?wxFONTENCODING_MACVIATNAMESE | ?wxFONTENCODING_MACARABICEXT | ?wxFONTENCODING_MACSYMBOL | ?wxFONTENCODING_MACDINGBATS | ?wxFONTENCODING_MACTURKISH | ?wxFONTENCODING_MACCROATIAN | ?wxFONTENCODING_MACICELANDIC | ?wxFONTENCODING_MACROMANIAN | ?wxFONTENCODING_MACCELTIC | ?wxFONTENCODING_MACGAELIC | ?wxFONTENCODING_MACKEYBOARD | ?wxFONTENCODING_MAX | ?wxFONTENCODING_MACMIN | ?wxFONTENCODING_MACMAX | ?wxFONTENCODING_UTF16 | ?wxFONTENCODING_UTF32 | ?wxFONTENCODING_UNICODE | ?wxFONTENCODING_GB2312 | ?wxFONTENCODING_BIG5 | ?wxFONTENCODING_SHIFT_JIS
+%%<br /> Encoding = ?wxFONTENCODING_SYSTEM | ?wxFONTENCODING_DEFAULT | ?wxFONTENCODING_ISO8859_1 | ?wxFONTENCODING_ISO8859_2 | ?wxFONTENCODING_ISO8859_3 | ?wxFONTENCODING_ISO8859_4 | ?wxFONTENCODING_ISO8859_5 | ?wxFONTENCODING_ISO8859_6 | ?wxFONTENCODING_ISO8859_7 | ?wxFONTENCODING_ISO8859_8 | ?wxFONTENCODING_ISO8859_9 | ?wxFONTENCODING_ISO8859_10 | ?wxFONTENCODING_ISO8859_11 | ?wxFONTENCODING_ISO8859_12 | ?wxFONTENCODING_ISO8859_13 | ?wxFONTENCODING_ISO8859_14 | ?wxFONTENCODING_ISO8859_15 | ?wxFONTENCODING_ISO8859_MAX | ?wxFONTENCODING_KOI8 | ?wxFONTENCODING_KOI8_U | ?wxFONTENCODING_ALTERNATIVE | ?wxFONTENCODING_BULGARIAN | ?wxFONTENCODING_CP437 | ?wxFONTENCODING_CP850 | ?wxFONTENCODING_CP852 | ?wxFONTENCODING_CP855 | ?wxFONTENCODING_CP866 | ?wxFONTENCODING_CP874 | ?wxFONTENCODING_CP932 | ?wxFONTENCODING_CP936 | ?wxFONTENCODING_CP949 | ?wxFONTENCODING_CP950 | ?wxFONTENCODING_CP1250 | ?wxFONTENCODING_CP1251 | ?wxFONTENCODING_CP1252 | ?wxFONTENCODING_CP1253 | ?wxFONTENCODING_CP1254 | ?wxFONTENCODING_CP1255 | ?wxFONTENCODING_CP1256 | ?wxFONTENCODING_CP1257 | ?wxFONTENCODING_CP12_MAX | ?wxFONTENCODING_UTF7 | ?wxFONTENCODING_UTF8 | ?wxFONTENCODING_EUC_JP | ?wxFONTENCODING_UTF16BE | ?wxFONTENCODING_UTF16LE | ?wxFONTENCODING_UTF32BE | ?wxFONTENCODING_UTF32LE | ?wxFONTENCODING_MACROMAN | ?wxFONTENCODING_MACJAPANESE | ?wxFONTENCODING_MACCHINESETRAD | ?wxFONTENCODING_MACKOREAN | ?wxFONTENCODING_MACARABIC | ?wxFONTENCODING_MACHEBREW | ?wxFONTENCODING_MACGREEK | ?wxFONTENCODING_MACCYRILLIC | ?wxFONTENCODING_MACDEVANAGARI | ?wxFONTENCODING_MACGURMUKHI | ?wxFONTENCODING_MACGUJARATI | ?wxFONTENCODING_MACORIYA | ?wxFONTENCODING_MACBENGALI | ?wxFONTENCODING_MACTAMIL | ?wxFONTENCODING_MACTELUGU | ?wxFONTENCODING_MACKANNADA | ?wxFONTENCODING_MACMALAJALAM | ?wxFONTENCODING_MACSINHALESE | ?wxFONTENCODING_MACBURMESE | ?wxFONTENCODING_MACKHMER | ?wxFONTENCODING_MACTHAI | ?wxFONTENCODING_MACLAOTIAN | ?wxFONTENCODING_MACGEORGIAN | ?wxFONTENCODING_MACARMENIAN | ?wxFONTENCODING_MACCHINESESIMP | ?wxFONTENCODING_MACTIBETAN | ?wxFONTENCODING_MACMONGOLIAN | ?wxFONTENCODING_MACETHIOPIC | ?wxFONTENCODING_MACCENTRALEUR | ?wxFONTENCODING_MACVIATNAMESE | ?wxFONTENCODING_MACARABICEXT | ?wxFONTENCODING_MACSYMBOL | ?wxFONTENCODING_MACDINGBATS | ?wxFONTENCODING_MACTURKISH | ?wxFONTENCODING_MACCROATIAN | ?wxFONTENCODING_MACICELANDIC | ?wxFONTENCODING_MACROMANIAN | ?wxFONTENCODING_MACCELTIC | ?wxFONTENCODING_MACGAELIC | ?wxFONTENCODING_MACKEYBOARD | ?wxFONTENCODING_MAX | ?wxFONTENCODING_MACMIN | ?wxFONTENCODING_MACMAX | ?wxFONTENCODING_UTF16 | ?wxFONTENCODING_UTF32 | ?wxFONTENCODING_UNICODE | ?wxFONTENCODING_GB2312 | ?wxFONTENCODING_BIG5 | ?wxFONTENCODING_SHIFT_JIS
+-spec styleSetFontEncoding(This, Style, Encoding) -> ok when
+	This::wxStyledTextCtrl(), Style::integer(), Encoding::wx:wx_enum().
 styleSetFontEncoding(#wx_ref{type=ThisT,ref=ThisRef},Style,Encoding)
  when is_integer(Style),is_integer(Encoding) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_StyleSetFontEncoding,
   <<ThisRef:32/?UI,Style:32/?UI,Encoding:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Cmd::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlcmdkeyexecute">external documentation</a>.
+-spec cmdKeyExecute(This, Cmd) -> ok when
+	This::wxStyledTextCtrl(), Cmd::integer().
 cmdKeyExecute(#wx_ref{type=ThisT,ref=ThisRef},Cmd)
  when is_integer(Cmd) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_CmdKeyExecute,
   <<ThisRef:32/?UI,Cmd:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Left::integer(), Right::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetmargins">external documentation</a>.
+-spec setMargins(This, Left, Right) -> ok when
+	This::wxStyledTextCtrl(), Left::integer(), Right::integer().
 setMargins(#wx_ref{type=ThisT,ref=ThisRef},Left,Right)
  when is_integer(Left),is_integer(Right) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetMargins,
   <<ThisRef:32/?UI,Left:32/?UI,Right:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> {StartPos::integer(), EndPos::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetselection">external documentation</a>.
+-spec getSelection(This) -> {StartPos::integer(), EndPos::integer()} when
+	This::wxStyledTextCtrl().
 getSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetSelection,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Pos::integer()) -> {X::integer(), Y::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlpointfromposition">external documentation</a>.
+-spec pointFromPosition(This, Pos) -> {X::integer(), Y::integer()} when
+	This::wxStyledTextCtrl(), Pos::integer().
 pointFromPosition(#wx_ref{type=ThisT,ref=ThisRef},Pos)
  when is_integer(Pos) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_PointFromPosition,
   <<ThisRef:32/?UI,Pos:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Line::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlscrolltoline">external documentation</a>.
+-spec scrollToLine(This, Line) -> ok when
+	This::wxStyledTextCtrl(), Line::integer().
 scrollToLine(#wx_ref{type=ThisT,ref=ThisRef},Line)
  when is_integer(Line) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_ScrollToLine,
   <<ThisRef:32/?UI,Line:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Column::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlscrolltocolumn">external documentation</a>.
+-spec scrollToColumn(This, Column) -> ok when
+	This::wxStyledTextCtrl(), Column::integer().
 scrollToColumn(#wx_ref{type=ThisT,ref=ThisRef},Column)
  when is_integer(Column) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_ScrollToColumn,
   <<ThisRef:32/?UI,Column:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Msg::integer()) -> integer()
 %% @equiv sendMsg(This,Msg, [])
+-spec sendMsg(This, Msg) -> integer() when
+	This::wxStyledTextCtrl(), Msg::integer().
+
 sendMsg(This,Msg)
  when is_record(This, wx_ref),is_integer(Msg) ->
   sendMsg(This,Msg, []).
 
-%% @spec (This::wxStyledTextCtrl(), Msg::integer(), [Option]) -> integer()
-%% Option = {wp, integer()} | {lp, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsendmsg">external documentation</a>.
+-spec sendMsg(This, Msg, [Option]) -> integer() when
+	This::wxStyledTextCtrl(), Msg::integer(),
+	Option :: {wp, integer()}
+		 | {lp, integer()}.
 sendMsg(#wx_ref{type=ThisT,ref=ThisRef},Msg, Options)
  when is_integer(Msg),is_list(Options) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
@@ -3467,39 +3911,44 @@ sendMsg(#wx_ref{type=ThisT,ref=ThisRef},Msg, Options)
   wxe_util:call(?wxStyledTextCtrl_SendMsg,
   <<ThisRef:32/?UI,Msg:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxStyledTextCtrl(), Bar::wxScrollBar:wxScrollBar()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetvscrollbar">external documentation</a>.
+-spec setVScrollBar(This, Bar) -> ok when
+	This::wxStyledTextCtrl(), Bar::wxScrollBar:wxScrollBar().
 setVScrollBar(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BarT,ref=BarRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   ?CLASS(BarT,wxScrollBar),
   wxe_util:cast(?wxStyledTextCtrl_SetVScrollBar,
   <<ThisRef:32/?UI,BarRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Bar::wxScrollBar:wxScrollBar()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsethscrollbar">external documentation</a>.
+-spec setHScrollBar(This, Bar) -> ok when
+	This::wxStyledTextCtrl(), Bar::wxScrollBar:wxScrollBar().
 setHScrollBar(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BarT,ref=BarRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   ?CLASS(BarT,wxScrollBar),
   wxe_util:cast(?wxStyledTextCtrl_SetHScrollBar,
   <<ThisRef:32/?UI,BarRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetlastkeydownprocessed">external documentation</a>.
+-spec getLastKeydownProcessed(This) -> boolean() when
+	This::wxStyledTextCtrl().
 getLastKeydownProcessed(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetLastKeydownProcessed,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Val::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetlastkeydownprocessed">external documentation</a>.
+-spec setLastKeydownProcessed(This, Val) -> ok when
+	This::wxStyledTextCtrl(), Val::boolean().
 setLastKeydownProcessed(#wx_ref{type=ThisT,ref=ThisRef},Val)
  when is_boolean(Val) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:cast(?wxStyledTextCtrl_SetLastKeydownProcessed,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Val)):32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Filename::string()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsavefile">external documentation</a>.
+-spec saveFile(This, Filename) -> boolean() when
+	This::wxStyledTextCtrl(), Filename::string().
 saveFile(#wx_ref{type=ThisT,ref=ThisRef},Filename)
  when is_list(Filename) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
@@ -3507,8 +3956,9 @@ saveFile(#wx_ref{type=ThisT,ref=ThisRef},Filename)
   wxe_util:call(?wxStyledTextCtrl_SaveFile,
   <<ThisRef:32/?UI,(byte_size(Filename_UC)):32/?UI,(Filename_UC)/binary, 0:(((8- ((0+byte_size(Filename_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxStyledTextCtrl(), Filename::string()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlloadfile">external documentation</a>.
+-spec loadFile(This, Filename) -> boolean() when
+	This::wxStyledTextCtrl(), Filename::string().
 loadFile(#wx_ref{type=ThisT,ref=ThisRef},Filename)
  when is_list(Filename) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
@@ -3516,20 +3966,20 @@ loadFile(#wx_ref{type=ThisT,ref=ThisRef},Filename)
   wxe_util:call(?wxStyledTextCtrl_LoadFile,
   <<ThisRef:32/?UI,(byte_size(Filename_UC)):32/?UI,(Filename_UC)/binary, 0:(((8- ((0+byte_size(Filename_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxStyledTextCtrl(), X::integer(), Y::integer(), Def::WxDragResult) -> WxDragResult
-%% WxDragResult = integer()
-%% WxDragResult = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrldodragover">external documentation</a>.
-%%<br /> WxDragResult is one of ?wxDragError | ?wxDragNone | ?wxDragCopy | ?wxDragMove | ?wxDragLink | ?wxDragCancel
-%%<br /> WxDragResult is one of ?wxDragError | ?wxDragNone | ?wxDragCopy | ?wxDragMove | ?wxDragLink | ?wxDragCancel
+%%<br /> Res = ?wxDragError | ?wxDragNone | ?wxDragCopy | ?wxDragMove | ?wxDragLink | ?wxDragCancel
+%%<br /> Def = ?wxDragError | ?wxDragNone | ?wxDragCopy | ?wxDragMove | ?wxDragLink | ?wxDragCancel
+-spec doDragOver(This, X, Y, Def) -> wx:wx_enum() when
+	This::wxStyledTextCtrl(), X::integer(), Y::integer(), Def::wx:wx_enum().
 doDragOver(#wx_ref{type=ThisT,ref=ThisRef},X,Y,Def)
  when is_integer(X),is_integer(Y),is_integer(Def) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_DoDragOver,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI,Def:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), X::integer(), Y::integer(), Data::string()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrldodroptext">external documentation</a>.
+-spec doDropText(This, X, Y, Data) -> boolean() when
+	This::wxStyledTextCtrl(), X::integer(), Y::integer(), Data::string().
 doDropText(#wx_ref{type=ThisT,ref=ThisRef},X,Y,Data)
  when is_integer(X),is_integer(Y),is_list(Data) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
@@ -3537,15 +3987,17 @@ doDropText(#wx_ref{type=ThisT,ref=ThisRef},X,Y,Data)
   wxe_util:call(?wxStyledTextCtrl_DoDropText,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI,(byte_size(Data_UC)):32/?UI,(Data_UC)/binary, 0:(((8- ((0+byte_size(Data_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetuseantialiasing">external documentation</a>.
+-spec getUseAntiAliasing(This) -> boolean() when
+	This::wxStyledTextCtrl().
 getUseAntiAliasing(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetUseAntiAliasing,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Text::binary()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrladdtextraw">external documentation</a>.
+-spec addTextRaw(This, Text) -> ok when
+	This::wxStyledTextCtrl(), Text::binary().
 addTextRaw(#wx_ref{type=ThisT,ref=ThisRef},Text)
  when is_binary(Text) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
@@ -3553,8 +4005,9 @@ addTextRaw(#wx_ref{type=ThisT,ref=ThisRef},Text)
   wxe_util:cast(?wxStyledTextCtrl_AddTextRaw,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Pos::integer(), Text::binary()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlinserttextraw">external documentation</a>.
+-spec insertTextRaw(This, Pos, Text) -> ok when
+	This::wxStyledTextCtrl(), Pos::integer(), Text::binary().
 insertTextRaw(#wx_ref{type=ThisT,ref=ThisRef},Pos,Text)
  when is_integer(Pos),is_binary(Text) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
@@ -3562,38 +4015,44 @@ insertTextRaw(#wx_ref{type=ThisT,ref=ThisRef},Pos,Text)
   wxe_util:cast(?wxStyledTextCtrl_InsertTextRaw,
   <<ThisRef:32/?UI,Pos:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> {binary(), LinePos::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetcurlineraw">external documentation</a>.
+-spec getCurLineRaw(This) -> Result when
+	Result ::{Res ::binary(), LinePos::integer()},
+	This::wxStyledTextCtrl().
 getCurLineRaw(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetCurLineRaw,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Line::integer()) -> binary()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetlineraw">external documentation</a>.
+-spec getLineRaw(This, Line) -> binary() when
+	This::wxStyledTextCtrl(), Line::integer().
 getLineRaw(#wx_ref{type=ThisT,ref=ThisRef},Line)
  when is_integer(Line) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetLineRaw,
   <<ThisRef:32/?UI,Line:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> binary()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetselectedtextraw">external documentation</a>.
+-spec getSelectedTextRaw(This) -> binary() when
+	This::wxStyledTextCtrl().
 getSelectedTextRaw(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetSelectedTextRaw,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), StartPos::integer(), EndPos::integer()) -> binary()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgettextrangeraw">external documentation</a>.
+-spec getTextRangeRaw(This, StartPos, EndPos) -> binary() when
+	This::wxStyledTextCtrl(), StartPos::integer(), EndPos::integer().
 getTextRangeRaw(#wx_ref{type=ThisT,ref=ThisRef},StartPos,EndPos)
  when is_integer(StartPos),is_integer(EndPos) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetTextRangeRaw,
   <<ThisRef:32/?UI,StartPos:32/?UI,EndPos:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Text::binary()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsettextraw">external documentation</a>.
+-spec setTextRaw(This, Text) -> ok when
+	This::wxStyledTextCtrl(), Text::binary().
 setTextRaw(#wx_ref{type=ThisT,ref=ThisRef},Text)
  when is_binary(Text) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
@@ -3601,15 +4060,17 @@ setTextRaw(#wx_ref{type=ThisT,ref=ThisRef},Text)
   wxe_util:cast(?wxStyledTextCtrl_SetTextRaw,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> binary()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgettextraw">external documentation</a>.
+-spec getTextRaw(This) -> binary() when
+	This::wxStyledTextCtrl().
 getTextRaw(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   wxe_util:call(?wxStyledTextCtrl_GetTextRaw,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl(), Text::binary()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlappendtextraw">external documentation</a>.
+-spec appendTextRaw(This, Text) -> ok when
+	This::wxStyledTextCtrl(), Text::binary().
 appendTextRaw(#wx_ref{type=ThisT,ref=ThisRef},Text)
  when is_binary(Text) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
@@ -3617,8 +4078,8 @@ appendTextRaw(#wx_ref{type=ThisT,ref=ThisRef},Text)
   wxe_util:cast(?wxStyledTextCtrl_AppendTextRaw,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextCtrl()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxStyledTextCtrl) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxStyledTextCtrl),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxStyledTextEvent.erl b/lib/wx/src/gen/wxStyledTextEvent.erl
index 5d98ae585d..9c1343ef85 100644
--- a/lib/wx/src/gen/wxStyledTextEvent.erl
+++ b/lib/wx/src/gen/wxStyledTextEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -44,169 +44,193 @@
   parent_class/1,resumePropagation/2,setInt/2,setString/2,shouldPropagate/1,
   skip/1,skip/2,stopPropagation/1]).
 
+-export_type([wxStyledTextEvent/0]).
 %% @hidden
 parent_class(wxCommandEvent) -> true;
 parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (This::wxStyledTextEvent()) -> integer()
+-type wxStyledTextEvent() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextevent.html#wxstyledtexteventgetposition">external documentation</a>.
+-spec getPosition(This) -> integer() when
+	This::wxStyledTextEvent().
 getPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextEvent),
   wxe_util:call(?wxStyledTextEvent_GetPosition,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextEvent()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextevent.html#wxstyledtexteventgetkey">external documentation</a>.
+-spec getKey(This) -> integer() when
+	This::wxStyledTextEvent().
 getKey(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextEvent),
   wxe_util:call(?wxStyledTextEvent_GetKey,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextEvent()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextevent.html#wxstyledtexteventgetmodifiers">external documentation</a>.
+-spec getModifiers(This) -> integer() when
+	This::wxStyledTextEvent().
 getModifiers(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextEvent),
   wxe_util:call(?wxStyledTextEvent_GetModifiers,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextEvent()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextevent.html#wxstyledtexteventgetmodificationtype">external documentation</a>.
+-spec getModificationType(This) -> integer() when
+	This::wxStyledTextEvent().
 getModificationType(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextEvent),
   wxe_util:call(?wxStyledTextEvent_GetModificationType,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextEvent()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextevent.html#wxstyledtexteventgettext">external documentation</a>.
+-spec getText(This) -> string() when
+	This::wxStyledTextEvent().
 getText(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextEvent),
   wxe_util:call(?wxStyledTextEvent_GetText,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextEvent()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextevent.html#wxstyledtexteventgetlength">external documentation</a>.
+-spec getLength(This) -> integer() when
+	This::wxStyledTextEvent().
 getLength(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextEvent),
   wxe_util:call(?wxStyledTextEvent_GetLength,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextEvent()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextevent.html#wxstyledtexteventgetlinesadded">external documentation</a>.
+-spec getLinesAdded(This) -> integer() when
+	This::wxStyledTextEvent().
 getLinesAdded(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextEvent),
   wxe_util:call(?wxStyledTextEvent_GetLinesAdded,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextEvent()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextevent.html#wxstyledtexteventgetline">external documentation</a>.
+-spec getLine(This) -> integer() when
+	This::wxStyledTextEvent().
 getLine(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextEvent),
   wxe_util:call(?wxStyledTextEvent_GetLine,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextEvent()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextevent.html#wxstyledtexteventgetfoldlevelnow">external documentation</a>.
+-spec getFoldLevelNow(This) -> integer() when
+	This::wxStyledTextEvent().
 getFoldLevelNow(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextEvent),
   wxe_util:call(?wxStyledTextEvent_GetFoldLevelNow,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextEvent()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextevent.html#wxstyledtexteventgetfoldlevelprev">external documentation</a>.
+-spec getFoldLevelPrev(This) -> integer() when
+	This::wxStyledTextEvent().
 getFoldLevelPrev(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextEvent),
   wxe_util:call(?wxStyledTextEvent_GetFoldLevelPrev,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextEvent()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextevent.html#wxstyledtexteventgetmargin">external documentation</a>.
+-spec getMargin(This) -> integer() when
+	This::wxStyledTextEvent().
 getMargin(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextEvent),
   wxe_util:call(?wxStyledTextEvent_GetMargin,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextEvent()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextevent.html#wxstyledtexteventgetmessage">external documentation</a>.
+-spec getMessage(This) -> integer() when
+	This::wxStyledTextEvent().
 getMessage(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextEvent),
   wxe_util:call(?wxStyledTextEvent_GetMessage,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextEvent()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextevent.html#wxstyledtexteventgetwparam">external documentation</a>.
+-spec getWParam(This) -> integer() when
+	This::wxStyledTextEvent().
 getWParam(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextEvent),
   wxe_util:call(?wxStyledTextEvent_GetWParam,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextEvent()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextevent.html#wxstyledtexteventgetlparam">external documentation</a>.
+-spec getLParam(This) -> integer() when
+	This::wxStyledTextEvent().
 getLParam(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextEvent),
   wxe_util:call(?wxStyledTextEvent_GetLParam,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextEvent()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextevent.html#wxstyledtexteventgetlisttype">external documentation</a>.
+-spec getListType(This) -> integer() when
+	This::wxStyledTextEvent().
 getListType(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextEvent),
   wxe_util:call(?wxStyledTextEvent_GetListType,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextEvent()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextevent.html#wxstyledtexteventgetx">external documentation</a>.
+-spec getX(This) -> integer() when
+	This::wxStyledTextEvent().
 getX(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextEvent),
   wxe_util:call(?wxStyledTextEvent_GetX,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextEvent()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextevent.html#wxstyledtexteventgety">external documentation</a>.
+-spec getY(This) -> integer() when
+	This::wxStyledTextEvent().
 getY(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextEvent),
   wxe_util:call(?wxStyledTextEvent_GetY,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextEvent()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextevent.html#wxstyledtexteventgetdragtext">external documentation</a>.
+-spec getDragText(This) -> string() when
+	This::wxStyledTextEvent().
 getDragText(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextEvent),
   wxe_util:call(?wxStyledTextEvent_GetDragText,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextEvent()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextevent.html#wxstyledtexteventgetdragallowmove">external documentation</a>.
+-spec getDragAllowMove(This) -> boolean() when
+	This::wxStyledTextEvent().
 getDragAllowMove(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextEvent),
   wxe_util:call(?wxStyledTextEvent_GetDragAllowMove,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextEvent()) -> WxDragResult
-%% WxDragResult = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextevent.html#wxstyledtexteventgetdragresult">external documentation</a>.
-%%<br /> WxDragResult is one of ?wxDragError | ?wxDragNone | ?wxDragCopy | ?wxDragMove | ?wxDragLink | ?wxDragCancel
+%%<br /> Res = ?wxDragError | ?wxDragNone | ?wxDragCopy | ?wxDragMove | ?wxDragLink | ?wxDragCancel
+-spec getDragResult(This) -> wx:wx_enum() when
+	This::wxStyledTextEvent().
 getDragResult(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextEvent),
   wxe_util:call(?wxStyledTextEvent_GetDragResult,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextEvent()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextevent.html#wxstyledtexteventgetshift">external documentation</a>.
+-spec getShift(This) -> boolean() when
+	This::wxStyledTextEvent().
 getShift(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextEvent),
   wxe_util:call(?wxStyledTextEvent_GetShift,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextEvent()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextevent.html#wxstyledtexteventgetcontrol">external documentation</a>.
+-spec getControl(This) -> boolean() when
+	This::wxStyledTextEvent().
 getControl(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextEvent),
   wxe_util:call(?wxStyledTextEvent_GetControl,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxStyledTextEvent()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextevent.html#wxstyledtexteventgetalt">external documentation</a>.
+-spec getAlt(This) -> boolean() when
+	This::wxStyledTextEvent().
 getAlt(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxStyledTextEvent),
   wxe_util:call(?wxStyledTextEvent_GetAlt,
diff --git a/lib/wx/src/gen/wxSysColourChangedEvent.erl b/lib/wx/src/gen/wxSysColourChangedEvent.erl
index 0d86edcf5b..94777748d2 100644
--- a/lib/wx/src/gen/wxSysColourChangedEvent.erl
+++ b/lib/wx/src/gen/wxSysColourChangedEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -37,10 +37,12 @@
 -export([getId/1,getSkipped/1,getTimestamp/1,isCommandEvent/1,parent_class/1,
   resumePropagation/2,shouldPropagate/1,skip/1,skip/2,stopPropagation/1]).
 
+-export_type([wxSysColourChangedEvent/0]).
 %% @hidden
 parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
+-type wxSysColourChangedEvent() :: wx:wx_object().
  %% From wxEvent
 %% @hidden
 stopPropagation(This) -> wxEvent:stopPropagation(This).
diff --git a/lib/wx/src/gen/wxSystemOptions.erl b/lib/wx/src/gen/wxSystemOptions.erl
index d5e504632b..a94b74136f 100644
--- a/lib/wx/src/gen/wxSystemOptions.erl
+++ b/lib/wx/src/gen/wxSystemOptions.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -29,50 +29,52 @@
 %% inherited exports
 -export([parent_class/1]).
 
+-export_type([wxSystemOptions/0]).
 %% @hidden
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (Name::string()) -> string()
+-type wxSystemOptions() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsystemoptions.html#wxsystemoptionsgetoption">external documentation</a>.
+-spec getOption(Name) -> string() when
+	Name::string().
 getOption(Name)
  when is_list(Name) ->
   Name_UC = unicode:characters_to_binary([Name,0]),
   wxe_util:call(?wxSystemOptions_GetOption,
   <<(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((4+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (Name::string()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsystemoptions.html#wxsystemoptionsgetoptionint">external documentation</a>.
+-spec getOptionInt(Name) -> integer() when
+	Name::string().
 getOptionInt(Name)
  when is_list(Name) ->
   Name_UC = unicode:characters_to_binary([Name,0]),
   wxe_util:call(?wxSystemOptions_GetOptionInt,
   <<(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((4+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (Name::string()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsystemoptions.html#wxsystemoptionshasoption">external documentation</a>.
+-spec hasOption(Name) -> boolean() when
+	Name::string().
 hasOption(Name)
  when is_list(Name) ->
   Name_UC = unicode:characters_to_binary([Name,0]),
   wxe_util:call(?wxSystemOptions_HasOption,
   <<(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((4+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (Name::string()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsystemoptions.html#wxsystemoptionsisfalse">external documentation</a>.
+-spec isFalse(Name) -> boolean() when
+	Name::string().
 isFalse(Name)
  when is_list(Name) ->
   Name_UC = unicode:characters_to_binary([Name,0]),
   wxe_util:call(?wxSystemOptions_IsFalse,
   <<(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((4+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (Name::string(),X::integer()|string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsystemoptions.html#wxsystemoptionssetoption">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% setOption(Name::string(), Value::integer()) -> ok </c>
-%% </p>
-%% <p><c>
-%% setOption(Name::string(), Value::string()) -> ok </c>
-%% </p>
+-spec setOption(Name, Value) -> ok when
+	Name::string(), Value::integer();
+      (Name, Value) -> ok when
+	Name::string(), Value::string().
 setOption(Name,Value)
  when is_list(Name),is_integer(Value) ->
   Name_UC = unicode:characters_to_binary([Name,0]),
diff --git a/lib/wx/src/gen/wxSystemSettings.erl b/lib/wx/src/gen/wxSystemSettings.erl
index 3f7e0a1ad6..fce9572ae9 100644
--- a/lib/wx/src/gen/wxSystemSettings.erl
+++ b/lib/wx/src/gen/wxSystemSettings.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -29,38 +29,42 @@
 %% inherited exports
 -export([parent_class/1]).
 
+-export_type([wxSystemSettings/0]).
 %% @hidden
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (Index::WxSystemColour) -> wx:colour()
-%% WxSystemColour = integer()
+-type wxSystemSettings() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsystemsettings.html#wxsystemsettingsgetcolour">external documentation</a>.
-%%<br /> WxSystemColour is one of ?wxSYS_COLOUR_SCROLLBAR | ?wxSYS_COLOUR_BACKGROUND | ?wxSYS_COLOUR_DESKTOP | ?wxSYS_COLOUR_ACTIVECAPTION | ?wxSYS_COLOUR_INACTIVECAPTION | ?wxSYS_COLOUR_MENU | ?wxSYS_COLOUR_WINDOW | ?wxSYS_COLOUR_WINDOWFRAME | ?wxSYS_COLOUR_MENUTEXT | ?wxSYS_COLOUR_WINDOWTEXT | ?wxSYS_COLOUR_CAPTIONTEXT | ?wxSYS_COLOUR_ACTIVEBORDER | ?wxSYS_COLOUR_INACTIVEBORDER | ?wxSYS_COLOUR_APPWORKSPACE | ?wxSYS_COLOUR_HIGHLIGHT | ?wxSYS_COLOUR_HIGHLIGHTTEXT | ?wxSYS_COLOUR_BTNFACE | ?wxSYS_COLOUR_3DFACE | ?wxSYS_COLOUR_BTNSHADOW | ?wxSYS_COLOUR_3DSHADOW | ?wxSYS_COLOUR_GRAYTEXT | ?wxSYS_COLOUR_BTNTEXT | ?wxSYS_COLOUR_INACTIVECAPTIONTEXT | ?wxSYS_COLOUR_BTNHIGHLIGHT | ?wxSYS_COLOUR_BTNHILIGHT | ?wxSYS_COLOUR_3DHIGHLIGHT | ?wxSYS_COLOUR_3DHILIGHT | ?wxSYS_COLOUR_3DDKSHADOW | ?wxSYS_COLOUR_3DLIGHT | ?wxSYS_COLOUR_INFOTEXT | ?wxSYS_COLOUR_INFOBK | ?wxSYS_COLOUR_LISTBOX | ?wxSYS_COLOUR_HOTLIGHT | ?wxSYS_COLOUR_GRADIENTACTIVECAPTION | ?wxSYS_COLOUR_GRADIENTINACTIVECAPTION | ?wxSYS_COLOUR_MENUHILIGHT | ?wxSYS_COLOUR_MENUBAR | ?wxSYS_COLOUR_LISTBOXTEXT | ?wxSYS_COLOUR_MAX
+%%<br /> Index = ?wxSYS_COLOUR_SCROLLBAR | ?wxSYS_COLOUR_BACKGROUND | ?wxSYS_COLOUR_DESKTOP | ?wxSYS_COLOUR_ACTIVECAPTION | ?wxSYS_COLOUR_INACTIVECAPTION | ?wxSYS_COLOUR_MENU | ?wxSYS_COLOUR_WINDOW | ?wxSYS_COLOUR_WINDOWFRAME | ?wxSYS_COLOUR_MENUTEXT | ?wxSYS_COLOUR_WINDOWTEXT | ?wxSYS_COLOUR_CAPTIONTEXT | ?wxSYS_COLOUR_ACTIVEBORDER | ?wxSYS_COLOUR_INACTIVEBORDER | ?wxSYS_COLOUR_APPWORKSPACE | ?wxSYS_COLOUR_HIGHLIGHT | ?wxSYS_COLOUR_HIGHLIGHTTEXT | ?wxSYS_COLOUR_BTNFACE | ?wxSYS_COLOUR_3DFACE | ?wxSYS_COLOUR_BTNSHADOW | ?wxSYS_COLOUR_3DSHADOW | ?wxSYS_COLOUR_GRAYTEXT | ?wxSYS_COLOUR_BTNTEXT | ?wxSYS_COLOUR_INACTIVECAPTIONTEXT | ?wxSYS_COLOUR_BTNHIGHLIGHT | ?wxSYS_COLOUR_BTNHILIGHT | ?wxSYS_COLOUR_3DHIGHLIGHT | ?wxSYS_COLOUR_3DHILIGHT | ?wxSYS_COLOUR_3DDKSHADOW | ?wxSYS_COLOUR_3DLIGHT | ?wxSYS_COLOUR_INFOTEXT | ?wxSYS_COLOUR_INFOBK | ?wxSYS_COLOUR_LISTBOX | ?wxSYS_COLOUR_HOTLIGHT | ?wxSYS_COLOUR_GRADIENTACTIVECAPTION | ?wxSYS_COLOUR_GRADIENTINACTIVECAPTION | ?wxSYS_COLOUR_MENUHILIGHT | ?wxSYS_COLOUR_MENUBAR | ?wxSYS_COLOUR_LISTBOXTEXT | ?wxSYS_COLOUR_MAX
+-spec getColour(Index) -> wx:wx_colour() when
+	Index::wx:wx_enum().
 getColour(Index)
  when is_integer(Index) ->
   wxe_util:call(?wxSystemSettings_GetColour,
   <<Index:32/?UI>>).
 
-%% @spec (Index::WxSystemFont) -> wxFont:wxFont()
-%% WxSystemFont = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsystemsettings.html#wxsystemsettingsgetfont">external documentation</a>.
-%%<br /> WxSystemFont is one of ?wxSYS_OEM_FIXED_FONT | ?wxSYS_ANSI_FIXED_FONT | ?wxSYS_ANSI_VAR_FONT | ?wxSYS_SYSTEM_FONT | ?wxSYS_DEVICE_DEFAULT_FONT | ?wxSYS_DEFAULT_PALETTE | ?wxSYS_SYSTEM_FIXED_FONT | ?wxSYS_DEFAULT_GUI_FONT | ?wxSYS_ICONTITLE_FONT
+%%<br /> Index = ?wxSYS_OEM_FIXED_FONT | ?wxSYS_ANSI_FIXED_FONT | ?wxSYS_ANSI_VAR_FONT | ?wxSYS_SYSTEM_FONT | ?wxSYS_DEVICE_DEFAULT_FONT | ?wxSYS_DEFAULT_PALETTE | ?wxSYS_SYSTEM_FIXED_FONT | ?wxSYS_DEFAULT_GUI_FONT | ?wxSYS_ICONTITLE_FONT
+-spec getFont(Index) -> wxFont:wxFont() when
+	Index::wx:wx_enum().
 getFont(Index)
  when is_integer(Index) ->
   wxe_util:call(?wxSystemSettings_GetFont,
   <<Index:32/?UI>>).
 
-%% @spec (Index::WxSystemMetric) -> integer()
 %% @equiv getMetric(Index, [])
+-spec getMetric(Index) -> integer() when
+	Index::wx:wx_enum().
+
 getMetric(Index)
  when is_integer(Index) ->
   getMetric(Index, []).
 
-%% @spec (Index::WxSystemMetric, [Option]) -> integer()
-%% Option = {win, wxWindow:wxWindow()}
-%% WxSystemMetric = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsystemsettings.html#wxsystemsettingsgetmetric">external documentation</a>.
-%%<br /> WxSystemMetric is one of ?wxSYS_MOUSE_BUTTONS | ?wxSYS_BORDER_X | ?wxSYS_BORDER_Y | ?wxSYS_CURSOR_X | ?wxSYS_CURSOR_Y | ?wxSYS_DCLICK_X | ?wxSYS_DCLICK_Y | ?wxSYS_DRAG_X | ?wxSYS_DRAG_Y | ?wxSYS_EDGE_X | ?wxSYS_EDGE_Y | ?wxSYS_HSCROLL_ARROW_X | ?wxSYS_HSCROLL_ARROW_Y | ?wxSYS_HTHUMB_X | ?wxSYS_ICON_X | ?wxSYS_ICON_Y | ?wxSYS_ICONSPACING_X | ?wxSYS_ICONSPACING_Y | ?wxSYS_WINDOWMIN_X | ?wxSYS_WINDOWMIN_Y | ?wxSYS_SCREEN_X | ?wxSYS_SCREEN_Y | ?wxSYS_FRAMESIZE_X | ?wxSYS_FRAMESIZE_Y | ?wxSYS_SMALLICON_X | ?wxSYS_SMALLICON_Y | ?wxSYS_HSCROLL_Y | ?wxSYS_VSCROLL_X | ?wxSYS_VSCROLL_ARROW_X | ?wxSYS_VSCROLL_ARROW_Y | ?wxSYS_VTHUMB_Y | ?wxSYS_CAPTION_Y | ?wxSYS_MENU_Y | ?wxSYS_NETWORK_PRESENT | ?wxSYS_PENWINDOWS_PRESENT | ?wxSYS_SHOW_SOUNDS | ?wxSYS_SWAP_BUTTONS
+%%<br /> Index = ?wxSYS_MOUSE_BUTTONS | ?wxSYS_BORDER_X | ?wxSYS_BORDER_Y | ?wxSYS_CURSOR_X | ?wxSYS_CURSOR_Y | ?wxSYS_DCLICK_X | ?wxSYS_DCLICK_Y | ?wxSYS_DRAG_X | ?wxSYS_DRAG_Y | ?wxSYS_EDGE_X | ?wxSYS_EDGE_Y | ?wxSYS_HSCROLL_ARROW_X | ?wxSYS_HSCROLL_ARROW_Y | ?wxSYS_HTHUMB_X | ?wxSYS_ICON_X | ?wxSYS_ICON_Y | ?wxSYS_ICONSPACING_X | ?wxSYS_ICONSPACING_Y | ?wxSYS_WINDOWMIN_X | ?wxSYS_WINDOWMIN_Y | ?wxSYS_SCREEN_X | ?wxSYS_SCREEN_Y | ?wxSYS_FRAMESIZE_X | ?wxSYS_FRAMESIZE_Y | ?wxSYS_SMALLICON_X | ?wxSYS_SMALLICON_Y | ?wxSYS_HSCROLL_Y | ?wxSYS_VSCROLL_X | ?wxSYS_VSCROLL_ARROW_X | ?wxSYS_VSCROLL_ARROW_Y | ?wxSYS_VTHUMB_Y | ?wxSYS_CAPTION_Y | ?wxSYS_MENU_Y | ?wxSYS_NETWORK_PRESENT | ?wxSYS_PENWINDOWS_PRESENT | ?wxSYS_SHOW_SOUNDS | ?wxSYS_SWAP_BUTTONS
+-spec getMetric(Index, [Option]) -> integer() when
+	Index::wx:wx_enum(),
+	Option :: {win, wxWindow:wxWindow()}.
 getMetric(Index, Options)
  when is_integer(Index),is_list(Options) ->
   MOpts = fun({win, #wx_ref{type=WinT,ref=WinRef}}, Acc) ->   ?CLASS(WinT,wxWindow),[<<1:32/?UI,WinRef:32/?UI>>|Acc];
@@ -69,10 +73,9 @@ getMetric(Index, Options)
   wxe_util:call(?wxSystemSettings_GetMetric,
   <<Index:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec () -> WxSystemScreenType
-%% WxSystemScreenType = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsystemsettings.html#wxsystemsettingsgetscreentype">external documentation</a>.
-%%<br /> WxSystemScreenType is one of ?wxSYS_SCREEN_NONE | ?wxSYS_SCREEN_TINY | ?wxSYS_SCREEN_PDA | ?wxSYS_SCREEN_SMALL | ?wxSYS_SCREEN_DESKTOP
+%%<br /> Res = ?wxSYS_SCREEN_NONE | ?wxSYS_SCREEN_TINY | ?wxSYS_SCREEN_PDA | ?wxSYS_SCREEN_SMALL | ?wxSYS_SCREEN_DESKTOP
+-spec getScreenType() -> wx:wx_enum().
 getScreenType() ->
   wxe_util:call(?wxSystemSettings_GetScreenType,
   <<>>).
diff --git a/lib/wx/src/gen/wxTextAttr.erl b/lib/wx/src/gen/wxTextAttr.erl
index 056dc59161..1e3872421b 100644
--- a/lib/wx/src/gen/wxTextAttr.erl
+++ b/lib/wx/src/gen/wxTextAttr.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -34,26 +34,32 @@
 %% inherited exports
 -export([parent_class/1]).
 
+-export_type([wxTextAttr/0]).
 %% @hidden
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxTextAttr()
+-type wxTextAttr() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextattr.html#wxtextattrwxtextattr">external documentation</a>.
+-spec new() -> wxTextAttr().
 new() ->
   wxe_util:construct(?wxTextAttr_new_0,
   <<>>).
 
-%% @spec (ColText::wx:colour()) -> wxTextAttr()
 %% @equiv new(ColText, [])
+-spec new(ColText) -> wxTextAttr() when
+	ColText::wx:wx_colour().
+
 new(ColText)
  when tuple_size(ColText) =:= 3; tuple_size(ColText) =:= 4 ->
   new(ColText, []).
 
-%% @spec (ColText::wx:colour(), [Option]) -> wxTextAttr()
-%% Option = {colBack, wx:colour()} | {font, wxFont:wxFont()} | {alignment, WxTextAttrAlignment}
-%% WxTextAttrAlignment = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextattr.html#wxtextattrwxtextattr">external documentation</a>.
-%%<br /> WxTextAttrAlignment is one of ?wxTEXT_ALIGNMENT_DEFAULT | ?wxTEXT_ALIGNMENT_LEFT | ?wxTEXT_ALIGNMENT_CENTRE | ?wxTEXT_ALIGNMENT_CENTER | ?wxTEXT_ALIGNMENT_RIGHT | ?wxTEXT_ALIGNMENT_JUSTIFIED
+%%<br /> Alignment = ?wxTEXT_ALIGNMENT_DEFAULT | ?wxTEXT_ALIGNMENT_LEFT | ?wxTEXT_ALIGNMENT_CENTRE | ?wxTEXT_ALIGNMENT_CENTER | ?wxTEXT_ALIGNMENT_RIGHT | ?wxTEXT_ALIGNMENT_JUSTIFIED
+-spec new(ColText, [Option]) -> wxTextAttr() when
+	ColText::wx:wx_colour(),
+	Option :: {colBack, wx:wx_colour()}
+		 | {font, wxFont:wxFont()}
+		 | {alignment, wx:wx_enum()}.
 new(ColText, Options)
  when tuple_size(ColText) =:= 3; tuple_size(ColText) =:= 4,is_list(Options) ->
   MOpts = fun({colBack, ColBack}, Acc) -> [<<1:32/?UI,(wxe_util:colour_bin(ColBack)):16/binary,0:32>>|Acc];
@@ -64,134 +70,151 @@ new(ColText, Options)
   wxe_util:construct(?wxTextAttr_new_2,
   <<(wxe_util:colour_bin(ColText)):16/binary, BinOpt/binary>>).
 
-%% @spec (This::wxTextAttr()) -> WxTextAttrAlignment
-%% WxTextAttrAlignment = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextattr.html#wxtextattrgetalignment">external documentation</a>.
-%%<br /> WxTextAttrAlignment is one of ?wxTEXT_ALIGNMENT_DEFAULT | ?wxTEXT_ALIGNMENT_LEFT | ?wxTEXT_ALIGNMENT_CENTRE | ?wxTEXT_ALIGNMENT_CENTER | ?wxTEXT_ALIGNMENT_RIGHT | ?wxTEXT_ALIGNMENT_JUSTIFIED
+%%<br /> Res = ?wxTEXT_ALIGNMENT_DEFAULT | ?wxTEXT_ALIGNMENT_LEFT | ?wxTEXT_ALIGNMENT_CENTRE | ?wxTEXT_ALIGNMENT_CENTER | ?wxTEXT_ALIGNMENT_RIGHT | ?wxTEXT_ALIGNMENT_JUSTIFIED
+-spec getAlignment(This) -> wx:wx_enum() when
+	This::wxTextAttr().
 getAlignment(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTextAttr),
   wxe_util:call(?wxTextAttr_GetAlignment,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTextAttr()) -> wx:colour()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextattr.html#wxtextattrgetbackgroundcolour">external documentation</a>.
+-spec getBackgroundColour(This) -> wx:wx_colour() when
+	This::wxTextAttr().
 getBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTextAttr),
   wxe_util:call(?wxTextAttr_GetBackgroundColour,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTextAttr()) -> wxFont:wxFont()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextattr.html#wxtextattrgetfont">external documentation</a>.
+-spec getFont(This) -> wxFont:wxFont() when
+	This::wxTextAttr().
 getFont(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTextAttr),
   wxe_util:call(?wxTextAttr_GetFont,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTextAttr()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextattr.html#wxtextattrgetleftindent">external documentation</a>.
+-spec getLeftIndent(This) -> integer() when
+	This::wxTextAttr().
 getLeftIndent(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTextAttr),
   wxe_util:call(?wxTextAttr_GetLeftIndent,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTextAttr()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextattr.html#wxtextattrgetleftsubindent">external documentation</a>.
+-spec getLeftSubIndent(This) -> integer() when
+	This::wxTextAttr().
 getLeftSubIndent(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTextAttr),
   wxe_util:call(?wxTextAttr_GetLeftSubIndent,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTextAttr()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextattr.html#wxtextattrgetrightindent">external documentation</a>.
+-spec getRightIndent(This) -> integer() when
+	This::wxTextAttr().
 getRightIndent(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTextAttr),
   wxe_util:call(?wxTextAttr_GetRightIndent,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTextAttr()) -> [integer()]
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextattr.html#wxtextattrgettabs">external documentation</a>.
+-spec getTabs(This) -> [integer()] when
+	This::wxTextAttr().
 getTabs(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTextAttr),
   wxe_util:call(?wxTextAttr_GetTabs,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTextAttr()) -> wx:colour()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextattr.html#wxtextattrgettextcolour">external documentation</a>.
+-spec getTextColour(This) -> wx:wx_colour() when
+	This::wxTextAttr().
 getTextColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTextAttr),
   wxe_util:call(?wxTextAttr_GetTextColour,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTextAttr()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextattr.html#wxtextattrhasbackgroundcolour">external documentation</a>.
+-spec hasBackgroundColour(This) -> boolean() when
+	This::wxTextAttr().
 hasBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTextAttr),
   wxe_util:call(?wxTextAttr_HasBackgroundColour,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTextAttr()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextattr.html#wxtextattrhasfont">external documentation</a>.
+-spec hasFont(This) -> boolean() when
+	This::wxTextAttr().
 hasFont(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTextAttr),
   wxe_util:call(?wxTextAttr_HasFont,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTextAttr()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextattr.html#wxtextattrhastextcolour">external documentation</a>.
+-spec hasTextColour(This) -> boolean() when
+	This::wxTextAttr().
 hasTextColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTextAttr),
   wxe_util:call(?wxTextAttr_HasTextColour,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTextAttr()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextattr.html#wxtextattrgetflags">external documentation</a>.
+-spec getFlags(This) -> integer() when
+	This::wxTextAttr().
 getFlags(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTextAttr),
   wxe_util:call(?wxTextAttr_GetFlags,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTextAttr()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextattr.html#wxtextattrisdefault">external documentation</a>.
+-spec isDefault(This) -> boolean() when
+	This::wxTextAttr().
 isDefault(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTextAttr),
   wxe_util:call(?wxTextAttr_IsDefault,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTextAttr(), Alignment::WxTextAttrAlignment) -> ok
-%% WxTextAttrAlignment = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextattr.html#wxtextattrsetalignment">external documentation</a>.
-%%<br /> WxTextAttrAlignment is one of ?wxTEXT_ALIGNMENT_DEFAULT | ?wxTEXT_ALIGNMENT_LEFT | ?wxTEXT_ALIGNMENT_CENTRE | ?wxTEXT_ALIGNMENT_CENTER | ?wxTEXT_ALIGNMENT_RIGHT | ?wxTEXT_ALIGNMENT_JUSTIFIED
+%%<br /> Alignment = ?wxTEXT_ALIGNMENT_DEFAULT | ?wxTEXT_ALIGNMENT_LEFT | ?wxTEXT_ALIGNMENT_CENTRE | ?wxTEXT_ALIGNMENT_CENTER | ?wxTEXT_ALIGNMENT_RIGHT | ?wxTEXT_ALIGNMENT_JUSTIFIED
+-spec setAlignment(This, Alignment) -> ok when
+	This::wxTextAttr(), Alignment::wx:wx_enum().
 setAlignment(#wx_ref{type=ThisT,ref=ThisRef},Alignment)
  when is_integer(Alignment) ->
   ?CLASS(ThisT,wxTextAttr),
   wxe_util:cast(?wxTextAttr_SetAlignment,
   <<ThisRef:32/?UI,Alignment:32/?UI>>).
 
-%% @spec (This::wxTextAttr(), ColBack::wx:colour()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextattr.html#wxtextattrsetbackgroundcolour">external documentation</a>.
+-spec setBackgroundColour(This, ColBack) -> ok when
+	This::wxTextAttr(), ColBack::wx:wx_colour().
 setBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef},ColBack)
  when tuple_size(ColBack) =:= 3; tuple_size(ColBack) =:= 4 ->
   ?CLASS(ThisT,wxTextAttr),
   wxe_util:cast(?wxTextAttr_SetBackgroundColour,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(ColBack)):16/binary>>).
 
-%% @spec (This::wxTextAttr(), Flags::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextattr.html#wxtextattrsetflags">external documentation</a>.
+-spec setFlags(This, Flags) -> ok when
+	This::wxTextAttr(), Flags::integer().
 setFlags(#wx_ref{type=ThisT,ref=ThisRef},Flags)
  when is_integer(Flags) ->
   ?CLASS(ThisT,wxTextAttr),
   wxe_util:cast(?wxTextAttr_SetFlags,
   <<ThisRef:32/?UI,Flags:32/?UI>>).
 
-%% @spec (This::wxTextAttr(), Font::wxFont:wxFont()) -> ok
 %% @equiv setFont(This,Font, [])
+-spec setFont(This, Font) -> ok when
+	This::wxTextAttr(), Font::wxFont:wxFont().
+
 setFont(This,Font)
  when is_record(This, wx_ref),is_record(Font, wx_ref) ->
   setFont(This,Font, []).
 
-%% @spec (This::wxTextAttr(), Font::wxFont:wxFont(), [Option]) -> ok
-%% Option = {flags, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextattr.html#wxtextattrsetfont">external documentation</a>.
+-spec setFont(This, Font, [Option]) -> ok when
+	This::wxTextAttr(), Font::wxFont:wxFont(),
+	Option :: {flags, integer()}.
 setFont(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FontT,ref=FontRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxTextAttr),
@@ -202,15 +225,18 @@ setFont(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FontT,ref=FontRef}, Options
   wxe_util:cast(?wxTextAttr_SetFont,
   <<ThisRef:32/?UI,FontRef:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxTextAttr(), Indent::integer()) -> ok
 %% @equiv setLeftIndent(This,Indent, [])
+-spec setLeftIndent(This, Indent) -> ok when
+	This::wxTextAttr(), Indent::integer().
+
 setLeftIndent(This,Indent)
  when is_record(This, wx_ref),is_integer(Indent) ->
   setLeftIndent(This,Indent, []).
 
-%% @spec (This::wxTextAttr(), Indent::integer(), [Option]) -> ok
-%% Option = {subIndent, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextattr.html#wxtextattrsetleftindent">external documentation</a>.
+-spec setLeftIndent(This, Indent, [Option]) -> ok when
+	This::wxTextAttr(), Indent::integer(),
+	Option :: {subIndent, integer()}.
 setLeftIndent(#wx_ref{type=ThisT,ref=ThisRef},Indent, Options)
  when is_integer(Indent),is_list(Options) ->
   ?CLASS(ThisT,wxTextAttr),
@@ -220,16 +246,18 @@ setLeftIndent(#wx_ref{type=ThisT,ref=ThisRef},Indent, Options)
   wxe_util:cast(?wxTextAttr_SetLeftIndent,
   <<ThisRef:32/?UI,Indent:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxTextAttr(), Indent::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextattr.html#wxtextattrsetrightindent">external documentation</a>.
+-spec setRightIndent(This, Indent) -> ok when
+	This::wxTextAttr(), Indent::integer().
 setRightIndent(#wx_ref{type=ThisT,ref=ThisRef},Indent)
  when is_integer(Indent) ->
   ?CLASS(ThisT,wxTextAttr),
   wxe_util:cast(?wxTextAttr_SetRightIndent,
   <<ThisRef:32/?UI,Indent:32/?UI>>).
 
-%% @spec (This::wxTextAttr(), Tabs::[integer()]) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextattr.html#wxtextattrsettabs">external documentation</a>.
+-spec setTabs(This, Tabs) -> ok when
+	This::wxTextAttr(), Tabs::[integer()].
 setTabs(#wx_ref{type=ThisT,ref=ThisRef},Tabs)
  when is_list(Tabs) ->
   ?CLASS(ThisT,wxTextAttr),
@@ -237,16 +265,17 @@ setTabs(#wx_ref{type=ThisT,ref=ThisRef},Tabs)
   <<ThisRef:32/?UI,(length(Tabs)):32/?UI,
         (<< <<C:32/?I>> || C <- Tabs>>)/binary, 0:(((0+length(Tabs)) rem 2)*32)>>).
 
-%% @spec (This::wxTextAttr(), ColText::wx:colour()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextattr.html#wxtextattrsettextcolour">external documentation</a>.
+-spec setTextColour(This, ColText) -> ok when
+	This::wxTextAttr(), ColText::wx:wx_colour().
 setTextColour(#wx_ref{type=ThisT,ref=ThisRef},ColText)
  when tuple_size(ColText) =:= 3; tuple_size(ColText) =:= 4 ->
   ?CLASS(ThisT,wxTextAttr),
   wxe_util:cast(?wxTextAttr_SetTextColour,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(ColText)):16/binary>>).
 
-%% @spec (This::wxTextAttr()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxTextAttr) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxTextAttr),
   wxe_util:destroy(?wxTextAttr_destroy,Obj),
diff --git a/lib/wx/src/gen/wxTextCtrl.erl b/lib/wx/src/gen/wxTextCtrl.erl
index b32f45b83b..fa83913a6f 100644
--- a/lib/wx/src/gen/wxTextCtrl.erl
+++ b/lib/wx/src/gen/wxTextCtrl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -77,27 +77,36 @@
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
 
+-export_type([wxTextCtrl/0]).
 %% @hidden
 parent_class(wxControl) -> true;
 parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxTextCtrl()
+-type wxTextCtrl() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlwxtextctrl">external documentation</a>.
+-spec new() -> wxTextCtrl().
 new() ->
   wxe_util:construct(?wxTextCtrl_new_0,
   <<>>).
 
-%% @spec (Parent::wxWindow:wxWindow(), Id::integer()) -> wxTextCtrl()
 %% @equiv new(Parent,Id, [])
+-spec new(Parent, Id) -> wxTextCtrl() when
+	Parent::wxWindow:wxWindow(), Id::integer().
+
 new(Parent,Id)
  when is_record(Parent, wx_ref),is_integer(Id) ->
   new(Parent,Id, []).
 
-%% @spec (Parent::wxWindow:wxWindow(), Id::integer(), [Option]) -> wxTextCtrl()
-%% Option = {value, string()} | {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()} | {validator, wx:wx()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlwxtextctrl">external documentation</a>.
+-spec new(Parent, Id, [Option]) -> wxTextCtrl() when
+	Parent::wxWindow:wxWindow(), Id::integer(),
+	Option :: {value, string()}
+		 | {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}
+		 | {validator, wx:wx()}.
 new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
  when is_integer(Id),is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -111,8 +120,9 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
   wxe_util:construct(?wxTextCtrl_new_3,
   <<ParentRef:32/?UI,Id:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxTextCtrl(), Text::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlappendtext">external documentation</a>.
+-spec appendText(This, Text) -> ok when
+	This::wxTextCtrl(), Text::string().
 appendText(#wx_ref{type=ThisT,ref=ThisRef},Text)
  when is_list(Text) ->
   ?CLASS(ThisT,wxTextCtrl),
@@ -120,64 +130,78 @@ appendText(#wx_ref{type=ThisT,ref=ThisRef},Text)
   wxe_util:cast(?wxTextCtrl_AppendText,
   <<ThisRef:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxTextCtrl()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlcancopy">external documentation</a>.
+-spec canCopy(This) -> boolean() when
+	This::wxTextCtrl().
 canCopy(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTextCtrl),
   wxe_util:call(?wxTextCtrl_CanCopy,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTextCtrl()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlcancut">external documentation</a>.
+-spec canCut(This) -> boolean() when
+	This::wxTextCtrl().
 canCut(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTextCtrl),
   wxe_util:call(?wxTextCtrl_CanCut,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTextCtrl()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlcanpaste">external documentation</a>.
+-spec canPaste(This) -> boolean() when
+	This::wxTextCtrl().
 canPaste(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTextCtrl),
   wxe_util:call(?wxTextCtrl_CanPaste,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTextCtrl()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlcanredo">external documentation</a>.
+-spec canRedo(This) -> boolean() when
+	This::wxTextCtrl().
 canRedo(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTextCtrl),
   wxe_util:call(?wxTextCtrl_CanRedo,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTextCtrl()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlcanundo">external documentation</a>.
+-spec canUndo(This) -> boolean() when
+	This::wxTextCtrl().
 canUndo(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTextCtrl),
   wxe_util:call(?wxTextCtrl_CanUndo,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlclear">external documentation</a>.
+-spec clear(This) -> ok when
+	This::wxTextCtrl().
 clear(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTextCtrl),
   wxe_util:cast(?wxTextCtrl_Clear,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlcopy">external documentation</a>.
+-spec copy(This) -> ok when
+	This::wxTextCtrl().
 copy(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTextCtrl),
   wxe_util:cast(?wxTextCtrl_Copy,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTextCtrl(), Parent::wxWindow:wxWindow(), Id::integer()) -> bool()
 %% @equiv create(This,Parent,Id, [])
+-spec create(This, Parent, Id) -> boolean() when
+	This::wxTextCtrl(), Parent::wxWindow:wxWindow(), Id::integer().
+
 create(This,Parent,Id)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id) ->
   create(This,Parent,Id, []).
 
-%% @spec (This::wxTextCtrl(), Parent::wxWindow:wxWindow(), Id::integer(), [Option]) -> bool()
-%% Option = {value, string()} | {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()} | {validator, wx:wx()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlcreate">external documentation</a>.
+-spec create(This, Parent, Id, [Option]) -> boolean() when
+	This::wxTextCtrl(), Parent::wxWindow:wxWindow(), Id::integer(),
+	Option :: {value, string()}
+		 | {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}
+		 | {validator, wx:wx()}.
 create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
  when is_integer(Id),is_list(Options) ->
   ?CLASS(ThisT,wxTextCtrl),
@@ -192,96 +216,109 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id, O
   wxe_util:call(?wxTextCtrl_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI,Id:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlcut">external documentation</a>.
+-spec cut(This) -> ok when
+	This::wxTextCtrl().
 cut(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTextCtrl),
   wxe_util:cast(?wxTextCtrl_Cut,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrldiscardedits">external documentation</a>.
+-spec discardEdits(This) -> ok when
+	This::wxTextCtrl().
 discardEdits(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTextCtrl),
   wxe_util:cast(?wxTextCtrl_DiscardEdits,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTextCtrl(), Event::wxKeyEvent:wxKeyEvent()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlemulatekeypress">external documentation</a>.
+-spec emulateKeyPress(This, Event) -> boolean() when
+	This::wxTextCtrl(), Event::wxKeyEvent:wxKeyEvent().
 emulateKeyPress(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=EventT,ref=EventRef}) ->
   ?CLASS(ThisT,wxTextCtrl),
   ?CLASS(EventT,wxKeyEvent),
   wxe_util:call(?wxTextCtrl_EmulateKeyPress,
   <<ThisRef:32/?UI,EventRef:32/?UI>>).
 
-%% @spec (This::wxTextCtrl()) -> wxTextAttr:wxTextAttr()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlgetdefaultstyle">external documentation</a>.
+-spec getDefaultStyle(This) -> wxTextAttr:wxTextAttr() when
+	This::wxTextCtrl().
 getDefaultStyle(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTextCtrl),
   wxe_util:call(?wxTextCtrl_GetDefaultStyle,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTextCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlgetinsertionpoint">external documentation</a>.
+-spec getInsertionPoint(This) -> integer() when
+	This::wxTextCtrl().
 getInsertionPoint(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTextCtrl),
   wxe_util:call(?wxTextCtrl_GetInsertionPoint,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTextCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlgetlastposition">external documentation</a>.
+-spec getLastPosition(This) -> integer() when
+	This::wxTextCtrl().
 getLastPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTextCtrl),
   wxe_util:call(?wxTextCtrl_GetLastPosition,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTextCtrl(), LineNo::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlgetlinelength">external documentation</a>.
+-spec getLineLength(This, LineNo) -> integer() when
+	This::wxTextCtrl(), LineNo::integer().
 getLineLength(#wx_ref{type=ThisT,ref=ThisRef},LineNo)
  when is_integer(LineNo) ->
   ?CLASS(ThisT,wxTextCtrl),
   wxe_util:call(?wxTextCtrl_GetLineLength,
   <<ThisRef:32/?UI,LineNo:32/?UI>>).
 
-%% @spec (This::wxTextCtrl(), LineNo::integer()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlgetlinetext">external documentation</a>.
+-spec getLineText(This, LineNo) -> string() when
+	This::wxTextCtrl(), LineNo::integer().
 getLineText(#wx_ref{type=ThisT,ref=ThisRef},LineNo)
  when is_integer(LineNo) ->
   ?CLASS(ThisT,wxTextCtrl),
   wxe_util:call(?wxTextCtrl_GetLineText,
   <<ThisRef:32/?UI,LineNo:32/?UI>>).
 
-%% @spec (This::wxTextCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlgetnumberoflines">external documentation</a>.
+-spec getNumberOfLines(This) -> integer() when
+	This::wxTextCtrl().
 getNumberOfLines(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTextCtrl),
   wxe_util:call(?wxTextCtrl_GetNumberOfLines,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTextCtrl(), From::integer(), To::integer()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlgetrange">external documentation</a>.
+-spec getRange(This, From, To) -> string() when
+	This::wxTextCtrl(), From::integer(), To::integer().
 getRange(#wx_ref{type=ThisT,ref=ThisRef},From,To)
  when is_integer(From),is_integer(To) ->
   ?CLASS(ThisT,wxTextCtrl),
   wxe_util:call(?wxTextCtrl_GetRange,
   <<ThisRef:32/?UI,From:32/?UI,To:32/?UI>>).
 
-%% @spec (This::wxTextCtrl()) -> {From::integer(), To::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlgetselection">external documentation</a>.
+-spec getSelection(This) -> {From::integer(), To::integer()} when
+	This::wxTextCtrl().
 getSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTextCtrl),
   wxe_util:call(?wxTextCtrl_GetSelection,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTextCtrl()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlgetstringselection">external documentation</a>.
+-spec getStringSelection(This) -> string() when
+	This::wxTextCtrl().
 getStringSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTextCtrl),
   wxe_util:call(?wxTextCtrl_GetStringSelection,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTextCtrl(), Position::integer(), Style::wxTextAttr:wxTextAttr()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlgetstyle">external documentation</a>.
+-spec getStyle(This, Position, Style) -> boolean() when
+	This::wxTextCtrl(), Position::integer(), Style::wxTextAttr:wxTextAttr().
 getStyle(#wx_ref{type=ThisT,ref=ThisRef},Position,#wx_ref{type=StyleT,ref=StyleRef})
  when is_integer(Position) ->
   ?CLASS(ThisT,wxTextCtrl),
@@ -289,50 +326,58 @@ getStyle(#wx_ref{type=ThisT,ref=ThisRef},Position,#wx_ref{type=StyleT,ref=StyleR
   wxe_util:call(?wxTextCtrl_GetStyle,
   <<ThisRef:32/?UI,Position:32/?UI,StyleRef:32/?UI>>).
 
-%% @spec (This::wxTextCtrl()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlgetvalue">external documentation</a>.
+-spec getValue(This) -> string() when
+	This::wxTextCtrl().
 getValue(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTextCtrl),
   wxe_util:call(?wxTextCtrl_GetValue,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTextCtrl()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrliseditable">external documentation</a>.
+-spec isEditable(This) -> boolean() when
+	This::wxTextCtrl().
 isEditable(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTextCtrl),
   wxe_util:call(?wxTextCtrl_IsEditable,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTextCtrl()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlismodified">external documentation</a>.
+-spec isModified(This) -> boolean() when
+	This::wxTextCtrl().
 isModified(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTextCtrl),
   wxe_util:call(?wxTextCtrl_IsModified,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTextCtrl()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlismultiline">external documentation</a>.
+-spec isMultiLine(This) -> boolean() when
+	This::wxTextCtrl().
 isMultiLine(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTextCtrl),
   wxe_util:call(?wxTextCtrl_IsMultiLine,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTextCtrl()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlissingleline">external documentation</a>.
+-spec isSingleLine(This) -> boolean() when
+	This::wxTextCtrl().
 isSingleLine(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTextCtrl),
   wxe_util:call(?wxTextCtrl_IsSingleLine,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTextCtrl(), File::string()) -> bool()
 %% @equiv loadFile(This,File, [])
+-spec loadFile(This, File) -> boolean() when
+	This::wxTextCtrl(), File::string().
+
 loadFile(This,File)
  when is_record(This, wx_ref),is_list(File) ->
   loadFile(This,File, []).
 
-%% @spec (This::wxTextCtrl(), File::string(), [Option]) -> bool()
-%% Option = {fileType, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlloadfile">external documentation</a>.
+-spec loadFile(This, File, [Option]) -> boolean() when
+	This::wxTextCtrl(), File::string(),
+	Option :: {fileType, integer()}.
 loadFile(#wx_ref{type=ThisT,ref=ThisRef},File, Options)
  when is_list(File),is_list(Options) ->
   ?CLASS(ThisT,wxTextCtrl),
@@ -343,45 +388,52 @@ loadFile(#wx_ref{type=ThisT,ref=ThisRef},File, Options)
   wxe_util:call(?wxTextCtrl_LoadFile,
   <<ThisRef:32/?UI,(byte_size(File_UC)):32/?UI,(File_UC)/binary, 0:(((8- ((0+byte_size(File_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlmarkdirty">external documentation</a>.
+-spec markDirty(This) -> ok when
+	This::wxTextCtrl().
 markDirty(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTextCtrl),
   wxe_util:cast(?wxTextCtrl_MarkDirty,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlpaste">external documentation</a>.
+-spec paste(This) -> ok when
+	This::wxTextCtrl().
 paste(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTextCtrl),
   wxe_util:cast(?wxTextCtrl_Paste,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTextCtrl(), Pos::integer()) -> {bool(), X::integer(), Y::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlpositiontoxy">external documentation</a>.
+-spec positionToXY(This, Pos) -> Result when
+	Result ::{Res ::boolean(), X::integer(), Y::integer()},
+	This::wxTextCtrl(), Pos::integer().
 positionToXY(#wx_ref{type=ThisT,ref=ThisRef},Pos)
  when is_integer(Pos) ->
   ?CLASS(ThisT,wxTextCtrl),
   wxe_util:call(?wxTextCtrl_PositionToXY,
   <<ThisRef:32/?UI,Pos:32/?UI>>).
 
-%% @spec (This::wxTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlredo">external documentation</a>.
+-spec redo(This) -> ok when
+	This::wxTextCtrl().
 redo(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTextCtrl),
   wxe_util:cast(?wxTextCtrl_Redo,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTextCtrl(), From::integer(), To::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlremove">external documentation</a>.
+-spec remove(This, From, To) -> ok when
+	This::wxTextCtrl(), From::integer(), To::integer().
 remove(#wx_ref{type=ThisT,ref=ThisRef},From,To)
  when is_integer(From),is_integer(To) ->
   ?CLASS(ThisT,wxTextCtrl),
   wxe_util:cast(?wxTextCtrl_Remove,
   <<ThisRef:32/?UI,From:32/?UI,To:32/?UI>>).
 
-%% @spec (This::wxTextCtrl(), From::integer(), To::integer(), Value::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlreplace">external documentation</a>.
+-spec replace(This, From, To, Value) -> ok when
+	This::wxTextCtrl(), From::integer(), To::integer(), Value::string().
 replace(#wx_ref{type=ThisT,ref=ThisRef},From,To,Value)
  when is_integer(From),is_integer(To),is_list(Value) ->
   ?CLASS(ThisT,wxTextCtrl),
@@ -389,15 +441,19 @@ replace(#wx_ref{type=ThisT,ref=ThisRef},From,To,Value)
   wxe_util:cast(?wxTextCtrl_Replace,
   <<ThisRef:32/?UI,From:32/?UI,To:32/?UI,(byte_size(Value_UC)):32/?UI,(Value_UC)/binary, 0:(((8- ((0+byte_size(Value_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxTextCtrl()) -> bool()
 %% @equiv saveFile(This, [])
+-spec saveFile(This) -> boolean() when
+	This::wxTextCtrl().
+
 saveFile(This)
  when is_record(This, wx_ref) ->
   saveFile(This, []).
 
-%% @spec (This::wxTextCtrl(), [Option]) -> bool()
-%% Option = {file, string()} | {fileType, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlsavefile">external documentation</a>.
+-spec saveFile(This, [Option]) -> boolean() when
+	This::wxTextCtrl(),
+	Option :: {file, string()}
+		 | {fileType, integer()}.
 saveFile(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxTextCtrl),
@@ -408,55 +464,62 @@ saveFile(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxTextCtrl_SaveFile,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxTextCtrl(), Style::wxTextAttr:wxTextAttr()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlsetdefaultstyle">external documentation</a>.
+-spec setDefaultStyle(This, Style) -> boolean() when
+	This::wxTextCtrl(), Style::wxTextAttr:wxTextAttr().
 setDefaultStyle(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=StyleT,ref=StyleRef}) ->
   ?CLASS(ThisT,wxTextCtrl),
   ?CLASS(StyleT,wxTextAttr),
   wxe_util:call(?wxTextCtrl_SetDefaultStyle,
   <<ThisRef:32/?UI,StyleRef:32/?UI>>).
 
-%% @spec (This::wxTextCtrl(), Editable::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlseteditable">external documentation</a>.
+-spec setEditable(This, Editable) -> ok when
+	This::wxTextCtrl(), Editable::boolean().
 setEditable(#wx_ref{type=ThisT,ref=ThisRef},Editable)
  when is_boolean(Editable) ->
   ?CLASS(ThisT,wxTextCtrl),
   wxe_util:cast(?wxTextCtrl_SetEditable,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Editable)):32/?UI>>).
 
-%% @spec (This::wxTextCtrl(), Pos::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlsetinsertionpoint">external documentation</a>.
+-spec setInsertionPoint(This, Pos) -> ok when
+	This::wxTextCtrl(), Pos::integer().
 setInsertionPoint(#wx_ref{type=ThisT,ref=ThisRef},Pos)
  when is_integer(Pos) ->
   ?CLASS(ThisT,wxTextCtrl),
   wxe_util:cast(?wxTextCtrl_SetInsertionPoint,
   <<ThisRef:32/?UI,Pos:32/?UI>>).
 
-%% @spec (This::wxTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlsetinsertionpointend">external documentation</a>.
+-spec setInsertionPointEnd(This) -> ok when
+	This::wxTextCtrl().
 setInsertionPointEnd(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTextCtrl),
   wxe_util:cast(?wxTextCtrl_SetInsertionPointEnd,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTextCtrl(), Len::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlsetmaxlength">external documentation</a>.
+-spec setMaxLength(This, Len) -> ok when
+	This::wxTextCtrl(), Len::integer().
 setMaxLength(#wx_ref{type=ThisT,ref=ThisRef},Len)
  when is_integer(Len) ->
   ?CLASS(ThisT,wxTextCtrl),
   wxe_util:cast(?wxTextCtrl_SetMaxLength,
   <<ThisRef:32/?UI,Len:32/?UI>>).
 
-%% @spec (This::wxTextCtrl(), From::integer(), To::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlsetselection">external documentation</a>.
+-spec setSelection(This, From, To) -> ok when
+	This::wxTextCtrl(), From::integer(), To::integer().
 setSelection(#wx_ref{type=ThisT,ref=ThisRef},From,To)
  when is_integer(From),is_integer(To) ->
   ?CLASS(ThisT,wxTextCtrl),
   wxe_util:cast(?wxTextCtrl_SetSelection,
   <<ThisRef:32/?UI,From:32/?UI,To:32/?UI>>).
 
-%% @spec (This::wxTextCtrl(), Start::integer(), End::integer(), Style::wxTextAttr:wxTextAttr()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlsetstyle">external documentation</a>.
+-spec setStyle(This, Start, End, Style) -> boolean() when
+	This::wxTextCtrl(), Start::integer(), End::integer(), Style::wxTextAttr:wxTextAttr().
 setStyle(#wx_ref{type=ThisT,ref=ThisRef},Start,End,#wx_ref{type=StyleT,ref=StyleRef})
  when is_integer(Start),is_integer(End) ->
   ?CLASS(ThisT,wxTextCtrl),
@@ -464,8 +527,9 @@ setStyle(#wx_ref{type=ThisT,ref=ThisRef},Start,End,#wx_ref{type=StyleT,ref=Style
   wxe_util:call(?wxTextCtrl_SetStyle,
   <<ThisRef:32/?UI,Start:32/?UI,End:32/?UI,StyleRef:32/?UI>>).
 
-%% @spec (This::wxTextCtrl(), Value::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlsetvalue">external documentation</a>.
+-spec setValue(This, Value) -> ok when
+	This::wxTextCtrl(), Value::string().
 setValue(#wx_ref{type=ThisT,ref=ThisRef},Value)
  when is_list(Value) ->
   ?CLASS(ThisT,wxTextCtrl),
@@ -473,23 +537,26 @@ setValue(#wx_ref{type=ThisT,ref=ThisRef},Value)
   wxe_util:cast(?wxTextCtrl_SetValue,
   <<ThisRef:32/?UI,(byte_size(Value_UC)):32/?UI,(Value_UC)/binary, 0:(((8- ((0+byte_size(Value_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxTextCtrl(), Pos::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlshowposition">external documentation</a>.
+-spec showPosition(This, Pos) -> ok when
+	This::wxTextCtrl(), Pos::integer().
 showPosition(#wx_ref{type=ThisT,ref=ThisRef},Pos)
  when is_integer(Pos) ->
   ?CLASS(ThisT,wxTextCtrl),
   wxe_util:cast(?wxTextCtrl_ShowPosition,
   <<ThisRef:32/?UI,Pos:32/?UI>>).
 
-%% @spec (This::wxTextCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlundo">external documentation</a>.
+-spec undo(This) -> ok when
+	This::wxTextCtrl().
 undo(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTextCtrl),
   wxe_util:cast(?wxTextCtrl_Undo,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTextCtrl(), Text::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlwritetext">external documentation</a>.
+-spec writeText(This, Text) -> ok when
+	This::wxTextCtrl(), Text::string().
 writeText(#wx_ref{type=ThisT,ref=ThisRef},Text)
  when is_list(Text) ->
   ?CLASS(ThisT,wxTextCtrl),
@@ -497,16 +564,17 @@ writeText(#wx_ref{type=ThisT,ref=ThisRef},Text)
   wxe_util:cast(?wxTextCtrl_WriteText,
   <<ThisRef:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxTextCtrl(), X::integer(), Y::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlxytoposition">external documentation</a>.
+-spec xYToPosition(This, X, Y) -> integer() when
+	This::wxTextCtrl(), X::integer(), Y::integer().
 xYToPosition(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
  when is_integer(X),is_integer(Y) ->
   ?CLASS(ThisT,wxTextCtrl),
   wxe_util:call(?wxTextCtrl_XYToPosition,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI>>).
 
-%% @spec (This::wxTextCtrl()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxTextCtrl) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxTextCtrl),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxTextDataObject.erl b/lib/wx/src/gen/wxTextDataObject.erl
index f4fe3b5e0c..ab4d5378e1 100644
--- a/lib/wx/src/gen/wxTextDataObject.erl
+++ b/lib/wx/src/gen/wxTextDataObject.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -32,18 +32,21 @@
 %% inherited exports
 -export([parent_class/1]).
 
+-export_type([wxTextDataObject/0]).
 %% @hidden
 parent_class(wxDataObject) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxTextDataObject()
+-type wxTextDataObject() :: wx:wx_object().
 %% @equiv new([])
+-spec new() -> wxTextDataObject().
+
 new() ->
   new([]).
 
-%% @spec ([Option]) -> wxTextDataObject()
-%% Option = {text, string()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextdataobject.html#wxtextdataobjectwxtextdataobject">external documentation</a>.
+-spec new([Option]) -> wxTextDataObject() when
+	Option :: {text, string()}.
 new(Options)
  when is_list(Options) ->
   MOpts = fun({text, Text}, Acc) ->   Text_UC = unicode:characters_to_binary([Text,0]),[<<1:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8>>|Acc];
@@ -52,22 +55,25 @@ new(Options)
   wxe_util:construct(?wxTextDataObject_new,
   <<BinOpt/binary>>).
 
-%% @spec (This::wxTextDataObject()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextdataobject.html#wxtextdataobjectgettextlength">external documentation</a>.
+-spec getTextLength(This) -> integer() when
+	This::wxTextDataObject().
 getTextLength(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTextDataObject),
   wxe_util:call(?wxTextDataObject_GetTextLength,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTextDataObject()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextdataobject.html#wxtextdataobjectgettext">external documentation</a>.
+-spec getText(This) -> string() when
+	This::wxTextDataObject().
 getText(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTextDataObject),
   wxe_util:call(?wxTextDataObject_GetText,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTextDataObject(), Text::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextdataobject.html#wxtextdataobjectsettext">external documentation</a>.
+-spec setText(This, Text) -> ok when
+	This::wxTextDataObject(), Text::string().
 setText(#wx_ref{type=ThisT,ref=ThisRef},Text)
  when is_list(Text) ->
   ?CLASS(ThisT,wxTextDataObject),
@@ -75,8 +81,8 @@ setText(#wx_ref{type=ThisT,ref=ThisRef},Text)
   wxe_util:cast(?wxTextDataObject_SetText,
   <<ThisRef:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxTextDataObject()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxTextDataObject) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxTextDataObject),
   wxe_util:destroy(?wxTextDataObject_destroy,Obj),
diff --git a/lib/wx/src/gen/wxTextEntryDialog.erl b/lib/wx/src/gen/wxTextEntryDialog.erl
index 53694a47e6..c26a1a57b5 100644
--- a/lib/wx/src/gen/wxTextEntryDialog.erl
+++ b/lib/wx/src/gen/wxTextEntryDialog.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -77,6 +77,7 @@
   transferDataFromWindow/1,transferDataToWindow/1,update/1,updateWindowUI/1,
   updateWindowUI/2,validate/1,warpPointer/3]).
 
+-export_type([wxTextEntryDialog/0]).
 %% @hidden
 parent_class(wxDialog) -> true;
 parent_class(wxTopLevelWindow) -> true;
@@ -84,15 +85,22 @@ parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (Parent::wxWindow:wxWindow(), Message::string()) -> wxTextEntryDialog()
+-type wxTextEntryDialog() :: wx:wx_object().
 %% @equiv new(Parent,Message, [])
+-spec new(Parent, Message) -> wxTextEntryDialog() when
+	Parent::wxWindow:wxWindow(), Message::string().
+
 new(Parent,Message)
  when is_record(Parent, wx_ref),is_list(Message) ->
   new(Parent,Message, []).
 
-%% @spec (Parent::wxWindow:wxWindow(), Message::string(), [Option]) -> wxTextEntryDialog()
-%% Option = {caption, string()} | {value, string()} | {style, integer()} | {pos, {X::integer(), Y::integer()}}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextentrydialog.html#wxtextentrydialogwxtextentrydialog">external documentation</a>.
+-spec new(Parent, Message, [Option]) -> wxTextEntryDialog() when
+	Parent::wxWindow:wxWindow(), Message::string(),
+	Option :: {caption, string()}
+		 | {value, string()}
+		 | {style, integer()}
+		 | {pos, {X::integer(), Y::integer()}}.
 new(#wx_ref{type=ParentT,ref=ParentRef},Message, Options)
  when is_list(Message),is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -106,15 +114,17 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Message, Options)
   wxe_util:construct(?wxTextEntryDialog_new,
   <<ParentRef: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, BinOpt/binary>>).
 
-%% @spec (This::wxTextEntryDialog()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextentrydialog.html#wxtextentrydialoggetvalue">external documentation</a>.
+-spec getValue(This) -> string() when
+	This::wxTextEntryDialog().
 getValue(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTextEntryDialog),
   wxe_util:call(?wxTextEntryDialog_GetValue,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTextEntryDialog(), Val::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextentrydialog.html#wxtextentrydialogsetvalue">external documentation</a>.
+-spec setValue(This, Val) -> ok when
+	This::wxTextEntryDialog(), Val::string().
 setValue(#wx_ref{type=ThisT,ref=ThisRef},Val)
  when is_list(Val) ->
   ?CLASS(ThisT,wxTextEntryDialog),
@@ -122,8 +132,8 @@ setValue(#wx_ref{type=ThisT,ref=ThisRef},Val)
   wxe_util:cast(?wxTextEntryDialog_SetValue,
   <<ThisRef:32/?UI,(byte_size(Val_UC)):32/?UI,(Val_UC)/binary, 0:(((8- ((0+byte_size(Val_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxTextEntryDialog()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxTextEntryDialog) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxTextEntryDialog),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxToggleButton.erl b/lib/wx/src/gen/wxToggleButton.erl
index d7755cc50b..23a2987a27 100644
--- a/lib/wx/src/gen/wxToggleButton.erl
+++ b/lib/wx/src/gen/wxToggleButton.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -69,27 +69,35 @@
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
 
+-export_type([wxToggleButton/0]).
 %% @hidden
 parent_class(wxControl) -> true;
 parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxToggleButton()
+-type wxToggleButton() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtogglebutton.html#wxtogglebuttonwxtogglebutton">external documentation</a>.
+-spec new() -> wxToggleButton().
 new() ->
   wxe_util:construct(?wxToggleButton_new_0,
   <<>>).
 
-%% @spec (Parent::wxWindow:wxWindow(), Id::integer(), Label::string()) -> wxToggleButton()
 %% @equiv new(Parent,Id,Label, [])
+-spec new(Parent, Id, Label) -> wxToggleButton() when
+	Parent::wxWindow:wxWindow(), Id::integer(), Label::string().
+
 new(Parent,Id,Label)
  when is_record(Parent, wx_ref),is_integer(Id),is_list(Label) ->
   new(Parent,Id,Label, []).
 
-%% @spec (Parent::wxWindow:wxWindow(), Id::integer(), Label::string(), [Option]) -> wxToggleButton()
-%% Option = {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()} | {validator, wx:wx()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtogglebutton.html#wxtogglebuttonwxtogglebutton">external documentation</a>.
+-spec new(Parent, Id, Label, [Option]) -> wxToggleButton() when
+	Parent::wxWindow:wxWindow(), Id::integer(), Label::string(),
+	Option :: {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}
+		 | {validator, wx:wx()}.
 new(#wx_ref{type=ParentT,ref=ParentRef},Id,Label, Options)
  when is_integer(Id),is_list(Label),is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -103,15 +111,21 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Id,Label, Options)
   wxe_util:construct(?wxToggleButton_new_4,
   <<ParentRef:32/?UI,Id:32/?UI,(byte_size(Label_UC)):32/?UI,(Label_UC)/binary, 0:(((8- ((4+byte_size(Label_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxToggleButton(), Parent::wxWindow:wxWindow(), Id::integer(), Label::string()) -> bool()
 %% @equiv create(This,Parent,Id,Label, [])
+-spec create(This, Parent, Id, Label) -> boolean() when
+	This::wxToggleButton(), Parent::wxWindow:wxWindow(), Id::integer(), Label::string().
+
 create(This,Parent,Id,Label)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id),is_list(Label) ->
   create(This,Parent,Id,Label, []).
 
-%% @spec (This::wxToggleButton(), Parent::wxWindow:wxWindow(), Id::integer(), Label::string(), [Option]) -> bool()
-%% Option = {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()} | {validator, wx:wx()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtogglebutton.html#wxtogglebuttoncreate">external documentation</a>.
+-spec create(This, Parent, Id, Label, [Option]) -> boolean() when
+	This::wxToggleButton(), Parent::wxWindow:wxWindow(), Id::integer(), Label::string(),
+	Option :: {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}
+		 | {validator, wx:wx()}.
 create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id,Label, Options)
  when is_integer(Id),is_list(Label),is_list(Options) ->
   ?CLASS(ThisT,wxToggleButton),
@@ -126,23 +140,25 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id,La
   wxe_util:call(?wxToggleButton_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI,Id:32/?UI,(byte_size(Label_UC)):32/?UI,(Label_UC)/binary, 0:(((8- ((0+byte_size(Label_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxToggleButton()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtogglebutton.html#wxtogglebuttongetvalue">external documentation</a>.
+-spec getValue(This) -> boolean() when
+	This::wxToggleButton().
 getValue(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxToggleButton),
   wxe_util:call(?wxToggleButton_GetValue,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxToggleButton(), State::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtogglebutton.html#wxtogglebuttonsetvalue">external documentation</a>.
+-spec setValue(This, State) -> ok when
+	This::wxToggleButton(), State::boolean().
 setValue(#wx_ref{type=ThisT,ref=ThisRef},State)
  when is_boolean(State) ->
   ?CLASS(ThisT,wxToggleButton),
   wxe_util:cast(?wxToggleButton_SetValue,
   <<ThisRef:32/?UI,(wxe_util:from_bool(State)):32/?UI>>).
 
-%% @spec (This::wxToggleButton()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxToggleButton) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxToggleButton),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxToolBar.erl b/lib/wx/src/gen/wxToolBar.erl
index 59369368f0..8fc200d6ba 100644
--- a/lib/wx/src/gen/wxToolBar.erl
+++ b/lib/wx/src/gen/wxToolBar.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -77,52 +77,57 @@
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
 
+-export_type([wxToolBar/0]).
 %% @hidden
 parent_class(wxControl) -> true;
 parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (This::wxToolBar(), Control::wxControl:wxControl()) -> wx:wx()
+-type wxToolBar() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbaraddcontrol">external documentation</a>.
+-spec addControl(This, Control) -> wx:wx() when
+	This::wxToolBar(), Control::wxControl:wxControl().
 addControl(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ControlT,ref=ControlRef}) ->
   ?CLASS(ThisT,wxToolBar),
   ?CLASS(ControlT,wxControl),
   wxe_util:call(?wxToolBar_AddControl,
   <<ThisRef:32/?UI,ControlRef:32/?UI>>).
 
-%% @spec (This::wxToolBar()) -> wx:wx()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbaraddseparator">external documentation</a>.
+-spec addSeparator(This) -> wx:wx() when
+	This::wxToolBar().
 addSeparator(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxToolBar),
   wxe_util:call(?wxToolBar_AddSeparator,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxToolBar(), Tool::wx:wx()) -> wx:wx()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbaraddtool">external documentation</a>.
+-spec addTool(This, Tool) -> wx:wx() when
+	This::wxToolBar(), Tool::wx:wx().
 addTool(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ToolT,ref=ToolRef}) ->
   ?CLASS(ThisT,wxToolBar),
   ?CLASS(ToolT,wx),
   wxe_util:call(?wxToolBar_AddTool_1,
   <<ThisRef:32/?UI,ToolRef:32/?UI>>).
 
-%% @spec (This::wxToolBar(), Toolid::integer(), Bitmap::wxBitmap:wxBitmap()) -> wx:wx()
 %% @equiv addTool(This,Toolid,Bitmap, [])
+-spec addTool(This, Toolid, Bitmap) -> wx:wx() when
+	This::wxToolBar(), Toolid::integer(), Bitmap::wxBitmap:wxBitmap().
+
 addTool(This,Toolid,Bitmap)
  when is_record(This, wx_ref),is_integer(Toolid),is_record(Bitmap, wx_ref) ->
   addTool(This,Toolid,Bitmap, []).
 
-%% @spec (This::wxToolBar(),Toolid::integer(),X::string()|term(),X::term()) -> wx:wx()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbaraddtool">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% addTool(This::wxToolBar(), Toolid::integer(), Label::string(), Bitmap::wxBitmap:wxBitmap()) -> addTool(This,Toolid,Label,Bitmap, []) </c></p>
-%% <p><c>
-%% addTool(This::wxToolBar(), Toolid::integer(), Bitmap::wxBitmap:wxBitmap(), BmpDisabled::wxBitmap:wxBitmap()) -> addTool(This,Toolid,Bitmap,BmpDisabled, []) </c></p>
-%% <p><c>
-%% addTool(This::wxToolBar(), Toolid::integer(), Bitmap::wxBitmap:wxBitmap(), [Option]) -> wx:wx() </c>
-%%<br /> Option = {shortHelpString, string()} | {longHelpString, string()}
-%% </p>
+-spec addTool(This, Toolid, Label, Bitmap) -> wx:wx() when
+	This::wxToolBar(), Toolid::integer(), Label::string(), Bitmap::wxBitmap:wxBitmap();
+      (This, Toolid, Bitmap, BmpDisabled) -> wx:wx() when
+	This::wxToolBar(), Toolid::integer(), Bitmap::wxBitmap:wxBitmap(), BmpDisabled::wxBitmap:wxBitmap();
+      (This, Toolid, Bitmap, [Option]) -> wx:wx() when
+	This::wxToolBar(), Toolid::integer(), Bitmap::wxBitmap:wxBitmap(),
+	Option :: {shortHelpString, string()}
+		 | {longHelpString, string()}.
 
 addTool(This,Toolid,Label,Bitmap)
  when is_record(This, wx_ref),is_integer(Toolid),is_list(Label),is_record(Bitmap, wx_ref) ->
@@ -142,21 +147,19 @@ addTool(#wx_ref{type=ThisT,ref=ThisRef},Toolid,#wx_ref{type=BitmapT,ref=BitmapRe
   wxe_util:call(?wxToolBar_AddTool_3,
   <<ThisRef:32/?UI,Toolid:32/?UI,BitmapRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxToolBar(),Toolid::integer(),X::string()|term(),X::term(),X::term()) -> wx:wx()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbaraddtool">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% addTool(This::wxToolBar(), Toolid::integer(), Label::string(), Bitmap::wxBitmap:wxBitmap(), BmpDisabled::wxBitmap:wxBitmap()) -> addTool(This,Toolid,Label,Bitmap,BmpDisabled, []) </c></p>
-%% <p><c>
-%% addTool(This::wxToolBar(), Toolid::integer(), Label::string(), Bitmap::wxBitmap:wxBitmap(), [Option]) -> wx:wx() </c>
-%%<br /> Option = {shortHelp, string()} | {kind, WxItemKind}
-%%<br /> WxItemKind = integer()
-%%<br /> WxItemKind is one of ?wxITEM_SEPARATOR | ?wxITEM_NORMAL | ?wxITEM_CHECK | ?wxITEM_RADIO | ?wxITEM_MAX
-%% </p>
-%% <p><c>
-%% addTool(This::wxToolBar(), Toolid::integer(), Bitmap::wxBitmap:wxBitmap(), BmpDisabled::wxBitmap:wxBitmap(), [Option]) -> wx:wx() </c>
-%%<br /> Option = {toggle, bool()} | {clientData, wx:wx()} | {shortHelpString, string()} | {longHelpString, string()}
-%% </p>
+-spec addTool(This, Toolid, Label, Bitmap, BmpDisabled) -> wx:wx() when
+	This::wxToolBar(), Toolid::integer(), Label::string(), Bitmap::wxBitmap:wxBitmap(), BmpDisabled::wxBitmap:wxBitmap();
+      (This, Toolid, Label, Bitmap, [Option]) -> wx:wx() when
+	This::wxToolBar(), Toolid::integer(), Label::string(), Bitmap::wxBitmap:wxBitmap(),
+	Option :: {shortHelp, string()}
+		 | {kind, wx:wx_enum()};
+      (This, Toolid, Bitmap, BmpDisabled, [Option]) -> wx:wx() when
+	This::wxToolBar(), Toolid::integer(), Bitmap::wxBitmap:wxBitmap(), BmpDisabled::wxBitmap:wxBitmap(),
+	Option :: {toggle, boolean()}
+		 | {clientData, wx:wx()}
+		 | {shortHelpString, string()}
+		 | {longHelpString, string()}.
 
 addTool(This,Toolid,Label,Bitmap,BmpDisabled)
  when is_record(This, wx_ref),is_integer(Toolid),is_list(Label),is_record(Bitmap, wx_ref),is_record(BmpDisabled, wx_ref) ->
@@ -186,17 +189,15 @@ addTool(#wx_ref{type=ThisT,ref=ThisRef},Toolid,#wx_ref{type=BitmapT,ref=BitmapRe
   wxe_util:call(?wxToolBar_AddTool_4_1,
   <<ThisRef:32/?UI,Toolid:32/?UI,BitmapRef:32/?UI,BmpDisabledRef:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxToolBar(),Toolid::integer(),X::term()|string(),X::term(),X::bool()|term(),X::integer()|term()) -> wx:wx()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbaraddtool">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% addTool(This::wxToolBar(), Toolid::integer(), Bitmap::wxBitmap:wxBitmap(), BmpDisabled::wxBitmap:wxBitmap(), Toggle::bool(), XPos::integer()) -> addTool(This,Toolid,Bitmap,BmpDisabled,Toggle,XPos, []) </c></p>
-%% <p><c>
-%% addTool(This::wxToolBar(), Toolid::integer(), Label::string(), Bitmap::wxBitmap:wxBitmap(), BmpDisabled::wxBitmap:wxBitmap(), [Option]) -> wx:wx() </c>
-%%<br /> Option = {kind, WxItemKind} | {shortHelp, string()} | {longHelp, string()} | {data, wx:wx()}
-%%<br /> WxItemKind = integer()
-%%<br /> WxItemKind is one of ?wxITEM_SEPARATOR | ?wxITEM_NORMAL | ?wxITEM_CHECK | ?wxITEM_RADIO | ?wxITEM_MAX
-%% </p>
+-spec addTool(This, Toolid, Bitmap, BmpDisabled, Toggle, XPos) -> wx:wx() when
+	This::wxToolBar(), Toolid::integer(), Bitmap::wxBitmap:wxBitmap(), BmpDisabled::wxBitmap:wxBitmap(), Toggle::boolean(), XPos::integer();
+      (This, Toolid, Label, Bitmap, BmpDisabled, [Option]) -> wx:wx() when
+	This::wxToolBar(), Toolid::integer(), Label::string(), Bitmap::wxBitmap:wxBitmap(), BmpDisabled::wxBitmap:wxBitmap(),
+	Option :: {kind, wx:wx_enum()}
+		 | {shortHelp, string()}
+		 | {longHelp, string()}
+		 | {data, wx:wx()}.
 
 addTool(This,Toolid,Bitmap,BmpDisabled,Toggle,XPos)
  when is_record(This, wx_ref),is_integer(Toolid),is_record(Bitmap, wx_ref),is_record(BmpDisabled, wx_ref),is_boolean(Toggle),is_integer(XPos) ->
@@ -216,9 +217,13 @@ addTool(#wx_ref{type=ThisT,ref=ThisRef},Toolid,Label,#wx_ref{type=BitmapT,ref=Bi
   wxe_util:call(?wxToolBar_AddTool_5,
   <<ThisRef:32/?UI,Toolid:32/?UI,(byte_size(Label_UC)):32/?UI,(Label_UC)/binary, 0:(((8- ((4+byte_size(Label_UC)) band 16#7)) band 16#7))/unit:8,BitmapRef:32/?UI,BmpDisabledRef:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxToolBar(), Toolid::integer(), Bitmap::wxBitmap:wxBitmap(), BmpDisabled::wxBitmap:wxBitmap(), Toggle::bool(), XPos::integer(), [Option]) -> wx:wx()
-%% Option = {yPos, integer()} | {clientData, wx:wx()} | {shortHelp, string()} | {longHelp, string()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbaraddtool">external documentation</a>.
+-spec addTool(This, Toolid, Bitmap, BmpDisabled, Toggle, XPos, [Option]) -> wx:wx() when
+	This::wxToolBar(), Toolid::integer(), Bitmap::wxBitmap:wxBitmap(), BmpDisabled::wxBitmap:wxBitmap(), Toggle::boolean(), XPos::integer(),
+	Option :: {yPos, integer()}
+		 | {clientData, wx:wx()}
+		 | {shortHelp, string()}
+		 | {longHelp, string()}.
 addTool(#wx_ref{type=ThisT,ref=ThisRef},Toolid,#wx_ref{type=BitmapT,ref=BitmapRef},#wx_ref{type=BmpDisabledT,ref=BmpDisabledRef},Toggle,XPos, Options)
  when is_integer(Toolid),is_boolean(Toggle),is_integer(XPos),is_list(Options) ->
   ?CLASS(ThisT,wxToolBar),
@@ -233,15 +238,21 @@ addTool(#wx_ref{type=ThisT,ref=ThisRef},Toolid,#wx_ref{type=BitmapT,ref=BitmapRe
   wxe_util:call(?wxToolBar_AddTool_6,
   <<ThisRef:32/?UI,Toolid:32/?UI,BitmapRef:32/?UI,BmpDisabledRef:32/?UI,(wxe_util:from_bool(Toggle)):32/?UI,XPos:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxToolBar(), Toolid::integer(), Label::string(), Bitmap::wxBitmap:wxBitmap()) -> wx:wx()
 %% @equiv addCheckTool(This,Toolid,Label,Bitmap, [])
+-spec addCheckTool(This, Toolid, Label, Bitmap) -> wx:wx() when
+	This::wxToolBar(), Toolid::integer(), Label::string(), Bitmap::wxBitmap:wxBitmap().
+
 addCheckTool(This,Toolid,Label,Bitmap)
  when is_record(This, wx_ref),is_integer(Toolid),is_list(Label),is_record(Bitmap, wx_ref) ->
   addCheckTool(This,Toolid,Label,Bitmap, []).
 
-%% @spec (This::wxToolBar(), Toolid::integer(), Label::string(), Bitmap::wxBitmap:wxBitmap(), [Option]) -> wx:wx()
-%% Option = {bmpDisabled, wxBitmap:wxBitmap()} | {shortHelp, string()} | {longHelp, string()} | {data, wx:wx()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbaraddchecktool">external documentation</a>.
+-spec addCheckTool(This, Toolid, Label, Bitmap, [Option]) -> wx:wx() when
+	This::wxToolBar(), Toolid::integer(), Label::string(), Bitmap::wxBitmap:wxBitmap(),
+	Option :: {bmpDisabled, wxBitmap:wxBitmap()}
+		 | {shortHelp, string()}
+		 | {longHelp, string()}
+		 | {data, wx:wx()}.
 addCheckTool(#wx_ref{type=ThisT,ref=ThisRef},Toolid,Label,#wx_ref{type=BitmapT,ref=BitmapRef}, Options)
  when is_integer(Toolid),is_list(Label),is_list(Options) ->
   ?CLASS(ThisT,wxToolBar),
@@ -256,15 +267,21 @@ addCheckTool(#wx_ref{type=ThisT,ref=ThisRef},Toolid,Label,#wx_ref{type=BitmapT,r
   wxe_util:call(?wxToolBar_AddCheckTool,
   <<ThisRef:32/?UI,Toolid:32/?UI,(byte_size(Label_UC)):32/?UI,(Label_UC)/binary, 0:(((8- ((4+byte_size(Label_UC)) band 16#7)) band 16#7))/unit:8,BitmapRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxToolBar(), Toolid::integer(), Label::string(), Bitmap::wxBitmap:wxBitmap()) -> wx:wx()
 %% @equiv addRadioTool(This,Toolid,Label,Bitmap, [])
+-spec addRadioTool(This, Toolid, Label, Bitmap) -> wx:wx() when
+	This::wxToolBar(), Toolid::integer(), Label::string(), Bitmap::wxBitmap:wxBitmap().
+
 addRadioTool(This,Toolid,Label,Bitmap)
  when is_record(This, wx_ref),is_integer(Toolid),is_list(Label),is_record(Bitmap, wx_ref) ->
   addRadioTool(This,Toolid,Label,Bitmap, []).
 
-%% @spec (This::wxToolBar(), Toolid::integer(), Label::string(), Bitmap::wxBitmap:wxBitmap(), [Option]) -> wx:wx()
-%% Option = {bmpDisabled, wxBitmap:wxBitmap()} | {shortHelp, string()} | {longHelp, string()} | {data, wx:wx()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbaraddradiotool">external documentation</a>.
+-spec addRadioTool(This, Toolid, Label, Bitmap, [Option]) -> wx:wx() when
+	This::wxToolBar(), Toolid::integer(), Label::string(), Bitmap::wxBitmap:wxBitmap(),
+	Option :: {bmpDisabled, wxBitmap:wxBitmap()}
+		 | {shortHelp, string()}
+		 | {longHelp, string()}
+		 | {data, wx:wx()}.
 addRadioTool(#wx_ref{type=ThisT,ref=ThisRef},Toolid,Label,#wx_ref{type=BitmapT,ref=BitmapRef}, Options)
  when is_integer(Toolid),is_list(Label),is_list(Options) ->
   ?CLASS(ThisT,wxToolBar),
@@ -279,131 +296,148 @@ addRadioTool(#wx_ref{type=ThisT,ref=ThisRef},Toolid,Label,#wx_ref{type=BitmapT,r
   wxe_util:call(?wxToolBar_AddRadioTool,
   <<ThisRef:32/?UI,Toolid:32/?UI,(byte_size(Label_UC)):32/?UI,(Label_UC)/binary, 0:(((8- ((4+byte_size(Label_UC)) band 16#7)) band 16#7))/unit:8,BitmapRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxToolBar(), Toolid::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbardeletetool">external documentation</a>.
+-spec deleteTool(This, Toolid) -> boolean() when
+	This::wxToolBar(), Toolid::integer().
 deleteTool(#wx_ref{type=ThisT,ref=ThisRef},Toolid)
  when is_integer(Toolid) ->
   ?CLASS(ThisT,wxToolBar),
   wxe_util:call(?wxToolBar_DeleteTool,
   <<ThisRef:32/?UI,Toolid:32/?UI>>).
 
-%% @spec (This::wxToolBar(), Pos::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbardeletetoolbypos">external documentation</a>.
+-spec deleteToolByPos(This, Pos) -> boolean() when
+	This::wxToolBar(), Pos::integer().
 deleteToolByPos(#wx_ref{type=ThisT,ref=ThisRef},Pos)
  when is_integer(Pos) ->
   ?CLASS(ThisT,wxToolBar),
   wxe_util:call(?wxToolBar_DeleteToolByPos,
   <<ThisRef:32/?UI,Pos:32/?UI>>).
 
-%% @spec (This::wxToolBar(), Toolid::integer(), Enable::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbarenabletool">external documentation</a>.
+-spec enableTool(This, Toolid, Enable) -> ok when
+	This::wxToolBar(), Toolid::integer(), Enable::boolean().
 enableTool(#wx_ref{type=ThisT,ref=ThisRef},Toolid,Enable)
  when is_integer(Toolid),is_boolean(Enable) ->
   ?CLASS(ThisT,wxToolBar),
   wxe_util:cast(?wxToolBar_EnableTool,
   <<ThisRef:32/?UI,Toolid:32/?UI,(wxe_util:from_bool(Enable)):32/?UI>>).
 
-%% @spec (This::wxToolBar(), Toolid::integer()) -> wx:wx()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbarfindbyid">external documentation</a>.
+-spec findById(This, Toolid) -> wx:wx() when
+	This::wxToolBar(), Toolid::integer().
 findById(#wx_ref{type=ThisT,ref=ThisRef},Toolid)
  when is_integer(Toolid) ->
   ?CLASS(ThisT,wxToolBar),
   wxe_util:call(?wxToolBar_FindById,
   <<ThisRef:32/?UI,Toolid:32/?UI>>).
 
-%% @spec (This::wxToolBar(), Toolid::integer()) -> wxControl:wxControl()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbarfindcontrol">external documentation</a>.
+-spec findControl(This, Toolid) -> wxControl:wxControl() when
+	This::wxToolBar(), Toolid::integer().
 findControl(#wx_ref{type=ThisT,ref=ThisRef},Toolid)
  when is_integer(Toolid) ->
   ?CLASS(ThisT,wxToolBar),
   wxe_util:call(?wxToolBar_FindControl,
   <<ThisRef:32/?UI,Toolid:32/?UI>>).
 
-%% @spec (This::wxToolBar(), X::integer(), Y::integer()) -> wx:wx()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbarfindtoolforposition">external documentation</a>.
+-spec findToolForPosition(This, X, Y) -> wx:wx() when
+	This::wxToolBar(), X::integer(), Y::integer().
 findToolForPosition(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
  when is_integer(X),is_integer(Y) ->
   ?CLASS(ThisT,wxToolBar),
   wxe_util:call(?wxToolBar_FindToolForPosition,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI>>).
 
-%% @spec (This::wxToolBar()) -> {W::integer(), H::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbargettoolsize">external documentation</a>.
+-spec getToolSize(This) -> {W::integer(), H::integer()} when
+	This::wxToolBar().
 getToolSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxToolBar),
   wxe_util:call(?wxToolBar_GetToolSize,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxToolBar()) -> {W::integer(), H::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbargettoolbitmapsize">external documentation</a>.
+-spec getToolBitmapSize(This) -> {W::integer(), H::integer()} when
+	This::wxToolBar().
 getToolBitmapSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxToolBar),
   wxe_util:call(?wxToolBar_GetToolBitmapSize,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxToolBar()) -> {W::integer(), H::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbargetmargins">external documentation</a>.
+-spec getMargins(This) -> {W::integer(), H::integer()} when
+	This::wxToolBar().
 getMargins(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxToolBar),
   wxe_util:call(?wxToolBar_GetMargins,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxToolBar(), Toolid::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbargettoolenabled">external documentation</a>.
+-spec getToolEnabled(This, Toolid) -> boolean() when
+	This::wxToolBar(), Toolid::integer().
 getToolEnabled(#wx_ref{type=ThisT,ref=ThisRef},Toolid)
  when is_integer(Toolid) ->
   ?CLASS(ThisT,wxToolBar),
   wxe_util:call(?wxToolBar_GetToolEnabled,
   <<ThisRef:32/?UI,Toolid:32/?UI>>).
 
-%% @spec (This::wxToolBar(), Toolid::integer()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbargettoollonghelp">external documentation</a>.
+-spec getToolLongHelp(This, Toolid) -> string() when
+	This::wxToolBar(), Toolid::integer().
 getToolLongHelp(#wx_ref{type=ThisT,ref=ThisRef},Toolid)
  when is_integer(Toolid) ->
   ?CLASS(ThisT,wxToolBar),
   wxe_util:call(?wxToolBar_GetToolLongHelp,
   <<ThisRef:32/?UI,Toolid:32/?UI>>).
 
-%% @spec (This::wxToolBar()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbargettoolpacking">external documentation</a>.
+-spec getToolPacking(This) -> integer() when
+	This::wxToolBar().
 getToolPacking(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxToolBar),
   wxe_util:call(?wxToolBar_GetToolPacking,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxToolBar(), Id::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbargettoolpos">external documentation</a>.
+-spec getToolPos(This, Id) -> integer() when
+	This::wxToolBar(), Id::integer().
 getToolPos(#wx_ref{type=ThisT,ref=ThisRef},Id)
  when is_integer(Id) ->
   ?CLASS(ThisT,wxToolBar),
   wxe_util:call(?wxToolBar_GetToolPos,
   <<ThisRef:32/?UI,Id:32/?UI>>).
 
-%% @spec (This::wxToolBar()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbargettoolseparation">external documentation</a>.
+-spec getToolSeparation(This) -> integer() when
+	This::wxToolBar().
 getToolSeparation(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxToolBar),
   wxe_util:call(?wxToolBar_GetToolSeparation,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxToolBar(), Toolid::integer()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbargettoolshorthelp">external documentation</a>.
+-spec getToolShortHelp(This, Toolid) -> string() when
+	This::wxToolBar(), Toolid::integer().
 getToolShortHelp(#wx_ref{type=ThisT,ref=ThisRef},Toolid)
  when is_integer(Toolid) ->
   ?CLASS(ThisT,wxToolBar),
   wxe_util:call(?wxToolBar_GetToolShortHelp,
   <<ThisRef:32/?UI,Toolid:32/?UI>>).
 
-%% @spec (This::wxToolBar(), Toolid::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbargettoolstate">external documentation</a>.
+-spec getToolState(This, Toolid) -> boolean() when
+	This::wxToolBar(), Toolid::integer().
 getToolState(#wx_ref{type=ThisT,ref=ThisRef},Toolid)
  when is_integer(Toolid) ->
   ?CLASS(ThisT,wxToolBar),
   wxe_util:call(?wxToolBar_GetToolState,
   <<ThisRef:32/?UI,Toolid:32/?UI>>).
 
-%% @spec (This::wxToolBar(), Pos::integer(), Control::wxControl:wxControl()) -> wx:wx()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbarinsertcontrol">external documentation</a>.
+-spec insertControl(This, Pos, Control) -> wx:wx() when
+	This::wxToolBar(), Pos::integer(), Control::wxControl:wxControl().
 insertControl(#wx_ref{type=ThisT,ref=ThisRef},Pos,#wx_ref{type=ControlT,ref=ControlRef})
  when is_integer(Pos) ->
   ?CLASS(ThisT,wxToolBar),
@@ -411,16 +445,18 @@ insertControl(#wx_ref{type=ThisT,ref=ThisRef},Pos,#wx_ref{type=ControlT,ref=Cont
   wxe_util:call(?wxToolBar_InsertControl,
   <<ThisRef:32/?UI,Pos:32/?UI,ControlRef:32/?UI>>).
 
-%% @spec (This::wxToolBar(), Pos::integer()) -> wx:wx()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbarinsertseparator">external documentation</a>.
+-spec insertSeparator(This, Pos) -> wx:wx() when
+	This::wxToolBar(), Pos::integer().
 insertSeparator(#wx_ref{type=ThisT,ref=ThisRef},Pos)
  when is_integer(Pos) ->
   ?CLASS(ThisT,wxToolBar),
   wxe_util:call(?wxToolBar_InsertSeparator,
   <<ThisRef:32/?UI,Pos:32/?UI>>).
 
-%% @spec (This::wxToolBar(), Pos::integer(), Tool::wx:wx()) -> wx:wx()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbarinserttool">external documentation</a>.
+-spec insertTool(This, Pos, Tool) -> wx:wx() when
+	This::wxToolBar(), Pos::integer(), Tool::wx:wx().
 insertTool(#wx_ref{type=ThisT,ref=ThisRef},Pos,#wx_ref{type=ToolT,ref=ToolRef})
  when is_integer(Pos) ->
   ?CLASS(ThisT,wxToolBar),
@@ -428,21 +464,24 @@ insertTool(#wx_ref{type=ThisT,ref=ThisRef},Pos,#wx_ref{type=ToolT,ref=ToolRef})
   wxe_util:call(?wxToolBar_InsertTool_2,
   <<ThisRef:32/?UI,Pos:32/?UI,ToolRef:32/?UI>>).
 
-%% @spec (This::wxToolBar(), Pos::integer(), Toolid::integer(), Bitmap::wxBitmap:wxBitmap()) -> wx:wx()
 %% @equiv insertTool(This,Pos,Toolid,Bitmap, [])
+-spec insertTool(This, Pos, Toolid, Bitmap) -> wx:wx() when
+	This::wxToolBar(), Pos::integer(), Toolid::integer(), Bitmap::wxBitmap:wxBitmap().
+
 insertTool(This,Pos,Toolid,Bitmap)
  when is_record(This, wx_ref),is_integer(Pos),is_integer(Toolid),is_record(Bitmap, wx_ref) ->
   insertTool(This,Pos,Toolid,Bitmap, []).
 
-%% @spec (This::wxToolBar(),Pos::integer(),Toolid::integer(),X::string()|term(),X::term()) -> wx:wx()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbarinserttool">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% insertTool(This::wxToolBar(), Pos::integer(), Toolid::integer(), Label::string(), Bitmap::wxBitmap:wxBitmap()) -> insertTool(This,Pos,Toolid,Label,Bitmap, []) </c></p>
-%% <p><c>
-%% insertTool(This::wxToolBar(), Pos::integer(), Toolid::integer(), Bitmap::wxBitmap:wxBitmap(), [Option]) -> wx:wx() </c>
-%%<br /> Option = {bmpDisabled, wxBitmap:wxBitmap()} | {toggle, bool()} | {clientData, wx:wx()} | {shortHelp, string()} | {longHelp, string()}
-%% </p>
+-spec insertTool(This, Pos, Toolid, Label, Bitmap) -> wx:wx() when
+	This::wxToolBar(), Pos::integer(), Toolid::integer(), Label::string(), Bitmap::wxBitmap:wxBitmap();
+      (This, Pos, Toolid, Bitmap, [Option]) -> wx:wx() when
+	This::wxToolBar(), Pos::integer(), Toolid::integer(), Bitmap::wxBitmap:wxBitmap(),
+	Option :: {bmpDisabled, wxBitmap:wxBitmap()}
+		 | {toggle, boolean()}
+		 | {clientData, wx:wx()}
+		 | {shortHelp, string()}
+		 | {longHelp, string()}.
 
 insertTool(This,Pos,Toolid,Label,Bitmap)
  when is_record(This, wx_ref),is_integer(Pos),is_integer(Toolid),is_list(Label),is_record(Bitmap, wx_ref) ->
@@ -461,11 +500,15 @@ insertTool(#wx_ref{type=ThisT,ref=ThisRef},Pos,Toolid,#wx_ref{type=BitmapT,ref=B
   wxe_util:call(?wxToolBar_InsertTool_4,
   <<ThisRef:32/?UI,Pos:32/?UI,Toolid:32/?UI,BitmapRef:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxToolBar(), Pos::integer(), Toolid::integer(), Label::string(), Bitmap::wxBitmap:wxBitmap(), [Option]) -> wx:wx()
-%% Option = {bmpDisabled, wxBitmap:wxBitmap()} | {kind, WxItemKind} | {shortHelp, string()} | {longHelp, string()} | {clientData, wx:wx()}
-%% WxItemKind = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbarinserttool">external documentation</a>.
-%%<br /> WxItemKind is one of ?wxITEM_SEPARATOR | ?wxITEM_NORMAL | ?wxITEM_CHECK | ?wxITEM_RADIO | ?wxITEM_MAX
+%%<br /> Kind = ?wxITEM_SEPARATOR | ?wxITEM_NORMAL | ?wxITEM_CHECK | ?wxITEM_RADIO | ?wxITEM_MAX
+-spec insertTool(This, Pos, Toolid, Label, Bitmap, [Option]) -> wx:wx() when
+	This::wxToolBar(), Pos::integer(), Toolid::integer(), Label::string(), Bitmap::wxBitmap:wxBitmap(),
+	Option :: {bmpDisabled, wxBitmap:wxBitmap()}
+		 | {kind, wx:wx_enum()}
+		 | {shortHelp, string()}
+		 | {longHelp, string()}
+		 | {clientData, wx:wx()}.
 insertTool(#wx_ref{type=ThisT,ref=ThisRef},Pos,Toolid,Label,#wx_ref{type=BitmapT,ref=BitmapRef}, Options)
  when is_integer(Pos),is_integer(Toolid),is_list(Label),is_list(Options) ->
   ?CLASS(ThisT,wxToolBar),
@@ -481,39 +524,44 @@ insertTool(#wx_ref{type=ThisT,ref=ThisRef},Pos,Toolid,Label,#wx_ref{type=BitmapT
   wxe_util:call(?wxToolBar_InsertTool_5,
   <<ThisRef:32/?UI,Pos:32/?UI,Toolid:32/?UI,(byte_size(Label_UC)):32/?UI,(Label_UC)/binary, 0:(((8- ((0+byte_size(Label_UC)) band 16#7)) band 16#7))/unit:8,BitmapRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxToolBar()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbarrealize">external documentation</a>.
+-spec realize(This) -> boolean() when
+	This::wxToolBar().
 realize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxToolBar),
   wxe_util:call(?wxToolBar_Realize,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxToolBar(), Toolid::integer()) -> wx:wx()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbarremovetool">external documentation</a>.
+-spec removeTool(This, Toolid) -> wx:wx() when
+	This::wxToolBar(), Toolid::integer().
 removeTool(#wx_ref{type=ThisT,ref=ThisRef},Toolid)
  when is_integer(Toolid) ->
   ?CLASS(ThisT,wxToolBar),
   wxe_util:call(?wxToolBar_RemoveTool,
   <<ThisRef:32/?UI,Toolid:32/?UI>>).
 
-%% @spec (This::wxToolBar(), X::integer(), Y::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbarsetmargins">external documentation</a>.
+-spec setMargins(This, X, Y) -> ok when
+	This::wxToolBar(), X::integer(), Y::integer().
 setMargins(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
  when is_integer(X),is_integer(Y) ->
   ?CLASS(ThisT,wxToolBar),
   wxe_util:cast(?wxToolBar_SetMargins,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI>>).
 
-%% @spec (This::wxToolBar(), Size::{W::integer(), H::integer()}) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbarsettoolbitmapsize">external documentation</a>.
+-spec setToolBitmapSize(This, Size) -> ok when
+	This::wxToolBar(), Size::{W::integer(), H::integer()}.
 setToolBitmapSize(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH})
  when is_integer(SizeW),is_integer(SizeH) ->
   ?CLASS(ThisT,wxToolBar),
   wxe_util:cast(?wxToolBar_SetToolBitmapSize,
   <<ThisRef:32/?UI,SizeW:32/?UI,SizeH:32/?UI>>).
 
-%% @spec (This::wxToolBar(), Toolid::integer(), HelpString::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbarsettoollonghelp">external documentation</a>.
+-spec setToolLongHelp(This, Toolid, HelpString) -> ok when
+	This::wxToolBar(), Toolid::integer(), HelpString::string().
 setToolLongHelp(#wx_ref{type=ThisT,ref=ThisRef},Toolid,HelpString)
  when is_integer(Toolid),is_list(HelpString) ->
   ?CLASS(ThisT,wxToolBar),
@@ -521,16 +569,18 @@ setToolLongHelp(#wx_ref{type=ThisT,ref=ThisRef},Toolid,HelpString)
   wxe_util:cast(?wxToolBar_SetToolLongHelp,
   <<ThisRef:32/?UI,Toolid:32/?UI,(byte_size(HelpString_UC)):32/?UI,(HelpString_UC)/binary, 0:(((8- ((4+byte_size(HelpString_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxToolBar(), Packing::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbarsettoolpacking">external documentation</a>.
+-spec setToolPacking(This, Packing) -> ok when
+	This::wxToolBar(), Packing::integer().
 setToolPacking(#wx_ref{type=ThisT,ref=ThisRef},Packing)
  when is_integer(Packing) ->
   ?CLASS(ThisT,wxToolBar),
   wxe_util:cast(?wxToolBar_SetToolPacking,
   <<ThisRef:32/?UI,Packing:32/?UI>>).
 
-%% @spec (This::wxToolBar(), Id::integer(), HelpString::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbarsettoolshorthelp">external documentation</a>.
+-spec setToolShortHelp(This, Id, HelpString) -> ok when
+	This::wxToolBar(), Id::integer(), HelpString::string().
 setToolShortHelp(#wx_ref{type=ThisT,ref=ThisRef},Id,HelpString)
  when is_integer(Id),is_list(HelpString) ->
   ?CLASS(ThisT,wxToolBar),
@@ -538,16 +588,18 @@ setToolShortHelp(#wx_ref{type=ThisT,ref=ThisRef},Id,HelpString)
   wxe_util:cast(?wxToolBar_SetToolShortHelp,
   <<ThisRef:32/?UI,Id:32/?UI,(byte_size(HelpString_UC)):32/?UI,(HelpString_UC)/binary, 0:(((8- ((4+byte_size(HelpString_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxToolBar(), Separation::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbarsettoolseparation">external documentation</a>.
+-spec setToolSeparation(This, Separation) -> ok when
+	This::wxToolBar(), Separation::integer().
 setToolSeparation(#wx_ref{type=ThisT,ref=ThisRef},Separation)
  when is_integer(Separation) ->
   ?CLASS(ThisT,wxToolBar),
   wxe_util:cast(?wxToolBar_SetToolSeparation,
   <<ThisRef:32/?UI,Separation:32/?UI>>).
 
-%% @spec (This::wxToolBar(), Toolid::integer(), Toggle::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbartoggletool">external documentation</a>.
+-spec toggleTool(This, Toolid, Toggle) -> ok when
+	This::wxToolBar(), Toolid::integer(), Toggle::boolean().
 toggleTool(#wx_ref{type=ThisT,ref=ThisRef},Toolid,Toggle)
  when is_integer(Toolid),is_boolean(Toggle) ->
   ?CLASS(ThisT,wxToolBar),
diff --git a/lib/wx/src/gen/wxToolTip.erl b/lib/wx/src/gen/wxToolTip.erl
index b0749c851a..c604fc4af9 100644
--- a/lib/wx/src/gen/wxToolTip.erl
+++ b/lib/wx/src/gen/wxToolTip.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -29,33 +29,39 @@
 %% inherited exports
 -export([parent_class/1]).
 
+-export_type([wxToolTip/0]).
 %% @hidden
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (Flag::bool()) -> ok
+-type wxToolTip() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtooltip.html#wxtooltipenable">external documentation</a>.
+-spec enable(Flag) -> ok when
+	Flag::boolean().
 enable(Flag)
  when is_boolean(Flag) ->
   wxe_util:cast(?wxToolTip_Enable,
   <<(wxe_util:from_bool(Flag)):32/?UI>>).
 
-%% @spec (Msecs::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtooltip.html#wxtooltipsetdelay">external documentation</a>.
+-spec setDelay(Msecs) -> ok when
+	Msecs::integer().
 setDelay(Msecs)
  when is_integer(Msecs) ->
   wxe_util:cast(?wxToolTip_SetDelay,
   <<Msecs:32/?UI>>).
 
-%% @spec (Tip::string()) -> wxToolTip()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtooltip.html#wxtooltipwxtooltip">external documentation</a>.
+-spec new(Tip) -> wxToolTip() when
+	Tip::string().
 new(Tip)
  when is_list(Tip) ->
   Tip_UC = unicode:characters_to_binary([Tip,0]),
   wxe_util:construct(?wxToolTip_new,
   <<(byte_size(Tip_UC)):32/?UI,(Tip_UC)/binary, 0:(((8- ((4+byte_size(Tip_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxToolTip(), Tip::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtooltip.html#wxtooltipsettip">external documentation</a>.
+-spec setTip(This, Tip) -> ok when
+	This::wxToolTip(), Tip::string().
 setTip(#wx_ref{type=ThisT,ref=ThisRef},Tip)
  when is_list(Tip) ->
   ?CLASS(ThisT,wxToolTip),
@@ -63,22 +69,24 @@ setTip(#wx_ref{type=ThisT,ref=ThisRef},Tip)
   wxe_util:cast(?wxToolTip_SetTip,
   <<ThisRef:32/?UI,(byte_size(Tip_UC)):32/?UI,(Tip_UC)/binary, 0:(((8- ((0+byte_size(Tip_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxToolTip()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtooltip.html#wxtooltipgettip">external documentation</a>.
+-spec getTip(This) -> string() when
+	This::wxToolTip().
 getTip(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxToolTip),
   wxe_util:call(?wxToolTip_GetTip,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxToolTip()) -> wxWindow:wxWindow()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtooltip.html#wxtooltipgetwindow">external documentation</a>.
+-spec getWindow(This) -> wxWindow:wxWindow() when
+	This::wxToolTip().
 getWindow(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxToolTip),
   wxe_util:call(?wxToolTip_GetWindow,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxToolTip()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxToolTip) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxToolTip),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxToolbook.erl b/lib/wx/src/gen/wxToolbook.erl
index 764f66c2e5..f568a11d6a 100644
--- a/lib/wx/src/gen/wxToolbook.erl
+++ b/lib/wx/src/gen/wxToolbook.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2012. 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
@@ -74,27 +74,34 @@
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
 
+-export_type([wxToolbook/0]).
 %% @hidden
 parent_class(wxControl) -> true;
 parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxToolbook()
+-type wxToolbook() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbook.html#wxtoolbookwxtoolbook">external documentation</a>.
+-spec new() -> wxToolbook().
 new() ->
   wxe_util:construct(?wxToolbook_new_0,
   <<>>).
 
-%% @spec (Parent::wxWindow:wxWindow(), Id::integer()) -> wxToolbook()
 %% @equiv new(Parent,Id, [])
+-spec new(Parent, Id) -> wxToolbook() when
+	Parent::wxWindow:wxWindow(), Id::integer().
+
 new(Parent,Id)
  when is_record(Parent, wx_ref),is_integer(Id) ->
   new(Parent,Id, []).
 
-%% @spec (Parent::wxWindow:wxWindow(), Id::integer(), [Option]) -> wxToolbook()
-%% Option = {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbook.html#wxtoolbookwxtoolbook">external documentation</a>.
+-spec new(Parent, Id, [Option]) -> wxToolbook() when
+	Parent::wxWindow:wxWindow(), Id::integer(),
+	Option :: {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}.
 new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
  when is_integer(Id),is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -106,15 +113,19 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
   wxe_util:construct(?wxToolbook_new_3,
   <<ParentRef:32/?UI,Id:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxToolbook(), Page::wxWindow:wxWindow(), Text::string()) -> bool()
 %% @equiv addPage(This,Page,Text, [])
+-spec addPage(This, Page, Text) -> boolean() when
+	This::wxToolbook(), Page::wxWindow:wxWindow(), Text::string().
+
 addPage(This,Page,Text)
  when is_record(This, wx_ref),is_record(Page, wx_ref),is_list(Text) ->
   addPage(This,Page,Text, []).
 
-%% @spec (This::wxToolbook(), Page::wxWindow:wxWindow(), Text::string(), [Option]) -> bool()
-%% Option = {bSelect, bool()} | {imageId, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbook.html#wxtoolbookaddpage">external documentation</a>.
+-spec addPage(This, Page, Text, [Option]) -> boolean() when
+	This::wxToolbook(), Page::wxWindow:wxWindow(), Text::string(),
+	Option :: {bSelect, boolean()}
+		 | {imageId, integer()}.
 addPage(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PageT,ref=PageRef},Text, Options)
  when is_list(Text),is_list(Options) ->
   ?CLASS(ThisT,wxToolbook),
@@ -127,15 +138,18 @@ addPage(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PageT,ref=PageRef},Text, Op
   wxe_util:call(?wxToolbook_AddPage,
   <<ThisRef:32/?UI,PageRef:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((4+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxToolbook()) -> ok
 %% @equiv advanceSelection(This, [])
+-spec advanceSelection(This) -> ok when
+	This::wxToolbook().
+
 advanceSelection(This)
  when is_record(This, wx_ref) ->
   advanceSelection(This, []).
 
-%% @spec (This::wxToolbook(), [Option]) -> ok
-%% Option = {forward, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbook.html#wxtoolbookadvanceselection">external documentation</a>.
+-spec advanceSelection(This, [Option]) -> ok when
+	This::wxToolbook(),
+	Option :: {forward, boolean()}.
 advanceSelection(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxToolbook),
@@ -145,23 +159,29 @@ advanceSelection(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxToolbook_AdvanceSelection,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxToolbook(), ImageList::wxImageList:wxImageList()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbook.html#wxtoolbookassignimagelist">external documentation</a>.
+-spec assignImageList(This, ImageList) -> ok when
+	This::wxToolbook(), ImageList::wxImageList:wxImageList().
 assignImageList(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ImageListT,ref=ImageListRef}) ->
   ?CLASS(ThisT,wxToolbook),
   ?CLASS(ImageListT,wxImageList),
   wxe_util:cast(?wxToolbook_AssignImageList,
   <<ThisRef:32/?UI,ImageListRef:32/?UI>>).
 
-%% @spec (This::wxToolbook(), Parent::wxWindow:wxWindow(), Id::integer()) -> bool()
 %% @equiv create(This,Parent,Id, [])
+-spec create(This, Parent, Id) -> boolean() when
+	This::wxToolbook(), Parent::wxWindow:wxWindow(), Id::integer().
+
 create(This,Parent,Id)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id) ->
   create(This,Parent,Id, []).
 
-%% @spec (This::wxToolbook(), Parent::wxWindow:wxWindow(), Id::integer(), [Option]) -> bool()
-%% Option = {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbook.html#wxtoolbookcreate">external documentation</a>.
+-spec create(This, Parent, Id, [Option]) -> boolean() when
+	This::wxToolbook(), Parent::wxWindow:wxWindow(), Id::integer(),
+	Option :: {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}.
 create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
  when is_integer(Id),is_list(Options) ->
   ?CLASS(ThisT,wxToolbook),
@@ -174,98 +194,114 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id, O
   wxe_util:call(?wxToolbook_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI,Id:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxToolbook()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbook.html#wxtoolbookdeleteallpages">external documentation</a>.
+-spec deleteAllPages(This) -> boolean() when
+	This::wxToolbook().
 deleteAllPages(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxToolbook),
   wxe_util:call(?wxToolbook_DeleteAllPages,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxToolbook(), N::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbook.html#wxtoolbookdeletepage">external documentation</a>.
+-spec deletePage(This, N) -> boolean() when
+	This::wxToolbook(), N::integer().
 deletePage(#wx_ref{type=ThisT,ref=ThisRef},N)
  when is_integer(N) ->
   ?CLASS(ThisT,wxToolbook),
   wxe_util:call(?wxToolbook_DeletePage,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @spec (This::wxToolbook(), N::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbook.html#wxtoolbookremovepage">external documentation</a>.
+-spec removePage(This, N) -> boolean() when
+	This::wxToolbook(), N::integer().
 removePage(#wx_ref{type=ThisT,ref=ThisRef},N)
  when is_integer(N) ->
   ?CLASS(ThisT,wxToolbook),
   wxe_util:call(?wxToolbook_RemovePage,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @spec (This::wxToolbook()) -> wxWindow:wxWindow()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbook.html#wxtoolbookgetcurrentpage">external documentation</a>.
+-spec getCurrentPage(This) -> wxWindow:wxWindow() when
+	This::wxToolbook().
 getCurrentPage(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxToolbook),
   wxe_util:call(?wxToolbook_GetCurrentPage,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxToolbook()) -> wxImageList:wxImageList()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbook.html#wxtoolbookgetimagelist">external documentation</a>.
+-spec getImageList(This) -> wxImageList:wxImageList() when
+	This::wxToolbook().
 getImageList(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxToolbook),
   wxe_util:call(?wxToolbook_GetImageList,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxToolbook(), N::integer()) -> wxWindow:wxWindow()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbook.html#wxtoolbookgetpage">external documentation</a>.
+-spec getPage(This, N) -> wxWindow:wxWindow() when
+	This::wxToolbook(), N::integer().
 getPage(#wx_ref{type=ThisT,ref=ThisRef},N)
  when is_integer(N) ->
   ?CLASS(ThisT,wxToolbook),
   wxe_util:call(?wxToolbook_GetPage,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @spec (This::wxToolbook()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbook.html#wxtoolbookgetpagecount">external documentation</a>.
+-spec getPageCount(This) -> integer() when
+	This::wxToolbook().
 getPageCount(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxToolbook),
   wxe_util:call(?wxToolbook_GetPageCount,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxToolbook(), N::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbook.html#wxtoolbookgetpageimage">external documentation</a>.
+-spec getPageImage(This, N) -> integer() when
+	This::wxToolbook(), N::integer().
 getPageImage(#wx_ref{type=ThisT,ref=ThisRef},N)
  when is_integer(N) ->
   ?CLASS(ThisT,wxToolbook),
   wxe_util:call(?wxToolbook_GetPageImage,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @spec (This::wxToolbook(), N::integer()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbook.html#wxtoolbookgetpagetext">external documentation</a>.
+-spec getPageText(This, N) -> string() when
+	This::wxToolbook(), N::integer().
 getPageText(#wx_ref{type=ThisT,ref=ThisRef},N)
  when is_integer(N) ->
   ?CLASS(ThisT,wxToolbook),
   wxe_util:call(?wxToolbook_GetPageText,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @spec (This::wxToolbook()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbook.html#wxtoolbookgetselection">external documentation</a>.
+-spec getSelection(This) -> integer() when
+	This::wxToolbook().
 getSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxToolbook),
   wxe_util:call(?wxToolbook_GetSelection,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxToolbook(), Pt::{X::integer(), Y::integer()}) -> {integer(), Flags::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbook.html#wxtoolbookhittest">external documentation</a>.
+-spec hitTest(This, Pt) -> Result when
+	Result ::{Res ::integer(), Flags::integer()},
+	This::wxToolbook(), Pt::{X::integer(), Y::integer()}.
 hitTest(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY})
  when is_integer(PtX),is_integer(PtY) ->
   ?CLASS(ThisT,wxToolbook),
   wxe_util:call(?wxToolbook_HitTest,
   <<ThisRef:32/?UI,PtX:32/?UI,PtY:32/?UI>>).
 
-%% @spec (This::wxToolbook(), N::integer(), Page::wxWindow:wxWindow(), Text::string()) -> bool()
 %% @equiv insertPage(This,N,Page,Text, [])
+-spec insertPage(This, N, Page, Text) -> boolean() when
+	This::wxToolbook(), N::integer(), Page::wxWindow:wxWindow(), Text::string().
+
 insertPage(This,N,Page,Text)
  when is_record(This, wx_ref),is_integer(N),is_record(Page, wx_ref),is_list(Text) ->
   insertPage(This,N,Page,Text, []).
 
-%% @spec (This::wxToolbook(), N::integer(), Page::wxWindow:wxWindow(), Text::string(), [Option]) -> bool()
-%% Option = {bSelect, bool()} | {imageId, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbook.html#wxtoolbookinsertpage">external documentation</a>.
+-spec insertPage(This, N, Page, Text, [Option]) -> boolean() when
+	This::wxToolbook(), N::integer(), Page::wxWindow:wxWindow(), Text::string(),
+	Option :: {bSelect, boolean()}
+		 | {imageId, integer()}.
 insertPage(#wx_ref{type=ThisT,ref=ThisRef},N,#wx_ref{type=PageT,ref=PageRef},Text, Options)
  when is_integer(N),is_list(Text),is_list(Options) ->
   ?CLASS(ThisT,wxToolbook),
@@ -278,32 +314,36 @@ insertPage(#wx_ref{type=ThisT,ref=ThisRef},N,#wx_ref{type=PageT,ref=PageRef},Tex
   wxe_util:call(?wxToolbook_InsertPage,
   <<ThisRef:32/?UI,N:32/?UI,PageRef:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxToolbook(), ImageList::wxImageList:wxImageList()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbook.html#wxtoolbooksetimagelist">external documentation</a>.
+-spec setImageList(This, ImageList) -> ok when
+	This::wxToolbook(), ImageList::wxImageList:wxImageList().
 setImageList(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ImageListT,ref=ImageListRef}) ->
   ?CLASS(ThisT,wxToolbook),
   ?CLASS(ImageListT,wxImageList),
   wxe_util:cast(?wxToolbook_SetImageList,
   <<ThisRef:32/?UI,ImageListRef:32/?UI>>).
 
-%% @spec (This::wxToolbook(), Size::{W::integer(), H::integer()}) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbook.html#wxtoolbooksetpagesize">external documentation</a>.
+-spec setPageSize(This, Size) -> ok when
+	This::wxToolbook(), Size::{W::integer(), H::integer()}.
 setPageSize(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH})
  when is_integer(SizeW),is_integer(SizeH) ->
   ?CLASS(ThisT,wxToolbook),
   wxe_util:cast(?wxToolbook_SetPageSize,
   <<ThisRef:32/?UI,SizeW:32/?UI,SizeH:32/?UI>>).
 
-%% @spec (This::wxToolbook(), N::integer(), ImageId::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbook.html#wxtoolbooksetpageimage">external documentation</a>.
+-spec setPageImage(This, N, ImageId) -> boolean() when
+	This::wxToolbook(), N::integer(), ImageId::integer().
 setPageImage(#wx_ref{type=ThisT,ref=ThisRef},N,ImageId)
  when is_integer(N),is_integer(ImageId) ->
   ?CLASS(ThisT,wxToolbook),
   wxe_util:call(?wxToolbook_SetPageImage,
   <<ThisRef:32/?UI,N:32/?UI,ImageId:32/?UI>>).
 
-%% @spec (This::wxToolbook(), N::integer(), StrText::string()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbook.html#wxtoolbooksetpagetext">external documentation</a>.
+-spec setPageText(This, N, StrText) -> boolean() when
+	This::wxToolbook(), N::integer(), StrText::string().
 setPageText(#wx_ref{type=ThisT,ref=ThisRef},N,StrText)
  when is_integer(N),is_list(StrText) ->
   ?CLASS(ThisT,wxToolbook),
@@ -311,24 +351,26 @@ setPageText(#wx_ref{type=ThisT,ref=ThisRef},N,StrText)
   wxe_util:call(?wxToolbook_SetPageText,
   <<ThisRef:32/?UI,N:32/?UI,(byte_size(StrText_UC)):32/?UI,(StrText_UC)/binary, 0:(((8- ((4+byte_size(StrText_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxToolbook(), N::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbook.html#wxtoolbooksetselection">external documentation</a>.
+-spec setSelection(This, N) -> integer() when
+	This::wxToolbook(), N::integer().
 setSelection(#wx_ref{type=ThisT,ref=ThisRef},N)
  when is_integer(N) ->
   ?CLASS(ThisT,wxToolbook),
   wxe_util:call(?wxToolbook_SetSelection,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @spec (This::wxToolbook(), N::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbook.html#wxtoolbookchangeselection">external documentation</a>.
+-spec changeSelection(This, N) -> integer() when
+	This::wxToolbook(), N::integer().
 changeSelection(#wx_ref{type=ThisT,ref=ThisRef},N)
  when is_integer(N) ->
   ?CLASS(ThisT,wxToolbook),
   wxe_util:call(?wxToolbook_ChangeSelection,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @spec (This::wxToolbook()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxToolbook) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxToolbook),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxTopLevelWindow.erl b/lib/wx/src/gen/wxTopLevelWindow.erl
index e0551b480f..b315429bb6 100644
--- a/lib/wx/src/gen/wxTopLevelWindow.erl
+++ b/lib/wx/src/gen/wxTopLevelWindow.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -72,48 +72,57 @@
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
 
+-export_type([wxTopLevelWindow/0]).
 %% @hidden
 parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (This::wxTopLevelWindow()) -> wxIcon:wxIcon()
+-type wxTopLevelWindow() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoplevelwindow.html#wxtoplevelwindowgeticon">external documentation</a>.
+-spec getIcon(This) -> wxIcon:wxIcon() when
+	This::wxTopLevelWindow().
 getIcon(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTopLevelWindow),
   wxe_util:call(?wxTopLevelWindow_GetIcon,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTopLevelWindow()) -> wxIconBundle:wxIconBundle()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoplevelwindow.html#wxtoplevelwindowgeticons">external documentation</a>.
+-spec getIcons(This) -> wxIconBundle:wxIconBundle() when
+	This::wxTopLevelWindow().
 getIcons(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTopLevelWindow),
   wxe_util:call(?wxTopLevelWindow_GetIcons,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTopLevelWindow()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoplevelwindow.html#wxtoplevelwindowgettitle">external documentation</a>.
+-spec getTitle(This) -> string() when
+	This::wxTopLevelWindow().
 getTitle(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTopLevelWindow),
   wxe_util:call(?wxTopLevelWindow_GetTitle,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTopLevelWindow()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoplevelwindow.html#wxtoplevelwindowisactive">external documentation</a>.
+-spec isActive(This) -> boolean() when
+	This::wxTopLevelWindow().
 isActive(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTopLevelWindow),
   wxe_util:call(?wxTopLevelWindow_IsActive,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTopLevelWindow()) -> ok
 %% @equiv iconize(This, [])
+-spec iconize(This) -> ok when
+	This::wxTopLevelWindow().
+
 iconize(This)
  when is_record(This, wx_ref) ->
   iconize(This, []).
 
-%% @spec (This::wxTopLevelWindow(), [Option]) -> ok
-%% Option = {iconize, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoplevelwindow.html#wxtoplevelwindowiconize">external documentation</a>.
+-spec iconize(This, [Option]) -> ok when
+	This::wxTopLevelWindow(),
+	Option :: {iconize, boolean()}.
 iconize(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxTopLevelWindow),
@@ -123,36 +132,42 @@ iconize(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxTopLevelWindow_Iconize,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxTopLevelWindow()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoplevelwindow.html#wxtoplevelwindowisfullscreen">external documentation</a>.
+-spec isFullScreen(This) -> boolean() when
+	This::wxTopLevelWindow().
 isFullScreen(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTopLevelWindow),
   wxe_util:call(?wxTopLevelWindow_IsFullScreen,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTopLevelWindow()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoplevelwindow.html#wxtoplevelwindowisiconized">external documentation</a>.
+-spec isIconized(This) -> boolean() when
+	This::wxTopLevelWindow().
 isIconized(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTopLevelWindow),
   wxe_util:call(?wxTopLevelWindow_IsIconized,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTopLevelWindow()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoplevelwindow.html#wxtoplevelwindowismaximized">external documentation</a>.
+-spec isMaximized(This) -> boolean() when
+	This::wxTopLevelWindow().
 isMaximized(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTopLevelWindow),
   wxe_util:call(?wxTopLevelWindow_IsMaximized,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTopLevelWindow()) -> ok
 %% @equiv maximize(This, [])
+-spec maximize(This) -> ok when
+	This::wxTopLevelWindow().
+
 maximize(This)
  when is_record(This, wx_ref) ->
   maximize(This, []).
 
-%% @spec (This::wxTopLevelWindow(), [Option]) -> ok
-%% Option = {maximize, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoplevelwindow.html#wxtoplevelwindowmaximize">external documentation</a>.
+-spec maximize(This, [Option]) -> ok when
+	This::wxTopLevelWindow(),
+	Option :: {maximize, boolean()}.
 maximize(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxTopLevelWindow),
@@ -162,15 +177,18 @@ maximize(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxTopLevelWindow_Maximize,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxTopLevelWindow()) -> ok
 %% @equiv requestUserAttention(This, [])
+-spec requestUserAttention(This) -> ok when
+	This::wxTopLevelWindow().
+
 requestUserAttention(This)
  when is_record(This, wx_ref) ->
   requestUserAttention(This, []).
 
-%% @spec (This::wxTopLevelWindow(), [Option]) -> ok
-%% Option = {flags, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoplevelwindow.html#wxtoplevelwindowrequestuserattention">external documentation</a>.
+-spec requestUserAttention(This, [Option]) -> ok when
+	This::wxTopLevelWindow(),
+	Option :: {flags, integer()}.
 requestUserAttention(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxTopLevelWindow),
@@ -180,31 +198,36 @@ requestUserAttention(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxTopLevelWindow_RequestUserAttention,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxTopLevelWindow(), Icon::wxIcon:wxIcon()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoplevelwindow.html#wxtoplevelwindowseticon">external documentation</a>.
+-spec setIcon(This, Icon) -> ok when
+	This::wxTopLevelWindow(), Icon::wxIcon:wxIcon().
 setIcon(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=IconT,ref=IconRef}) ->
   ?CLASS(ThisT,wxTopLevelWindow),
   ?CLASS(IconT,wxIcon),
   wxe_util:cast(?wxTopLevelWindow_SetIcon,
   <<ThisRef:32/?UI,IconRef:32/?UI>>).
 
-%% @spec (This::wxTopLevelWindow(), Icons::wxIconBundle:wxIconBundle()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoplevelwindow.html#wxtoplevelwindowseticons">external documentation</a>.
+-spec setIcons(This, Icons) -> ok when
+	This::wxTopLevelWindow(), Icons::wxIconBundle:wxIconBundle().
 setIcons(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=IconsT,ref=IconsRef}) ->
   ?CLASS(ThisT,wxTopLevelWindow),
   ?CLASS(IconsT,wxIconBundle),
   wxe_util:cast(?wxTopLevelWindow_SetIcons,
   <<ThisRef:32/?UI,IconsRef:32/?UI>>).
 
-%% @spec (This::wxTopLevelWindow()) -> ok
 %% @equiv centerOnScreen(This, [])
+-spec centerOnScreen(This) -> ok when
+	This::wxTopLevelWindow().
+
 centerOnScreen(This)
  when is_record(This, wx_ref) ->
   centerOnScreen(This, []).
 
-%% @spec (This::wxTopLevelWindow(), [Option]) -> ok
-%% Option = {dir, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoplevelwindow.html#wxtoplevelwindowcenteronscreen">external documentation</a>.
+-spec centerOnScreen(This, [Option]) -> ok when
+	This::wxTopLevelWindow(),
+	Option :: {dir, integer()}.
 centerOnScreen(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxTopLevelWindow),
@@ -214,15 +237,18 @@ centerOnScreen(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxTopLevelWindow_CenterOnScreen,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxTopLevelWindow()) -> ok
 %% @equiv centreOnScreen(This, [])
+-spec centreOnScreen(This) -> ok when
+	This::wxTopLevelWindow().
+
 centreOnScreen(This)
  when is_record(This, wx_ref) ->
   centreOnScreen(This, []).
 
-%% @spec (This::wxTopLevelWindow(), [Option]) -> ok
-%% Option = {dir, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoplevelwindow.html#wxtoplevelwindowcentreonscreen">external documentation</a>.
+-spec centreOnScreen(This, [Option]) -> ok when
+	This::wxTopLevelWindow(),
+	Option :: {dir, integer()}.
 centreOnScreen(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxTopLevelWindow),
@@ -232,16 +258,18 @@ centreOnScreen(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxTopLevelWindow_CentreOnScreen,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxTopLevelWindow(), Region::wxRegion:wxRegion()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoplevelwindow.html#wxtoplevelwindowsetshape">external documentation</a>.
+-spec setShape(This, Region) -> boolean() when
+	This::wxTopLevelWindow(), Region::wxRegion:wxRegion().
 setShape(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=RegionT,ref=RegionRef}) ->
   ?CLASS(ThisT,wxTopLevelWindow),
   ?CLASS(RegionT,wxRegion),
   wxe_util:call(?wxTopLevelWindow_SetShape,
   <<ThisRef:32/?UI,RegionRef:32/?UI>>).
 
-%% @spec (This::wxTopLevelWindow(), Title::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoplevelwindow.html#wxtoplevelwindowsettitle">external documentation</a>.
+-spec setTitle(This, Title) -> ok when
+	This::wxTopLevelWindow(), Title::string().
 setTitle(#wx_ref{type=ThisT,ref=ThisRef},Title)
  when is_list(Title) ->
   ?CLASS(ThisT,wxTopLevelWindow),
@@ -249,15 +277,18 @@ setTitle(#wx_ref{type=ThisT,ref=ThisRef},Title)
   wxe_util:cast(?wxTopLevelWindow_SetTitle,
   <<ThisRef: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>>).
 
-%% @spec (This::wxTopLevelWindow(), Show::bool()) -> bool()
 %% @equiv showFullScreen(This,Show, [])
+-spec showFullScreen(This, Show) -> boolean() when
+	This::wxTopLevelWindow(), Show::boolean().
+
 showFullScreen(This,Show)
  when is_record(This, wx_ref),is_boolean(Show) ->
   showFullScreen(This,Show, []).
 
-%% @spec (This::wxTopLevelWindow(), Show::bool(), [Option]) -> bool()
-%% Option = {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoplevelwindow.html#wxtoplevelwindowshowfullscreen">external documentation</a>.
+-spec showFullScreen(This, Show, [Option]) -> boolean() when
+	This::wxTopLevelWindow(), Show::boolean(),
+	Option :: {style, integer()}.
 showFullScreen(#wx_ref{type=ThisT,ref=ThisRef},Show, Options)
  when is_boolean(Show),is_list(Options) ->
   ?CLASS(ThisT,wxTopLevelWindow),
diff --git a/lib/wx/src/gen/wxTreeCtrl.erl b/lib/wx/src/gen/wxTreeCtrl.erl
index 77705ec76e..ba9052b5f3 100644
--- a/lib/wx/src/gen/wxTreeCtrl.erl
+++ b/lib/wx/src/gen/wxTreeCtrl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -89,27 +89,36 @@
   show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,update/1,
   updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
 
+-export_type([wxTreeCtrl/0]).
 %% @hidden
 parent_class(wxControl) -> true;
 parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxTreeCtrl()
+-type wxTreeCtrl() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlwxtreectrl">external documentation</a>.
+-spec new() -> wxTreeCtrl().
 new() ->
   wxe_util:construct(?wxTreeCtrl_new_0,
   <<>>).
 
-%% @spec (Parent::wxWindow:wxWindow()) -> wxTreeCtrl()
 %% @equiv new(Parent, [])
+-spec new(Parent) -> wxTreeCtrl() when
+	Parent::wxWindow:wxWindow().
+
 new(Parent)
  when is_record(Parent, wx_ref) ->
   new(Parent, []).
 
-%% @spec (Parent::wxWindow:wxWindow(), [Option]) -> wxTreeCtrl()
-%% Option = {id, integer()} | {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()} | {validator, wx:wx()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlwxtreectrl">external documentation</a>.
+-spec new(Parent, [Option]) -> wxTreeCtrl() when
+	Parent::wxWindow:wxWindow(),
+	Option :: {id, integer()}
+		 | {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}
+		 | {validator, wx:wx()}.
 new(#wx_ref{type=ParentT,ref=ParentRef}, Options)
  when is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -123,15 +132,20 @@ new(#wx_ref{type=ParentT,ref=ParentRef}, Options)
   wxe_util:construct(?wxTreeCtrl_new_2,
   <<ParentRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxTreeCtrl(), Text::string()) -> integer()
 %% @equiv addRoot(This,Text, [])
+-spec addRoot(This, Text) -> integer() when
+	This::wxTreeCtrl(), Text::string().
+
 addRoot(This,Text)
  when is_record(This, wx_ref),is_list(Text) ->
   addRoot(This,Text, []).
 
-%% @spec (This::wxTreeCtrl(), Text::string(), [Option]) -> integer()
-%% Option = {image, integer()} | {selectedImage, integer()} | {data, term()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrladdroot">external documentation</a>.
+-spec addRoot(This, Text, [Option]) -> integer() when
+	This::wxTreeCtrl(), Text::string(),
+	Option :: {image, integer()}
+		 | {selectedImage, integer()}
+		 | {data, term()}.
 addRoot(#wx_ref{type=ThisT,ref=ThisRef},Text, Options)
  when is_list(Text),is_list(Options) ->
   ?CLASS(ThisT,wxTreeCtrl),
@@ -144,15 +158,20 @@ addRoot(#wx_ref{type=ThisT,ref=ThisRef},Text, Options)
   wxe_util:call(?wxTreeCtrl_AddRoot,
   <<ThisRef:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxTreeCtrl(), Parent::integer(), Text::string()) -> integer()
 %% @equiv appendItem(This,Parent,Text, [])
+-spec appendItem(This, Parent, Text) -> integer() when
+	This::wxTreeCtrl(), Parent::integer(), Text::string().
+
 appendItem(This,Parent,Text)
  when is_record(This, wx_ref),is_integer(Parent),is_list(Text) ->
   appendItem(This,Parent,Text, []).
 
-%% @spec (This::wxTreeCtrl(), Parent::integer(), Text::string(), [Option]) -> integer()
-%% Option = {image, integer()} | {selectedImage, integer()} | {data, term()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlappenditem">external documentation</a>.
+-spec appendItem(This, Parent, Text, [Option]) -> integer() when
+	This::wxTreeCtrl(), Parent::integer(), Text::string(),
+	Option :: {image, integer()}
+		 | {selectedImage, integer()}
+		 | {data, term()}.
 appendItem(#wx_ref{type=ThisT,ref=ThisRef},Parent,Text, Options)
  when is_integer(Parent),is_list(Text),is_list(Options) ->
   ?CLASS(ThisT,wxTreeCtrl),
@@ -165,47 +184,58 @@ appendItem(#wx_ref{type=ThisT,ref=ThisRef},Parent,Text, Options)
   wxe_util:call(?wxTreeCtrl_AppendItem,
   <<ThisRef:32/?UI,0:32,Parent:64/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((4+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxTreeCtrl(), ImageList::wxImageList:wxImageList()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlassignimagelist">external documentation</a>.
+-spec assignImageList(This, ImageList) -> ok when
+	This::wxTreeCtrl(), ImageList::wxImageList:wxImageList().
 assignImageList(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ImageListT,ref=ImageListRef}) ->
   ?CLASS(ThisT,wxTreeCtrl),
   ?CLASS(ImageListT,wxImageList),
   wxe_util:cast(?wxTreeCtrl_AssignImageList,
   <<ThisRef:32/?UI,ImageListRef:32/?UI>>).
 
-%% @spec (This::wxTreeCtrl(), ImageList::wxImageList:wxImageList()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlassignstateimagelist">external documentation</a>.
+-spec assignStateImageList(This, ImageList) -> ok when
+	This::wxTreeCtrl(), ImageList::wxImageList:wxImageList().
 assignStateImageList(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ImageListT,ref=ImageListRef}) ->
   ?CLASS(ThisT,wxTreeCtrl),
   ?CLASS(ImageListT,wxImageList),
   wxe_util:cast(?wxTreeCtrl_AssignStateImageList,
   <<ThisRef:32/?UI,ImageListRef:32/?UI>>).
 
-%% @spec (This::wxTreeCtrl(), Item::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlcollapse">external documentation</a>.
+-spec collapse(This, Item) -> ok when
+	This::wxTreeCtrl(), Item::integer().
 collapse(#wx_ref{type=ThisT,ref=ThisRef},Item)
  when is_integer(Item) ->
   ?CLASS(ThisT,wxTreeCtrl),
   wxe_util:cast(?wxTreeCtrl_Collapse,
   <<ThisRef:32/?UI,0:32,Item:64/?UI>>).
 
-%% @spec (This::wxTreeCtrl(), Item::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlcollapseandreset">external documentation</a>.
+-spec collapseAndReset(This, Item) -> ok when
+	This::wxTreeCtrl(), Item::integer().
 collapseAndReset(#wx_ref{type=ThisT,ref=ThisRef},Item)
  when is_integer(Item) ->
   ?CLASS(ThisT,wxTreeCtrl),
   wxe_util:cast(?wxTreeCtrl_CollapseAndReset,
   <<ThisRef:32/?UI,0:32,Item:64/?UI>>).
 
-%% @spec (This::wxTreeCtrl(), Parent::wxWindow:wxWindow()) -> bool()
 %% @equiv create(This,Parent, [])
+-spec create(This, Parent) -> boolean() when
+	This::wxTreeCtrl(), Parent::wxWindow:wxWindow().
+
 create(This,Parent)
  when is_record(This, wx_ref),is_record(Parent, wx_ref) ->
   create(This,Parent, []).
 
-%% @spec (This::wxTreeCtrl(), Parent::wxWindow:wxWindow(), [Option]) -> bool()
-%% Option = {id, integer()} | {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()} | {validator, wx:wx()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlcreate">external documentation</a>.
+-spec create(This, Parent, [Option]) -> boolean() when
+	This::wxTreeCtrl(), Parent::wxWindow:wxWindow(),
+	Option :: {id, integer()}
+		 | {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}
+		 | {validator, wx:wx()}.
 create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxTreeCtrl),
@@ -220,62 +250,71 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef}, Opti
   wxe_util:call(?wxTreeCtrl_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxTreeCtrl(), Item::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrldelete">external documentation</a>.
+-spec delete(This, Item) -> ok when
+	This::wxTreeCtrl(), Item::integer().
 delete(#wx_ref{type=ThisT,ref=ThisRef},Item)
  when is_integer(Item) ->
   ?CLASS(ThisT,wxTreeCtrl),
   wxe_util:cast(?wxTreeCtrl_Delete,
   <<ThisRef:32/?UI,0:32,Item:64/?UI>>).
 
-%% @spec (This::wxTreeCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrldeleteallitems">external documentation</a>.
+-spec deleteAllItems(This) -> ok when
+	This::wxTreeCtrl().
 deleteAllItems(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTreeCtrl),
   wxe_util:cast(?wxTreeCtrl_DeleteAllItems,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTreeCtrl(), Item::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrldeletechildren">external documentation</a>.
+-spec deleteChildren(This, Item) -> ok when
+	This::wxTreeCtrl(), Item::integer().
 deleteChildren(#wx_ref{type=ThisT,ref=ThisRef},Item)
  when is_integer(Item) ->
   ?CLASS(ThisT,wxTreeCtrl),
   wxe_util:cast(?wxTreeCtrl_DeleteChildren,
   <<ThisRef:32/?UI,0:32,Item:64/?UI>>).
 
-%% @spec (This::wxTreeCtrl(), Item::integer()) -> wxTextCtrl:wxTextCtrl()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrleditlabel">external documentation</a>.
+-spec editLabel(This, Item) -> wxTextCtrl:wxTextCtrl() when
+	This::wxTreeCtrl(), Item::integer().
 editLabel(#wx_ref{type=ThisT,ref=ThisRef},Item)
  when is_integer(Item) ->
   ?CLASS(ThisT,wxTreeCtrl),
   wxe_util:call(?wxTreeCtrl_EditLabel,
   <<ThisRef:32/?UI,0:32,Item:64/?UI>>).
 
-%% @spec (This::wxTreeCtrl(), Item::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlensurevisible">external documentation</a>.
+-spec ensureVisible(This, Item) -> ok when
+	This::wxTreeCtrl(), Item::integer().
 ensureVisible(#wx_ref{type=ThisT,ref=ThisRef},Item)
  when is_integer(Item) ->
   ?CLASS(ThisT,wxTreeCtrl),
   wxe_util:cast(?wxTreeCtrl_EnsureVisible,
   <<ThisRef:32/?UI,0:32,Item:64/?UI>>).
 
-%% @spec (This::wxTreeCtrl(), Item::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlexpand">external documentation</a>.
+-spec expand(This, Item) -> ok when
+	This::wxTreeCtrl(), Item::integer().
 expand(#wx_ref{type=ThisT,ref=ThisRef},Item)
  when is_integer(Item) ->
   ?CLASS(ThisT,wxTreeCtrl),
   wxe_util:cast(?wxTreeCtrl_Expand,
   <<ThisRef:32/?UI,0:32,Item:64/?UI>>).
 
-%% @spec (This::wxTreeCtrl(), Item::integer(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}) -> bool()
 %% @equiv getBoundingRect(This,Item,Rect, [])
+-spec getBoundingRect(This, Item, Rect) -> boolean() when
+	This::wxTreeCtrl(), Item::integer(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}.
+
 getBoundingRect(This,Item,Rect={RectX,RectY,RectW,RectH})
  when is_record(This, wx_ref),is_integer(Item),is_integer(RectX),is_integer(RectY),is_integer(RectW),is_integer(RectH) ->
   getBoundingRect(This,Item,Rect, []).
 
-%% @spec (This::wxTreeCtrl(), Item::integer(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}, [Option]) -> bool()
-%% Option = {textOnly, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlgetboundingrect">external documentation</a>.
+-spec getBoundingRect(This, Item, Rect, [Option]) -> boolean() when
+	This::wxTreeCtrl(), Item::integer(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()},
+	Option :: {textOnly, boolean()}.
 getBoundingRect(#wx_ref{type=ThisT,ref=ThisRef},Item,{RectX,RectY,RectW,RectH}, Options)
  when is_integer(Item),is_integer(RectX),is_integer(RectY),is_integer(RectW),is_integer(RectH),is_list(Options) ->
   ?CLASS(ThisT,wxTreeCtrl),
@@ -285,15 +324,18 @@ getBoundingRect(#wx_ref{type=ThisT,ref=ThisRef},Item,{RectX,RectY,RectW,RectH},
   wxe_util:call(?wxTreeCtrl_GetBoundingRect,
   <<ThisRef:32/?UI,0:32,Item:64/?UI,RectX:32/?UI,RectY:32/?UI,RectW:32/?UI,RectH:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxTreeCtrl(), Item::integer()) -> integer()
 %% @equiv getChildrenCount(This,Item, [])
+-spec getChildrenCount(This, Item) -> integer() when
+	This::wxTreeCtrl(), Item::integer().
+
 getChildrenCount(This,Item)
  when is_record(This, wx_ref),is_integer(Item) ->
   getChildrenCount(This,Item, []).
 
-%% @spec (This::wxTreeCtrl(), Item::integer(), [Option]) -> integer()
-%% Option = {recursively, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlgetchildrencount">external documentation</a>.
+-spec getChildrenCount(This, Item, [Option]) -> integer() when
+	This::wxTreeCtrl(), Item::integer(),
+	Option :: {recursively, boolean()}.
 getChildrenCount(#wx_ref{type=ThisT,ref=ThisRef},Item, Options)
  when is_integer(Item),is_list(Options) ->
   ?CLASS(ThisT,wxTreeCtrl),
@@ -303,94 +345,107 @@ getChildrenCount(#wx_ref{type=ThisT,ref=ThisRef},Item, Options)
   wxe_util:call(?wxTreeCtrl_GetChildrenCount,
   <<ThisRef:32/?UI,0:32,Item:64/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxTreeCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlgetcount">external documentation</a>.
+-spec getCount(This) -> integer() when
+	This::wxTreeCtrl().
 getCount(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTreeCtrl),
   wxe_util:call(?wxTreeCtrl_GetCount,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTreeCtrl()) -> wxTextCtrl:wxTextCtrl()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlgeteditcontrol">external documentation</a>.
+-spec getEditControl(This) -> wxTextCtrl:wxTextCtrl() when
+	This::wxTreeCtrl().
 getEditControl(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTreeCtrl),
   wxe_util:call(?wxTreeCtrl_GetEditControl,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTreeCtrl(), Item::integer()) -> {integer(), Cookie::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlgetfirstchild">external documentation</a>.
+-spec getFirstChild(This, Item) -> Result when
+	Result ::{Res ::integer(), Cookie::integer()},
+	This::wxTreeCtrl(), Item::integer().
 getFirstChild(#wx_ref{type=ThisT,ref=ThisRef},Item)
  when is_integer(Item) ->
   ?CLASS(ThisT,wxTreeCtrl),
   wxe_util:call(?wxTreeCtrl_GetFirstChild,
   <<ThisRef:32/?UI,0:32,Item:64/?UI>>).
 
-%% @spec (This::wxTreeCtrl(), Item::integer(), Cookie::integer()) -> {integer(), Cookie::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlgetnextchild">external documentation</a>.
+-spec getNextChild(This, Item, Cookie) -> Result when
+	Result ::{Res ::integer(), Cookie::integer()},
+	This::wxTreeCtrl(), Item::integer(), Cookie::integer().
 getNextChild(#wx_ref{type=ThisT,ref=ThisRef},Item,Cookie)
  when is_integer(Item),is_integer(Cookie) ->
   ?CLASS(ThisT,wxTreeCtrl),
   wxe_util:call(?wxTreeCtrl_GetNextChild,
   <<ThisRef:32/?UI,0:32,Item:64/?UI,Cookie:64/?UI>>).
 
-%% @spec (This::wxTreeCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlgetfirstvisibleitem">external documentation</a>.
+-spec getFirstVisibleItem(This) -> integer() when
+	This::wxTreeCtrl().
 getFirstVisibleItem(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTreeCtrl),
   wxe_util:call(?wxTreeCtrl_GetFirstVisibleItem,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTreeCtrl()) -> wxImageList:wxImageList()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlgetimagelist">external documentation</a>.
+-spec getImageList(This) -> wxImageList:wxImageList() when
+	This::wxTreeCtrl().
 getImageList(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTreeCtrl),
   wxe_util:call(?wxTreeCtrl_GetImageList,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTreeCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlgetindent">external documentation</a>.
+-spec getIndent(This) -> integer() when
+	This::wxTreeCtrl().
 getIndent(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTreeCtrl),
   wxe_util:call(?wxTreeCtrl_GetIndent,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTreeCtrl(), Item::integer()) -> wx:colour()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlgetitembackgroundcolour">external documentation</a>.
+-spec getItemBackgroundColour(This, Item) -> wx:wx_colour() when
+	This::wxTreeCtrl(), Item::integer().
 getItemBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef},Item)
  when is_integer(Item) ->
   ?CLASS(ThisT,wxTreeCtrl),
   wxe_util:call(?wxTreeCtrl_GetItemBackgroundColour,
   <<ThisRef:32/?UI,0:32,Item:64/?UI>>).
 
-%% @spec (This::wxTreeCtrl(), Item::integer()) -> term()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlgetitemdata">external documentation</a>.
+-spec getItemData(This, Item) -> term() when
+	This::wxTreeCtrl(), Item::integer().
 getItemData(#wx_ref{type=ThisT,ref=ThisRef},Item)
  when is_integer(Item) ->
   ?CLASS(ThisT,wxTreeCtrl),
   wxe_util:call(?wxTreeCtrl_GetItemData,
   <<ThisRef:32/?UI,0:32,Item:64/?UI>>).
 
-%% @spec (This::wxTreeCtrl(), Item::integer()) -> wxFont:wxFont()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlgetitemfont">external documentation</a>.
+-spec getItemFont(This, Item) -> wxFont:wxFont() when
+	This::wxTreeCtrl(), Item::integer().
 getItemFont(#wx_ref{type=ThisT,ref=ThisRef},Item)
  when is_integer(Item) ->
   ?CLASS(ThisT,wxTreeCtrl),
   wxe_util:call(?wxTreeCtrl_GetItemFont,
   <<ThisRef:32/?UI,0:32,Item:64/?UI>>).
 
-%% @spec (This::wxTreeCtrl(), Item::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlgetitemimage">external documentation</a>.
+-spec getItemImage(This, Item) -> integer() when
+	This::wxTreeCtrl(), Item::integer().
 getItemImage(#wx_ref{type=ThisT,ref=ThisRef},Item)
  when is_integer(Item) ->
   ?CLASS(ThisT,wxTreeCtrl),
   wxe_util:call(?wxTreeCtrl_GetItemImage_1,
   <<ThisRef:32/?UI,0:32,Item:64/?UI>>).
 
-%% @spec (This::wxTreeCtrl(), Item::integer(), [Option]) -> integer()
-%% Option = {which, WxTreeItemIcon}
-%% WxTreeItemIcon = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlgetitemimage">external documentation</a>.
-%%<br /> WxTreeItemIcon is one of ?wxTreeItemIcon_Normal | ?wxTreeItemIcon_Selected | ?wxTreeItemIcon_Expanded | ?wxTreeItemIcon_SelectedExpanded | ?wxTreeItemIcon_Max
+%%<br /> Which = ?wxTreeItemIcon_Normal | ?wxTreeItemIcon_Selected | ?wxTreeItemIcon_Expanded | ?wxTreeItemIcon_SelectedExpanded | ?wxTreeItemIcon_Max
+-spec getItemImage(This, Item, [Option]) -> integer() when
+	This::wxTreeCtrl(), Item::integer(),
+	Option :: {which, wx:wx_enum()}.
 getItemImage(#wx_ref{type=ThisT,ref=ThisRef},Item, Options)
  when is_integer(Item),is_list(Options) ->
   ?CLASS(ThisT,wxTreeCtrl),
@@ -400,115 +455,134 @@ getItemImage(#wx_ref{type=ThisT,ref=ThisRef},Item, Options)
   wxe_util:call(?wxTreeCtrl_GetItemImage_2,
   <<ThisRef:32/?UI,0:32,Item:64/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxTreeCtrl(), Item::integer()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlgetitemtext">external documentation</a>.
+-spec getItemText(This, Item) -> string() when
+	This::wxTreeCtrl(), Item::integer().
 getItemText(#wx_ref{type=ThisT,ref=ThisRef},Item)
  when is_integer(Item) ->
   ?CLASS(ThisT,wxTreeCtrl),
   wxe_util:call(?wxTreeCtrl_GetItemText,
   <<ThisRef:32/?UI,0:32,Item:64/?UI>>).
 
-%% @spec (This::wxTreeCtrl(), Item::integer()) -> wx:colour()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlgetitemtextcolour">external documentation</a>.
+-spec getItemTextColour(This, Item) -> wx:wx_colour() when
+	This::wxTreeCtrl(), Item::integer().
 getItemTextColour(#wx_ref{type=ThisT,ref=ThisRef},Item)
  when is_integer(Item) ->
   ?CLASS(ThisT,wxTreeCtrl),
   wxe_util:call(?wxTreeCtrl_GetItemTextColour,
   <<ThisRef:32/?UI,0:32,Item:64/?UI>>).
 
-%% @spec (This::wxTreeCtrl(), Item::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlgetlastchild">external documentation</a>.
+-spec getLastChild(This, Item) -> integer() when
+	This::wxTreeCtrl(), Item::integer().
 getLastChild(#wx_ref{type=ThisT,ref=ThisRef},Item)
  when is_integer(Item) ->
   ?CLASS(ThisT,wxTreeCtrl),
   wxe_util:call(?wxTreeCtrl_GetLastChild,
   <<ThisRef:32/?UI,0:32,Item:64/?UI>>).
 
-%% @spec (This::wxTreeCtrl(), Item::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlgetnextsibling">external documentation</a>.
+-spec getNextSibling(This, Item) -> integer() when
+	This::wxTreeCtrl(), Item::integer().
 getNextSibling(#wx_ref{type=ThisT,ref=ThisRef},Item)
  when is_integer(Item) ->
   ?CLASS(ThisT,wxTreeCtrl),
   wxe_util:call(?wxTreeCtrl_GetNextSibling,
   <<ThisRef:32/?UI,0:32,Item:64/?UI>>).
 
-%% @spec (This::wxTreeCtrl(), Item::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlgetnextvisible">external documentation</a>.
+-spec getNextVisible(This, Item) -> integer() when
+	This::wxTreeCtrl(), Item::integer().
 getNextVisible(#wx_ref{type=ThisT,ref=ThisRef},Item)
  when is_integer(Item) ->
   ?CLASS(ThisT,wxTreeCtrl),
   wxe_util:call(?wxTreeCtrl_GetNextVisible,
   <<ThisRef:32/?UI,0:32,Item:64/?UI>>).
 
-%% @spec (This::wxTreeCtrl(), Item::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlgetitemparent">external documentation</a>.
+-spec getItemParent(This, Item) -> integer() when
+	This::wxTreeCtrl(), Item::integer().
 getItemParent(#wx_ref{type=ThisT,ref=ThisRef},Item)
  when is_integer(Item) ->
   ?CLASS(ThisT,wxTreeCtrl),
   wxe_util:call(?wxTreeCtrl_GetItemParent,
   <<ThisRef:32/?UI,0:32,Item:64/?UI>>).
 
-%% @spec (This::wxTreeCtrl(), Item::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlgetprevsibling">external documentation</a>.
+-spec getPrevSibling(This, Item) -> integer() when
+	This::wxTreeCtrl(), Item::integer().
 getPrevSibling(#wx_ref{type=ThisT,ref=ThisRef},Item)
  when is_integer(Item) ->
   ?CLASS(ThisT,wxTreeCtrl),
   wxe_util:call(?wxTreeCtrl_GetPrevSibling,
   <<ThisRef:32/?UI,0:32,Item:64/?UI>>).
 
-%% @spec (This::wxTreeCtrl(), Item::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlgetprevvisible">external documentation</a>.
+-spec getPrevVisible(This, Item) -> integer() when
+	This::wxTreeCtrl(), Item::integer().
 getPrevVisible(#wx_ref{type=ThisT,ref=ThisRef},Item)
  when is_integer(Item) ->
   ?CLASS(ThisT,wxTreeCtrl),
   wxe_util:call(?wxTreeCtrl_GetPrevVisible,
   <<ThisRef:32/?UI,0:32,Item:64/?UI>>).
 
-%% @spec (This::wxTreeCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlgetrootitem">external documentation</a>.
+-spec getRootItem(This) -> integer() when
+	This::wxTreeCtrl().
 getRootItem(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTreeCtrl),
   wxe_util:call(?wxTreeCtrl_GetRootItem,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTreeCtrl()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlgetselection">external documentation</a>.
+-spec getSelection(This) -> integer() when
+	This::wxTreeCtrl().
 getSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTreeCtrl),
   wxe_util:call(?wxTreeCtrl_GetSelection,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTreeCtrl()) -> {integer(), Val::[integer()]}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlgetselections">external documentation</a>.
+-spec getSelections(This) -> Result when
+	Result ::{Res ::integer(), Val::[integer()]},
+	This::wxTreeCtrl().
 getSelections(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTreeCtrl),
   wxe_util:call(?wxTreeCtrl_GetSelections,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTreeCtrl()) -> wxImageList:wxImageList()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlgetstateimagelist">external documentation</a>.
+-spec getStateImageList(This) -> wxImageList:wxImageList() when
+	This::wxTreeCtrl().
 getStateImageList(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTreeCtrl),
   wxe_util:call(?wxTreeCtrl_GetStateImageList,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTreeCtrl(), Point::{X::integer(), Y::integer()}) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlhittest">external documentation</a>.
+-spec hitTest(This, Point) -> integer() when
+	This::wxTreeCtrl(), Point::{X::integer(), Y::integer()}.
 hitTest(#wx_ref{type=ThisT,ref=ThisRef},{PointX,PointY})
  when is_integer(PointX),is_integer(PointY) ->
   ?CLASS(ThisT,wxTreeCtrl),
   wxe_util:call(?wxTreeCtrl_HitTest,
   <<ThisRef:32/?UI,PointX:32/?UI,PointY:32/?UI>>).
 
-%% @spec (This::wxTreeCtrl(), Parent::integer(), Pos::integer(), Text::string()) -> integer()
 %% @equiv insertItem(This,Parent,Pos,Text, [])
+-spec insertItem(This, Parent, Pos, Text) -> integer() when
+	This::wxTreeCtrl(), Parent::integer(), Pos::integer(), Text::string().
+
 insertItem(This,Parent,Pos,Text)
  when is_record(This, wx_ref),is_integer(Parent),is_integer(Pos),is_list(Text) ->
   insertItem(This,Parent,Pos,Text, []).
 
-%% @spec (This::wxTreeCtrl(), Parent::integer(), Pos::integer(), Text::string(), [Option]) -> integer()
-%% Option = {image, integer()} | {selImage, integer()} | {data, term()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlinsertitem">external documentation</a>.
+-spec insertItem(This, Parent, Pos, Text, [Option]) -> integer() when
+	This::wxTreeCtrl(), Parent::integer(), Pos::integer(), Text::string(),
+	Option :: {image, integer()}
+		 | {selImage, integer()}
+		 | {data, term()}.
 insertItem(#wx_ref{type=ThisT,ref=ThisRef},Parent,Pos,Text, Options)
  when is_integer(Parent),is_integer(Pos),is_list(Text),is_list(Options) ->
   ?CLASS(ThisT,wxTreeCtrl),
@@ -521,55 +595,65 @@ insertItem(#wx_ref{type=ThisT,ref=ThisRef},Parent,Pos,Text, Options)
   wxe_util:call(?wxTreeCtrl_InsertItem,
   <<ThisRef:32/?UI,0:32,Parent:64/?UI,Pos:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxTreeCtrl(), Item::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlisbold">external documentation</a>.
+-spec isBold(This, Item) -> boolean() when
+	This::wxTreeCtrl(), Item::integer().
 isBold(#wx_ref{type=ThisT,ref=ThisRef},Item)
  when is_integer(Item) ->
   ?CLASS(ThisT,wxTreeCtrl),
   wxe_util:call(?wxTreeCtrl_IsBold,
   <<ThisRef:32/?UI,0:32,Item:64/?UI>>).
 
-%% @spec (This::wxTreeCtrl(), Item::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlisexpanded">external documentation</a>.
+-spec isExpanded(This, Item) -> boolean() when
+	This::wxTreeCtrl(), Item::integer().
 isExpanded(#wx_ref{type=ThisT,ref=ThisRef},Item)
  when is_integer(Item) ->
   ?CLASS(ThisT,wxTreeCtrl),
   wxe_util:call(?wxTreeCtrl_IsExpanded,
   <<ThisRef:32/?UI,0:32,Item:64/?UI>>).
 
-%% @spec (This::wxTreeCtrl(), Item::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlisselected">external documentation</a>.
+-spec isSelected(This, Item) -> boolean() when
+	This::wxTreeCtrl(), Item::integer().
 isSelected(#wx_ref{type=ThisT,ref=ThisRef},Item)
  when is_integer(Item) ->
   ?CLASS(ThisT,wxTreeCtrl),
   wxe_util:call(?wxTreeCtrl_IsSelected,
   <<ThisRef:32/?UI,0:32,Item:64/?UI>>).
 
-%% @spec (This::wxTreeCtrl(), Item::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlisvisible">external documentation</a>.
+-spec isVisible(This, Item) -> boolean() when
+	This::wxTreeCtrl(), Item::integer().
 isVisible(#wx_ref{type=ThisT,ref=ThisRef},Item)
  when is_integer(Item) ->
   ?CLASS(ThisT,wxTreeCtrl),
   wxe_util:call(?wxTreeCtrl_IsVisible,
   <<ThisRef:32/?UI,0:32,Item:64/?UI>>).
 
-%% @spec (This::wxTreeCtrl(), Item::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlitemhaschildren">external documentation</a>.
+-spec itemHasChildren(This, Item) -> boolean() when
+	This::wxTreeCtrl(), Item::integer().
 itemHasChildren(#wx_ref{type=ThisT,ref=ThisRef},Item)
  when is_integer(Item) ->
   ?CLASS(ThisT,wxTreeCtrl),
   wxe_util:call(?wxTreeCtrl_ItemHasChildren,
   <<ThisRef:32/?UI,0:32,Item:64/?UI>>).
 
-%% @spec (This::wxTreeCtrl(), Parent::integer(), Text::string()) -> integer()
 %% @equiv prependItem(This,Parent,Text, [])
+-spec prependItem(This, Parent, Text) -> integer() when
+	This::wxTreeCtrl(), Parent::integer(), Text::string().
+
 prependItem(This,Parent,Text)
  when is_record(This, wx_ref),is_integer(Parent),is_list(Text) ->
   prependItem(This,Parent,Text, []).
 
-%% @spec (This::wxTreeCtrl(), Parent::integer(), Text::string(), [Option]) -> integer()
-%% Option = {image, integer()} | {selectedImage, integer()} | {data, term()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlprependitem">external documentation</a>.
+-spec prependItem(This, Parent, Text, [Option]) -> integer() when
+	This::wxTreeCtrl(), Parent::integer(), Text::string(),
+	Option :: {image, integer()}
+		 | {selectedImage, integer()}
+		 | {data, term()}.
 prependItem(#wx_ref{type=ThisT,ref=ThisRef},Parent,Text, Options)
  when is_integer(Parent),is_list(Text),is_list(Options) ->
   ?CLASS(ThisT,wxTreeCtrl),
@@ -582,25 +666,28 @@ prependItem(#wx_ref{type=ThisT,ref=ThisRef},Parent,Text, Options)
   wxe_util:call(?wxTreeCtrl_PrependItem,
   <<ThisRef:32/?UI,0:32,Parent:64/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((4+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxTreeCtrl(), Item::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlscrollto">external documentation</a>.
+-spec scrollTo(This, Item) -> ok when
+	This::wxTreeCtrl(), Item::integer().
 scrollTo(#wx_ref{type=ThisT,ref=ThisRef},Item)
  when is_integer(Item) ->
   ?CLASS(ThisT,wxTreeCtrl),
   wxe_util:cast(?wxTreeCtrl_ScrollTo,
   <<ThisRef:32/?UI,0:32,Item:64/?UI>>).
 
-%% @spec (This::wxTreeCtrl(), Item::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlselectitem">external documentation</a>.
+-spec selectItem(This, Item) -> ok when
+	This::wxTreeCtrl(), Item::integer().
 selectItem(#wx_ref{type=ThisT,ref=ThisRef},Item)
  when is_integer(Item) ->
   ?CLASS(ThisT,wxTreeCtrl),
   wxe_util:cast(?wxTreeCtrl_SelectItem_1,
   <<ThisRef:32/?UI,0:32,Item:64/?UI>>).
 
-%% @spec (This::wxTreeCtrl(), Item::integer(), [Option]) -> ok
-%% Option = {select, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlselectitem">external documentation</a>.
+-spec selectItem(This, Item, [Option]) -> ok when
+	This::wxTreeCtrl(), Item::integer(),
+	Option :: {select, boolean()}.
 selectItem(#wx_ref{type=ThisT,ref=ThisRef},Item, Options)
  when is_integer(Item),is_list(Options) ->
   ?CLASS(ThisT,wxTreeCtrl),
@@ -610,39 +697,45 @@ selectItem(#wx_ref{type=ThisT,ref=ThisRef},Item, Options)
   wxe_util:cast(?wxTreeCtrl_SelectItem_2,
   <<ThisRef:32/?UI,0:32,Item:64/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxTreeCtrl(), Indent::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlsetindent">external documentation</a>.
+-spec setIndent(This, Indent) -> ok when
+	This::wxTreeCtrl(), Indent::integer().
 setIndent(#wx_ref{type=ThisT,ref=ThisRef},Indent)
  when is_integer(Indent) ->
   ?CLASS(ThisT,wxTreeCtrl),
   wxe_util:cast(?wxTreeCtrl_SetIndent,
   <<ThisRef:32/?UI,Indent:32/?UI>>).
 
-%% @spec (This::wxTreeCtrl(), ImageList::wxImageList:wxImageList()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlsetimagelist">external documentation</a>.
+-spec setImageList(This, ImageList) -> ok when
+	This::wxTreeCtrl(), ImageList::wxImageList:wxImageList().
 setImageList(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ImageListT,ref=ImageListRef}) ->
   ?CLASS(ThisT,wxTreeCtrl),
   ?CLASS(ImageListT,wxImageList),
   wxe_util:cast(?wxTreeCtrl_SetImageList,
   <<ThisRef:32/?UI,ImageListRef:32/?UI>>).
 
-%% @spec (This::wxTreeCtrl(), Item::integer(), Col::wx:colour()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlsetitembackgroundcolour">external documentation</a>.
+-spec setItemBackgroundColour(This, Item, Col) -> ok when
+	This::wxTreeCtrl(), Item::integer(), Col::wx:wx_colour().
 setItemBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef},Item,Col)
  when is_integer(Item),tuple_size(Col) =:= 3; tuple_size(Col) =:= 4 ->
   ?CLASS(ThisT,wxTreeCtrl),
   wxe_util:cast(?wxTreeCtrl_SetItemBackgroundColour,
   <<ThisRef:32/?UI,0:32,Item:64/?UI,(wxe_util:colour_bin(Col)):16/binary>>).
 
-%% @spec (This::wxTreeCtrl(), Item::integer()) -> ok
 %% @equiv setItemBold(This,Item, [])
+-spec setItemBold(This, Item) -> ok when
+	This::wxTreeCtrl(), Item::integer().
+
 setItemBold(This,Item)
  when is_record(This, wx_ref),is_integer(Item) ->
   setItemBold(This,Item, []).
 
-%% @spec (This::wxTreeCtrl(), Item::integer(), [Option]) -> ok
-%% Option = {bold, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlsetitembold">external documentation</a>.
+-spec setItemBold(This, Item, [Option]) -> ok when
+	This::wxTreeCtrl(), Item::integer(),
+	Option :: {bold, boolean()}.
 setItemBold(#wx_ref{type=ThisT,ref=ThisRef},Item, Options)
  when is_integer(Item),is_list(Options) ->
   ?CLASS(ThisT,wxTreeCtrl),
@@ -652,8 +745,9 @@ setItemBold(#wx_ref{type=ThisT,ref=ThisRef},Item, Options)
   wxe_util:cast(?wxTreeCtrl_SetItemBold,
   <<ThisRef:32/?UI,0:32,Item:64/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxTreeCtrl(), Item::integer(), Data::term()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlsetitemdata">external documentation</a>.
+-spec setItemData(This, Item, Data) -> ok when
+	This::wxTreeCtrl(), Item::integer(), Data::term().
 setItemData(#wx_ref{type=ThisT,ref=ThisRef},Item,Data)
  when is_integer(Item) ->
   ?CLASS(ThisT,wxTreeCtrl),
@@ -661,15 +755,18 @@ setItemData(#wx_ref{type=ThisT,ref=ThisRef},Item,Data)
   wxe_util:cast(?wxTreeCtrl_SetItemData,
   <<ThisRef:32/?UI,0:32,Item:64/?UI>>).
 
-%% @spec (This::wxTreeCtrl(), Item::integer()) -> ok
 %% @equiv setItemDropHighlight(This,Item, [])
+-spec setItemDropHighlight(This, Item) -> ok when
+	This::wxTreeCtrl(), Item::integer().
+
 setItemDropHighlight(This,Item)
  when is_record(This, wx_ref),is_integer(Item) ->
   setItemDropHighlight(This,Item, []).
 
-%% @spec (This::wxTreeCtrl(), Item::integer(), [Option]) -> ok
-%% Option = {highlight, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlsetitemdrophighlight">external documentation</a>.
+-spec setItemDropHighlight(This, Item, [Option]) -> ok when
+	This::wxTreeCtrl(), Item::integer(),
+	Option :: {highlight, boolean()}.
 setItemDropHighlight(#wx_ref{type=ThisT,ref=ThisRef},Item, Options)
  when is_integer(Item),is_list(Options) ->
   ?CLASS(ThisT,wxTreeCtrl),
@@ -679,8 +776,9 @@ setItemDropHighlight(#wx_ref{type=ThisT,ref=ThisRef},Item, Options)
   wxe_util:cast(?wxTreeCtrl_SetItemDropHighlight,
   <<ThisRef:32/?UI,0:32,Item:64/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxTreeCtrl(), Item::integer(), Font::wxFont:wxFont()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlsetitemfont">external documentation</a>.
+-spec setItemFont(This, Item, Font) -> ok when
+	This::wxTreeCtrl(), Item::integer(), Font::wxFont:wxFont().
 setItemFont(#wx_ref{type=ThisT,ref=ThisRef},Item,#wx_ref{type=FontT,ref=FontRef})
  when is_integer(Item) ->
   ?CLASS(ThisT,wxTreeCtrl),
@@ -688,15 +786,18 @@ setItemFont(#wx_ref{type=ThisT,ref=ThisRef},Item,#wx_ref{type=FontT,ref=FontRef}
   wxe_util:cast(?wxTreeCtrl_SetItemFont,
   <<ThisRef:32/?UI,0:32,Item:64/?UI,FontRef:32/?UI>>).
 
-%% @spec (This::wxTreeCtrl(), Item::integer()) -> ok
 %% @equiv setItemHasChildren(This,Item, [])
+-spec setItemHasChildren(This, Item) -> ok when
+	This::wxTreeCtrl(), Item::integer().
+
 setItemHasChildren(This,Item)
  when is_record(This, wx_ref),is_integer(Item) ->
   setItemHasChildren(This,Item, []).
 
-%% @spec (This::wxTreeCtrl(), Item::integer(), [Option]) -> ok
-%% Option = {has, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlsetitemhaschildren">external documentation</a>.
+-spec setItemHasChildren(This, Item, [Option]) -> ok when
+	This::wxTreeCtrl(), Item::integer(),
+	Option :: {has, boolean()}.
 setItemHasChildren(#wx_ref{type=ThisT,ref=ThisRef},Item, Options)
  when is_integer(Item),is_list(Options) ->
   ?CLASS(ThisT,wxTreeCtrl),
@@ -706,19 +807,20 @@ setItemHasChildren(#wx_ref{type=ThisT,ref=ThisRef},Item, Options)
   wxe_util:cast(?wxTreeCtrl_SetItemHasChildren,
   <<ThisRef:32/?UI,0:32,Item:64/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxTreeCtrl(), Item::integer(), Image::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlsetitemimage">external documentation</a>.
+-spec setItemImage(This, Item, Image) -> ok when
+	This::wxTreeCtrl(), Item::integer(), Image::integer().
 setItemImage(#wx_ref{type=ThisT,ref=ThisRef},Item,Image)
  when is_integer(Item),is_integer(Image) ->
   ?CLASS(ThisT,wxTreeCtrl),
   wxe_util:cast(?wxTreeCtrl_SetItemImage_2,
   <<ThisRef:32/?UI,0:32,Item:64/?UI,Image:32/?UI>>).
 
-%% @spec (This::wxTreeCtrl(), Item::integer(), Image::integer(), [Option]) -> ok
-%% Option = {which, WxTreeItemIcon}
-%% WxTreeItemIcon = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlsetitemimage">external documentation</a>.
-%%<br /> WxTreeItemIcon is one of ?wxTreeItemIcon_Normal | ?wxTreeItemIcon_Selected | ?wxTreeItemIcon_Expanded | ?wxTreeItemIcon_SelectedExpanded | ?wxTreeItemIcon_Max
+%%<br /> Which = ?wxTreeItemIcon_Normal | ?wxTreeItemIcon_Selected | ?wxTreeItemIcon_Expanded | ?wxTreeItemIcon_SelectedExpanded | ?wxTreeItemIcon_Max
+-spec setItemImage(This, Item, Image, [Option]) -> ok when
+	This::wxTreeCtrl(), Item::integer(), Image::integer(),
+	Option :: {which, wx:wx_enum()}.
 setItemImage(#wx_ref{type=ThisT,ref=ThisRef},Item,Image, Options)
  when is_integer(Item),is_integer(Image),is_list(Options) ->
   ?CLASS(ThisT,wxTreeCtrl),
@@ -728,8 +830,9 @@ setItemImage(#wx_ref{type=ThisT,ref=ThisRef},Item,Image, Options)
   wxe_util:cast(?wxTreeCtrl_SetItemImage_3,
   <<ThisRef:32/?UI,0:32,Item:64/?UI,Image:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxTreeCtrl(), Item::integer(), Text::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlsetitemtext">external documentation</a>.
+-spec setItemText(This, Item, Text) -> ok when
+	This::wxTreeCtrl(), Item::integer(), Text::string().
 setItemText(#wx_ref{type=ThisT,ref=ThisRef},Item,Text)
  when is_integer(Item),is_list(Text) ->
   ?CLASS(ThisT,wxTreeCtrl),
@@ -737,78 +840,87 @@ setItemText(#wx_ref{type=ThisT,ref=ThisRef},Item,Text)
   wxe_util:cast(?wxTreeCtrl_SetItemText,
   <<ThisRef:32/?UI,0:32,Item:64/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((4+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxTreeCtrl(), Item::integer(), Col::wx:colour()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlsetitemtextcolour">external documentation</a>.
+-spec setItemTextColour(This, Item, Col) -> ok when
+	This::wxTreeCtrl(), Item::integer(), Col::wx:wx_colour().
 setItemTextColour(#wx_ref{type=ThisT,ref=ThisRef},Item,Col)
  when is_integer(Item),tuple_size(Col) =:= 3; tuple_size(Col) =:= 4 ->
   ?CLASS(ThisT,wxTreeCtrl),
   wxe_util:cast(?wxTreeCtrl_SetItemTextColour,
   <<ThisRef:32/?UI,0:32,Item:64/?UI,(wxe_util:colour_bin(Col)):16/binary>>).
 
-%% @spec (This::wxTreeCtrl(), ImageList::wxImageList:wxImageList()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlsetstateimagelist">external documentation</a>.
+-spec setStateImageList(This, ImageList) -> ok when
+	This::wxTreeCtrl(), ImageList::wxImageList:wxImageList().
 setStateImageList(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ImageListT,ref=ImageListRef}) ->
   ?CLASS(ThisT,wxTreeCtrl),
   ?CLASS(ImageListT,wxImageList),
   wxe_util:cast(?wxTreeCtrl_SetStateImageList,
   <<ThisRef:32/?UI,ImageListRef:32/?UI>>).
 
-%% @spec (This::wxTreeCtrl(), Styles::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlsetwindowstyle">external documentation</a>.
+-spec setWindowStyle(This, Styles) -> ok when
+	This::wxTreeCtrl(), Styles::integer().
 setWindowStyle(#wx_ref{type=ThisT,ref=ThisRef},Styles)
  when is_integer(Styles) ->
   ?CLASS(ThisT,wxTreeCtrl),
   wxe_util:cast(?wxTreeCtrl_SetWindowStyle,
   <<ThisRef:32/?UI,Styles:32/?UI>>).
 
-%% @spec (This::wxTreeCtrl(), Item::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlsortchildren">external documentation</a>.
+-spec sortChildren(This, Item) -> ok when
+	This::wxTreeCtrl(), Item::integer().
 sortChildren(#wx_ref{type=ThisT,ref=ThisRef},Item)
  when is_integer(Item) ->
   ?CLASS(ThisT,wxTreeCtrl),
   wxe_util:cast(?wxTreeCtrl_SortChildren,
   <<ThisRef:32/?UI,0:32,Item:64/?UI>>).
 
-%% @spec (This::wxTreeCtrl(), Item::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrltoggle">external documentation</a>.
+-spec toggle(This, Item) -> ok when
+	This::wxTreeCtrl(), Item::integer().
 toggle(#wx_ref{type=ThisT,ref=ThisRef},Item)
  when is_integer(Item) ->
   ?CLASS(ThisT,wxTreeCtrl),
   wxe_util:cast(?wxTreeCtrl_Toggle,
   <<ThisRef:32/?UI,0:32,Item:64/?UI>>).
 
-%% @spec (This::wxTreeCtrl(), Item::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrltoggleitemselection">external documentation</a>.
+-spec toggleItemSelection(This, Item) -> ok when
+	This::wxTreeCtrl(), Item::integer().
 toggleItemSelection(#wx_ref{type=ThisT,ref=ThisRef},Item)
  when is_integer(Item) ->
   ?CLASS(ThisT,wxTreeCtrl),
   wxe_util:cast(?wxTreeCtrl_ToggleItemSelection,
   <<ThisRef:32/?UI,0:32,Item:64/?UI>>).
 
-%% @spec (This::wxTreeCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlunselect">external documentation</a>.
+-spec unselect(This) -> ok when
+	This::wxTreeCtrl().
 unselect(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTreeCtrl),
   wxe_util:cast(?wxTreeCtrl_Unselect,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTreeCtrl()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlunselectall">external documentation</a>.
+-spec unselectAll(This) -> ok when
+	This::wxTreeCtrl().
 unselectAll(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTreeCtrl),
   wxe_util:cast(?wxTreeCtrl_UnselectAll,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTreeCtrl(), Item::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlunselectitem">external documentation</a>.
+-spec unselectItem(This, Item) -> ok when
+	This::wxTreeCtrl(), Item::integer().
 unselectItem(#wx_ref{type=ThisT,ref=ThisRef},Item)
  when is_integer(Item) ->
   ?CLASS(ThisT,wxTreeCtrl),
   wxe_util:cast(?wxTreeCtrl_UnselectItem,
   <<ThisRef:32/?UI,0:32,Item:64/?UI>>).
 
-%% @spec (This::wxTreeCtrl()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxTreeCtrl) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxTreeCtrl),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxTreeEvent.erl b/lib/wx/src/gen/wxTreeEvent.erl
index 0264d43568..8c91d73dbd 100644
--- a/lib/wx/src/gen/wxTreeEvent.erl
+++ b/lib/wx/src/gen/wxTreeEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -42,63 +42,73 @@
   isSelection/1,parent_class/1,resumePropagation/2,setInt/2,setString/2,
   shouldPropagate/1,skip/1,skip/2,stopPropagation/1,veto/1]).
 
+-export_type([wxTreeEvent/0]).
 %% @hidden
 parent_class(wxNotifyEvent) -> true;
 parent_class(wxCommandEvent) -> true;
 parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (This::wxTreeEvent()) -> integer()
+-type wxTreeEvent() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreeevent.html#wxtreeeventgetkeycode">external documentation</a>.
+-spec getKeyCode(This) -> integer() when
+	This::wxTreeEvent().
 getKeyCode(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTreeEvent),
   wxe_util:call(?wxTreeEvent_GetKeyCode,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTreeEvent()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreeevent.html#wxtreeeventgetitem">external documentation</a>.
+-spec getItem(This) -> integer() when
+	This::wxTreeEvent().
 getItem(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTreeEvent),
   wxe_util:call(?wxTreeEvent_GetItem,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTreeEvent()) -> wxKeyEvent:wxKeyEvent()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreeevent.html#wxtreeeventgetkeyevent">external documentation</a>.
+-spec getKeyEvent(This) -> wxKeyEvent:wxKeyEvent() when
+	This::wxTreeEvent().
 getKeyEvent(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTreeEvent),
   wxe_util:call(?wxTreeEvent_GetKeyEvent,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTreeEvent()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreeevent.html#wxtreeeventgetlabel">external documentation</a>.
+-spec getLabel(This) -> string() when
+	This::wxTreeEvent().
 getLabel(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTreeEvent),
   wxe_util:call(?wxTreeEvent_GetLabel,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTreeEvent()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreeevent.html#wxtreeeventgetolditem">external documentation</a>.
+-spec getOldItem(This) -> integer() when
+	This::wxTreeEvent().
 getOldItem(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTreeEvent),
   wxe_util:call(?wxTreeEvent_GetOldItem,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTreeEvent()) -> {X::integer(), Y::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreeevent.html#wxtreeeventgetpoint">external documentation</a>.
+-spec getPoint(This) -> {X::integer(), Y::integer()} when
+	This::wxTreeEvent().
 getPoint(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTreeEvent),
   wxe_util:call(?wxTreeEvent_GetPoint,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTreeEvent()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreeevent.html#wxtreeeventiseditcancelled">external documentation</a>.
+-spec isEditCancelled(This) -> boolean() when
+	This::wxTreeEvent().
 isEditCancelled(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTreeEvent),
   wxe_util:call(?wxTreeEvent_IsEditCancelled,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTreeEvent(), ToolTip::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreeevent.html#wxtreeeventsettooltip">external documentation</a>.
+-spec setToolTip(This, ToolTip) -> ok when
+	This::wxTreeEvent(), ToolTip::string().
 setToolTip(#wx_ref{type=ThisT,ref=ThisRef},ToolTip)
  when is_list(ToolTip) ->
   ?CLASS(ThisT,wxTreeEvent),
diff --git a/lib/wx/src/gen/wxTreebook.erl b/lib/wx/src/gen/wxTreebook.erl
index 24f5d72c43..945cfb62e1 100644
--- a/lib/wx/src/gen/wxTreebook.erl
+++ b/lib/wx/src/gen/wxTreebook.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2012. 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
@@ -75,27 +75,34 @@
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
 
+-export_type([wxTreebook/0]).
 %% @hidden
 parent_class(wxControl) -> true;
 parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxTreebook()
+-type wxTreebook() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreebook.html#wxtreebookwxtreebook">external documentation</a>.
+-spec new() -> wxTreebook().
 new() ->
   wxe_util:construct(?wxTreebook_new_0,
   <<>>).
 
-%% @spec (Parent::wxWindow:wxWindow(), Id::integer()) -> wxTreebook()
 %% @equiv new(Parent,Id, [])
+-spec new(Parent, Id) -> wxTreebook() when
+	Parent::wxWindow:wxWindow(), Id::integer().
+
 new(Parent,Id)
  when is_record(Parent, wx_ref),is_integer(Id) ->
   new(Parent,Id, []).
 
-%% @spec (Parent::wxWindow:wxWindow(), Id::integer(), [Option]) -> wxTreebook()
-%% Option = {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreebook.html#wxtreebookwxtreebook">external documentation</a>.
+-spec new(Parent, Id, [Option]) -> wxTreebook() when
+	Parent::wxWindow:wxWindow(), Id::integer(),
+	Option :: {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}.
 new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
  when is_integer(Id),is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -107,15 +114,19 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
   wxe_util:construct(?wxTreebook_new_3,
   <<ParentRef:32/?UI,Id:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxTreebook(), Page::wxWindow:wxWindow(), Text::string()) -> bool()
 %% @equiv addPage(This,Page,Text, [])
+-spec addPage(This, Page, Text) -> boolean() when
+	This::wxTreebook(), Page::wxWindow:wxWindow(), Text::string().
+
 addPage(This,Page,Text)
  when is_record(This, wx_ref),is_record(Page, wx_ref),is_list(Text) ->
   addPage(This,Page,Text, []).
 
-%% @spec (This::wxTreebook(), Page::wxWindow:wxWindow(), Text::string(), [Option]) -> bool()
-%% Option = {bSelect, bool()} | {imageId, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreebook.html#wxtreebookaddpage">external documentation</a>.
+-spec addPage(This, Page, Text, [Option]) -> boolean() when
+	This::wxTreebook(), Page::wxWindow:wxWindow(), Text::string(),
+	Option :: {bSelect, boolean()}
+		 | {imageId, integer()}.
 addPage(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PageT,ref=PageRef},Text, Options)
  when is_list(Text),is_list(Options) ->
   ?CLASS(ThisT,wxTreebook),
@@ -128,15 +139,18 @@ addPage(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PageT,ref=PageRef},Text, Op
   wxe_util:call(?wxTreebook_AddPage,
   <<ThisRef:32/?UI,PageRef:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((4+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxTreebook()) -> ok
 %% @equiv advanceSelection(This, [])
+-spec advanceSelection(This) -> ok when
+	This::wxTreebook().
+
 advanceSelection(This)
  when is_record(This, wx_ref) ->
   advanceSelection(This, []).
 
-%% @spec (This::wxTreebook(), [Option]) -> ok
-%% Option = {forward, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreebook.html#wxtreebookadvanceselection">external documentation</a>.
+-spec advanceSelection(This, [Option]) -> ok when
+	This::wxTreebook(),
+	Option :: {forward, boolean()}.
 advanceSelection(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxTreebook),
@@ -146,23 +160,29 @@ advanceSelection(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxTreebook_AdvanceSelection,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxTreebook(), ImageList::wxImageList:wxImageList()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreebook.html#wxtreebookassignimagelist">external documentation</a>.
+-spec assignImageList(This, ImageList) -> ok when
+	This::wxTreebook(), ImageList::wxImageList:wxImageList().
 assignImageList(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ImageListT,ref=ImageListRef}) ->
   ?CLASS(ThisT,wxTreebook),
   ?CLASS(ImageListT,wxImageList),
   wxe_util:cast(?wxTreebook_AssignImageList,
   <<ThisRef:32/?UI,ImageListRef:32/?UI>>).
 
-%% @spec (This::wxTreebook(), Parent::wxWindow:wxWindow(), Id::integer()) -> bool()
 %% @equiv create(This,Parent,Id, [])
+-spec create(This, Parent, Id) -> boolean() when
+	This::wxTreebook(), Parent::wxWindow:wxWindow(), Id::integer().
+
 create(This,Parent,Id)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id) ->
   create(This,Parent,Id, []).
 
-%% @spec (This::wxTreebook(), Parent::wxWindow:wxWindow(), Id::integer(), [Option]) -> bool()
-%% Option = {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreebook.html#wxtreebookcreate">external documentation</a>.
+-spec create(This, Parent, Id, [Option]) -> boolean() when
+	This::wxTreebook(), Parent::wxWindow:wxWindow(), Id::integer(),
+	Option :: {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}.
 create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
  when is_integer(Id),is_list(Options) ->
   ?CLASS(ThisT,wxTreebook),
@@ -175,90 +195,103 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id, O
   wxe_util:call(?wxTreebook_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI,Id:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxTreebook()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreebook.html#wxtreebookdeleteallpages">external documentation</a>.
+-spec deleteAllPages(This) -> boolean() when
+	This::wxTreebook().
 deleteAllPages(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTreebook),
   wxe_util:call(?wxTreebook_DeleteAllPages,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTreebook(), Pos::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreebook.html#wxtreebookdeletepage">external documentation</a>.
+-spec deletePage(This, Pos) -> boolean() when
+	This::wxTreebook(), Pos::integer().
 deletePage(#wx_ref{type=ThisT,ref=ThisRef},Pos)
  when is_integer(Pos) ->
   ?CLASS(ThisT,wxTreebook),
   wxe_util:call(?wxTreebook_DeletePage,
   <<ThisRef:32/?UI,Pos:32/?UI>>).
 
-%% @spec (This::wxTreebook(), N::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreebook.html#wxtreebookremovepage">external documentation</a>.
+-spec removePage(This, N) -> boolean() when
+	This::wxTreebook(), N::integer().
 removePage(#wx_ref{type=ThisT,ref=ThisRef},N)
  when is_integer(N) ->
   ?CLASS(ThisT,wxTreebook),
   wxe_util:call(?wxTreebook_RemovePage,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @spec (This::wxTreebook()) -> wxWindow:wxWindow()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreebook.html#wxtreebookgetcurrentpage">external documentation</a>.
+-spec getCurrentPage(This) -> wxWindow:wxWindow() when
+	This::wxTreebook().
 getCurrentPage(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTreebook),
   wxe_util:call(?wxTreebook_GetCurrentPage,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTreebook()) -> wxImageList:wxImageList()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreebook.html#wxtreebookgetimagelist">external documentation</a>.
+-spec getImageList(This) -> wxImageList:wxImageList() when
+	This::wxTreebook().
 getImageList(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTreebook),
   wxe_util:call(?wxTreebook_GetImageList,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTreebook(), N::integer()) -> wxWindow:wxWindow()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreebook.html#wxtreebookgetpage">external documentation</a>.
+-spec getPage(This, N) -> wxWindow:wxWindow() when
+	This::wxTreebook(), N::integer().
 getPage(#wx_ref{type=ThisT,ref=ThisRef},N)
  when is_integer(N) ->
   ?CLASS(ThisT,wxTreebook),
   wxe_util:call(?wxTreebook_GetPage,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @spec (This::wxTreebook()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreebook.html#wxtreebookgetpagecount">external documentation</a>.
+-spec getPageCount(This) -> integer() when
+	This::wxTreebook().
 getPageCount(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTreebook),
   wxe_util:call(?wxTreebook_GetPageCount,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTreebook(), N::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreebook.html#wxtreebookgetpageimage">external documentation</a>.
+-spec getPageImage(This, N) -> integer() when
+	This::wxTreebook(), N::integer().
 getPageImage(#wx_ref{type=ThisT,ref=ThisRef},N)
  when is_integer(N) ->
   ?CLASS(ThisT,wxTreebook),
   wxe_util:call(?wxTreebook_GetPageImage,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @spec (This::wxTreebook(), N::integer()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreebook.html#wxtreebookgetpagetext">external documentation</a>.
+-spec getPageText(This, N) -> string() when
+	This::wxTreebook(), N::integer().
 getPageText(#wx_ref{type=ThisT,ref=ThisRef},N)
  when is_integer(N) ->
   ?CLASS(ThisT,wxTreebook),
   wxe_util:call(?wxTreebook_GetPageText,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @spec (This::wxTreebook()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreebook.html#wxtreebookgetselection">external documentation</a>.
+-spec getSelection(This) -> integer() when
+	This::wxTreebook().
 getSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxTreebook),
   wxe_util:call(?wxTreebook_GetSelection,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxTreebook(), Pos::integer()) -> bool()
 %% @equiv expandNode(This,Pos, [])
+-spec expandNode(This, Pos) -> boolean() when
+	This::wxTreebook(), Pos::integer().
+
 expandNode(This,Pos)
  when is_record(This, wx_ref),is_integer(Pos) ->
   expandNode(This,Pos, []).
 
-%% @spec (This::wxTreebook(), Pos::integer(), [Option]) -> bool()
-%% Option = {expand, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreebook.html#wxtreebookexpandnode">external documentation</a>.
+-spec expandNode(This, Pos, [Option]) -> boolean() when
+	This::wxTreebook(), Pos::integer(),
+	Option :: {expand, boolean()}.
 expandNode(#wx_ref{type=ThisT,ref=ThisRef},Pos, Options)
  when is_integer(Pos),is_list(Options) ->
   ?CLASS(ThisT,wxTreebook),
@@ -268,31 +301,38 @@ expandNode(#wx_ref{type=ThisT,ref=ThisRef},Pos, Options)
   wxe_util:call(?wxTreebook_ExpandNode,
   <<ThisRef:32/?UI,Pos:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxTreebook(), Pos::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreebook.html#wxtreebookisnodeexpanded">external documentation</a>.
+-spec isNodeExpanded(This, Pos) -> boolean() when
+	This::wxTreebook(), Pos::integer().
 isNodeExpanded(#wx_ref{type=ThisT,ref=ThisRef},Pos)
  when is_integer(Pos) ->
   ?CLASS(ThisT,wxTreebook),
   wxe_util:call(?wxTreebook_IsNodeExpanded,
   <<ThisRef:32/?UI,Pos:32/?UI>>).
 
-%% @spec (This::wxTreebook(), Pt::{X::integer(), Y::integer()}) -> {integer(), Flags::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreebook.html#wxtreebookhittest">external documentation</a>.
+-spec hitTest(This, Pt) -> Result when
+	Result ::{Res ::integer(), Flags::integer()},
+	This::wxTreebook(), Pt::{X::integer(), Y::integer()}.
 hitTest(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY})
  when is_integer(PtX),is_integer(PtY) ->
   ?CLASS(ThisT,wxTreebook),
   wxe_util:call(?wxTreebook_HitTest,
   <<ThisRef:32/?UI,PtX:32/?UI,PtY:32/?UI>>).
 
-%% @spec (This::wxTreebook(), Pos::integer(), Page::wxWindow:wxWindow(), Text::string()) -> bool()
 %% @equiv insertPage(This,Pos,Page,Text, [])
+-spec insertPage(This, Pos, Page, Text) -> boolean() when
+	This::wxTreebook(), Pos::integer(), Page::wxWindow:wxWindow(), Text::string().
+
 insertPage(This,Pos,Page,Text)
  when is_record(This, wx_ref),is_integer(Pos),is_record(Page, wx_ref),is_list(Text) ->
   insertPage(This,Pos,Page,Text, []).
 
-%% @spec (This::wxTreebook(), Pos::integer(), Page::wxWindow:wxWindow(), Text::string(), [Option]) -> bool()
-%% Option = {bSelect, bool()} | {imageId, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreebook.html#wxtreebookinsertpage">external documentation</a>.
+-spec insertPage(This, Pos, Page, Text, [Option]) -> boolean() when
+	This::wxTreebook(), Pos::integer(), Page::wxWindow:wxWindow(), Text::string(),
+	Option :: {bSelect, boolean()}
+		 | {imageId, integer()}.
 insertPage(#wx_ref{type=ThisT,ref=ThisRef},Pos,#wx_ref{type=PageT,ref=PageRef},Text, Options)
  when is_integer(Pos),is_list(Text),is_list(Options) ->
   ?CLASS(ThisT,wxTreebook),
@@ -305,15 +345,19 @@ insertPage(#wx_ref{type=ThisT,ref=ThisRef},Pos,#wx_ref{type=PageT,ref=PageRef},T
   wxe_util:call(?wxTreebook_InsertPage,
   <<ThisRef:32/?UI,Pos:32/?UI,PageRef:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxTreebook(), Pos::integer(), Page::wxWindow:wxWindow(), Text::string()) -> bool()
 %% @equiv insertSubPage(This,Pos,Page,Text, [])
+-spec insertSubPage(This, Pos, Page, Text) -> boolean() when
+	This::wxTreebook(), Pos::integer(), Page::wxWindow:wxWindow(), Text::string().
+
 insertSubPage(This,Pos,Page,Text)
  when is_record(This, wx_ref),is_integer(Pos),is_record(Page, wx_ref),is_list(Text) ->
   insertSubPage(This,Pos,Page,Text, []).
 
-%% @spec (This::wxTreebook(), Pos::integer(), Page::wxWindow:wxWindow(), Text::string(), [Option]) -> bool()
-%% Option = {bSelect, bool()} | {imageId, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreebook.html#wxtreebookinsertsubpage">external documentation</a>.
+-spec insertSubPage(This, Pos, Page, Text, [Option]) -> boolean() when
+	This::wxTreebook(), Pos::integer(), Page::wxWindow:wxWindow(), Text::string(),
+	Option :: {bSelect, boolean()}
+		 | {imageId, integer()}.
 insertSubPage(#wx_ref{type=ThisT,ref=ThisRef},Pos,#wx_ref{type=PageT,ref=PageRef},Text, Options)
  when is_integer(Pos),is_list(Text),is_list(Options) ->
   ?CLASS(ThisT,wxTreebook),
@@ -326,32 +370,36 @@ insertSubPage(#wx_ref{type=ThisT,ref=ThisRef},Pos,#wx_ref{type=PageT,ref=PageRef
   wxe_util:call(?wxTreebook_InsertSubPage,
   <<ThisRef:32/?UI,Pos:32/?UI,PageRef:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxTreebook(), ImageList::wxImageList:wxImageList()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreebook.html#wxtreebooksetimagelist">external documentation</a>.
+-spec setImageList(This, ImageList) -> ok when
+	This::wxTreebook(), ImageList::wxImageList:wxImageList().
 setImageList(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ImageListT,ref=ImageListRef}) ->
   ?CLASS(ThisT,wxTreebook),
   ?CLASS(ImageListT,wxImageList),
   wxe_util:cast(?wxTreebook_SetImageList,
   <<ThisRef:32/?UI,ImageListRef:32/?UI>>).
 
-%% @spec (This::wxTreebook(), Size::{W::integer(), H::integer()}) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreebook.html#wxtreebooksetpagesize">external documentation</a>.
+-spec setPageSize(This, Size) -> ok when
+	This::wxTreebook(), Size::{W::integer(), H::integer()}.
 setPageSize(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH})
  when is_integer(SizeW),is_integer(SizeH) ->
   ?CLASS(ThisT,wxTreebook),
   wxe_util:cast(?wxTreebook_SetPageSize,
   <<ThisRef:32/?UI,SizeW:32/?UI,SizeH:32/?UI>>).
 
-%% @spec (This::wxTreebook(), N::integer(), ImageId::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreebook.html#wxtreebooksetpageimage">external documentation</a>.
+-spec setPageImage(This, N, ImageId) -> boolean() when
+	This::wxTreebook(), N::integer(), ImageId::integer().
 setPageImage(#wx_ref{type=ThisT,ref=ThisRef},N,ImageId)
  when is_integer(N),is_integer(ImageId) ->
   ?CLASS(ThisT,wxTreebook),
   wxe_util:call(?wxTreebook_SetPageImage,
   <<ThisRef:32/?UI,N:32/?UI,ImageId:32/?UI>>).
 
-%% @spec (This::wxTreebook(), N::integer(), StrText::string()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreebook.html#wxtreebooksetpagetext">external documentation</a>.
+-spec setPageText(This, N, StrText) -> boolean() when
+	This::wxTreebook(), N::integer(), StrText::string().
 setPageText(#wx_ref{type=ThisT,ref=ThisRef},N,StrText)
  when is_integer(N),is_list(StrText) ->
   ?CLASS(ThisT,wxTreebook),
@@ -359,24 +407,26 @@ setPageText(#wx_ref{type=ThisT,ref=ThisRef},N,StrText)
   wxe_util:call(?wxTreebook_SetPageText,
   <<ThisRef:32/?UI,N:32/?UI,(byte_size(StrText_UC)):32/?UI,(StrText_UC)/binary, 0:(((8- ((4+byte_size(StrText_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxTreebook(), N::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreebook.html#wxtreebooksetselection">external documentation</a>.
+-spec setSelection(This, N) -> integer() when
+	This::wxTreebook(), N::integer().
 setSelection(#wx_ref{type=ThisT,ref=ThisRef},N)
  when is_integer(N) ->
   ?CLASS(ThisT,wxTreebook),
   wxe_util:call(?wxTreebook_SetSelection,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @spec (This::wxTreebook(), N::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreebook.html#wxtreebookchangeselection">external documentation</a>.
+-spec changeSelection(This, N) -> integer() when
+	This::wxTreebook(), N::integer().
 changeSelection(#wx_ref{type=ThisT,ref=ThisRef},N)
  when is_integer(N) ->
   ?CLASS(ThisT,wxTreebook),
   wxe_util:call(?wxTreebook_ChangeSelection,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @spec (This::wxTreebook()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxTreebook) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxTreebook),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxUpdateUIEvent.erl b/lib/wx/src/gen/wxUpdateUIEvent.erl
index baf9fc8b52..26cf81f72d 100644
--- a/lib/wx/src/gen/wxUpdateUIEvent.erl
+++ b/lib/wx/src/gen/wxUpdateUIEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -42,129 +42,143 @@
   parent_class/1,resumePropagation/2,setInt/2,setString/2,shouldPropagate/1,
   skip/1,skip/2,stopPropagation/1]).
 
+-export_type([wxUpdateUIEvent/0]).
 %% @hidden
 parent_class(wxCommandEvent) -> true;
 parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec (Win::wxWindow:wxWindow()) -> bool()
+-type wxUpdateUIEvent() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxupdateuievent.html#wxupdateuieventcanupdate">external documentation</a>.
+-spec canUpdate(Win) -> boolean() when
+	Win::wxWindow:wxWindow().
 canUpdate(#wx_ref{type=WinT,ref=WinRef}) ->
   ?CLASS(WinT,wxWindow),
   wxe_util:call(?wxUpdateUIEvent_CanUpdate,
   <<WinRef:32/?UI>>).
 
-%% @spec (This::wxUpdateUIEvent(), Check::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxupdateuievent.html#wxupdateuieventcheck">external documentation</a>.
+-spec check(This, Check) -> ok when
+	This::wxUpdateUIEvent(), Check::boolean().
 check(#wx_ref{type=ThisT,ref=ThisRef},Check)
  when is_boolean(Check) ->
   ?CLASS(ThisT,wxUpdateUIEvent),
   wxe_util:cast(?wxUpdateUIEvent_Check,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Check)):32/?UI>>).
 
-%% @spec (This::wxUpdateUIEvent(), Enable::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxupdateuievent.html#wxupdateuieventenable">external documentation</a>.
+-spec enable(This, Enable) -> ok when
+	This::wxUpdateUIEvent(), Enable::boolean().
 enable(#wx_ref{type=ThisT,ref=ThisRef},Enable)
  when is_boolean(Enable) ->
   ?CLASS(ThisT,wxUpdateUIEvent),
   wxe_util:cast(?wxUpdateUIEvent_Enable,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Enable)):32/?UI>>).
 
-%% @spec (This::wxUpdateUIEvent(), Show::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxupdateuievent.html#wxupdateuieventshow">external documentation</a>.
+-spec show(This, Show) -> ok when
+	This::wxUpdateUIEvent(), Show::boolean().
 show(#wx_ref{type=ThisT,ref=ThisRef},Show)
  when is_boolean(Show) ->
   ?CLASS(ThisT,wxUpdateUIEvent),
   wxe_util:cast(?wxUpdateUIEvent_Show,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Show)):32/?UI>>).
 
-%% @spec (This::wxUpdateUIEvent()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxupdateuievent.html#wxupdateuieventgetchecked">external documentation</a>.
+-spec getChecked(This) -> boolean() when
+	This::wxUpdateUIEvent().
 getChecked(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxUpdateUIEvent),
   wxe_util:call(?wxUpdateUIEvent_GetChecked,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxUpdateUIEvent()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxupdateuievent.html#wxupdateuieventgetenabled">external documentation</a>.
+-spec getEnabled(This) -> boolean() when
+	This::wxUpdateUIEvent().
 getEnabled(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxUpdateUIEvent),
   wxe_util:call(?wxUpdateUIEvent_GetEnabled,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxUpdateUIEvent()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxupdateuievent.html#wxupdateuieventgetshown">external documentation</a>.
+-spec getShown(This) -> boolean() when
+	This::wxUpdateUIEvent().
 getShown(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxUpdateUIEvent),
   wxe_util:call(?wxUpdateUIEvent_GetShown,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxUpdateUIEvent()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxupdateuievent.html#wxupdateuieventgetsetchecked">external documentation</a>.
+-spec getSetChecked(This) -> boolean() when
+	This::wxUpdateUIEvent().
 getSetChecked(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxUpdateUIEvent),
   wxe_util:call(?wxUpdateUIEvent_GetSetChecked,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxUpdateUIEvent()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxupdateuievent.html#wxupdateuieventgetsetenabled">external documentation</a>.
+-spec getSetEnabled(This) -> boolean() when
+	This::wxUpdateUIEvent().
 getSetEnabled(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxUpdateUIEvent),
   wxe_util:call(?wxUpdateUIEvent_GetSetEnabled,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxUpdateUIEvent()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxupdateuievent.html#wxupdateuieventgetsetshown">external documentation</a>.
+-spec getSetShown(This) -> boolean() when
+	This::wxUpdateUIEvent().
 getSetShown(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxUpdateUIEvent),
   wxe_util:call(?wxUpdateUIEvent_GetSetShown,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxUpdateUIEvent()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxupdateuievent.html#wxupdateuieventgetsettext">external documentation</a>.
+-spec getSetText(This) -> boolean() when
+	This::wxUpdateUIEvent().
 getSetText(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxUpdateUIEvent),
   wxe_util:call(?wxUpdateUIEvent_GetSetText,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxUpdateUIEvent()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxupdateuievent.html#wxupdateuieventgettext">external documentation</a>.
+-spec getText(This) -> string() when
+	This::wxUpdateUIEvent().
 getText(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxUpdateUIEvent),
   wxe_util:call(?wxUpdateUIEvent_GetText,
   <<ThisRef:32/?UI>>).
 
-%% @spec () -> WxUpdateUIMode
-%% WxUpdateUIMode = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxupdateuievent.html#wxupdateuieventgetmode">external documentation</a>.
-%%<br /> WxUpdateUIMode is one of ?wxUPDATE_UI_PROCESS_ALL | ?wxUPDATE_UI_PROCESS_SPECIFIED
+%%<br /> Res = ?wxUPDATE_UI_PROCESS_ALL | ?wxUPDATE_UI_PROCESS_SPECIFIED
+-spec getMode() -> wx:wx_enum().
 getMode() ->
   wxe_util:call(?wxUpdateUIEvent_GetMode,
   <<>>).
 
-%% @spec () -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxupdateuievent.html#wxupdateuieventgetupdateinterval">external documentation</a>.
+-spec getUpdateInterval() -> integer().
 getUpdateInterval() ->
   wxe_util:call(?wxUpdateUIEvent_GetUpdateInterval,
   <<>>).
 
-%% @spec () -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxupdateuievent.html#wxupdateuieventresetupdatetime">external documentation</a>.
+-spec resetUpdateTime() -> ok.
 resetUpdateTime() ->
   wxe_util:cast(?wxUpdateUIEvent_ResetUpdateTime,
   <<>>).
 
-%% @spec (Mode::WxUpdateUIMode) -> ok
-%% WxUpdateUIMode = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxupdateuievent.html#wxupdateuieventsetmode">external documentation</a>.
-%%<br /> WxUpdateUIMode is one of ?wxUPDATE_UI_PROCESS_ALL | ?wxUPDATE_UI_PROCESS_SPECIFIED
+%%<br /> Mode = ?wxUPDATE_UI_PROCESS_ALL | ?wxUPDATE_UI_PROCESS_SPECIFIED
+-spec setMode(Mode) -> ok when
+	Mode::wx:wx_enum().
 setMode(Mode)
  when is_integer(Mode) ->
   wxe_util:cast(?wxUpdateUIEvent_SetMode,
   <<Mode:32/?UI>>).
 
-%% @spec (This::wxUpdateUIEvent(), Text::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxupdateuievent.html#wxupdateuieventsettext">external documentation</a>.
+-spec setText(This, Text) -> ok when
+	This::wxUpdateUIEvent(), Text::string().
 setText(#wx_ref{type=ThisT,ref=ThisRef},Text)
  when is_list(Text) ->
   ?CLASS(ThisT,wxUpdateUIEvent),
@@ -172,8 +186,9 @@ setText(#wx_ref{type=ThisT,ref=ThisRef},Text)
   wxe_util:cast(?wxUpdateUIEvent_SetText,
   <<ThisRef:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (UpdateInterval::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxupdateuievent.html#wxupdateuieventsetupdateinterval">external documentation</a>.
+-spec setUpdateInterval(UpdateInterval) -> ok when
+	UpdateInterval::integer().
 setUpdateInterval(UpdateInterval)
  when is_integer(UpdateInterval) ->
   wxe_util:cast(?wxUpdateUIEvent_SetUpdateInterval,
diff --git a/lib/wx/src/gen/wxWindow.erl b/lib/wx/src/gen/wxWindow.erl
index 6b57cf508e..9c4d3596fe 100644
--- a/lib/wx/src/gen/wxWindow.erl
+++ b/lib/wx/src/gen/wxWindow.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -69,25 +69,32 @@
 %% inherited exports
 -export([connect/2,connect/3,disconnect/1,disconnect/2,disconnect/3,parent_class/1]).
 
+-export_type([wxWindow/0]).
 %% @hidden
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxWindow()
+-type wxWindow() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowwxwindow">external documentation</a>.
+-spec new() -> wxWindow().
 new() ->
   wxe_util:construct(?wxWindow_new_0,
   <<>>).
 
-%% @spec (Parent::wxWindow(), Id::integer()) -> wxWindow()
 %% @equiv new(Parent,Id, [])
+-spec new(Parent, Id) -> wxWindow() when
+	Parent::wxWindow(), Id::integer().
+
 new(Parent,Id)
  when is_record(Parent, wx_ref),is_integer(Id) ->
   new(Parent,Id, []).
 
-%% @spec (Parent::wxWindow(), Id::integer(), [Option]) -> wxWindow()
-%% Option = {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowwxwindow">external documentation</a>.
+-spec new(Parent, Id, [Option]) -> wxWindow() when
+	Parent::wxWindow(), Id::integer(),
+	Option :: {pos, {X::integer(), Y::integer()}}
+		 | {size, {W::integer(), H::integer()}}
+		 | {style, integer()}.
 new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
  when is_integer(Id),is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -99,30 +106,35 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
   wxe_util:construct(?wxWindow_new_3,
   <<ParentRef:32/?UI,Id:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxWindow(), Size::{W::integer(), H::integer()}) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowcachebestsize">external documentation</a>.
+-spec cacheBestSize(This, Size) -> ok when
+	This::wxWindow(), Size::{W::integer(), H::integer()}.
 cacheBestSize(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH})
  when is_integer(SizeW),is_integer(SizeH) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:cast(?wxWindow_CacheBestSize,
   <<ThisRef:32/?UI,SizeW:32/?UI,SizeH:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowcapturemouse">external documentation</a>.
+-spec captureMouse(This) -> ok when
+	This::wxWindow().
 captureMouse(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:cast(?wxWindow_CaptureMouse,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> ok
 %% @equiv center(This, [])
+-spec center(This) -> ok when
+	This::wxWindow().
+
 center(This)
  when is_record(This, wx_ref) ->
   center(This, []).
 
-%% @spec (This::wxWindow(), [Option]) -> ok
-%% Option = {dir, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowcenter">external documentation</a>.
+-spec center(This, [Option]) -> ok when
+	This::wxWindow(),
+	Option :: {dir, integer()}.
 center(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxWindow),
@@ -132,15 +144,18 @@ center(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxWindow_Center,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxWindow()) -> ok
 %% @equiv centerOnParent(This, [])
+-spec centerOnParent(This) -> ok when
+	This::wxWindow().
+
 centerOnParent(This)
  when is_record(This, wx_ref) ->
   centerOnParent(This, []).
 
-%% @spec (This::wxWindow(), [Option]) -> ok
-%% Option = {dir, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowcenteronparent">external documentation</a>.
+-spec centerOnParent(This, [Option]) -> ok when
+	This::wxWindow(),
+	Option :: {dir, integer()}.
 centerOnParent(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxWindow),
@@ -150,15 +165,18 @@ centerOnParent(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxWindow_CenterOnParent,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxWindow()) -> ok
 %% @equiv centre(This, [])
+-spec centre(This) -> ok when
+	This::wxWindow().
+
 centre(This)
  when is_record(This, wx_ref) ->
   centre(This, []).
 
-%% @spec (This::wxWindow(), [Option]) -> ok
-%% Option = {dir, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowcentre">external documentation</a>.
+-spec centre(This, [Option]) -> ok when
+	This::wxWindow(),
+	Option :: {dir, integer()}.
 centre(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxWindow),
@@ -168,15 +186,18 @@ centre(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxWindow_Centre,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxWindow()) -> ok
 %% @equiv centreOnParent(This, [])
+-spec centreOnParent(This) -> ok when
+	This::wxWindow().
+
 centreOnParent(This)
  when is_record(This, wx_ref) ->
   centreOnParent(This, []).
 
-%% @spec (This::wxWindow(), [Option]) -> ok
-%% Option = {dir, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowcentreonparent">external documentation</a>.
+-spec centreOnParent(This, [Option]) -> ok when
+	This::wxWindow(),
+	Option :: {dir, integer()}.
 centreOnParent(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxWindow),
@@ -186,38 +207,44 @@ centreOnParent(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxWindow_CentreOnParent,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxWindow()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowclearbackground">external documentation</a>.
+-spec clearBackground(This) -> ok when
+	This::wxWindow().
 clearBackground(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:cast(?wxWindow_ClearBackground,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow(), Pt::{X::integer(), Y::integer()}) -> {X::integer(), Y::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowclienttoscreen">external documentation</a>.
+-spec clientToScreen(This, Pt) -> {X::integer(), Y::integer()} when
+	This::wxWindow(), Pt::{X::integer(), Y::integer()}.
 clientToScreen(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY})
  when is_integer(PtX),is_integer(PtY) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_ClientToScreen_1,
   <<ThisRef:32/?UI,PtX:32/?UI,PtY:32/?UI>>).
 
-%% @spec (This::wxWindow(), X::integer(), Y::integer()) -> {X::integer(), Y::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowclienttoscreen">external documentation</a>.
+-spec clientToScreen(This, X, Y) -> {X::integer(), Y::integer()} when
+	This::wxWindow(), X::integer(), Y::integer().
 clientToScreen(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
  when is_integer(X),is_integer(Y) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_ClientToScreen_2,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> bool()
 %% @equiv close(This, [])
+-spec close(This) -> boolean() when
+	This::wxWindow().
+
 close(This)
  when is_record(This, wx_ref) ->
   close(This, []).
 
-%% @spec (This::wxWindow(), [Option]) -> bool()
-%% Option = {force, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowclose">external documentation</a>.
+-spec close(This, [Option]) -> boolean() when
+	This::wxWindow(),
+	Option :: {force, boolean()}.
 close(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxWindow),
@@ -227,52 +254,60 @@ close(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxWindow_Close,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxWindow(), Sz::{W::integer(), H::integer()}) -> {W::integer(), H::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowconvertdialogtopixels">external documentation</a>.
+-spec convertDialogToPixels(This, Sz) -> {W::integer(), H::integer()} when
+	This::wxWindow(), Sz::{W::integer(), H::integer()}.
 convertDialogToPixels(#wx_ref{type=ThisT,ref=ThisRef},{SzW,SzH})
  when is_integer(SzW),is_integer(SzH) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_ConvertDialogToPixels,
   <<ThisRef:32/?UI,SzW:32/?UI,SzH:32/?UI>>).
 
-%% @spec (This::wxWindow(), Sz::{W::integer(), H::integer()}) -> {W::integer(), H::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowconvertpixelstodialog">external documentation</a>.
+-spec convertPixelsToDialog(This, Sz) -> {W::integer(), H::integer()} when
+	This::wxWindow(), Sz::{W::integer(), H::integer()}.
 convertPixelsToDialog(#wx_ref{type=ThisT,ref=ThisRef},{SzW,SzH})
  when is_integer(SzW),is_integer(SzH) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_ConvertPixelsToDialog,
   <<ThisRef:32/?UI,SzW:32/?UI,SzH:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowdestroy">external documentation</a>.
+-spec 'Destroy'(This) -> boolean() when
+	This::wxWindow().
 'Destroy'(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_Destroy,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowdestroychildren">external documentation</a>.
+-spec destroyChildren(This) -> boolean() when
+	This::wxWindow().
 destroyChildren(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_DestroyChildren,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowdisable">external documentation</a>.
+-spec disable(This) -> boolean() when
+	This::wxWindow().
 disable(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_Disable,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> bool()
 %% @equiv enable(This, [])
+-spec enable(This) -> boolean() when
+	This::wxWindow().
+
 enable(This)
  when is_record(This, wx_ref) ->
   enable(This, []).
 
-%% @spec (This::wxWindow(), [Option]) -> bool()
-%% Option = {enable, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowenable">external documentation</a>.
+-spec enable(This, [Option]) -> boolean() when
+	This::wxWindow(),
+	Option :: {enable, boolean()}.
 enable(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxWindow),
@@ -282,21 +317,17 @@ enable(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxWindow_Enable,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec () -> wxWindow()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowfindfocus">external documentation</a>.
+-spec findFocus() -> wxWindow().
 findFocus() ->
   wxe_util:call(?wxWindow_FindFocus,
   <<>>).
 
-%% @spec (This::wxWindow(),X::integer()|string()) -> wxWindow()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowfindwindow">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% findWindow(This::wxWindow(), Winid::integer()) -> wxWindow() </c>
-%% </p>
-%% <p><c>
-%% findWindow(This::wxWindow(), Name::string()) -> wxWindow() </c>
-%% </p>
+-spec findWindow(This, Winid) -> wxWindow() when
+	This::wxWindow(), Winid::integer();
+      (This, Name) -> wxWindow() when
+	This::wxWindow(), Name::string().
 findWindow(#wx_ref{type=ThisT,ref=ThisRef},Winid)
  when is_integer(Winid) ->
   ?CLASS(ThisT,wxWindow),
@@ -309,15 +340,18 @@ findWindow(#wx_ref{type=ThisT,ref=ThisRef},Name)
   wxe_util:call(?wxWindow_FindWindow_1_1,
   <<ThisRef:32/?UI,(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((0+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (Winid::integer()) -> wxWindow()
 %% @equiv findWindowById(Winid, [])
+-spec findWindowById(Winid) -> wxWindow() when
+	Winid::integer().
+
 findWindowById(Winid)
  when is_integer(Winid) ->
   findWindowById(Winid, []).
 
-%% @spec (Winid::integer(), [Option]) -> wxWindow()
-%% Option = {parent, wxWindow()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowfindwindowbyid">external documentation</a>.
+-spec findWindowById(Winid, [Option]) -> wxWindow() when
+	Winid::integer(),
+	Option :: {parent, wxWindow()}.
 findWindowById(Winid, Options)
  when is_integer(Winid),is_list(Options) ->
   MOpts = fun({parent, #wx_ref{type=ParentT,ref=ParentRef}}, Acc) ->   ?CLASS(ParentT,wxWindow),[<<1:32/?UI,ParentRef:32/?UI>>|Acc];
@@ -326,15 +360,18 @@ findWindowById(Winid, Options)
   wxe_util:call(?wxWindow_FindWindowById,
   <<Winid:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (Name::string()) -> wxWindow()
 %% @equiv findWindowByName(Name, [])
+-spec findWindowByName(Name) -> wxWindow() when
+	Name::string().
+
 findWindowByName(Name)
  when is_list(Name) ->
   findWindowByName(Name, []).
 
-%% @spec (Name::string(), [Option]) -> wxWindow()
-%% Option = {parent, wxWindow()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowfindwindowbyname">external documentation</a>.
+-spec findWindowByName(Name, [Option]) -> wxWindow() when
+	Name::string(),
+	Option :: {parent, wxWindow()}.
 findWindowByName(Name, Options)
  when is_list(Name),is_list(Options) ->
   Name_UC = unicode:characters_to_binary([Name,0]),
@@ -344,15 +381,18 @@ findWindowByName(Name, Options)
   wxe_util:call(?wxWindow_FindWindowByName,
   <<(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((4+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (Label::string()) -> wxWindow()
 %% @equiv findWindowByLabel(Label, [])
+-spec findWindowByLabel(Label) -> wxWindow() when
+	Label::string().
+
 findWindowByLabel(Label)
  when is_list(Label) ->
   findWindowByLabel(Label, []).
 
-%% @spec (Label::string(), [Option]) -> wxWindow()
-%% Option = {parent, wxWindow()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowfindwindowbylabel">external documentation</a>.
+-spec findWindowByLabel(Label, [Option]) -> wxWindow() when
+	Label::string(),
+	Option :: {parent, wxWindow()}.
 findWindowByLabel(Label, Options)
  when is_list(Label),is_list(Options) ->
   Label_UC = unicode:characters_to_binary([Label,0]),
@@ -362,285 +402,326 @@ findWindowByLabel(Label, Options)
   wxe_util:call(?wxWindow_FindWindowByLabel,
   <<(byte_size(Label_UC)):32/?UI,(Label_UC)/binary, 0:(((8- ((4+byte_size(Label_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxWindow()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowfit">external documentation</a>.
+-spec fit(This) -> ok when
+	This::wxWindow().
 fit(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:cast(?wxWindow_Fit,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowfitinside">external documentation</a>.
+-spec fitInside(This) -> ok when
+	This::wxWindow().
 fitInside(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:cast(?wxWindow_FitInside,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowfreeze">external documentation</a>.
+-spec freeze(This) -> ok when
+	This::wxWindow().
 freeze(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:cast(?wxWindow_Freeze,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> wxAcceleratorTable:wxAcceleratorTable()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetacceleratortable">external documentation</a>.
+-spec getAcceleratorTable(This) -> wxAcceleratorTable:wxAcceleratorTable() when
+	This::wxWindow().
 getAcceleratorTable(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_GetAcceleratorTable,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> wx:colour()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetbackgroundcolour">external documentation</a>.
+-spec getBackgroundColour(This) -> wx:wx_colour() when
+	This::wxWindow().
 getBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_GetBackgroundColour,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> WxBackgroundStyle
-%% WxBackgroundStyle = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetbackgroundstyle">external documentation</a>.
-%%<br /> WxBackgroundStyle is one of ?wxBG_STYLE_SYSTEM | ?wxBG_STYLE_COLOUR | ?wxBG_STYLE_CUSTOM
+%%<br /> Res = ?wxBG_STYLE_SYSTEM | ?wxBG_STYLE_COLOUR | ?wxBG_STYLE_CUSTOM
+-spec getBackgroundStyle(This) -> wx:wx_enum() when
+	This::wxWindow().
 getBackgroundStyle(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_GetBackgroundStyle,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> {W::integer(), H::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetbestsize">external documentation</a>.
+-spec getBestSize(This) -> {W::integer(), H::integer()} when
+	This::wxWindow().
 getBestSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_GetBestSize,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> wxCaret:wxCaret()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetcaret">external documentation</a>.
+-spec getCaret(This) -> wxCaret:wxCaret() when
+	This::wxWindow().
 getCaret(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_GetCaret,
   <<ThisRef:32/?UI>>).
 
-%% @spec () -> wxWindow()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetcapture">external documentation</a>.
+-spec getCapture() -> wxWindow().
 getCapture() ->
   wxe_util:call(?wxWindow_GetCapture,
   <<>>).
 
-%% @spec (This::wxWindow()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetcharheight">external documentation</a>.
+-spec getCharHeight(This) -> integer() when
+	This::wxWindow().
 getCharHeight(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_GetCharHeight,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetcharwidth">external documentation</a>.
+-spec getCharWidth(This) -> integer() when
+	This::wxWindow().
 getCharWidth(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_GetCharWidth,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> [wxWindow()]
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetchildren">external documentation</a>.
+-spec getChildren(This) -> [wxWindow()] when
+	This::wxWindow().
 getChildren(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_GetChildren,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> {W::integer(), H::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetclientsize">external documentation</a>.
+-spec getClientSize(This) -> {W::integer(), H::integer()} when
+	This::wxWindow().
 getClientSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_GetClientSize,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> wxSizer:wxSizer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetcontainingsizer">external documentation</a>.
+-spec getContainingSizer(This) -> wxSizer:wxSizer() when
+	This::wxWindow().
 getContainingSizer(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_GetContainingSizer,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> wxCursor:wxCursor()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetcursor">external documentation</a>.
+-spec getCursor(This) -> wxCursor:wxCursor() when
+	This::wxWindow().
 getCursor(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_GetCursor,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> wxDropTarget:wxDropTarget()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetdroptarget">external documentation</a>.
+-spec getDropTarget(This) -> wxDropTarget:wxDropTarget() when
+	This::wxWindow().
 getDropTarget(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_GetDropTarget,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> wxEvtHandler:wxEvtHandler()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgeteventhandler">external documentation</a>.
+-spec getEventHandler(This) -> wxEvtHandler:wxEvtHandler() when
+	This::wxWindow().
 getEventHandler(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_GetEventHandler,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetextrastyle">external documentation</a>.
+-spec getExtraStyle(This) -> integer() when
+	This::wxWindow().
 getExtraStyle(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_GetExtraStyle,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> wxFont:wxFont()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetfont">external documentation</a>.
+-spec getFont(This) -> wxFont:wxFont() when
+	This::wxWindow().
 getFont(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_GetFont,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> wx:colour()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetforegroundcolour">external documentation</a>.
+-spec getForegroundColour(This) -> wx:wx_colour() when
+	This::wxWindow().
 getForegroundColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_GetForegroundColour,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> wxWindow()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetgrandparent">external documentation</a>.
+-spec getGrandParent(This) -> wxWindow() when
+	This::wxWindow().
 getGrandParent(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_GetGrandParent,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgethandle">external documentation</a>.
+-spec getHandle(This) -> integer() when
+	This::wxWindow().
 getHandle(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_GetHandle,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgethelptext">external documentation</a>.
+-spec getHelpText(This) -> string() when
+	This::wxWindow().
 getHelpText(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_GetHelpText,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetid">external documentation</a>.
+-spec getId(This) -> integer() when
+	This::wxWindow().
 getId(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_GetId,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetlabel">external documentation</a>.
+-spec getLabel(This) -> string() when
+	This::wxWindow().
 getLabel(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_GetLabel,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> {W::integer(), H::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetmaxsize">external documentation</a>.
+-spec getMaxSize(This) -> {W::integer(), H::integer()} when
+	This::wxWindow().
 getMaxSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_GetMaxSize,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> {W::integer(), H::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetminsize">external documentation</a>.
+-spec getMinSize(This) -> {W::integer(), H::integer()} when
+	This::wxWindow().
 getMinSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_GetMinSize,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetname">external documentation</a>.
+-spec getName(This) -> string() when
+	This::wxWindow().
 getName(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_GetName,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> wxWindow()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetparent">external documentation</a>.
+-spec getParent(This) -> wxWindow() when
+	This::wxWindow().
 getParent(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_GetParent,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> {X::integer(), Y::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetposition">external documentation</a>.
+-spec getPosition(This) -> {X::integer(), Y::integer()} when
+	This::wxWindow().
 getPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_GetPosition,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> {X::integer(), Y::integer(), W::integer(), H::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetrect">external documentation</a>.
+-spec getRect(This) -> {X::integer(), Y::integer(), W::integer(), H::integer()} when
+	This::wxWindow().
 getRect(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_GetRect,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> {X::integer(), Y::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetscreenposition">external documentation</a>.
+-spec getScreenPosition(This) -> {X::integer(), Y::integer()} when
+	This::wxWindow().
 getScreenPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_GetScreenPosition,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> {X::integer(), Y::integer(), W::integer(), H::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetscreenrect">external documentation</a>.
+-spec getScreenRect(This) -> {X::integer(), Y::integer(), W::integer(), H::integer()} when
+	This::wxWindow().
 getScreenRect(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_GetScreenRect,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow(), Orient::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetscrollpos">external documentation</a>.
+-spec getScrollPos(This, Orient) -> integer() when
+	This::wxWindow(), Orient::integer().
 getScrollPos(#wx_ref{type=ThisT,ref=ThisRef},Orient)
  when is_integer(Orient) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_GetScrollPos,
   <<ThisRef:32/?UI,Orient:32/?UI>>).
 
-%% @spec (This::wxWindow(), Orient::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetscrollrange">external documentation</a>.
+-spec getScrollRange(This, Orient) -> integer() when
+	This::wxWindow(), Orient::integer().
 getScrollRange(#wx_ref{type=ThisT,ref=ThisRef},Orient)
  when is_integer(Orient) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_GetScrollRange,
   <<ThisRef:32/?UI,Orient:32/?UI>>).
 
-%% @spec (This::wxWindow(), Orient::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetscrollthumb">external documentation</a>.
+-spec getScrollThumb(This, Orient) -> integer() when
+	This::wxWindow(), Orient::integer().
 getScrollThumb(#wx_ref{type=ThisT,ref=ThisRef},Orient)
  when is_integer(Orient) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_GetScrollThumb,
   <<ThisRef:32/?UI,Orient:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> {W::integer(), H::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetsize">external documentation</a>.
+-spec getSize(This) -> {W::integer(), H::integer()} when
+	This::wxWindow().
 getSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_GetSize,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> wxSizer:wxSizer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetsizer">external documentation</a>.
+-spec getSizer(This) -> wxSizer:wxSizer() when
+	This::wxWindow().
 getSizer(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_GetSizer,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow(), String::string()) -> {X::integer(), Y::integer(), Descent::integer(), ExternalLeading::integer()}
 %% @equiv getTextExtent(This,String, [])
+-spec getTextExtent(This, String) -> Result when
+	Result ::{X::integer(), Y::integer(), Descent::integer(), ExternalLeading::integer()},
+	This::wxWindow(), String::string().
+
 getTextExtent(This,String)
  when is_record(This, wx_ref),is_list(String) ->
   getTextExtent(This,String, []).
 
-%% @spec (This::wxWindow(), String::string(), [Option]) -> {X::integer(), Y::integer(), Descent::integer(), ExternalLeading::integer()}
-%% Option = {theFont, wxFont:wxFont()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgettextextent">external documentation</a>.
+-spec getTextExtent(This, String, [Option]) -> Result when
+	Result :: {X::integer(), Y::integer(), Descent::integer(), ExternalLeading::integer()},
+	This::wxWindow(), String::string(),
+	Option :: {theFont, wxFont:wxFont()}.
 getTextExtent(#wx_ref{type=ThisT,ref=ThisRef},String, Options)
  when is_list(String),is_list(Options) ->
   ?CLASS(ThisT,wxWindow),
@@ -651,109 +732,117 @@ getTextExtent(#wx_ref{type=ThisT,ref=ThisRef},String, Options)
   wxe_util:call(?wxWindow_GetTextExtent,
   <<ThisRef:32/?UI,(byte_size(String_UC)):32/?UI,(String_UC)/binary, 0:(((8- ((0+byte_size(String_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxWindow()) -> wxToolTip:wxToolTip()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgettooltip">external documentation</a>.
+-spec getToolTip(This) -> wxToolTip:wxToolTip() when
+	This::wxWindow().
 getToolTip(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_GetToolTip,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> wxRegion:wxRegion()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetupdateregion">external documentation</a>.
+-spec getUpdateRegion(This) -> wxRegion:wxRegion() when
+	This::wxWindow().
 getUpdateRegion(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_GetUpdateRegion,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> {W::integer(), H::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetvirtualsize">external documentation</a>.
+-spec getVirtualSize(This) -> {W::integer(), H::integer()} when
+	This::wxWindow().
 getVirtualSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_GetVirtualSize,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetwindowstyleflag">external documentation</a>.
+-spec getWindowStyleFlag(This) -> integer() when
+	This::wxWindow().
 getWindowStyleFlag(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_GetWindowStyleFlag,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> WxWindowVariant
-%% WxWindowVariant = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetwindowvariant">external documentation</a>.
-%%<br /> WxWindowVariant is one of ?wxWINDOW_VARIANT_NORMAL | ?wxWINDOW_VARIANT_SMALL | ?wxWINDOW_VARIANT_MINI | ?wxWINDOW_VARIANT_LARGE | ?wxWINDOW_VARIANT_MAX
+%%<br /> Res = ?wxWINDOW_VARIANT_NORMAL | ?wxWINDOW_VARIANT_SMALL | ?wxWINDOW_VARIANT_MINI | ?wxWINDOW_VARIANT_LARGE | ?wxWINDOW_VARIANT_MAX
+-spec getWindowVariant(This) -> wx:wx_enum() when
+	This::wxWindow().
 getWindowVariant(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_GetWindowVariant,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowhascapture">external documentation</a>.
+-spec hasCapture(This) -> boolean() when
+	This::wxWindow().
 hasCapture(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_HasCapture,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow(), Orient::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowhasscrollbar">external documentation</a>.
+-spec hasScrollbar(This, Orient) -> boolean() when
+	This::wxWindow(), Orient::integer().
 hasScrollbar(#wx_ref{type=ThisT,ref=ThisRef},Orient)
  when is_integer(Orient) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_HasScrollbar,
   <<ThisRef:32/?UI,Orient:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowhastransparentbackground">external documentation</a>.
+-spec hasTransparentBackground(This) -> boolean() when
+	This::wxWindow().
 hasTransparentBackground(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_HasTransparentBackground,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowhide">external documentation</a>.
+-spec hide(This) -> boolean() when
+	This::wxWindow().
 hide(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_Hide,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowinheritattributes">external documentation</a>.
+-spec inheritAttributes(This) -> ok when
+	This::wxWindow().
 inheritAttributes(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:cast(?wxWindow_InheritAttributes,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowinitdialog">external documentation</a>.
+-spec initDialog(This) -> ok when
+	This::wxWindow().
 initDialog(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:cast(?wxWindow_InitDialog,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowinvalidatebestsize">external documentation</a>.
+-spec invalidateBestSize(This) -> ok when
+	This::wxWindow().
 invalidateBestSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:cast(?wxWindow_InvalidateBestSize,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowisenabled">external documentation</a>.
+-spec isEnabled(This) -> boolean() when
+	This::wxWindow().
 isEnabled(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_IsEnabled,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow(),X::term()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowisexposed">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% isExposed(This::wxWindow(), Pt::{X::integer(), Y::integer()}) -> bool() </c>
-%% </p>
-%% <p><c>
-%% isExposed(This::wxWindow(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}) -> bool() </c>
-%% </p>
+-spec isExposed(This, Pt) -> boolean() when
+	This::wxWindow(), Pt::{X::integer(), Y::integer()};
+      (This, Rect) -> boolean() when
+	This::wxWindow(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}.
 isExposed(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY})
  when is_integer(PtX),is_integer(PtY) ->
   ?CLASS(ThisT,wxWindow),
@@ -765,80 +854,92 @@ isExposed(#wx_ref{type=ThisT,ref=ThisRef},{RectX,RectY,RectW,RectH})
   wxe_util:call(?wxWindow_IsExposed_1_1,
   <<ThisRef:32/?UI,RectX:32/?UI,RectY:32/?UI,RectW:32/?UI,RectH:32/?UI>>).
 
-%% @spec (This::wxWindow(), X::integer(), Y::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowisexposed">external documentation</a>.
+-spec isExposed(This, X, Y) -> boolean() when
+	This::wxWindow(), X::integer(), Y::integer().
 isExposed(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
  when is_integer(X),is_integer(Y) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_IsExposed_2,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI>>).
 
-%% @spec (This::wxWindow(), X::integer(), Y::integer(), W::integer(), H::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowisexposed">external documentation</a>.
+-spec isExposed(This, X, Y, W, H) -> boolean() when
+	This::wxWindow(), X::integer(), Y::integer(), W::integer(), H::integer().
 isExposed(#wx_ref{type=ThisT,ref=ThisRef},X,Y,W,H)
  when is_integer(X),is_integer(Y),is_integer(W),is_integer(H) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_IsExposed_4,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI,W:32/?UI,H:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowisretained">external documentation</a>.
+-spec isRetained(This) -> boolean() when
+	This::wxWindow().
 isRetained(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_IsRetained,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowisshown">external documentation</a>.
+-spec isShown(This) -> boolean() when
+	This::wxWindow().
 isShown(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_IsShown,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowistoplevel">external documentation</a>.
+-spec isTopLevel(This) -> boolean() when
+	This::wxWindow().
 isTopLevel(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_IsTopLevel,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowlayout">external documentation</a>.
+-spec layout(This) -> boolean() when
+	This::wxWindow().
 layout(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_Layout,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowlinedown">external documentation</a>.
+-spec lineDown(This) -> boolean() when
+	This::wxWindow().
 lineDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_LineDown,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowlineup">external documentation</a>.
+-spec lineUp(This) -> boolean() when
+	This::wxWindow().
 lineUp(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_LineUp,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowlower">external documentation</a>.
+-spec lower(This) -> ok when
+	This::wxWindow().
 lower(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:cast(?wxWindow_Lower,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> ok
 %% @equiv makeModal(This, [])
+-spec makeModal(This) -> ok when
+	This::wxWindow().
+
 makeModal(This)
  when is_record(This, wx_ref) ->
   makeModal(This, []).
 
-%% @spec (This::wxWindow(), [Option]) -> ok
-%% Option = {modal, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowmakemodal">external documentation</a>.
+-spec makeModal(This, [Option]) -> ok when
+	This::wxWindow(),
+	Option :: {modal, boolean()}.
 makeModal(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxWindow),
@@ -848,21 +949,20 @@ makeModal(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxWindow_MakeModal,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxWindow(), Pt::{X::integer(), Y::integer()}) -> ok
 %% @equiv move(This,Pt, [])
+-spec move(This, Pt) -> ok when
+	This::wxWindow(), Pt::{X::integer(), Y::integer()}.
+
 move(This,Pt={PtX,PtY})
  when is_record(This, wx_ref),is_integer(PtX),is_integer(PtY) ->
   move(This,Pt, []).
 
-%% @spec (This::wxWindow(),X::integer()|term(),X::integer()|term()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowmove">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% move(This::wxWindow(), X::integer(), Y::integer()) -> move(This,X,Y, []) </c></p>
-%% <p><c>
-%% move(This::wxWindow(), Pt::{X::integer(), Y::integer()}, [Option]) -> ok </c>
-%%<br /> Option = {flags, integer()}
-%% </p>
+-spec move(This, X, Y) -> ok when
+	This::wxWindow(), X::integer(), Y::integer();
+      (This, Pt, [Option]) -> ok when
+	This::wxWindow(), Pt::{X::integer(), Y::integer()},
+	Option :: {flags, integer()}.
 
 move(This,X,Y)
  when is_record(This, wx_ref),is_integer(X),is_integer(Y) ->
@@ -876,9 +976,10 @@ move(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY}, Options)
   wxe_util:cast(?wxWindow_Move_2,
   <<ThisRef:32/?UI,PtX:32/?UI,PtY:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxWindow(), X::integer(), Y::integer(), [Option]) -> ok
-%% Option = {flags, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowmove">external documentation</a>.
+-spec move(This, X, Y, [Option]) -> ok when
+	This::wxWindow(), X::integer(), Y::integer(),
+	Option :: {flags, integer()}.
 move(#wx_ref{type=ThisT,ref=ThisRef},X,Y, Options)
  when is_integer(X),is_integer(Y),is_list(Options) ->
   ?CLASS(ThisT,wxWindow),
@@ -888,31 +989,36 @@ move(#wx_ref{type=ThisT,ref=ThisRef},X,Y, Options)
   wxe_util:cast(?wxWindow_Move_3,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxWindow(), Win::wxWindow()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowmoveafterintaborder">external documentation</a>.
+-spec moveAfterInTabOrder(This, Win) -> ok when
+	This::wxWindow(), Win::wxWindow().
 moveAfterInTabOrder(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WinT,ref=WinRef}) ->
   ?CLASS(ThisT,wxWindow),
   ?CLASS(WinT,wxWindow),
   wxe_util:cast(?wxWindow_MoveAfterInTabOrder,
   <<ThisRef:32/?UI,WinRef:32/?UI>>).
 
-%% @spec (This::wxWindow(), Win::wxWindow()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowmovebeforeintaborder">external documentation</a>.
+-spec moveBeforeInTabOrder(This, Win) -> ok when
+	This::wxWindow(), Win::wxWindow().
 moveBeforeInTabOrder(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WinT,ref=WinRef}) ->
   ?CLASS(ThisT,wxWindow),
   ?CLASS(WinT,wxWindow),
   wxe_util:cast(?wxWindow_MoveBeforeInTabOrder,
   <<ThisRef:32/?UI,WinRef:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> bool()
 %% @equiv navigate(This, [])
+-spec navigate(This) -> boolean() when
+	This::wxWindow().
+
 navigate(This)
  when is_record(This, wx_ref) ->
   navigate(This, []).
 
-%% @spec (This::wxWindow(), [Option]) -> bool()
-%% Option = {flags, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindownavigate">external documentation</a>.
+-spec navigate(This, [Option]) -> boolean() when
+	This::wxWindow(),
+	Option :: {flags, integer()}.
 navigate(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxWindow),
@@ -922,29 +1028,34 @@ navigate(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxWindow_Navigate,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxWindow()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowpagedown">external documentation</a>.
+-spec pageDown(This) -> boolean() when
+	This::wxWindow().
 pageDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_PageDown,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowpageup">external documentation</a>.
+-spec pageUp(This) -> boolean() when
+	This::wxWindow().
 pageUp(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_PageUp,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> wxEvtHandler:wxEvtHandler()
 %% @equiv popEventHandler(This, [])
+-spec popEventHandler(This) -> wxEvtHandler:wxEvtHandler() when
+	This::wxWindow().
+
 popEventHandler(This)
  when is_record(This, wx_ref) ->
   popEventHandler(This, []).
 
-%% @spec (This::wxWindow(), [Option]) -> wxEvtHandler:wxEvtHandler()
-%% Option = {deleteHandler, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowpopeventhandler">external documentation</a>.
+-spec popEventHandler(This, [Option]) -> wxEvtHandler:wxEvtHandler() when
+	This::wxWindow(),
+	Option :: {deleteHandler, boolean()}.
 popEventHandler(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxWindow),
@@ -954,15 +1065,18 @@ popEventHandler(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxWindow_PopEventHandler,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxWindow(), Menu::wxMenu:wxMenu()) -> bool()
 %% @equiv popupMenu(This,Menu, [])
+-spec popupMenu(This, Menu) -> boolean() when
+	This::wxWindow(), Menu::wxMenu:wxMenu().
+
 popupMenu(This,Menu)
  when is_record(This, wx_ref),is_record(Menu, wx_ref) ->
   popupMenu(This,Menu, []).
 
-%% @spec (This::wxWindow(), Menu::wxMenu:wxMenu(), [Option]) -> bool()
-%% Option = {pos, {X::integer(), Y::integer()}}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowpopupmenu">external documentation</a>.
+-spec popupMenu(This, Menu, [Option]) -> boolean() when
+	This::wxWindow(), Menu::wxMenu:wxMenu(),
+	Option :: {pos, {X::integer(), Y::integer()}}.
 popupMenu(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=MenuT,ref=MenuRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxWindow),
@@ -973,8 +1087,9 @@ popupMenu(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=MenuT,ref=MenuRef}, Optio
   wxe_util:call(?wxWindow_PopupMenu_2,
   <<ThisRef:32/?UI,MenuRef:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxWindow(), Menu::wxMenu:wxMenu(), X::integer(), Y::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowpopupmenu">external documentation</a>.
+-spec popupMenu(This, Menu, X, Y) -> boolean() when
+	This::wxWindow(), Menu::wxMenu:wxMenu(), X::integer(), Y::integer().
 popupMenu(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=MenuT,ref=MenuRef},X,Y)
  when is_integer(X),is_integer(Y) ->
   ?CLASS(ThisT,wxWindow),
@@ -982,22 +1097,27 @@ popupMenu(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=MenuT,ref=MenuRef},X,Y)
   wxe_util:call(?wxWindow_PopupMenu_3,
   <<ThisRef:32/?UI,MenuRef:32/?UI,X:32/?UI,Y:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowraise">external documentation</a>.
+-spec raise(This) -> ok when
+	This::wxWindow().
 raise(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:cast(?wxWindow_Raise,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> ok
 %% @equiv refresh(This, [])
+-spec refresh(This) -> ok when
+	This::wxWindow().
+
 refresh(This)
  when is_record(This, wx_ref) ->
   refresh(This, []).
 
-%% @spec (This::wxWindow(), [Option]) -> ok
-%% Option = {eraseBackground, bool()} | {rect, {X::integer(), Y::integer(), W::integer(), H::integer()}}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowrefresh">external documentation</a>.
+-spec refresh(This, [Option]) -> ok when
+	This::wxWindow(),
+	Option :: {eraseBackground, boolean()}
+		 | {rect, {X::integer(), Y::integer(), W::integer(), H::integer()}}.
 refresh(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxWindow),
@@ -1008,15 +1128,18 @@ refresh(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxWindow_Refresh,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxWindow(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}) -> ok
 %% @equiv refreshRect(This,Rect, [])
+-spec refreshRect(This, Rect) -> ok when
+	This::wxWindow(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}.
+
 refreshRect(This,Rect={RectX,RectY,RectW,RectH})
  when is_record(This, wx_ref),is_integer(RectX),is_integer(RectY),is_integer(RectW),is_integer(RectH) ->
   refreshRect(This,Rect, []).
 
-%% @spec (This::wxWindow(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}, [Option]) -> ok
-%% Option = {eraseBackground, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowrefreshrect">external documentation</a>.
+-spec refreshRect(This, Rect, [Option]) -> ok when
+	This::wxWindow(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()},
+	Option :: {eraseBackground, boolean()}.
 refreshRect(#wx_ref{type=ThisT,ref=ThisRef},{RectX,RectY,RectW,RectH}, Options)
  when is_integer(RectX),is_integer(RectY),is_integer(RectW),is_integer(RectH),is_list(Options) ->
   ?CLASS(ThisT,wxWindow),
@@ -1026,69 +1149,79 @@ refreshRect(#wx_ref{type=ThisT,ref=ThisRef},{RectX,RectY,RectW,RectH}, Options)
   wxe_util:cast(?wxWindow_RefreshRect,
   <<ThisRef:32/?UI,RectX:32/?UI,RectY:32/?UI,RectW:32/?UI,RectH:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxWindow()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowreleasemouse">external documentation</a>.
+-spec releaseMouse(This) -> ok when
+	This::wxWindow().
 releaseMouse(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:cast(?wxWindow_ReleaseMouse,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow(), Child::wxWindow()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowremovechild">external documentation</a>.
+-spec removeChild(This, Child) -> ok when
+	This::wxWindow(), Child::wxWindow().
 removeChild(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ChildT,ref=ChildRef}) ->
   ?CLASS(ThisT,wxWindow),
   ?CLASS(ChildT,wxWindow),
   wxe_util:cast(?wxWindow_RemoveChild,
   <<ThisRef:32/?UI,ChildRef:32/?UI>>).
 
-%% @spec (This::wxWindow(), NewParent::wxWindow()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowreparent">external documentation</a>.
+-spec reparent(This, NewParent) -> boolean() when
+	This::wxWindow(), NewParent::wxWindow().
 reparent(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=NewParentT,ref=NewParentRef}) ->
   ?CLASS(ThisT,wxWindow),
   ?CLASS(NewParentT,wxWindow),
   wxe_util:call(?wxWindow_Reparent,
   <<ThisRef:32/?UI,NewParentRef:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> {X::integer(), Y::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowscreentoclient">external documentation</a>.
+-spec screenToClient(This) -> {X::integer(), Y::integer()} when
+	This::wxWindow().
 screenToClient(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_ScreenToClient_2,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow(), Pt::{X::integer(), Y::integer()}) -> {X::integer(), Y::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowscreentoclient">external documentation</a>.
+-spec screenToClient(This, Pt) -> {X::integer(), Y::integer()} when
+	This::wxWindow(), Pt::{X::integer(), Y::integer()}.
 screenToClient(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY})
  when is_integer(PtX),is_integer(PtY) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_ScreenToClient_1,
   <<ThisRef:32/?UI,PtX:32/?UI,PtY:32/?UI>>).
 
-%% @spec (This::wxWindow(), Lines::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowscrolllines">external documentation</a>.
+-spec scrollLines(This, Lines) -> boolean() when
+	This::wxWindow(), Lines::integer().
 scrollLines(#wx_ref{type=ThisT,ref=ThisRef},Lines)
  when is_integer(Lines) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_ScrollLines,
   <<ThisRef:32/?UI,Lines:32/?UI>>).
 
-%% @spec (This::wxWindow(), Pages::integer()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowscrollpages">external documentation</a>.
+-spec scrollPages(This, Pages) -> boolean() when
+	This::wxWindow(), Pages::integer().
 scrollPages(#wx_ref{type=ThisT,ref=ThisRef},Pages)
  when is_integer(Pages) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_ScrollPages,
   <<ThisRef:32/?UI,Pages:32/?UI>>).
 
-%% @spec (This::wxWindow(), Dx::integer(), Dy::integer()) -> ok
 %% @equiv scrollWindow(This,Dx,Dy, [])
+-spec scrollWindow(This, Dx, Dy) -> ok when
+	This::wxWindow(), Dx::integer(), Dy::integer().
+
 scrollWindow(This,Dx,Dy)
  when is_record(This, wx_ref),is_integer(Dx),is_integer(Dy) ->
   scrollWindow(This,Dx,Dy, []).
 
-%% @spec (This::wxWindow(), Dx::integer(), Dy::integer(), [Option]) -> ok
-%% Option = {rect, {X::integer(), Y::integer(), W::integer(), H::integer()}}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowscrollwindow">external documentation</a>.
+-spec scrollWindow(This, Dx, Dy, [Option]) -> ok when
+	This::wxWindow(), Dx::integer(), Dy::integer(),
+	Option :: {rect, {X::integer(), Y::integer(), W::integer(), H::integer()}}.
 scrollWindow(#wx_ref{type=ThisT,ref=ThisRef},Dx,Dy, Options)
  when is_integer(Dx),is_integer(Dy),is_list(Options) ->
   ?CLASS(ThisT,wxWindow),
@@ -1098,57 +1231,57 @@ scrollWindow(#wx_ref{type=ThisT,ref=ThisRef},Dx,Dy, Options)
   wxe_util:cast(?wxWindow_ScrollWindow,
   <<ThisRef:32/?UI,Dx:32/?UI,Dy:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxWindow(), Accel::wxAcceleratorTable:wxAcceleratorTable()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetacceleratortable">external documentation</a>.
+-spec setAcceleratorTable(This, Accel) -> ok when
+	This::wxWindow(), Accel::wxAcceleratorTable:wxAcceleratorTable().
 setAcceleratorTable(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=AccelT,ref=AccelRef}) ->
   ?CLASS(ThisT,wxWindow),
   ?CLASS(AccelT,wxAcceleratorTable),
   wxe_util:cast(?wxWindow_SetAcceleratorTable,
   <<ThisRef:32/?UI,AccelRef:32/?UI>>).
 
-%% @spec (This::wxWindow(), AutoLayout::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetautolayout">external documentation</a>.
+-spec setAutoLayout(This, AutoLayout) -> ok when
+	This::wxWindow(), AutoLayout::boolean().
 setAutoLayout(#wx_ref{type=ThisT,ref=ThisRef},AutoLayout)
  when is_boolean(AutoLayout) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:cast(?wxWindow_SetAutoLayout,
   <<ThisRef:32/?UI,(wxe_util:from_bool(AutoLayout)):32/?UI>>).
 
-%% @spec (This::wxWindow(), Colour::wx:colour()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetbackgroundcolour">external documentation</a>.
+-spec setBackgroundColour(This, Colour) -> boolean() when
+	This::wxWindow(), Colour::wx:wx_colour().
 setBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef},Colour)
  when tuple_size(Colour) =:= 3; tuple_size(Colour) =:= 4 ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_SetBackgroundColour,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(Colour)):16/binary>>).
 
-%% @spec (This::wxWindow(), Style::WxBackgroundStyle) -> bool()
-%% WxBackgroundStyle = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetbackgroundstyle">external documentation</a>.
-%%<br /> WxBackgroundStyle is one of ?wxBG_STYLE_SYSTEM | ?wxBG_STYLE_COLOUR | ?wxBG_STYLE_CUSTOM
+%%<br /> Style = ?wxBG_STYLE_SYSTEM | ?wxBG_STYLE_COLOUR | ?wxBG_STYLE_CUSTOM
+-spec setBackgroundStyle(This, Style) -> boolean() when
+	This::wxWindow(), Style::wx:wx_enum().
 setBackgroundStyle(#wx_ref{type=ThisT,ref=ThisRef},Style)
  when is_integer(Style) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_SetBackgroundStyle,
   <<ThisRef:32/?UI,Style:32/?UI>>).
 
-%% @spec (This::wxWindow(), Caret::wxCaret:wxCaret()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetcaret">external documentation</a>.
+-spec setCaret(This, Caret) -> ok when
+	This::wxWindow(), Caret::wxCaret:wxCaret().
 setCaret(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=CaretT,ref=CaretRef}) ->
   ?CLASS(ThisT,wxWindow),
   ?CLASS(CaretT,wxCaret),
   wxe_util:cast(?wxWindow_SetCaret,
   <<ThisRef:32/?UI,CaretRef:32/?UI>>).
 
-%% @spec (This::wxWindow(),X::term()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetclientsize">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% setClientSize(This::wxWindow(), Size::{W::integer(), H::integer()}) -> ok </c>
-%% </p>
-%% <p><c>
-%% setClientSize(This::wxWindow(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}) -> ok </c>
-%% </p>
+-spec setClientSize(This, Size) -> ok when
+	This::wxWindow(), Size::{W::integer(), H::integer()};
+      (This, Rect) -> ok when
+	This::wxWindow(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}.
 setClientSize(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH})
  when is_integer(SizeW),is_integer(SizeH) ->
   ?CLASS(ThisT,wxWindow),
@@ -1160,118 +1293,133 @@ setClientSize(#wx_ref{type=ThisT,ref=ThisRef},{RectX,RectY,RectW,RectH})
   wxe_util:cast(?wxWindow_SetClientSize_1_1,
   <<ThisRef:32/?UI,RectX:32/?UI,RectY:32/?UI,RectW:32/?UI,RectH:32/?UI>>).
 
-%% @spec (This::wxWindow(), Width::integer(), Height::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetclientsize">external documentation</a>.
+-spec setClientSize(This, Width, Height) -> ok when
+	This::wxWindow(), Width::integer(), Height::integer().
 setClientSize(#wx_ref{type=ThisT,ref=ThisRef},Width,Height)
  when is_integer(Width),is_integer(Height) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:cast(?wxWindow_SetClientSize_2,
   <<ThisRef:32/?UI,Width:32/?UI,Height:32/?UI>>).
 
-%% @spec (This::wxWindow(), Sizer::wxSizer:wxSizer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetcontainingsizer">external documentation</a>.
+-spec setContainingSizer(This, Sizer) -> ok when
+	This::wxWindow(), Sizer::wxSizer:wxSizer().
 setContainingSizer(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=SizerT,ref=SizerRef}) ->
   ?CLASS(ThisT,wxWindow),
   ?CLASS(SizerT,wxSizer),
   wxe_util:cast(?wxWindow_SetContainingSizer,
   <<ThisRef:32/?UI,SizerRef:32/?UI>>).
 
-%% @spec (This::wxWindow(), Cursor::wxCursor:wxCursor()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetcursor">external documentation</a>.
+-spec setCursor(This, Cursor) -> boolean() when
+	This::wxWindow(), Cursor::wxCursor:wxCursor().
 setCursor(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=CursorT,ref=CursorRef}) ->
   ?CLASS(ThisT,wxWindow),
   ?CLASS(CursorT,wxCursor),
   wxe_util:call(?wxWindow_SetCursor,
   <<ThisRef:32/?UI,CursorRef:32/?UI>>).
 
-%% @spec (This::wxWindow(), MaxSize::{W::integer(), H::integer()}) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetmaxsize">external documentation</a>.
+-spec setMaxSize(This, MaxSize) -> ok when
+	This::wxWindow(), MaxSize::{W::integer(), H::integer()}.
 setMaxSize(#wx_ref{type=ThisT,ref=ThisRef},{MaxSizeW,MaxSizeH})
  when is_integer(MaxSizeW),is_integer(MaxSizeH) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:cast(?wxWindow_SetMaxSize,
   <<ThisRef:32/?UI,MaxSizeW:32/?UI,MaxSizeH:32/?UI>>).
 
-%% @spec (This::wxWindow(), MinSize::{W::integer(), H::integer()}) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetminsize">external documentation</a>.
+-spec setMinSize(This, MinSize) -> ok when
+	This::wxWindow(), MinSize::{W::integer(), H::integer()}.
 setMinSize(#wx_ref{type=ThisT,ref=ThisRef},{MinSizeW,MinSizeH})
  when is_integer(MinSizeW),is_integer(MinSizeH) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:cast(?wxWindow_SetMinSize,
   <<ThisRef:32/?UI,MinSizeW:32/?UI,MinSizeH:32/?UI>>).
 
-%% @spec (This::wxWindow(), Colour::wx:colour()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetownbackgroundcolour">external documentation</a>.
+-spec setOwnBackgroundColour(This, Colour) -> ok when
+	This::wxWindow(), Colour::wx:wx_colour().
 setOwnBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef},Colour)
  when tuple_size(Colour) =:= 3; tuple_size(Colour) =:= 4 ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:cast(?wxWindow_SetOwnBackgroundColour,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(Colour)):16/binary>>).
 
-%% @spec (This::wxWindow(), Font::wxFont:wxFont()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetownfont">external documentation</a>.
+-spec setOwnFont(This, Font) -> ok when
+	This::wxWindow(), Font::wxFont:wxFont().
 setOwnFont(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FontT,ref=FontRef}) ->
   ?CLASS(ThisT,wxWindow),
   ?CLASS(FontT,wxFont),
   wxe_util:cast(?wxWindow_SetOwnFont,
   <<ThisRef:32/?UI,FontRef:32/?UI>>).
 
-%% @spec (This::wxWindow(), Colour::wx:colour()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetownforegroundcolour">external documentation</a>.
+-spec setOwnForegroundColour(This, Colour) -> ok when
+	This::wxWindow(), Colour::wx:wx_colour().
 setOwnForegroundColour(#wx_ref{type=ThisT,ref=ThisRef},Colour)
  when tuple_size(Colour) =:= 3; tuple_size(Colour) =:= 4 ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:cast(?wxWindow_SetOwnForegroundColour,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(Colour)):16/binary>>).
 
-%% @spec (This::wxWindow(), DropTarget::wxDropTarget:wxDropTarget()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetdroptarget">external documentation</a>.
+-spec setDropTarget(This, DropTarget) -> ok when
+	This::wxWindow(), DropTarget::wxDropTarget:wxDropTarget().
 setDropTarget(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=DropTargetT,ref=DropTargetRef}) ->
   ?CLASS(ThisT,wxWindow),
   ?CLASS(DropTargetT,wxDropTarget),
   wxe_util:cast(?wxWindow_SetDropTarget,
   <<ThisRef:32/?UI,DropTargetRef:32/?UI>>).
 
-%% @spec (This::wxWindow(), ExStyle::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetextrastyle">external documentation</a>.
+-spec setExtraStyle(This, ExStyle) -> ok when
+	This::wxWindow(), ExStyle::integer().
 setExtraStyle(#wx_ref{type=ThisT,ref=ThisRef},ExStyle)
  when is_integer(ExStyle) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:cast(?wxWindow_SetExtraStyle,
   <<ThisRef:32/?UI,ExStyle:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetfocus">external documentation</a>.
+-spec setFocus(This) -> ok when
+	This::wxWindow().
 setFocus(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:cast(?wxWindow_SetFocus,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetfocusfromkbd">external documentation</a>.
+-spec setFocusFromKbd(This) -> ok when
+	This::wxWindow().
 setFocusFromKbd(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:cast(?wxWindow_SetFocusFromKbd,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow(), Font::wxFont:wxFont()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetfont">external documentation</a>.
+-spec setFont(This, Font) -> boolean() when
+	This::wxWindow(), Font::wxFont:wxFont().
 setFont(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FontT,ref=FontRef}) ->
   ?CLASS(ThisT,wxWindow),
   ?CLASS(FontT,wxFont),
   wxe_util:call(?wxWindow_SetFont,
   <<ThisRef:32/?UI,FontRef:32/?UI>>).
 
-%% @spec (This::wxWindow(), Colour::wx:colour()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetforegroundcolour">external documentation</a>.
+-spec setForegroundColour(This, Colour) -> boolean() when
+	This::wxWindow(), Colour::wx:wx_colour().
 setForegroundColour(#wx_ref{type=ThisT,ref=ThisRef},Colour)
  when tuple_size(Colour) =:= 3; tuple_size(Colour) =:= 4 ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_SetForegroundColour,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(Colour)):16/binary>>).
 
-%% @spec (This::wxWindow(), Text::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsethelptext">external documentation</a>.
+-spec setHelpText(This, Text) -> ok when
+	This::wxWindow(), Text::string().
 setHelpText(#wx_ref{type=ThisT,ref=ThisRef},Text)
  when is_list(Text) ->
   ?CLASS(ThisT,wxWindow),
@@ -1279,16 +1427,18 @@ setHelpText(#wx_ref{type=ThisT,ref=ThisRef},Text)
   wxe_util:cast(?wxWindow_SetHelpText,
   <<ThisRef:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxWindow(), Winid::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetid">external documentation</a>.
+-spec setId(This, Winid) -> ok when
+	This::wxWindow(), Winid::integer().
 setId(#wx_ref{type=ThisT,ref=ThisRef},Winid)
  when is_integer(Winid) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:cast(?wxWindow_SetId,
   <<ThisRef:32/?UI,Winid:32/?UI>>).
 
-%% @spec (This::wxWindow(), Label::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetlabel">external documentation</a>.
+-spec setLabel(This, Label) -> ok when
+	This::wxWindow(), Label::string().
 setLabel(#wx_ref{type=ThisT,ref=ThisRef},Label)
  when is_list(Label) ->
   ?CLASS(ThisT,wxWindow),
@@ -1296,8 +1446,9 @@ setLabel(#wx_ref{type=ThisT,ref=ThisRef},Label)
   wxe_util:cast(?wxWindow_SetLabel,
   <<ThisRef:32/?UI,(byte_size(Label_UC)):32/?UI,(Label_UC)/binary, 0:(((8- ((0+byte_size(Label_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxWindow(), Name::string()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetname">external documentation</a>.
+-spec setName(This, Name) -> ok when
+	This::wxWindow(), Name::string().
 setName(#wx_ref{type=ThisT,ref=ThisRef},Name)
  when is_list(Name) ->
   ?CLASS(ThisT,wxWindow),
@@ -1305,23 +1456,27 @@ setName(#wx_ref{type=ThisT,ref=ThisRef},Name)
   wxe_util:cast(?wxWindow_SetName,
   <<ThisRef:32/?UI,(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((0+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxWindow(), Pal::wxPalette:wxPalette()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetpalette">external documentation</a>.
+-spec setPalette(This, Pal) -> ok when
+	This::wxWindow(), Pal::wxPalette:wxPalette().
 setPalette(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PalT,ref=PalRef}) ->
   ?CLASS(ThisT,wxWindow),
   ?CLASS(PalT,wxPalette),
   wxe_util:cast(?wxWindow_SetPalette,
   <<ThisRef:32/?UI,PalRef:32/?UI>>).
 
-%% @spec (This::wxWindow(), Orient::integer(), Pos::integer(), ThumbVisible::integer(), Range::integer()) -> ok
 %% @equiv setScrollbar(This,Orient,Pos,ThumbVisible,Range, [])
+-spec setScrollbar(This, Orient, Pos, ThumbVisible, Range) -> ok when
+	This::wxWindow(), Orient::integer(), Pos::integer(), ThumbVisible::integer(), Range::integer().
+
 setScrollbar(This,Orient,Pos,ThumbVisible,Range)
  when is_record(This, wx_ref),is_integer(Orient),is_integer(Pos),is_integer(ThumbVisible),is_integer(Range) ->
   setScrollbar(This,Orient,Pos,ThumbVisible,Range, []).
 
-%% @spec (This::wxWindow(), Orient::integer(), Pos::integer(), ThumbVisible::integer(), Range::integer(), [Option]) -> ok
-%% Option = {refresh, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetscrollbar">external documentation</a>.
+-spec setScrollbar(This, Orient, Pos, ThumbVisible, Range, [Option]) -> ok when
+	This::wxWindow(), Orient::integer(), Pos::integer(), ThumbVisible::integer(), Range::integer(),
+	Option :: {refresh, boolean()}.
 setScrollbar(#wx_ref{type=ThisT,ref=ThisRef},Orient,Pos,ThumbVisible,Range, Options)
  when is_integer(Orient),is_integer(Pos),is_integer(ThumbVisible),is_integer(Range),is_list(Options) ->
   ?CLASS(ThisT,wxWindow),
@@ -1331,15 +1486,18 @@ setScrollbar(#wx_ref{type=ThisT,ref=ThisRef},Orient,Pos,ThumbVisible,Range, Opti
   wxe_util:cast(?wxWindow_SetScrollbar,
   <<ThisRef:32/?UI,Orient:32/?UI,Pos:32/?UI,ThumbVisible:32/?UI,Range:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxWindow(), Orient::integer(), Pos::integer()) -> ok
 %% @equiv setScrollPos(This,Orient,Pos, [])
+-spec setScrollPos(This, Orient, Pos) -> ok when
+	This::wxWindow(), Orient::integer(), Pos::integer().
+
 setScrollPos(This,Orient,Pos)
  when is_record(This, wx_ref),is_integer(Orient),is_integer(Pos) ->
   setScrollPos(This,Orient,Pos, []).
 
-%% @spec (This::wxWindow(), Orient::integer(), Pos::integer(), [Option]) -> ok
-%% Option = {refresh, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetscrollpos">external documentation</a>.
+-spec setScrollPos(This, Orient, Pos, [Option]) -> ok when
+	This::wxWindow(), Orient::integer(), Pos::integer(),
+	Option :: {refresh, boolean()}.
 setScrollPos(#wx_ref{type=ThisT,ref=ThisRef},Orient,Pos, Options)
  when is_integer(Orient),is_integer(Pos),is_list(Options) ->
   ?CLASS(ThisT,wxWindow),
@@ -1349,14 +1507,11 @@ setScrollPos(#wx_ref{type=ThisT,ref=ThisRef},Orient,Pos, Options)
   wxe_util:cast(?wxWindow_SetScrollPos,
   <<ThisRef:32/?UI,Orient:32/?UI,Pos:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxWindow(),X::term()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetsize">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% setSize(This::wxWindow(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}) -> setSize(This,Rect, []) </c></p>
-%% <p><c>
-%% setSize(This::wxWindow(), Size::{W::integer(), H::integer()}) -> ok </c>
-%% </p>
+-spec setSize(This, Rect) -> ok when
+	This::wxWindow(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()};
+      (This, Size) -> ok when
+	This::wxWindow(), Size::{W::integer(), H::integer()}.
 
 setSize(This,Rect={RectX,RectY,RectW,RectH})
  when is_record(This, wx_ref),is_integer(RectX),is_integer(RectY),is_integer(RectW),is_integer(RectH) ->
@@ -1367,16 +1522,12 @@ setSize(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH})
   wxe_util:cast(?wxWindow_SetSize_1,
   <<ThisRef:32/?UI,SizeW:32/?UI,SizeH:32/?UI>>).
 
-%% @spec (This::wxWindow(),X::integer()|term(),X::integer()|term()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetsize">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% setSize(This::wxWindow(), Width::integer(), Height::integer()) -> ok </c>
-%% </p>
-%% <p><c>
-%% setSize(This::wxWindow(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}, [Option]) -> ok </c>
-%%<br /> Option = {sizeFlags, integer()}
-%% </p>
+-spec setSize(This, Width, Height) -> ok when
+	This::wxWindow(), Width::integer(), Height::integer();
+      (This, Rect, [Option]) -> ok when
+	This::wxWindow(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()},
+	Option :: {sizeFlags, integer()}.
 setSize(#wx_ref{type=ThisT,ref=ThisRef},Width,Height)
  when is_integer(Width),is_integer(Height) ->
   ?CLASS(ThisT,wxWindow),
@@ -1391,15 +1542,18 @@ setSize(#wx_ref{type=ThisT,ref=ThisRef},{RectX,RectY,RectW,RectH}, Options)
   wxe_util:cast(?wxWindow_SetSize_2_1,
   <<ThisRef:32/?UI,RectX:32/?UI,RectY:32/?UI,RectW:32/?UI,RectH:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxWindow(), X::integer(), Y::integer(), Width::integer(), Height::integer()) -> ok
 %% @equiv setSize(This,X,Y,Width,Height, [])
+-spec setSize(This, X, Y, Width, Height) -> ok when
+	This::wxWindow(), X::integer(), Y::integer(), Width::integer(), Height::integer().
+
 setSize(This,X,Y,Width,Height)
  when is_record(This, wx_ref),is_integer(X),is_integer(Y),is_integer(Width),is_integer(Height) ->
   setSize(This,X,Y,Width,Height, []).
 
-%% @spec (This::wxWindow(), X::integer(), Y::integer(), Width::integer(), Height::integer(), [Option]) -> ok
-%% Option = {sizeFlags, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetsize">external documentation</a>.
+-spec setSize(This, X, Y, Width, Height, [Option]) -> ok when
+	This::wxWindow(), X::integer(), Y::integer(), Width::integer(), Height::integer(),
+	Option :: {sizeFlags, integer()}.
 setSize(#wx_ref{type=ThisT,ref=ThisRef},X,Y,Width,Height, Options)
  when is_integer(X),is_integer(Y),is_integer(Width),is_integer(Height),is_list(Options) ->
   ?CLASS(ThisT,wxWindow),
@@ -1409,21 +1563,21 @@ setSize(#wx_ref{type=ThisT,ref=ThisRef},X,Y,Width,Height, Options)
   wxe_util:cast(?wxWindow_SetSize_5,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI,Width:32/?UI,Height:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxWindow(), MinSize::{W::integer(), H::integer()}) -> ok
 %% @equiv setSizeHints(This,MinSize, [])
+-spec setSizeHints(This, MinSize) -> ok when
+	This::wxWindow(), MinSize::{W::integer(), H::integer()}.
+
 setSizeHints(This,MinSize={MinSizeW,MinSizeH})
  when is_record(This, wx_ref),is_integer(MinSizeW),is_integer(MinSizeH) ->
   setSizeHints(This,MinSize, []).
 
-%% @spec (This::wxWindow(),X::integer()|term(),X::integer()|term()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetsizehints">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% setSizeHints(This::wxWindow(), MinW::integer(), MinH::integer()) -> setSizeHints(This,MinW,MinH, []) </c></p>
-%% <p><c>
-%% setSizeHints(This::wxWindow(), MinSize::{W::integer(), H::integer()}, [Option]) -> ok </c>
-%%<br /> Option = {maxSize, {W::integer(), H::integer()}} | {incSize, {W::integer(), H::integer()}}
-%% </p>
+-spec setSizeHints(This, MinW, MinH) -> ok when
+	This::wxWindow(), MinW::integer(), MinH::integer();
+      (This, MinSize, [Option]) -> ok when
+	This::wxWindow(), MinSize::{W::integer(), H::integer()},
+	Option :: {maxSize, {W::integer(), H::integer()}}
+		 | {incSize, {W::integer(), H::integer()}}.
 
 setSizeHints(This,MinW,MinH)
  when is_record(This, wx_ref),is_integer(MinW),is_integer(MinH) ->
@@ -1438,9 +1592,13 @@ setSizeHints(#wx_ref{type=ThisT,ref=ThisRef},{MinSizeW,MinSizeH}, Options)
   wxe_util:cast(?wxWindow_SetSizeHints_2,
   <<ThisRef:32/?UI,MinSizeW:32/?UI,MinSizeH:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxWindow(), MinW::integer(), MinH::integer(), [Option]) -> ok
-%% Option = {maxW, integer()} | {maxH, integer()} | {incW, integer()} | {incH, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetsizehints">external documentation</a>.
+-spec setSizeHints(This, MinW, MinH, [Option]) -> ok when
+	This::wxWindow(), MinW::integer(), MinH::integer(),
+	Option :: {maxW, integer()}
+		 | {maxH, integer()}
+		 | {incW, integer()}
+		 | {incH, integer()}.
 setSizeHints(#wx_ref{type=ThisT,ref=ThisRef},MinW,MinH, Options)
  when is_integer(MinW),is_integer(MinH),is_list(Options) ->
   ?CLASS(ThisT,wxWindow),
@@ -1453,15 +1611,18 @@ setSizeHints(#wx_ref{type=ThisT,ref=ThisRef},MinW,MinH, Options)
   wxe_util:cast(?wxWindow_SetSizeHints_3,
   <<ThisRef:32/?UI,MinW:32/?UI,MinH:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxWindow(), Sizer::wxSizer:wxSizer()) -> ok
 %% @equiv setSizer(This,Sizer, [])
+-spec setSizer(This, Sizer) -> ok when
+	This::wxWindow(), Sizer::wxSizer:wxSizer().
+
 setSizer(This,Sizer)
  when is_record(This, wx_ref),is_record(Sizer, wx_ref) ->
   setSizer(This,Sizer, []).
 
-%% @spec (This::wxWindow(), Sizer::wxSizer:wxSizer(), [Option]) -> ok
-%% Option = {deleteOld, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetsizer">external documentation</a>.
+-spec setSizer(This, Sizer, [Option]) -> ok when
+	This::wxWindow(), Sizer::wxSizer:wxSizer(),
+	Option :: {deleteOld, boolean()}.
 setSizer(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=SizerT,ref=SizerRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxWindow),
@@ -1472,15 +1633,18 @@ setSizer(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=SizerT,ref=SizerRef}, Opti
   wxe_util:cast(?wxWindow_SetSizer,
   <<ThisRef:32/?UI,SizerRef:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxWindow(), Sizer::wxSizer:wxSizer()) -> ok
 %% @equiv setSizerAndFit(This,Sizer, [])
+-spec setSizerAndFit(This, Sizer) -> ok when
+	This::wxWindow(), Sizer::wxSizer:wxSizer().
+
 setSizerAndFit(This,Sizer)
  when is_record(This, wx_ref),is_record(Sizer, wx_ref) ->
   setSizerAndFit(This,Sizer, []).
 
-%% @spec (This::wxWindow(), Sizer::wxSizer:wxSizer(), [Option]) -> ok
-%% Option = {deleteOld, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetsizerandfit">external documentation</a>.
+-spec setSizerAndFit(This, Sizer, [Option]) -> ok when
+	This::wxWindow(), Sizer::wxSizer:wxSizer(),
+	Option :: {deleteOld, boolean()}.
 setSizerAndFit(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=SizerT,ref=SizerRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxWindow),
@@ -1491,23 +1655,20 @@ setSizerAndFit(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=SizerT,ref=SizerRef}
   wxe_util:cast(?wxWindow_SetSizerAndFit,
   <<ThisRef:32/?UI,SizerRef:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxWindow(), EnableTheme::bool()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetthemeenabled">external documentation</a>.
+-spec setThemeEnabled(This, EnableTheme) -> ok when
+	This::wxWindow(), EnableTheme::boolean().
 setThemeEnabled(#wx_ref{type=ThisT,ref=ThisRef},EnableTheme)
  when is_boolean(EnableTheme) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:cast(?wxWindow_SetThemeEnabled,
   <<ThisRef:32/?UI,(wxe_util:from_bool(EnableTheme)):32/?UI>>).
 
-%% @spec (This::wxWindow(),X::string()|term()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsettooltip">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% setToolTip(This::wxWindow(), Tip::string()) -> ok </c>
-%% </p>
-%% <p><c>
-%% setToolTip(This::wxWindow(), Tip::wxToolTip:wxToolTip()) -> ok </c>
-%% </p>
+-spec setToolTip(This, Tip) -> ok when
+	This::wxWindow(), Tip::string();
+      (This, Tip) -> ok when
+	This::wxWindow(), Tip::wxToolTip:wxToolTip().
 setToolTip(#wx_ref{type=ThisT,ref=ThisRef},Tip)
  when is_list(Tip) ->
   ?CLASS(ThisT,wxWindow),
@@ -1520,37 +1681,38 @@ setToolTip(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=TipT,ref=TipRef}) ->
   wxe_util:cast(?wxWindow_SetToolTip_1_1,
   <<ThisRef:32/?UI,TipRef:32/?UI>>).
 
-%% @spec (This::wxWindow(), Size::{W::integer(), H::integer()}) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetvirtualsize">external documentation</a>.
+-spec setVirtualSize(This, Size) -> ok when
+	This::wxWindow(), Size::{W::integer(), H::integer()}.
 setVirtualSize(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH})
  when is_integer(SizeW),is_integer(SizeH) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:cast(?wxWindow_SetVirtualSize_1,
   <<ThisRef:32/?UI,SizeW:32/?UI,SizeH:32/?UI>>).
 
-%% @spec (This::wxWindow(), X::integer(), Y::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetvirtualsize">external documentation</a>.
+-spec setVirtualSize(This, X, Y) -> ok when
+	This::wxWindow(), X::integer(), Y::integer().
 setVirtualSize(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
  when is_integer(X),is_integer(Y) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:cast(?wxWindow_SetVirtualSize_2,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI>>).
 
-%% @spec (This::wxWindow(), MinSize::{W::integer(), H::integer()}) -> ok
 %% @equiv setVirtualSizeHints(This,MinSize, [])
+-spec setVirtualSizeHints(This, MinSize) -> ok when
+	This::wxWindow(), MinSize::{W::integer(), H::integer()}.
+
 setVirtualSizeHints(This,MinSize={MinSizeW,MinSizeH})
  when is_record(This, wx_ref),is_integer(MinSizeW),is_integer(MinSizeH) ->
   setVirtualSizeHints(This,MinSize, []).
 
-%% @spec (This::wxWindow(),X::integer()|term(),X::integer()|term()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetvirtualsizehints">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% setVirtualSizeHints(This::wxWindow(), MinW::integer(), MinH::integer()) -> setVirtualSizeHints(This,MinW,MinH, []) </c></p>
-%% <p><c>
-%% setVirtualSizeHints(This::wxWindow(), MinSize::{W::integer(), H::integer()}, [Option]) -> ok </c>
-%%<br /> Option = {maxSize, {W::integer(), H::integer()}}
-%% </p>
+-spec setVirtualSizeHints(This, MinW, MinH) -> ok when
+	This::wxWindow(), MinW::integer(), MinH::integer();
+      (This, MinSize, [Option]) -> ok when
+	This::wxWindow(), MinSize::{W::integer(), H::integer()},
+	Option :: {maxSize, {W::integer(), H::integer()}}.
 
 setVirtualSizeHints(This,MinW,MinH)
  when is_record(This, wx_ref),is_integer(MinW),is_integer(MinH) ->
@@ -1564,9 +1726,11 @@ setVirtualSizeHints(#wx_ref{type=ThisT,ref=ThisRef},{MinSizeW,MinSizeH}, Options
   wxe_util:cast(?wxWindow_SetVirtualSizeHints_2,
   <<ThisRef:32/?UI,MinSizeW:32/?UI,MinSizeH:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxWindow(), MinW::integer(), MinH::integer(), [Option]) -> ok
-%% Option = {maxW, integer()} | {maxH, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetvirtualsizehints">external documentation</a>.
+-spec setVirtualSizeHints(This, MinW, MinH, [Option]) -> ok when
+	This::wxWindow(), MinW::integer(), MinH::integer(),
+	Option :: {maxW, integer()}
+		 | {maxH, integer()}.
 setVirtualSizeHints(#wx_ref{type=ThisT,ref=ThisRef},MinW,MinH, Options)
  when is_integer(MinW),is_integer(MinH),is_list(Options) ->
   ?CLASS(ThisT,wxWindow),
@@ -1577,48 +1741,54 @@ setVirtualSizeHints(#wx_ref{type=ThisT,ref=ThisRef},MinW,MinH, Options)
   wxe_util:cast(?wxWindow_SetVirtualSizeHints_3,
   <<ThisRef:32/?UI,MinW:32/?UI,MinH:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxWindow(), Style::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetwindowstyle">external documentation</a>.
+-spec setWindowStyle(This, Style) -> ok when
+	This::wxWindow(), Style::integer().
 setWindowStyle(#wx_ref{type=ThisT,ref=ThisRef},Style)
  when is_integer(Style) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:cast(?wxWindow_SetWindowStyle,
   <<ThisRef:32/?UI,Style:32/?UI>>).
 
-%% @spec (This::wxWindow(), Style::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetwindowstyleflag">external documentation</a>.
+-spec setWindowStyleFlag(This, Style) -> ok when
+	This::wxWindow(), Style::integer().
 setWindowStyleFlag(#wx_ref{type=ThisT,ref=ThisRef},Style)
  when is_integer(Style) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:cast(?wxWindow_SetWindowStyleFlag,
   <<ThisRef:32/?UI,Style:32/?UI>>).
 
-%% @spec (This::wxWindow(), Variant::WxWindowVariant) -> ok
-%% WxWindowVariant = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetwindowvariant">external documentation</a>.
-%%<br /> WxWindowVariant is one of ?wxWINDOW_VARIANT_NORMAL | ?wxWINDOW_VARIANT_SMALL | ?wxWINDOW_VARIANT_MINI | ?wxWINDOW_VARIANT_LARGE | ?wxWINDOW_VARIANT_MAX
+%%<br /> Variant = ?wxWINDOW_VARIANT_NORMAL | ?wxWINDOW_VARIANT_SMALL | ?wxWINDOW_VARIANT_MINI | ?wxWINDOW_VARIANT_LARGE | ?wxWINDOW_VARIANT_MAX
+-spec setWindowVariant(This, Variant) -> ok when
+	This::wxWindow(), Variant::wx:wx_enum().
 setWindowVariant(#wx_ref{type=ThisT,ref=ThisRef},Variant)
  when is_integer(Variant) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:cast(?wxWindow_SetWindowVariant,
   <<ThisRef:32/?UI,Variant:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowshouldinheritcolours">external documentation</a>.
+-spec shouldInheritColours(This) -> boolean() when
+	This::wxWindow().
 shouldInheritColours(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_ShouldInheritColours,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> bool()
 %% @equiv show(This, [])
+-spec show(This) -> boolean() when
+	This::wxWindow().
+
 show(This)
  when is_record(This, wx_ref) ->
   show(This, []).
 
-%% @spec (This::wxWindow(), [Option]) -> bool()
-%% Option = {show, bool()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowshow">external documentation</a>.
+-spec show(This, [Option]) -> boolean() when
+	This::wxWindow(),
+	Option :: {show, boolean()}.
 show(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxWindow),
@@ -1628,43 +1798,50 @@ show(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxWindow_Show,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxWindow()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowthaw">external documentation</a>.
+-spec thaw(This) -> ok when
+	This::wxWindow().
 thaw(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:cast(?wxWindow_Thaw,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowtransferdatafromwindow">external documentation</a>.
+-spec transferDataFromWindow(This) -> boolean() when
+	This::wxWindow().
 transferDataFromWindow(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_TransferDataFromWindow,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowtransferdatatowindow">external documentation</a>.
+-spec transferDataToWindow(This) -> boolean() when
+	This::wxWindow().
 transferDataToWindow(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_TransferDataToWindow,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowupdate">external documentation</a>.
+-spec update(This) -> ok when
+	This::wxWindow().
 update(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:cast(?wxWindow_Update,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> ok
 %% @equiv updateWindowUI(This, [])
+-spec updateWindowUI(This) -> ok when
+	This::wxWindow().
+
 updateWindowUI(This)
  when is_record(This, wx_ref) ->
   updateWindowUI(This, []).
 
-%% @spec (This::wxWindow(), [Option]) -> ok
-%% Option = {flags, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowupdatewindowui">external documentation</a>.
+-spec updateWindowUI(This, [Option]) -> ok when
+	This::wxWindow(),
+	Option :: {flags, integer()}.
 updateWindowUI(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxWindow),
@@ -1674,23 +1851,25 @@ updateWindowUI(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxWindow_UpdateWindowUI,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxWindow()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowvalidate">external documentation</a>.
+-spec validate(This) -> boolean() when
+	This::wxWindow().
 validate(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:call(?wxWindow_Validate,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxWindow(), X::integer(), Y::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowwarppointer">external documentation</a>.
+-spec warpPointer(This, X, Y) -> ok when
+	This::wxWindow(), X::integer(), Y::integer().
 warpPointer(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
  when is_integer(X),is_integer(Y) ->
   ?CLASS(ThisT,wxWindow),
   wxe_util:cast(?wxWindow_WarpPointer,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI>>).
 
-%% @spec (This::wxWindow()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxWindow) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxWindow),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxWindowCreateEvent.erl b/lib/wx/src/gen/wxWindowCreateEvent.erl
index c8b3c74f81..f17d6011d9 100644
--- a/lib/wx/src/gen/wxWindowCreateEvent.erl
+++ b/lib/wx/src/gen/wxWindowCreateEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -40,11 +40,13 @@
   parent_class/1,resumePropagation/2,setInt/2,setString/2,shouldPropagate/1,
   skip/1,skip/2,stopPropagation/1]).
 
+-export_type([wxWindowCreateEvent/0]).
 %% @hidden
 parent_class(wxCommandEvent) -> true;
 parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
+-type wxWindowCreateEvent() :: wx:wx_object().
  %% From wxCommandEvent
 %% @hidden
 setString(This,S) -> wxCommandEvent:setString(This,S).
diff --git a/lib/wx/src/gen/wxWindowDC.erl b/lib/wx/src/gen/wxWindowDC.erl
index 17cbd3d378..ba7bdf50aa 100644
--- a/lib/wx/src/gen/wxWindowDC.erl
+++ b/lib/wx/src/gen/wxWindowDC.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -52,25 +52,28 @@
   setPen/2,setTextBackground/2,setTextForeground/2,setUserScale/3,startDoc/2,
   startPage/1]).
 
+-export_type([wxWindowDC/0]).
 %% @hidden
 parent_class(wxDC) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxWindowDC()
+-type wxWindowDC() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindowdc.html#wxwindowdcwxwindowdc">external documentation</a>.
+-spec new() -> wxWindowDC().
 new() ->
   wxe_util:construct(?wxWindowDC_new_0,
   <<>>).
 
-%% @spec (Win::wxWindow:wxWindow()) -> wxWindowDC()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindowdc.html#wxwindowdcwxwindowdc">external documentation</a>.
+-spec new(Win) -> wxWindowDC() when
+	Win::wxWindow:wxWindow().
 new(#wx_ref{type=WinT,ref=WinRef}) ->
   ?CLASS(WinT,wxWindow),
   wxe_util:construct(?wxWindowDC_new_1,
   <<WinRef:32/?UI>>).
 
-%% @spec (This::wxWindowDC()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxWindowDC) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxWindowDC),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wxWindowDestroyEvent.erl b/lib/wx/src/gen/wxWindowDestroyEvent.erl
index e62700da4a..909f521d82 100644
--- a/lib/wx/src/gen/wxWindowDestroyEvent.erl
+++ b/lib/wx/src/gen/wxWindowDestroyEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -40,11 +40,13 @@
   parent_class/1,resumePropagation/2,setInt/2,setString/2,shouldPropagate/1,
   skip/1,skip/2,stopPropagation/1]).
 
+-export_type([wxWindowDestroyEvent/0]).
 %% @hidden
 parent_class(wxCommandEvent) -> true;
 parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
+-type wxWindowDestroyEvent() :: wx:wx_object().
  %% From wxCommandEvent
 %% @hidden
 setString(This,S) -> wxCommandEvent:setString(This,S).
diff --git a/lib/wx/src/gen/wxXmlResource.erl b/lib/wx/src/gen/wxXmlResource.erl
index 2b69a49bd7..c18f6ce051 100644
--- a/lib/wx/src/gen/wxXmlResource.erl
+++ b/lib/wx/src/gen/wxXmlResource.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -34,17 +34,21 @@
 %% inherited exports
 -export([parent_class/1]).
 
+-export_type([wxXmlResource/0]).
 %% @hidden
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
-%% @spec () -> wxXmlResource()
+-type wxXmlResource() :: wx:wx_object().
 %% @equiv new([])
+-spec new() -> wxXmlResource().
+
 new() ->
   new([]).
 
-%% @spec ([Option]) -> wxXmlResource()
-%% Option = {flags, integer()} | {domain, string()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourcewxxmlresource">external documentation</a>.
+-spec new([Option]) -> wxXmlResource() when
+	Option :: {flags, integer()}
+		 | {domain, string()}.
 new(Options)
  when is_list(Options) ->
   MOpts = fun({flags, Flags}, Acc) -> [<<1:32/?UI,Flags:32/?UI>>|Acc];
@@ -54,9 +58,11 @@ new(Options)
   wxe_util:construct(?wxXmlResource_new_1,
   <<BinOpt/binary>>).
 
-%% @spec (Filemask::string(), [Option]) -> wxXmlResource()
-%% Option = {flags, integer()} | {domain, string()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourcewxxmlresource">external documentation</a>.
+-spec new(Filemask, [Option]) -> wxXmlResource() when
+	Filemask::string(),
+	Option :: {flags, integer()}
+		 | {domain, string()}.
 new(Filemask, Options)
  when is_list(Filemask),is_list(Options) ->
   Filemask_UC = unicode:characters_to_binary([Filemask,0]),
@@ -67,15 +73,18 @@ new(Filemask, Options)
   wxe_util:construct(?wxXmlResource_new_2,
   <<(byte_size(Filemask_UC)):32/?UI,(Filemask_UC)/binary, 0:(((8- ((4+byte_size(Filemask_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxXmlResource(), Name::string(), Control::wxWindow:wxWindow()) -> bool()
 %% @equiv attachUnknownControl(This,Name,Control, [])
+-spec attachUnknownControl(This, Name, Control) -> boolean() when
+	This::wxXmlResource(), Name::string(), Control::wxWindow:wxWindow().
+
 attachUnknownControl(This,Name,Control)
  when is_record(This, wx_ref),is_list(Name),is_record(Control, wx_ref) ->
   attachUnknownControl(This,Name,Control, []).
 
-%% @spec (This::wxXmlResource(), Name::string(), Control::wxWindow:wxWindow(), [Option]) -> bool()
-%% Option = {parent, wxWindow:wxWindow()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourceattachunknowncontrol">external documentation</a>.
+-spec attachUnknownControl(This, Name, Control, [Option]) -> boolean() when
+	This::wxXmlResource(), Name::string(), Control::wxWindow:wxWindow(),
+	Option :: {parent, wxWindow:wxWindow()}.
 attachUnknownControl(#wx_ref{type=ThisT,ref=ThisRef},Name,#wx_ref{type=ControlT,ref=ControlRef}, Options)
  when is_list(Name),is_list(Options) ->
   ?CLASS(ThisT,wxXmlResource),
@@ -87,50 +96,57 @@ attachUnknownControl(#wx_ref{type=ThisT,ref=ThisRef},Name,#wx_ref{type=ControlT,
   wxe_util:call(?wxXmlResource_AttachUnknownControl,
   <<ThisRef:32/?UI,(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((0+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8,ControlRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @spec (This::wxXmlResource()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourceclearhandlers">external documentation</a>.
+-spec clearHandlers(This) -> ok when
+	This::wxXmlResource().
 clearHandlers(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxXmlResource),
   wxe_util:cast(?wxXmlResource_ClearHandlers,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxXmlResource(), Major::integer(), Minor::integer(), Release::integer(), Revision::integer()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourcecompareversion">external documentation</a>.
+-spec compareVersion(This, Major, Minor, Release, Revision) -> integer() when
+	This::wxXmlResource(), Major::integer(), Minor::integer(), Release::integer(), Revision::integer().
 compareVersion(#wx_ref{type=ThisT,ref=ThisRef},Major,Minor,Release,Revision)
  when is_integer(Major),is_integer(Minor),is_integer(Release),is_integer(Revision) ->
   ?CLASS(ThisT,wxXmlResource),
   wxe_util:call(?wxXmlResource_CompareVersion,
   <<ThisRef:32/?UI,Major:32/?UI,Minor:32/?UI,Release:32/?UI,Revision:32/?UI>>).
 
-%% @spec () -> wxXmlResource()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourceget">external documentation</a>.
+-spec get() -> wxXmlResource().
 get() ->
   wxe_util:call(?wxXmlResource_Get,
   <<>>).
 
-%% @spec (This::wxXmlResource()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourcegetflags">external documentation</a>.
+-spec getFlags(This) -> integer() when
+	This::wxXmlResource().
 getFlags(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxXmlResource),
   wxe_util:call(?wxXmlResource_GetFlags,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxXmlResource()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourcegetversion">external documentation</a>.
+-spec getVersion(This) -> integer() when
+	This::wxXmlResource().
 getVersion(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxXmlResource),
   wxe_util:call(?wxXmlResource_GetVersion,
   <<ThisRef:32/?UI>>).
 
-%% @spec (Str_id::[string()]) -> integer()
 %% @equiv getXRCID(Str_id, [])
+-spec getXRCID(Str_id) -> integer() when
+	Str_id::[string()].
+
 getXRCID(Str_id)
  when is_list(Str_id) ->
   getXRCID(Str_id, []).
 
-%% @spec (Str_id::[string()], [Option]) -> integer()
-%% Option = {value_if_not_found, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourcegetxrcid">external documentation</a>.
+-spec getXRCID(Str_id, [Option]) -> integer() when
+	Str_id::[string()],
+	Option :: {value_if_not_found, integer()}.
 getXRCID(Str_id, Options)
  when is_list(Str_id),is_list(Options) ->
   Str_id_UC = unicode:characters_to_binary([Str_id,0]),
@@ -140,15 +156,17 @@ getXRCID(Str_id, Options)
   wxe_util:call(?wxXmlResource_GetXRCID,
   <<(byte_size(Str_id_UC)):32/?UI,(Str_id_UC)/binary, 0:(((8- ((4+byte_size(Str_id_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec (This::wxXmlResource()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourceinitallhandlers">external documentation</a>.
+-spec initAllHandlers(This) -> ok when
+	This::wxXmlResource().
 initAllHandlers(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxXmlResource),
   wxe_util:cast(?wxXmlResource_InitAllHandlers,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxXmlResource(), Filemask::string()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourceload">external documentation</a>.
+-spec load(This, Filemask) -> boolean() when
+	This::wxXmlResource(), Filemask::string().
 load(#wx_ref{type=ThisT,ref=ThisRef},Filemask)
  when is_list(Filemask) ->
   ?CLASS(ThisT,wxXmlResource),
@@ -156,8 +174,9 @@ load(#wx_ref{type=ThisT,ref=ThisRef},Filemask)
   wxe_util:call(?wxXmlResource_Load,
   <<ThisRef:32/?UI,(byte_size(Filemask_UC)):32/?UI,(Filemask_UC)/binary, 0:(((8- ((0+byte_size(Filemask_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxXmlResource(), Name::string()) -> wxBitmap:wxBitmap()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourceloadbitmap">external documentation</a>.
+-spec loadBitmap(This, Name) -> wxBitmap:wxBitmap() when
+	This::wxXmlResource(), Name::string().
 loadBitmap(#wx_ref{type=ThisT,ref=ThisRef},Name)
  when is_list(Name) ->
   ?CLASS(ThisT,wxXmlResource),
@@ -165,8 +184,9 @@ loadBitmap(#wx_ref{type=ThisT,ref=ThisRef},Name)
   wxe_util:call(?wxXmlResource_LoadBitmap,
   <<ThisRef:32/?UI,(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((0+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxXmlResource(), Parent::wxWindow:wxWindow(), Name::string()) -> wxDialog:wxDialog()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourceloaddialog">external documentation</a>.
+-spec loadDialog(This, Parent, Name) -> wxDialog:wxDialog() when
+	This::wxXmlResource(), Parent::wxWindow:wxWindow(), Name::string().
 loadDialog(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Name)
  when is_list(Name) ->
   ?CLASS(ThisT,wxXmlResource),
@@ -175,8 +195,9 @@ loadDialog(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},N
   wxe_util:call(?wxXmlResource_LoadDialog_2,
   <<ThisRef:32/?UI,ParentRef:32/?UI,(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((4+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxXmlResource(), Dlg::wxDialog:wxDialog(), Parent::wxWindow:wxWindow(), Name::string()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourceloaddialog">external documentation</a>.
+-spec loadDialog(This, Dlg, Parent, Name) -> boolean() when
+	This::wxXmlResource(), Dlg::wxDialog:wxDialog(), Parent::wxWindow:wxWindow(), Name::string().
 loadDialog(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=DlgT,ref=DlgRef},#wx_ref{type=ParentT,ref=ParentRef},Name)
  when is_list(Name) ->
   ?CLASS(ThisT,wxXmlResource),
@@ -186,8 +207,9 @@ loadDialog(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=DlgT,ref=DlgRef},#wx_ref
   wxe_util:call(?wxXmlResource_LoadDialog_3,
   <<ThisRef:32/?UI,DlgRef:32/?UI,ParentRef:32/?UI,(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((0+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxXmlResource(), Parent::wxWindow:wxWindow(), Name::string()) -> wxFrame:wxFrame()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourceloadframe">external documentation</a>.
+-spec loadFrame(This, Parent, Name) -> wxFrame:wxFrame() when
+	This::wxXmlResource(), Parent::wxWindow:wxWindow(), Name::string().
 loadFrame(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Name)
  when is_list(Name) ->
   ?CLASS(ThisT,wxXmlResource),
@@ -196,8 +218,9 @@ loadFrame(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Na
   wxe_util:call(?wxXmlResource_LoadFrame_2,
   <<ThisRef:32/?UI,ParentRef:32/?UI,(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((4+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxXmlResource(), Frame::wxFrame:wxFrame(), Parent::wxWindow:wxWindow(), Name::string()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourceloadframe">external documentation</a>.
+-spec loadFrame(This, Frame, Parent, Name) -> boolean() when
+	This::wxXmlResource(), Frame::wxFrame:wxFrame(), Parent::wxWindow:wxWindow(), Name::string().
 loadFrame(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FrameT,ref=FrameRef},#wx_ref{type=ParentT,ref=ParentRef},Name)
  when is_list(Name) ->
   ?CLASS(ThisT,wxXmlResource),
@@ -207,8 +230,9 @@ loadFrame(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FrameT,ref=FrameRef},#wx_
   wxe_util:call(?wxXmlResource_LoadFrame_3,
   <<ThisRef:32/?UI,FrameRef:32/?UI,ParentRef:32/?UI,(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((0+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxXmlResource(), Name::string()) -> wxIcon:wxIcon()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourceloadicon">external documentation</a>.
+-spec loadIcon(This, Name) -> wxIcon:wxIcon() when
+	This::wxXmlResource(), Name::string().
 loadIcon(#wx_ref{type=ThisT,ref=ThisRef},Name)
  when is_list(Name) ->
   ?CLASS(ThisT,wxXmlResource),
@@ -216,8 +240,9 @@ loadIcon(#wx_ref{type=ThisT,ref=ThisRef},Name)
   wxe_util:call(?wxXmlResource_LoadIcon,
   <<ThisRef:32/?UI,(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((0+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxXmlResource(), Name::string()) -> wxMenu:wxMenu()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourceloadmenu">external documentation</a>.
+-spec loadMenu(This, Name) -> wxMenu:wxMenu() when
+	This::wxXmlResource(), Name::string().
 loadMenu(#wx_ref{type=ThisT,ref=ThisRef},Name)
  when is_list(Name) ->
   ?CLASS(ThisT,wxXmlResource),
@@ -225,8 +250,9 @@ loadMenu(#wx_ref{type=ThisT,ref=ThisRef},Name)
   wxe_util:call(?wxXmlResource_LoadMenu,
   <<ThisRef:32/?UI,(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((0+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxXmlResource(), Name::string()) -> wxMenuBar:wxMenuBar()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourceloadmenubar">external documentation</a>.
+-spec loadMenuBar(This, Name) -> wxMenuBar:wxMenuBar() when
+	This::wxXmlResource(), Name::string().
 loadMenuBar(#wx_ref{type=ThisT,ref=ThisRef},Name)
  when is_list(Name) ->
   ?CLASS(ThisT,wxXmlResource),
@@ -234,8 +260,9 @@ loadMenuBar(#wx_ref{type=ThisT,ref=ThisRef},Name)
   wxe_util:call(?wxXmlResource_LoadMenuBar_1,
   <<ThisRef:32/?UI,(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((0+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxXmlResource(), Parent::wxWindow:wxWindow(), Name::string()) -> wxMenuBar:wxMenuBar()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourceloadmenubar">external documentation</a>.
+-spec loadMenuBar(This, Parent, Name) -> wxMenuBar:wxMenuBar() when
+	This::wxXmlResource(), Parent::wxWindow:wxWindow(), Name::string().
 loadMenuBar(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Name)
  when is_list(Name) ->
   ?CLASS(ThisT,wxXmlResource),
@@ -244,8 +271,9 @@ loadMenuBar(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},
   wxe_util:call(?wxXmlResource_LoadMenuBar_2,
   <<ThisRef:32/?UI,ParentRef:32/?UI,(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((4+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxXmlResource(), Parent::wxWindow:wxWindow(), Name::string()) -> wxPanel:wxPanel()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourceloadpanel">external documentation</a>.
+-spec loadPanel(This, Parent, Name) -> wxPanel:wxPanel() when
+	This::wxXmlResource(), Parent::wxWindow:wxWindow(), Name::string().
 loadPanel(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Name)
  when is_list(Name) ->
   ?CLASS(ThisT,wxXmlResource),
@@ -254,8 +282,9 @@ loadPanel(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Na
   wxe_util:call(?wxXmlResource_LoadPanel_2,
   <<ThisRef:32/?UI,ParentRef:32/?UI,(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((4+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxXmlResource(), Panel::wxPanel:wxPanel(), Parent::wxWindow:wxWindow(), Name::string()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourceloadpanel">external documentation</a>.
+-spec loadPanel(This, Panel, Parent, Name) -> boolean() when
+	This::wxXmlResource(), Panel::wxPanel:wxPanel(), Parent::wxWindow:wxWindow(), Name::string().
 loadPanel(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PanelT,ref=PanelRef},#wx_ref{type=ParentT,ref=ParentRef},Name)
  when is_list(Name) ->
   ?CLASS(ThisT,wxXmlResource),
@@ -265,8 +294,9 @@ loadPanel(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PanelT,ref=PanelRef},#wx_
   wxe_util:call(?wxXmlResource_LoadPanel_3,
   <<ThisRef:32/?UI,PanelRef:32/?UI,ParentRef:32/?UI,(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((0+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (This::wxXmlResource(), Parent::wxWindow:wxWindow(), Name::string()) -> wxToolBar:wxToolBar()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourceloadtoolbar">external documentation</a>.
+-spec loadToolBar(This, Parent, Name) -> wxToolBar:wxToolBar() when
+	This::wxXmlResource(), Parent::wxWindow:wxWindow(), Name::string().
 loadToolBar(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Name)
  when is_list(Name) ->
   ?CLASS(ThisT,wxXmlResource),
@@ -275,23 +305,26 @@ loadToolBar(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},
   wxe_util:call(?wxXmlResource_LoadToolBar,
   <<ThisRef:32/?UI,ParentRef:32/?UI,(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((4+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (Res::wxXmlResource()) -> wxXmlResource()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourceset">external documentation</a>.
+-spec set(Res) -> wxXmlResource() when
+	Res::wxXmlResource().
 set(#wx_ref{type=ResT,ref=ResRef}) ->
   ?CLASS(ResT,wxXmlResource),
   wxe_util:call(?wxXmlResource_Set,
   <<ResRef:32/?UI>>).
 
-%% @spec (This::wxXmlResource(), Flags::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourcesetflags">external documentation</a>.
+-spec setFlags(This, Flags) -> ok when
+	This::wxXmlResource(), Flags::integer().
 setFlags(#wx_ref{type=ThisT,ref=ThisRef},Flags)
  when is_integer(Flags) ->
   ?CLASS(ThisT,wxXmlResource),
   wxe_util:cast(?wxXmlResource_SetFlags,
   <<ThisRef:32/?UI,Flags:32/?UI>>).
 
-%% @spec (This::wxXmlResource(), Filename::string()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourceunload">external documentation</a>.
+-spec unload(This, Filename) -> boolean() when
+	This::wxXmlResource(), Filename::string().
 unload(#wx_ref{type=ThisT,ref=ThisRef},Filename)
  when is_list(Filename) ->
   ?CLASS(ThisT,wxXmlResource),
@@ -318,8 +351,8 @@ xrcctrl(Window = #wx_ref{}, Name, Type) when is_list(Name), is_atom(Type) ->
     Res = wxWindow:findWindow(Window,ID),
     wx:typeCast(Res, Type).
 
-%% @spec (This::wxXmlResource()) -> ok
 %% @doc Destroys this object, do not use object again
+-spec destroy(This::wxXmlResource) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxXmlResource),
   wxe_util:destroy(?DESTROY_OBJECT,Obj),
diff --git a/lib/wx/src/gen/wx_misc.erl b/lib/wx/src/gen/wx_misc.erl
index 3382d898e4..81dd16c0c4 100644
--- a/lib/wx/src/gen/wx_misc.erl
+++ b/lib/wx/src/gen/wx_misc.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -30,42 +30,44 @@
   launchDefaultBrowser/2,newId/0,registerId/1,setDetectableAutoRepeat/1,
   shell/0,shell/1,shutdown/1]).
 
-%% @spec (Key::WxKeyCode) -> bool()
-%% WxKeyCode = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_miscellany.html#wxgetkeystate">external documentation</a>.
-%%<br /> WxKeyCode is one of ?WXK_BACK | ?WXK_TAB | ?WXK_RETURN | ?WXK_ESCAPE | ?WXK_SPACE | ?WXK_DELETE | ?WXK_START | ?WXK_LBUTTON | ?WXK_RBUTTON | ?WXK_CANCEL | ?WXK_MBUTTON | ?WXK_CLEAR | ?WXK_SHIFT | ?WXK_ALT | ?WXK_CONTROL | ?WXK_MENU | ?WXK_PAUSE | ?WXK_CAPITAL | ?WXK_END | ?WXK_HOME | ?WXK_LEFT | ?WXK_UP | ?WXK_RIGHT | ?WXK_DOWN | ?WXK_SELECT | ?WXK_PRINT | ?WXK_EXECUTE | ?WXK_SNAPSHOT | ?WXK_INSERT | ?WXK_HELP | ?WXK_NUMPAD0 | ?WXK_NUMPAD1 | ?WXK_NUMPAD2 | ?WXK_NUMPAD3 | ?WXK_NUMPAD4 | ?WXK_NUMPAD5 | ?WXK_NUMPAD6 | ?WXK_NUMPAD7 | ?WXK_NUMPAD8 | ?WXK_NUMPAD9 | ?WXK_MULTIPLY | ?WXK_ADD | ?WXK_SEPARATOR | ?WXK_SUBTRACT | ?WXK_DECIMAL | ?WXK_DIVIDE | ?WXK_F1 | ?WXK_F2 | ?WXK_F3 | ?WXK_F4 | ?WXK_F5 | ?WXK_F6 | ?WXK_F7 | ?WXK_F8 | ?WXK_F9 | ?WXK_F10 | ?WXK_F11 | ?WXK_F12 | ?WXK_F13 | ?WXK_F14 | ?WXK_F15 | ?WXK_F16 | ?WXK_F17 | ?WXK_F18 | ?WXK_F19 | ?WXK_F20 | ?WXK_F21 | ?WXK_F22 | ?WXK_F23 | ?WXK_F24 | ?WXK_NUMLOCK | ?WXK_SCROLL | ?WXK_PAGEUP | ?WXK_PAGEDOWN | ?WXK_NUMPAD_SPACE | ?WXK_NUMPAD_TAB | ?WXK_NUMPAD_ENTER | ?WXK_NUMPAD_F1 | ?WXK_NUMPAD_F2 | ?WXK_NUMPAD_F3 | ?WXK_NUMPAD_F4 | ?WXK_NUMPAD_HOME | ?WXK_NUMPAD_LEFT | ?WXK_NUMPAD_UP | ?WXK_NUMPAD_RIGHT | ?WXK_NUMPAD_DOWN | ?WXK_NUMPAD_PAGEUP | ?WXK_NUMPAD_PAGEDOWN | ?WXK_NUMPAD_END | ?WXK_NUMPAD_BEGIN | ?WXK_NUMPAD_INSERT | ?WXK_NUMPAD_DELETE | ?WXK_NUMPAD_EQUAL | ?WXK_NUMPAD_MULTIPLY | ?WXK_NUMPAD_ADD | ?WXK_NUMPAD_SEPARATOR | ?WXK_NUMPAD_SUBTRACT | ?WXK_NUMPAD_DECIMAL | ?WXK_NUMPAD_DIVIDE | ?WXK_WINDOWS_LEFT | ?WXK_WINDOWS_RIGHT | ?WXK_WINDOWS_MENU | ?WXK_COMMAND | ?WXK_SPECIAL1 | ?WXK_SPECIAL2 | ?WXK_SPECIAL3 | ?WXK_SPECIAL4 | ?WXK_SPECIAL5 | ?WXK_SPECIAL6 | ?WXK_SPECIAL7 | ?WXK_SPECIAL8 | ?WXK_SPECIAL9 | ?WXK_SPECIAL10 | ?WXK_SPECIAL11 | ?WXK_SPECIAL12 | ?WXK_SPECIAL13 | ?WXK_SPECIAL14 | ?WXK_SPECIAL15 | ?WXK_SPECIAL16 | ?WXK_SPECIAL17 | ?WXK_SPECIAL18 | ?WXK_SPECIAL19 | ?WXK_SPECIAL20
+%%<br /> Key = ?WXK_BACK | ?WXK_TAB | ?WXK_RETURN | ?WXK_ESCAPE | ?WXK_SPACE | ?WXK_DELETE | ?WXK_START | ?WXK_LBUTTON | ?WXK_RBUTTON | ?WXK_CANCEL | ?WXK_MBUTTON | ?WXK_CLEAR | ?WXK_SHIFT | ?WXK_ALT | ?WXK_CONTROL | ?WXK_MENU | ?WXK_PAUSE | ?WXK_CAPITAL | ?WXK_END | ?WXK_HOME | ?WXK_LEFT | ?WXK_UP | ?WXK_RIGHT | ?WXK_DOWN | ?WXK_SELECT | ?WXK_PRINT | ?WXK_EXECUTE | ?WXK_SNAPSHOT | ?WXK_INSERT | ?WXK_HELP | ?WXK_NUMPAD0 | ?WXK_NUMPAD1 | ?WXK_NUMPAD2 | ?WXK_NUMPAD3 | ?WXK_NUMPAD4 | ?WXK_NUMPAD5 | ?WXK_NUMPAD6 | ?WXK_NUMPAD7 | ?WXK_NUMPAD8 | ?WXK_NUMPAD9 | ?WXK_MULTIPLY | ?WXK_ADD | ?WXK_SEPARATOR | ?WXK_SUBTRACT | ?WXK_DECIMAL | ?WXK_DIVIDE | ?WXK_F1 | ?WXK_F2 | ?WXK_F3 | ?WXK_F4 | ?WXK_F5 | ?WXK_F6 | ?WXK_F7 | ?WXK_F8 | ?WXK_F9 | ?WXK_F10 | ?WXK_F11 | ?WXK_F12 | ?WXK_F13 | ?WXK_F14 | ?WXK_F15 | ?WXK_F16 | ?WXK_F17 | ?WXK_F18 | ?WXK_F19 | ?WXK_F20 | ?WXK_F21 | ?WXK_F22 | ?WXK_F23 | ?WXK_F24 | ?WXK_NUMLOCK | ?WXK_SCROLL | ?WXK_PAGEUP | ?WXK_PAGEDOWN | ?WXK_NUMPAD_SPACE | ?WXK_NUMPAD_TAB | ?WXK_NUMPAD_ENTER | ?WXK_NUMPAD_F1 | ?WXK_NUMPAD_F2 | ?WXK_NUMPAD_F3 | ?WXK_NUMPAD_F4 | ?WXK_NUMPAD_HOME | ?WXK_NUMPAD_LEFT | ?WXK_NUMPAD_UP | ?WXK_NUMPAD_RIGHT | ?WXK_NUMPAD_DOWN | ?WXK_NUMPAD_PAGEUP | ?WXK_NUMPAD_PAGEDOWN | ?WXK_NUMPAD_END | ?WXK_NUMPAD_BEGIN | ?WXK_NUMPAD_INSERT | ?WXK_NUMPAD_DELETE | ?WXK_NUMPAD_EQUAL | ?WXK_NUMPAD_MULTIPLY | ?WXK_NUMPAD_ADD | ?WXK_NUMPAD_SEPARATOR | ?WXK_NUMPAD_SUBTRACT | ?WXK_NUMPAD_DECIMAL | ?WXK_NUMPAD_DIVIDE | ?WXK_WINDOWS_LEFT | ?WXK_WINDOWS_RIGHT | ?WXK_WINDOWS_MENU | ?WXK_COMMAND | ?WXK_SPECIAL1 | ?WXK_SPECIAL2 | ?WXK_SPECIAL3 | ?WXK_SPECIAL4 | ?WXK_SPECIAL5 | ?WXK_SPECIAL6 | ?WXK_SPECIAL7 | ?WXK_SPECIAL8 | ?WXK_SPECIAL9 | ?WXK_SPECIAL10 | ?WXK_SPECIAL11 | ?WXK_SPECIAL12 | ?WXK_SPECIAL13 | ?WXK_SPECIAL14 | ?WXK_SPECIAL15 | ?WXK_SPECIAL16 | ?WXK_SPECIAL17 | ?WXK_SPECIAL18 | ?WXK_SPECIAL19 | ?WXK_SPECIAL20
+-spec getKeyState(Key) -> boolean() when
+	Key::wx:wx_enum().
 getKeyState(Key)
  when is_integer(Key) ->
   wxe_util:call(?utils_wxGetKeyState,
   <<Key:32/?UI>>).
 
-%% @spec () -> {X::integer(), Y::integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_miscellany.html#wxgetmouseposition">external documentation</a>.
+-spec getMousePosition() -> {X::integer(), Y::integer()}.
 getMousePosition() ->
   wxe_util:call(?utils_wxGetMousePosition,
   <<>>).
 
-%% @spec () -> wx:wxMouseState()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_miscellany.html#wxgetmousestate">external documentation</a>.
+-spec getMouseState() -> wx:wx_wxMouseState().
 getMouseState() ->
   wxe_util:call(?utils_wxGetMouseState,
   <<>>).
 
-%% @spec (Flag::bool()) -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_miscellany.html#wxsetdetectableautorepeat">external documentation</a>.
+-spec setDetectableAutoRepeat(Flag) -> boolean() when
+	Flag::boolean().
 setDetectableAutoRepeat(Flag)
  when is_boolean(Flag) ->
   wxe_util:call(?utils_wxSetDetectableAutoRepeat,
   <<(wxe_util:from_bool(Flag)):32/?UI>>).
 
-%% @spec () -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_miscellany.html#wxbell">external documentation</a>.
+-spec bell() -> ok.
 bell() ->
   wxe_util:cast(?utils_wxBell,
   <<>>).
 
-%% @spec (Frame::wxFrame:wxFrame(), MenuString::string(), ItemString::string()) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_miscellany.html#wxfindmenuitemid">external documentation</a>.
+-spec findMenuItemId(Frame, MenuString, ItemString) -> integer() when
+	Frame::wxFrame:wxFrame(), MenuString::string(), ItemString::string().
 findMenuItemId(#wx_ref{type=FrameT,ref=FrameRef},MenuString,ItemString)
  when is_list(MenuString),is_list(ItemString) ->
   ?CLASS(FrameT,wxFrame),
@@ -74,28 +76,31 @@ findMenuItemId(#wx_ref{type=FrameT,ref=FrameRef},MenuString,ItemString)
   wxe_util:call(?utils_wxFindMenuItemId,
   <<FrameRef:32/?UI,(byte_size(MenuString_UC)):32/?UI,(MenuString_UC)/binary, 0:(((8- ((0+byte_size(MenuString_UC)) band 16#7)) band 16#7))/unit:8,(byte_size(ItemString_UC)):32/?UI,(ItemString_UC)/binary, 0:(((8- ((4+byte_size(ItemString_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @spec (Pt::{X::integer(), Y::integer()}) -> wxWindow:wxWindow()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_miscellany.html#wxgenericfindwindowatpoint">external documentation</a>.
+-spec genericFindWindowAtPoint(Pt) -> wxWindow:wxWindow() when
+	Pt::{X::integer(), Y::integer()}.
 genericFindWindowAtPoint({PtX,PtY})
  when is_integer(PtX),is_integer(PtY) ->
   wxe_util:call(?utils_wxGenericFindWindowAtPoint,
   <<PtX:32/?UI,PtY:32/?UI>>).
 
-%% @spec (Pt::{X::integer(), Y::integer()}) -> wxWindow:wxWindow()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_miscellany.html#wxfindwindowatpoint">external documentation</a>.
+-spec findWindowAtPoint(Pt) -> wxWindow:wxWindow() when
+	Pt::{X::integer(), Y::integer()}.
 findWindowAtPoint({PtX,PtY})
  when is_integer(PtX),is_integer(PtY) ->
   wxe_util:call(?utils_wxFindWindowAtPoint,
   <<PtX:32/?UI,PtY:32/?UI>>).
 
-%% @spec () -> ok
 %% @equiv beginBusyCursor([])
+-spec beginBusyCursor() -> ok.
+
 beginBusyCursor() ->
   beginBusyCursor([]).
 
-%% @spec ([Option]) -> ok
-%% Option = {cursor, wxCursor:wxCursor()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_miscellany.html#wxbeginbusycursor">external documentation</a>.
+-spec beginBusyCursor([Option]) -> ok when
+	Option :: {cursor, wxCursor:wxCursor()}.
 beginBusyCursor(Options)
  when is_list(Options) ->
   MOpts = fun({cursor, #wx_ref{type=CursorT,ref=CursorRef}}, Acc) ->   ?CLASS(CursorT,wxCursor),[<<1:32/?UI,CursorRef:32/?UI>>|Acc];
@@ -104,35 +109,36 @@ beginBusyCursor(Options)
   wxe_util:cast(?utils_wxBeginBusyCursor,
   <<BinOpt/binary>>).
 
-%% @spec () -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_miscellany.html#wxendbusycursor">external documentation</a>.
+-spec endBusyCursor() -> ok.
 endBusyCursor() ->
   wxe_util:cast(?utils_wxEndBusyCursor,
   <<>>).
 
-%% @spec () -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_miscellany.html#wxisbusy">external documentation</a>.
+-spec isBusy() -> boolean().
 isBusy() ->
   wxe_util:call(?utils_wxIsBusy,
   <<>>).
 
-%% @spec (WFlags::WxShutdownFlags) -> bool()
-%% WxShutdownFlags = integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_miscellany.html#wxshutdown">external documentation</a>.
-%%<br /> WxShutdownFlags is one of ?wxSHUTDOWN_POWEROFF | ?wxSHUTDOWN_REBOOT
+%%<br /> WFlags = ?wxSHUTDOWN_POWEROFF | ?wxSHUTDOWN_REBOOT
+-spec shutdown(WFlags) -> boolean() when
+	WFlags::wx:wx_enum().
 shutdown(WFlags)
  when is_integer(WFlags) ->
   wxe_util:call(?utils_wxShutdown,
   <<WFlags:32/?UI>>).
 
-%% @spec () -> bool()
 %% @equiv shell([])
+-spec shell() -> boolean().
+
 shell() ->
   shell([]).
 
-%% @spec ([Option]) -> bool()
-%% Option = {command, string()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_miscellany.html#wxshell">external documentation</a>.
+-spec shell([Option]) -> boolean() when
+	Option :: {command, string()}.
 shell(Options)
  when is_list(Options) ->
   MOpts = fun({command, Command}, Acc) ->   Command_UC = unicode:characters_to_binary([Command,0]),[<<1:32/?UI,(byte_size(Command_UC)):32/?UI,(Command_UC)/binary, 0:(((8- ((0+byte_size(Command_UC)) band 16#7)) band 16#7))/unit:8>>|Acc];
@@ -141,15 +147,18 @@ shell(Options)
   wxe_util:call(?utils_wxShell,
   <<BinOpt/binary>>).
 
-%% @spec (Url::string()) -> bool()
 %% @equiv launchDefaultBrowser(Url, [])
+-spec launchDefaultBrowser(Url) -> boolean() when
+	Url::string().
+
 launchDefaultBrowser(Url)
  when is_list(Url) ->
   launchDefaultBrowser(Url, []).
 
-%% @spec (Url::string(), [Option]) -> bool()
-%% Option = {flags, integer()}
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_miscellany.html#wxlaunchdefaultbrowser">external documentation</a>.
+-spec launchDefaultBrowser(Url, [Option]) -> boolean() when
+	Url::string(),
+	Option :: {flags, integer()}.
 launchDefaultBrowser(Url, Options)
  when is_list(Url),is_list(Options) ->
   Url_UC = unicode:characters_to_binary([Url,0]),
@@ -159,57 +168,58 @@ launchDefaultBrowser(Url, Options)
   wxe_util:call(?utils_wxLaunchDefaultBrowser,
   <<(byte_size(Url_UC)):32/?UI,(Url_UC)/binary, 0:(((8- ((4+byte_size(Url_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @spec () -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_miscellany.html#wxgetemailaddress">external documentation</a>.
+-spec getEmailAddress() -> string().
 getEmailAddress() ->
   wxe_util:call(?utils_wxGetEmailAddress,
   <<>>).
 
-%% @spec () -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_miscellany.html#wxgetuserid">external documentation</a>.
+-spec getUserId() -> string().
 getUserId() ->
   wxe_util:call(?utils_wxGetUserId,
   <<>>).
 
-%% @spec () -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_miscellany.html#wxgethomedir">external documentation</a>.
+-spec getHomeDir() -> string().
 getHomeDir() ->
   wxe_util:call(?utils_wxGetHomeDir,
   <<>>).
 
-%% @spec () -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_miscellany.html#wxnewid">external documentation</a>.
+-spec newId() -> integer().
 newId() ->
   wxe_util:call(?utils_wxNewId,
   <<>>).
 
-%% @spec (Id::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_miscellany.html#wxregisterid">external documentation</a>.
+-spec registerId(Id) -> ok when
+	Id::integer().
 registerId(Id)
  when is_integer(Id) ->
   wxe_util:cast(?utils_wxRegisterId,
   <<Id:32/?UI>>).
 
-%% @spec () -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_miscellany.html#wxgetcurrentid">external documentation</a>.
+-spec getCurrentId() -> integer().
 getCurrentId() ->
   wxe_util:call(?utils_wxGetCurrentId,
   <<>>).
 
-%% @spec () -> string()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_miscellany.html#wxgetosdescription">external documentation</a>.
+-spec getOsDescription() -> string().
 getOsDescription() ->
   wxe_util:call(?utils_wxGetOsDescription,
   <<>>).
 
-%% @spec () -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_miscellany.html#wxisplatformlittleendian">external documentation</a>.
+-spec isPlatformLittleEndian() -> boolean().
 isPlatformLittleEndian() ->
   wxe_util:call(?utils_wxIsPlatformLittleEndian,
   <<>>).
 
-%% @spec () -> bool()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_miscellany.html#wxisplatform64bit">external documentation</a>.
+-spec isPlatform64Bit() -> boolean().
 isPlatform64Bit() ->
   wxe_util:call(?utils_wxIsPlatform64Bit,
   <<>>).
diff --git a/lib/wx/src/wx.erl b/lib/wx/src/wx.erl
index 9d76f3bc42..ecdc6e2647 100644
--- a/lib/wx/src/wx.erl
+++ b/lib/wx/src/wx.erl
@@ -1,46 +1,46 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2008-2012. 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
 %% compliance with the License. You should have received a copy of the
 %% Erlang Public License along with this software. If not, it can be
 %% retrieved online at http://www.erlang.org/.
-%% 
+%%
 %% Software distributed under the License is distributed on an "AS IS"
 %% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
 %% the License for the specific language governing rights and limitations
 %% under the License.
-%% 
+%%
 %% %CopyrightEnd%
 %%%-------------------------------------------------------------------
 %%% File    : wx.erl
 %%% Author  : Dan Gudmundsson <[email protected]>
-%%% Description : 
+%%% Description :
 %%%
 %%% Created : 22 Feb 2007 by Dan Gudmundsson <[email protected]>
 %%%-------------------------------------------------------------------
 
 %% @doc A port of <a href="http://www.wxwidgets.org/">wxWidgets</a>.
-%% 
+%%
 %% This is the base api of <a href="http://www.wxwidgets.org/">wxWidgets</a>.
-%% This module contains functions for 
+%% This module contains functions for
 %% starting and stopping the wx-server, as well as  other utility functions.
 %%
 %% wxWidgets is object oriented, and not functional. Thus, in wxErlang a
 %% module represents a class, and the object created by this class
 %% has an own type, wxCLASS().  This module represents the base
 %% class, and all other wxMODULE's are sub-classes of this class.
-%% 
-%% Objects of a class are created with wxCLASS:new(...) and destroyed with 
+%%
+%% Objects of a class are created with wxCLASS:new(...) and destroyed with
 %% wxCLASS:destroy(). Member functions are called with wxCLASS:member(Object, ...)
 %% instead of as in C++ Object.member(...).
-%% 
+%%
 %% Sub class modules inherit (non static) functions from their parents.
 %% The inherited functions are not documented in the sub-classes.
-%% 
+%%
 %% This erlang port of wxWidgets tries to be a one-to-one mapping with
 %% the original wxWidgets library. Some things are different though,
 %% as the optional arguments use property lists and can be in any
@@ -59,42 +59,43 @@
 %%
 %% Global (classless) functions are located in the wx_misc module.
 
-%% @type wxObject().      Opaque object 
-%% @type wx_env().  Wx process environment
-%% @type wx_mem().  Wx memory area
-%% @type colour().  A 3 or 4 tuple: {R,G,B,A} or as argument {R,G,B} is also accepted
-%%                  where each colour channel is a an integer between 0-255. 
-%% @type datetime(). {{Year,Month,Day}, {Hour,Minute,Second}} in local timezone.
-%% @type mouseState().   See #wxMouseState{} defined in wx.hrl
-
-
 -module(wx).
 
 -export([parent_class/1, new/0, new/1, destroy/0,
 	 get_env/0,set_env/1, debug/1,
 	 batch/1,foreach/2,map/2,foldl/3,foldr/3,
-	 getObjectType/1, typeCast/2, 
+	 getObjectType/1, typeCast/2,
 	 null/0, is_null/1]).
 
 -export([create_memory/1, get_memory_bin/1,
 	 retain_memory/1, release_memory/1]).
 
-
 -export([demo/0]).
-
+-export_type([wx_colour/0, wx_datetime/0, wx_enum/0, wx_mouseState/0, wx_wxHtmlLinkInfo/0]).
 -include("wxe.hrl").
+-include("../include/wx.hrl").
+
+-opaque wx_object() :: tuple().  %% Opaque object reference
+-opaque wx_env() :: tuple().     %% Opaque process environment
+-opaque wx_memory() :: tuple().     %% Opaque memory reference
+-type wx_colour() :: {R::byte(),G::byte(),B::byte()} |
+		     {R::byte(),G::byte(),B::byte(), A::byte()}. %% Always RGBA as return values
+-type wx_datetime() :: {{Year::integer(),Month::integer(),Day::integer()},
+			{Hour::integer(),Minute::integer(),Second::integer()}}. %% In Local Timezone
+-type wx_mouseState() :: #wxMouseState{}.  %% See #wxMouseState{} defined in wx.hrl
+-type wx_enum() :: integer().      %% Constant defined in wx.hrl
+-type wx_wxHtmlLinkInfo() :: #wxHtmlLinkInfo{}.
 
-%% @hidden
 parent_class(_) -> true. %% Let the null pointers be sent down.
 
-%% @spec () -> wxObject()
 %% @doc Starts a wx server.
+-spec new() -> wx_object().
 new() ->
     new([]).
 
-%% @spec ([Option]) -> wxObject()
-%% @doc Starts a wx server. 
+%% @doc Starts a wx server.
 %% Option may be {debug, Level}, see debug/1.
+-spec new([Option]) -> wx_object() when Option :: {debug, list() | atom()}.
 new(Options) when is_list(Options) ->
     #wx_env{port=Port} = wxe_server:start(),
     put(opengl_port, Port),
@@ -102,130 +103,129 @@ new(Options) when is_list(Options) ->
     debug(Debug),
     null().
 
-%% @spec () -> ok
 %% @doc Stops a wx server.
+-spec destroy() -> ok.
 destroy() ->
     wxe_server:stop(),
     erase(?WXE_IDENTIFIER),
     ok.
 
-%% @spec () -> wx_env()
 %% @doc Gets this process's current wx environment.
 %% Can be sent to other processes to allow them use this process wx environment.
 %% @see set_env/1
+-spec get_env() -> wx_env().
 get_env() ->
     case get(?WXE_IDENTIFIER) of
 	undefined -> erlang:error({wxe,unknown_port});
 	Env = #wx_env{} -> Env
     end.
 
-%% @spec (wx_env()) -> ok
 %% @doc Sets the process wx environment, allows this process to use
 %% another process wx environment.
+-spec set_env(wx_env()) -> ok.
 set_env(#wx_env{sv=Pid, port=Port} = Env) ->
-    put(?WXE_IDENTIFIER, Env),    
+    put(?WXE_IDENTIFIER, Env),
     put(opengl_port, Port),
     %%    wxe_util:cast(?REGISTER_PID, <<>>),
     wxe_server:register_me(Pid),
     ok.
 
-%% @spec () -> wxObject()
 %% @doc Returns the null object
+-spec null() -> wx_object().
 null() ->
     #wx_ref{ref=0, type=wx}.
 
-%% @spec (wxObject()) -> boolean()
 %% @doc Returns true if object is null, false otherwise
+-spec is_null(wx_object()) -> boolean().
 is_null(#wx_ref{ref=NULL}) -> NULL =:= 0.
 
-%% @spec (wxObject()) -> atom()
 %% @doc Returns the object type
+-spec getObjectType(wx_object()) -> atom().
 getObjectType(#wx_ref{type=Type}) ->
     Type.
 
-%% @spec (wxObject(), atom()) -> wxObject()
 %% @doc Casts the object to class NewType.
-%%  It is needed when using functions like wxWindow:findWindow/2, which 
+%%  It is needed when using functions like wxWindow:findWindow/2, which
 %%  returns a generic wxObject type.
+-spec typeCast(wx_object(), atom()) -> wx_object().
 typeCast(Old=#wx_ref{}, NewType) when is_atom(NewType) ->
     Old#wx_ref{type=NewType}.
 
-%% @spec (function()) -> term() 
 %% @doc Batches all <c>wx</c> commands
 %% used in the fun.  Improves performance of the command processing by
 %% grabbing the wxWidgets thread so that no event processing will be
 %% done before the complete batch of commands is invoked.
-%% 
+%%
 %% @see map/2
 %% @see foreach/2
 %% @see foldl/3
 %% @see foldr/3
+-spec batch(function()) -> term().
 batch(Fun) ->
     ok = wxe_util:cast(?BATCH_BEGIN, <<>>),
     try Fun()
-    catch 
+    catch
 	error:W -> erlang:exit({W, erlang:get_stacktrace()});
 	throw:W -> erlang:throw(W);
 	exit:W  -> erlang:exit(W)
-    after 
+    after
         ok = wxe_util:cast(?BATCH_END, <<>>)
     end.
 
-%% @spec (function(), list()) -> ok
-%% @doc Behaves like {@link //stdlib/lists:foreach/2} but batches wx commands. See {@link batch/1}. 
+%% @doc Behaves like {@link //stdlib/lists:foreach/2} but batches wx commands. See {@link batch/1}.
+-spec foreach(function(), list()) -> ok.
 foreach(Fun, List) ->
     ok = wxe_util:cast(?BATCH_BEGIN, <<>>),
     try lists:foreach(Fun, List)
-    catch 
+    catch
 	error:W -> erlang:exit({W, erlang:get_stacktrace()});
 	throw:W -> erlang:throw(W);
 	exit:W  -> erlang:exit(W)
-    after 
+    after
         ok = wxe_util:cast(?BATCH_END, <<>>)
     end.
 
-%% @spec (function(), list()) -> list()
-%% @doc Behaves like {@link //stdlib/lists:map/2} but batches wx commands. See {@link batch/1}. 
+%% @doc Behaves like {@link //stdlib/lists:map/2} but batches wx commands. See {@link batch/1}.
+-spec map(function(), list()) -> list().
 map(Fun, List) ->
     ok = wxe_util:cast(?BATCH_BEGIN, <<>>),
     try lists:map(Fun, List)
-    catch 
+    catch
 	error:W -> erlang:exit({W, erlang:get_stacktrace()});
 	throw:W -> erlang:throw(W);
 	exit:W  -> erlang:exit(W)
-    after 
+    after
         ok = wxe_util:cast(?BATCH_END, <<>>)
     end.
 
-%% @spec (function(), term(), list()) -> term()
-%% @doc Behaves like {@link //stdlib/lists:foldl/3} but batches wx commands. See {@link batch/1}. 
+%% @doc Behaves like {@link //stdlib/lists:foldl/3} but batches wx commands. See {@link batch/1}.
+-spec foldl(function(), term(), list()) -> term().
 foldl(Fun, Acc, List) ->
     ok = wxe_util:cast(?BATCH_BEGIN, <<>>),
     try lists:foldl(Fun, Acc, List)
-    catch 
+    catch
 	error:W -> erlang:exit({W, erlang:get_stacktrace()});
 	throw:W -> erlang:throw(W);
 	exit:W  -> erlang:exit(W)
-    after 
+    after
         ok = wxe_util:cast(?BATCH_END, <<>>)
     end.
 
-%% @spec (function(), term(), list()) -> term()
-%% @doc Behaves like {@link //stdlib/lists:foldr/3} but batches wx commands. See {@link batch/1}. 
+%% @doc Behaves like {@link //stdlib/lists:foldr/3} but batches wx commands. See {@link batch/1}.
+-spec foldr(function(), term(), list()) -> term().
 foldr(Fun, Acc, List) ->
     ok = wxe_util:cast(?BATCH_BEGIN, <<>>),
     try lists:foldr(Fun, Acc, List)
-    catch 
+    catch
 	error:W -> erlang:exit({W, erlang:get_stacktrace()});
 	throw:W -> erlang:throw(W);
 	exit:W  -> erlang:exit(W)
-    after 
+    after
         ok = wxe_util:cast(?BATCH_END, <<>>)
     end.
 
 -define(MIN_BIN_SIZE, 64).  %% Current emulator min off heap size
 
-%% @spec (integer()) -> wx_memory()
 %% @doc Creates a memory area (of Size in bytes) which can be used by an external library (i.e. opengl).
 %% It is up to the client to keep a reference to this object so it does
 %% not get garbage collected by erlang while still in use by the external
@@ -233,22 +233,23 @@ foldr(Fun, Acc, List) ->
 %%
 %% This is far from erlang's intentional usage and can crash the erlang emulator.
 %% Use it carefully.
+-spec create_memory(integer()) -> wx_memory().
 create_memory(Size) when Size > ?MIN_BIN_SIZE ->
     #wx_mem{bin = <<0:(Size*8)>>, size = Size};
 create_memory(Size) ->
     #wx_mem{bin = <<0:((?MIN_BIN_SIZE+1)*8)>>, size = Size}.
 
-%% @spec (wx_memory()) -> binary()
 %% @doc Returns the memory area as a binary.
+-spec get_memory_bin(wx_memory()) -> binary().
 get_memory_bin(#wx_mem{bin=Bin, size=Size}) when Size > ?MIN_BIN_SIZE ->
     Bin;
 get_memory_bin(#wx_mem{bin=Bin, size=Size}) ->
     <<WithCorrectSize:Size/binary, _/binary>> = Bin,
     WithCorrectSize.
 
-%% @spec (wx_memory()) -> ok
 %% @doc Saves the memory from deletion until release_memory/1 is called.
 %% If release_memory/1 is not called the memory will not be garbage collected.
+-spec retain_memory(wx_memory()) -> ok.
 retain_memory(#wx_mem{bin=Bin}) ->
     wxe_util:send_bin(Bin),
     ok = wxe_util:cast(?WXE_BIN_INCR, <<>>);
@@ -260,30 +261,29 @@ retain_memory(Bin) when is_binary(Bin) ->
     wxe_util:send_bin(Bin),
     ok = wxe_util:cast(?WXE_BIN_INCR, <<>>).
 
+-spec release_memory(wx_memory()) -> ok.
 release_memory(#wx_mem{bin=Bin}) ->
     wxe_util:send_bin(Bin),
     ok = wxe_util:cast(?WXE_BIN_DECR, <<>>);
 release_memory(Bin) when is_binary(Bin) ->
     wxe_util:send_bin(Bin),
     ok = wxe_util:cast(?WXE_BIN_DECR, <<>>).
-    
 
-
-
-%% @spec (Level::term()) -> ok
-%%   Level = none | verbose | trace | driver | [Level]
 %% @doc Sets debug level. If debug level is verbose or trace
-%% each call is printed on console. If Level is driver each allocated 
+%% each call is printed on console. If Level is driver each allocated
 %% object and deletion is printed on the console.
+-spec debug(Level | [Level]) -> ok
+     when Level :: none | verbose | trace | driver.
+
 debug(none) -> debug(0);
 debug(verbose) -> debug(1);
 debug(trace) -> debug(2);
 debug(driver) -> debug(16);
 debug([]) -> debug(0);
 
-debug(List) when is_list(List) -> 
-    {Drv,Erl} = 
-	lists:foldl(fun(verbose, {Drv,_Erl}) -> 
+debug(List) when is_list(List) ->
+    {Drv,Erl} =
+	lists:foldl(fun(verbose, {Drv,_Erl}) ->
 			    {Drv,1};
 		       (trace, {Drv,_Erl}) ->
 			    {Drv,2};
@@ -295,28 +295,28 @@ debug(Level) when is_integer(Level) ->
     case get(?WXE_IDENTIFIER) of
 	undefined -> erlang:error({wxe,unknown_port});
 	#wx_env{debug=Old} when Old =:= Level -> ok;
-	Env = #wx_env{sv=Server, port=Port, debug=Old} -> 
-	    if 
+	Env = #wx_env{sv=Server, port=Port, debug=Old} ->
+	    if
 		Old > 16, Level > 16 -> ok;
 		Old < 16, Level < 16 -> ok;
 		true ->
 		    erlang:port_call(Port,?WXE_DEBUG_DRIVER, [Level bsr 4])
-	    end,		    
+	    end,
 	    put(?WXE_IDENTIFIER, Env#wx_env{debug=Level}),
 	    wxe_server:set_debug(Server,Level),
 	    ok
     end.
 
-%% @spec () -> ok
 %% @doc Starts a wxErlang demo if examples directory exists and is compiled
+-spec demo() -> ok.
 demo() ->
     Priv = code:priv_dir(wx),
     Demo = filename:join([filename:dirname(Priv),examples,demo]),
     Mod  = list_to_atom("demo"), %% Fool xref tests
     case file:set_cwd(Demo) of
-	ok ->	             
+	ok ->
 	    apply(Mod, start, []);
 	_  ->
 	    {error, no_demo_dir}
     end.
-    
+