[wx] Fix bad type references

30 files changed, 141 insertions, 127 deletions

diff --git a/lib/wx/api_gen/wx_gen_erl.erl b/lib/wx/api_gen/wx_gen_erl.erl
index aac57586bc..59a4d3d8e7 100644
--- a/lib/wx/api_gen/wx_gen_erl.erl
+++ b/lib/wx/api_gen/wx_gen_erl.erl
@@ -177,7 +177,18 @@ parents_check([Parent|Ps]) ->
     w("parent_class(~s) -> true;~n",[Parent]),
     parents_check(Ps).
 
-check_class(#type{base={class,"wx"}}) -> ok;
+check_class(#type{name="wxObject", base={class,"wx"}}) ->
+    "wx:wx_object()";
+check_class(#type{name="wxIconLocation", base={class,"wx"}}) ->
+    "wx:wx_object()";
+check_class(#type{name="wxToolBarToolBase", base={class,"wx"}, mod=Mod}) ->
+    %% Implement this some day
+    "wx:wx_object()";
+check_class(#type{name="wxValidator", base={class,"wx"}, mod=Mod}) ->
+    %% Implement this some day
+    "wx:wx_object()";
+check_class(#type{name=Name, base={class,"wx"}}) ->
+    exit({class, Name});
 check_class(#type{base={class,Name},xml=Xml}) ->
     case get({class,Name}) of
 	undefined ->
@@ -190,12 +201,15 @@ check_class(#type{base={class,Name},xml=Xml}) ->
 			_ ->
 			    ?warning("~s:~s: Class ~p used but not defined~n   (see ~p)~n",
 				     [get(current_class),get(current_func),Name, Xml])
-		    end;
+		    end,
+		    "wx:wx_object()";
 		_ ->
 		    ?warning("~s:~s: Class ~p used is enum~n",
-			     [get(current_class),get(current_func),Name])
+			     [get(current_class),get(current_func),Name]),
+		    exit(class_enum)
 	    end;
-	_ -> ok
+	_ ->
+	    Name ++ ":" ++ Name ++ "()"
     end.
 
 gen_export(#class{name=Class,abstract=Abs},Ms0) ->
@@ -766,21 +780,21 @@ doc_arg_type3(#type{base=eventType}, _) ->  "atom()";
 doc_arg_type3(#type{base={ref,N}}, _) ->     N++"()";
 doc_arg_type3(#type{base={term,_N}}, _) ->  "term()";
 doc_arg_type3(T=#type{base={class,N}}, _) ->
-    check_class(T),
-    case get(current_class) of
-	N -> N ++ "()";
-	_ ->  N++":" ++ N++"()"
+    ClassType = check_class(T),
+    Current = get(current_class),
+    if N =:= Current -> N ++ "()";
+       true -> ClassType
     end;
 doc_arg_type3({merged,_,T1=#type{base={class,N1}},_,_,T2=#type{base={class,N2}},_}, _) ->
-    check_class(T1),
-    check_class(T2),
+    CT1 = check_class(T1),
+    CT2 = check_class(T2),
     Curr = get(current_class),
     if
-	N1 =:= Curr, N2 =:= Curr ->  N1++"() | "++ N2++"()";
-	N1 =:= Curr -> N1++"() | "++ N2++":" ++ N2++"()";
-	N2 =:= Curr -> N1++":" ++ N1++"() | "++ N2++"()";
+	N1 =:= Curr, N2 =:= Curr ->  N1++"()";
+	N1 =:= Curr -> N1++"() | "++ CT2;
+	N2 =:= Curr -> CT1 ++ " | "++ N2++"()";
 	true ->
-	    N1++":" ++ N1++"() | "++ N2++":" ++ N2++"()"
+	    CT1 ++ " | " ++ CT2
     end;
 %% doc_arg_type3(#type{base={enum,{_,N}}}, _) ->    uppercase(N);
 %% doc_arg_type3(#type{base={enum,N}}, _) ->    uppercase(N);
diff --git a/lib/wx/src/gen/wxAuiManager.erl b/lib/wx/src/gen/wxAuiManager.erl
index 95dd5d64a5..71e851f706 100644
--- a/lib/wx/src/gen/wxAuiManager.erl
+++ b/lib/wx/src/gen/wxAuiManager.erl
@@ -119,7 +119,7 @@ detachPane(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef})
   <<ThisRef:32/?UI,WindowRef:32/?UI>>).
 
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanager.html#wxauimanagergetallpanes">external documentation</a>.
--spec getAllPanes(This) -> wxAuiPaneInfoArray:wxAuiPaneInfoArray() when
+-spec getAllPanes(This) -> wx:wx_object() when
 	This::wxAuiManager().
 getAllPanes(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxAuiManager),
diff --git a/lib/wx/src/gen/wxBitmapButton.erl b/lib/wx/src/gen/wxBitmapButton.erl
index 79e51da801..ddddbbc1dd 100644
--- a/lib/wx/src/gen/wxBitmapButton.erl
+++ b/lib/wx/src/gen/wxBitmapButton.erl
@@ -101,7 +101,7 @@ new(Parent,Id,Bitmap)
 	Option :: {pos, {X::integer(), Y::integer()}}
 		 | {size, {W::integer(), H::integer()}}
 		 | {style, integer()}
-		 | {validator, wx:wx()}.
+		 | {validator, wx:wx_object()}.
 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),
@@ -129,7 +129,7 @@ create(This,Parent,Id,Bitmap)
 	Option :: {pos, {X::integer(), Y::integer()}}
 		 | {size, {W::integer(), H::integer()}}
 		 | {style, integer()}
-		 | {validator, wx:wx()}.
+		 | {validator, wx:wx_object()}.
 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),
diff --git a/lib/wx/src/gen/wxButton.erl b/lib/wx/src/gen/wxButton.erl
index ae78f53e6f..a27e5d91c2 100644
--- a/lib/wx/src/gen/wxButton.erl
+++ b/lib/wx/src/gen/wxButton.erl
@@ -99,7 +99,7 @@ new(Parent,Id)
 		 | {pos, {X::integer(), Y::integer()}}
 		 | {size, {W::integer(), H::integer()}}
 		 | {style, integer()}
-		 | {validator, wx:wx()}.
+		 | {validator, wx:wx_object()}.
 new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
  when is_integer(Id),is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -128,7 +128,7 @@ create(This,Parent,Id)
 		 | {pos, {X::integer(), Y::integer()}}
 		 | {size, {W::integer(), H::integer()}}
 		 | {style, integer()}
-		 | {validator, wx:wx()}.
+		 | {validator, wx:wx_object()}.
 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),
diff --git a/lib/wx/src/gen/wxCheckBox.erl b/lib/wx/src/gen/wxCheckBox.erl
index 37bca77cae..6e30f14207 100644
--- a/lib/wx/src/gen/wxCheckBox.erl
+++ b/lib/wx/src/gen/wxCheckBox.erl
@@ -99,7 +99,7 @@ new(Parent,Id,Label)
 	Option :: {pos, {X::integer(), Y::integer()}}
 		 | {size, {W::integer(), H::integer()}}
 		 | {style, integer()}
-		 | {validator, wx:wx()}.
+		 | {validator, wx:wx_object()}.
 new(#wx_ref{type=ParentT,ref=ParentRef},Id,Label, Options)
  when is_integer(Id),is_list(Label),is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -127,7 +127,7 @@ create(This,Parent,Id,Label)
 	Option :: {pos, {X::integer(), Y::integer()}}
 		 | {size, {W::integer(), H::integer()}}
 		 | {style, integer()}
-		 | {validator, wx:wx()}.
+		 | {validator, wx:wx_object()}.
 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),
diff --git a/lib/wx/src/gen/wxCheckListBox.erl b/lib/wx/src/gen/wxCheckListBox.erl
index 71199fed3b..083a9e32f4 100644
--- a/lib/wx/src/gen/wxCheckListBox.erl
+++ b/lib/wx/src/gen/wxCheckListBox.erl
@@ -106,7 +106,7 @@ new(Parent,Id)
 		 | {size, {W::integer(), H::integer()}}
 		 | {choices, [[unicode:chardata()]]}
 		 | {style, integer()}
-		 | {validator, wx:wx()}.
+		 | {validator, wx:wx_object()}.
 new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
  when is_integer(Id),is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
diff --git a/lib/wx/src/gen/wxChoice.erl b/lib/wx/src/gen/wxChoice.erl
index b9cac3926c..2a2b2688fe 100644
--- a/lib/wx/src/gen/wxChoice.erl
+++ b/lib/wx/src/gen/wxChoice.erl
@@ -104,7 +104,7 @@ new(Parent,Id)
 		 | {size, {W::integer(), H::integer()}}
 		 | {choices, [[unicode:chardata()]]}
 		 | {style, integer()}
-		 | {validator, wx:wx()}.
+		 | {validator, wx:wx_object()}.
 new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
  when is_integer(Id),is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -130,7 +130,7 @@ create(This,Parent,Id,Pos={PosX,PosY},Size={SizeW,SizeH},Choices)
 -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::[[unicode:chardata()]],
 	Option :: {style, integer()}
-		 | {validator, wx:wx()}.
+		 | {validator, wx:wx_object()}.
 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),
diff --git a/lib/wx/src/gen/wxColourPickerCtrl.erl b/lib/wx/src/gen/wxColourPickerCtrl.erl
index 5fd51eba15..1ba771695f 100644
--- a/lib/wx/src/gen/wxColourPickerCtrl.erl
+++ b/lib/wx/src/gen/wxColourPickerCtrl.erl
@@ -104,7 +104,7 @@ new(Parent,Id)
 		 | {pos, {X::integer(), Y::integer()}}
 		 | {size, {W::integer(), H::integer()}}
 		 | {style, integer()}
-		 | {validator, wx:wx()}.
+		 | {validator, wx:wx_object()}.
 new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
  when is_integer(Id),is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -133,7 +133,7 @@ create(This,Parent,Id)
 		 | {pos, {X::integer(), Y::integer()}}
 		 | {size, {W::integer(), H::integer()}}
 		 | {style, integer()}
-		 | {validator, wx:wx()}.
+		 | {validator, wx:wx_object()}.
 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),
diff --git a/lib/wx/src/gen/wxComboBox.erl b/lib/wx/src/gen/wxComboBox.erl
index b9224d18b9..c67ff82bbc 100644
--- a/lib/wx/src/gen/wxComboBox.erl
+++ b/lib/wx/src/gen/wxComboBox.erl
@@ -107,7 +107,7 @@ new(Parent,Id)
 		 | {size, {W::integer(), H::integer()}}
 		 | {choices, [[unicode:chardata()]]}
 		 | {style, integer()}
-		 | {validator, wx:wx()}.
+		 | {validator, wx:wx_object()}.
 new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
  when is_integer(Id),is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -134,7 +134,7 @@ create(This,Parent,Id,Value,Pos={PosX,PosY},Size={SizeW,SizeH},Choices)
 -spec create(This, Parent, Id, Value, Pos, Size, Choices, [Option]) -> boolean() when
 	This::wxComboBox(), Parent::wxWindow:wxWindow(), Id::integer(), Value::unicode:chardata(), Pos::{X::integer(), Y::integer()}, Size::{W::integer(), H::integer()}, Choices::[[unicode:chardata()]],
 	Option :: {style, integer()}
-		 | {validator, wx:wx()}.
+		 | {validator, wx:wx_object()}.
 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),
diff --git a/lib/wx/src/gen/wxDatePickerCtrl.erl b/lib/wx/src/gen/wxDatePickerCtrl.erl
index ad66d1cf03..6ffc2ca3f5 100644
--- a/lib/wx/src/gen/wxDatePickerCtrl.erl
+++ b/lib/wx/src/gen/wxDatePickerCtrl.erl
@@ -104,7 +104,7 @@ new(Parent,Id)
 		 | {pos, {X::integer(), Y::integer()}}
 		 | {size, {W::integer(), H::integer()}}
 		 | {style, integer()}
-		 | {validator, wx:wx()}.
+		 | {validator, wx:wx_object()}.
 new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
  when is_integer(Id),is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
diff --git a/lib/wx/src/gen/wxDirPickerCtrl.erl b/lib/wx/src/gen/wxDirPickerCtrl.erl
index 5bc79ca7a1..bbc169ae03 100644
--- a/lib/wx/src/gen/wxDirPickerCtrl.erl
+++ b/lib/wx/src/gen/wxDirPickerCtrl.erl
@@ -105,7 +105,7 @@ new(Parent,Id)
 		 | {pos, {X::integer(), Y::integer()}}
 		 | {size, {W::integer(), H::integer()}}
 		 | {style, integer()}
-		 | {validator, wx:wx()}.
+		 | {validator, wx:wx_object()}.
 new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
  when is_integer(Id),is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -136,7 +136,7 @@ create(This,Parent,Id)
 		 | {pos, {X::integer(), Y::integer()}}
 		 | {size, {W::integer(), H::integer()}}
 		 | {style, integer()}
-		 | {validator, wx:wx()}.
+		 | {validator, wx:wx_object()}.
 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),
diff --git a/lib/wx/src/gen/wxFilePickerCtrl.erl b/lib/wx/src/gen/wxFilePickerCtrl.erl
index f13c20f6c7..d19c8c00cb 100644
--- a/lib/wx/src/gen/wxFilePickerCtrl.erl
+++ b/lib/wx/src/gen/wxFilePickerCtrl.erl
@@ -106,7 +106,7 @@ new(Parent,Id)
 		 | {pos, {X::integer(), Y::integer()}}
 		 | {size, {W::integer(), H::integer()}}
 		 | {style, integer()}
-		 | {validator, wx:wx()}.
+		 | {validator, wx:wx_object()}.
 new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
  when is_integer(Id),is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -139,7 +139,7 @@ create(This,Parent,Id)
 		 | {pos, {X::integer(), Y::integer()}}
 		 | {size, {W::integer(), H::integer()}}
 		 | {style, integer()}
-		 | {validator, wx:wx()}.
+		 | {validator, wx:wx_object()}.
 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),
diff --git a/lib/wx/src/gen/wxFontPickerCtrl.erl b/lib/wx/src/gen/wxFontPickerCtrl.erl
index 2659d4e2e3..46c0dbab4d 100644
--- a/lib/wx/src/gen/wxFontPickerCtrl.erl
+++ b/lib/wx/src/gen/wxFontPickerCtrl.erl
@@ -105,7 +105,7 @@ new(Parent,Id)
 		 | {pos, {X::integer(), Y::integer()}}
 		 | {size, {W::integer(), H::integer()}}
 		 | {style, integer()}
-		 | {validator, wx:wx()}.
+		 | {validator, wx:wx_object()}.
 new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
  when is_integer(Id),is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -134,7 +134,7 @@ create(This,Parent,Id)
 		 | {pos, {X::integer(), Y::integer()}}
 		 | {size, {W::integer(), H::integer()}}
 		 | {style, integer()}
-		 | {validator, wx:wx()}.
+		 | {validator, wx:wx_object()}.
 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),
diff --git a/lib/wx/src/gen/wxGLCanvas.erl b/lib/wx/src/gen/wxGLCanvas.erl
index 3a9cb39020..46168374af 100644
--- a/lib/wx/src/gen/wxGLCanvas.erl
+++ b/lib/wx/src/gen/wxGLCanvas.erl
@@ -96,7 +96,7 @@ new(Parent)
 %% 		 | {palette, wxPalette:wxPalette()}.<br />
 %% 
 -spec new(Parent, Shared) -> wxGLCanvas() when
-	Parent::wxWindow:wxWindow(), Shared::wxGLContext:wxGLContext() | wxGLCanvas();
+	Parent::wxWindow:wxWindow(), Shared::wx:wx_object() | wxGLCanvas();
       (Parent, [Option]) -> wxGLCanvas() when
 	Parent::wxWindow:wxWindow(),
 	Option :: {id, integer()}
@@ -128,7 +128,7 @@ new(#wx_ref{type=ParentT,ref=ParentRef}, Options)
 
 %% @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(),
+	Parent::wxWindow:wxWindow(), Shared::wx:wx_object() | wxGLCanvas(),
 	Option :: {id, integer()}
 		 | {pos, {X::integer(), Y::integer()}}
 		 | {size, {W::integer(), H::integer()}}
@@ -159,7 +159,7 @@ new(#wx_ref{type=ParentT,ref=ParentRef},#wx_ref{type=SharedT,ref=SharedRef}, Opt
   <<ParentRef:32/?UI,SharedRef:32/?UI, BinOpt/binary>>).
 
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxglcanvas.html#wxglcanvasgetcontext">external documentation</a>.
--spec getContext(This) -> wxGLContext:wxGLContext() when
+-spec getContext(This) -> wx:wx_object() when
 	This::wxGLCanvas().
 getContext(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGLCanvas),
diff --git a/lib/wx/src/gen/wxGauge.erl b/lib/wx/src/gen/wxGauge.erl
index c35a2574f6..7f892355c7 100644
--- a/lib/wx/src/gen/wxGauge.erl
+++ b/lib/wx/src/gen/wxGauge.erl
@@ -99,7 +99,7 @@ new(Parent,Id,Range)
 	Option :: {pos, {X::integer(), Y::integer()}}
 		 | {size, {W::integer(), H::integer()}}
 		 | {style, integer()}
-		 | {validator, wx:wx()}.
+		 | {validator, wx:wx_object()}.
 new(#wx_ref{type=ParentT,ref=ParentRef},Id,Range, Options)
  when is_integer(Id),is_integer(Range),is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -126,7 +126,7 @@ create(This,Parent,Id,Range)
 	Option :: {pos, {X::integer(), Y::integer()}}
 		 | {size, {W::integer(), H::integer()}}
 		 | {style, integer()}
-		 | {validator, wx:wx()}.
+		 | {validator, wx:wx_object()}.
 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),
diff --git a/lib/wx/src/gen/wxGridBagSizer.erl b/lib/wx/src/gen/wxGridBagSizer.erl
index 6a978efc85..e8a9ff6d76 100644
--- a/lib/wx/src/gen/wxGridBagSizer.erl
+++ b/lib/wx/src/gen/wxGridBagSizer.erl
@@ -98,7 +98,7 @@ add(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ItemT,ref=ItemRef}) ->
 %% 	Option :: {proportion, integer()}<br />
 %% 		 | {flag, integer()}<br />
 %% 		 | {border, integer()}<br />
-%% 		 | {userData, wx:wx()}.<br />
+%% 		 | {userData, wx:wx_object()}.<br />
 %% 
 -spec add(This, Width, Height) -> wxSizerItem:wxSizerItem() when
 	This::wxGridBagSizer(), Width::integer(), Height::integer();
@@ -109,7 +109,7 @@ add(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ItemT,ref=ItemRef}) ->
 	Option :: {proportion, integer()}
 		 | {flag, integer()}
 		 | {border, integer()}
-		 | {userData, wx:wx()}.
+		 | {userData, wx:wx_object()}.
 
 add(This,Width,Height)
  when is_record(This, wx_ref),is_integer(Width),is_integer(Height) ->
@@ -143,13 +143,13 @@ add(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef}, Options
 %% 	Option :: {proportion, integer()}<br />
 %% 		 | {flag, integer()}<br />
 %% 		 | {border, integer()}<br />
-%% 		 | {userData, wx:wx()};<br />
+%% 		 | {userData, wx:wx_object()};<br />
 %%       (This, Window, Pos, [Option]) -> wxSizerItem:wxSizerItem() when<br />
 %% 	This::wxGridBagSizer(), Window::wxWindow:wxWindow() | wxSizer:wxSizer(), Pos::{R::integer(), C::integer()},<br />
 %% 	Option :: {span, {RS::integer(), CS::integer()}}<br />
 %% 		 | {flag, integer()}<br />
 %% 		 | {border, integer()}<br />
-%% 		 | {userData, wx:wx()}.<br />
+%% 		 | {userData, wx:wx_object()}.<br />
 %% 
 -spec add(This, Width, Height, Pos) -> wxSizerItem:wxSizerItem() when
 	This::wxGridBagSizer(), Width::integer(), Height::integer(), Pos::{R::integer(), C::integer()};
@@ -158,13 +158,13 @@ add(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef}, Options
 	Option :: {proportion, integer()}
 		 | {flag, integer()}
 		 | {border, integer()}
-		 | {userData, wx:wx()};
+		 | {userData, wx:wx_object()};
       (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()}.
+		 | {userData, wx:wx_object()}.
 
 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) ->
@@ -204,7 +204,7 @@ add(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef},{PosR,Po
 	Option :: {span, {RS::integer(), CS::integer()}}
 		 | {flag, integer()}
 		 | {border, integer()}
-		 | {userData, wx:wx()}.
+		 | {userData, wx:wx_object()}.
 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),
@@ -305,7 +305,7 @@ findItemAtPosition(#wx_ref{type=ThisT,ref=ThisRef},{PosR,PosC})
 
 %% @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().
+	This::wxGridBagSizer(), UserData::wx:wx_object().
 findItemWithData(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=UserDataT,ref=UserDataRef}) ->
   ?CLASS(ThisT,wxGridBagSizer),
   ?CLASS(UserDataT,wx),
diff --git a/lib/wx/src/gen/wxIcon.erl b/lib/wx/src/gen/wxIcon.erl
index c726f2ed4c..0f31278732 100644
--- a/lib/wx/src/gen/wxIcon.erl
+++ b/lib/wx/src/gen/wxIcon.erl
@@ -50,13 +50,13 @@ new() ->
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxicon.html#wxiconwxicon">external documentation</a>.
 %% <br /> Also:<br />
 %% new(Loc) -> wxIcon() when<br />
-%% 	Loc::wx:wx().<br />
+%% 	Loc::wx:wx_object().<br />
 %% 
 %%<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) -> wxIcon() when
 	Filename::unicode:chardata();
       (Loc) -> wxIcon() when
-	Loc::wx:wx().
+	Loc::wx:wx_object().
 
 new(Filename)
  when is_list(Filename) ->
diff --git a/lib/wx/src/gen/wxListBox.erl b/lib/wx/src/gen/wxListBox.erl
index bcaf5fad3b..3b41de9ffc 100644
--- a/lib/wx/src/gen/wxListBox.erl
+++ b/lib/wx/src/gen/wxListBox.erl
@@ -104,7 +104,7 @@ new(Parent,Id)
 		 | {size, {W::integer(), H::integer()}}
 		 | {choices, [[unicode:chardata()]]}
 		 | {style, integer()}
-		 | {validator, wx:wx()}.
+		 | {validator, wx:wx_object()}.
 new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
  when is_integer(Id),is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -130,7 +130,7 @@ create(This,Parent,Id,Pos={PosX,PosY},Size={SizeW,SizeH},Choices)
 -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::[[unicode:chardata()]],
 	Option :: {style, integer()}
-		 | {validator, wx:wx()}.
+		 | {validator, wx:wx_object()}.
 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),
diff --git a/lib/wx/src/gen/wxRadioBox.erl b/lib/wx/src/gen/wxRadioBox.erl
index 1b3717de23..7843fde488 100644
--- a/lib/wx/src/gen/wxRadioBox.erl
+++ b/lib/wx/src/gen/wxRadioBox.erl
@@ -93,7 +93,7 @@ new(Parent,Id,Title,Pos={PosX,PosY},Size={SizeW,SizeH},Choices)
 	Parent::wxWindow:wxWindow(), Id::integer(), Title::unicode:chardata(), Pos::{X::integer(), Y::integer()}, Size::{W::integer(), H::integer()}, Choices::[[unicode:chardata()]],
 	Option :: {majorDim, integer()}
 		 | {style, integer()}
-		 | {val, wx:wx()}.
+		 | {val, wx:wx_object()}.
 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),
