Update headers and templates

swigtemplates/app.i

@@ -1,12 +1,11 @@
 %module app
 %include <common.i>
 %{
-#include <wx/app.h>
-
-#include "wxext/app_ext.h"
+#include <wx/wx.h>
+#include <wx/vidmode.h>
+#include "wxext/app_ext2.h"
 #if defined(__WXMAC__)
 #include <objc/runtime.h>
-#include "wxext/osx/app_ext.h"
 #endif
 
 %}
@@ -43,6 +42,7 @@
 %import "wx/hashmap.h"
 %import "wx/math.h"
 %import "wx/localedefs.h"
+%import "wx/eventfilter.h"
 %import "wx/event.h"
 %import "wx/dataobj.h"
 %import "wx/cursor.h"
@@ -64,11 +64,11 @@
 %import "wx/vidmode.h"
 %import "wx/cmdargs.h"
 %import "wx/string.h"
+%import "wx/nonownedwnd.h"
 %import "wx/toplevel.h"
 %import "wx/frame.h"
-%include "wx/app.h"
 %include "wx/build.h"
-%include "wxext/app_ext.h"
+%include "wx/app.h"
 
 #if defined(__WXMSW__)
     %include "wx/msw/app.h"
@@ -84,11 +84,12 @@
     %include "wx/x11/app.h"
 #elif defined(__WXMAC__)
     %include "wx/osx/app.h"
-    %include "wxext/osx/app_ext.h"
 #elif defined(__WXQT__)
     %include "wx/qt/app.h"
 #endif
 
+%include "wxext/app_ext2.h"
+
 %{
 /* typedef wxWindow* (* InitTopWindow)(); */
 

swigtemplates/button.i

@@ -3,7 +3,6 @@
 %{
 #include <wx/vidmode.h>
 #include "wxext/button_ext.h"
-#include "wxext/osx/button_ext.h"
 %}
 
 
@@ -59,7 +58,6 @@
 %import "wx/control.h"
 %import "wx/anybutton.h"
 %include "wx/button.h"
-%include "wxext/button_ext.h"
 
 #if defined(__WXUNIVERSAL__)
     %include "wx/univ/button.h"
@@ -73,7 +71,8 @@
     %include "wx/gtk1/button.h"
 #elif defined(__WXMAC__)
     %include "wx/osx/button.h"
-    %include "wxext/osx/button_ext.h"
 #elif defined(__WXQT__)
     %include "wx/qt/button.h"
 #endif
+
+%include "wxext/button_ext.h"

swigtemplates/event.i

@@ -1,4 +1,15 @@
 %module event
+%{
+#include <wx/event.h>
+
+#include "wxext/event_ext.h"
+#include "wxext/eventfilter_ext.h"
+#if defined(__WXMAC__)
+#include <objc/runtime.h>
+#endif
+
+%}
+
 %include <common.i>
 
 %ignore wxObject::ms_classInfo;
@@ -24,6 +35,9 @@
 %import "wx/mousestate.h"
 %import "wx/tracker.h"
 %include "wx/event.h"
+%include "wx/eventfilter.h"
+%include "wxext/event_ext.h"
+%include "wxext/eventfilter_ext.h"
 
 /* For some reason this doesn't work. Figure out why */
 

swigtemplates/frame.i

@@ -2,10 +2,7 @@
 %include <common.i>
 %{
 #include <wx/vidmode.h>
-#include "wxext/frame_ext.h"
-#if defined(__WXMAC__)
-    #include "wxext/osx/frame_ext.h"
-#endif
+#include "wxext/frame_ext2.h"
 %}
 
 %ignore wxWindowList::Nth;
@@ -63,7 +60,6 @@
 %import "wx/string.h"
 %import "wx/toplevel.h"
 %include "wx/frame.h"
-%include "wxext/frame_ext.h"
 
 #if defined(__WXUNIVERSAL__)
     %include "wx/univ/frame.h"
@@ -78,8 +74,9 @@
         %include "wx/motif/frame.h"
     #elif defined(__WXMAC__)
         %include "wx/osx/frame.h"
-        %include "wxext/osx/frame_ext.h"
     #elif defined(__WXQT__)
         %include "wx/qt/frame.h"
     #endif
 #endif
+
+%include "wxext/frame_ext2.h"

swigtemplates/panel.i

@@ -3,7 +3,6 @@
 %{
 #include <wx/vidmode.h>
 #include "wxext/panel_ext.h"
-#include "wxext/generic/panelg_ext.h"
 %}
 
 
@@ -58,8 +57,6 @@
 %import "wx/window.h"
 %import "wx/control.h"
 %include "wx/panel.h"
-%include "wxext/panel_ext.h"
-%include "wxext/generic/panelg_ext.h"
 
 #if defined(__WXUNIVERSAL__)
     %include "wx/univ/panel.h"
@@ -69,3 +66,5 @@
     #define wxHAS_GENERIC_PANEL
     %include "wx/generic/panelg.h"
 #endif
+
+%include "wxext/panel_ext.h"

swigtemplates/window.i

@@ -55,7 +55,6 @@
 %import "wx/toplevel.h"
 %import "wx/frame.h"
 %include "wx/window.h"
-%include "wxext/window_ext.h"
 
 // include the declaration of the platform-specific class
 #if defined(__WXMSW__)
@@ -117,4 +116,4 @@
     %include "wx/univ/window.h"
 #endif // wxUniv
 
-%include "wxext/window_ext_inc.h"
+%include "wxext/window_ext.h"