6 files changed, 77 insertions, 11 deletions
diff --git a/lib/wx/api_gen/Makefile b/lib/wx/api_gen/Makefile
index 29ff185760..3fa8f1feee 100644
--- a/lib/wx/api_gen/Makefile
+++ b/lib/wx/api_gen/Makefile
@@ -49,7 +49,7 @@ opt:  $(WX) $(GL)
 $(WX): wxxml_generated $(COMPILER_T) wxapi.conf $(wildcard wx_extra/wx*.c_src) $(wildcard wx_extra/wx*.erl)
 	erl -noshell -run wx_gen code && touch wx_code_generated
 
-wxxml_generated:  wx_doxygen.conf wx_extra/bugs.h wx_extra/wxe_evth.h wx_extra/func30.h
+wxxml_generated:  wx_doxygen.conf wx_extra/bugs.h wx_extra/wxe_evth.h wx_extra/added_func.h
 	sed -e 's|@WXGTK_DIR@|$(WXGTK_DIR)|g' wx_doxygen.conf > wx_doxygen
 	doxygen wx_doxygen && touch wxxml_generated
 
diff --git a/lib/wx/api_gen/wx_extra/added_func.h b/lib/wx/api_gen/wx_extra/added_func.h
new file mode 100644
index 0000000000..2323529368
--- /dev/null
+++ b/lib/wx/api_gen/wx_extra/added_func.h
@@ -0,0 +1,28 @@
+//  Added 3.0 functionality
+
+class WXDLLIMPEXP_AUI wxAuiTabArt
+{
+public:
+    virtual void SetColour(const wxColour& colour) = 0;
+    virtual void SetActiveColour(const wxColour& colour) = 0;
+};
+
+// Api to get data out of paneinfo
+class WXDLLIMPEXP_AUI wxAuiPaneInfo
+{
+ public:
+    wxString GetName();
+    wxString GetCaption();
+    wxIcon GetIcon();
+
+    wxWindow* GetWindow();
+    wxFrame* GetFrame();
+
+    int GetDirection();
+    int GetLayer();
+    int GetRow();
+    int GetPosition();
+
+    wxPoint GetFloatingPosition();
+    wxSize GetFloatingSize();
+};
diff --git a/lib/wx/api_gen/wx_extra/func30.h b/lib/wx/api_gen/wx_extra/func30.h
deleted file mode 100644
index 383ea08b93..0000000000
--- a/lib/wx/api_gen/wx_extra/func30.h
+++ /dev/null
@@ -1,8 +0,0 @@
-//  Added 3.0 functionality
-
-class WXDLLIMPEXP_AUI wxAuiTabArt
-{
-public:
-    virtual void SetColour(const wxColour& colour) = 0;
-    virtual void SetActiveColour(const wxColour& colour) = 0;
-}
diff --git a/lib/wx/api_gen/wx_gen.erl b/lib/wx/api_gen/wx_gen.erl
index e6fc6570f9..5cf09e5eee 100644
--- a/lib/wx/api_gen/wx_gen.erl
+++ b/lib/wx/api_gen/wx_gen.erl
@@ -771,6 +771,10 @@ parse_type2([N="wxGridCellCoordsArray"|R],Info,Opts,T) ->
     parse_type2(R,Info,Opts,T#type{name=N,base={comp,"wxGridCellCoords",
 						[{int,"R"},{int,"C"}]},
 				   single=array});
+parse_type2([N="wxAuiPaneInfoArray"|R],Info,Opts,T) ->
+    parse_type2(R,Info,Opts,T#type{name=N,base={class,"wxAuiPaneInfo"},
+				   single=array});
+
 parse_type2([N="wxRect"|R],Info,Opts,T) -> 
     parse_type2(R,Info,Opts,T#type{name=N,base={comp,N,[{int,"X"},{int,"Y"},
 							{int,"W"},{int,"H"}]}});