@@ -121,7 +121,7 @@ create(This,Parent,Id,Title,Pos={PosX,PosY},Size={SizeW,SizeH},Choices)
 	This::wxRadioBox(), Parent::wxWindow:wxWindow(), Id::integer(), Title::unicode:chardata(), Pos::{X::integer(), Y::integer()}, Size::{W::integer(), H::integer()}, Choices::[[unicode:chardata()]],
 	Option :: {majorDim, integer()}
 		 | {style, integer()}
-		 | {val, wx:wx()}.
+		 | {val, wx:wx_object()}.
 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),
diff --git a/lib/wx/src/gen/wxRadioButton.erl b/lib/wx/src/gen/wxRadioButton.erl
index a013bd65e4..beb052b873 100644
--- a/lib/wx/src/gen/wxRadioButton.erl
+++ b/lib/wx/src/gen/wxRadioButton.erl
@@ -97,7 +97,7 @@ new(Parent,Id,Label)
 	Option :: {pos, {X::integer(), Y::integer()}}
 		 | {size, {W::integer(), H::integer()}}
 		 | {style, integer()}
-		 | {validator, wx:wx()}.
+		 | {validator, wx:wx_object()}.
 new(#wx_ref{type=ParentT,ref=ParentRef},Id,Label, Options)
  when is_integer(Id),is_list(Label),is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -125,7 +125,7 @@ create(This,Parent,Id,Label)
 	Option :: {pos, {X::integer(), Y::integer()}}
 		 | {size, {W::integer(), H::integer()}}
 		 | {style, integer()}
-		 | {validator, wx:wx()}.
+		 | {validator, wx:wx_object()}.
 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),
diff --git a/lib/wx/src/gen/wxScrollBar.erl b/lib/wx/src/gen/wxScrollBar.erl
index 30272312ab..4370bd1635 100644
--- a/lib/wx/src/gen/wxScrollBar.erl
+++ b/lib/wx/src/gen/wxScrollBar.erl
@@ -98,7 +98,7 @@ new(Parent,Id)
 	Option :: {pos, {X::integer(), Y::integer()}}
 		 | {size, {W::integer(), H::integer()}}
 		 | {style, integer()}
-		 | {validator, wx:wx()}.
+		 | {validator, wx:wx_object()}.
 new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
  when is_integer(Id),is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -125,7 +125,7 @@ create(This,Parent,Id)
 	Option :: {pos, {X::integer(), Y::integer()}}
 		 | {size, {W::integer(), H::integer()}}
 		 | {style, integer()}
-		 | {validator, wx:wx()}.
+		 | {validator, wx:wx_object()}.
 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),
diff --git a/lib/wx/src/gen/wxSizer.erl b/lib/wx/src/gen/wxSizer.erl
index 104e1bcdc9..7edc01aa2a 100644
--- a/lib/wx/src/gen/wxSizer.erl
+++ b/lib/wx/src/gen/wxSizer.erl
@@ -56,7 +56,7 @@ add(This,Window)
 %% 	Option :: {proportion, integer()}<br />
 %% 		 | {flag, integer()}<br />
 %% 		 | {border, integer()}<br />