diff --git a/lib/wx/api_gen/wx_gen_cpp.erl b/lib/wx/api_gen/wx_gen_cpp.erl
index 5ce60391c1..5649336b5d 100644
--- a/lib/wx/api_gen/wx_gen_cpp.erl
+++ b/lib/wx/api_gen/wx_gen_cpp.erl
@@ -1020,6 +1020,10 @@ build_ret(Name,_,#type{base={comp,_,_},single=array}) ->
     w(" for(unsigned int i=0; i < ~s.GetCount(); i++) {~n", [Name]),
     w("  rt.add(~s[i]);~n }~n",[Name]),
     w(" rt.endList(~s.GetCount());~n",[Name]);
+build_ret(Name,_,#type{base={class,Class},single=array}) ->
+    w(" for(unsigned int i=0; i < ~s.GetCount(); i++) {~n", [Name]),
+    w("  rt.addRef(getRef((void *) &~s.Item(i), memenv), \"~s\");~n }~n",[Name, Class]),
+    w(" rt.endList(~s.GetCount());~n",[Name]);
 build_ret(Name,_,#type{name=List,single=list,base={class,Class}}) ->
     w(" int i=0;~n"),
     w(" for(~s::const_iterator it = ~s.begin(); it != ~s.end(); ++it) {~n",
diff --git a/lib/wx/api_gen/wxapi.conf b/lib/wx/api_gen/wxapi.conf
index 2ca254ef74..f076323bea 100644
--- a/lib/wx/api_gen/wxapi.conf
+++ b/lib/wx/api_gen/wxapi.conf
@@ -1246,7 +1246,8 @@
   'SetArtProvider','SetDockSizeConstraint','SetFlags','SetManagedWindow',
   'ShowHint','UnInit','Update']}.
 
-{class, wxAuiPaneInfo, root, [{ifdef, wxUSE_AUI}], 
+{class, wxAuiPaneInfo, root,
+ [{ifdef, wxUSE_AUI}],
  [
   wxAuiPaneInfo,'~wxAuiPaneInfo', 
   'BestSize','Bottom','BottomDockable','Caption','CaptionVisible',
@@ -1263,7 +1264,44 @@
   'MinSize','MinimizeButton','Movable','Name',
   'PaneBorder','PinButton','Position','Resizable','Right',
   'RightDockable','Row','SafeSet','SetFlag','Show','ToolbarPane',
-  'Top','TopDockable','Window']}.
+  'Top','TopDockable','Window',
+  %% Extended func
+  %% These are not initilized by default and thus cause crashes
+  %% {'GetName',
+  %%  [{pre_hook, [{c, "#if 0\n"}]},
+  %%   {post_hook, [{c, "#endif\n if(!This) throw wxe_badarg(0);\n wxString Result = This->name"}]}]},
+  %% {'GetCaption',
+  %%  [{pre_hook, [{c, "#if 0\n"}]},
+  %%   {post_hook, [{c, "#endif\n if(!This) throw wxe_badarg(0);\n wxString Result = This->caption"}]}]},
+  %% {'GetIcon',
+  %%  [{pre_hook, [{c, "#if 0\n"}]},
+  %%   {post_hook, [{c, "#endif\n if(!This) throw wxe_badarg(0);\n wxIcon Result = This->icon"}]}]},
+  {'GetWindow',
+   [{pre_hook, [{c, "#if 0\n"}]},
+    {post_hook, [{c, "#endif\n if(!This) throw wxe_badarg(0);\n wxWindow* Result = This->window"}]}]},
+  {'GetFrame',
+   [{pre_hook, [{c, "#if 0\n"}]},
+    {post_hook, [{c, "#endif\n if(!This) throw wxe_badarg(0);\n wxFrame* Result = This->frame"}]}]},
+  {'GetDirection',
+   [{pre_hook, [{c, "#if 0\n"}]},
+    {post_hook, [{c, "#endif\n if(!This) throw wxe_badarg(0);\n int Result = This->dock_direction"}]}]},
+  {'GetLayer',
+   [{pre_hook, [{c, "#if 0\n"}]},
+    {post_hook, [{c, "#endif\n if(!This) throw wxe_badarg(0);\n int Result = This->dock_layer"}]}]},
+  {'GetRow',
+   [{pre_hook, [{c, "#if 0\n"}]},
+    {post_hook, [{c, "#endif\n if(!This) throw wxe_badarg(0);\n int Result = This->dock_row"}]}]},
+  {'GetPosition',
+   [{pre_hook, [{c, "#if 0\n"}]},
+    {post_hook, [{c, "#endif\n if(!This) throw wxe_badarg(0);\n int Result = This->dock_pos"}]}]},
+  {'GetFloatingPosition',
+   [{pre_hook, [{c, "#if 0\n"}]},
+    {post_hook, [{c, "#endif\n if(!This) throw wxe_badarg(0);\n wxPoint Result = This->floating_pos"}]}]},
+  {'GetFloatingSize',
+   [{pre_hook, [{c, "#if 0\n"}]},
+    {post_hook, [{c, "#endif\n if(!This) throw wxe_badarg(0);\n wxSize Result = This->floating_size"}]}]}
+
+]}.
 
 {class, wxAuiNotebook, wxControl, [{ifdef, wxUSE_AUI}], 
  ['wxAuiNotebook','AddPage',%'AdvanceSelection',