-%% 		 | {userData, wx:wx()};<br />
+%% 		 | {userData, wx:wx_object()};<br />
 %%       (This, Window, Flags) -> wxSizerItem:wxSizerItem() when<br />
 %% 	This::wxSizer(), Window::wxWindow:wxWindow() | wxSizer(), Flags::wxSizerFlags:wxSizerFlags().<br />
 %% 
@@ -67,7 +67,7 @@ add(This,Window)
 	Option :: {proportion, integer()}
 		 | {flag, integer()}
 		 | {border, integer()}
-		 | {userData, wx:wx()};
+		 | {userData, wx:wx_object()};
       (This, Window, Flags) -> wxSizerItem:wxSizerItem() when
 	This::wxSizer(), Window::wxWindow:wxWindow() | wxSizer(), Flags::wxSizerFlags:wxSizerFlags().
 
@@ -110,7 +110,7 @@ add(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef},#wx_ref{
 	Option :: {proportion, integer()}
 		 | {flag, integer()}
 		 | {border, integer()}
-		 | {userData, wx:wx()}.
+		 | {userData, wx:wx_object()}.
 add(#wx_ref{type=ThisT,ref=ThisRef},Width,Height, Options)
  when is_integer(Width),is_integer(Height),is_list(Options) ->
   ?CLASS(ThisT,wxSizer),
@@ -350,7 +350,7 @@ insert(#wx_ref{type=ThisT,ref=ThisRef},Index,#wx_ref{type=ItemT,ref=ItemRef})
 %% 	Option :: {proportion, integer()}<br />
 %% 		 | {flag, integer()}<br />
 %% 		 | {border, integer()}<br />
-%% 		 | {userData, wx:wx()};<br />
+%% 		 | {userData, wx:wx_object()};<br />
 %%       (This, Index, Window, Flags) -> wxSizerItem:wxSizerItem() when<br />
 %% 	This::wxSizer(), Index::integer(), Window::wxWindow:wxWindow() | wxSizer(), Flags::wxSizerFlags:wxSizerFlags().<br />
 %% 
@@ -361,7 +361,7 @@ insert(#wx_ref{type=ThisT,ref=ThisRef},Index,#wx_ref{type=ItemT,ref=ItemRef})
 	Option :: {proportion, integer()}
 		 | {flag, integer()}
 		 | {border, integer()}
-		 | {userData, wx:wx()};
+		 | {userData, wx:wx_object()};
       (This, Index, Window, Flags) -> wxSizerItem:wxSizerItem() when
 	This::wxSizer(), Index::integer(), Window::wxWindow:wxWindow() | wxSizer(), Flags::wxSizerFlags:wxSizerFlags().
 
@@ -405,7 +405,7 @@ insert(#wx_ref{type=ThisT,ref=ThisRef},Index,#wx_ref{type=WindowT,ref=WindowRef}
 	Option :: {proportion, integer()}
 		 | {flag, integer()}
 		 | {border, integer()}
-		 | {userData, wx:wx()}.
+		 | {userData, wx:wx_object()}.
 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),
@@ -497,7 +497,7 @@ prepend(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ItemT,ref=ItemRef}) ->
 %% 	Option :: {proportion, integer()}<br />
 %% 		 | {flag, integer()}<br />
 %% 		 | {border, integer()}<br />
-%% 		 | {userData, wx:wx()};<br />
+%% 		 | {userData, wx:wx_object()};<br />
 %%       (This, Window, Flags) -> wxSizerItem:wxSizerItem() when<br />
 %% 	This::wxSizer(), Window::wxWindow:wxWindow() | wxSizer(), Flags::wxSizerFlags:wxSizerFlags().<br />
 %% 
@@ -508,7 +508,7 @@ prepend(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ItemT,ref=ItemRef}) ->
 	Option :: {proportion, integer()}
 		 | {flag, integer()}
 		 | {border, integer()}
-		 | {userData, wx:wx()};
+		 | {userData, wx:wx_object()};
       (This, Window, Flags) -> wxSizerItem:wxSizerItem() when
 	This::wxSizer(), Window::wxWindow:wxWindow() | wxSizer(), Flags::wxSizerFlags:wxSizerFlags().
 
@@ -551,7 +551,7 @@ prepend(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef},#wx_
 	Option :: {proportion, integer()}
 		 | {flag, integer()}
 		 | {border, integer()}
-		 | {userData, wx:wx()}.
+		 | {userData, wx:wx_object()}.
 prepend(#wx_ref{type=ThisT,ref=ThisRef},Width,Height, Options)
  when is_integer(Width),is_integer(Height),is_list(Options) ->
   ?CLASS(ThisT,wxSizer),
diff --git a/lib/wx/src/gen/wxSizerItem.erl b/lib/wx/src/gen/wxSizerItem.erl
index 22533500da..62655864d1 100644
--- a/lib/wx/src/gen/wxSizerItem.erl
+++ b/lib/wx/src/gen/wxSizerItem.erl
@@ -72,7 +72,7 @@ new(Width,Height,#wx_ref{type=FlagsT,ref=FlagsRef})
 
 %% @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().
+	Window::wxWindow:wxWindow() | wxSizer:wxSizer(), Proportion::integer(), Flag::integer(), Border::integer(), UserData::wx:wx_object().
 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
@@ -88,7 +88,7 @@ new(#wx_ref{type=WindowT,ref=WindowRef},Proportion,Flag,Border,#wx_ref{type=User
 
 %% @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().
+	Width::integer(), Height::integer(), Proportion::integer(), Flag::integer(), Border::integer(), UserData::wx:wx_object().
 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),
@@ -200,7 +200,7 @@ getSpacer(#wx_ref{type=ThisT,ref=ThisRef}) ->
   <<ThisRef:32/?UI>>).
 
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemgetuserdata">external documentation</a>.
--spec getUserData(This) -> wx:wx() when
+-spec getUserData(This) -> wx:wx_object() when
 	This::wxSizerItem().
 getUserData(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxSizerItem),
diff --git a/lib/wx/src/gen/wxSlider.erl b/lib/wx/src/gen/wxSlider.erl
index e951e559ca..459e9b9c35 100644
--- a/lib/wx/src/gen/wxSlider.erl
+++ b/lib/wx/src/gen/wxSlider.erl
@@ -99,7 +99,7 @@ new(Parent,Id,Value,MinValue,MaxValue)
 	Option :: {pos, {X::integer(), Y::integer()}}
 		 | {size, {W::integer(), H::integer()}}
 		 | {style, integer()}
-		 | {validator, wx:wx()}.
+		 | {validator, wx:wx_object()}.
 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),
@@ -126,7 +126,7 @@ create(This,Parent,Id,Value,MinValue,MaxValue)
 	Option :: {pos, {X::integer(), Y::integer()}}
 		 | {size, {W::integer(), H::integer()}}
 		 | {style, integer()}
-		 | {validator, wx:wx()}.
+		 | {validator, wx:wx_object()}.
 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),
diff --git a/lib/wx/src/gen/wxStyledTextCtrl.erl b/lib/wx/src/gen/wxStyledTextCtrl.erl
index 057e01ddd5..f6dc2176b7 100644
--- a/lib/wx/src/gen/wxStyledTextCtrl.erl
+++ b/lib/wx/src/gen/wxStyledTextCtrl.erl
@@ -252,7 +252,7 @@ addText(#wx_ref{type=ThisT,ref=ThisRef},Text)
 
 %% @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().
+	This::wxStyledTextCtrl(), Data::wx:wx_object().
 addStyledText(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=DataT,ref=DataRef}) ->
   ?CLASS(ThisT,wxStyledTextCtrl),
   ?CLASS(DataT,wxMemoryBuffer),
@@ -361,7 +361,7 @@ setSavePoint(#wx_ref{type=ThisT,ref=ThisRef}) ->
   <<ThisRef:32/?UI>>).
 
 %% @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
+-spec getStyledText(This, StartPos, EndPos) -> wx:wx_object() when
 	This::wxStyledTextCtrl(), StartPos::integer(), EndPos::integer().
 getStyledText(#wx_ref{type=ThisT,ref=ThisRef},StartPos,EndPos)
  when is_integer(StartPos),is_integer(EndPos) ->
diff --git a/lib/wx/src/gen/wxTextCtrl.erl b/lib/wx/src/gen/wxTextCtrl.erl
index 21ff062d5b..e1f82c40c3 100644
--- a/lib/wx/src/gen/wxTextCtrl.erl
+++ b/lib/wx/src/gen/wxTextCtrl.erl
@@ -106,7 +106,7 @@ new(Parent,Id)
 		 | {pos, {X::integer(), Y::integer()}}
 		 | {size, {W::integer(), H::integer()}}
 		 | {style, integer()}
-		 | {validator, wx:wx()}.
+		 | {validator, wx:wx_object()}.
 new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
  when is_integer(Id),is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -201,7 +201,7 @@ create(This,Parent,Id)
 		 | {pos, {X::integer(), Y::integer()}}
 		 | {size, {W::integer(), H::integer()}}
 		 | {style, integer()}
-		 | {validator, wx:wx()}.
+		 | {validator, wx:wx_object()}.
 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),
diff --git a/lib/wx/src/gen/wxToggleButton.erl b/lib/wx/src/gen/wxToggleButton.erl
index 1d770b5ca5..ed2f564952 100644
--- a/lib/wx/src/gen/wxToggleButton.erl
+++ b/lib/wx/src/gen/wxToggleButton.erl
@@ -97,7 +97,7 @@ new(Parent,Id,Label)
 	Option :: {pos, {X::integer(), Y::integer()}}
 		 | {size, {W::integer(), H::integer()}}
 		 | {style, integer()}
-		 | {validator, wx:wx()}.
+		 | {validator, wx:wx_object()}.
 new(#wx_ref{type=ParentT,ref=ParentRef},Id,Label, Options)
  when is_integer(Id),is_list(Label),is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -125,7 +125,7 @@ create(This,Parent,Id,Label)
 	Option :: {pos, {X::integer(), Y::integer()}}
 		 | {size, {W::integer(), H::integer()}}
 		 | {style, integer()}
-		 | {validator, wx:wx()}.
+		 | {validator, wx:wx_object()}.
 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),
diff --git a/lib/wx/src/gen/wxToolBar.erl b/lib/wx/src/gen/wxToolBar.erl
index e55becb748..9401e30e20 100644
--- a/lib/wx/src/gen/wxToolBar.erl
+++ b/lib/wx/src/gen/wxToolBar.erl
@@ -86,7 +86,7 @@ parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -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
+-spec addControl(This, Control) -> wx:wx_object() when
 	This::wxToolBar(), Control::wxControl:wxControl().
 addControl(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ControlT,ref=ControlRef}) ->
   ?CLASS(ThisT,wxToolBar),
@@ -95,7 +95,7 @@ addControl(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ControlT,ref=ControlRef}
   <<ThisRef:32/?UI,ControlRef:32/?UI>>).
 
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbaraddseparator">external documentation</a>.
--spec addSeparator(This) -> wx:wx() when
+-spec addSeparator(This) -> wx:wx_object() when
 	This::wxToolBar().
 addSeparator(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxToolBar),
@@ -103,8 +103,8 @@ addSeparator(#wx_ref{type=ThisT,ref=ThisRef}) ->
   <<ThisRef:32/?UI>>).
 
 %% @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().
+-spec addTool(This, Tool) -> wx:wx_object() when
+	This::wxToolBar(), Tool::wx:wx_object().
 addTool(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ToolT,ref=ToolRef}) ->
   ?CLASS(ThisT,wxToolBar),
   ?CLASS(ToolT,wx),
@@ -112,7 +112,7 @@ addTool(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ToolT,ref=ToolRef}) ->
   <<ThisRef:32/?UI,ToolRef:32/?UI>>).
 
 %% @equiv addTool(This,Toolid,Bitmap, [])
--spec addTool(This, Toolid, Bitmap) -> wx:wx() when
+-spec addTool(This, Toolid, Bitmap) -> wx:wx_object() when
 	This::wxToolBar(), Toolid::integer(), Bitmap::wxBitmap:wxBitmap().
 
 addTool(This,Toolid,Bitmap)
@@ -121,19 +121,19 @@ addTool(This,Toolid,Bitmap)
 
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbaraddtool">external documentation</a>.
 %% <br /> Also:<br />
-%% addTool(This, Toolid, Bitmap, BmpDisabled) -> wx:wx() when<br />
+%% addTool(This, Toolid, Bitmap, BmpDisabled) -> wx:wx_object() when<br />
 %% 	This::wxToolBar(), Toolid::integer(), Bitmap::wxBitmap:wxBitmap(), BmpDisabled::wxBitmap:wxBitmap();<br />
-%%       (This, Toolid, Bitmap, [Option]) -> wx:wx() when<br />
+%%       (This, Toolid, Bitmap, [Option]) -> wx:wx_object() when<br />
 %% 	This::wxToolBar(), Toolid::integer(), Bitmap::wxBitmap:wxBitmap(),<br />
 %% 	Option :: {shortHelpString, unicode:chardata()}<br />
 %% 		 | {longHelpString, unicode:chardata()}.<br />
 %% 
 %%<br /> Kind = ?wxITEM_SEPARATOR | ?wxITEM_NORMAL | ?wxITEM_CHECK | ?wxITEM_RADIO | ?wxITEM_MAX
--spec addTool(This, Toolid, Label, Bitmap) -> wx:wx() when
+-spec addTool(This, Toolid, Label, Bitmap) -> wx:wx_object() when
 	This::wxToolBar(), Toolid::integer(), Label::unicode:chardata(), Bitmap::wxBitmap:wxBitmap();
-      (This, Toolid, Bitmap, BmpDisabled) -> wx:wx() when
+      (This, Toolid, Bitmap, BmpDisabled) -> wx:wx_object() when
 	This::wxToolBar(), Toolid::integer(), Bitmap::wxBitmap:wxBitmap(), BmpDisabled::wxBitmap:wxBitmap();
-      (This, Toolid, Bitmap, [Option]) -> wx:wx() when
+      (This, Toolid, Bitmap, [Option]) -> wx:wx_object() when
 	This::wxToolBar(), Toolid::integer(), Bitmap::wxBitmap:wxBitmap(),
 	Option :: {shortHelpString, unicode:chardata()}
 		 | {longHelpString, unicode:chardata()}.
@@ -158,28 +158,28 @@ addTool(#wx_ref{type=ThisT,ref=ThisRef},Toolid,#wx_ref{type=BitmapT,ref=BitmapRe
 
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbaraddtool">external documentation</a>.
 %% <br /> Also:<br />
-%% addTool(This, Toolid, Label, Bitmap, [Option]) -> wx:wx() when<br />
+%% addTool(This, Toolid, Label, Bitmap, [Option]) -> wx:wx_object() when<br />
 %% 	This::wxToolBar(), Toolid::integer(), Label::unicode:chardata(), Bitmap::wxBitmap:wxBitmap(),<br />
 %% 	Option :: {shortHelp, unicode:chardata()}<br />
 %% 		 | {kind, wx:wx_enum()};<br />
-%%       (This, Toolid, Bitmap, BmpDisabled, [Option]) -> wx:wx() when<br />
+%%       (This, Toolid, Bitmap, BmpDisabled, [Option]) -> wx:wx_object() when<br />
 %% 	This::wxToolBar(), Toolid::integer(), Bitmap::wxBitmap:wxBitmap(), BmpDisabled::wxBitmap:wxBitmap(),<br />
 %% 	Option :: {toggle, boolean()}<br />
-%% 		 | {clientData, wx:wx()}<br />
+%% 		 | {clientData, wx:wx_object()}<br />
 %% 		 | {shortHelpString, unicode:chardata()}<br />
 %% 		 | {longHelpString, unicode:chardata()}.<br />
 %% 
 %%<br /> Kind = ?wxITEM_SEPARATOR | ?wxITEM_NORMAL | ?wxITEM_CHECK | ?wxITEM_RADIO | ?wxITEM_MAX
--spec addTool(This, Toolid, Label, Bitmap, BmpDisabled) -> wx:wx() when
+-spec addTool(This, Toolid, Label, Bitmap, BmpDisabled) -> wx:wx_object() when
 	This::wxToolBar(), Toolid::integer(), Label::unicode:chardata(), Bitmap::wxBitmap:wxBitmap(), BmpDisabled::wxBitmap:wxBitmap();
-      (This, Toolid, Label, Bitmap, [Option]) -> wx:wx() when
+      (This, Toolid, Label, Bitmap, [Option]) -> wx:wx_object() when
 	This::wxToolBar(), Toolid::integer(), Label::unicode:chardata(), Bitmap::wxBitmap:wxBitmap(),
 	Option :: {shortHelp, unicode:chardata()}
 		 | {kind, wx:wx_enum()};
-      (This, Toolid, Bitmap, BmpDisabled, [Option]) -> wx:wx() when
+      (This, Toolid, Bitmap, BmpDisabled, [Option]) -> wx:wx_object() when
 	This::wxToolBar(), Toolid::integer(), Bitmap::wxBitmap:wxBitmap(), BmpDisabled::wxBitmap:wxBitmap(),
 	Option :: {toggle, boolean()}
-		 | {clientData, wx:wx()}
+		 | {clientData, wx:wx_object()}
 		 | {shortHelpString, unicode:chardata()}
 		 | {longHelpString, unicode:chardata()}.
 
@@ -213,22 +213,22 @@ addTool(#wx_ref{type=ThisT,ref=ThisRef},Toolid,#wx_ref{type=BitmapT,ref=BitmapRe
 
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbaraddtool">external documentation</a>.
 %% <br /> Also:<br />
-%% addTool(This, Toolid, Label, Bitmap, BmpDisabled, [Option]) -> wx:wx() when<br />
+%% addTool(This, Toolid, Label, Bitmap, BmpDisabled, [Option]) -> wx:wx_object() when<br />
 %% 	This::wxToolBar(), Toolid::integer(), Label::unicode:chardata(), Bitmap::wxBitmap:wxBitmap(), BmpDisabled::wxBitmap:wxBitmap(),<br />
 %% 	Option :: {kind, wx:wx_enum()}<br />
 %% 		 | {shortHelp, unicode:chardata()}<br />
 %% 		 | {longHelp, unicode:chardata()}<br />
-%% 		 | {data, wx:wx()}.<br />
+%% 		 | {data, wx:wx_object()}.<br />
 %% 
 %%<br /> Kind = ?wxITEM_SEPARATOR | ?wxITEM_NORMAL | ?wxITEM_CHECK | ?wxITEM_RADIO | ?wxITEM_MAX
--spec addTool(This, Toolid, Bitmap, BmpDisabled, Toggle, XPos) -> wx:wx() when
+-spec addTool(This, Toolid, Bitmap, BmpDisabled, Toggle, XPos) -> wx:wx_object() 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, Toolid, Label, Bitmap, BmpDisabled, [Option]) -> wx:wx_object() when
 	This::wxToolBar(), Toolid::integer(), Label::unicode:chardata(), Bitmap::wxBitmap:wxBitmap(), BmpDisabled::wxBitmap:wxBitmap(),
 	Option :: {kind, wx:wx_enum()}
 		 | {shortHelp, unicode:chardata()}
 		 | {longHelp, unicode:chardata()}
-		 | {data, wx:wx()}.
+		 | {data, wx:wx_object()}.
 
 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) ->
@@ -249,10 +249,10 @@ addTool(#wx_ref{type=ThisT,ref=ThisRef},Toolid,Label,#wx_ref{type=BitmapT,ref=Bi
   <<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>>).
 
 %% @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
+-spec addTool(This, Toolid, Bitmap, BmpDisabled, Toggle, XPos, [Option]) -> wx:wx_object() when
 	This::wxToolBar(), Toolid::integer(), Bitmap::wxBitmap:wxBitmap(), BmpDisabled::wxBitmap:wxBitmap(), Toggle::boolean(), XPos::integer(),
 	Option :: {yPos, integer()}
-		 | {clientData, wx:wx()}
+		 | {clientData, wx:wx_object()}
 		 | {shortHelp, unicode:chardata()}
 		 | {longHelp, unicode:chardata()}.
 addTool(#wx_ref{type=ThisT,ref=ThisRef},Toolid,#wx_ref{type=BitmapT,ref=BitmapRef},#wx_ref{type=BmpDisabledT,ref=BmpDisabledRef},Toggle,XPos, Options)
@@ -270,7 +270,7 @@ addTool(#wx_ref{type=ThisT,ref=ThisRef},Toolid,#wx_ref{type=BitmapT,ref=BitmapRe
   <<ThisRef:32/?UI,Toolid:32/?UI,BitmapRef:32/?UI,BmpDisabledRef:32/?UI,(wxe_util:from_bool(Toggle)):32/?UI,XPos:32/?UI, BinOpt/binary>>).
 
 %% @equiv addCheckTool(This,Toolid,Label,Bitmap, [])
--spec addCheckTool(This, Toolid, Label, Bitmap) -> wx:wx() when
+-spec addCheckTool(This, Toolid, Label, Bitmap) -> wx:wx_object() when
 	This::wxToolBar(), Toolid::integer(), Label::unicode:chardata(), Bitmap::wxBitmap:wxBitmap().
 
 addCheckTool(This,Toolid,Label,Bitmap)
@@ -278,12 +278,12 @@ addCheckTool(This,Toolid,Label,Bitmap)
   addCheckTool(This,Toolid,Label,Bitmap, []).
 
 %% @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
+-spec addCheckTool(This, Toolid, Label, Bitmap, [Option]) -> wx:wx_object() when
 	This::wxToolBar(), Toolid::integer(), Label::unicode:chardata(), Bitmap::wxBitmap:wxBitmap(),
 	Option :: {bmpDisabled, wxBitmap:wxBitmap()}
 		 | {shortHelp, unicode:chardata()}
 		 | {longHelp, unicode:chardata()}
-		 | {data, wx:wx()}.
+		 | {data, wx:wx_object()}.
 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),
@@ -299,7 +299,7 @@ addCheckTool(#wx_ref{type=ThisT,ref=ThisRef},Toolid,Label,#wx_ref{type=BitmapT,r
   <<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>>).
 
 %% @equiv addRadioTool(This,Toolid,Label,Bitmap, [])
--spec addRadioTool(This, Toolid, Label, Bitmap) -> wx:wx() when
+-spec addRadioTool(This, Toolid, Label, Bitmap) -> wx:wx_object() when
 	This::wxToolBar(), Toolid::integer(), Label::unicode:chardata(), Bitmap::wxBitmap:wxBitmap().
 
 addRadioTool(This,Toolid,Label,Bitmap)
@@ -307,12 +307,12 @@ addRadioTool(This,Toolid,Label,Bitmap)
   addRadioTool(This,Toolid,Label,Bitmap, []).
 
 %% @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
+-spec addRadioTool(This, Toolid, Label, Bitmap, [Option]) -> wx:wx_object() when
 	This::wxToolBar(), Toolid::integer(), Label::unicode:chardata(), Bitmap::wxBitmap:wxBitmap(),
 	Option :: {bmpDisabled, wxBitmap:wxBitmap()}
 		 | {shortHelp, unicode:chardata()}
 		 | {longHelp, unicode:chardata()}
-		 | {data, wx:wx()}.
+		 | {data, wx:wx_object()}.
 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),
@@ -355,7 +355,7 @@ enableTool(#wx_ref{type=ThisT,ref=ThisRef},Toolid,Enable)
   <<ThisRef:32/?UI,Toolid:32/?UI,(wxe_util:from_bool(Enable)):32/?UI>>).
 
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbarfindbyid">external documentation</a>.
--spec findById(This, Toolid) -> wx:wx() when
+-spec findById(This, Toolid) -> wx:wx_object() when
 	This::wxToolBar(), Toolid::integer().
 findById(#wx_ref{type=ThisT,ref=ThisRef},Toolid)
  when is_integer(Toolid) ->
@@ -373,7 +373,7 @@ findControl(#wx_ref{type=ThisT,ref=ThisRef},Toolid)
   <<ThisRef:32/?UI,Toolid:32/?UI>>).
 
 %% @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
+-spec findToolForPosition(This, X, Y) -> wx:wx_object() when
 	This::wxToolBar(), X::integer(), Y::integer().
 findToolForPosition(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
  when is_integer(X),is_integer(Y) ->
@@ -467,7 +467,7 @@ getToolState(#wx_ref{type=ThisT,ref=ThisRef},Toolid)
   <<ThisRef:32/?UI,Toolid:32/?UI>>).
 
 %% @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
+-spec insertControl(This, Pos, Control) -> wx:wx_object() 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) ->
@@ -477,7 +477,7 @@ insertControl(#wx_ref{type=ThisT,ref=ThisRef},Pos,#wx_ref{type=ControlT,ref=Cont
   <<ThisRef:32/?UI,Pos:32/?UI,ControlRef:32/?UI>>).
 
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbarinsertseparator">external documentation</a>.
--spec insertSeparator(This, Pos) -> wx:wx() when
+-spec insertSeparator(This, Pos) -> wx:wx_object() when
 	This::wxToolBar(), Pos::integer().
 insertSeparator(#wx_ref{type=ThisT,ref=ThisRef},Pos)
  when is_integer(Pos) ->
@@ -486,8 +486,8 @@ insertSeparator(#wx_ref{type=ThisT,ref=ThisRef},Pos)
   <<ThisRef:32/?UI,Pos:32/?UI>>).
 
 %% @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().
+-spec insertTool(This, Pos, Tool) -> wx:wx_object() when
+	This::wxToolBar(), Pos::integer(), Tool::wx:wx_object().
 insertTool(#wx_ref{type=ThisT,ref=ThisRef},Pos,#wx_ref{type=ToolT,ref=ToolRef})
  when is_integer(Pos) ->
   ?CLASS(ThisT,wxToolBar),
@@ -496,7 +496,7 @@ insertTool(#wx_ref{type=ThisT,ref=ThisRef},Pos,#wx_ref{type=ToolT,ref=ToolRef})
   <<ThisRef:32/?UI,Pos:32/?UI,ToolRef:32/?UI>>).
 
 %% @equiv insertTool(This,Pos,Toolid,Bitmap, [])
--spec insertTool(This, Pos, Toolid, Bitmap) -> wx:wx() when
+-spec insertTool(This, Pos, Toolid, Bitmap) -> wx:wx_object() when
 	This::wxToolBar(), Pos::integer(), Toolid::integer(), Bitmap::wxBitmap:wxBitmap().
 
 insertTool(This,Pos,Toolid,Bitmap)
@@ -505,22 +505,22 @@ insertTool(This,Pos,Toolid,Bitmap)
 
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbarinserttool">external documentation</a>.
 %% <br /> Also:<br />
-%% insertTool(This, Pos, Toolid, Bitmap, [Option]) -> wx:wx() when<br />
+%% insertTool(This, Pos, Toolid, Bitmap, [Option]) -> wx:wx_object() when<br />
 %% 	This::wxToolBar(), Pos::integer(), Toolid::integer(), Bitmap::wxBitmap:wxBitmap(),<br />
 %% 	Option :: {bmpDisabled, wxBitmap:wxBitmap()}<br />
 %% 		 | {toggle, boolean()}<br />
-%% 		 | {clientData, wx:wx()}<br />
+%% 		 | {clientData, wx:wx_object()}<br />
 %% 		 | {shortHelp, unicode:chardata()}<br />
 %% 		 | {longHelp, unicode:chardata()}.<br />
 %% 
 %%<br /> Kind = ?wxITEM_SEPARATOR | ?wxITEM_NORMAL | ?wxITEM_CHECK | ?wxITEM_RADIO | ?wxITEM_MAX
--spec insertTool(This, Pos, Toolid, Label, Bitmap) -> wx:wx() when
+-spec insertTool(This, Pos, Toolid, Label, Bitmap) -> wx:wx_object() when
 	This::wxToolBar(), Pos::integer(), Toolid::integer(), Label::unicode:chardata(), Bitmap::wxBitmap:wxBitmap();
-      (This, Pos, Toolid, Bitmap, [Option]) -> wx:wx() when
+      (This, Pos, Toolid, Bitmap, [Option]) -> wx:wx_object() when
 	This::wxToolBar(), Pos::integer(), Toolid::integer(), Bitmap::wxBitmap:wxBitmap(),
 	Option :: {bmpDisabled, wxBitmap:wxBitmap()}
 		 | {toggle, boolean()}
-		 | {clientData, wx:wx()}
+		 | {clientData, wx:wx_object()}
 		 | {shortHelp, unicode:chardata()}
 		 | {longHelp, unicode:chardata()}.
 
@@ -543,13 +543,13 @@ insertTool(#wx_ref{type=ThisT,ref=ThisRef},Pos,Toolid,#wx_ref{type=BitmapT,ref=B
 
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbarinserttool">external documentation</a>.
 %%<br /> Kind = ?wxITEM_SEPARATOR | ?wxITEM_NORMAL | ?wxITEM_CHECK | ?wxITEM_RADIO | ?wxITEM_MAX
--spec insertTool(This, Pos, Toolid, Label, Bitmap, [Option]) -> wx:wx() when
+-spec insertTool(This, Pos, Toolid, Label, Bitmap, [Option]) -> wx:wx_object() when
 	This::wxToolBar(), Pos::integer(), Toolid::integer(), Label::unicode:chardata(), Bitmap::wxBitmap:wxBitmap(),
 	Option :: {bmpDisabled, wxBitmap:wxBitmap()}
 		 | {kind, wx:wx_enum()}
 		 | {shortHelp, unicode:chardata()}
 		 | {longHelp, unicode:chardata()}
-		 | {clientData, wx:wx()}.
+		 | {clientData, wx:wx_object()}.
 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),
@@ -574,7 +574,7 @@ realize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   <<ThisRef:32/?UI>>).
 
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbarremovetool">external documentation</a>.
--spec removeTool(This, Toolid) -> wx:wx() when
+-spec removeTool(This, Toolid) -> wx:wx_object() when
 	This::wxToolBar(), Toolid::integer().
 removeTool(#wx_ref{type=ThisT,ref=ThisRef},Toolid)
  when is_integer(Toolid) ->
diff --git a/lib/wx/src/gen/wxTreeCtrl.erl b/lib/wx/src/gen/wxTreeCtrl.erl
index fef9916fff..dfa9e691ce 100644
--- a/lib/wx/src/gen/wxTreeCtrl.erl
+++ b/lib/wx/src/gen/wxTreeCtrl.erl
@@ -118,7 +118,7 @@ new(Parent)
 		 | {pos, {X::integer(), Y::integer()}}
 		 | {size, {W::integer(), H::integer()}}
 		 | {style, integer()}
-		 | {validator, wx:wx()}.
+		 | {validator, wx:wx_object()}.
 new(#wx_ref{type=ParentT,ref=ParentRef}, Options)
  when is_list(Options) ->
   ?CLASS(ParentT,wxWindow),
@@ -235,7 +235,7 @@ create(This,Parent)
 		 | {pos, {X::integer(), Y::integer()}}
 		 | {size, {W::integer(), H::integer()}}
 		 | {style, integer()}
-		 | {validator, wx:wx()}.
+		 | {validator, wx:wx_object()}.
 create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxTreeCtrl),
diff --git a/lib/wx/src/gen/wxWindow.erl b/lib/wx/src/gen/wxWindow.erl
index d31f489726..229633a106 100644
--- a/lib/wx/src/gen/wxWindow.erl
+++ b/lib/wx/src/gen/wxWindow.erl
@@ -526,7 +526,7 @@ getCursor(#wx_ref{type=ThisT,ref=ThisRef}) ->
   <<ThisRef:32/?UI>>).
 
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetdroptarget">external documentation</a>.
--spec getDropTarget(This) -> wxDropTarget:wxDropTarget() when
+-spec getDropTarget(This) -> wx:wx_object() when
 	This::wxWindow().
 getDropTarget(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxWindow),
@@ -1384,7 +1384,7 @@ setOwnForegroundColour(#wx_ref{type=ThisT,ref=ThisRef},Colour)
 
 %% @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().
+	This::wxWindow(), DropTarget::wx:wx_object().
 setDropTarget(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=DropTargetT,ref=DropTargetRef}) ->
   ?CLASS(ThisT,wxWindow),
   ?CLASS(DropTargetT,wxDropTarget),